- 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, 41 insertions, 132 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index ca7e55e35..8ab70ce7f 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,7 +3,7 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom: ports/www/seamonkey/Makefile,v 1.26 2005/11/11 08:00:02 ahze Exp $
+#    $MCom: ports/www/seamonkey/Makefile,v 1.27 2005/11/11 09:03:26 ahze Exp $
 #
 
 PORTNAME?=	seamonkey
@@ -18,104 +18,38 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.5:${PORTSDIR}/graphics/png \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft \
-		nspr4:${PORTSDIR}/devel/nspr \
-		nss3:${PORTSDIR}/security/nss \
-		svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
+LIB_DEPENDS=	svg-cairo.1:${PORTSDIR}/graphics/libsvg-cairo
 
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-WRKSRC=		${WRKDIR}/mozilla
 MOZILLA?=	seamonkey
 MOZ_SUFX?=	# empty (for now)
 MOZ_VER?=	1.5a
-LATEST_LINK=	${MOZILLA}
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
-			--exclude */macbuild/*\
-			--exclude */package/* \
-			--exclude .cvsignore \
-			--exclude */nsprpub/*	\
-			--exclude makefile.win \
-			--exclude MANIFEST
-USE_GNOME=	gtk20 libidl desktopfileutils
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_PERL5=	yes
-USE_ICONV=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=	default
-FAKEDIR=	${WRKDIR}/fake
 SCRIPTS_DIR=	${FAKEDIR}/lib/${MOZILLA}
 MOZ_PIS_DIR=	${SCRIPTS_DIR}/init.d
 MOZ_PIS_SCRIPTS=	S50cleanhome
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/cairo"
-CONFIGURE_ARGS=	--with-system-nspr		\
-		--disable-auto-deps		\
-		--enable-chrome-format=jar	\
-		--disable-cpp-exceptions	\
-		--disable-cpp-rtti		\
-		--enable-crypto			\
-		--disable-gtktest		\
-		--disable-freetypetest		\
-		--disable-installer		\
-		--disable-glibtest		\
-		--enable-double-buffer		\
-		--enable-mathml			\
-		--disable-md			\
-		--disable-pedantic		\
-		--disable-bidi			\
-		--disable-plaintext-editor-only	\
-		--enable-svg			\
-		--disable-tests			\
-		--disable-xterm-updates		\
-		--enable-xinerama		\
-		--with-system-zlib		\
-		--with-system-jpeg=${LOCALBASE}	\
-		--with-system-png=${LOCALBASE}	\
-		--with-gssapi=/usr		\
-		--prefix=${FAKEDIR}		\
-		--with-pthreads			\
-		--enable-application=suite 	\
-		--enable-xft 			\
-		--disable-freetype2 		\
-		--enable-default-toolkit=gtk2 	\
-		--enable-svg-renderer-cairo	\
-		--enable-system-cairo		\
-		--enable-cairo
 
-PLIST=		${WRKDIR}/pkg-plist
 MOZ_EXTENSIONS=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
-ESD_LIB=	libesd.so.2
-FREETYPE_LIB=	libfreetype.so.9
-PKGCONFIG_FILES=seamonkey-gtkmozembed seamonkey-js seamonkey-xpcom \
-		seamonkey-plugin
-
-# JPI stuff.  List paths to Java Plug-ins here in the order to try.
-JPI_LIST?=\
-	${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \
-	${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
-	${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
-	${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
-
 OPTIONS=MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
-	DEBUG "Enable debugging (i.e. gdb) support" off \
 	LDAP "Enable LDAP support for Mailnews" on \
 	CHATZILLA "Enable the Chatzilla IRC module" on \
-	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \
-	OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \
-	SMB "Enable smb:// URI support via gnomevfs" off
+	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off
 
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../mozilla/Makefile.common"
 
+LATEST_LINK=	${MOZILLA}
 .if exists(${LOCALBASE}/include/cairo/cairo-glitz.h)
 # Glitz support can only be enabled if cairo is built with glitz support
 CONFIGURE_ARGS+=--enable-glitz
@@ -130,29 +64,10 @@ LIB_DEPENDS+=	glitz.1:${PORTSDIR}/graphics/glitz
 IGNORE=		core dumps on ${ARCH} during post-build
 .endif
 
-.if exists(${X11BASE}/lib/X11/fonts/mozilla/fonts.dir)
-BROKEN="Mozilla${MOZ_SUFX} and Xft2 render the mozilla-fonts \
-	illegibly. Please remove the mozilla-fonts package"
-.endif
-
-#.if defined(WITH_CALENDAR) && (defined(WITHOUT_MAILNEWS) || \
-#	defined(WITHOUT_COMPOSER))
-#BROKEN=		Calendar requires Composer and Mailnews support.
-#.endif
-
 .if ${OSVERSION} < 500000
 USE_GCC=	3.4+
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug \
-			--disable-strip
-.else
-CONFIGURE_ARGS+=	--disable-debug \
-			--enable-strip
-.endif
-
-# LDAP is only used by mail and news so disable both together
 .if defined(WITHOUT_MAILNEWS)
 CONFIGURE_ARGS+=	--disable-ldap --disable-mailnews
 .else
@@ -176,9 +91,9 @@ CONFIGURE_ARGS+=	--disable-jsd \
 			--disable-dtd-debug
 .endif
 
-#.if defined(WITH_CALENDAR)
-#CONFIGURE_ARGS+=	--enable-calendar
-#.endif
+.if defined(WITH_CALENDAR)
+CONFIGURE_ARGS+=	--enable-calendar
+.endif
 
 .if defined(WITHOUT_COMPOSER)
 CONFIGURE_ARGS+=	--disable-composer
@@ -188,42 +103,16 @@ CONFIGURE_ARGS+=	--disable-composer
 CONFIGURE_ARGS+=	--enable-reorder
 .endif
 
-.if defined(WITH_SMB)
-USE_GNOME+=	gnomevfs2
-.else
-CONFIGURE_ARGS+=--disable-gnomevfs
-.endif
-
-.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
-
 post-patch:
-	  @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \
-		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
-	@${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/%{idldir}/%idldir%/g' \
-		${WRKSRC}/build/unix/mozilla-config.in
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/build/unix/run-mozilla.sh
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
 		-e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \
 			${WRKSRC}/config/autoconf.mk.in
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
 		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|libesd\.so\.0|${ESD_LIB}|g' \
-		${WRKSRC}/widget/src/gtk2/nsSound.cpp
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
@@ -232,21 +121,10 @@ post-patch:
 		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
 	@${REINPLACE_CMD} -e 's|libfreetype.so.6|${FREETYPE_LIB}|g' \
 		${WRKSRC}/modules/libpref/src/init/all.js
-#	@for pcfile in ${PKGCONFIG_FILES}; do \
-#		${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \
-#			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \
-#			${WRKSRC}/build/unix/$${pcfile}.pc.in; \
-#	done
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/seamonkey.desktop
 
-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
-
 post-build:
 	${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \
 		${FILESDIR}/seamonkey.sh >${WRKSRC}/${MOZILLA}
@@ -260,7 +138,6 @@ pre-install:
 	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
 		${FAKEDIR}/bin/seamonkey \
 		${FAKEDIR}/bin/seamonkey-config
-		${ECHO_CMD} bin/mozilla >> ${PLIST} ; \
 	${ECHO_CMD} bin/${MOZILLA} >> ${PLIST}
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
diff --git a/www/seamonkey/files/mozconfig.in b/www/seamonkey/files/mozconfig.in
new file mode 100644
index 000000000..b6c50de65
--- /dev/null
+++ b/www/seamonkey/files/mozconfig.in
@@ -0,0 +1,7 @@
+# .mozconfig.in -*-shell-script-*-
+# $FreeBSD$
+#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.9 2005/11/12 02:06:57 ahze Exp $
+######################################################################
+ac_add_options --enable-application=suite
+ac_add_options --enable-svg-renderer=cairo
+ac_add_options --enable-system-cairo
diff --git a/www/seamonkey/files/patch-libm b/www/seamonkey/files/patch-libm
new file mode 100644
index 000000000..7de64b2a5
--- /dev/null
+++ b/www/seamonkey/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