On Nov 15, 2007, at 02:26, source_changes@macosforge.org wrote:
Added: trunk/dports/net/nss/Portfile =================================================================== --- trunk/dports/net/nss/Portfile (rev 0) +++ trunk/dports/net/nss/Portfile 2007-11-15 08:26:49 UTC (rev 31067) @@ -0,0 +1,43 @@ +# $Id$ +PortSystem 1.0 +name nss +version 3.11.7 +categories net +maintainers rsync@reifferscheid.org +description Network Security Service libraries. +depends_lib port:nspr + +long_description ${description} +configure { }
FYI, "use_configure no" is better than "configure {}".
+homepage http://www.mozilla.org/projects/security/pki/nss/ +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 \
[snip] To avoid having to change these version numbers every time you update the port version, you can use 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 nss-${version}.tar.gz md5 82594a0773cedd7bb7aa25009a25f5a3 \
Added: trunk/dports/net/nss/files/patch-Darwin.mk.diff =================================================================== --- trunk/dports/net/nss/files/patch- Darwin.mk.diff (rev 0) +++ trunk/dports/net/nss/files/patch-Darwin.mk.diff 2007-11-15 08:26:49 UTC (rev 31067) @@ -0,0 +1,11 @@ +--- mozilla/security/coreconf/Darwin.mk.orig 2007-11-14 19:41:02.000000000 +0100 ++++ mozilla/security/coreconf/Darwin.mk 2007-11-14 19:41:20.000000000 +0100 +@@ -111,7 +111,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
You mustn't hard-code "/opt/local" into ports. MacPorts can be installed in any prefix; /opt/local just happens to be the default. If you must use a patchfile for this, use something like "@@PREFIX@@" instead of "/opt/local" in your patchfiles. Then replace "@@PREFIX@@" with ${prefix} using a reinplace in the portfile.
+ MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) + DLL_SUFFIX = dylib
Added: trunk/dports/net/nss/files/patch-UNIX.mk.diff =================================================================== --- trunk/dports/net/nss/files/patch- UNIX.mk.diff (rev 0) +++ trunk/dports/net/nss/files/patch-UNIX.mk.diff 2007-11-15 08:26:49 UTC (rev 31067) @@ -0,0 +1,11 @@ +--- mozilla/security/coreconf/UNIX.mk.orig 2007-11-14 19:41:08.000000000 +0100 ++++ mozilla/security/coreconf/UNIX.mk 2007-11-14 19:41:24.000000000 +0100 +@@ -46,7 +46,7 @@ + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g +- DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) ++ DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) -I/opt// local/include/nspr/ -L/opt/local/lib
Ditto.
+ endif + + ifdef BUILD_TREE
Added: trunk/dports/net/nss/files/patch-config.mk.diff =================================================================== --- trunk/dports/net/nss/files/patch- config.mk.diff (rev 0) +++ trunk/dports/net/nss/files/patch-config.mk.diff 2007-11-15 08:26:49 UTC (rev 31067) @@ -0,0 +1,11 @@ +--- mozilla/security/nss/lib/ckfw/builtins/config.mk.orig 2007-11-14 19:51:59.000000000 +0100 ++++ mozilla/security/nss/lib/ckfw/builtins/config.mk 2007-11-14 19:52:38.000000000 +0100 +@@ -60,7 +60,7 @@ + # To create a loadable module on Darwin, we must use -bundle. + # + ifeq ($(OS_TARGET),Darwin) +-DSO_LDOPTS = -bundle ++DSO_LDOPTS = -bundle -L/opt/local/lib
Ditto.
+ endif + + ifeq ($(OS_TARGET),SunOS)
Dear Ryan, Saispo, macports-dev-list, attached is a patch containing all the recommended changes. Thanks for your help. Kind regards Thomas Reifferscheid PS: thomas$ head -1 patch-port_nss.diff diff -Naur ports/net/nss.orig/Portfile ports/net/nss/Portfile Ryan Schmidt wrote:
On Nov 15, 2007, at 02:26, source_changes@macosforge.org wrote:
Added: trunk/dports/net/nss/Portfile =================================================================== --- trunk/dports/net/nss/Portfile (rev 0) +++ trunk/dports/net/nss/Portfile 2007-11-15 08:26:49 UTC (rev 31067) @@ -0,0 +1,43 @@ +# $Id$ +PortSystem 1.0 +name nss +version 3.11.7 +categories net +maintainers rsync@reifferscheid.org +description Network Security Service libraries. +depends_lib port:nspr + +long_description ${description} +configure { }
FYI, "use_configure no" is better than "configure {}".
+homepage http://www.mozilla.org/projects/security/pki/nss/ +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/...
+checksums nss-3.11.7.tar.gz md5 82594a0773cedd7bb7aa25009a25f5a3 \
[snip]
To avoid having to change these version numbers every time you update the port version, you can use
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 nss-${version}.tar.gz md5 82594a0773cedd7bb7aa25009a25f5a3 \
Added: trunk/dports/net/nss/files/patch-Darwin.mk.diff =================================================================== --- trunk/dports/net/nss/files/patch-Darwin.mk.diff (rev 0) +++ trunk/dports/net/nss/files/patch-Darwin.mk.diff 2007-11-15 08:26:49 UTC (rev 31067) @@ -0,0 +1,11 @@ +--- mozilla/security/coreconf/Darwin.mk.orig 2007-11-14 19:41:02.000000000 +0100 ++++ mozilla/security/coreconf/Darwin.mk 2007-11-14 19:41:20.000000000 +0100 +@@ -111,7 +111,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
You mustn't hard-code "/opt/local" into ports. MacPorts can be installed in any prefix; /opt/local just happens to be the default. If you must use a patchfile for this, use something like "@@PREFIX@@" instead of "/opt/local" in your patchfiles. Then replace "@@PREFIX@@" with ${prefix} using a reinplace in the portfile.
+ MKSHLIB = $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS) + DLL_SUFFIX = dylib
Added: trunk/dports/net/nss/files/patch-UNIX.mk.diff =================================================================== --- trunk/dports/net/nss/files/patch-UNIX.mk.diff (rev 0) +++ trunk/dports/net/nss/files/patch-UNIX.mk.diff 2007-11-15 08:26:49 UTC (rev 31067) @@ -0,0 +1,11 @@ +--- mozilla/security/coreconf/UNIX.mk.orig 2007-11-14 19:41:08.000000000 +0100 ++++ mozilla/security/coreconf/UNIX.mk 2007-11-14 19:41:24.000000000 +0100 +@@ -46,7 +46,7 @@ + DEFINES += -UDEBUG -DNDEBUG + else + OPTIMIZER += -g +- DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) ++ DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) -I/opt//local/include/nspr/ -L/opt/local/lib
Ditto.
+ endif + + ifdef BUILD_TREE
Added: trunk/dports/net/nss/files/patch-config.mk.diff =================================================================== --- trunk/dports/net/nss/files/patch-config.mk.diff (rev 0) +++ trunk/dports/net/nss/files/patch-config.mk.diff 2007-11-15 08:26:49 UTC (rev 31067) @@ -0,0 +1,11 @@ +--- mozilla/security/nss/lib/ckfw/builtins/config.mk.orig 2007-11-14 19:51:59.000000000 +0100 ++++ mozilla/security/nss/lib/ckfw/builtins/config.mk 2007-11-14 19:52:38.000000000 +0100 +@@ -60,7 +60,7 @@ + # To create a loadable module on Darwin, we must use -bundle. + # + ifeq ($(OS_TARGET),Darwin) +-DSO_LDOPTS = -bundle ++DSO_LDOPTS = -bundle -L/opt/local/lib
Ditto.
+ endif + + ifeq ($(OS_TARGET),SunOS)
On Nov 16, 2007, at 02:29, Thomas Reifferscheid wrote:
Dear Ryan, Saispo, macports-dev-list,
attached is a patch containing all the recommended changes. Thanks for your help.
I made some revisions; attached is the patch I would like to commit. Is it ok with you? Here's the commit message I would use: ===== 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 ===== I removed the checksums for the patchfiles, because MacPorts does not check checksums of patchfiles that are included in the ports tree. It only checks checksums of files downloaded from master_sites. You may notice this if you use "sudo port -dv checksum". I noted you fixed the case of the patchfile in the checksums section but not the patchfiles section. I fixed it in the patchfiles section. Although it will work with the wrong case on most Macs, which have case-insensitive HFS filesystems, some users may choose to use case- sensitive HFS filesystems, or even case-sensitive UFS filesystems, and for those users, the port would fail.
The changes are ok with me. I'm sorry for the Uppercase stuff. When I was creating the Portfile, I was using a local repository. Thats when the checksum of the patchfiles were required, but it's ok when they get removed from the Portfile. Kind regards Thomas Reifferscheid Ryan Schmidt wrote:
On Nov 16, 2007, at 02:29, Thomas Reifferscheid wrote:
Dear Ryan, Saispo, macports-dev-list,
attached is a patch containing all the recommended changes. Thanks for your help.
I made some revisions; attached is the patch I would like to commit. Is it ok with you?
Here's the commit message I would use:
===== 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 =====
I removed the checksums for the patchfiles, because MacPorts does not check checksums of patchfiles that are included in the ports tree. It only checks checksums of files downloaded from master_sites. You may notice this if you use "sudo port -dv checksum".
I noted you fixed the case of the patchfile in the checksums section but not the patchfiles section. I fixed it in the patchfiles section. Although it will work with the wrong case on most Macs, which have case-insensitive HFS filesystems, some users may choose to use case-sensitive HFS filesystems, or even case-sensitive UFS filesystems, and for those users, the port would fail.
Great, I committed it in r31120. On Nov 16, 2007, at 05:13, Thomas Reifferscheid wrote:
The changes are ok with me. I'm sorry for the Uppercase stuff. When I was creating the Portfile, I was using a local repository. Thats when the checksum of the patchfiles were required, but it's ok when they get removed from the Portfile.
Ryan Schmidt wrote:
On Nov 16, 2007, at 02:29, Thomas Reifferscheid wrote:
Dear Ryan, Saispo, macports-dev-list,
attached is a patch containing all the recommended changes. Thanks for your help.
I made some revisions; attached is the patch I would like to commit. Is it ok with you?
Here's the commit message I would use:
===== 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 =====
I removed the checksums for the patchfiles, because MacPorts does not check checksums of patchfiles that are included in the ports tree. It only checks checksums of files downloaded from master_sites. You may notice this if you use "sudo port -dv checksum".
I noted you fixed the case of the patchfile in the checksums section but not the patchfiles section. I fixed it in the patchfiles section. Although it will work with the wrong case on most Macs, which have case-insensitive HFS filesystems, some users may choose to use case-sensitive HFS filesystems, or even case- sensitive UFS filesystems, and for those users, the port would fail.
participants (2)
-
Ryan Schmidt
-
Thomas Reifferscheid