- Support Makefile.common in all mozilla ports

- Make all mozilla ports use system nss, nspr, and libm
  and some mozilla ports use system cairo
- Do a bunch of much needed catch-up and sync work on many mozilla ports
  such as libesd and cups patch, and many other misc patches
- This adds WITH_DEBUG/WITH_LOGGING to many mozilla ports that didn't
  have it before.
- Extend EXTRACT_AFTER_ARGS so everything will extract faster.

Todo:
        Sync thunderbird-devel with thunderbird THEN
        make it use Makefile.common


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

3 files changed, 33 insertions, 161 deletions

diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 10d140969..e6d52c39f 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/Makefile,v 1.12 2005/11/11 00:57:51 ahze Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.13 2005/11/12 02:06:57 ahze Exp $
 #
 
 PORTNAME=	firefox
@@ -19,96 +19,37 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 MAINTAINER=	gnome@FreeBSD.org
 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}
 
+WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 FAKEDIR=	${WRKDIR}/fake
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl desktopfileutils
-USE_ICONV=	yes
-USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 USE_GCC=	3.4+
-WRKSRC=		${WRKDIR}/mozilla
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-KRB5_HOME?=	/usr
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
-			--exclude */macbuild/*\
-			--exclude */package/* \
-			--exclude .cvsignore \
-			--exclude makefile.win \
-			--exclude mozilla/security/nss	\
-			--exclude */nsprpub/*	\
-			--exclude mozilla/gfx/cairo \
-			--exclude MANIFEST
-
-FIREFOX=	${PORTNAME}
+FIREFOX=	${MOZILLA}
 FF_SUFX=	# -devel
 FF=		${FIREFOX}${FF_SUFX}
 FF_VER=		1.5
-#FF_VER=	${PORTVERSION}
 
 FIREFOX_ICON=		${FF}.xpm
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/icons/default.xpm
 
-PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
-		firefox-plugin
-
-JPI_LIST?=\
-	${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
-	${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so
-
 SYSTEM_PREFS=		${FAKEDIR}/lib/${FF}/defaults/pref/firefox.js
 SCRIPTS_DIR=		${FAKEDIR}/lib/${FF}
 MOZ_PIS_SCRIPTS=	S50cleanhome
 MOZ_PIS_DIR=		${SCRIPTS_DIR}/init.d
-CPPFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${X11BASE}/lib
-LIBS+=		${PTHREAD_LIBS}
 
-OPTIONS=	DEBUG "Build a debugging image" off \
-		LOGGING "Enable additional log messages" off \
-		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
-		SMB "Enable smb:// URI support using gnomevfs" off \
-		NEWTAB "Open external links in a new tab" on
+OPTIONS=	NEWTAB "Open external links in a new tab" on
 
 .include <bsd.port.pre.mk>
-
-.if defined(WITH_DEBUG)
-WITH_LOGGING=		yes
-CONFIGURE_ENV+=		WITH_DEBUG=yes
-.endif # defined(WITH_DEBUG)
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS:=		-O2 -fno-strict-aliasing ${CFLAGS:N-O*}
-.else
-CFLAGS:=		-O ${CFLAGS:N-O*:N-m*}
-CONFIGURE_ENV+=		WITH_OPTIMIZE=-O
-.endif # defined(WITH_OPTIMIZED_CFLAGS)
-
-.if defined(WITH_LOGGING)
-CONFIGURE_ENV+=	WITH_LOGGING=yes
-.endif # defined(WITH_LOGGING)
-
-.if defined(WITH_SMB)
-USE_GNOME+=	gnomevfs2
-CONFIGURE_ENV+=	WITH_SMB=yes
-.endif # defined(WITH_SMB)
+.include "${.CURDIR}/../mozilla/Makefile.common"
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500035
 IGNORE=	core dumps on alpha during post-build
@@ -124,24 +65,10 @@ pre-extract::
 	@${ECHO_MSG}
 
 post-extract::
-	@${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|'		\
-		-e 's|@CFLAGS@|${CFLAGS}|'		\
-		-e 's|@LDFLAGS@|${LDFLAGS}|'		\
-		-e 's|@LIBS@|${LIBS}|'			\
-		-e 's|@X11BASE@|${X11BASE}|'		\
-		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
-		-e 's|@FAKEDIR@|${FAKEDIR}|'		\
-		-e 's|@PERL@|${PERL5}|'			\
-		-e 's|@KRB5_HOME@|${KRB5_HOME}|'		\
-		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
 		<${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 ; \
@@ -176,12 +103,6 @@ post-patch:
 		${WRKSRC}/${ii}/all.js
 .endfor
 
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${FALSE}; \
-	fi
-
 pre-install:
 	@${RM} -rf ${FAKEDIR} ${PLIST}
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in
index 305744c56..c4e584980 100644
--- a/www/firefox10/files/mozconfig.in
+++ b/www/firefox10/files/mozconfig.in
@@ -1,84 +1,10 @@
 # .mozconfig.in -*-shell-script-*-
 # $FreeBSD$
-#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.8 2005/11/11 00:57:52 ahze Exp $
+#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.9 2005/11/12 02:06:57 ahze Exp $
 ######################################################################
-# standard opts from README
 ac_add_options --enable-application=browser
-ac_add_options --enable-crypto
-ac_add_options --disable-tests
-ac_add_options --disable-mailnews
-ac_add_options --disable-composer
-ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-svg-renderer=cairo
+ac_add_options --enable-system-cairo
 # See the following URL for approval email for using official branding
 # http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
 ac_add_options --enable-official-branding
-######################################################################
-# FBSD specific
-export CPPFLAGS="@CPPFLAGS@"
-export CFLAGS="@CFLAGS@"
-export LIBS="@LIBS@"
-export LDFLAGS="@LDFLAGS@"
-export CONFIG_SH=/bin/sh
-export XP_UNIX=1
-mk_add_options XP_UNIX=1
-export PERL="@PERL@"
-mk_add_options PERL=$PERL
-# Configure options for installation
-ac_add_options --prefix=@FAKEDIR@
-ac_add_options --x-includes=@X11BASE@/include
-ac_add_options --x-libraries=@X11BASE@/lib
-######################################################################
-# Use ports for these libraries
-ac_add_options --with-system-jpeg=@LOCALBASE@
-ac_add_options --with-system-zlib
-ac_add_options --with-system-png=@LOCALBASE@
-ac_add_options --with-gssapi=@KRB5_HOME@
-ac_add_options --with-system-nspr
-ac_add_options --enable-system-cairo
-######################################################################
-# set compile/link features
-ac_add_options --with-pthreads
-######################################################################
-# disable unneeded/unavailable
-ac_add_options --disable-auto-deps
-ac_add_options --disable-bidi
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-jsd
-ac_add_options --disable-ldap
-ac_add_options --disable-pedantic
-ac_add_options --disable-profilesharing
-ac_add_options --disable-installer
-ac_add_options --enable-single-profile
-ac_add_options --disable-profilesharing
-ac_add_options --enable-image-decoders=png,gif,jpeg,bmp
-ac_add_options --enable-extensions="default"
-ac_add_options --enable-svg-renderer=cairo
-######################################################################
-# conditional from port Makefile
-#if test -n "$WITH_REORDER"; then
-#    ac_add_options --enable-reorder
-#else
-#    ac_add_options --disable-reorder
-#fi # test -n "$WITH_REORDER"
-if test -n "$WITH_DEBUG"; then
-    ac_add_options --enable-debug
-    ac_add_options --disable-strip
-else
-    ac_add_options --disable-debug
-    ac_add_options --enable-optimize=${WITH_OPTIMIZE}
-    ac_add_options --enable-strip
-fi # test -n "$WITH_DEBUG"
-if test -n "$WITH_LOGGING"; then
-    ac_add_options --enable-logging
-else
-    ac_add_options --disable-logging
-fi # test -n "$WITH_LOGGING"
-if test -z "$WITHOUT_XFT"; then
-    ac_add_options --enable-xft
-else
-    ac_add_options --disable-xft
-fi # test -z "$WITHOUT_XFT"
-if test -z "$WITH_SMB"; then
-    ac_add_options --disable-gnomevfs
-fi # test -z "$WITH_SMB"
-######################################################################
diff --git a/www/firefox10/files/patch-libm b/www/firefox10/files/patch-libm
new file mode 100644
index 000000000..7de64b2a5
--- /dev/null
+++ b/www/firefox10/files/patch-libm
@@ -0,0 +1,25 @@
+--- js/src/Makefile.in	Thu Aug  4 22:26:52 2005
++++ js/src/Makefile.in	Thu Aug  4 23:02:32 2005
+@@ -148,5 +148,4 @@
+ endif
+ 
+-FDLIBM_LIBRARY	= fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
+ JSMATH_PRELINK	= jsmathtemp.o
+ JS_SAFE_ARENA	= 1
+@@ -320,7 +319,4 @@
+ endif
+ 	@$(RM) -f $(JSMATH_PRELINK)
+-else
+-# Create dependency so we build fdlibm
+-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
+ endif
+ 
+--- js/Makefile.in	Sun Mar 23 14:36:00 2003
++++ js/Makefile.in	Thu Aug  4 23:08:06 2005
+@@ -46,5 +46,5 @@
+ #
+ 
+-DIRS		= src/fdlibm src
++DIRS		= src
+ 
+ include $(topsrcdir)/config/rules.mk