Convert to use PLIST_VARS instead of manually passing "@comment "

through PLIST_SUBST to the plist module.

4 files changed, 37 insertions, 41 deletions

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
index 3048c179211..7dff607c5bb 100644
--- a/archivers/gtar-base/Makefile
+++ b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2008/04/02 22:03:07 tonnerre Exp $
+# $NetBSD: Makefile,v 1.62 2008/04/12 22:42:57 jlam Exp $
 
 DISTNAME=	tar-1.15.1
 PKGNAME=	gtar-base-1.15.1
@@ -43,20 +43,17 @@ CONFIGURE_ENV+=		gt_cv_func_gnugettext2_libintl=yes
 PLIST_SUBST+=		GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 BUILD_DEFS+=		GTAR_PROGRAM_PREFIX
+PLIST_VARS+=		gtar rmt
 
 TEST_TARGET=		check
 
 .if ${GTAR_PROGRAM_PREFIX} != "g"
-PLIST_SUBST+=		IF_BIN_GTAR=""
-.else
-PLIST_SUBST+=		IF_BIN_GTAR="@comment "
+PLIST.gtar=		yes
 .endif
 
 # don't include rmt if gtar won't build it
 .if ${OPSYS} != "Interix"
-PLIST_SUBST+=		IF_LIBEXEC_RMT=""
-.else
-PLIST_SUBST+=		IF_LIBEXEC_RMT="@comment "
+PLIST.rmt=		yes
 .endif
 
 post-install:
diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST
index c067fc13672..8283733b3b7 100644
--- a/archivers/gtar-base/PLIST
+++ b/archivers/gtar-base/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.11 2006/04/17 07:07:11 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:42:57 jlam Exp $
 bin/${GTAR_PROGRAM_PREFIX}tar
-${IF_BIN_GTAR}bin/gtar
-${IF_LIBEXEC_RMT}libexec/${GTAR_PROGRAM_PREFIX}rmt
+${PLIST.gtar}bin/gtar
+${PLIST.rmt}libexec/${GTAR_PROGRAM_PREFIX}rmt
 man/man1/${GTAR_PROGRAM_PREFIX}tar.1
 share/locale/cs/LC_MESSAGES/tar.mo
 share/locale/da/LC_MESSAGES/tar.mo
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index b670a583d19..5137db46174 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/04/07 17:48:14 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2008/04/12 22:42:57 jlam Exp $
 
 DISTNAME=	p7zip_4.57_src_all
 PKGNAME=	p7zip-4.57
@@ -18,14 +18,13 @@ MAKE_FILE=		makefile
 MAKE_JOBS_SAFE=		no # missing header when compiling sfx
 NO_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
+PLIST_VARS=		dll
 
 # compiles, but does not recognize any archives as supported
 DYNAMIC_7Z=		NO
 .if !empty(DYNAMIC_7Z:MYES)
 BUILD_TARGET=		all2
-PLIST_SUBST+=		DYNAMIC_7Z=""
-.else
-PLIST_SUBST+=		DYNAMIC_7Z="@comment "
+PLIST.dll=		yes
 .endif
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/-/_/}
diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST
index 49a4982c8dc..2c4f8dc25ab 100644
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST,v 1.13 2007/12/16 09:25:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:42:57 jlam Exp $
 bin/7z
 bin/7za
-${DYNAMIC_7Z}lib/7z/7z
-${DYNAMIC_7Z}lib/7z/Codecs/7zAES.dll
-${DYNAMIC_7Z}lib/7z/Codecs/AES.dll
-${DYNAMIC_7Z}lib/7z/Codecs/BZip2.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Branch.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Copy.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Deflate.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Implode.dll
-${DYNAMIC_7Z}lib/7z/Codecs/LZMA.dll
-${DYNAMIC_7Z}lib/7z/Codecs/PPMD.dll
-${DYNAMIC_7Z}lib/7z/Codecs/Swap.dll
-${DYNAMIC_7Z}lib/7z/Formats/7z.dll
-${DYNAMIC_7Z}lib/7z/Formats/Rar.dll
-${DYNAMIC_7Z}lib/7z/Formats/Tar.dll
-${DYNAMIC_7Z}lib/7z/Formats/Zip.dll
-${DYNAMIC_7Z}lib/7z/Formats/arj.dll
-${DYNAMIC_7Z}lib/7z/Formats/bz2.dll
-${DYNAMIC_7Z}lib/7z/Formats/cab.dll
-${DYNAMIC_7Z}lib/7z/Formats/cpio.dll
-${DYNAMIC_7Z}lib/7z/Formats/deb.dll
-${DYNAMIC_7Z}lib/7z/Formats/gz.dll
-${DYNAMIC_7Z}lib/7z/Formats/rpm.dll
-${DYNAMIC_7Z}lib/7z/Formats/split.dll
+${PLIST.dll}lib/7z/7z
+${PLIST.dll}lib/7z/Codecs/7zAES.dll
+${PLIST.dll}lib/7z/Codecs/AES.dll
+${PLIST.dll}lib/7z/Codecs/BZip2.dll
+${PLIST.dll}lib/7z/Codecs/Branch.dll
+${PLIST.dll}lib/7z/Codecs/Copy.dll
+${PLIST.dll}lib/7z/Codecs/Deflate.dll
+${PLIST.dll}lib/7z/Codecs/Implode.dll
+${PLIST.dll}lib/7z/Codecs/LZMA.dll
+${PLIST.dll}lib/7z/Codecs/PPMD.dll
+${PLIST.dll}lib/7z/Codecs/Swap.dll
+${PLIST.dll}lib/7z/Formats/7z.dll
+${PLIST.dll}lib/7z/Formats/Rar.dll
+${PLIST.dll}lib/7z/Formats/Tar.dll
+${PLIST.dll}lib/7z/Formats/Zip.dll
+${PLIST.dll}lib/7z/Formats/arj.dll
+${PLIST.dll}lib/7z/Formats/bz2.dll
+${PLIST.dll}lib/7z/Formats/cab.dll
+${PLIST.dll}lib/7z/Formats/cpio.dll
+${PLIST.dll}lib/7z/Formats/deb.dll
+${PLIST.dll}lib/7z/Formats/gz.dll
+${PLIST.dll}lib/7z/Formats/rpm.dll
+${PLIST.dll}lib/7z/Formats/split.dll
 man/man1/7z.1
 man/man1/7za.1
 man/man1/7zr.1
@@ -69,6 +69,6 @@ share/doc/p7zip/syntax.htm
 @dirrm share/doc/p7zip/switches
 @dirrm share/doc/p7zip/commands
 @dirrm share/doc/p7zip
-${DYNAMIC_7Z}@dirrm lib/7z/Formats
-${DYNAMIC_7Z}@dirrm lib/7z/Codecs
-${DYNAMIC_7Z}@dirrm lib/7z
+${PLIST.dll}@dirrm lib/7z/Formats
+${PLIST.dll}@dirrm lib/7z/Codecs
+${PLIST.dll}@dirrm lib/7z