Date: Tue, 19 Jun 2012 06:51:52 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r779 - in branches/experimental: mail/thunderbird mail/thunderbird-beta mail/thunderbird-beta/files mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3 mail/thunderbird3/files www/firefox www/firefox-beta www/firefox-esr www/firefox36 www/libxul www/libxul19 www/seamonkey www/seamonkey-beta Message-ID: <201206190651.q5J6pqvq044669@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Jun 19 06:51:52 2012
New Revision: 779
Log:
enable system nss
Added:
branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
branches/experimental/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
branches/experimental/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
branches/experimental/mail/thunderbird3/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
Modified:
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/firefox-beta/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox36/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/libxul19/Makefile
branches/experimental/www/seamonkey-beta/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/mail/thunderbird-beta/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -16,6 +16,7 @@
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+ nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -26,7 +27,7 @@
USE_AUTOTOOLS= autoconf213:env
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
-USE_MOZILLA= -nss -dbm
+USE_MOZILLA= # empty
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Added: branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 19 06:51:52 2012 (r779)
@@ -0,0 +1,12 @@
+--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~
++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in
+@@ -188,6 +188,9 @@ endif
+
+ OBJDEST = $(OBJDIR_NAME)
+
++# accept -pthread with MOZ_NATIVE_NSS
++LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS)
++
+ ###########################################################################
+
+ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -16,6 +16,7 @@
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+ nss>=3.13.1:${PORTSDIR}/security/nss \
sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -27,7 +28,7 @@
LATEST_LINK= thunderbird-esr
USE_GECKO= gecko
CONFLICTS= thunderbird-1[1-9].*
-USE_MOZILLA= -nss -dbm
+USE_MOZILLA= # empty
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Added: branches/experimental/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 19 06:51:52 2012 (r779)
@@ -0,0 +1,12 @@
+--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~
++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in
+@@ -188,6 +188,9 @@ endif
+
+ OBJDEST = $(OBJDIR_NAME)
+
++# accept -pthread with MOZ_NATIVE_NSS
++LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS)
++
+ ###########################################################################
+
+ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/mail/thunderbird/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -16,6 +16,7 @@
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
+ nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -26,7 +27,7 @@
USE_AUTOTOOLS= autoconf213:env
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
-USE_MOZILLA= -nss -dbm
+USE_MOZILLA= # empty
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Added: branches/experimental/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 19 06:51:52 2012 (r779)
@@ -0,0 +1,12 @@
+--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~
++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in
+@@ -188,6 +188,9 @@ endif
+
+ OBJDEST = $(OBJDIR_NAME)
+
++# accept -pthread with MOZ_NATIVE_NSS
++LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS)
++
+ ###########################################################################
+
+ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/mail/thunderbird3/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -15,13 +15,14 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
-BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr \
+ nss>=3.12.8:${PORTSDIR}/security/nss
DEPRECATED= will be unsupported by when Thunderbird 12 is release, migrate to mail/thunderbird now
USE_AUTOTOOLS= autoconf213:env
LATEST_LINK= thunderbird3
USE_GECKO= gecko
-USE_MOZILLA= -nss -dbm -event -ffi -vpx
+USE_MOZILLA= -event -ffi -vpx
MOZ_CHROME= jar
MAKE_JOBS_SAFE= yes
Added: branches/experimental/mail/thunderbird3/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird3/files/patch-directory-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in Tue Jun 19 06:51:52 2012 (r779)
@@ -0,0 +1,12 @@
+--- directory/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in~
++++ directory/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in
+@@ -189,6 +189,9 @@
+
+ OBJDEST = $(OBJDIR_NAME)
+
++# accept -pthread with MOZ_NATIVE_NSS
++LINK_DLL = $(CC_FOR_LINK) -shared -o $@ $(OBJS) $(EXTRA_DLL_LIBS)
++
+ ###########################################################################
+
+ ifeq ($(USE_DLL_EXPORTS_FILE), 1)
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/www/firefox-beta/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -17,6 +17,7 @@
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \
+ nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -28,7 +29,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -nss -dbm
+USE_MOZILLA= # empty
MOZILLA_NAME= Firefox
MAKE_JOBS_SAFE= yes
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/www/firefox-esr/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -17,6 +17,7 @@
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \
+ nss>=3.13.1:${PORTSDIR}/security/nss \
sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -29,7 +30,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-1[1-9].*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -nss -dbm
+USE_MOZILLA= # empty
MOZILLA_NAME= Firefox
MAKE_JOBS_SAFE= yes
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/www/firefox/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -17,6 +17,7 @@
COMMENT= Web browser based on the browser portion of Mozilla
BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
+ nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -28,7 +29,7 @@
USE_GECKO= gecko
CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -nss -dbm
+USE_MOZILLA= # empty
MOZILLA_NAME= Firefox
MAKE_JOBS_SAFE= yes
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/www/firefox36/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -16,14 +16,15 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr \
+ nss>=3.12.8:${PORTSDIR}/security/nss
DEPRECATED= will be unsupported by when Firefox 12 is release, migrate to www/firefox now
USE_AUTOTOOLS= autoconf213:env
LATEST_LINK= firefox36
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -nss -dbm -cairo -event -ffi -vpx
+USE_MOZILLA= -cairo -event -ffi -vpx
MOZ_CHROME= jar
USE_GECKO_OPTIONS=+smb
MOZILLA_NAME= Firefox${MOZILLA_SUFX}
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/www/libxul/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -16,6 +16,7 @@
COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \
+ nss>=3.13.1:${PORTSDIR}/security/nss \
sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -45,12 +46,16 @@
OPTIONS= # Empty, used for generic gecko OPTIONS
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
-USE_MOZILLA= -nss -dbm
-MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js mozilla-nss \
+USE_MOZILLA= # empty
+MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js \
mozilla-plugin
.include <bsd.port.pre.mk>
+.if ${USE_MOZILLA:M-nss}
+MOZ_PKGCONFIG_FILES+= mozilla-nss
+.endif
+
.if ${ARCH} == powerpc64
.if ${OSVERSION} < 900033
BROKEN= Needs binutils 2.17.50 to build
Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/www/libxul19/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -41,16 +41,20 @@
OPTIONS= # Empty, used for generic gecko OPTIONS
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
-USE_MOZILLA= -nss -dbm -event -ffi -vpx
+USE_MOZILLA= -event -ffi -vpx
MOZ_CHROME= jar
MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-gtkmozembed-embedding \
- mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
+ mozilla-gtkmozembed mozilla-js mozilla-plugin
OPTIONS_DEFINE= JAVA
JAVA_DESC= Enable JAVA xpcom
.include <bsd.port.pre.mk>
+.if ${USE_MOZILLA:M-nss}
+MOZ_PKGCONFIG_FILES+= mozilla-nss
+.endif
+
.if ${OSVERSION} < 700000
LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/www/seamonkey-beta/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -16,6 +16,7 @@
COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+ nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
@@ -44,7 +45,7 @@
--disable-updater \
--disable-necko-wifi
-USE_MOZILLA= -nss -dbm
+USE_MOZILLA= # empty
USE_GECKO_OPTIONS=+smb
MOZILLA_PLIST_DIRS= bin lib
MOZ_PKGCONFIG_FILES=
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Tue Jun 19 06:41:12 2012 (r778)
+++ branches/experimental/www/seamonkey/Makefile Tue Jun 19 06:51:52 2012 (r779)
@@ -16,6 +16,7 @@
COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr \
+ nss>=3.13.2:${PORTSDIR}/security/nss \
sqlite3>=3.7.10:${PORTSDIR}/databases/sqlite3 \
unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
@@ -44,7 +45,7 @@
--disable-updater \
--disable-necko-wifi
-USE_MOZILLA= -nss -dbm
+USE_MOZILLA= # empty
USE_GECKO_OPTIONS=+smb
MOZILLA_PLIST_DIRS= bin lib
MOZ_PKGCONFIG_FILES=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206190651.q5J6pqvq044669>