Author: jbeich Date: Mon Jun 11 20:54:57 2012 New Revision: 746 Log: - update Nightly - switch to system nss
Modified: branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox-nightly/distinfo branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in branches/experimental/www/firefox-nightly/files/patch-config_config.mk branches/experimental/www/firefox-nightly/files/patch-configure.in branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/Makefile Mon Jun 11 20:54:57 2012 (r746) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge <[email protected]> # -# $FreeBSD: ports/www/firefox/Makefile,v 1.269 2012/06/06 07:55:46 beat Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.271 2012/06/07 06:46:12 beat Exp $ # PORTNAME= firefox @@ -18,6 +18,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.12.1:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \ @@ -30,7 +31,7 @@ USE_PYTHON_BUILD=yes USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -nss -dbm -vpx +USE_MOZILLA= -vpx MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} @@ -58,7 +59,7 @@ OPTIONS_DEFINE= PGO PGO_DESC= Enable Profile-Guided Optimization -HGREV= 96037:7e4c2abb9fc9 +HGREV= 96339:b76ec573a6f0 .include <bsd.port.pre.mk> Modified: branches/experimental/www/firefox-nightly/distinfo ============================================================================== --- branches/experimental/www/firefox-nightly/distinfo Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/distinfo Mon Jun 11 20:54:57 2012 (r746) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/7e4c2abb9fc9.tar.bz2) = 5f7e8662ca72b9d71737d23dd50371c6d8beac952cab40ad6c068470f4b3407f -SIZE (firefox-nightly/7e4c2abb9fc9.tar.bz2) = 81757412 +SHA256 (firefox-nightly/b76ec573a6f0.tar.bz2) = d174687137545e6063db16a514650c683b7c6eafccdebeb0dc40dd5fb530a5bc +SIZE (firefox-nightly/b76ec573a6f0.tar.bz2) = 82265804 Modified: branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in Mon Jun 11 20:54:57 2012 (r746) @@ -22,3 +22,22 @@ #else @BINPATH@/mozsqlt3@DLL_SUFFIX@ #endif +@@ -581,16 +585,18 @@ + ; NSS libraries are signed in the staging directory, + ; meaning their .chk files are created there directly. + ; ++#ifndef MOZ_NATIVE_NSS + @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@ + #ifndef NSS_DISABLE_DBM + @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@ + #endif + @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@ ++#endif + @BINPATH@/chrome/pippki@JAREXT@ + @BINPATH@/chrome/pippki.manifest + @BINPATH@/components/pipboot.xpt Modified: branches/experimental/www/firefox-nightly/files/patch-config_config.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-config_config.mk Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/files/patch-config_config.mk Mon Jun 11 20:54:57 2012 (r746) @@ -1,10 +1,10 @@ --- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 +++ config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I%%LOCALBASE%%/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ +@@ -376,6 +376,7 @@ INCLUDES = \ + -I$(DIST)/include \ + $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \ $(OS_INCLUDES) \ - $(NULL) ++ -I%%LOCALBASE%%/include \ + $(NULL) + + include $(topsrcdir)/config/static-checking-config.mk Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-configure.in Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/files/patch-configure.in Mon Jun 11 20:54:57 2012 (r746) @@ -28,6 +28,17 @@ dnl system libevent Support dnl ======================================================== +@@ -4263,6 +4270,10 @@ else + fi + fi + ++if test -n "$MOZ_NATIVE_NSS"; then ++ AC_DEFINE(MOZ_NATIVE_NSS) ++fi ++ + dnl ====================== + dnl Detect yasm + dnl ====================== @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS Modified: branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk ============================================================================== --- branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Sat Jun 9 09:37:21 2012 (r745) +++ branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Mon Jun 11 20:54:57 2012 (r746) @@ -1,10 +1,10 @@ --- js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 +++ js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I%%LOCALBASE%%/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ +@@ -376,6 +376,7 @@ INCLUDES = \ + -I$(DIST)/include \ + $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \ $(OS_INCLUDES) \ - $(NULL) ++ -I%%LOCALBAS%%/include \ + $(NULL) + + include $(topsrcdir)/config/static-checking-config.mk _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
