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

through PLIST_SUBST to the plist module.

19 files changed, 73 insertions, 76 deletions

diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 597b6caf326..c2d4e29f5e2 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/07/09 04:27:55 minskim Exp $
+# $NetBSD: Makefile,v 1.43 2008/04/12 22:43:09 jlam Exp $
 #
 
 DISTNAME=	Linux-PAM-0.77
@@ -47,12 +47,12 @@ PKG_SUPPORTED_OPTIONS=	libcrack
 ###
 ### Support using libcrack to protect against weak passwords.
 ###
+PLIST_VARS+=		libcrack
 .if !empty(PKG_OPTIONS:Mlibcrack)
 .  include "../../security/libcrack/buildlink3.mk"
-PLIST_SUBST+=		USE_LIBCRACK=
+PLIST.libcrack=		yes
 .else
 CONFIGURE_ARGS+=	--disable-crack
-PLIST_SUBST+=		USE_LIBCRACK="@comment "
 .endif
 
 .if !empty(OPSYS:M*BSD)
@@ -69,11 +69,10 @@ EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
 CFILES=			access.conf pam_env.conf group.conf time.conf
 
+PLIST_VARS+=		limits
 .if ${OPSYS} == "Linux"
 CFILES+=		limits.conf
-PLIST_SUBST+=		PAM_LIMITS=
-.else
-PLIST_SUBST+=		PAM_LIMITS="@comment "
+PLIST.limits=		yes
 .endif
 
 CONF_FILES=		${EGDIR}/pam.conf ${PKG_SYSCONFBASEDIR}/pam.conf
diff --git a/security/PAM/PLIST b/security/PAM/PLIST
index 9ff54bce459..62248c9cf92 100644
--- a/security/PAM/PLIST
+++ b/security/PAM/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/16 07:46:57 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:09 jlam Exp $
 include/security/_pam_aconf.h
 include/security/_pam_compat.h
 include/security/_pam_macros.h
@@ -12,7 +12,7 @@ lib/libpam.la
 lib/libpam_misc.la
 lib/libpamc.la
 lib/security/pam_access.la
-${USE_LIBCRACK}lib/security/pam_cracklib.la
+${PLIST.libcrack}lib/security/pam_cracklib.la
 lib/security/pam_debug.la
 lib/security/pam_deny.la
 lib/security/pam_env.la
@@ -22,7 +22,7 @@ lib/security/pam_ftp.la
 lib/security/pam_group.la
 lib/security/pam_issue.la
 lib/security/pam_lastlog.la
-${PAM_LIMITS}lib/security/pam_limits.la
+${PLIST.limits}lib/security/pam_limits.la
 lib/security/pam_listfile.la
 lib/security/pam_mail.la
 lib/security/pam_mkhomedir.la
@@ -62,7 +62,7 @@ sbin/pam_tally
 sbin/unix_chkpwd
 share/examples/${PKGBASE}/access.conf
 share/examples/${PKGBASE}/group.conf
-${PAM_LIMITS}share/examples/${PKGBASE}/limits.conf
+${PLIST.limits}share/examples/${PKGBASE}/limits.conf
 share/examples/${PKGBASE}/pam.conf
 share/examples/${PKGBASE}/pam_env.conf
 share/examples/${PKGBASE}/time.conf
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 78b8961ac14..3cf4989ce75 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/02/19 16:20:15 reed Exp $
+# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:09 jlam Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -69,6 +69,7 @@ PKG_SUPPORTED_OPTIONS=	milter
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		milter
 .if !empty(PKG_OPTIONS:Mmilter)
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-runtime-dir=${AMAVIS_DIR:Q}
@@ -80,14 +81,13 @@ CONFIGURE_DIRS=		${WRKSRC}/helper-progs
 BUILD_DIRS=		${WRKSRC}/helper-progs
 RCD_SCRIPTS+=		amavismilter
 MESSAGE_SRC+=		${PKGDIR}/MESSAGE.milter
-PLIST_SUBST+=		MILTER=
+PLIST.milter=		yes
 
 PTHREAD_OPTS+=		require native	# doesn't work with pth
 .  include "../../mail/libmilter/buildlink3.mk"
 .  include "../../mk/pthread.buildlink3.mk"
 .else
 USE_LANGUAGES=		# none, not even C
-PLIST_SUBST+=		MILTER="@comment "
 
 do-build:	replace-interpreter
 .endif
diff --git a/security/amavisd-new/PLIST b/security/amavisd-new/PLIST
index a8d1eb27b48..1937af324c5 100644
--- a/security/amavisd-new/PLIST
+++ b/security/amavisd-new/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.12 2008/02/19 16:18:18 reed Exp $
-${MILTER}sbin/amavis
-${MILTER}sbin/amavis-milter
+@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:09 jlam Exp $
+${PLIST.milter}sbin/amavis
+${PLIST.milter}sbin/amavis-milter
 sbin/amavisd
 sbin/amavisd-agent
 sbin/amavisd-nanny
@@ -42,6 +42,6 @@ share/examples/amavisd-new/amavisd.conf-default
 share/examples/amavisd-new/amavisd.conf-minimal
 share/examples/amavisd-new/amavisd.conf-sample
 share/examples/rc.d/amavisd
-${MILTER}share/examples/rc.d/amavismilter
+${PLIST.milter}share/examples/rc.d/amavismilter
 @dirrm share/examples/amavisd-new
 @dirrm share/doc/amavisd-new
diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index c941cf76a71..0a1cdce7035 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/07/11 20:16:33 adrianp Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/12 22:43:09 jlam Exp $
 #
 
 DISTNAME=		chkrootkit-0.47
@@ -33,9 +33,10 @@ SUBST_SED.helper=	-e "s|./chklastlog|${PREFIX}/bin/chklastlog|g"	\
 
 .include "../../mk/compiler.mk"
 
+PLIST_VARS+=	wtmpx
 .if ${OPSYS} == "SunOS"
 PROGRAMS+=	check_wtmpx
-PLIST_SUBST+=	WTMPX=""
+PLIST.wtmpx=	yes
 CFLAGS+=	-DSOLARIS2
 LDFLAGS+=	-lsocket
 .  if empty(CC_VERSION:Mgcc-*)
@@ -44,7 +45,6 @@ MAKE_ENV+=	STATIC="-B static"
 MAKE_ENV+=	STATIC="-static"
 .  endif
 .else
-PLIST_SUBST+=	WTMPX="@comment "
 MAKE_ENV+=	STATIC="-static"
 .endif
 
diff --git a/security/chkrootkit/PLIST b/security/chkrootkit/PLIST
index 55fbf3f6c7d..faf08a5de8a 100644
--- a/security/chkrootkit/PLIST
+++ b/security/chkrootkit/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/28 10:41:59 adrianp Exp $
-${WTMPX}bin/check_wtmpx
+@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:09 jlam Exp $
+${PLIST.wtmpx}bin/check_wtmpx
 bin/chkdirs
 bin/chklastlog
 bin/chkproc
diff --git a/security/cyrus-saslauthd/PLIST b/security/cyrus-saslauthd/PLIST
index 7513dd9df83..3667f2adf6a 100644
--- a/security/cyrus-saslauthd/PLIST
+++ b/security/cyrus-saslauthd/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2006/10/04 12:07:53 obache Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:09 jlam Exp $
 bin/saslcache
 bin/testsaslauthd
 man/man8/saslauthd.8
 sbin/saslauthd
 sbin/testsaslauthd
-${LDAP}share/doc/cyrus-saslauthd/LDAP_SASLAUTHD
-${LDAP}@dirrm share/doc/cyrus-saslauthd
+${PLIST.ldap}share/doc/cyrus-saslauthd/PLIST.ldap_SASLAUTHD
+${PLIST.ldap}@dirrm share/doc/cyrus-saslauthd
 share/examples/rc.d/saslauthd
diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index e03d0db01ba..10b71f54ff9 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2006/05/31 18:22:25 ghen Exp $
+# $NetBSD: options.mk,v 1.11 2008/04/12 22:43:09 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
 PKG_SUPPORTED_OPTIONS=	pam kerberos ldap gssapi
@@ -18,15 +18,15 @@ CONFIGURE_ARGS+=	--without-pam
 ###
 ### Authentication against information stored in an LDAP directory
 ###
+PLIST_VARS+=		ldap
 .if !empty(PKG_OPTIONS:Mldap)
 .  include "../../databases/openldap-client/buildlink3.mk"
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 BUILDLINK_INCDIRS.cyrus-sasl=	include/sasl
 CONFIGURE_ARGS+=	--with-ldap=${BUILDLINK_PREFIX.openldap-client}
-PLIST_SUBST+=		LDAP=
+PLIST.ldap=		yes
 .else
 CONFIGURE_ARGS+=	--without-ldap
-PLIST_SUBST+=		LDAP="@comment "
 .endif
 
 ###
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index e89944db87b..4107bbe658f 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2007/03/07 11:31:24 drochner Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/04/12 22:43:09 jlam Exp $
 bin/gpg
 bin/gpg-zip
 bin/gpgsplit
@@ -7,7 +7,7 @@ info/gnupg1.info
 libexec/gnupg/gpgkeys_curl
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
-${OPENLDAP}libexec/gnupg/gpgkeys_ldap
+${PLIST.ldap}libexec/gnupg/gpgkeys_ldap
 man/man1/gpg.1
 man/man1/gpg.ru.1
 man/man1/gpgv.1
diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk
index e778f7057e1..cde9bbb4348 100644
--- a/security/gnupg/options.mk
+++ b/security/gnupg/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2007/10/31 12:29:33 rillig Exp $
+# $NetBSD: options.mk,v 1.13 2008/04/12 22:43:09 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg
 PKG_SUPPORTED_OPTIONS=	curl idea ldap
@@ -43,16 +43,16 @@ pre-configure:
 	${GZCAT} ${DISTDIR}/idea.c.gz > ${WRKSRC}/cipher/idea.c
 .endif
 
+PLIST_VARS+=		ldap
 .if !empty(PKG_OPTIONS:Mldap)
 .include "../../databases/openldap-client/buildlink3.mk"
-PLIST_SUBST+=	OPENLDAP=""
+PLIST.ldap=		yes
 .else
-CONFIGURE_ARGS+=--disable-ldap
-PLIST_SUBST+=	OPENLDAP="@comment "
+CONFIGURE_ARGS+=	--disable-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Mm68060-optimized)
 # be more efficient on M68060 machines
-CONFIGURE_ENV+=                M68060=${M68060:Q}
-CFLAGS+=                       -m68060
+CONFIGURE_ENV+=		M68060=${M68060:Q}
+CFLAGS+=		-m68060
 .endif
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index ef25d742f9e..3bf7fe286f9 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2008/03/04 22:37:46 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2008/04/12 22:43:09 jlam Exp $
 
 DISTNAME=	heimdal-1.1
 CATEGORIES=	security
@@ -52,10 +52,9 @@ CONFIGURE_ENV.SunOS+=	ac_cv_header_vis_h=no
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.readline}/include/readline
 
+PLIST_VARS+=		afskauth
 .if ${OPSYS} == "IRIX"
-PLIST_SUBST+=		IF_IRIX=""
-.else
-PLIST_SUBST+=		IF_IRIX="@comment "
+PLIST.afskauth=		yes
 .endif
 
 OWN_DIRS_PERMS=		${HEIMDAL_HDB_DIR} ${ROOT_USER} ${ROOT_GROUP} 0700
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index 9099fee3228..a119cb9d6c0 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2008/02/28 08:14:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:09 jlam Exp $
 bin/afslog
 bin/compile_et
 bin/gss
@@ -88,7 +88,7 @@ include/krb5/ss/ss.h
 include/krb5/xdbm.h
 info/heimdal.info
 info/hx509.info
-${IF_IRIX}lib/afskauthlib.so
+${PLIST.afskauth}lib/afskauthlib.so
 lib/libasn1.la
 lib/libcom_err.la
 lib/libeditline.la
@@ -825,11 +825,11 @@ sbin/iprop-log
 sbin/kadmin
 sbin/kstash
 sbin/ktutil
-${LDAP}share/examples/heimdal/hdb.schema
+${PLIST.ldap}share/examples/heimdal/hdb.schema
 share/examples/rc.d/kadmind
 share/examples/rc.d/kcm
 share/examples/rc.d/kdc
 share/examples/rc.d/kpasswdd
-${LDAP}@dirrm share/examples/heimdal
+${PLIST.ldap}@dirrm share/examples/heimdal
 @dirrm include/krb5/kadm5
 @dirrm include/krb5/ss
diff --git a/security/heimdal/options.mk b/security/heimdal/options.mk
index b1c27bbcc44..8e7559aa27a 100644
--- a/security/heimdal/options.mk
+++ b/security/heimdal/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/02/28 14:11:55 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:10 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.heimdal
 PKG_SUPPORTED_OPTIONS=	inet6 kerberos-prefix-cmds ldap
@@ -18,18 +18,17 @@ CONFIGURE_ARGS+=	--without-ipv6
 ###
 ### Support using LDAP as a KDC backend.
 ###
+PLIST_VARS+=		ldap
 .if !empty(PKG_OPTIONS:Mldap)
 .  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-openldap=${BUILDLINK_PREFIX.openldap-client}
-PLIST_SUBST+=		LDAP=""
+PLIST.ldap=		yes
 
 post-install: heimdal-ldap-schema
 heimdal-ldap-schema:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/heimdal
 	${INSTALL_DATA} ${WRKSRC}/lib/hdb/hdb.schema			\
 		${DESTDIR}${PREFIX}/share/examples/heimdal
-.else
-PLIST_SUBST+=		LDAP="@comment "
 .endif
 
 ###
diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index 6d6a0641b8d..6cf4171b92d 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2008/01/17 06:42:47 tnn Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2008/04/12 22:43:12 jlam Exp $
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
@@ -29,14 +29,14 @@ include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp.h
 include/openssl/hmac.h
-${IDEA}include/openssl/idea.h
+${PLIST.idea}include/openssl/idea.h
 include/openssl/krb5_asn.h
 include/openssl/kssl.h
 include/openssl/lhash.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
-${MDC2}include/openssl/mdc2.h
+${PLIST.mdc2}include/openssl/mdc2.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/ocsp.h
@@ -52,7 +52,7 @@ include/openssl/pqueue.h
 include/openssl/rand.h
 include/openssl/rc2.h
 include/openssl/rc4.h
-${RC5}include/openssl/rc5.h
+${PLIST.rc5}include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/safestack.h
diff --git a/security/openssl/options.mk b/security/openssl/options.mk
index 47e309ff069..25696de0f5a 100644
--- a/security/openssl/options.mk
+++ b/security/openssl/options.mk
@@ -1,11 +1,14 @@
-# $NetBSD: options.mk,v 1.4 2008/01/17 06:42:48 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openssl
 PKG_SUPPORTED_OPTIONS=	idea mdc2 rc5
+
 .include "../../mk/bsd.options.mk"
 
 OPENSSL_LICENSE=	# empty
 
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
 ###
 ### Support for the IDEA algorithm
 ###	US Patent: 5214703
@@ -14,10 +17,9 @@ OPENSSL_LICENSE=	# empty
 ###
 .if !empty(PKG_OPTIONS:Midea)
 OPENSSL_LICENSE+=	idea-license
-PLIST_SUBST+=		IDEA=
+PLIST.idea=		yes
 .else
 CONFIGURE_ARGS+=	no-idea
-PLIST_SUBST+=		IDEA="@comment "
 .endif
 
 ###
@@ -28,10 +30,9 @@ PLIST_SUBST+=		IDEA="@comment "
 # A license file is needed.
 OPENSSL_LICENSE+=	mdc2-nonlicense
 CONFIGURE_ARGS+=	enable-mdc2
-PLIST_SUBST+=		MDC2=
+PLIST.mdc2=		yes
 .else
 CONFIGURE_ARGS+=	no-mdc2
-PLIST_SUBST+=		MDC2="@comment "
 .endif
 
 ###
@@ -42,10 +43,9 @@ PLIST_SUBST+=		MDC2="@comment "
 # A license file is needed.
 OPENSSL_LICENSE+=	rc5-nonlicense
 CONFIGURE_ARGS+=	enable-rc5
-PLIST_SUBST+=		RC5=
+PLIST.rc5=		yes
 .else
 CONFIGURE_ARGS+=	no-rc5
-PLIST_SUBST+=		RC5="@comment "
 .endif
 
 .if !empty(OPENSSL_LICENSE)
diff --git a/security/pinentry/PLIST b/security/pinentry/PLIST
index dcbb86e9536..70a6f2a73b3 100644
--- a/security/pinentry/PLIST
+++ b/security/pinentry/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2006/11/22 11:56:14 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:12 jlam Exp $
 bin/pinentry
 bin/pinentry-curses
 info/pinentry.info
-${USE_GTK}bin/pinentry-gtk
-${USE_GTK2}bin/pinentry-gtk-2
-${USE_QT}bin/pinentry-qt
+${PLIST.gtk}bin/pinentry-gtk
+${PLIST.gtk2}bin/pinentry-gtk-2
+${PLIST.qt}bin/pinentry-qt
diff --git a/security/pinentry/options.mk b/security/pinentry/options.mk
index 5fbfce06b6e..f950d2ccaff 100644
--- a/security/pinentry/options.mk
+++ b/security/pinentry/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2006/10/11 18:53:38 shannonjr Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $
 #
 
 # XXX This usage of bsd.options.mk is incorrect.  The package should
@@ -11,22 +11,22 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.pinentry
 PKG_SUPPORTED_OPTIONS=	gtk gtk2 qt
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
 .if !empty(PKG_OPTIONS:Mgtk)
 CONFIGURE_ARGS+=	--enable-pinentry-gtk
-PLIST_SUBST+=		USE_GTK=
+PLIST.gtk=		yes
 .  include "../../x11/gtk/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-pinentry-gtk
-PLIST_SUBST+=		USE_GTK='@comment '
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk2)
 CONFIGURE_ARGS+=	--enable-pinentry-gtk2
-PLIST_SUBST+=		USE_GTK2=
+PLIST.gtk2=		yes
 .  include "../../x11/gtk2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-pinentry-gtk2
-PLIST_SUBST+=		USE_GTK2='@comment '
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt)
@@ -36,9 +36,8 @@ CONFIGURE_ARGS+=	--enable-pinentry-qt
 CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR:Q}
 CONFIGURE_ARGS+=	--with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include
 CONFIGURE_ARGS+=	--with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib
-PLIST_SUBST+=		USE_QT=
+PLIST.qt=		yes
 .  include "../../x11/qt3-libs/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-pinentry-qt
-PLIST_SUBST+=		USE_QT='@comment '
 .endif
diff --git a/security/ssh2/PLIST b/security/ssh2/PLIST
index 3907e921708..aca5c85ab13 100644
--- a/security/ssh2/PLIST
+++ b/security/ssh2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:12 jlam Exp $
 bin/scp
 bin/scp2
 bin/sftp
@@ -10,8 +10,8 @@ bin/ssh-add
 bin/ssh-add2
 bin/ssh-agent
 bin/ssh-agent2
-${X11_SUPPORT}bin/ssh-askpass
-${X11_SUPPORT}bin/ssh-askpass2
+${PLIST.x11}bin/ssh-askpass
+${PLIST.x11}bin/ssh-askpass2
 bin/ssh-dummy-shell
 bin/ssh-keygen
 bin/ssh-keygen2
diff --git a/security/ssh2/options.mk b/security/ssh2/options.mk
index eeb0c8e7d76..85111a30286 100644
--- a/security/ssh2/options.mk
+++ b/security/ssh2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/08/09 20:28:10 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:12 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ssh2
 PKG_SUPPORTED_OPTIONS=	x11
@@ -6,9 +6,11 @@ PKG_SUGGESTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		x11
+
 .if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--with-x
-PLIST_SUBST+=		X11_SUPPORT=
+PLIST.x11=		yes
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXt?=	build
@@ -19,5 +21,4 @@ CONFIGURE_ENV+=		ac_cv_path_XAUTH_PATH=${PREFIX:Q}/bin/xauth
 .endif
 .else
 CONFIGURE_ARGS+=	--without-x
-PLIST_SUBST+=		X11_SUPPORT='@comment '
 .endif