tidy up NetBSD/Linux support, ala phoenix-bin-nightly.

6 files changed, 29 insertions, 17 deletions

diff --git a/www/mozilla-bin/Makefile b/www/mozilla-bin/Makefile
index 257e95c48ab..c08f793b6fd 100644
--- a/www/mozilla-bin/Makefile
+++ b/www/mozilla-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2003/04/14 20:28:22 grant Exp $
+# $NetBSD: Makefile,v 1.2 2003/04/14 22:50:18 grant Exp $
 #
 
-DISTNAME=		mozilla-i686-pc-linux-gnu-1.3
+#DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
 PKGNAME=		mozilla-bin-1.3
 WRKSRC=			${WRKDIR}/mozilla
 CATEGORIES=		www
@@ -16,24 +16,25 @@ ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386
 CONFLICTS+=		mozilla-linux-[0-9]*
 
 NO_CONFIGURE=		# defined
+USE_PKGINSTALL=		YES
 
+FILES_SUBST+=		PLATFORM=${PLATFORM}
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 
-MOZILLA_LIB=		${PREFIX}/lib/mozilla-linux
-
 do-build:
 
 post-build:
-	${SED} -e "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/mozilla.sh >	\
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mozilla.sh > \
 		${WRKDIR}/mozilla.sh
 
 do-install:
 	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
-	cd ${WRKSRC} && ${CP} -r . ${MOZILLA_LIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/mozilla.sh ${PREFIX}/bin/mozilla-linux
+	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
+	${INSTALL_SCRIPT} ${WRKDIR}/mozilla.sh ${PREFIX}/bin/mozilla-${PLATFORM}
 
 post-install:
 	@${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}
diff --git a/www/mozilla-bin/Makefile.Linux.i386 b/www/mozilla-bin/Makefile.Linux.i386
new file mode 100644
index 00000000000..ea8651f33aa
--- /dev/null
+++ b/www/mozilla-bin/Makefile.Linux.i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.Linux.i386,v 1.1 2003/04/14 22:50:18 grant Exp $
+#
+
+DISTNAME=	mozilla-i686-pc-linux-gnu-1.3
+
+PLATFORM=	linux
+MOZILLA_LIB=	${PREFIX}/lib/mozilla-${PLATFORM}
diff --git a/www/mozilla-bin/Makefile.NetBSD.i386 b/www/mozilla-bin/Makefile.NetBSD.i386
index 5376effb67c..cda85a6a6d2 100644
--- a/www/mozilla-bin/Makefile.NetBSD.i386
+++ b/www/mozilla-bin/Makefile.NetBSD.i386
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1 2003/04/14 20:28:22 grant Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/04/14 22:50:18 grant Exp $
 #
 
-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
+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 "Makefile.Linux.i386"
 
 .include "../../emulators/suse_linux/Makefile.application"
diff --git a/www/mozilla-bin/PLIST b/www/mozilla-bin/PLIST
index 6168c9a75bf..8396ff5e821 100644
--- a/www/mozilla-bin/PLIST
+++ b/www/mozilla-bin/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2003/04/14 20:28:22 grant Exp $
-bin/mozilla-linux
+@comment $NetBSD: PLIST,v 1.2 2003/04/14 22:50:18 grant Exp $
+@comment this PLIST intentionally left blank
diff --git a/www/mozilla-bin/distinfo b/www/mozilla-bin/distinfo
index b52095e99ed..d3dd2ab56c4 100644
--- a/www/mozilla-bin/distinfo
+++ b/www/mozilla-bin/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1 2003/04/14 20:28:22 grant Exp $
+$NetBSD: distinfo,v 1.2 2003/04/14 22:50:18 grant Exp $
 
 SHA1 (mozilla-i686-pc-linux-gnu-1.3.tar.gz) = 03d7ffb028f89ad53a6ebc6056a8024df8bea5b8
 Size (mozilla-i686-pc-linux-gnu-1.3.tar.gz) = 13691482 bytes
+SHA1 (mozilla-sparc-sun-solaris2.8-1.3.tar.gz) = 13dd18df3fb96fe88fbe51a790e7d1b263227b37
+Size (mozilla-sparc-sun-solaris2.8-1.3.tar.gz) = 17585212 bytes
diff --git a/www/mozilla-bin/files/mozilla.sh b/www/mozilla-bin/files/mozilla.sh
index 16f3c629310..8cab235d9b0 100644
--- a/www/mozilla-bin/files/mozilla.sh
+++ b/www/mozilla-bin/files/mozilla.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
-# $NetBSD: mozilla.sh,v 1.1 2003/04/14 20:28:22 grant Exp $
-exec @PREFIX@/lib/mozilla-linux/mozilla "$@"
+#!@SH@
+# $NetBSD: mozilla.sh,v 1.2 2003/04/14 22:50:19 grant Exp $
+exec @PREFIX@/lib/mozilla-@PLATFORM@/mozilla "$@"