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

through PLIST_SUBST to the plist module.

28 files changed, 173 insertions, 202 deletions

diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index 1f1efda0bdb..8503a852c7f 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2008/03/04 16:38:11 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2008/04/12 22:43:02 jlam Exp $
 
 DISTNAME=		cint5.15
 PKGNAME=		cint-5.15.174
@@ -17,12 +17,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DIST_SUBDIR=		${PKGNAME_NOREV}
 WRKSRC=			${WRKDIR}
 GCC_REQD+=		3.0
-PTHREAD_OPTS+=	native
+PTHREAD_OPTS+=		native
+PLIST_VARS+=		threads
 .include "../../mk/pthread.buildlink3.mk"
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-PLIST_SUBST+= HAVE_THR=""
-.else
-PLIST_SUBST+= HAVE_THR="@comment "
+PLIST.threads=		yes
 .endif
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2
diff --git a/lang/cint/PLIST b/lang/cint/PLIST
index 7c4031322c6..e5c9ccbbb76 100644
--- a/lang/cint/PLIST
+++ b/lang/cint/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/05/26 12:30:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:02 jlam Exp $
 bin/cint
 bin/makecint
 cint/G__ci.h
@@ -110,7 +110,7 @@ cint/include/new
 cint/include/new.h
 cint/include/ostream
 cint/include/platform.h
-${HAVE_THR}cint/include/pthread.dll
+${PLIST.threads}cint/include/pthread.dll
 cint/include/pthread.h
 cint/include/readfile.h
 cint/include/regex.h
diff --git a/lang/clisp/PLIST b/lang/clisp/PLIST
index 4504d851ec1..7cce5d42677 100644
--- a/lang/clisp/PLIST
+++ b/lang/clisp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2008/02/29 19:34:44 tnn Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:02 jlam Exp $
 bin/clisp
 lib/clisp/base/calls.o
 lib/clisp/base/gettext.o
@@ -18,16 +18,16 @@ lib/clisp/base/width.o
 lib/clisp/clisp-link
 lib/clisp/data/Symbol-Table.text
 lib/clisp/data/UnicodeDataFull.txt
-${bdb}lib/clisp/full/bdb.o
+${PLIST.bdb}lib/clisp/full/bdb.o
 lib/clisp/full/calls.o
-${mit-clx}lib/clisp/full/clx.o
-${new-clx}lib/clisp/full/clx.o
-${pcre}lib/clisp/full/cpcre.o
-${fastcgi}lib/clisp/full/fastcgi.o
-${fastcgi}lib/clisp/full/fastcgi_wrappers.o
+${PLIST.mit-clx}lib/clisp/full/clx.o
+${PLIST.new-clx}lib/clisp/full/clx.o
+${PLIST.pcre}lib/clisp/full/cpcre.o
+${PLIST.fastcgi}lib/clisp/full/fastcgi.o
+${PLIST.fastcgi}lib/clisp/full/fastcgi_wrappers.o
 lib/clisp/full/gettext.o
-${gdbm}lib/clisp/full/gdbm.o
-${gtk2}lib/clisp/full/gtk.o
+${PLIST.gdbm}lib/clisp/full/gdbm.o
+${PLIST.gtk2}lib/clisp/full/gtk.o
 lib/clisp/full/libnoreadline.a
 lib/clisp/full/lisp.a
 lib/clisp/full/lisp.run
@@ -36,16 +36,16 @@ lib/clisp/full/localcharset.o
 lib/clisp/full/makevars
 lib/clisp/full/modules.h
 lib/clisp/full/modules.o
-${pgsql}lib/clisp/full/postgresql.o
-${rawsock}lib/clisp/full/rawsock.o
+${PLIST.pgsql}lib/clisp/full/postgresql.o
+${PLIST.rawsock}lib/clisp/full/rawsock.o
 lib/clisp/full/readline.o
 lib/clisp/full/regexi.o
 lib/clisp/full/regexp.dvi
 lib/clisp/full/uniname.o
 lib/clisp/full/width.o
-${wildcard}lib/clisp/full/wildcard.dvi
-${wildcard}lib/clisp/full/wildcard.o
-${zlib}lib/clisp/full/zlib.o
+${PLIST.wildcard}lib/clisp/full/wildcard.dvi
+${PLIST.wildcard}lib/clisp/full/wildcard.o
+${PLIST.zlib}lib/clisp/full/zlib.o
 lib/clisp/linkkit/clisp.h
 lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
diff --git a/lang/clisp/options.mk b/lang/clisp/options.mk
index 580f3a3f769..e09515a9285 100644
--- a/lang/clisp/options.mk
+++ b/lang/clisp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/02/29 19:34:44 tnn Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:02 jlam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.clisp
 
@@ -25,11 +25,11 @@ PKG_SUGGESTED_OPTIONS+=		gmalloc
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
 .for option in ${PKG_SUPPORTED_OPTIONS}
 .  if !empty(PKG_OPTIONS:M${option})
-PLIST_SUBST+=	${option}=""
-.  else
-PLIST_SUBST+=	${option}="@comment "
+PLIST.${option}=	yes
 .  endif
 .endfor
 
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 068d8e69ab1..48ae36043ad 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/01/12 11:48:39 tonio Exp $
+# $NetBSD: Makefile,v 1.20 2008/04/12 22:43:02 jlam Exp $
 #
 
 DISTNAME=	coq-8.1pl3
@@ -33,15 +33,14 @@ _STRIPFLAG_CC=
 _STRIPFLAG_INSTALL=
 .endif
 
+PLIST_VARS=		coqide
 PKG_OPTIONS_VAR=	PKG_OPTIONS.coq
 PKG_SUPPORTED_OPTIONS=	coqide
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mcoqide)
 .include "../../x11/lablgtk/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-PLIST_SUBST+=	WITH_IDE=''
-.else
-PLIST_SUBST+=	WITH_IDE='@comment '
+PLIST.coqide=		yes
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/lang/coq/PLIST b/lang/coq/PLIST
index e03005158b4..3bf6d11d594 100644
--- a/lang/coq/PLIST
+++ b/lang/coq/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.6 2007/12/01 13:05:36 tonio Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:02 jlam Exp $
 bin/coq-interface
 bin/coq-tex
 bin/coq_makefile
 bin/coqc
 bin/coqdep
 bin/coqdoc
-${WITH_IDE}bin/coqide
-${WITH_IDE}bin/coqide.byte
+${PLIST.coqide}bin/coqide
+${PLIST.coqide}bin/coqide.byte
 bin/coqmktop
 bin/coqtop
 bin/coqtop.byte
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 311638dcc88..8610f31a0dd 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/08/17 22:27:15 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:02 jlam Exp $
 
 DISTNAME=	elk-3.99.7
 CATEGORIES=	lang
@@ -14,7 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		WITH_XAW=${ELK_AWK:Q}
 
 .include "options.mk"
 
diff --git a/lang/elk/PLIST b/lang/elk/PLIST
index 6a2c3700fe2..eff7d35fad3 100644
--- a/lang/elk/PLIST
+++ b/lang/elk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/10/15 23:07:21 tonio Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:02 jlam Exp $
 bin/elk
 bin/scheme-elk
 include/elk/compat.h
@@ -28,12 +28,12 @@ lib/elk/record.la
 lib/elk/regexp.la
 lib/elk/struct.la
 lib/elk/unix.la
-${WITHMOTIF}lib/elk/motif.la
-${WITHXAW}lib/elk/xaw.la
-${WITHX11}lib/elk/xlib.la
+${PLIST.motif}lib/elk/motif.la
+${PLIST.xaw}lib/elk/xaw.la
+${PLIST.x11}lib/elk/xlib.la
 lib/libelk.la
-${WITHX11}lib/libelk-xlib.la
-${WITHX11}lib/libelk-xt.la
+${PLIST.x11}lib/libelk-xlib.la
+${PLIST.x11}lib/libelk-xt.la
 man/man1/elk.1
 man/man1/scheme-elk.1
 share/doc/elk/examples/c++/class.cpp
@@ -139,10 +139,10 @@ share/elk/struct.scm
 share/elk/toplevel.scm
 share/elk/trace.scm
 share/elk/unix.scm
-${WITHXAW}share/elk/xaw.scm
-${WITHX11}share/elk/xlib.scm
-${WITHX11}share/elk/xwidgets.scm
-${WITHMOTIF}share/elk/motif.scm
+${PLIST.xaw}share/elk/xaw.scm
+${PLIST.x11}share/elk/xlib.scm
+${PLIST.x11}share/elk/xwidgets.scm
+${PLIST.motif}share/elk/motif.scm
 @dirrm share/elk
 @dirrm share/doc/elk/ps
 @dirrm share/doc/elk/examples/xlib
diff --git a/lang/elk/options.mk b/lang/elk/options.mk
index a0f155fe8de..9da6e4d7724 100644
--- a/lang/elk/options.mk
+++ b/lang/elk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2007/08/17 22:27:15 joerg Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:02 jlam Exp $
 
 # Global and legacy options
 
@@ -8,28 +8,24 @@ PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		x11 xaw motif
+
 ###
 ### x11 support
 ###
 .if !empty(PKG_OPTIONS:Mxaw) || !empty(PKG_OPTIONS:Mmotif)
-PLIST_SUBST+= WITHX11=""
+PLIST.x11=		yes
 .  if !empty(PKG_OPTIONS:Mxaw)
-PLIST_SUBST+= WITHXAW=""
-ELK_AWK="yes"
+PLIST.xaw=		yes
+CONFIGURE_ENV+=		WITH_XAW="yes"
 .    include "../../mk/xaw.buildlink3.mk"
 .  else
-PLIST_SUBST+= WITHXAW="@comment "
-ELK_AWK="no"
+CONFIGURE_ENV+=		WITH_XAW="no"
 .  endif
 .  if !empty(PKG_OPTIONS:Mmotif)
 .  include "../../mk/motif.buildlink3.mk"
-PLIST_SUBST+= WITHMOTIF=""
-.  else
-PLIST_SUBST+= WITHMOTIF="@comment "
+PLIST.motif=		yes
 .  endif
 .else
 CONFIGURE_ARGS+=	--without-x
-PLIST_SUBST+= WITHMOTIF="@comment "
-PLIST_SUBST+= WITHX11="@comment "
-PLIST_SUBST+= WITHXAW="@comment "
 .endif
diff --git a/lang/gauche/PLIST b/lang/gauche/PLIST
index dde76705078..ebf6c534755 100644
--- a/lang/gauche/PLIST
+++ b/lang/gauche/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2008/03/01 19:57:44 tnn Exp $
+@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:02 jlam Exp $
 bin/gauche-cesconv
 bin/gauche-config
 bin/gauche-install
@@ -18,7 +18,7 @@ lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-install
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-package
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-parameter-lib.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gauche-sequence-lib.so
-${USE_GDBM}lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gdbm.so
+${PLIST.gdbm}lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gdbm.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gosh
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libcharconv.so
 lib/gauche/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/libgauche-uvector.so
@@ -103,7 +103,7 @@ share/gauche/${PKGVERSION}/lib/dbd/null.scm
 share/gauche/${PKGVERSION}/lib/dbi.scm
 share/gauche/${PKGVERSION}/lib/dbm.scm
 share/gauche/${PKGVERSION}/lib/dbm/fsdbm.scm
-${USE_GDBM}share/gauche/${PKGVERSION}/lib/dbm/gdbm.scm
+${PLIST.gdbm}share/gauche/${PKGVERSION}/lib/dbm/gdbm.scm
 share/gauche/${PKGVERSION}/lib/dbm/ndbm.scm
 share/gauche/${PKGVERSION}/lib/file/filter.scm
 share/gauche/${PKGVERSION}/lib/file/util.scm
diff --git a/lang/gauche/options.mk b/lang/gauche/options.mk
index 2790cb34b39..d4d7b40ad92 100644
--- a/lang/gauche/options.mk
+++ b/lang/gauche/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2007/01/19 14:02:39 uebayasi Exp $
+# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:02 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gauche
 PKG_OPTIONS_OPTIONAL_GROUPS=	multibyte
@@ -16,12 +16,11 @@ PKG_OPTIONS_LEGACY_OPTS+=	multibyte:utf8
 ### GDBM extension.  Modules seem to be better tested with GDBM
 ### than NDBM.
 ###
+PLIST_VARS+=	gdbm
 .if !empty(PKG_OPTIONS:Mgdbm)
 .  include "../../databases/gdbm/buildlink3.mk"
-PLIST_SUBST+=	USE_GDBM=''
+PLIST.gdbm=	yes
 MAKE_ENV+=	GDBM_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gdbm}/lib
-.else
-PLIST_SUBST+=	USE_GDBM='@comment '
 .endif
 
 ###
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index a0be4440c58..971dd535f4d 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/10/04 21:07:52 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2008/04/12 22:43:02 jlam Exp $
 #
 
 DISTNAME=	Python-2.1.3
@@ -35,6 +35,8 @@ INSTALL_TARGET=		altinstall
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS=	bsddb socket termios
+
 PLIST_SRC=	${.CURDIR}/../../lang/python21/PLIST.common
 .if exists(${.CURDIR}/../../lang/python21/PLIST.${OPSYS})
 PLIST_SRC+=	${.CURDIR}/../../lang/python21/PLIST.${OPSYS}
@@ -52,29 +54,23 @@ PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
 PLIST_SUBST+=	PY_PLATNAME=${PY_PLATNAME:Q}
 
-PLAT_SOCKET=	"@comment "
-PLAT_TERMIOS=	"@comment "
 .if !empty(MACHINE_PLATFORM:MNetBSD-[2-9].*)
 .  if exists(/usr/include/sys/socket.h)
-PLAT_SOCKET=	""
+PLIST.socket=	yes
 .  endif
 .  if exists(/usr/include/termios.h)
-PLAT_TERMIOS=	""
+PLIST.termios=	yes
 .  endif
 .endif
-PLIST_SUBST+=	PLAT_SOCKET=${PLAT_SOCKET} PLAT_TERMIOS=${PLAT_TERMIOS}
 
 # bsddb.so is not built on Solaris (or IRIX?)
-BSDDB=
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "IRIX"
-BSDDB=		"@comment "
-.else
-.include "../../mk/bdb.buildlink3.mk"
+.if ${OPSYS} != "SunOS" && ${OPSYS} != "IRIX"
+.  include "../../mk/bdb.buildlink3.mk"
+PLIST.bsddb=	yes
 MAKE_ENV+=	PY_BDB_TYPE=${BDB_TYPE:Q}
 MAKE_ENV+=	PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 MAKE_ENV+=	PY_BDB_LIBDIRS=${BDBBASE}/lib
 .endif
-PLIST_SUBST+=	BSDDB=${BSDDB}
 
 PLIST_SUBST+=	PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
 
diff --git a/lang/python21/PLIST.common b/lang/python21/PLIST.common
index 4dc02cd6363..a431b70e98e 100644
--- a/lang/python21/PLIST.common
+++ b/lang/python21/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2005/05/29 11:18:35 minskim Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2008/04/12 22:43:02 jlam Exp $
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 include/python${PY_VER_SUFFIX}/Python.h
@@ -622,7 +622,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
-${BSDDB}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb.so
+${PLIST.bsddb}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so
@@ -832,12 +832,12 @@ lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/FCNTL.pyo
 lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.py
 lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.pyc
 lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.pyo
-${PLAT_SOCKET}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.py
-${PLAT_SOCKET}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.pyc
-${PLAT_SOCKET}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.pyo
-${PLAT_TERMIOS}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.py
-${PLAT_TERMIOS}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.pyc
-${PLAT_TERMIOS}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.pyo
+${PLIST.socket}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.py
+${PLIST.socket}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.pyc
+${PLIST.socket}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SOCKET.pyo
+${PLIST.termios}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.py
+${PLIST.termios}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.pyc
+${PLIST.termios}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TERMIOS.pyo
 lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/regen
 lib/python${PY_VER_SUFFIX}/popen2.py
 lib/python${PY_VER_SUFFIX}/popen2.pyc
diff --git a/lang/python23/Makefile.common b/lang/python23/Makefile.common
index 22fc97537a3..216da3bd470 100644
--- a/lang/python23/Makefile.common
+++ b/lang/python23/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.37 2007/12/24 01:19:47 minskim Exp $
+# $NetBSD: Makefile.common,v 1.38 2008/04/12 22:43:02 jlam Exp $
 #
 
 DISTNAME=	Python-2.3.5
@@ -59,29 +59,26 @@ IS_64BIT_PLATFORM?=	no
 .endif
 
 # the dl module isn't built for 64 bit archs and Darwin
-.if !empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) || \
-    (${OPSYS} == "Darwin") || (${OPSYS} == "Interix")
-PLIST_SUBST+=	DLMODULE="@comment "
-.else
-PLIST_SUBST+=	DLMODULE=
+PLIST_VARS+=		dl
+.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) && \
+    (${OPSYS} != "Darwin") && (${OPSYS} != "Interix")
+PLIST.dl=		yes
 .endif
 
 # setup.py causes some modules to be built if the platform is *not* 64bit.
+PLIST_VARS+=		extra-so
 .if !empty(IS_64BIT_PLATFORM:M[nN][oO])
-PLIST_SUBST+=	EXTRA_SO=
-.else
-PLIST_SUBST+=	EXTRA_SO="@comment "
+PLIST.extra-so=		yes
 .endif
 
 # ossaudiodev is only available on x86 for the following platforms
+PLIST_VARS+=		oss
 .if (${MACHINE_ARCH} == "i386") && \
     (${PY_PLATNAME} == "linux2" || ${PY_PLATNAME} == "freebsd4" || \
      ${PY_PLATNAME} == "freebsd5")
-PLIST_SUBST+=	OSSAUDIODEV=
+PLIST.oss=		yes
 .elif (${MACHINE_ARCH} == "x86_64") && (${PY_PLATNAME} == "linux2")
-PLIST_SUBST+=	OSSAUDIODEV=
-.else
-PLIST_SUBST+=	OSSAUDIODEV="@comment "
+PLIST.oss=		yes
 .endif
 
 # Make sure python modules can link correctly
@@ -89,27 +86,23 @@ PLIST_SUBST+=	OSSAUDIODEV="@comment "
 INSTALL_UNSTRIPPED=	yes
 .endif
 
+PLIST_VARS+=	bsddb dll nis
 .if ${OPSYS} == "IRIX"
-.  if ${ABI} == "64"
-PLIST_SUBST+=	NISMODULE="@comment "
-.  else
-PLIST_SUBST+=	NISMODULE=
+.  if ${ABI} != "64"
+PLIST.nis=	yes
 .  endif
-PLIST_SUBST+=	BSDDBMODULE="@comment "
-PLIST_SUBST+=	NOSHLIB="@comment "
 .else
 .  include "../../mk/bdb.buildlink3.mk"
 MAKE_ENV+=	PY_BDB_TYPE=${BDB_TYPE:Q}
 MAKE_ENV+=	PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 MAKE_ENV+=	PY_BDB_LIBDIRS=${BDBBASE}/lib
 MAKE_ENV+=	PY_BDB_LIBS=${BDB_LIBS:Q}
-PLIST_SUBST+=	BSDDBMODULE=
-PLIST_SUBST+=	NOSHLIB=
+PLIST.bsddb=	yes
+PLIST.dll=	yes
 .  if ${OPSYS} == "Interix"
-PLIST_SUBST+=	NISMODULE="@comment "
 CONFIGURE_ENV+=	ac_cv_header_stropts_h=no
 .  else
-PLIST_SUBST+=	NISMODULE=
+PLIST.nis=	yes
 .  endif
 .endif
 
diff --git a/lang/python23/PLIST.common b/lang/python23/PLIST.common
index 82ebc5caef2..759b49c312f 100644
--- a/lang/python23/PLIST.common
+++ b/lang/python23/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2004/11/24 20:45:10 jschauma Exp $
+@comment $NetBSD: PLIST.common,v 1.8 2008/04/12 22:43:02 jlam Exp $
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 include/python${PY_VER_SUFFIX}/Python.h
@@ -72,8 +72,8 @@ include/python${PY_VER_SUFFIX}/tupleobject.h
 include/python${PY_VER_SUFFIX}/ucnhash.h
 include/python${PY_VER_SUFFIX}/unicodeobject.h
 include/python${PY_VER_SUFFIX}/weakrefobject.h
-${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so
-${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so.1.0
+${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so
+${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so.1.0
 lib/python${PY_VER_SUFFIX}/BaseHTTPServer.py
 lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyc
 lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyo
@@ -1126,9 +1126,9 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ssl.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_testcapi.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
-${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
+${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
-${BSDDBMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
+${PLIST.bsddb}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so
@@ -1136,23 +1136,23 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/cmath.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/crypt.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so
-${DLMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
+${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
-${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
+${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/md5.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
-${NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
+${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/pcre.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/pwd.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/regex.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
-${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
-${OSSAUDIODEV}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
+${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
+${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/rotor.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/sha.so
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 80edd24bbdc..9ae8e7d1887 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2008/04/11 10:44:08 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2008/04/12 22:43:02 jlam Exp $
 
 DISTNAME=	Python-2.4.5
 PKGNAME=	python24-2.4.5
@@ -69,37 +69,34 @@ IS_64BIT_PLATFORM?=	no
 .endif
 
 # the dl module isn't built for 64 bit archs and Darwin
-.if !empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) || (${OPSYS} == "Darwin")
-PLIST_SUBST+=	DLMODULE="@comment "
-.else
-PLIST_SUBST+=	DLMODULE=
+PLIST_VARS+=	dl
+.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) && (${OPSYS} != "Darwin")
+PLIST.dl=	yes
 .endif
 
 # setup.py causes some modules to be built if the platform is *not* 64bit.
+PLIST_VARS+=	extra-so
 .if !empty(IS_64BIT_PLATFORM:M[nN][oO])
-PLIST_SUBST+=	EXTRA_SO=
-.else
-PLIST_SUBST+=	EXTRA_SO="@comment "
+PLIST.extra-so=	yes
 .endif
 
 # ossaudiodev is only available on x86 for the following platforms
+PLIST_VARS+=	oss
 .if (${MACHINE_ARCH} == "i386") && \
     (${PY_PLATNAME} == "linux2" || ${OPSYS} == "FreeBSD")
-PLIST_SUBST+=	OSSAUDIODEV=
+PLIST.oss=	yes
 .elif (${MACHINE_ARCH} == "x86_64") && (${PY_PLATNAME} == "linux2")
-PLIST_SUBST+=	OSSAUDIODEV=
-.else
-PLIST_SUBST+=	OSSAUDIODEV="@comment "
+PLIST.oss=	yes
 .endif
 
 # Mac OS X Leopard support:
 # 1.) Fix detection of setpgrp(2).
 # 2.) "lib-dynload/_OSA.so" isn't built.
+PLIST_VARS+=	osa
 .if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
 CFLAGS+=	-D__DARWIN_UNIX03
-PLIST_SUBST+=	LEOPARD="@comment "
 .else
-PLIST_SUBST+=	LEOPARD=
+PLIST.osa=	yes
 .endif
 
 # Make sure python modules can link correctly
@@ -108,30 +105,25 @@ INSTALL_UNSTRIPPED=	yes
 CFLAGS+=		-I${WRKSRC}/Include
 .endif
 
+PLIST_VARS+=	bsddb dll nis no-nis
 .if ${OPSYS} == "IRIX"
 .  if ${ABI} == "64"
-PLIST_SUBST+=	NISMODULE="@comment "
-PLIST_SUBST+=	NO_NISMODULE="@comment "
+PLIST.no-nis=	yes
 .  else
-PLIST_SUBST+=	NISMODULE=
-PLIST_SUBST+=	NO_NISMODULE="@comment "
+PLIST.nis=	yes
 .  endif
-PLIST_SUBST+=	BSDDBMODULE="@comment "
-PLIST_SUBST+=	NOSHLIB="@comment "
 .else
 .  include "../../mk/bdb.buildlink3.mk"
 MAKE_ENV+=	PY_BDB_TYPE=${BDB_TYPE:Q}
 MAKE_ENV+=	PY_BDB_INCDIRS=${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 MAKE_ENV+=	PY_BDB_LIBDIRS=${BDBBASE}/lib
 LIBS+=		${BDB_LIBS}
-PLIST_SUBST+=	BSDDBMODULE=
-PLIST_SUBST+=	NOSHLIB=
+PLIST.bsddb=	yes
+PLIST.dll=	yes
 .if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
-PLIST_SUBST+=	NISMODULE=
-PLIST_SUBST+=	NO_NISMODULE="@comment "
+PLIST.nis=	yes
 .else
-PLIST_SUBST+=	NISMODULE="@comment "
-PLIST_SUBST+=	NO_NISMODULE=
+PLIST.no-nis=	yes
 .endif
 .endif
 
diff --git a/lang/python24/PLIST.Darwin b/lang/python24/PLIST.Darwin
index ba82423fec3..36a2765e749 100644
--- a/lang/python24/PLIST.Darwin
+++ b/lang/python24/PLIST.Darwin
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.5 2007/12/15 18:43:32 tron Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.6 2008/04/12 22:43:02 jlam Exp $
 lib/libpython2.4.2.dylib
 lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so
@@ -25,7 +25,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_Launch.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_List.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Menu.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Mlte.so
-${LEOPARD}lib/python${PY_VER_SUFFIX}/lib-dynload/_OSA.so
+${PLIST.osa}lib/python${PY_VER_SUFFIX}/lib-dynload/_OSA.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qd.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qdoffs.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qt.so
diff --git a/lang/python24/PLIST.common b/lang/python24/PLIST.common
index 2b0bba56468..c79af0e6078 100644
--- a/lang/python24/PLIST.common
+++ b/lang/python24/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.9 2008/04/11 10:44:08 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2008/04/12 22:43:02 jlam Exp $
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 bin/smtpd${PY_VER_SUFFIX}.py
@@ -77,8 +77,8 @@ include/python${PY_VER_SUFFIX}/tupleobject.h
 include/python${PY_VER_SUFFIX}/ucnhash.h
 include/python${PY_VER_SUFFIX}/unicodeobject.h
 include/python${PY_VER_SUFFIX}/weakrefobject.h
-${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so
-${NOSHLIB}lib/libpython${PY_VER_SUFFIX}.so.1.0
+${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so
+${PLIST.dll}lib/libpython${PY_VER_SUFFIX}.so.1.0
 lib/python${PY_VER_SUFFIX}/BaseHTTPServer.py
 lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyc
 lib/python${PY_VER_SUFFIX}/BaseHTTPServer.pyo
@@ -1277,7 +1277,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/array.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so
-${BSDDBMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
+${PLIST.bsddb}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so
@@ -1286,22 +1286,22 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/collections.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/crypt.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so
-${DLMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
+${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
-${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
+${PLIST.extra-so}}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/md5.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
-${NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
-${NO_NISMODULE}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
+${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
+${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/regex.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
-${EXTRA_SO}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
-${OSSAUDIODEV}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
+${PLIST.extra-so}}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
+${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/sha.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile
index f2266d52ca9..4f0ee529823 100644
--- a/lang/ruby18-base/Makefile
+++ b/lang/ruby18-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2008/01/04 15:42:34 ghen Exp $
+# $NetBSD: Makefile,v 1.41 2008/04/12 22:43:02 jlam Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
@@ -57,10 +57,9 @@ CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q}
 #
 # IRIX work around which should be fixed.
 #
-.if ${OPSYS} == "IRIX"
-PLIST_SUBST+=	HAS_IO="@comment "
-.else
-PLIST_SUBST+=	HAS_IO=
+PLIST_VARS+=	io
+.if ${OPSYS} != "IRIX"
+PLIST.io=	yes
 .endif
 
 #
diff --git a/lang/ruby18-base/PLIST b/lang/ruby18-base/PLIST
index adc1be208c0..6deb309ed0a 100644
--- a/lang/ruby18-base/PLIST
+++ b/lang/ruby18-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2008/03/10 02:50:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:02 jlam Exp $
 bin/erb${RUBY_VER}
 bin/h2rb${RUBY_VER}
 bin/irb${RUBY_VER}
@@ -83,7 +83,7 @@ ${RUBY_ARCHLIBDIR}/etc.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/fcntl.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/iconv.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/intern.h
-${HAS_IO}${RUBY_ARCHLIBDIR}/io/wait.${RUBY_DLEXT}
+${PLIST.io}${RUBY_ARCHLIBDIR}/io/wait.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/missing.h
 ${RUBY_ARCHLIBDIR}/nkf.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/node.h
@@ -109,7 +109,7 @@ ${RUBY_ARCHLIBDIR}/version.h
 ${RUBY_ARCHLIBDIR}/zlib.${RUBY_DLEXT}
 @exec ${MKDIR} %D/${RUBY_SITEARCHLIBDIR}
 ${RUBY_LIBDIR}/importenv.rb
-${HAS_IO}${RUBY_LIBDIR}/io/nonblock.rb
+${PLIST.io}${RUBY_LIBDIR}/io/nonblock.rb
 ${RUBY_LIBDIR}/ipaddr.rb
 ${RUBY_LIBDIR}/irb/cmd/chws.rb
 ${RUBY_LIBDIR}/irb/cmd/fork.rb
diff --git a/lang/smlnj/Makefile.common b/lang/smlnj/Makefile.common
index d48c0fe1567..a090c3b30d5 100644
--- a/lang/smlnj/Makefile.common
+++ b/lang/smlnj/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2006/10/19 19:47:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/04/12 22:43:02 jlam Exp $
 
 # smlnj also supports hppa, sparc, ppc, mlrisc & alpha
 # pkg support for those platforms, and say, solaris-x86
@@ -17,19 +17,21 @@ OS=		${LOWER_OPSYS}
 OS=		bsd
 .endif
 
-NLFFI=		# not available on all platforms
+PLIST_VARS+=	nlffi		# not available on all platforms
 
 .if ${MACHINE_ARCH} == "i386"
 BOX=		x86
+PLIST.nlffi=	yes
 .elif ${MACHINE_ARCH} == "powerpc"
 BOX=		ppc
-NLFFI=		"@comment "
 .elif ${MACHINE_ARCH} == "sparc"
 BOX=		${MACHINE_ARCH}
+PLIST.nlffi=	yes
 .else
 # for "make fetch", default to i386 instead of trying to download
 # a non-existing file
 BOX=		x86
+PLIST.nlffi=	yes
 .endif
 
 PLIST_SUBST+=	BOX=${BOX:Q} OS=${OS:Q} NLFFI=${NLFFI}
diff --git a/lang/smlnj/PLIST b/lang/smlnj/PLIST
index 355ff4653f8..148f74f801d 100644
--- a/lang/smlnj/PLIST
+++ b/lang/smlnj/PLIST
@@ -1,16 +1,16 @@
-@comment $NetBSD: PLIST,v 1.4 2004/06/06 04:38:29 snj Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:03 jlam Exp $
 bin/ml-build
 bin/ml-burg
 bin/ml-lex
 bin/ml-makedepend
-${NLFFI}bin/ml-nlffigen
+${PLIST.nlffi}bin/ml-nlffigen
 bin/ml-yacc
 bin/nowhere
 bin/sml
 lib/smlnj/bin/.arch-n-opsys
 lib/smlnj/bin/.heap/ml-burg.${BOX}-${OS}
 lib/smlnj/bin/.heap/ml-lex.${BOX}-${OS}
-${NLFFI}lib/smlnj/bin/.heap/ml-nlffigen.${BOX}-${OS}
+${PLIST.nlffi}lib/smlnj/bin/.heap/ml-nlffigen.${BOX}-${OS}
 lib/smlnj/bin/.heap/ml-yacc.${BOX}-${OS}
 lib/smlnj/bin/.heap/nowhere.${BOX}-${OS}
 lib/smlnj/bin/.heap/sml.${BOX}-${OS}
@@ -21,7 +21,7 @@ lib/smlnj/bin/ml-build
 lib/smlnj/bin/ml-burg
 lib/smlnj/bin/ml-lex
 lib/smlnj/bin/ml-makedepend
-${NLFFI}lib/smlnj/bin/ml-nlffigen
+${PLIST.nlffi}lib/smlnj/bin/ml-nlffigen
 lib/smlnj/bin/ml-yacc
 lib/smlnj/bin/nowhere
 lib/smlnj/bin/sml
@@ -38,9 +38,9 @@ lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/SPARC.cm
 lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Visual.cm
 lib/smlnj/lib/basis.cm/CM/${BOX}-unix/basis.cm
 lib/smlnj/lib/burg-ext.cm/CM/${BOX}-unix/burg-ext.cm
-${NLFFI}lib/smlnj/lib/c/CM/${BOX}-unix/c.cm
-${NLFFI}lib/smlnj/lib/c/internals/CM/${BOX}-unix/c-int.cm
-${NLFFI}lib/smlnj/lib/c/memory/CM/${BOX}-unix/memory.cm
+${PLIST.nlffi}lib/smlnj/lib/c/CM/${BOX}-unix/c.cm
+${PLIST.nlffi}lib/smlnj/lib/c/internals/CM/${BOX}-unix/c-int.cm
+${PLIST.nlffi}lib/smlnj/lib/c/memory/CM/${BOX}-unix/memory.cm
 lib/smlnj/lib/ckit-lib.cm/CM/${BOX}-unix/ckit-lib.cm
 lib/smlnj/lib/cml-lib/CM/${BOX}-unix/smlnj-lib.cm
 lib/smlnj/lib/cml-lib/CM/${BOX}-unix/trace-cml.cm
@@ -239,15 +239,15 @@ lib/smlnj/lib/unix-lib.cm/CM/${BOX}-unix/unix-lib.cm
 @dirrm lib/smlnj/lib/ckit-lib.cm/CM/${BOX}-unix
 @dirrm lib/smlnj/lib/ckit-lib.cm/CM
 @dirrm lib/smlnj/lib/ckit-lib.cm
-${NLFFI}@dirrm lib/smlnj/lib/c/memory/CM/${BOX}-unix
-${NLFFI}@dirrm lib/smlnj/lib/c/memory/CM
-${NLFFI}@dirrm lib/smlnj/lib/c/memory
-${NLFFI}@dirrm lib/smlnj/lib/c/internals/CM/${BOX}-unix
-${NLFFI}@dirrm lib/smlnj/lib/c/internals/CM
-${NLFFI}@dirrm lib/smlnj/lib/c/internals
-${NLFFI}@dirrm lib/smlnj/lib/c/CM/${BOX}-unix
-${NLFFI}@dirrm lib/smlnj/lib/c/CM
-${NLFFI}@dirrm lib/smlnj/lib/c
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c/memory/CM/${BOX}-unix
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c/memory/CM
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c/memory
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c/internals/CM/${BOX}-unix
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c/internals/CM
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c/internals
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c/CM/${BOX}-unix
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c/CM
+${PLIST.nlffi}@dirrm lib/smlnj/lib/c
 @dirrm lib/smlnj/lib/burg-ext.cm/CM/${BOX}-unix
 @dirrm lib/smlnj/lib/burg-ext.cm/CM
 @dirrm lib/smlnj/lib/burg-ext.cm
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index dce8f7f67ff..8574f928f86 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2008/03/05 21:50:22 tnn Exp $
+# $NetBSD: Makefile,v 1.48 2008/04/12 22:43:03 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -42,9 +42,10 @@ PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	jce
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip
-PLIST_SUBST+=	SUN_JRE14_USE_JCE=""
+PLIST.jce=	yes
 
 END_MESSAGE=								\
 	""								\
@@ -53,8 +54,6 @@ END_MESSAGE=								\
 	""								\
 	"Under 'Other Downloads' / 'Java Cryptography Extension'"	\
 	"click 'Download' and choose the .zip file."
-.else
-PLIST_SUBST+=	SUN_JRE14_USE_JCE="@comment "
 .endif
 
 # Some of the binaries require libX11, so ensure that requirement is
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index f8d203600d5..342bf258309 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2008/03/05 21:50:22 tnn Exp $
+@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:43:03 jlam Exp $
 bin/sun14-java
 bin/sun14-keytool
 bin/sun14-orbd
@@ -187,8 +187,8 @@ java/sun-1.4/lib/plugin.jar
 java/sun-1.4/lib/psfont.properties.ja.default
 java/sun-1.4/lib/psfontj2d.properties.default
 java/sun-1.4/lib/rt.jar
-${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/COPYRIGHT.html
-${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/README.txt
+${PLIST.jce}java/sun-1.4/lib/security/COPYRIGHT.html
+${PLIST.jce}java/sun-1.4/lib/security/README.txt
 java/sun-1.4/lib/security/US_export_policy.jar
 java/sun-1.4/lib/security/cacerts
 java/sun-1.4/lib/security/java.policy
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index abd76a8f0ad..6ac63037699 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2008/03/31 22:10:07 tnn Exp $
+# $NetBSD: Makefile,v 1.53 2008/04/12 22:43:03 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
@@ -36,11 +36,10 @@ PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	jce
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip
-PLIST_SUBST+=	SUN_JRE15_USE_JCE=""
-.else
-PLIST_SUBST+=	SUN_JRE15_USE_JCE="@comment "
+PLIST.jce=	yes
 .endif
 
 # Some of the binaries require libX11, so ensure that requirement is
diff --git a/lang/sun-jre15/PLIST.linux-i386 b/lang/sun-jre15/PLIST.linux-i386
index 2837d028a19..0090e7260f5 100644
--- a/lang/sun-jre15/PLIST.linux-i386
+++ b/lang/sun-jre15/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.6 2008/01/07 19:56:27 tron Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.7 2008/04/12 22:43:03 jlam Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -185,8 +185,8 @@ java/sun-1.5/lib/plugin.jar
 java/sun-1.5/lib/psfont.properties.ja.default
 java/sun-1.5/lib/psfontj2d.properties.default
 java/sun-1.5/lib/rt.jar
-${SUN_JRE15_USE_JCE}java/sun-1.5/lib/security/COPYRIGHT.html
-${SUN_JRE15_USE_JCE}java/sun-1.5/lib/security/README.txt
+${PLIST.jce}java/sun-1.5/lib/security/COPYRIGHT.html
+${PLIST.jce}java/sun-1.5/lib/security/README.txt
 java/sun-1.5/lib/security/US_export_policy.jar
 java/sun-1.5/lib/security/cacerts
 java/sun-1.5/lib/security/java.policy
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile
index 036bb26b05a..da886590a06 100644
--- a/lang/sun-jre6/Makefile
+++ b/lang/sun-jre6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/03/12 14:26:33 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2008/04/12 22:43:03 jlam Exp $
 
 # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -38,11 +38,10 @@ PKG_SUPPORTED_OPTIONS=	sun-jre-jce
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	jce
 .if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} jce_policy-6.zip
-PLIST_SUBST+=	SUN_JRE6_USE_JCE=""
-.else
-PLIST_SUBST+=	SUN_JRE6_USE_JCE="@comment "
+PLIST.jce=	yes
 .endif
 
 # Some of the binaries require libX11, so ensure that requirement is
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index e1065e33216..6ef37fc87be 100644
--- a/lang/sun-jre6/PLIST.linux-i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.6 2008/03/05 22:32:09 tnn Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.7 2008/04/12 22:43:03 jlam Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -239,8 +239,8 @@ java/sun-6/lib/psfont.properties.ja.default
 java/sun-6/lib/psfontj2d.properties.default
 java/sun-6/lib/resources.jar
 java/sun-6/lib/rt.jar
-${SUN_JRE6_USE_JCE}java/sun-6/lib/security/COPYRIGHT.html
-${SUN_JRE6_USE_JCE}java/sun-6/lib/security/README.txt
+${PLIST.jce}java/sun-6/lib/security/COPYRIGHT.html
+${PLIST.jce}java/sun-6/lib/security/README.txt
 java/sun-6/lib/security/US_export_policy.jar
 java/sun-6/lib/security/cacerts
 java/sun-6/lib/security/java.policy