- Use system nss and nspr

Requested by:	marcus


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5100 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 28 insertions, 62 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 4084bf0eb..7f11ca352 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/Makefile,v 1.11 2005/11/11 00:15:47 ahze Exp $
 #
 
 PORTNAME=	firefox
 DISTVERSION=	1.5rc2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -20,6 +21,8 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
+		nspr4:${PORTSDIR}/devel/nspr \
+		nss3:${PORTSDIR}/security/nss \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 RUN_DEPENDS=	Xvfb:${X_VFBSERVER_PORT}
@@ -48,6 +51,8 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */package/* \
 			--exclude .cvsignore \
 			--exclude makefile.win \
+			--exclude mozilla/security/nss	\
+			--exclude */nsprpub/*	\
 			--exclude MANIFEST
 
 FIREFOX=	${PORTNAME}
@@ -60,7 +65,7 @@ FIREFOX_ICON=		${FF}.xpm
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/icons/default.xpm
 
 PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
-		firefox-nspr firefox-nss firefox-plugin
+		firefox-plugin
 
 JPI_LIST?=\
 	${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
@@ -132,6 +137,10 @@ post-extract::
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${FF}.desktop
 
 post-patch:
+	@${REINPLACE_CMD} -e  's/%{idldir}/%idldir%/g ; \
+		s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \
+		s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \
+			${WRKSRC}/build/unix/mozilla-config.in
 	@${REINPLACE_CMD} -e 's|%%FIREFOX%%|${FF}|' \
 		${WRKSRC}/config/autoconf.mk.in
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FF}|g ; \
@@ -150,10 +159,8 @@ post-patch:
 		${WRKSRC}/build/unix/run-mozilla.sh
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/nsprpub/configure
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
 		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in
index 99d3d7817..08292ce9d 100644
--- a/www/firefox/files/mozconfig.in
+++ b/www/firefox/files/mozconfig.in
@@ -1,6 +1,6 @@
 # .mozconfig.in -*-shell-script-*-
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.7 2005/11/11 00:15:48 ahze Exp $
 ######################################################################
 # standard opts from README
 ac_add_options --enable-application=browser
@@ -32,8 +32,8 @@ ac_add_options --x-libraries=@X11BASE@/lib
 ac_add_options --with-system-jpeg=@LOCALBASE@
 ac_add_options --with-system-zlib
 ac_add_options --with-system-png=@LOCALBASE@
-ac_add_options --without-system-nspr
 ac_add_options --with-gssapi=@KRB5_HOME@
+ac_add_options --with-system-nspr
 ######################################################################
 # set compile/link features
 ac_add_options --with-pthreads
diff --git a/www/firefox/files/patch-nspr-unix.c b/www/firefox/files/patch-nspr-unix.c
deleted file mode 100644
index 1687c4a2e..000000000
--- a/www/firefox/files/patch-nspr-unix.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-  $MCom$
-
---- nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
-+++ nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
-@@ -65,7 +65,8 @@
-  * PRInt32* pointer to a _PRSockLen_t* pointer.
-  */
- #if defined(HAVE_SOCKLEN_T) \
--    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
-+    || defined(FREEBSD)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-     || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -73,7 +74,7 @@
-     || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
-     || defined(NEXTSTEP) || defined(QNX)
- #define _PRSockLen_t int
--#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-+#elif (defined(AIX) && !defined(AIX4_1)) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
-     || defined(DGUX) || defined(VMS) || defined(NTO)
- #define _PRSockLen_t size_t
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 4084bf0eb..7f11ca352 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/Makefile,v 1.11 2005/11/11 00:15:47 ahze Exp $
 #
 
 PORTNAME=	firefox
 DISTVERSION=	1.5rc2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -20,6 +21,8 @@ COMMENT=	Web browser based on the browser portion of Mozilla
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
+		nspr4:${PORTSDIR}/devel/nspr \
+		nss3:${PORTSDIR}/security/nss \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 RUN_DEPENDS=	Xvfb:${X_VFBSERVER_PORT}
@@ -48,6 +51,8 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */package/* \
 			--exclude .cvsignore \
 			--exclude makefile.win \
+			--exclude mozilla/security/nss	\
+			--exclude */nsprpub/*	\
 			--exclude MANIFEST
 
 FIREFOX=	${PORTNAME}
@@ -60,7 +65,7 @@ FIREFOX_ICON=		${FF}.xpm
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/icons/default.xpm
 
 PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
-		firefox-nspr firefox-nss firefox-plugin
+		firefox-plugin
 
 JPI_LIST?=\
 	${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
@@ -132,6 +137,10 @@ post-extract::
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${FF}.desktop
 
 post-patch:
+	@${REINPLACE_CMD} -e  's/%{idldir}/%idldir%/g ; \
+		s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \
+		s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \
+			${WRKSRC}/build/unix/mozilla-config.in
 	@${REINPLACE_CMD} -e 's|%%FIREFOX%%|${FF}|' \
 		${WRKSRC}/config/autoconf.mk.in
 	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FF}|g ; \
@@ -150,10 +159,8 @@ post-patch:
 		${WRKSRC}/build/unix/run-mozilla.sh
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/nsprpub/configure
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/nsprpub/config/config.mk \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
 		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in
index 99d3d7817..08292ce9d 100644
--- a/www/firefox10/files/mozconfig.in
+++ b/www/firefox10/files/mozconfig.in
@@ -1,6 +1,6 @@
 # .mozconfig.in -*-shell-script-*-
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.7 2005/11/11 00:15:48 ahze Exp $
 ######################################################################
 # standard opts from README
 ac_add_options --enable-application=browser
@@ -32,8 +32,8 @@ ac_add_options --x-libraries=@X11BASE@/lib
 ac_add_options --with-system-jpeg=@LOCALBASE@
 ac_add_options --with-system-zlib
 ac_add_options --with-system-png=@LOCALBASE@
-ac_add_options --without-system-nspr
 ac_add_options --with-gssapi=@KRB5_HOME@
+ac_add_options --with-system-nspr
 ######################################################################
 # set compile/link features
 ac_add_options --with-pthreads
diff --git a/www/firefox10/files/patch-nspr-unix.c b/www/firefox10/files/patch-nspr-unix.c
deleted file mode 100644
index 1687c4a2e..000000000
--- a/www/firefox10/files/patch-nspr-unix.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$FreeBSD$
-  $MCom$
-
---- nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
-+++ nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
-@@ -65,7 +65,8 @@
-  * PRInt32* pointer to a _PRSockLen_t* pointer.
-  */
- #if defined(HAVE_SOCKLEN_T) \
--    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
-+    || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
-+    || defined(FREEBSD)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-     || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -73,7 +74,7 @@
-     || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
-     || defined(NEXTSTEP) || defined(QNX)
- #define _PRSockLen_t int
--#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-+#elif (defined(AIX) && !defined(AIX4_1)) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
-     || defined(DGUX) || defined(VMS) || defined(NTO)
- #define _PRSockLen_t size_t