Clean up this port, including GCing old configure options and making patches

more acceptable to mozilla.org.  Hopefully these will make it into 0.9.9.

Add a hack to minimise the number of files extracted.

Merge in the patches from the mozilla+ipv6 port.

Submitted by:	sumikawa (mozilla+ipv6)

1 files changed, 26 insertions, 25 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 0d1197ee8e74..3f5ee1cf1797 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -28,58 +29,58 @@ LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
+EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_NEWGCC=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=					\
+		--disable-auto-deps		\
+		--enable-chrome-format=jar	\
 		--disable-cpp-exceptions	\
 		--disable-cpp-rtti		\
-		--disable-debug			\
-		--disable-idltool		\
-		--disable-md			\
-		--disable-pedantic		\
-		--disable-xterm-updates		\
 		--enable-crypto			\
+		--disable-debug			\
+		--enable-default-toolkit=gtk	\
 		--enable-double-buffer		\
-		--enable-editor			\
+		--enable-dtd-debug		\
+		--enable-jsd			\
+		--enable-ldap			\
 		--enable-mailnews		\
 		--enable-mathml			\
-		--enable-optimize="${CFLAGS}"	\
-		--enable-pics			\
+		--disable-md			\
+		--disable-optimize		\
+		--disable-pedantic		\
+		--disable-plaintext-editor-only	\
+		--enable-reorder		\
+		--enable-strip			\
 		--enable-svg			\
-		--enable-tests			\
-		--enable-toolkit=gtk		\
-		--enable-x11-shm		\
-		--enable-chrome-format=jar	\
-		--with-jpeg=${LOCALBASE}	\
-		--with-png=${LOCALBASE}		\
-		--with-mng=${LOCALBASE}		\
+		--disable-tests			\
+		--disable-xterm-updates		\
+		--enable-xinerama		\
+		--with-system-jpeg=${LOCALBASE}	\
+		--with-system-mng=${LOCALBASE}	\
+		--with-system-png=${LOCALBASE}	\
 		--with-pthreads
 .if !defined(WITHOUT_CHATZILLA)
 CONFIGURE_ARGS+=	--with-extensions=default,irc
 .endif
-CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		CFLAGS="" CXXFLAGS="" \
-		MOZ_INTERNAL_LIBART_LGPL=1
+CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
-		CFLAGS="" CXXFLAGS="" \
-		MALLOC_OPTIONS=j \
 		MOZ_INTERNAL_LIBART_LGPL=1
 ALL_TARGET=	default
 
 post-build:
-	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
+	${SED} -e "s;@PREFIX@;${PREFIX};g" \
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
-	@(cd ${WRKSRC}/dist/bin; \
+	(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
 	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
 	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
-	@/usr/bin/find ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
-		/usr/bin/xargs ${RMDIR} 2> /dev/null || ${TRUE}
+	${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
+		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
 
 do-install:
 	${MKDIR} ${PREFIX}/lib/mozilla