Move code that generates a dynamic PLIST from the {pre,do,post}-install

targets and into a GENERATE_PLIST variable definition.  Remove some
unnecessary empty PLISTs as a result of properly setting GENERATE_PLIST.

6 files changed, 9 insertions, 21 deletions

diff --git a/www/firefox-bin-nightly/PLIST b/www/firefox-bin-nightly/PLIST
deleted file mode 100644
index 3f7f6d5b891..00000000000
--- a/www/firefox-bin-nightly/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:02 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/www/firefox-bin/PLIST b/www/firefox-bin/PLIST
deleted file mode 100644
index 25b1a224a99..00000000000
--- a/www/firefox-bin/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2007/10/25 17:50:02 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/www/firefox15-bin/PLIST b/www/firefox15-bin/PLIST
deleted file mode 100644
index 3f7f6d5b891..00000000000
--- a/www/firefox15-bin/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:02 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/www/seamonkey-bin-nightly/PLIST b/www/seamonkey-bin-nightly/PLIST
deleted file mode 100644
index 4a961c24896..00000000000
--- a/www/seamonkey-bin-nightly/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:03 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/www/seamonkey-bin/Makefile.common b/www/seamonkey-bin/Makefile.common
index 4eae4aa0bf6..b3f2e101404 100644
--- a/www/seamonkey-bin/Makefile.common
+++ b/www/seamonkey-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2007/10/19 10:53:00 ghen Exp $
+# $NetBSD: Makefile.common,v 1.10 2007/10/25 21:04:25 jlam Exp $
 
 DISTNAME=		${MOZILLA}${MOX_EXTRA}-bin	# overridden below
 PKGNAME=		${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER}
@@ -61,7 +61,6 @@ MOZILLA_LIB=	${PREFIX}/lib/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM}
 FILES_SUBST+=	MOZILLA=${MOZILLA:Q}
 FILES_SUBST+=	MOZ_EXTRA=${MOZ_EXTRA:Q}
 FILES_SUBST+=	MOZ_PLATFORM=${MOZ_PLATFORM:Q}
-PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 
 INSTALLATION_DIRS=	bin
 
@@ -130,14 +129,13 @@ post-install:
 .  endif
 .endif
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/mozilla-linux/plugins
-	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-	@${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_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}
-	@${ECHO} @exec ${MKDIR} %D/lib/mozilla-linux/plugins >> ${PLIST_SRC}
+
+GENERATE_PLIST+=							\
+	${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM};		\
+	${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
+		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g";		\
+	${FIND} ${MOZILLA_LIB} -type d -print				\
+		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g";	\
+	${ECHO} "@exec ${MKDIR} %D/lib/mozilla-linux/plugins";
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey-bin/PLIST b/www/seamonkey-bin/PLIST
deleted file mode 100644
index 4a961c24896..00000000000
--- a/www/seamonkey-bin/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:50:03 jlam Exp $
-@comment this plist intentionally left empty