Unify all the mozilla projects into using a single Makefile.common and

INSTALL, and put it in seamonkey.
Ensure all build with USE_DESTDIR.
Bump PKGREVISIONs

5 files changed, 38 insertions, 49 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 2464095eeda..0615f2dd396 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2007/10/22 08:04:07 ghen Exp $
+# $NetBSD: Makefile,v 1.25 2009/03/18 00:08:40 abs Exp $
 
 MOZILLA=		seamonkey
-
+PKGREVISION=		1
 COMMENT=		Full featured gecko-based browser
 
 MOZILLA_USE_GTK2=	# yes
diff --git a/www/seamonkey/Makefile-seamonkey.common b/www/seamonkey/Makefile-seamonkey.common
index b278881b359..43831672835 100644
--- a/www/seamonkey/Makefile-seamonkey.common
+++ b/www/seamonkey/Makefile-seamonkey.common
@@ -1,29 +1,26 @@
-# $NetBSD: Makefile-seamonkey.common,v 1.22 2009/01/05 19:41:06 ghen Exp $
+# $NetBSD: Makefile-seamonkey.common,v 1.23 2009/03/18 00:08:40 abs Exp $
+# used by www/seamonkey/Makefile
+# used by www/seamonkey-gtk1/Makefile
 
 MOZILLA_BIN=		seamonkey-bin
 MOZ_VER=		1.1.14
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		seamonkey-${MOZ_DIST_VER}.source
-
-MASTER_SITES=		${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
 CATEGORIES=		www
+MASTER_SITES=		${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
 
 MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://www.mozilla.org/projects/seamonkey/
 
-
 DISTINFO_FILE=		${.CURDIR}/../../www/seamonkey/distinfo
 PATCHDIR=		${.CURDIR}/../../www/seamonkey/patches
 
 CONFIGURE_ARGS+=	--enable-application=suite
 
+USE_LANGUAGES+=		c++
 BUILD_SVG=		# yes
 BUILD_MATHML=		# yes
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
-CPPFLAGS+=		-DSQLITE_THREAD_OVERRIDE_LOCK=0
-.endif
+PKG_DESTDIR_SUPPORT=    user-destdir
 
 .include "../../www/seamonkey/Makefile.common"
diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common
index 8dcd1d2f857..38b7fae69d8 100644
--- a/www/seamonkey/Makefile.common
+++ b/www/seamonkey/Makefile.common
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.32 2009/02/18 10:51:40 abs Exp $
+# $NetBSD: Makefile.common,v 1.33 2009/03/18 00:08:40 abs Exp $
+# used by www/firefox/Makefile-firefox.common
 # used by mail/thunderbird/Makefile-thunderbird.common
 # used by www/seamonkey/Makefile-seamonkey.common
 # used by time/sunbird/Makefile-sunbird.common
@@ -6,8 +7,8 @@
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		seamonkey-${MOZ_DIST_VER}.source
 PKGNAME=		${MOZILLA}-${MOZ_VER}
-MASTER_SITES?=		${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
 CATEGORIES?=		www
+MASTER_SITES?=		${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
 
 FILESDIR=		${.CURDIR}/../../www/seamonkey/files
 
@@ -18,34 +19,28 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		autoconf213 gmake perl pkg-config
 GNU_CONFIGURE=		yes
 
+# Mozilla applications require the frame-pointer
+BUILDLINK_TRANSFORM+=	rm:-fomit-frame-pointer
+
 INSTALL_TEMPLATES+=	${.CURDIR}/../../www/seamonkey/INSTALL
 
-CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
-CONFIG_GUESS_OVERRIDE+=	nsprpub/build/autoconf/config.guess
-CONFIG_GUESS_OVERRIDE+=	directory/c-sdk/config/autoconf/config.guess
-CONFIG_SUB_OVERRIDE=	build/autoconf/config.sub
-CONFIG_SUB_OVERRIDE+=	nsprpub/build/autoconf/config.sub
-CONFIG_SUB_OVERRIDE+=	directory/c-sdk/config/autoconf/config.sub
+CONFIG_GUESS_OVERRIDE+=	*/*/*/config.guess */*/*/*/config.guess
+CONFIG_SUB_OVERRIDE+=	*/*/*/config.sub */*/*/*/config.sub
 CONFIG_STATUS_OVERRIDE=		build/config.status
 CONFIG_STATUS_OVERRIDE+=	nsprpub/config.status
 CONFIG_STATUS_OVERRIDE+=	directory/c-sdk/config.status
 
-PKGCONFIG_OVERRIDE+=	build/unix/${MOZILLA}-gtkmozembed.pc
-PKGCONFIG_OVERRIDE+=	build/unix/${MOZILLA}-js.pc
-PKGCONFIG_OVERRIDE+=	build/unix/${MOZILLA}-nspr.pc
-PKGCONFIG_OVERRIDE+=	build/unix/${MOZILLA}-nss.pc
-PKGCONFIG_OVERRIDE+=	build/unix/${MOZILLA}-plugin.pc
-PKGCONFIG_OVERRIDE+=	build/unix/${MOZILLA}-xpcom.pc
 # Some .pc files are filled in by the build process, so we can't fix the
 # rpaths until this has happened.
 PKGCONFIG_OVERRIDE_STAGE=	post-build
+PKGCONFIG_OVERRIDE+=   build/unix/*.pc
 
+CONFIGURE_ENV+=		ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
 CONFIGURE_ARGS+=	--disable-tests
 CONFIGURE_ARGS+=	--disable-pedantic
 CONFIGURE_ARGS+=	--with-system-jpeg=${BUILDLINK_PREFIX.jpeg:Q}
 CONFIGURE_ARGS+=	--with-system-png=${BUILDLINK_PREFIX.png:Q}
 CONFIGURE_ARGS+=	--enable-crypto
-CONFIGURE_ENV+=	ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
 
 SHAREMODE?=		644
 BUILD_TARGET=		# empty
@@ -53,29 +48,28 @@ BUILD_TARGET=		# empty
 UNLIMIT_RESOURCES=	datasize memorysize stacksize
 
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+
 .if defined(MOZILLA_USE_GTK2)
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-default-toolkit=gtk2 --disable-gnomevfs
 .else
-.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../net/ORBit/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-default-toolkit=gtk
 .endif
 
 # NetBSD-*-m68k builds, but "regchrome" dumps core.
 NOT_FOR_PLATFORM=	NetBSD-1.4.*-* NetBSD-*-m68k
 
-# Mozilla applications require the frame-pointer
-BUILDLINK_TRANSFORM+=	rm:-fomit-frame-pointer
-
 MAKE_ENV+=		MOZILLA_PKG_NAME=${MOZILLA:Q}
 
 MOZ_LIBDIR=		${PREFIX}/lib/${MOZILLA}
@@ -84,10 +78,7 @@ CONFIGURE_ENV+=		LIBRUNPATH=${MOZ_LIBDIR:Q}
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
 
 .if defined(BUILD_SVG)
-MAKE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
-CONFIGURE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
 CONFIGURE_ARGS+=	--enable-svg
-CONFIGURE_ARGS+=	--enable-svg-renderer-libart
 CONFIGURE_ARGS+=	--enable-svg-renderer=cairo
 .include "../../graphics/cairo/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-system-cairo
@@ -163,14 +154,17 @@ CONFIGURE_ARGS+=	--enable-optimize=${COPTS:Q}
 XPTCFILES+=		xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
 XPTCFILES+=		xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
 
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
+CPPFLAGS+=              -DSQLITE_THREAD_OVERRIDE_LOCK=0
+.endif
+
 .if ${OPSYS} == "Darwin"
 BUILDLINK_PASSTHRU_DIRS+=/Developer
 .endif
 
 post-extract:
-.for f in ${XPTCFILES}
-	${CP} ${FILESDIR:Q}/${f:Q} ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix/${f:Q}
-.endfor
+	cd ${FILESDIR:Q}						\
+	&& ${CP} ${XPTCFILES} ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix/
 
 pre-configure:
 	cd ${WRKSRC:Q} && autoconf
@@ -195,7 +189,7 @@ post-build:
 # do that part dynamically rather than trying to always keep our conditionals
 # up to date.  Note that the exact set of libfreebl libs has had a history
 # of changing even on minor releases.
-PLIST_SRC=      ${WRKDIR}/PLIST
+PLIST_SRC=	${WRKDIR}/PLIST
 pre-install:
 	cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \
 		${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl
@@ -210,13 +204,10 @@ pre-install:
 		${.CURDIR}/PLIST >> ${PLIST_SRC}
 
 do-install:
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR:Q}/moz-install
+	${SETENV} ${SCRIPTS_ENV} DESTDIR=${DESTDIR} ${SH} ${FILESDIR:Q}/moz-install
 
-.if !target(do-install)
 post-install:
-	${FIND} ${PREFIX}/lib/${MOZILLA}/defaults -type f -print | \
-	${XARGS} ${CHMOD} u+w
-.endif
+	${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \;
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST
index af4894fa98d..523bb89c1f6 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2008/07/05 12:04:38 ghen Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/03/18 00:08:40 abs Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -3043,8 +3043,8 @@ include/${MOZILLA}/nss/sslproto.h
 include/${MOZILLA}/nss/sslt.h
 include/${MOZILLA}/nss/watcomfx.h
 @comment end INCLUDE-PUBLIC
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
-@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
+@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
+@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/overlays.rdf
 @unexec ${RM} %D/lib/${MOZILLA}/chrome/stylesheets.rdf
diff --git a/www/seamonkey/files/moz-install b/www/seamonkey/files/moz-install
index 648f87a7931..257ed91f6d2 100755
--- a/www/seamonkey/files/moz-install
+++ b/www/seamonkey/files/moz-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: moz-install,v 1.7 2008/12/17 19:37:40 tnn Exp $
+# $NetBSD: moz-install,v 1.8 2009/03/18 00:08:40 abs Exp $
 
 ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
 ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
@@ -40,6 +40,7 @@ for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIS
 done
 
 # install PKGCONFIG
+${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
 for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`;
 	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i