summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/allegro/PLIST4
-rw-r--r--devel/allegro/options.mk8
-rw-r--r--devel/binutils/Makefile9
-rw-r--r--devel/binutils/PLIST.common30
-rw-r--r--devel/doxygen/Makefile8
-rw-r--r--devel/doxygen/PLIST18
-rw-r--r--devel/gmake/Makefile8
-rw-r--r--devel/gmake/PLIST4
-rw-r--r--devel/hdf5/PLIST86
-rw-r--r--devel/hdf5/options.mk8
-rw-r--r--devel/kdesdk3/PLIST108
-rw-r--r--devel/kdesdk3/options.mk8
-rw-r--r--devel/kdevelop-base/PLIST26
-rw-r--r--devel/kdevelop-base/options.mk8
-rw-r--r--devel/libgphoto2/Makefile13
-rw-r--r--devel/libgphoto2/PLIST.common4
-rw-r--r--devel/libtool-base/Makefile9
-rw-r--r--devel/libtool-base/PLIST4
-rw-r--r--devel/m17n-lib/PLIST24
-rw-r--r--devel/m17n-lib/options.mk7
-rw-r--r--devel/m4/Makefile8
-rw-r--r--devel/m4/PLIST4
-rw-r--r--devel/ncurses/Makefile.common7
-rw-r--r--devel/ncurses/PLIST32
-rw-r--r--devel/nspr/Makefile8
-rw-r--r--devel/nspr/PLIST6
-rw-r--r--devel/pango/PLIST26
-rw-r--r--devel/pango/options.mk7
-rw-r--r--devel/patch/Makefile8
-rw-r--r--devel/patch/PLIST4
-rw-r--r--devel/pilrc/Makefile9
-rw-r--r--devel/pilrc/PLIST4
-rw-r--r--devel/rt3/Makefile6
-rw-r--r--devel/rt3/PLIST4
-rw-r--r--devel/rudiments/Makefile9
-rw-r--r--devel/rudiments/PLIST8
-rw-r--r--devel/semi/PLIST6
-rw-r--r--devel/semi/options.mk12
38 files changed, 281 insertions, 281 deletions
diff --git a/devel/allegro/PLIST b/devel/allegro/PLIST
index 3d7298b3c39..f3ae87eca94 100644
--- a/devel/allegro/PLIST
+++ b/devel/allegro/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2007/11/29 22:45:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:42:59 jlam Exp $
bin/allegro-config
bin/colormap
bin/dat
@@ -99,7 +99,7 @@ include/linalleg.h
include/xalleg.h
info/allegro.info
lib/allegro/4.2.2/alleg-dga2.so
-${ESOUND}lib/allegro/4.2.2/alleg-esddigi.so
+${PLIST.esound}lib/allegro/4.2.2/alleg-esddigi.so
lib/allegro/4.2.2/modules.lst
lib/liballeg-${PKGVERSION}.so
lib/liballeg.so.4.2
diff --git a/devel/allegro/options.mk b/devel/allegro/options.mk
index 0f1a7fb63c7..e7a87235b6c 100644
--- a/devel/allegro/options.mk
+++ b/devel/allegro/options.mk
@@ -1,14 +1,14 @@
-# $NetBSD: options.mk,v 1.1 2005/06/01 14:29:58 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:59 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.allegro
PKG_SUPPORTED_OPTIONS= esound
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= esound
+
.if !empty(PKG_OPTIONS:Mesound)
CONFIGURE_ARGS+= --enable-esddigi
+PLIST.esound= yes
.include "../../audio/esound/buildlink3.mk"
-PLIST_SUBST+= ESOUND=""
-.else
-PLIST_SUBST+= ESOUND="@comment "
.endif
diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 96f85bce942..6cec10a838f 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2008/02/28 19:06:34 tnn Exp $
+# $NetBSD: Makefile,v 1.35 2008/04/12 22:42:59 jlam Exp $
DISTNAME= binutils-2.17
PKGREVISION= 1
@@ -36,11 +36,10 @@ INFO_FILES= # PLIST
# gprof (XXX: and others?) cannot be built on all platforms
#
+PLIST_VARS+= gprof
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "IRIX"
-PLIST_SUBST+= NO_GPROF="@comment "
-.else
-PLIST_SUBST+= NO_GPROF=""
+.if ${OPSYS} != "IRIX"
+PLIST.gprof= yes
.endif
# Prevent the need to run texi2pod.pl and pod2man hence
diff --git a/devel/binutils/PLIST.common b/devel/binutils/PLIST.common
index d97ee3f883a..bb67c2143f9 100644
--- a/devel/binutils/PLIST.common
+++ b/devel/binutils/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.14 2008/02/28 19:06:34 tnn Exp $
+@comment $NetBSD: PLIST.common,v 1.15 2008/04/12 22:42:59 jlam Exp $
${MACHINE_GNU_PLATFORM}/bin/ar
${MACHINE_GNU_PLATFORM}/bin/as
${MACHINE_GNU_PLATFORM}/bin/ld
@@ -10,7 +10,7 @@ bin/${GNU_PROGRAM_PREFIX}addr2line
bin/${GNU_PROGRAM_PREFIX}ar
bin/${GNU_PROGRAM_PREFIX}as
bin/${GNU_PROGRAM_PREFIX}c++filt
-${NO_GPROF}bin/${GNU_PROGRAM_PREFIX}gprof
+${PLIST.gprof}bin/${GNU_PROGRAM_PREFIX}gprof
bin/${GNU_PROGRAM_PREFIX}ld
bin/${GNU_PROGRAM_PREFIX}nm
bin/${GNU_PROGRAM_PREFIX}objcopy
@@ -28,7 +28,7 @@ include/symcat.h
info/as.info
info/bfd.info
info/binutils.info
-${NO_GPROF}info/gprof.info
+${PLIST.gprof}info/gprof.info
info/ld.info
lib/libbfd.la
lib/libiberty.a
@@ -38,7 +38,7 @@ man/man1/${GNU_PROGRAM_PREFIX}ar.1
man/man1/${GNU_PROGRAM_PREFIX}as.1
man/man1/${GNU_PROGRAM_PREFIX}c++filt.1
man/man1/${GNU_PROGRAM_PREFIX}dlltool.1
-${NO_GPROF}man/man1/${GNU_PROGRAM_PREFIX}gprof.1
+${PLIST.gprof}man/man1/${GNU_PROGRAM_PREFIX}gprof.1
man/man1/${GNU_PROGRAM_PREFIX}ld.1
man/man1/${GNU_PROGRAM_PREFIX}nlmconv.1
man/man1/${GNU_PROGRAM_PREFIX}nm.1
@@ -52,15 +52,15 @@ man/man1/${GNU_PROGRAM_PREFIX}strip.1
man/man1/${GNU_PROGRAM_PREFIX}windres.1
share/locale/da/LC_MESSAGES/bfd.mo
share/locale/da/LC_MESSAGES/binutils.mo
-${NO_GPROF}share/locale/da/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/da/LC_MESSAGES/gprof.mo
share/locale/da/LC_MESSAGES/ld.mo
share/locale/da/LC_MESSAGES/opcodes.mo
-${NO_GPROF}share/locale/de/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/de/LC_MESSAGES/gprof.mo
share/locale/de/LC_MESSAGES/opcodes.mo
share/locale/es/LC_MESSAGES/bfd.mo
share/locale/es/LC_MESSAGES/binutils.mo
share/locale/es/LC_MESSAGES/gas.mo
-${NO_GPROF}share/locale/es/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/es/LC_MESSAGES/gprof.mo
share/locale/es/LC_MESSAGES/ld.mo
share/locale/es/LC_MESSAGES/opcodes.mo
share/locale/fi/LC_MESSAGES/binutils.mo
@@ -68,17 +68,17 @@ share/locale/fi/LC_MESSAGES/opcodes.mo
share/locale/fr/LC_MESSAGES/bfd.mo
share/locale/fr/LC_MESSAGES/binutils.mo
share/locale/fr/LC_MESSAGES/gas.mo
-${NO_GPROF}share/locale/fr/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/fr/LC_MESSAGES/gprof.mo
share/locale/fr/LC_MESSAGES/ld.mo
share/locale/fr/LC_MESSAGES/opcodes.mo
-${NO_GPROF}share/locale/ga/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/ga/LC_MESSAGES/gprof.mo
share/locale/ga/LC_MESSAGES/opcodes.mo
-${NO_GPROF}share/locale/id/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/id/LC_MESSAGES/gprof.mo
share/locale/id/LC_MESSAGES/opcodes.mo
share/locale/ja/LC_MESSAGES/bfd.mo
share/locale/ja/LC_MESSAGES/binutils.mo
share/locale/nl/LC_MESSAGES/opcodes.mo
-${NO_GPROF}share/locale/pt_BR/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/pt_BR/LC_MESSAGES/gprof.mo
share/locale/pt_BR/LC_MESSAGES/opcodes.mo
share/locale/ro/LC_MESSAGES/bfd.mo
share/locale/ro/LC_MESSAGES/binutils.mo
@@ -87,16 +87,16 @@ share/locale/ru/LC_MESSAGES/binutils.mo
share/locale/rw/LC_MESSAGES/bfd.mo
share/locale/rw/LC_MESSAGES/binutils.mo
share/locale/rw/LC_MESSAGES/gas.mo
-${NO_GPROF}share/locale/rw/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/rw/LC_MESSAGES/gprof.mo
share/locale/sv/LC_MESSAGES/bfd.mo
share/locale/sv/LC_MESSAGES/binutils.mo
-${NO_GPROF}share/locale/sv/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/sv/LC_MESSAGES/gprof.mo
share/locale/sv/LC_MESSAGES/ld.mo
share/locale/sv/LC_MESSAGES/opcodes.mo
share/locale/tr/LC_MESSAGES/bfd.mo
share/locale/tr/LC_MESSAGES/binutils.mo
share/locale/tr/LC_MESSAGES/gas.mo
-${NO_GPROF}share/locale/tr/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/tr/LC_MESSAGES/gprof.mo
share/locale/tr/LC_MESSAGES/ld.mo
share/locale/tr/LC_MESSAGES/opcodes.mo
share/locale/vi/LC_MESSAGES/bfd.mo
@@ -107,5 +107,5 @@ share/locale/zh_CN/LC_MESSAGES/bfd.mo
share/locale/zh_CN/LC_MESSAGES/binutils.mo
share/locale/zh_CN/LC_MESSAGES/ld.mo
share/locale/zh_CN/LC_MESSAGES/opcodes.mo
-${NO_GPROF}share/locale/vi/LC_MESSAGES/gprof.mo
+${PLIST.gprof}share/locale/vi/LC_MESSAGES/gprof.mo
share/locale/zh_TW/LC_MESSAGES/binutils.mo
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index d4f9214b436..deaf68f9447 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2007/09/23 17:49:08 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2008/04/12 22:42:59 jlam Exp $
DISTNAME= doxygen-1.5.1.src
PKGNAME= doxygen-1.5.1
@@ -27,10 +27,12 @@ CONFIGURE_ARGS+= --docdir ${PREFIX}/share/doc
MAKE_ENV+= PKGSRC_CFLAGS=${CFLAGS:Q}
MAKE_FLAGS+= MAN1DIR=${PKGMANDIR}/man1
+PLIST_VARS+= ci cs
+
.if exists(./descr)
-PLIST_SUBST+= CASESENSITIVE="@comment " CASEINSENSITIVE=""
+PLIST.ci= yes # case-insensitive
.else
-PLIST_SUBST+= CASESENSITIVE="" CASEINSENSITIVE="@comment "
+PLIST.cs= yes # case-sensitive
.endif
SUBST_CLASSES+= pybin
diff --git a/devel/doxygen/PLIST b/devel/doxygen/PLIST
index fbcb47457cc..ca5209cba38 100644
--- a/devel/doxygen/PLIST
+++ b/devel/doxygen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/01/21 17:05:55 minskim Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:42:59 jlam Exp $
bin/doxygen
bin/doxytag
man/man1/doxygen.1
@@ -184,10 +184,10 @@ share/doc/doxygen/examples/diagrams_e.h
share/doc/doxygen/examples/docstring.cfg
share/doc/doxygen/examples/docstring.py
share/doc/doxygen/examples/docstring/html/annotated.html
-${CASESENSITIVE}share/doc/doxygen/examples/docstring/html/classdocstring_1_1PyClass-members.html
-${CASEINSENSITIVE}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class-members.html
-${CASESENSITIVE}share/doc/doxygen/examples/docstring/html/classdocstring_1_1PyClass.html
-${CASEINSENSITIVE}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class.html
+${PLIST.cs}share/doc/doxygen/examples/docstring/html/classdocstring_1_1PyClass-members.html
+${PLIST.ci}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class-members.html
+${PLIST.cs}share/doc/doxygen/examples/docstring/html/classdocstring_1_1PyClass.html
+${PLIST.ci}share/doc/doxygen/examples/docstring/html/classdocstring_1_1_py_class.html
share/doc/doxygen/examples/docstring/html/docstring_8py.html
share/doc/doxygen/examples/docstring/html/doxygen.css
share/doc/doxygen/examples/docstring/html/doxygen.png
@@ -380,10 +380,10 @@ share/doc/doxygen/examples/par/html/tabs.css
share/doc/doxygen/examples/pyexample.cfg
share/doc/doxygen/examples/pyexample.py
share/doc/doxygen/examples/pyexample/html/annotated.html
-${CASESENSITIVE}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass-members.html
-${CASEINSENSITIVE}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class-members.html
-${CASESENSITIVE}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass.html
-${CASEINSENSITIVE}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class.html
+${PLIST.cs}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass-members.html
+${PLIST.ci}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class-members.html
+${PLIST.cs}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1PyClass.html
+${PILST.ci}share/doc/doxygen/examples/pyexample/html/classpyexample_1_1_py_class.html
share/doc/doxygen/examples/pyexample/html/doxygen.css
share/doc/doxygen/examples/pyexample/html/doxygen.png
share/doc/doxygen/examples/pyexample/html/functions.html
diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile
index 761e55983b7..8000eb98f72 100644
--- a/devel/gmake/Makefile
+++ b/devel/gmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2006/10/09 12:52:34 joerg Exp $
+# $NetBSD: Makefile,v 1.70 2008/04/12 22:42:59 jlam Exp $
DISTNAME= make-3.81
PKGNAME= g${DISTNAME}
@@ -29,10 +29,10 @@ CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
+PLIST_VARS+= gmake
+
.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-PLIST_SUBST+= GMAKE_LINK=""
-.else
-PLIST_SUBST+= GMAKE_LINK="@comment "
+PLIST.gmake= yes
.endif
PLIST_SRC= ${PKGDIR}/PLIST
diff --git a/devel/gmake/PLIST b/devel/gmake/PLIST
index f1b5253c9b2..2622a831695 100644
--- a/devel/gmake/PLIST
+++ b/devel/gmake/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2006/03/30 03:44:43 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:42:59 jlam Exp $
bin/${GNU_PROGRAM_PREFIX}make
-${GMAKE_LINK}bin/gmake
+${PLIST.gmake}bin/gmake
info/make.info
man/man1/${GNU_PROGRAM_PREFIX}make.1
diff --git a/devel/hdf5/PLIST b/devel/hdf5/PLIST
index fc7643ad99f..05039e25428 100644
--- a/devel/hdf5/PLIST
+++ b/devel/hdf5/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.15 2007/09/18 18:58:08 drochner Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:42:59 jlam Exp $
bin/gif2h5
bin/h52gif
-${CXX}bin/h5c++
+${PLIST.cxx}bin/h5c++
bin/h5cc
bin/h5debug
bin/h5diff
@@ -51,40 +51,40 @@ include/H5api_adpt.h
include/H5pubconf.h
include/H5public.h
include/hdf5.h
-${CXX}include/H5AbstractDs.h
-${CXX}include/H5ArrayType.h
-${CXX}include/H5AtomType.h
-${CXX}include/H5Attribute.h
-${CXX}include/H5Classes.h
-${CXX}include/H5CommonFG.h
-${CXX}include/H5CompType.h
-${CXX}include/H5Cpp.h
-${CXX}include/H5CppDoc.h
-${CXX}include/H5DataSet.h
-${CXX}include/H5DataSpace.h
-${CXX}include/H5DataType.h
-${CXX}include/H5DcreatProp.h
-${CXX}include/H5DxferProp.h
-${CXX}include/H5EnumType.h
-${CXX}include/H5Exception.h
-${CXX}include/H5FaccProp.h
-${CXX}include/H5FcreatProp.h
-${CXX}include/H5File.h
-${CXX}include/H5FloatType.h
-${CXX}include/H5Group.h
-${CXX}include/H5IdComponent.h
-${CXX}include/H5Include.h
-${CXX}include/H5IntType.h
-${CXX}include/H5Library.h
-${CXX}include/H5Object.h
-${CXX}include/H5PredType.h
-${CXX}include/H5PropList.h
-${CXX}include/H5StrType.h
-${CXX}include/H5VarLenType.h
-${CXX}include/H5cxx_pubconf.h
+${PLIST.cxx}include/H5AbstractDs.h
+${PLIST.cxx}include/H5ArrayType.h
+${PLIST.cxx}include/H5AtomType.h
+${PLIST.cxx}include/H5Attribute.h
+${PLIST.cxx}include/H5Classes.h
+${PLIST.cxx}include/H5CommonFG.h
+${PLIST.cxx}include/H5CompType.h
+${PLIST.cxx}include/H5Cpp.h
+${PLIST.cxx}include/H5CppDoc.h
+${PLIST.cxx}include/H5DataSet.h
+${PLIST.cxx}include/H5DataSpace.h
+${PLIST.cxx}include/H5DataType.h
+${PLIST.cxx}include/H5DcreatProp.h
+${PLIST.cxx}include/H5DxferProp.h
+${PLIST.cxx}include/H5EnumType.h
+${PLIST.cxx}include/H5Exception.h
+${PLIST.cxx}include/H5FaccProp.h
+${PLIST.cxx}include/H5FcreatProp.h
+${PLIST.cxx}include/H5File.h
+${PLIST.cxx}include/H5FloatType.h
+${PLIST.cxx}include/H5Group.h
+${PLIST.cxx}include/H5IdComponent.h
+${PLIST.cxx}include/H5Include.h
+${PLIST.cxx}include/H5IntType.h
+${PLIST.cxx}include/H5Library.h
+${PLIST.cxx}include/H5Object.h
+${PLIST.cxx}include/H5PredType.h
+${PLIST.cxx}include/H5PropList.h
+${PLIST.cxx}include/H5StrType.h
+${PLIST.cxx}include/H5VarLenType.h
+${PLIST.cxx}include/H5cxx_pubconf.h
lib/libhdf5.la
lib/libhdf5.settings
-${CXX}lib/libhdf5_cpp.la
+${PLIST.cxx}lib/libhdf5_cpp.la
lib/libhdf5_hl.la
share/doc/hdf5/COPYING
share/doc/hdf5/HISTORY.txt
@@ -708,15 +708,15 @@ share/examples/hdf5/c/h5_reference.c
share/examples/hdf5/c/h5_select.c
share/examples/hdf5/c/h5_write.c
share/examples/hdf5/c/ph5example.c
-${CXX}share/examples/hdf5/c++/chunks.cpp
-${CXX}share/examples/hdf5/c++/compound.cpp
-${CXX}share/examples/hdf5/c++/create.cpp
-${CXX}share/examples/hdf5/c++/extend_ds.cpp
-${CXX}share/examples/hdf5/c++/h5group.cpp
-${CXX}share/examples/hdf5/c++/readdata.cpp
-${CXX}share/examples/hdf5/c++/strtype.cpp
-${CXX}share/examples/hdf5/c++/writedata.cpp
-${CXX}@dirrm share/examples/hdf5/c++
+${PLIST.cxx}share/examples/hdf5/c++/chunks.cpp
+${PLIST.cxx}share/examples/hdf5/c++/compound.cpp
+${PLIST.cxx}share/examples/hdf5/c++/create.cpp
+${PLIST.cxx}share/examples/hdf5/c++/extend_ds.cpp
+${PLIST.cxx}share/examples/hdf5/c++/h5group.cpp
+${PLIST.cxx}share/examples/hdf5/c++/readdata.cpp
+${PLIST.cxx}share/examples/hdf5/c++/strtype.cpp
+${PLIST.cxx}share/examples/hdf5/c++/writedata.cpp
+${PLIST.cxx}@dirrm share/examples/hdf5/c++
@dirrm share/examples/hdf5/c
@dirrm share/examples/hdf5
@dirrm share/doc/hdf5/html/fortran
diff --git a/devel/hdf5/options.mk b/devel/hdf5/options.mk
index b4988bc2091..ec506160be1 100644
--- a/devel/hdf5/options.mk
+++ b/devel/hdf5/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/07/22 04:46:15 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:59 jlam Exp $
PKG_OPTIONS_VAR=PKG_OPTIONS.hdf5
PKG_SUPPORTED_OPTIONS= szip cxx threads
@@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS= szip
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= cxx
+
.if !empty(PKG_OPTIONS:Mszip)
CONFIGURE_ARGS+= --with-szlib
.include "../../archivers/szip/buildlink3.mk"
@@ -14,9 +16,7 @@ CONFIGURE_ARGS+= --with-szlib
.if !empty(PKG_OPTIONS:Mcxx)
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --enable-cxx
-PLIST_SUBST+= CXX=
-.else
-PLIST_SUBST+= CXX="@comment "
+PLIST.cxx= yes
.endif
.if !empty(PKG_OPTIONS:Mthreads)
diff --git a/devel/kdesdk3/PLIST b/devel/kdesdk3/PLIST
index 2cc97fd8fee..1929a6687b8 100644
--- a/devel/kdesdk3/PLIST
+++ b/devel/kdesdk3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2007/10/20 10:50:37 markd Exp $
+@comment $NetBSD: PLIST,v 1.28 2008/04/12 22:42:59 jlam Exp $
bin/adddebug
bin/build-progress.sh
bin/catalogmanager
@@ -42,7 +42,7 @@ bin/kdekillall
bin/kdelnk2desktop.py
bin/kdemangen.pl
bin/kdesvn-build
-${HAVE_SVN}bin/kio_svn_helper
+${PLIST.svn}bin/kio_svn_helper
bin/kompare
bin/kuiviewer
bin/kunittest
@@ -132,12 +132,12 @@ lib/kde3/kbabeldict_dbsearchengine.la
lib/kde3/kbabeldict_poauxiliary.la
lib/kde3/kbabeldict_pocompendium.la
lib/kde3/kbabeldict_tmxcompendium.la
-${HAVE_SVN}lib/kde3/kded_ksvnd.la
+${PLIST.svn}lib/kde3/kded_ksvnd.la
lib/kde3/kfile_cpp.la
lib/kde3/kfile_diff.la
lib/kde3/kfile_po.la
lib/kde3/kfile_ts.la
-${HAVE_SVN}lib/kde3/kio_svn.la
+${PLIST.svn}lib/kde3/kio_svn.la
lib/kde3/libcervisiapart.la
lib/kde3/libkomparenavtreepart.la
lib/kde3/libkomparepart.la
@@ -297,19 +297,19 @@ share/doc/kde/HTML/en/umbrello/umbrello-ui.png
share/doc/kde/HTML/en/umbrello/uml_basics.docbook
share/doc/kde/HTML/en/umbrello/use-case-diagram.png
share/doc/kde/HTML/en/umbrello/working_with_umbrello.docbook
-${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_add.png
-${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_branch.png
-${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_merge.png
-${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_remove.png
-${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_status.png
-${HAVE_SVN}share/icons/crystalsvg/128x128/actions/svn_switch.png
+${PLIST.svn}share/icons/crystalsvg/128x128/actions/svn_add.png
+${PLIST.svn}share/icons/crystalsvg/128x128/actions/svn_branch.png
+${PLIST.svn}share/icons/crystalsvg/128x128/actions/svn_merge.png
+${PLIST.svn}share/icons/crystalsvg/128x128/actions/svn_remove.png
+${PLIST.svn}share/icons/crystalsvg/128x128/actions/svn_status.png
+${PLIST.svn}share/icons/crystalsvg/128x128/actions/svn_switch.png
share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png
-${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_add.png
-${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_branch.png
-${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_merge.png
-${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_remove.png
-${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_status.png
-${HAVE_SVN}share/icons/crystalsvg/16x16/actions/svn_switch.png
+${PLIST.svn}share/icons/crystalsvg/16x16/actions/svn_add.png
+${PLIST.svn}share/icons/crystalsvg/16x16/actions/svn_branch.png
+${PLIST.svn}share/icons/crystalsvg/16x16/actions/svn_merge.png
+${PLIST.svn}share/icons/crystalsvg/16x16/actions/svn_remove.png
+${PLIST.svn}share/icons/crystalsvg/16x16/actions/svn_status.png
+${PLIST.svn}share/icons/crystalsvg/16x16/actions/svn_switch.png
share/icons/crystalsvg/16x16/actions/umbrello_diagram_activity.png
share/icons/crystalsvg/16x16/actions/umbrello_diagram_class.png
share/icons/crystalsvg/16x16/actions/umbrello_diagram_collaboration.png
@@ -325,12 +325,12 @@ share/icons/crystalsvg/16x16/actions/vcs_remove.png
share/icons/crystalsvg/16x16/actions/vcs_status.png
share/icons/crystalsvg/16x16/actions/vcs_update.png
share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png
-${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_add.png
-${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_branch.png
-${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_merge.png
-${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_remove.png
-${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_status.png
-${HAVE_SVN}share/icons/crystalsvg/22x22/actions/svn_switch.png
+${PLIST.svn}share/icons/crystalsvg/22x22/actions/svn_add.png
+${PLIST.svn}share/icons/crystalsvg/22x22/actions/svn_branch.png
+${PLIST.svn}share/icons/crystalsvg/22x22/actions/svn_merge.png
+${PLIST.svn}share/icons/crystalsvg/22x22/actions/svn_remove.png
+${PLIST.svn}share/icons/crystalsvg/22x22/actions/svn_status.png
+${PLIST.svn}share/icons/crystalsvg/22x22/actions/svn_switch.png
share/icons/crystalsvg/22x22/actions/umbrello_diagram_activity.png
share/icons/crystalsvg/22x22/actions/umbrello_diagram_class.png
share/icons/crystalsvg/22x22/actions/umbrello_diagram_collaboration.png
@@ -347,12 +347,12 @@ share/icons/crystalsvg/22x22/actions/vcs_remove.png
share/icons/crystalsvg/22x22/actions/vcs_status.png
share/icons/crystalsvg/22x22/actions/vcs_update.png
share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png
-${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_add.png
-${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_branch.png
-${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_merge.png
-${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_remove.png
-${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_status.png
-${HAVE_SVN}share/icons/crystalsvg/32x32/actions/svn_switch.png
+${PLIST.svn}share/icons/crystalsvg/32x32/actions/svn_add.png
+${PLIST.svn}share/icons/crystalsvg/32x32/actions/svn_branch.png
+${PLIST.svn}share/icons/crystalsvg/32x32/actions/svn_merge.png
+${PLIST.svn}share/icons/crystalsvg/32x32/actions/svn_remove.png
+${PLIST.svn}share/icons/crystalsvg/32x32/actions/svn_status.png
+${PLIST.svn}share/icons/crystalsvg/32x32/actions/svn_switch.png
share/icons/crystalsvg/32x32/actions/vcs_add.png
share/icons/crystalsvg/32x32/actions/vcs_commit.png
share/icons/crystalsvg/32x32/actions/vcs_diff.png
@@ -360,12 +360,12 @@ share/icons/crystalsvg/32x32/actions/vcs_remove.png
share/icons/crystalsvg/32x32/actions/vcs_status.png
share/icons/crystalsvg/32x32/actions/vcs_update.png
share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png
-${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_add.png
-${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_branch.png
-${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_merge.png
-${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_remove.png
-${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_status.png
-${HAVE_SVN}share/icons/crystalsvg/48x48/actions/svn_switch.png
+${PLIST.svn}share/icons/crystalsvg/48x48/actions/svn_add.png
+${PLIST.svn}share/icons/crystalsvg/48x48/actions/svn_branch.png
+${PLIST.svn}share/icons/crystalsvg/48x48/actions/svn_merge.png
+${PLIST.svn}share/icons/crystalsvg/48x48/actions/svn_remove.png
+${PLIST.svn}share/icons/crystalsvg/48x48/actions/svn_status.png
+${PLIST.svn}share/icons/crystalsvg/48x48/actions/svn_switch.png
share/icons/crystalsvg/48x48/actions/vcs_add.png
share/icons/crystalsvg/48x48/actions/vcs_commit.png
share/icons/crystalsvg/48x48/actions/vcs_diff.png
@@ -373,19 +373,19 @@ share/icons/crystalsvg/48x48/actions/vcs_remove.png
share/icons/crystalsvg/48x48/actions/vcs_status.png
share/icons/crystalsvg/48x48/actions/vcs_update.png
share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png
-${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_add.png
-${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_branch.png
-${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_merge.png
-${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_remove.png
-${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_status.png
-${HAVE_SVN}share/icons/crystalsvg/64x64/actions/svn_switch.png
+${PLIST.svn}share/icons/crystalsvg/64x64/actions/svn_add.png
+${PLIST.svn}share/icons/crystalsvg/64x64/actions/svn_branch.png
+${PLIST.svn}share/icons/crystalsvg/64x64/actions/svn_merge.png
+${PLIST.svn}share/icons/crystalsvg/64x64/actions/svn_remove.png
+${PLIST.svn}share/icons/crystalsvg/64x64/actions/svn_status.png
+${PLIST.svn}share/icons/crystalsvg/64x64/actions/svn_switch.png
share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png
-${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_add.svgz
-${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_branch.svgz
-${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_merge.svgz
-${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_remove.svgz
-${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_status.svgz
-${HAVE_SVN}share/icons/crystalsvg/scalable/actions/svn_switch.svgz
+${PLIST.svn}share/icons/crystalsvg/scalable/actions/svn_add.svgz
+${PLIST.svn}share/icons/crystalsvg/scalable/actions/svn_branch.svgz
+${PLIST.svn}share/icons/crystalsvg/scalable/actions/svn_merge.svgz
+${PLIST.svn}share/icons/crystalsvg/scalable/actions/svn_remove.svgz
+${PLIST.svn}share/icons/crystalsvg/scalable/actions/svn_status.svgz
+${PLIST.svn}share/icons/crystalsvg/scalable/actions/svn_switch.svgz
share/icons/crystalsvg/scalable/actions/vcs_add.svgz
share/icons/crystalsvg/scalable/actions/vcs_commit.svgz
share/icons/crystalsvg/scalable/actions/vcs_diff.svgz
@@ -728,8 +728,8 @@ share/kde/apps/kconf_update/kbabel-projectrename.upd
share/kde/apps/kconf_update/move_repositories.pl
share/kde/apps/kompare/komparepartui.rc
share/kde/apps/kompare/kompareui.rc
-${HAVE_SVN}share/kde/apps/konqueror/servicemenus/subversion.desktop
-${HAVE_SVN}share/kde/apps/konqueror/servicemenus/subversion_toplevel.desktop
+${PLIST.svn}share/kde/apps/konqueror/servicemenus/subversion.desktop
+${PLIST.svn}share/kde/apps/konqueror/servicemenus/subversion_toplevel.desktop
share/kde/apps/kstyle/themes/scheck.themerc
share/kde/apps/kuiviewer/kuiviewerui.rc
share/kde/apps/kuiviewerpart/kuiviewer_part.rc
@@ -889,7 +889,7 @@ share/kde/services/kbabel_whitespacetool.desktop
share/kde/services/kbabel_xliff_export.desktop
share/kde/services/kbabel_xliff_import.desktop
share/kde/services/kbabel_xmltool.desktop
-${HAVE_SVN}share/kde/services/kded/ksvnd.desktop
+${PLIST.svn}share/kde/services/kded/ksvnd.desktop
share/kde/services/kfile_cpp.desktop
share/kde/services/kfile_diff.desktop
share/kde/services/kfile_h.desktop
@@ -901,11 +901,11 @@ share/kde/services/kuiviewer_part.desktop
share/kde/services/poauxiliary.desktop
share/kde/services/pocompendium.desktop
share/kde/services/pothumbnail.desktop
-${HAVE_SVN}share/kde/services/svn+file.protocol
-${HAVE_SVN}share/kde/services/svn+http.protocol
-${HAVE_SVN}share/kde/services/svn+https.protocol
-${HAVE_SVN}share/kde/services/svn+ssh.protocol
-${HAVE_SVN}share/kde/services/svn.protocol
+${PLIST.svn}share/kde/services/svn+file.protocol
+${PLIST.svn}share/kde/services/svn+http.protocol
+${PLIST.svn}share/kde/services/svn+https.protocol
+${PLIST.svn}share/kde/services/svn+ssh.protocol
+${PLIST.svn}share/kde/services/svn.protocol
share/kde/services/tmxcompendium.desktop
share/kde/servicetypes/kbabel_tool.desktop
share/kde/servicetypes/kbabel_validator.desktop
diff --git a/devel/kdesdk3/options.mk b/devel/kdesdk3/options.mk
index e7796dc781d..b8f729f0d28 100644
--- a/devel/kdesdk3/options.mk
+++ b/devel/kdesdk3/options.mk
@@ -1,15 +1,17 @@
-# $NetBSD: options.mk,v 1.1 2007/01/26 03:28:08 markd Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:59 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kdesdk
PKG_SUPPORTED_OPTIONS= svn
+
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= svn
+
.if !empty(PKG_OPTIONS:Msvn)
.include "../../devel/subversion-base/buildlink3.mk"
CONFIGURE_ARGS+= --with-svn-include="${BUILDLINK_PREFIX.subversion-base}/include"
CONFIGURE_ARGS+= --with-svn-lib="${BUILDLINK_PREFIX.subversion-base}/lib"
-PLIST_SUBST+= HAVE_SVN=""
+PLIST.svn= yes
.else
CONFIGURE_ARGS+= --with-subversion=no
-PLIST_SUBST+= HAVE_SVN="@comment "
.endif
diff --git a/devel/kdevelop-base/PLIST b/devel/kdevelop-base/PLIST
index ff4e9970299..0cb35d79e97 100644
--- a/devel/kdevelop-base/PLIST
+++ b/devel/kdevelop-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2008/02/20 10:24:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:42:59 jlam Exp $
bin/kdevassistant
bin/kdevdesigner
bin/kdevelop
@@ -144,10 +144,10 @@ include/kdevelop/widgets/qcomboview.h
include/kdevelop/widgets/resizablecombo.h
include/kinterfacedesigner/designer.h
lib/kconf_update_bin/kdev-gen-settings-kconf_update
-${HAVE_SVN}lib/kde3/kded_kdevsvnd.la
+${PLIST.svn}lib/kde3/kded_kdevsvnd.la
lib/kde3/kio_chm.la
lib/kde3/kio_csharpdoc.la
-${HAVE_SVN}lib/kde3/kio_kdevsvn.la
+${PLIST.svn}lib/kde3/kio_kdevsvn.la
lib/kde3/kio_perldoc.la
lib/kde3/kio_pydoc.la
lib/kde3/libclearcaseintegrator.la
@@ -220,7 +220,7 @@ lib/kde3/libkdevscripting.la
lib/kde3/libkdevscriptproject.la
lib/kde3/libkdevsnippet.la
lib/kde3/libkdevsqlsupport.la
-${HAVE_SVN}lib/kde3/libkdevsubversion.la
+${PLIST.svn}lib/kde3/libkdevsubversion.la
lib/kde3/libkdevtexttools.la
lib/kde3/libkdevtipofday.la
lib/kde3/libkdevtools.la
@@ -229,7 +229,7 @@ lib/kde3/libkdevuichooser.la
lib/kde3/libkdevvalgrind.la
lib/kde3/libkdevvcsmanager.la
lib/kde3/libperforceintegrator.la
-${HAVE_SVN}lib/kde3/libsubversionintegrator.la
+${PLIST.svn}lib/kde3/libsubversionintegrator.la
lib/libd.la
lib/libdesignerintegration.la
lib/libdocumentation_interfaces.la
@@ -1285,7 +1285,7 @@ share/kde/services/docdoxygenplugin.desktop
share/kde/services/dockdevtocplugin.desktop
share/kde/services/docqtplugin.desktop
share/kde/services/kchmpart.desktop
-${HAVE_SVN}share/kde/services/kded/kdevsvnd.desktop
+${PLIST.svn}share/kde/services/kded/kdevsvnd.desktop
share/kde/services/kdevabbrev.desktop
share/kde/services/kdevadaproject.desktop
share/kde/services/kdevadasupport.desktop
@@ -1355,13 +1355,13 @@ share/kde/services/kdevscripting.desktop
share/kde/services/kdevscriptproject.desktop
share/kde/services/kdevsnippet.desktop
share/kde/services/kdevsqlsupport.desktop
-${HAVE_SVN}share/kde/services/kdevsubversion.desktop
-${HAVE_SVN}share/kde/services/kdevsubversionintegrator.desktop
-${HAVE_SVN}share/kde/services/kdevsvn+file.protocol
-${HAVE_SVN}share/kde/services/kdevsvn+http.protocol
-${HAVE_SVN}share/kde/services/kdevsvn+https.protocol
-${HAVE_SVN}share/kde/services/kdevsvn+ssh.protocol
-${HAVE_SVN}share/kde/services/kdevsvn+svn.protocol
+${PLIST.svn}share/kde/services/kdevsubversion.desktop
+${PLIST.svn}share/kde/services/kdevsubversionintegrator.desktop
+${PLIST.svn}share/kde/services/kdevsvn+file.protocol
+${PLIST.svn}share/kde/services/kdevsvn+http.protocol
+${PLIST.svn}share/kde/services/kdevsvn+https.protocol
+${PLIST.svn}share/kde/services/kdevsvn+ssh.protocol
+${PLIST.svn}share/kde/services/kdevsvn+svn.protocol
share/kde/services/kdevtexttools.desktop
share/kde/services/kdevtipofday.desktop
share/kde/services/kdevtmakeproject.desktop
diff --git a/devel/kdevelop-base/options.mk b/devel/kdevelop-base/options.mk
index e1a8f55eb37..86f0bd0de71 100644
--- a/devel/kdevelop-base/options.mk
+++ b/devel/kdevelop-base/options.mk
@@ -1,17 +1,19 @@
-# $NetBSD: options.mk,v 1.1 2007/05/23 13:52:58 markd Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:59 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kdesdk
PKG_SUPPORTED_OPTIONS= svn
+
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= svn
+
.if !empty(PKG_OPTIONS:Msvn)
.include "../../devel/subversion-base/buildlink3.mk"
CONFIGURE_ARGS+= --with-apr-config=${BUILDLINK_PREFIX.apr}/bin/apr-config
CONFIGURE_ARGS+= --with-apu-config=${BUILDLINK_PREFIX.apr}/bin/apu-config
CONFIGURE_ARGS+= --with-svn-include=${BUILDLINK_PREFIX.subversion-base}/include/subversion-1
CONFIGURE_ARGS+= --with-svn-lib=${BUILDLINK_PREFIX.subversion-base}/lib
-PLIST_SUBST+= HAVE_SVN=""
+PLIST.svn= yes
.else
CONFIGURE_ARGS+= --disable-subversion
-PLIST_SUBST+= HAVE_SVN="@comment "
.endif
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index b044079336f..476d89e736c 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2007/05/01 12:03:26 veego Exp $
+# $NetBSD: Makefile,v 1.39 2008/04/12 22:42:59 jlam Exp $
DISTNAME= libgphoto2-2.3.1
PKGREVISION= 4
@@ -18,14 +18,13 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_DOXYGEN=false
PKGCONFIG_OVERRIDE+= libgphoto2/libgphoto2.pc.in
+PLIST_VARS+= libusb
.include "../../mk/bsd.prefs.mk"
-# Keep this in sync with buildlink3.mk!
-.if ${OPSYS} == "SunOS"
-PLIST_SUBST+= HAVE_LIBUSB="@comment "
-.else
-.include "../../devel/libusb/buildlink3.mk"
-PLIST_SUBST+= HAVE_LIBUSB=""
+# Keep this in sync with libusb/buildlink3.mk!
+.if ${OPSYS} != "SunOS"
+. include "../../devel/libusb/buildlink3.mk"
+PLIST.libusb= yes
.endif
# remove symbolic link
diff --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common
index a2376a08e81..2f8e54defa7 100644
--- a/devel/libgphoto2/PLIST.common
+++ b/devel/libgphoto2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.10 2007/01/03 08:20:18 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.11 2008/04/12 22:42:59 jlam Exp $
bin/gphoto2-config
bin/gphoto2-port-config
include/gphoto2/gphoto2-abilities-list.h
@@ -82,7 +82,7 @@ lib/libgphoto2/${PKGVERSION}/toshiba_pdrm11.la
lib/libgphoto2_port/0.7.1/disk.la
lib/libgphoto2_port/0.7.1/ptpip.la
lib/libgphoto2_port/0.7.1/serial.la
-lib/libgphoto2_port/0.7.1/usb.la
+${PLIST.libusb}lib/libgphoto2_port/0.7.1/usb.la
lib/pkgconfig/libgphoto2.pc
lib/pkgconfig/libgphoto2_port.pc
lib/udev/check-ptp-camera
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index fb3e7cd4128..81d7b40d10f 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2007/10/07 12:32:00 joerg Exp $
+# $NetBSD: Makefile,v 1.82 2008/04/12 22:42:59 jlam Exp $
###########################################################################
###########################################################################
@@ -34,6 +34,7 @@ COMMENT= Generic shared library support script (the script itself)
CONFLICTS+= libtool<=1.3.5nb11
TEST_TARGET= check
+PLIST_VARS+= shlibtool
.if ${OPSYS} == "AIX"
@@ -83,10 +84,8 @@ fix-libtool:
post-build: fix-libtool
-.if ${BUILD_SHLIBTOOL} == "NO"
-PLIST_SUBST+= SHLIBTOOL="@comment "
-.else
-PLIST_SUBST+= SHLIBTOOL=
+.if ${BUILD_SHLIBTOOL} != "NO"
+PLIST.shlibtool= yes
post-build:
@${SED} -e "s|@PREFIX@|"${PREFIX:Q}"|g" \
diff --git a/devel/libtool-base/PLIST b/devel/libtool-base/PLIST
index c4e74570526..bf0d8c26445 100644
--- a/devel/libtool-base/PLIST
+++ b/devel/libtool-base/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2005/05/10 16:49:22 tv Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:42:59 jlam Exp $
bin/libtool
bin/libtoolize
-${SHLIBTOOL}bin/shlibtool
+${PLIST.shlibtool}bin/shlibtool
share/aclocal/libtool.m4
share/aclocal/ltdl.m4
share/libtool/config.guess
diff --git a/devel/m17n-lib/PLIST b/devel/m17n-lib/PLIST
index 01f2156e325..fe3d12cb4dd 100644
--- a/devel/m17n-lib/PLIST
+++ b/devel/m17n-lib/PLIST
@@ -1,25 +1,25 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/27 13:48:28 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/12 22:42:59 jlam Exp $
bin/m17n-config
bin/m17n-conv
-${X11}bin/m17n-date
-${X11}bin/m17n-dump
-${X11}bin/m17n-edit
-${X11}bin/m17n-view
-${X11}include/m17n-X.h
+${PLIST.x11}bin/m17n-date
+${PLIST.x11}bin/m17n-dump
+${PLIST.x11}bin/m17n-edit
+${PLIST.x11}bin/m17n-view
+${PLIST.x11}include/m17n-X.h
include/m17n-core.h
include/m17n-flt.h
-${X11}include/m17n-gui.h
+${PLIST.x11}include/m17n-gui.h
include/m17n-misc.h
include/m17n.h
-${X11}lib/libm17n-X.la
+${PLIST.x11}lib/libm17n-X.la
lib/libm17n-core.la
lib/libm17n-flt.la
-${X11}lib/libm17n-gd.la
-${X11}lib/libm17n-gui.la
+${PLIST.x11}lib/libm17n-gd.la
+${PLIST.x11}lib/libm17n-gui.la
lib/libm17n.la
lib/libmimx-anthy.la
-${X11}lib/libmimx-ispell.la
+${PLIST.x11}lib/libmimx-ispell.la
lib/pkgconfig/m17n-core.pc
lib/pkgconfig/m17n-flt.pc
-${X11}lib/pkgconfig/m17n-gui.pc
+${PLIST.x11}lib/pkgconfig/m17n-gui.pc
lib/pkgconfig/m17n-shell.pc
diff --git a/devel/m17n-lib/options.mk b/devel/m17n-lib/options.mk
index 83d3d3d9024..322d27f6042 100644
--- a/devel/m17n-lib/options.mk
+++ b/devel/m17n-lib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/03/09 11:17:27 hira Exp $
+# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:59 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.m17n-lib
PKG_SUPPORTED_OPTIONS= anthy x11 libthai
@@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= x11
+
.if !empty(PKG_OPTIONS:Manthy)
.include "../../inputmethod/anthy/buildlink3.mk"
.endif
@@ -17,10 +19,9 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../graphics/libotf/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../mk/xaw.buildlink3.mk"
-PLIST_SUBST+= X11=""
+PLIST.x11= yes
.else
CONFIGURE_ARGS+= --without-gui
-PLIST_SUBST+= X11="@comment "
.endif
.if !empty(PKG_OPTIONS:Mlibthai)
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index dcc4096eeb7..6e66c8c60da 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/04/11 06:08:43 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2008/04/12 22:42:59 jlam Exp $
DISTNAME= m4-1.4.11
CATEGORIES= devel
@@ -25,10 +25,10 @@ CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
+PLIST_VARS+= gm4
+
.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-PLIST_SUBST+= GM4_LINK=""
-.else
-PLIST_SUBST+= GM4_LINK="@comment "
+PLIST.gm4= yes
.endif
.if ${OPSYS} == "DragonFly"
diff --git a/devel/m4/PLIST b/devel/m4/PLIST
index 6286261b280..2474ed6eb35 100644
--- a/devel/m4/PLIST
+++ b/devel/m4/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2008/04/11 06:08:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:00 jlam Exp $
bin/${GNU_PROGRAM_PREFIX}m4
-${GM4_LINK}bin/gm4
+${PLIST.gm4}bin/gm4
info/m4.info
man/man1/${GNU_PROGRAM_PREFIX}m4.1
share/examples/m4/capitalize.m4
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common
index 223b1b70dbf..21af2c09b5c 100644
--- a/devel/ncurses/Makefile.common
+++ b/devel/ncurses/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2007/12/11 05:27:05 bjs Exp $
+# $NetBSD: Makefile.common,v 1.8 2008/04/12 22:43:00 jlam Exp $
DISTNAME= ncurses-${NC_VERS}
NC_VERS= 5.6
@@ -48,12 +48,13 @@ CONFIGURE_ARGS+= --without-manpage-tbl
. endif
.endif
+PLIST_VARS+= not-sunos
+
.if ${OPSYS} == "SunOS"
-PLIST_SUBST+= NOT_SUNOS="@comment "
TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src
TERMINFODIR= share/lib/terminfo
.else
-PLIST_SUBST+= NOT_SUNOS=""
+PLIST.not-sunos=yes
TERMINFODIR= share/terminfo
.endif
diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST
index 0ce53aaa91c..963dd8d65c3 100644
--- a/devel/ncurses/PLIST
+++ b/devel/ncurses/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/01/23 22:55:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:00 jlam Exp $
bin/captoinfo
bin/clear
bin/infocmp
@@ -2417,20 +2417,20 @@ ${TERMINFODIR}/s/scanset
${TERMINFODIR}/s/scoansi
${TERMINFODIR}/s/scoansi-new
${TERMINFODIR}/s/scoansi-old
-${NOT_SUNOS}${TERMINFODIR}/s/screen
-${NOT_SUNOS}${TERMINFODIR}/s/screen-16color
-${NOT_SUNOS}${TERMINFODIR}/s/screen-16color-bce
-${NOT_SUNOS}${TERMINFODIR}/s/screen-16color-bce-s
-${NOT_SUNOS}${TERMINFODIR}/s/screen-16color-s
-${NOT_SUNOS}${TERMINFODIR}/s/screen-256color
-${NOT_SUNOS}${TERMINFODIR}/s/screen-256color-bce
-${NOT_SUNOS}${TERMINFODIR}/s/screen-256color-bce-s
-${NOT_SUNOS}${TERMINFODIR}/s/screen-256color-s
-${NOT_SUNOS}${TERMINFODIR}/s/screen-bce
-${NOT_SUNOS}${TERMINFODIR}/s/screen-s
-${NOT_SUNOS}${TERMINFODIR}/s/screen-w
-${NOT_SUNOS}${TERMINFODIR}/s/screen.linux
-${NOT_SUNOS}${TERMINFODIR}/s/screen.teraterm
+${PLIST.not-sunos}${TERMINFODIR}/s/screen
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-16color
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-16color-bce
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-16color-bce-s
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-16color-s
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-256color
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-256color-bce
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-256color-bce-s
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-256color-s
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-bce
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-s
+${PLIST.not-sunos}${TERMINFODIR}/s/screen-w
+${PLIST.not-sunos}${TERMINFODIR}/s/screen.linux
+${PLIST.not-sunos}${TERMINFODIR}/s/screen.teraterm
${TERMINFODIR}/s/screen.xterm-new
${TERMINFODIR}/s/screen.xterm-r6
${TERMINFODIR}/s/screen.xterm-xfree86
@@ -3280,5 +3280,5 @@ ${TERMINFODIR}/z/ztx11
@dirrm ${TERMINFODIR}/3
@dirrm ${TERMINFODIR}/2
@dirrm ${TERMINFODIR}/1
-${NOT_SUNOS}@dirrm ${TERMINFODIR}
+${PLIST.not-sunos}@dirrm ${TERMINFODIR}
@dirrm share/tabset
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 230750f9018..14a8b755360 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2008/01/29 11:37:35 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2008/04/12 22:43:00 jlam Exp $
DISTNAME= nspr-4.6.7
PKGREVISION= 1
@@ -38,6 +38,7 @@ SO_SUFFIX= so.1.0
PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
INSTALLATION_DIRS= bin
+PLIST_VARS+= sun4u_32
# see ${WRKSRC}/nspr-4.6.1/mozilla/nsprpub/pr/src/md/unix/Makefile.in
# for the bit about 32-bit sun4u machines installing an extra file.
@@ -48,14 +49,11 @@ CONFIGURE_ARGS+= --enable-64bit
. else
HW_CLASS!= ${UNAME} -m
. if ${HW_CLASS} == "sun4u"
-SUN4U_32=
+PLIST.sun4u_32= yes
. endif
. endif
.endif
-SUN4U_32?= "@comment "
-PLIST_SUBST+= SUN4U_32=${SUN4U_32}
-
.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon)
BUILDLINK_PASSTHRU_DIRS+= /Developer/Headers/FlatCarbon
diff --git a/devel/nspr/PLIST b/devel/nspr/PLIST
index 15e50fbfc56..62b65858ee5 100644
--- a/devel/nspr/PLIST
+++ b/devel/nspr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/10/22 15:23:27 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:00 jlam Exp $
bin/nspr-config
include/nspr/md/_aix.h
include/nspr/md/_aix32.cfg
@@ -130,7 +130,7 @@ include/nspr/prtrace.h
include/nspr/prtypes.h
include/nspr/prvrsion.h
include/nspr/prwin16.h
-${SUN4U_32}lib/nspr/cpu/sparcv8plus/libnspr_flt4.so
+${PLIST.sun4u_32}lib/nspr/cpu/sparcv8plus/libnspr_flt4.so
lib/nspr/libnspr4.a
lib/nspr/libnspr4.${SO_SUFFIX}
lib/nspr/libplc4.a
@@ -142,5 +142,5 @@ lib/pkgconfig/nspr.pc
@dirrm include/nspr/obsolete
@dirrm include/nspr/md
@dirrm include/nspr
-${SUN4U_32}@dirrm lib/nspr/cpu/sparcv8plus
+${PLIST.sun4u_32}@dirrm lib/nspr/cpu/sparcv8plus
@dirrm lib/nspr
diff --git a/devel/pango/PLIST b/devel/pango/PLIST
index 31fc7ed71e4..6d619a25343 100644
--- a/devel/pango/PLIST
+++ b/devel/pango/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.37 2008/04/10 12:14:43 drochner Exp $
+@comment $NetBSD: PLIST,v 1.38 2008/04/12 22:43:00 jlam Exp $
bin/pango-querymodules
-${X11}bin/pango-view
+${PLIST.x11}bin/pango-view
include/pango-1.0/pango/pango-attributes.h
include/pango-1.0/pango/pango-break.h
include/pango-1.0/pango/pango-context.h
@@ -26,25 +26,25 @@ include/pango-1.0/pango/pango-tabs.h
include/pango-1.0/pango/pango-types.h
include/pango-1.0/pango/pango-utils.h
include/pango-1.0/pango/pango.h
-${CARBON}include/pango-1.0/pango/pangoatsui.h
+${PLIST.carbon}include/pango-1.0/pango/pangoatsui.h
include/pango-1.0/pango/pangocairo.h
include/pango-1.0/pango/pangofc-decoder.h
include/pango-1.0/pango/pangofc-font.h
include/pango-1.0/pango/pangofc-fontmap.h
include/pango-1.0/pango/pangoft2.h
-${X11}include/pango-1.0/pango/pangox.h
-${X11}include/pango-1.0/pango/pangoxft-render.h
-${X11}include/pango-1.0/pango/pangoxft.h
+${PLIST.x11}include/pango-1.0/pango/pangox.h
+${PLIST.x11}include/pango-1.0/pango/pangoxft-render.h
+${PLIST.x11}include/pango-1.0/pango/pangoxft.h
lib/libpango-1.0.la
lib/libpangocairo-1.0.la
lib/libpangoft2-1.0.la
-${X11}lib/libpangox-1.0.la
-${X11}lib/libpangoxft-1.0.la
+${PLIST.x11}lib/libpangox-1.0.la
+${PLIST.x11}lib/libpangoxft-1.0.la
lib/pango/1.6.0/modules/pango-arabic-fc.la
lib/pango/1.6.0/modules/pango-arabic-lang.la
-${CARBON}lib/pango/1.6.0/modules/pango-basic-atsui.la
+${PLIST.carbon}lib/pango/1.6.0/modules/pango-basic-atsui.la
lib/pango/1.6.0/modules/pango-basic-fc.la
-${X11}lib/pango/1.6.0/modules/pango-basic-x.la
+${PLIST.x11}lib/pango/1.6.0/modules/pango-basic-x.la
lib/pango/1.6.0/modules/pango-hangul-fc.la
lib/pango/1.6.0/modules/pango-hebrew-fc.la
lib/pango/1.6.0/modules/pango-indic-fc.la
@@ -56,9 +56,9 @@ lib/pango/1.6.0/modules/pango-tibetan-fc.la
lib/pkgconfig/pango.pc
lib/pkgconfig/pangocairo.pc
lib/pkgconfig/pangoft2.pc
-${X11}lib/pkgconfig/pangox.pc
-${X11}lib/pkgconfig/pangoxft.pc
-${X11}libdata/pango/pangox.aliases
+${PLIST.x11}lib/pkgconfig/pangox.pc
+${PLIST.x11}lib/pkgconfig/pangoxft.pc
+${PLIST.x11}libdata/pango/pangox.aliases
man/man1/pango-querymodules.1
share/gtk-doc/html/pango/PangoEngineLang.html
share/gtk-doc/html/pango/PangoEngineShape.html
diff --git a/devel/pango/options.mk b/devel/pango/options.mk
index fa3906579bb..6f832cca749 100644
--- a/devel/pango/options.mk
+++ b/devel/pango/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2008/04/11 10:26:23 tron Exp $
+# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:00 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pango
PKG_SUPPORTED_OPTIONS= x11
@@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS= x11
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= x11
+
###
### X11 support
###
@@ -15,7 +17,7 @@ PKG_SUGGESTED_OPTIONS= x11
CONFIGURE_ENV+= ac_cv_lib_cairo_cairo_atsui_font_face_create_for_atsu_font_id=no
# fix for pangox.pc
CONFIGURE_ENV+= X_EXTRA_LIBS=${COMPILER_RPATH_FLAG}${X11BASE}/lib
-PLIST_SUBST+= X11=
+PLIST.x11= yes
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
@@ -23,5 +25,4 @@ BUILDLINK_DEPMETHOD.libXt?= build # only for configure
.include "../../x11/libXt/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-x
-PLIST_SUBST+= X11="@comment "
.endif
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index bd63e129c1f..c15886ade60 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/06/17 20:53:09 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2008/04/12 22:43:00 jlam Exp $
#
DISTNAME= patch-2.5.4
@@ -29,10 +29,10 @@ CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q}
PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
BUILD_DEFS+= GNU_PROGRAM_PREFIX
+PLIST_VARS+= gpatch
+
.if !defined(GNU_PROGRAM_PREFIX) || ${GNU_PROGRAM_PREFIX} != "g"
-PLIST_SUBST+= PATCH_LINK=""
-.else
-PLIST_SUBST+= PATCH_LINK="@comment "
+PLIST.gpatch= yes
.endif
do-patch:
diff --git a/devel/patch/PLIST b/devel/patch/PLIST
index 1dc8edc317d..a9ce3aa48b2 100644
--- a/devel/patch/PLIST
+++ b/devel/patch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/07 10:33:27 grant Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:00 jlam Exp $
bin/${GNU_PROGRAM_PREFIX}patch
-${PATCH_LINK}bin/gpatch
+${PLIST.gpatch}bin/gpatch
man/man1/${GNU_PROGRAM_PREFIX}patch.1
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 46426dffd31..d7e5b7f0909 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/04 21:29:26 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2008/04/12 22:43:00 jlam Exp $
#
DISTNAME= pilrc-3.2
@@ -27,12 +27,11 @@ PKG_SUGGESTED_OPTIONS= gtk
###
### gtk -- Build the GTK+ UI
###
+PLIST_VARS+= pilrcui
.if !empty(PKG_OPTIONS:Mgtk)
. include "../../x11/gtk/buildlink3.mk"
-PLIST_SUBST+= PILRCUI=
-CONFIGURE_ARGS+=--enable-pilrcui
-.else
-PLIST_SUBST+= PILRCUI="@comment "
+PLIST.pilrcui= yes
+CONFIGURE_ARGS+= --enable-pilrcui
.endif
post-install:
diff --git a/devel/pilrc/PLIST b/devel/pilrc/PLIST
index bd8b04435fc..dc0672f9589 100644
--- a/devel/pilrc/PLIST
+++ b/devel/pilrc/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/26 10:22:47 dillo Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:00 jlam Exp $
bin/pilrc
-${PILRCUI}bin/pilrcui
+${PLIST.pilrcui}bin/pilrcui
share/doc/html/pilrc/archive.html
share/doc/html/pilrc/contrib.html
share/doc/html/pilrc/download.html
diff --git a/devel/rt3/Makefile b/devel/rt3/Makefile
index e3f54c85331..f4cb7954fb3 100644
--- a/devel/rt3/Makefile
+++ b/devel/rt3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/03/24 21:55:36 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2008/04/12 22:43:00 jlam Exp $
DISTNAME= rt-3.6.6
PKGREVISION= 2
@@ -70,12 +70,12 @@ DEPENDS+= p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI
.elif !empty(PKG_OPTIONS:Mfastcgi)
DEPENDS+= p5-FCGI>=0.67:../../www/p5-FCGI
.endif
+PLIST_VARS+= speedycgi
.if !empty(PKG_OPTIONS:Mspeedycgi)
DEPENDS+= SpeedyCGI-[0-9]*:../../www/SpeedyCGI
-PLIST_SUBST+= IF_SPEEDYCGI=""
+PLIST.speedycgi=yes
.else
MAKE_FLAGS+= RT_SPEEDYCGI_HANDLER=""
-PLIST_SUBST+= IF_SPEEDYCGI="@comment "
.PHONY: rm-speedycgi
post-install: rm-speedycgi
diff --git a/devel/rt3/PLIST b/devel/rt3/PLIST
index b5f2681e0fc..1d1e4445a39 100644
--- a/devel/rt3/PLIST
+++ b/devel/rt3/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2008/03/24 21:55:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:00 jlam Exp $
bin/mason_handler.fcgi
-${IF_SPEEDYCGI}bin/mason_handler.scgi
+${PLIST.speedycgi}bin/mason_handler.scgi
bin/mason_handler.svc
bin/rt
bin/rt-crontool
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index cbf8fecf8ac..468e1adc422 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/13 19:23:24 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:00 jlam Exp $
#
DISTNAME= rudiments-0.29
@@ -15,13 +15,12 @@ USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
+PLIST_VARS+= shm
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-PLIST_SUBST+= COND_SHM="@comment "
-.else
-PLIST_SUBST+= COND_SHM=""
+.if ${OPSYS} != "NetBSD"
+PLIST.shm= yes
.endif
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/rudiments/PLIST b/devel/rudiments/PLIST
index 9d2cf100329..bdc0f2adb62 100644
--- a/devel/rudiments/PLIST
+++ b/devel/rudiments/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/06/13 19:23:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:00 jlam Exp $
bin/rudiments-config
include/rudiments/character.h
include/rudiments/charstring.h
@@ -143,8 +143,8 @@ include/rudiments/private/serviceentry.h
include/rudiments/private/serviceentryincludes.h
include/rudiments/private/sharedmemory.h
include/rudiments/private/sharedmemoryincludes.h
-${COND_SHM}include/rudiments/private/shmfile.h
-${COND_SHM}include/rudiments/private/shmfileincludes.h
+${PLIST.shm}include/rudiments/private/shmfile.h
+${PLIST.shm}include/rudiments/private/shmfileincludes.h
include/rudiments/private/signalclassesincludes.h
include/rudiments/private/signalhandler.h
include/rudiments/private/signalset.h
@@ -183,7 +183,7 @@ include/rudiments/server.h
include/rudiments/serversocket.h
include/rudiments/serviceentry.h
include/rudiments/sharedmemory.h
-${COND_SHM}include/rudiments/shmfile.h
+${PLIST.shm}include/rudiments/shmfile.h
include/rudiments/signalclasses.h
include/rudiments/snooze.h
include/rudiments/stringbuffer.h
diff --git a/devel/semi/PLIST b/devel/semi/PLIST
index b96dac543ff..b4167f4b2d7 100644
--- a/devel/semi/PLIST
+++ b/devel/semi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/10/29 12:59:00 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:00 jlam Exp $
${EMACS_INFOPREFIX}/mime-ui-en.info
${EMACS_INFOPREFIX}/mime-ui-ja.info
${FOR_xemacs}${EMACS_LISPPREFIX}/semi/auto-autoloads.el
@@ -8,7 +8,7 @@ ${FOR_xemacs}${EMACS_LISPPREFIX}/semi/custom-load.elc
${EMACS_LISPPREFIX}/semi/mail-mime-setup.el
${EMACS_LISPPREFIX}/semi/mail-mime-setup.elc
${EMACS_LISPPREFIX}/semi/mime-bbdb.el
-${FOR_bbdb}${EMACS_LISPPREFIX}/semi/mime-bbdb.elc
+${PLIST.bbdb}${EMACS_LISPPREFIX}/semi/mime-bbdb.elc
${EMACS_LISPPREFIX}/semi/mime-edit.el
${EMACS_LISPPREFIX}/semi/mime-edit.elc
${EMACS_LISPPREFIX}/semi/mime-image.el
@@ -24,7 +24,7 @@ ${EMACS_LISPPREFIX}/semi/mime-setup.elc
${EMACS_LISPPREFIX}/semi/mime-view.el
${EMACS_LISPPREFIX}/semi/mime-view.elc
${EMACS_LISPPREFIX}/semi/mime-w3.el
-${FOR_w3}${EMACS_LISPPREFIX}/semi/mime-w3.elc
+${PLIST.w3}${EMACS_LISPPREFIX}/semi/mime-w3.elc
${EMACS_LISPPREFIX}/semi/pgg-def.el
${EMACS_LISPPREFIX}/semi/pgg-def.elc
${EMACS_LISPPREFIX}/semi/pgg-gpg.el
diff --git a/devel/semi/options.mk b/devel/semi/options.mk
index 84d22ded6ba..efd4820e07d 100644
--- a/devel/semi/options.mk
+++ b/devel/semi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/10/29 13:01:37 uebayasi Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:00 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.semi
PKG_SUPPORTED_OPTIONS= semi-bbdb
@@ -8,18 +8,16 @@ PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= bbdb w3
+
.if !empty(PKG_OPTIONS:Msemi-bbdb)
.include "../../misc/bbdb/buildlink3.mk"
-PLIST_SUBST+= FOR_bbdb=
-.else
-PLIST_SUBST+= FOR_bbdb="@comment "
+PLIST.bbdb= yes
.endif
.if !empty(PKG_OPTIONS:Mw3)
.include "../../www/w3/buildlink3.mk"
-PLIST_SUBST+= FOR_w3=
-.else
-PLIST_SUBST+= FOR_w3="@comment "
+PLIST.w3= yes
.endif
# XXX inter-dependency!?!?!?