[31120] trunk/dports/net/nss

[source_changes at macosforge.org]

Revision: 31120
          http://trac.macosforge.org/projects/macports/changeset/31120
Author:   ryandesign at macports.org
Date:     2007-11-16 03:29:25 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
nss:

* no longer hardcode /opt/local; use the current ${prefix}
* automatically use the current version in master_sites
* remove unused checksums
* fix case of patchfile name for case-sensitive filesystems
* "use_configure no" is preferred over "configure {}"
* add whitespace recommended by port lint

Changes suggested by me and approved by port maintainer

Modified Paths:
--------------
    trunk/dports/net/nss/Portfile
    trunk/dports/net/nss/files/patch-Darwin.mk.diff
    trunk/dports/net/nss/files/patch-UNIX.mk.diff
    trunk/dports/net/nss/files/patch-config.mk.diff

Modified: trunk/dports/net/nss/Portfile
===================================================================
--- trunk/dports/net/nss/Portfile	2007-11-16 11:20:27 UTC (rev 31119)
+++ trunk/dports/net/nss/Portfile	2007-11-16 11:29:25 UTC (rev 31120)
@@ -1,5 +1,7 @@
 # $Id$
+
 PortSystem	1.0
+
 name		nss
 version		3.11.7
 categories	net
@@ -8,19 +10,19 @@
 depends_lib	port:nspr
 
 long_description ${description}
-configure	{ }
+use_configure	no
 homepage	http://www.mozilla.org/projects/security/pki/nss/
 platforms       darwin
-master_sites	ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_7_RTM/src/ \
-		http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_7_RTM/src/
-checksums	nss-3.11.7.tar.gz md5 82594a0773cedd7bb7aa25009a25f5a3 \
-		patch-Unix.mk.diff md5 9adba605169d66fe845445eb7fcf86ea \
-		patch-Darwin.mk.diff md5 d9f3f354106b78b645744204f1d111b1 \
-		patch-config.mk.diff md5 fb9bbd51b04e44fbcdd403c4153bbdfe
 
+set my_release 	NSS_[strsed ${version} {g/\./_/}]_RTM
+
+master_sites	ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${my_release}/src/ \
+		http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${my_release}/src/
+checksums	md5 82594a0773cedd7bb7aa25009a25f5a3
+
 worksrcdir      ${worksrcpath}
 patchfiles	patch-Darwin.mk.diff \
-		patch-Unix.mk.diff \
+		patch-UNIX.mk.diff \
 		patch-config.mk.diff
 
 post-patch {
@@ -29,6 +31,10 @@
 		mozilla/security/nss/cmd/platlibs.mk \
 		mozilla/security/nss/lib/smime/config.mk \
 		mozilla/security/nss/lib/ssl/config.mk
+        reinplace "s|@@PREFIX@@|${prefix}|g" \
+		mozilla/security/coreconf/Darwin.mk \
+		mozilla/security/coreconf/UNIX.mk \
+		mozilla/security/nss/lib/ckfw/builtins/config.mk
 }
 
 build {system "cd ${worksrcdir} && make -C mozilla/security/coreconf/nsinstall && make -C mozilla/security/dbm && make -C mozilla/security/nss"}

Modified: trunk/dports/net/nss/files/patch-Darwin.mk.diff
===================================================================
--- trunk/dports/net/nss/files/patch-Darwin.mk.diff	2007-11-16 11:20:27 UTC (rev 31119)
+++ trunk/dports/net/nss/files/patch-Darwin.mk.diff	2007-11-16 11:29:25 UTC (rev 31120)
@@ -5,7 +5,7 @@
  DSO_CFLAGS	= -fPIC
  # May override this with -bundle to create a loadable module.
 -DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
-+DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names -L/opt/local/lib
++DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names -L@@PREFIX@@/lib
  
  MKSHLIB		= $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
  DLL_SUFFIX	= dylib

Modified: trunk/dports/net/nss/files/patch-UNIX.mk.diff
===================================================================
--- trunk/dports/net/nss/files/patch-UNIX.mk.diff	2007-11-16 11:20:27 UTC (rev 31119)
+++ trunk/dports/net/nss/files/patch-UNIX.mk.diff	2007-11-16 11:29:25 UTC (rev 31120)
@@ -5,7 +5,7 @@
  else
  	OPTIMIZER  += -g
 -	DEFINES    += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami)
-+	DEFINES    += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) -I/opt//local/include/nspr/ -L/opt/local/lib
++	DEFINES    += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) -I@@PREFIX@@/include/nspr/ -L@@PREFIX@@/lib
  endif
  
  ifdef BUILD_TREE

Modified: trunk/dports/net/nss/files/patch-config.mk.diff
===================================================================
--- trunk/dports/net/nss/files/patch-config.mk.diff	2007-11-16 11:20:27 UTC (rev 31119)
+++ trunk/dports/net/nss/files/patch-config.mk.diff	2007-11-16 11:29:25 UTC (rev 31120)
@@ -5,7 +5,7 @@
  #
  ifeq ($(OS_TARGET),Darwin)
 -DSO_LDOPTS = -bundle
-+DSO_LDOPTS = -bundle -L/opt/local/lib
++DSO_LDOPTS = -bundle -L@@PREFIX@@/lib
  endif
  
  ifeq ($(OS_TARGET),SunOS)

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071116/482f22ad/attachment.html