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

through PLIST_SUBST to the plist module.

14 files changed, 53 insertions, 63 deletions

diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 486bf80eda1..686c1fcb18d 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/02/15 16:23:09 gdt Exp $
+# $NetBSD: Makefile,v 1.44 2008/04/12 22:43:12 jlam Exp $
 
 PKGNAME=		amanda-server-${VERS}
 SVR4_PKGNAME=		amase
@@ -39,11 +39,9 @@ CONFIGURE_ENV+=		ac_cv_lib_readline_readline=no
 # 		${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \
 # 	done
 
-.if ${OPSYS} == "SunOS"
-PLIST_SRC=	${WRKDIR}/PLIST-src
-
-pre-install:
-	${SED} -e 's|^libexec/chg-scsi$$|@comment libexec/chg-scsi needs headers...|' ${PKGDIR}/PLIST > ${PLIST_SRC}
+PLIST_VARS+=	scsi
+.if ${OPSYS} != "SunOS"
+PLIST.scsi=	yes
 .endif
 
 .include "../../sysutils/amanda-common/buildlink3.mk"
diff --git a/sysutils/amanda-server/PLIST b/sysutils/amanda-server/PLIST
index 9f4d1f9897c..1df17795544 100644
--- a/sysutils/amanda-server/PLIST
+++ b/sysutils/amanda-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/02/15 16:23:09 gdt Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:12 jlam Exp $
 lib/libamserver.la
 lib/libamtape.la
 lib/librestore.la
@@ -21,7 +21,7 @@ libexec/chg-multi
 libexec/chg-null
 libexec/chg-rait
 libexec/chg-rth
-libexec/chg-scsi
+${PLIST.scsi}libexec/chg-scsi
 libexec/chg-zd-mtx
 libexec/chunker
 libexec/driver
diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST
index 360130436cd..e2617297108 100644
--- a/sysutils/apcupsd/PLIST
+++ b/sysutils/apcupsd/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.10 2007/10/29 12:40:58 sborrill Exp $
-${CGI}libexec/cgi-bin/upsstats.cgi
-${CGI}libexec/cgi-bin/upsfstats.cgi
-${CGI}libexec/cgi-bin/upsimage.cgi
-${CGI}libexec/cgi-bin/multimon.cgi
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:12 jlam Exp $
+${PLIST.cgi}libexec/cgi-bin/upsstats.cgi
+${PLIST.cgi}libexec/cgi-bin/upsfstats.cgi
+${PLIST.cgi}libexec/cgi-bin/upsimage.cgi
+${PLIST.cgi}libexec/cgi-bin/multimon.cgi
 sbin/apcaccess
 sbin/apctest
 sbin/apcupsd
diff --git a/sysutils/apcupsd/options.mk b/sysutils/apcupsd/options.mk
index d710560f3b2..ddf04b5f197 100644
--- a/sysutils/apcupsd/options.mk
+++ b/sysutils/apcupsd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/10/29 12:40:58 sborrill Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:12 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.apcupsd
 PKG_SUPPORTED_OPTIONS=		snmp cgi
@@ -11,10 +11,9 @@ PKG_SUGGESTED_OPTIONS=		snmp cgi
 CONFIGURE_ARGS+=	--enable-snmp		# enable SNMP driver
 .endif
 
+PLIST_VARS+=		cgi
 .if !empty(PKG_OPTIONS:Mcgi)
 CONFIGURE_ARGS+=	--enable-cgi		# include CGI support
 CONFIGURE_ARGS+=	--with-cgi-bin=${PREFIX}/libexec/cgi-bin
-PLIST_SUBST+=	CGI=
-.else
-PLIST_SUBST+=	CGI="@comment "
+PLIST.cgi=		yes
 .endif
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 7efc2b87a1f..e19c0fe16d9 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/03/08 01:09:50 tnn Exp $
+# $NetBSD: Makefile,v 1.45 2008/04/12 22:43:12 jlam Exp $
 
 DISTNAME=	coreutils-6.10
 CATEGORIES=	sysutils
@@ -35,10 +35,9 @@ CONFIGURE_ENV+=		 ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes
 .endif
 
 # Exclude programs from PLIST which aren't built on a platform.
-.if ${OPSYS} == "Interix"
-PLIST_SUBST+=		COREUTILS_HAVE_HOSTID="@comment "
-.else
-PLIST_SUBST+=		COREUTILS_HAVE_HOSTID=""
+PLIST_VARS+=		hostid
+.if ${OPSYS} != "Interix"
+PLIST.hostid=		yes
 .endif
 
 # XXX - this hack is bound to cause fallout on some platform at some point.
diff --git a/sysutils/coreutils/PLIST b/sysutils/coreutils/PLIST
index f03a96f2656..2424e74e62f 100644
--- a/sysutils/coreutils/PLIST
+++ b/sysutils/coreutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/03/08 01:06:52 tnn Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:12 jlam Exp $
 bin/${GNU_PROGRAM_PREFIX}[
 bin/${GNU_PROGRAM_PREFIX}base64
 bin/${GNU_PROGRAM_PREFIX}basename
@@ -30,7 +30,7 @@ bin/${GNU_PROGRAM_PREFIX}fmt
 bin/${GNU_PROGRAM_PREFIX}fold
 bin/${GNU_PROGRAM_PREFIX}groups
 bin/${GNU_PROGRAM_PREFIX}head
-${COREUTILS_HAVE_HOSTID}bin/${GNU_PROGRAM_PREFIX}hostid
+${PLIST.hostid}bin/${GNU_PROGRAM_PREFIX}hostid
 bin/${GNU_PROGRAM_PREFIX}id
 bin/${GNU_PROGRAM_PREFIX}install
 bin/${GNU_PROGRAM_PREFIX}join
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 12c04436b93..41c213938ff 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2008/03/07 22:40:29 tron Exp $
+# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:12 jlam Exp $
 
 DISTNAME=	e2fsprogs-1.40.7
 CATEGORIES=	sysutils
@@ -16,16 +16,13 @@ INFO_FILES=	# PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+
 # Only build fsck(8) on platforms that need it.
-.if (${OPSYS} != "Linux")
-FSCK=		"@comment "
+PLIST_VARS+=		fsck
+.if ${OPSYS} == "Linux"
+PLIST.fsck=		yes
 .else
-FSCK=		# empty
-.endif
-PLIST_SUBST+=	FSCK=${FSCK}
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-.if !empty(FSCK)
 CONFIGURE_ARGS+=	--disable-fsck
 .endif
 
diff --git a/sysutils/e2fsprogs/PLIST b/sysutils/e2fsprogs/PLIST
index 904fcb200fc..b5687b93e13 100644
--- a/sysutils/e2fsprogs/PLIST
+++ b/sysutils/e2fsprogs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/03/07 22:40:29 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:12 jlam Exp $
 bin/chattr
 bin/lsattr
 bin/uuidgen
@@ -18,7 +18,7 @@ man/man8/e2image.8
 man/man8/e2label.8
 man/man8/filefrag.8
 man/man8/findfs.8
-${FSCK}man/man8/fsck.8
+${PLIST.fsck}man/man8/fsck.8
 man/man8/fsck.ext2.8
 man/man8/fsck.ext3.8
 man/man8/logsave.8
@@ -38,7 +38,7 @@ sbin/e2image
 sbin/e2label
 sbin/filefrag
 sbin/findfs
-${FSCK}sbin/fsck
+${PLIST.fsck}sbin/fsck
 sbin/fsck.ext2
 sbin/fsck.ext3
 sbin/logsave
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 7722f97f224..7496f8386cb 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/10/07 18:00:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.49 2008/04/12 22:43:12 jlam Exp $
 
 DISTNAME=	grub-0.97
 PKGREVISION=	8
@@ -25,9 +25,10 @@ BUILD_DEFS+=		GRUB_SCAN_ARGS
 
 .include "../../mk/curses.buildlink3.mk"
 
+PLIST_VARS+=		netboot
 .if defined(GRUB_NETWORK_CARDS)
 CONFIGURE_ARGS+=	--enable-diskless
-PLIST_SUBST+=		NETBOOT=
+PLIST.netboot=		yes
 
 .for nic in ${GRUB_NETWORK_CARDS}
 CONFIGURE_ARGS+=	--enable-${nic}
@@ -38,8 +39,6 @@ grub-netboot-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub
 	${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \
 		${PREFIX}/share/doc/grub
-.else
-PLIST_SUBST+=		NETBOOT="@comment "
 .endif
 
 .if defined(GRUB_PRESET_COMMAND) && !empty(GRUB_PRESET_COMMAND)
diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST
index da0ceb4056a..3e5e8bf77b8 100644
--- a/sysutils/grub/PLIST
+++ b/sysutils/grub/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/07 19:54:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:12 jlam Exp $
 bin/mbchk
 info/grub.info
 info/multiboot.info
@@ -13,8 +13,8 @@ lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/ffs_stage1_5
 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/iso9660_stage1_5
 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/jfs_stage1_5
 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/minix_stage1_5
-${NETBOOT}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/nbgrub
-${NETBOOT}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/pxegrub
+${PLIST.netboot}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/nbgrub
+${PLIST.netboot}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/pxegrub
 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/reiserfs_stage1_5
 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage1
 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage2
@@ -27,7 +27,7 @@ sbin/grub-install
 sbin/grub-md5-crypt
 sbin/grub-set-default
 sbin/grub-terminfo
-${NETBOOT}share/doc/grub/README.netboot
+${PLIST.netboot}share/doc/grub/README.netboot
 @dirrm lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}
 @dirrm lib/grub
-${NETBOOT}@dirrm share/doc/grub
+${PLIST.netboot}@dirrm share/doc/grub
diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
index 2ec269a29ab..007acb82a8a 100644
--- a/sysutils/libgtop/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/03/18 17:46:27 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:12 jlam Exp $
 
 DISTNAME=		libgtop-2.20.2
 CATEGORIES=		sysutils gnome
@@ -43,18 +43,17 @@ PRINT_PLIST_AWK+=	/^include\/libgtop-2.0\/glibtop_suid.h$$/ \
 CONFIGURE_ENV+=	fu_cv_sys_mounted_getmntinfo=yes
 .endif
 
+PLIST_VARS+=	server suid.h
 .if ${OPSYS} == "Linux"
-PLIST_SUBST+=	LIBGTOP_SERVER="@comment "
-PLIST_SUBST+=	LIBGTOP_SUID_H="@comment "
+#		nothing
 .elif ${OPSYS} == "SunOS"
-PLIST_SUBST+=	LIBGTOP_SERVER=""
-PLIST_SUBST+=	LIBGTOP_SUID_H="@comment "
+PLIST.server=	yes
 .else
-PLIST_SUBST+=	LIBGTOP_SERVER=""
-PLIST_SUBST+=	LIBGTOP_SUID_H=""
+PLIST.server=	yes
+PLIST.suid.h=	yes
 .endif
 
-.if ${OPSYS} != "Linux"
+.if defined(PLIST.server)
 post-install:
 	${CHMOD} g+s ${PREFIX}/bin/libgtop_server2
 .endif
diff --git a/sysutils/libgtop/PLIST b/sysutils/libgtop/PLIST
index d754b73e98b..9062acf7e60 100644
--- a/sysutils/libgtop/PLIST
+++ b/sysutils/libgtop/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2007/11/05 19:06:02 drochner Exp $
-${LIBGTOP_SERVER}bin/libgtop_daemon2
-${LIBGTOP_SERVER}bin/libgtop_server2
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:12 jlam Exp $
+${PLIST.server}bin/libgtop_daemon2
+${PLIST.server}bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
 include/libgtop-2.0/glibtop/close.h
 include/libgtop-2.0/glibtop/command.h
@@ -40,7 +40,7 @@ include/libgtop-2.0/glibtop/uptime.h
 include/libgtop-2.0/glibtop/version.h
 include/libgtop-2.0/glibtop_machine.h
 include/libgtop-2.0/glibtop_server.h
-${LIBGTOP_SUID_H}include/libgtop-2.0/glibtop_suid.h
+${PLIST.suid.h}include/libgtop-2.0/glibtop_suid.h
 include/libgtop-2.0/libgtopconfig.h
 info/libgtop2.info
 lib/libgtop-2.0.la
diff --git a/sysutils/memtestplus/PLIST b/sysutils/memtestplus/PLIST
index 53cc38fe6bc..5f9fcf05214 100644
--- a/sysutils/memtestplus/PLIST
+++ b/sysutils/memtestplus/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2006/11/01 15:38:15 mlelstv Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:12 jlam Exp $
 mdec/memtestplus.bin
 mdec/memtestplus
-${HAVE_ISO}mdec/memtestplus.iso
+${PLIST.iso}mdec/memtestplus.iso
 share/doc/memtestplus/README
 share/doc/memtestplus/FAQ
 @unexec ${RMDIR} %D/mdec 2>/dev/null || ${TRUE}
diff --git a/sysutils/memtestplus/options.mk b/sysutils/memtestplus/options.mk
index 9e892e7c8ce..7b8f3b59b16 100644
--- a/sysutils/memtestplus/options.mk
+++ b/sysutils/memtestplus/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/12/30 18:40:52 mlelstv Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:13 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.memtestplus
 PKG_SUPPORTED_OPTIONS=	iso serialconsole
@@ -6,12 +6,11 @@ PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		iso
 .if !empty(PKG_OPTIONS:Miso)
 BUILD_TARGET=		memtest.iso
 BUILD_DEPENDS+=		{cdrtools,cdrtools-ossdvd}>=2.01:../../sysutils/cdrtools
-PLIST_SUBST+=		HAVE_ISO=""
-.else
-PLIST_SUBST+=		HAVE_ISO="@comment "
+PLIST.iso=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mserialconsole)