Same reasoning as for minimo. patch -E recommended.
Please test. Thanks.
-Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile 10 Nov 2006 14:15:49 -0000 1.58
+++ Makefile 10 Nov 2006 20:25:04 -0000
@@ -6,7 +6,7 @@
VER= 1.5.0.8
DISTNAME= mozilla
-PKGNAME= mozilla-firefox-${VER}
+PKGNAME= mozilla-firefox-${VER}p0
SO_VERSION= 16.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@@ -14,8 +14,8 @@
browserdirprovider caps chrome commandlines composer cookie docshell \
editor embedcomponents fileview gfx_gtk gfxps gfxpsshar gkgfx \
gklayout gkplugin gtkembedmoz gtkxtbin htmlpars i18n imglib2 inspector \
- jar50 jsd jsj mork mozfind mozjs necko necko2 nsappshell nspr4 nss3 \
- nssckbi oji permissions pipboot pipnss pippki plc4 plds4 pref rdf \
+ jar50 jsd jsj mork mozfind mozjs necko necko2 nsappshell nss3 \
+ nssckbi oji permissions pipboot pipnss pippki pref rdf \
remoteservice searchservice smime3 softokn3 ssl3 system-pref \
toolkitcomps transformiix txmgr uconv ucvmath universalchardet \
webbrwsr websrvcs widget_gtk2 xmlextras xpcom xpcom_compat \
@@ -36,8 +36,7 @@
pthread z \
atk-1.0 cairo glib-2.0 gmodule-2.0 gobject-2.0 \
jpeg pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 png
-WANTLIB+= stdc++
+ pangoft2-1.0 png stdc++
MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/ \
http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/
@@ -48,7 +47,8 @@
BUILD_DEPENDS= :libIDL-*:devel/libIDL \
:zip->=2.3:archivers/zip \
:pkgconfig-*:devel/pkgconfig
-LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
+ nspr4.>=17,plc4.>=17,plds4.>=17::devel/nspr
VMEM_WARNING= Yes
@@ -58,16 +58,15 @@
NO_REGRESS= Yes
SUBST_VARS= LOCALBASE SO_VERSION
-MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf \
- ${WRKSRC}/nsprpub/build/autoconf
+MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf
AUTOCONF_VERSION= 2.13
CONFIGURE_STYLE= autoconf no-autoheader
CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \
--with-system-png=${LOCALBASE} \
--with-system-zlib=/usr/lib \
+ --with-system-nspr \
--with-pthreads \
- --without-system-nspr \
--enable-xft \
--enable-optimize=-Os \
--enable-default-toolkit=gtk2 \
@@ -103,11 +102,9 @@
pre-configure:
@cd ${WRKSRC}/browser/base/branding/ && cp aboutCredits.png about.png
- @cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
${WRKSRC}/browser/app/mozilla.in
@perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \
- ${WRKSRC}/nsprpub/pr/include/md/_openbsd.h \
${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp
do-install:
Index: patches/patch-nsprpub_config_rules_mk
===================================================================
RCS file: patches/patch-nsprpub_config_rules_mk
diff -N patches/patch-nsprpub_config_rules_mk
--- patches/patch-nsprpub_config_rules_mk 5 May 2006 10:14:21 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-nsprpub_config_rules_mk,v 1.3 2006/05/05 10:14:21 bernd Exp $
---- nsprpub/config/rules.mk.orig Thu Feb 23 00:03:11 2006
-+++ nsprpub/config/rules.mk Wed May 3 13:25:55 2006
-@@ -232,7 +232,7 @@ ifdef RELEASE_HEADERS
- $(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
- endif
- ifdef RELEASE_LIBS
-- $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
-+ $(NSINSTALL) -t -m 0444 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir)
- endif
- +$(LOOP_OVER_DIRS)
-
Index: patches/patch-nsprpub_configure_in
===================================================================
RCS file: patches/patch-nsprpub_configure_in
diff -N patches/patch-nsprpub_configure_in
--- patches/patch-nsprpub_configure_in 5 May 2006 10:14:21 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-nsprpub_configure_in,v 1.5 2006/05/05 10:14:21 bernd Exp $
---- nsprpub/configure.in.orig Thu Feb 23 00:03:11 2006
-+++ nsprpub/configure.in Wed May 3 13:25:55 2006
-@@ -1704,9 +1704,11 @@ mips-sony-newsos*)
- AC_DEFINE(OPENBSD)
- AC_DEFINE(HAVE_BSD_FLOCK)
- AC_DEFINE(HAVE_SOCKLEN_T)
-+ AC_DEFINE(_PR_HAVE_GETPROTO_R)
-+ AC_DEFINE(_PR_HAVE_GETPROTO_R_INT)
- CFLAGS="$CFLAGS -ansi -Wall"
- CXXFLAGS="$CXXFLAGS -ansi -Wall"
-- DLL_SUFFIX=so.1.0
-+ DLL_SUFFIX="so.${SO_VERSION}"
- DSO_CFLAGS=-fPIC
- MDCPUCFG_H=_openbsd.cfg
- PR_MD_CSRCS=openbsd.c
Index: patches/patch-nsprpub_pr_include_md__openbsd_h
===================================================================
RCS file: patches/patch-nsprpub_pr_include_md__openbsd_h
diff -N patches/patch-nsprpub_pr_include_md__openbsd_h
--- patches/patch-nsprpub_pr_include_md__openbsd_h 20 Dec 2005 23:44:00 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.8 2005/12/20 23:44:00 bernd Exp $
---- nsprpub/pr/include/md/_openbsd.h.orig Wed Apr 28 02:33:44 2004
-+++ nsprpub/pr/include/md/_openbsd.h Sat Sep 10 19:45:17 2005
-@@ -56,7 +56,7 @@
- #define _PR_SI_ARCHITECTURE "sparc"
- #endif
-
--#define PR_DLL_SUFFIX ".so.1.0"
-+#define PR_DLL_SUFFIX ".so._SO_VERSION_"
-
- #define _PR_VMBASE 0x30000000
- #define _PR_STACK_VMBASE 0x50000000
Index: patches/patch-nsprpub_pr_include_private_primpl_h
===================================================================
RCS file: patches/patch-nsprpub_pr_include_private_primpl_h
diff -N patches/patch-nsprpub_pr_include_private_primpl_h
--- patches/patch-nsprpub_pr_include_private_primpl_h 20 Dec 2005 23:44:00 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_include_private_primpl_h,v 1.3 2005/12/20 23:44:00 bernd Exp $
---- nsprpub/pr/include/private/primpl.h.orig Thu Aug 18 19:24:29 2005
-+++ nsprpub/pr/include/private/primpl.h Sat Sep 10 09:47:32 2005
-@@ -1867,6 +1867,7 @@ extern void _PR_DestroyZones(void);
- && !defined(DARWIN) \
- && !defined(NEXTSTEP) \
- && !defined(QNX) \
-+ && !defined(__OpenBSD__) \
- && !(defined (UNIXWARE) && defined (USE_SVR4_THREADS))
- #define _PR_OVERRIDE_MALLOC
- #endif
Index: patches/patch-nsprpub_pr_src_misc_prdtoa_c
===================================================================
RCS file: patches/patch-nsprpub_pr_src_misc_prdtoa_c
diff -N patches/patch-nsprpub_pr_src_misc_prdtoa_c
--- patches/patch-nsprpub_pr_src_misc_prdtoa_c 20 Dec 2005 23:44:00 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.2 2005/12/20 23:44:00 bernd Exp $
---- nsprpub/pr/src/misc/prdtoa.c.orig Thu Aug 18 19:24:37 2005
-+++ nsprpub/pr/src/misc/prdtoa.c Thu Nov 3 10:46:07 2005
-@@ -855,7 +855,7 @@ mult
- wc = wa + wb;
- if (wc > a->maxwds)
- k++;
-- c = Balloc(k);
-+ c = Balloc(k+2);
- for(x = c->x, xa = x + wc; x < xa; x++)
- *x = 0;
- xa = a->x;
Index: patches/patch-nsprpub_pr_src_misc_prinit_c
===================================================================
RCS file: patches/patch-nsprpub_pr_src_misc_prinit_c
diff -N patches/patch-nsprpub_pr_src_misc_prinit_c
--- patches/patch-nsprpub_pr_src_misc_prinit_c 20 Dec 2005 23:44:00 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.2 2005/12/20 23:44:00 bernd Exp $
---- nsprpub/pr/src/misc/prinit.c.orig Wed Apr 28 02:34:07 2004
-+++ nsprpub/pr/src/misc/prinit.c Sat Sep 10 09:47:32 2005
-@@ -433,6 +433,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
- _PR_LogCleanup();
-
- /*
-+ * accesses the current thread
-+ */
-+ _PR_CleanupNet();
-+ _PR_CleanupIO();
-+
-+ /*
- * This part should look like the end of _PR_NativeRunThread
- * and _PR_UserRunThread.
- */
-@@ -444,6 +450,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
- PR_DELETE(me->stack);
- PR_DELETE(me);
- }
-+ _PR_MD_SET_CURRENT_THREAD(NULL);
-
- /*
- * XXX: We are freeing the heap memory here so that Purify won't
-@@ -452,8 +459,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup()
- * Ideally, for each _PR_InitXXX(), there should be a corresponding
- * _PR_XXXCleanup() that we can call here.
- */
-- _PR_CleanupNet();
-- _PR_CleanupIO();
- #ifdef WINNT
- _PR_CleanupCPUs();
- #endif
Index: patches/patch-nsprpub_pr_src_misc_prnetdb_c
===================================================================
RCS file: patches/patch-nsprpub_pr_src_misc_prnetdb_c
diff -N patches/patch-nsprpub_pr_src_misc_prnetdb_c
--- patches/patch-nsprpub_pr_src_misc_prnetdb_c 20 Dec 2005 23:44:00 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.4 2005/12/20 23:44:00 bernd Exp $
---- nsprpub/pr/src/misc/prnetdb.c.orig Thu Aug 18 19:24:38 2005
-+++ nsprpub/pr/src/misc/prnetdb.c Sat Sep 10 09:47:32 2005
-@@ -2110,7 +2110,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
- */
- hints.ai_socktype = SOCK_STREAM;
-
-+ LOCK_DNS();
-+
- rv = GETADDRINFO(hostname, NULL, &hints, &res);
-+
-+ UNLOCK_DNS();
-+
- if (rv == 0)
- return (PRAddrInfo *) res;
-
Index: patches/patch-nsprpub_pr_src_pthreads_ptthread_c
===================================================================
RCS file: patches/patch-nsprpub_pr_src_pthreads_ptthread_c
diff -N patches/patch-nsprpub_pr_src_pthreads_ptthread_c
--- patches/patch-nsprpub_pr_src_pthreads_ptthread_c 20 Dec 2005 23:44:00 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-nsprpub_pr_src_pthreads_ptthread_c,v 1.2 2005/12/20 23:44:00 bernd Exp $
---- nsprpub/pr/src/pthreads/ptthread.c.orig Thu Aug 18 19:24:38 2005
-+++ nsprpub/pr/src/pthreads/ptthread.c Sat Sep 10 09:47:32 2005
-@@ -51,6 +51,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <signal.h>
-+#undef _POSIX_THREAD_PRIORITY_SCHEDULING
-
- /*
- * Record whether or not we have the privilege to set the scheduling
Index: patches/patch-security_coreconf_OpenBSD_mk
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk,v
retrieving revision 1.4
diff -u -r1.4 patch-security_coreconf_OpenBSD_mk
--- patches/patch-security_coreconf_OpenBSD_mk 20 Dec 2005 23:44:00 -0000 1.4
+++ patches/patch-security_coreconf_OpenBSD_mk 10 Nov 2006 20:25:04 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.4 2005/12/20 23:44:00 bernd Exp $
---- security/coreconf/OpenBSD.mk.orig Sun Apr 25 17:02:17 2004
-+++ security/coreconf/OpenBSD.mk Sat Sep 10 09:47:32 2005
+--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 11:02:17 2004
++++ security/coreconf/OpenBSD.mk Mon Nov 6 16:39:58 2006
@@ -37,12 +37,12 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@@ -27,7 +27,7 @@
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
-@@ -64,7 +64,7 @@ OS_LIBS =
+@@ -64,8 +64,9 @@ OS_LIBS =
ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
@@ -36,3 +36,5 @@
DSO_LDFLAGS =
MKSHLIB = $(CC) $(DSO_LDOPTS)
+
++NSPR_LIBS = $(shell pkg-config --libs nspr)
Index: patches/patch-security_manager_Makefile_in
===================================================================
RCS file: patches/patch-security_manager_Makefile_in
diff -N patches/patch-security_manager_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_manager_Makefile_in 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- security/manager/Makefile.in.orig Mon Nov 6 14:42:50 2006
++++ security/manager/Makefile.in Mon Nov 6 14:41:57 2006
+@@ -79,7 +79,7 @@ endif
+ # NSS makefiles are not safe for parallel execution.
+ DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
+ DEFAULT_GMAKE_FLAGS += CC="$(CC)"
+-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
++DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(NSPR_CFLAGS) -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
+ DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
+ DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
+ DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
Index: patches/patch-security_nss_Makefile
===================================================================
RCS file: patches/patch-security_nss_Makefile
diff -N patches/patch-security_nss_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_Makefile 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- security/nss/Makefile.orig Mon Nov 6 14:33:02 2006
++++ security/nss/Makefile Mon Nov 6 14:33:51 2006
+@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_coreconf build_nspr build_dbm all
++nss_build_all: build_coreconf build_dbm all
+
+ build_coreconf:
+ cd $(CORE_DEPTH)/coreconf ; $(MAKE)
Index: patches/patch-security_nss_cmd_pkiutil_platlibs_mk
===================================================================
RCS file: patches/patch-security_nss_cmd_pkiutil_platlibs_mk
diff -N patches/patch-security_nss_cmd_pkiutil_platlibs_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_cmd_pkiutil_platlibs_mk 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- security/nss/cmd/pkiutil/platlibs.mk.orig Mon Nov 6 18:34:15 2006
++++ security/nss/cmd/pkiutil/platlibs.mk Mon Nov 6 18:34:40 2006
+@@ -50,8 +50,6 @@ EXTRA_SHARED_LIBS += \
+ -L$(DIST)/lib/ \
+ -lnsspki3 \
+ -lnss3 \
+- -lplc4 \
+- -lplds4 \
+- -lnspr4 \
++ $(NSPR_LIBS) \
+ $(NULL)
+
Index: patches/patch-security_nss_cmd_platlibs_mk
===================================================================
RCS file: patches/patch-security_nss_cmd_platlibs_mk
diff -N patches/patch-security_nss_cmd_platlibs_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_cmd_platlibs_mk 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,26 @@
+$OpenBSD$
+--- security/nss/cmd/platlibs.mk.orig Mon Nov 6 17:57:12 2006
++++ security/nss/cmd/platlibs.mk Mon Nov 6 21:13:35 2006
+@@ -136,10 +136,7 @@ EXTRA_SHARED_LIBS += \
+ $(NULL)
+ else
+ EXTRA_SHARED_LIBS += \
+- -L$(DIST)/lib \
+- -lplc4 \
+- -lplds4 \
+- -lnspr4 \
++ $(NSPR_LIBS) \
+ $(NULL)
+ endif
+ endif
+@@ -222,9 +219,7 @@ EXTRA_SHARED_LIBS += \
+ -lssl3 \
+ -lsmime3 \
+ -lnss3 \
+- -lplc4 \
+- -lplds4 \
+- -lnspr4 \
++ $(NSPR_LIBS) \
+ $(NULL)
+
+ JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
Index: patches/patch-security_nss_lib_ckfw_builtins_Makefile
===================================================================
RCS file: patches/patch-security_nss_lib_ckfw_builtins_Makefile
diff -N patches/patch-security_nss_lib_ckfw_builtins_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_lib_ckfw_builtins_Makefile 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- security/nss/lib/ckfw/builtins/Makefile.orig Mon Nov 6 20:15:16 2006
++++ security/nss/lib/ckfw/builtins/Makefile Mon Nov 6 20:15:58 2006
+@@ -68,8 +68,8 @@ endif
+ else
+
+ EXTRA_LIBS += \
+- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
++ $(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
++ $(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ $(NULL)
+
+ endif
Index: patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile
===================================================================
RCS file: patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile
diff -N patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.orig Tue Nov 7 08:42:33 2006
++++ security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Tue Nov 7 08:44:01 2006
+@@ -98,8 +98,8 @@ EXTRA_LIBS += \
+ $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
+ $(CRYPTO_LIB) \
+ $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
++ $(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
++ $(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ $(NULL)
+
+ endif
Index: patches/patch-security_nss_lib_nss_config_mk
===================================================================
RCS file: patches/patch-security_nss_lib_nss_config_mk
diff -N patches/patch-security_nss_lib_nss_config_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_lib_nss_config_mk 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- security/nss/lib/nss/config.mk.orig Mon Nov 6 15:46:02 2006
++++ security/nss/lib/nss/config.mk Mon Nov 6 15:46:24 2006
+@@ -74,9 +74,7 @@ else
+ EXTRA_SHARED_LIBS += \
+ -L$(DIST)/lib/ \
+ -lsoftokn3 \
+- -lplc4 \
+- -lplds4 \
+- -lnspr4 \
++ $(NSPR_LIBS) \
+ $(NULL)
+
+ endif
Index: patches/patch-security_nss_lib_smime_config_mk
===================================================================
RCS file: patches/patch-security_nss_lib_smime_config_mk
diff -N patches/patch-security_nss_lib_smime_config_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_lib_smime_config_mk 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- security/nss/lib/smime/config.mk.orig Mon Nov 6 15:45:25 2006
++++ security/nss/lib/smime/config.mk Mon Nov 6 15:45:49 2006
+@@ -68,9 +68,7 @@ else
+ EXTRA_SHARED_LIBS += \
+ -L$(DIST)/lib/ \
+ -lnss3 \
+- -lplc4 \
+- -lplds4 \
+- -lnspr4 \
++ $(NSPR_LIBS) \
+ $(NULL)
+
+ ifeq ($(OS_ARCH), Darwin)
Index: patches/patch-security_nss_lib_softoken_config_mk
===================================================================
RCS file: patches/patch-security_nss_lib_softoken_config_mk
diff -N patches/patch-security_nss_lib_softoken_config_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_lib_softoken_config_mk 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- security/nss/lib/softoken/config.mk.orig Mon Nov 6 15:41:50 2006
++++ security/nss/lib/softoken/config.mk Mon Nov 6 15:45:13 2006
+@@ -80,10 +80,7 @@ else
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
+- -L$(DIST)/lib/ \
+- -lplc4 \
+- -lplds4 \
+- -lnspr4 \
++ $(NSPR_LIBS) \
+ $(NULL)
+ endif
+
Index: patches/patch-security_nss_lib_ssl_config_mk
===================================================================
RCS file: patches/patch-security_nss_lib_ssl_config_mk
diff -N patches/patch-security_nss_lib_ssl_config_mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-security_nss_lib_ssl_config_mk 10 Nov 2006 20:25:04 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- security/nss/lib/ssl/config.mk.orig Mon Nov 6 15:44:07 2006
++++ security/nss/lib/ssl/config.mk Mon Nov 6 15:44:53 2006
+@@ -73,9 +73,7 @@ else
+ EXTRA_SHARED_LIBS += \
+ -L$(DIST)/lib/ \
+ -lnss3 \
+- -lplc4 \
+- -lplds4 \
+- -lnspr4 \
++ $(NSPR_LIBS) \
+ $(NULL)
+
+ ifeq ($(OS_ARCH), BeOS)
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/www/mozilla-firefox/pkg/PFRAG.shared,v
retrieving revision 1.9
diff -u -r1.9 PFRAG.shared
--- pkg/PFRAG.shared 31 Dec 2005 18:35:56 -0000 1.9
+++ pkg/PFRAG.shared 10 Nov 2006 20:25:04 -0000
@@ -58,11 +58,8 @@
@lib mozilla-firefox/libgtkxtbin.so.${LIBgtkxtbin_VERSION}
@lib mozilla-firefox/libjsj.so.${LIBjsj_VERSION}
@lib mozilla-firefox/libmozjs.so.${LIBmozjs_VERSION}
[EMAIL PROTECTED] mozilla-firefox/libnspr4.so.${LIBnspr4_VERSION}
@lib mozilla-firefox/libnss3.so.${LIBnss3_VERSION}
@lib mozilla-firefox/libnssckbi.so.${LIBnssckbi_VERSION}
[EMAIL PROTECTED] mozilla-firefox/libplc4.so.${LIBplc4_VERSION}
[EMAIL PROTECTED] mozilla-firefox/libplds4.so.${LIBplds4_VERSION}
@lib mozilla-firefox/libsmime3.so.${LIBsmime3_VERSION}
@lib mozilla-firefox/libsoftokn3.so.${LIBsoftokn3_VERSION}
@lib mozilla-firefox/libssl3.so.${LIBssl3_VERSION}
