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

through PLIST_SUBST to the plist module.

6 files changed, 65 insertions, 64 deletions

diff --git a/pkgtools/bootstrap-extras/Makefile b/pkgtools/bootstrap-extras/Makefile
index 7954bd485ac..4ef3af6a7da 100644
--- a/pkgtools/bootstrap-extras/Makefile
+++ b/pkgtools/bootstrap-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/07/02 13:34:14 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/04/12 22:43:09 jlam Exp $
 
 DISTNAME=	bootstrap-extra-files-20070702
 CATEGORIES=	pkgtools
@@ -15,49 +15,55 @@ NO_BUILD=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-OPSYSVARS+=		NEED_FAKELDD
-NEED_FAKELDD.IRIX=	# empty
-NEED_FAKELDD.*=		"@comment "
-PLIST_SUBST+=		NEED_FAKELDD=${NEED_FAKELDD}
+EXTRA_FILES=	fakeldd mkdir strip xargs
+PLIST_VARS+=	${EXTRA_FILES}
 
-OPSYSVARS+=		NEED_MKDIR
-NEED_MKDIR.UnixWare=	# empty
-NEED_MKDIR.*=		"@comment "
-PLIST_SUBST+=		NEED_MKDIR=${NEED_MKDIR}
+.PHONY: ${EXTRA_FILES:S/^/do-install-/}
 
-OPSYSVARS+=		NEED_STRIP
-NEED_STRIP.AIX=		# empty
-NEED_STRIP.*=		"@comment "
-PLIST_SUBST+=		NEED_STRIP=${NEED_STRIP}
+NEED_FAKELDD=		IRIX
+.if !empty(NEED_FAKELDD:M${OPSYS})
+PLIST.fakeldd=		yes
+do-install:		do-install-fakeldd
+.endif
 
-OPSYSVARS+=		NEED_XARGS
-NEED_XARGS.Interix=	# empty
-NEED_XARGS.*=		"@comment "
-PLIST_SUBST+=		NEED_XARGS=${NEED_XARGS}
+NEED_MKDIR=		UnixWare
+.if !empty(NEED_MKDIR:M${OPSYS})
+PLIST.mkdir=		yes
+do-install:		do-install-mkdir
+.endif
+
+NEED_STRIP=		AIX
+.if !empty(NEED_STRIP:M${OPSYS})
+PLIST.strip=		yes
+do-install:		do-install-strip
+.endif
+
+NEED_XARGS=		Interix
+.if !empty(NEED_XARGS:M${OPSYS})
+PLIST.xargs=		yes
+do-install:		do-install-xargs
+.endif
 
 do-extract:
 	${CP} -R ${FILESDIR} ${WRKSRC}
 
 do-install:
-	if ${TEST} -z ${NEED_FAKELDD:M*:Q}""; then			\
-		${INSTALL_SCRIPT_DIR} ${PREFIX}/sbin;			\
-		${INSTALL_SCRIPT} ${WRKSRC}/fakeldd			\
-			${PREFIX}/sbin/fakeldd;				\
-	fi
-	if ${TEST} -z ${NEED_MKDIR:M*:Q}""; then			\
-		${INSTALL_SCRIPT_DIR} ${PREFIX}/bin;			\
-		${INSTALL_SCRIPT} ${WRKSRC}/mkdir-sh			\
-			${PREFIX}/bin/mkdir-sh;				\
-	fi
-	if ${TEST} -z ${NEED_STRIP:M*:Q}""; then			\
-		${INSTALL_SCRIPT_DIR} ${PREFIX}/bin;			\
-		${INSTALL_SCRIPT} ${WRKSRC}/strip-sh			\
-			${PREFIX}/bin/strip;				\
-	fi
-	if ${TEST} -z ${NEED_XARGS:M*:Q}""; then			\
-		${INSTALL_SCRIPT_DIR} ${PREFIX}/bin;			\
-		${INSTALL_SCRIPT} ${WRKSRC}/xargs-sh			\
-			${PREFIX}/bin/xargs;				\
-	fi
+	@${ECHO} ${.ALLSRC}
+
+do-install-fakeldd:
+	${INSTALL_SCRIPT_DIR} ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/fakeldd ${PREFIX}/sbin/fakeldd
+
+do-install-mkdir:
+	${INSTALL_SCRIPT_DIR} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/mkdir-sh ${PREFIX}/bin/mkdir-sh
+
+do-install-strip:
+	${INSTALL_SCRIPT_DIR} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/strip-sh ${PREFIX}/bin/strip
+
+do-install-xargs:
+	${INSTALL_SCRIPT_DIR} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/xargs-sh ${PREFIX}/bin/xargs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/bootstrap-extras/PLIST b/pkgtools/bootstrap-extras/PLIST
index 22a972df021..7c900925ee2 100644
--- a/pkgtools/bootstrap-extras/PLIST
+++ b/pkgtools/bootstrap-extras/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2007/07/01 23:27:43 tnn Exp $
-${NEED_MKDIR}bin/mkdir-sh
-${NEED_STRIP}bin/strip
-${NEED_FAKELDD}sbin/fakeldd
-${NEED_XARGS}bin/xargs
+@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:09 jlam Exp $
+${PLIST.mkdir}bin/mkdir-sh
+${PLIST.strip}bin/strip
+${PLIST.fakeldd}sbin/fakeldd
+${PLIST.xargs}bin/xargs
diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile
index 3a4bb6522bc..b0ed8471516 100644
--- a/pkgtools/libkver/Makefile
+++ b/pkgtools/libkver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/07/26 12:24:52 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/12 22:43:09 jlam Exp $
 
 DISTNAME=		libkver-${VERSION}
 CATEGORIES=		pkgtools
@@ -26,13 +26,13 @@ ONLY_FOR_PLATFORM=	NetBSD-*-*
 BUILDLINK_PASSTHRU_DIRS=	${BSDSRCDIR}/sys
 
 
+PLIST_VARS=	sysctl
 LDD_SYSCTL!=	ldd /sbin/sysctl 2>&1 || ${TRUE}
 MAKE_ENV+=	LDD_SYSCTL=${LDD_SYSCTL:Q} # save another ldd run
 .if empty(LDD_SYSCTL:M*libc*)
-PLIST_SUBST+=		HAS_SYSCTL=
+PLIST.sysctl=		yes
 FILES_SUBST+=		HAS_SYSCTL=true
 .else
-PLIST_SUBST+=		HAS_SYSCTL="@comment "
 FILES_SUBST+=		HAS_SYSCTL=false
 .endif
 
diff --git a/pkgtools/libkver/PLIST b/pkgtools/libkver/PLIST
index 1303710dbb6..56ed050cf42 100644
--- a/pkgtools/libkver/PLIST
+++ b/pkgtools/libkver/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/13 17:45:59 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:09 jlam Exp $
 lib/libkver.a
 lib/libkver.so
 lib/libkver.so.1
 lib/libkver.so.1.0
 man/cat3/kver.0
 man/man3/kver.3
-${HAS_SYSCTL}sbin/sysctl
+${PLIST.sysctl}sbin/sysctl
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 22e4404abdb..0174c0b8f1f 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2007/12/16 12:43:50 tron Exp $
+# $NetBSD: Makefile,v 1.75 2008/04/12 22:43:09 jlam Exp $
 
 DISTNAME=	xpkgwedge-1.16
 CATEGORIES=	pkgtools devel x11
@@ -44,29 +44,24 @@ FILES_SUBST+=		FONT_PROGS=${FONT_PROGS:Q}
 FILES_SUBST+=		MAKE=${IMAKE_MAKE:Q}
 USE_TOOLS+=		${IMAKE_TOOLS}
 
+PLIST_VARS+=		Darwin IRIX IRIX5 IRIX6
+
 .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
 APPLY_DARWIN_PATCH=	${TRUE}
-PLIST_SUBST+=		IS_DARWIN=
+PLIST.Darwin=		yes
 USE_TOOLS+=		patch
 .else
 APPLY_DARWIN_PATCH=	${FALSE}
-PLIST_SUBST+=		IS_DARWIN="@comment "
 .endif
 
 .if ${OPSYS} == "IRIX"
-PLIST_SUBST+=		IS_IRIX=
+PLIST.IRIX=		yes
 USE_TOOLS+=		patch
 . if !empty(OS_VERSION:M6*)
-PLIST_SUBST+=		IS_IRIX5="@comment "
-PLIST_SUBST+=		IS_IRIX6=
+PLIST.IRIX6=		yes
 . else
-PLIST_SUBST+=		IS_IRIX5=
-PLIST_SUBST+=		IS_IRIX6="@comment "
+PLIST.IRIX5=		yes
 . endif
-.else
-PLIST_SUBST+=		IS_IRIX="@comment "
-PLIST_SUBST+=		IS_IRIX5="@comment "
-PLIST_SUBST+=		IS_IRIX6="@comment "
 .endif
 
 .include "../../mk/x11.buildlink3.mk"
diff --git a/pkgtools/xpkgwedge/PLIST b/pkgtools/xpkgwedge/PLIST
index adfbe44ebbd..16d1b446644 100644
--- a/pkgtools/xpkgwedge/PLIST
+++ b/pkgtools/xpkgwedge/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2006/09/09 20:31:46 schwarz Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:09 jlam Exp $
 bin/pkgxmkmf
 lib/X11/config/xpkgwedge.def
-${IS_DARWIN}lib/X11/config/darwin.cf
-${IS_IRIX}lib/X11/config/sgi.cf
-${IS_IRIX5}lib/X11/config/sgiLib.rules
-${IS_IRIX6}lib/X11/config/X11.rules
+${PLIST.Darwin}lib/X11/config/darwin.cf
+${PLIST.IRIX}lib/X11/config/sgi.cf
+${PLIST.IRIX5}lib/X11/config/sgiLib.rules
+${PLIST.IRIX6}lib/X11/config/X11.rules