factor out the common bits of the various mozilla binary packages into

mozilla-bin/Makefile.common and mozilla-bin-nightly/Makefile.common.

the result is much less duplication and more consistent installations.
tested on NetBSD-current only (for now).

7 files changed, 24 insertions, 128 deletions

diff --git a/www/MozillaFirebird-bin/MESSAGE.NetBSD b/www/MozillaFirebird-bin/MESSAGE.NetBSD
deleted file mode 100644
index dfa45cca4c6..00000000000
--- a/www/MozillaFirebird-bin/MESSAGE.NetBSD
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2003/09/27 14:13:08 grant Exp $
-
-	Mozilla Firebird requires your kernel to include 'COMPAT_LINUX'
-	(plus in NetBSD systems before 1.5 'EXEC_ELF32').
-
-	Please note that if you have INET6 enabled in your kernel, you
-	will need to set net.inet6.ip6.v6only=0, using sysctl(8).
-	
-===========================================================================
diff --git a/www/MozillaFirebird-bin/Makefile b/www/MozillaFirebird-bin/Makefile
index 49bf343e990..e1c0e5eb3db 100644
--- a/www/MozillaFirebird-bin/Makefile
+++ b/www/MozillaFirebird-bin/Makefile
@@ -1,77 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2003/12/30 16:53:35 cjep Exp $
-#
+# $NetBSD: Makefile,v 1.6 2004/01/04 05:01:03 grant Exp $
 
-DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
-PKGNAME=		MozillaFirebird-bin-${PKGVER}
-WRKSRC=			${WRKDIR}/MozillaFirebird
-CATEGORIES=		www
-MASTER_SITES=		http://ftp.mozilla.org/pub/firebird/releases/${PKGVER}/ \
-			ftp://ftp.mozilla.org/pub/firebird/releases/${PKGVER}/ \
-			http://public.planetmirror.com.au/pub/firebird/releases/${PKGVER}/ \
-			ftp://public.planetmirror.com.au/pub/firebird/releases/${PKGVER}/
+MOZILLA=	MozillaFirebird
 
-MAINTAINER=		grant@NetBSD.org
-HOMEPAGE=		http://www.mozilla.org/projects/firebird/
-COMMENT=		Lightweight gecko-based web browser (binary pkg)
-
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386 SunOS-5.[789]*-sparc SunOS-5.[89]*-i386
+HOMEPAGE=	http://www.mozilla.org/projects/firebird/
 
 # this package was formerly named "phoenix-linux", and "phoenix-bin".
-CONFLICTS+=		phoenix-linux-[0-9]*
-CONFLICTS+=		phoenix-bin-[0-9]*
-
-NO_CONFIGURE=		YES
-USE_PKGINSTALL=		YES
-
-.include "../../mk/bsd.prefs.mk"
-
-FILES_SUBST+=		PLATFORM=${PLATFORM}
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-do-build:
-
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/MozillaFirebird.sh > \
-		${WRKDIR}/MozillaFirebird.sh
-
-do-install:
-	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
-	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/MozillaFirebird.sh \
-		${PREFIX}/bin/MozillaFirebird-${PLATFORM}
-	@${RM} -f ${MOZILLA_LIB}/plugins/libnullplugin.so
-
-post-install:
-# this build wants exactly 'libgtk-1.2.so.0', etc.
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-	@cd ${MOZILLA_LIB} && \
-	${LN} -s ${PREFIX}/lib/libglib.*so* .;				\
-	${LN} -s ${PREFIX}/lib/libgmodule.*so* .;			\
-	${LN} -s ${X11PREFIX}/lib/libgdk.*so* .;			\
-	${LN} -s ${X11PREFIX}/lib/libgtk.*so* .;			\
-	${LN} -s libgtk.so libgtk-1.2.so.0;				\
-	${LN} -s libgdk.so libgdk-1.2.so.0;				\
-	${LN} -s libglib.so libglib-1.2.so.0;				\
-	${LN} -s libgmodule.so libgmodule-1.2.so.0
-
-.endif
-	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-	@${ECHO} bin/MozillaFirebird-${PLATFORM} >> ${PLIST_SRC}
-	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
-		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
-		>> ${PLIST_SRC}
-	@${FIND} ${MOZILLA_LIB} -type d -print				\
-		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
-		>> ${PLIST_SRC}
-
-.include "../../mk/bsd.prefs.mk"
-
-# everything specific to your OS/Arch goes into it's own Makefile
-# group together i386, i486, i586 and i686 (for Linux)
-ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g}
+CONFLICTS+=	phoenix-linux-[0-9]*
+CONFLICTS+=	phoenix-bin-[0-9]*
 
-.if exists(Makefile.${OPSYS}.${ARCH})
-.  include "Makefile.${OPSYS}.${ARCH}"
-.endif
+ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86 NetBSD-*-i386
+ONLY_FOR_PLATFORM+=	SunOS-5.[789]*-sparc SunOS-5.[89]*-i386
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../www/mozilla-bin/Makefile.common"
diff --git a/www/MozillaFirebird-bin/Makefile.Linux.i386 b/www/MozillaFirebird-bin/Makefile.Linux.i386
index 2095a1e1021..c0e9d955405 100644
--- a/www/MozillaFirebird-bin/Makefile.Linux.i386
+++ b/www/MozillaFirebird-bin/Makefile.Linux.i386
@@ -1,10 +1,6 @@
-# $NetBSD: Makefile.Linux.i386,v 1.4 2003/12/20 11:24:51 grant Exp $
-#
+# $NetBSD: Makefile.Linux.i386,v 1.5 2004/01/04 05:01:03 grant Exp $
 
-PKGVER=		0.7
-DISTNAME=	MozillaFirebird-${PKGVER}-i686-pc-linux-gnu
+MOZ_VER=	0.7
+DISTNAME=	MozillaFirebird-${MOZ_VER}-i686-pc-linux-gnu
 
-DEPENDS+=	gtk+>=1.2:../../x11/gtk
-
-PLATFORM=	linux
-MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
+MOZ_PLATFORM=	linux
diff --git a/www/MozillaFirebird-bin/Makefile.NetBSD.i386 b/www/MozillaFirebird-bin/Makefile.NetBSD.i386
index 6c7accde311..04cbcef468a 100644
--- a/www/MozillaFirebird-bin/Makefile.NetBSD.i386
+++ b/www/MozillaFirebird-bin/Makefile.NetBSD.i386
@@ -1,16 +1,6 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.4 2003/12/20 11:24:51 grant Exp $
-#
+# $NetBSD: Makefile.NetBSD.i386,v 1.5 2004/01/04 05:01:03 grant Exp $
 
-PKGVER=		0.7
-DISTNAME=	MozillaFirebird-${PKGVER}-i686-pc-linux-gnu
+MOZ_VER=	0.7
+DISTNAME=	MozillaFirebird-${MOZ_VER}-i686-pc-linux-gnu
 
-PLATFORM=	linux
-MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
-
-DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+=	suse_x11>=7.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=	suse_gtk>=7.3:../../emulators/${SUSE_DIR_PREFIX}_gtk
-
-CONFLICTS+=	suse_libc5-[0-9]*
-
-.include "../../emulators/suse_linux/Makefile.application"
+MOZ_PLATFORM=	linux
diff --git a/www/MozillaFirebird-bin/Makefile.SunOS.i386 b/www/MozillaFirebird-bin/Makefile.SunOS.i386
index a611641e6d9..8fdf5984241 100644
--- a/www/MozillaFirebird-bin/Makefile.SunOS.i386
+++ b/www/MozillaFirebird-bin/Makefile.SunOS.i386
@@ -1,11 +1,6 @@
-# $NetBSD: Makefile.SunOS.i386,v 1.2 2003/12/20 11:24:51 grant Exp $
-#
+# $NetBSD: Makefile.SunOS.i386,v 1.3 2004/01/04 05:01:03 grant Exp $
 
-PKGVER=		0.7
-DISTNAME=	MozillaFirebird-${PKGVER}-i386-pc-solaris2.8
-MASTER_SITES:=	${MASTER_SITES:S|$|contrib/|}
+MOZ_VER=	0.7
+DISTNAME=	MozillaFirebird-${MOZ_VER}-i386-pc-solaris2.8
 
-DEPENDS+=	gtk+>=1.2:../../x11/gtk
-
-PLATFORM=	${LOWER_OPSYS}
-MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
+MOZ_PLATFORM=	solaris
diff --git a/www/MozillaFirebird-bin/Makefile.SunOS.sparc b/www/MozillaFirebird-bin/Makefile.SunOS.sparc
index ba7ed28e356..04adc2a88cd 100644
--- a/www/MozillaFirebird-bin/Makefile.SunOS.sparc
+++ b/www/MozillaFirebird-bin/Makefile.SunOS.sparc
@@ -1,11 +1,6 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.3 2003/12/20 11:24:51 grant Exp $
-#
+# $NetBSD: Makefile.SunOS.sparc,v 1.4 2004/01/04 05:01:03 grant Exp $
 
-PKGVER=		0.6.1
-DISTNAME=	MozillaFirebird-${PKGVER}-sparc-sun-solaris2.7
-MASTER_SITES:=	${MASTER_SITES:S|$|contrib/|}
+MOZ_VER=	0.6.1
+DISTNAME=	MozillaFirebird-${MOZ_VER}-sparc-sun-solaris2.7
 
-DEPENDS+=	gtk+>=1.2:../../x11/gtk
-
-PLATFORM=	${LOWER_OPSYS}
-MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
+MOZ_PLATFORM=	solaris
diff --git a/www/MozillaFirebird-bin/files/MozillaFirebird.sh b/www/MozillaFirebird-bin/files/MozillaFirebird.sh
deleted file mode 100644
index 28fc5d1b27f..00000000000
--- a/www/MozillaFirebird-bin/files/MozillaFirebird.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!@SH@
-# $NetBSD: MozillaFirebird.sh,v 1.1 2003/09/27 14:13:08 grant Exp $
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-@PLATFORM@:@PREFIX@/lib"
-export LD_LIBRARY_PATH
-
-exec @PREFIX@/lib/MozillaFirebird-@PLATFORM@/MozillaFirebird "$@"