Date: Sun, 8 Jul 2012 12:46:59 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r859 - in branches/experimental: mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3/files www/firefox-esr/files www/firefox/files www/firefox36/files www/libxul/files www/libxul19/files www/seamonkey/files Message-ID: <201207081246.q68CkxEc043250@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Jul 8 12:46:59 2012
New Revision: 859
Log:
rename manifest patch and partially revert r731, apply only where
it's actually needed
Added:
branches/experimental/www/firefox/files/patch-bug752895
Deleted:
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/mail/thunderbird3/files/patch-configure.in
branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in
branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox36/files/patch-configure.in
branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in
branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in
branches/experimental/www/libxul19/files/patch-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in
Modified:
branches/experimental/mail/thunderbird-esr/files/patch-configure.in
branches/experimental/mail/thunderbird/files/patch-configure.in
branches/experimental/www/firefox-esr/files/patch-configure.in
branches/experimental/www/firefox/files/patch-configure.in
branches/experimental/www/libxul/files/patch-configure.in
branches/experimental/www/seamonkey/files/patch-configure.in
Modified: branches/experimental/mail/thunderbird-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858)
+++ branches/experimental/mail/thunderbird-esr/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859)
@@ -1,15 +1,5 @@
--- configure.in.orig 2011-12-19 14:48:06.000000000 +0100
+++ configure.in 2011-12-19 15:51:19.000000000 +0100
-@@ -4218,6 +4218,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,26 +0,0 @@
---- mozilla/browser/installer/package-manifest.in~
-+++ mozilla/browser/installer/package-manifest.in
-@@ -40,10 +40,12 @@
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
--@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-+#endif
-+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
- #ifdef XP_MACOSX
-@@ -109,7 +111,9 @@
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
Modified: branches/experimental/mail/thunderbird/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858)
+++ branches/experimental/mail/thunderbird/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859)
@@ -1,15 +1,5 @@
--- configure.in.orig 2011-12-19 14:48:06.000000000 +0100
+++ configure.in 2011-12-19 15:51:19.000000000 +0100
-@@ -4218,6 +4218,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,24 +0,0 @@
---- mozilla/browser/installer/package-manifest.in~
-+++ mozilla/browser/installer/package-manifest.in
-@@ -58,9 +58,11 @@
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
-@@ -109,7 +111,9 @@
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
Deleted: branches/experimental/mail/thunderbird3/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- configure.in.orig 2009-08-14 11:24:58.206076928 +0200
-+++ configure.in 2009-08-14 11:25:29.601293359 +0200
-@@ -4304,6 +4304,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl ========================================================
- dnl = If NSS was not detected in the system,
Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- mozilla/browser/installer/package-manifest.in~
-+++ mozilla/browser/installer/package-manifest.in
-@@ -46,10 +46,12 @@
- #else
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
--@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-+#endif
-+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
- #else
Deleted: branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,26 +0,0 @@
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -40,10 +40,12 @@
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
--@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-+#endif
-+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
- #ifdef XP_MACOSX
-@@ -109,7 +111,9 @@
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
Modified: branches/experimental/www/firefox-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858)
+++ branches/experimental/www/firefox-esr/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859)
@@ -27,16 +27,6 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
-@@ -4218,6 +4218,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
@@ -4230,6 +4233,9 @@
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
Deleted: branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,24 +0,0 @@
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -58,9 +58,11 @@
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
-@@ -109,7 +111,9 @@
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
Added: branches/experimental/www/firefox/files/patch-bug752895
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-bug752895 Sun Jul 8 12:46:59 2012 (r859)
@@ -0,0 +1,71 @@
+commit de14ddd
+Author: Andrew Benton <b3nton@gmail.com>
+Date: Tue Jun 12 09:10:09 2012 +0200
+
+ Bug 752895 - Don't try to install nspr, nss and sqlite when using system libraries. r=glandium
+---
+ browser/installer/Makefile.in | 8 ++++++++
+ browser/installer/package-manifest.in | 6 ++++++
+ 2 files changed, 14 insertions(+)
+
+diff --git browser/installer/Makefile.in browser/installer/Makefile.in
+index 975b1f4..c791872 100644
+--- browser/installer/Makefile.in
++++ browser/installer/Makefile.in
+@@ -44,6 +44,14 @@ ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
+ DEFINES += -DMOZ_GTK2=1
+ endif
+
++ifdef MOZ_NATIVE_NSPR
++DEFINES += -DMOZ_NATIVE_NSPR=1
++endif
++
++ifdef MOZ_NATIVE_NSS
++DEFINES += -DMOZ_NATIVE_NSS=1
++endif
++
+ ifdef NSS_DISABLE_DBM
+ DEFINES += -DNSS_DISABLE_DBM=1
+ endif
+diff --git browser/installer/package-manifest.in browser/installer/package-manifest.in
+index 2969643..b8fddf0 100644
+--- browser/installer/package-manifest.in
++++ browser/installer/package-manifest.in
+@@ -58,9 +58,11 @@
+ #ifndef MOZ_STATIC_JS
+ @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
+ #endif
++#ifndef MOZ_NATIVE_NSPR
+ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
+ @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
++#endif
+ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+ #ifdef XP_MACOSX
+ @BINPATH@/XUL
+@@ -109,7 +111,9 @@
+ #endif
+ @BINPATH@/platform.ini
+ #ifndef XP_OS2
++#ifndef MOZ_NATIVE_SQLITE
+ @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
++#endif
+ #else
+ @BINPATH@/mozsqlt3@DLL_SUFFIX@
+ #endif
+@@ -583,6 +587,7 @@
+ ; 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@
+@@ -593,6 +598,7 @@
+ @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/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858)
+++ branches/experimental/www/firefox/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859)
@@ -1,15 +1,5 @@
--- configure.in.orig 2012-05-23 20:56:34.000000000 +0200
+++ configure.in 2012-05-27 18:18:25.000000000 +0200
-@@ -4218,6 +4218,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
@@ -4230,6 +4233,9 @@
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
Deleted: branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/www/firefox36/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -46,10 +46,12 @@
- #else
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
--@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-+#endif
-+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
- #else
Deleted: branches/experimental/www/firefox36/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox36/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- configure.in.orig 2009-10-03 20:24:11.000000000 +0200
-+++ configure.in 2009-10-03 20:24:43.000000000 +0200
-@@ -4252,6 +4252,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
Deleted: branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,26 +0,0 @@
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -40,10 +40,12 @@
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
--@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-+#endif
-+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@
- #ifdef XP_MACOSX
-@@ -109,7 +111,9 @@
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
Modified: branches/experimental/www/libxul/files/patch-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858)
+++ branches/experimental/www/libxul/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859)
@@ -27,16 +27,6 @@
AC_DEFINE(HAVE_CLOCK_MONOTONIC)
AC_SUBST(HAVE_CLOCK_MONOTONIC)
AC_SUBST(REALTIME_LIBS)
-@@ -4218,6 +4218,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
@@ -4230,6 +4233,9 @@
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
Deleted: branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/www/libxul19/files/patch-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -46,10 +46,12 @@
- #else
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
--@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
-+#endif
-+@BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
- #else
Deleted: branches/experimental/www/libxul19/files/patch-configure.in
==============================================================================
--- branches/experimental/www/libxul19/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,12 +0,0 @@
---- configure.in.orig 2009-10-29 23:11:31.000000000 +0100
-+++ configure.in 2009-11-16 19:51:19.000000000 +0100
-@@ -4252,6 +4252,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
Modified: branches/experimental/www/seamonkey/files/patch-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-configure.in Sun Jul 8 12:46:45 2012 (r858)
+++ branches/experimental/www/seamonkey/files/patch-configure.in Sun Jul 8 12:46:59 2012 (r859)
@@ -1,15 +1,5 @@
--- configure.in.orig 2011-12-17 18:35:47.000000000 +0100
+++ configure.in 2011-12-19 15:57:09.000000000 +0100
-@@ -4218,6 +4218,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
@@ -4383,7 +4386,7 @@
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Deleted: branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-browser-installer-package-manifest.in Sun Jul 8 12:46:59 2012 (r858)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,24 +0,0 @@
---- mozilla/browser/installer/package-manifest.in~
-+++ mozilla/browser/installer/package-manifest.in
-@@ -58,9 +58,11 @@
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
-@@ -109,7 +111,9 @@
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207081246.q68CkxEc043250>