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, 25 insertions, 112 deletions

diff --git a/www/mozilla-bin-nightly/MESSAGE.NetBSD b/www/mozilla-bin-nightly/MESSAGE.NetBSD
deleted file mode 100644
index 4db2c15c19d..00000000000
--- a/www/mozilla-bin-nightly/MESSAGE.NetBSD
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1.1.1 2003/05/20 14:25:14 grant Exp $
-
-	Mozilla 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/mozilla-bin-nightly/Makefile b/www/mozilla-bin-nightly/Makefile
index 6c605725b67..5d1326ed4be 100644
--- a/www/mozilla-bin-nightly/Makefile
+++ b/www/mozilla-bin-nightly/Makefile
@@ -1,76 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2003/12/23 03:50:51 grant Exp $
-#
+# $NetBSD: Makefile,v 1.10 2004/01/04 05:01:03 grant Exp $
 
-DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
-PKGNAME=		mozilla-bin-${PKGVER}
-WRKSRC=			${WRKDIR}/mozilla
-CATEGORIES=		www
-MASTER_SITES=		http://ftp.mozilla.org/pub/mozilla/nightly/latest/
+MOZILLA=		mozilla
 
-MAINTAINER=		grant@NetBSD.org
-HOMEPAGE=		http://www.mozilla.org/
-COMMENT=		Full featured gecko-based browser (nightly binary pkg)
+ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86 NetBSD-*-i386
+ONLY_FOR_PLATFORM+=	SunOS-5.[789]*-sparc SunOS-5.[89]*-i386
 
-ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386 SunOS-5.[789]*-sparc
-
-DIST_SUBDIR=		${PKGNAME}
-NO_CHECKSUM=		# defined
-NO_CONFIGURE=		# defined
-NO_SRC_ON_FTP=		# defined
-
-USE_PKGINSTALL=		YES
-
-.include "../../mk/bsd.prefs.mk"
-
-PKGVER!=		${DATE} +%Y%m%d
-
-FILES_SUBST+=		PLATFORM=${PLATFORM}
-PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-
-do-build:
-
-post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mozilla.sh > ${WRKDIR}/mozilla.sh
-
-do-install:
-	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
-	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/mozilla.sh ${PREFIX}/bin/mozilla-${PLATFORM}
-	@${FIND} ${MOZILLA_LIB} -type f -print \
-		| ${XARGS} ${CHMOD} a+r
-	@${FIND} ${MOZILLA_LIB} \( -type f -o -perm -u+x \) -print \
-		| ${XARGS} ${CHMOD} a+rx
-	@${FIND} ${MOZILLA_LIB} -type d -print \
-		| ${XARGS} ${CHMOD} a+rx
-
-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/mozilla-${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}
-
-# 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}
-
-.if exists(Makefile.${OPSYS}.${ARCH})
-.  include "Makefile.${OPSYS}.${ARCH}"
-.endif
-
-.include "../../mk/bsd.pkg.mk"
+.include "../../www/mozilla-bin-nightly/Makefile.common"
diff --git a/www/mozilla-bin-nightly/Makefile.Linux.i386 b/www/mozilla-bin-nightly/Makefile.Linux.i386
index 35258afbe5b..852e0529dc4 100644
--- a/www/mozilla-bin-nightly/Makefile.Linux.i386
+++ b/www/mozilla-bin-nightly/Makefile.Linux.i386
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile.Linux.i386,v 1.3 2003/10/19 08:47:42 grant Exp $
-#
+# $NetBSD: Makefile.Linux.i386,v 1.4 2004/01/04 05:01:03 grant Exp $
 
 DISTNAME=	mozilla-i686-pc-linux-gnu
 
-DEPENDS+=	gtk+>=1.2:../../x11/gtk
-
-PLATFORM=	linux
-MOZILLA_LIB=	${PREFIX}/lib/mozilla-${PLATFORM}
+MOZ_PLATFORM=	linux
diff --git a/www/mozilla-bin-nightly/Makefile.NetBSD.i386 b/www/mozilla-bin-nightly/Makefile.NetBSD.i386
index da84a875438..ef0f338ee9c 100644
--- a/www/mozilla-bin-nightly/Makefile.NetBSD.i386
+++ b/www/mozilla-bin-nightly/Makefile.NetBSD.i386
@@ -1,13 +1,5 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/10/19 08:47:42 grant Exp $
-#
+# $NetBSD: Makefile.NetBSD.i386,v 1.3 2004/01/04 05:01:03 grant Exp $
 
 DISTNAME=	mozilla-i686-pc-linux-gnu
 
-PLATFORM=	linux
-MOZILLA_LIB=	${PREFIX}/lib/mozilla-${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
-
-.include "../../emulators/suse_linux/Makefile.application"
+MOZ_PLATFORM=	linux
diff --git a/www/mozilla-bin-nightly/Makefile.SunOS.sparc b/www/mozilla-bin-nightly/Makefile.SunOS.sparc
index 7bc7138eccf..853a0234f33 100644
--- a/www/mozilla-bin-nightly/Makefile.SunOS.sparc
+++ b/www/mozilla-bin-nightly/Makefile.SunOS.sparc
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.1 2003/06/11 17:43:15 grant Exp $
-#
+# $NetBSD: Makefile.SunOS.sparc,v 1.2 2004/01/04 05:01:03 grant Exp $
 
 DISTNAME=	mozilla-sparc-sun-solaris2.7
 
-DEPENDS+=	gtk+>=1.2:../../x11/gtk
-
-PLATFORM=	${LOWER_OPSYS}
-MOZILLA_LIB=	${PREFIX}/lib/mozilla-${PLATFORM}
+MOZ_PLATFORM=	solaris
diff --git a/www/mozilla-bin-nightly/Makefile.common b/www/mozilla-bin-nightly/Makefile.common
new file mode 100644
index 00000000000..75247dc5b41
--- /dev/null
+++ b/www/mozilla-bin-nightly/Makefile.common
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile.common,v 1.1 2004/01/04 05:01:03 grant Exp $
+
+MASTER_SITES=	http://ftp.mozilla.org/pub/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ \
+		ftp://ftp.mozilla.org/pub/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/
+
+DIST_SUBDIR=	${PKGNAME}
+NO_CHECKSUM=	# defined
+NO_SRC_ON_FTP=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+MOZ_VER!=	${DATE} +%Y%m%d
+
+.include "../../www/mozilla-bin/Makefile.common"
diff --git a/www/mozilla-bin-nightly/files/mozilla.sh b/www/mozilla-bin-nightly/files/mozilla.sh
deleted file mode 100644
index 42c1cf7f5ee..00000000000
--- a/www/mozilla-bin-nightly/files/mozilla.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!@SH@
-# $NetBSD: mozilla.sh,v 1.3 2003/07/18 07:31:17 grant Exp $
-
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/mozilla-@PLATFORM@:@PREFIX@/lib"
-export LD_LIBRARY_PATH
-
-exec @PREFIX@/lib/mozilla-@PLATFORM@/mozilla "$@"