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

5 files changed, 26 insertions, 15 deletions

diff --git a/www/phoenix-bin/Makefile b/www/phoenix-bin/Makefile
index 0c052cb3c0d..5f23234e917 100644
--- a/www/phoenix-bin/Makefile
+++ b/www/phoenix-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2003/04/14 19:56:28 grant Exp $
+# $NetBSD: Makefile,v 1.2 2003/04/14 22:59:31 grant Exp $
 #
 
-DISTNAME=		phoenix-0.5-i686-pc-linux-gnu
+#DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
 PKGNAME=		phoenix-bin-0.5
 WRKSRC=			${WRKDIR}/phoenix
 CATEGORIES=		www
@@ -16,23 +16,25 @@ ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386
 CONFLICTS+=		phoenix-linux-[0-9]*
 
 NO_CONFIGURE=		# defined
+USE_PKGINSTALL=		YES
 
+FILES_SUBST+=		PLATFORM=${PLATFORM}
 PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
-PHOENIX_LIB=		${PREFIX}/lib/phoenix-linux
 
 do-build:
 
 post-build:
-	${SED} -e "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/phoenix.sh >	\
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/phoenix.sh > \
 		${WRKDIR}/phoenix.sh
 
 do-install:
 	${INSTALL_DATA_DIR} ${PHOENIX_LIB}
-	cd ${WRKSRC} && ${CP} -r . ${PHOENIX_LIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/phoenix.sh ${PREFIX}/bin/phoenix-linux
+	cd ${WRKSRC} && ${PAX} -rw -pm . ${PHOENIX_LIB}
+	${INSTALL_SCRIPT} ${WRKDIR}/phoenix.sh ${PREFIX}/bin/phoenix-${PLATFORM}
 
 post-install:
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
+	@${ECHO} bin/phoenix-${PLATFORM} >> ${PLIST_SRC}
 	@${FIND} ${PHOENIX_LIB} \( -type f -o -type l \) -print		\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
 		>> ${PLIST_SRC}
diff --git a/www/phoenix-bin/Makefile.Linux.i386 b/www/phoenix-bin/Makefile.Linux.i386
new file mode 100644
index 00000000000..1dec21e1809
--- /dev/null
+++ b/www/phoenix-bin/Makefile.Linux.i386
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.Linux.i386,v 1.1 2003/04/14 22:59:31 grant Exp $
+#
+
+DISTNAME=	phoenix-0.5-i686-pc-linux-gnu
+
+PLATFORM=	linux
+PHOENIX_LIB=    ${PREFIX}/lib/phoenix-${PLATFORM}
diff --git a/www/phoenix-bin/Makefile.NetBSD.i386 b/www/phoenix-bin/Makefile.NetBSD.i386
index bbd6dc18ba1..650c62b9521 100644
--- a/www/phoenix-bin/Makefile.NetBSD.i386
+++ b/www/phoenix-bin/Makefile.NetBSD.i386
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.1 2003/04/14 19:56:28 grant Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/04/14 22:59:31 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/phoenix-bin/PLIST b/www/phoenix-bin/PLIST
index a79e7c02be1..483f3b782ae 100644
--- a/www/phoenix-bin/PLIST
+++ b/www/phoenix-bin/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2003/04/14 19:56:28 grant Exp $
-bin/phoenix-linux
+@comment $NetBSD: PLIST,v 1.2 2003/04/14 22:59:31 grant Exp $
+@comment this PLIST intentionally left blank
diff --git a/www/phoenix-bin/files/phoenix.sh b/www/phoenix-bin/files/phoenix.sh
index 8652402c4f1..b6b26915a15 100644
--- a/www/phoenix-bin/files/phoenix.sh
+++ b/www/phoenix-bin/files/phoenix.sh
@@ -1,3 +1,3 @@
-#!/bin/sh
-# $NetBSD: phoenix.sh,v 1.1 2003/04/14 19:56:29 grant Exp $
-exec @PREFIX@/lib/phoenix-linux/phoenix "$@"
+#!@SH@
+# $NetBSD: phoenix.sh,v 1.2 2003/04/14 22:59:32 grant Exp $
+exec @PREFIX@/lib/phoenix-@PLATFORM@/phoenix "$@"