summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjlam <jlam>2008-04-12 22:42:57 +0000
committerjlam <jlam>2008-04-12 22:42:57 +0000
commit84db467ec7c8386066718011f8d47775d5608811 (patch)
treefdd67c81079412bf94013749a954125434a9baca /misc
parent7082f8c2044621c8641f3c82a2da95c2d442048c (diff)
downloadpkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'misc')
-rw-r--r--misc/kdeaccessibility3/Makefile7
-rw-r--r--misc/kdeaccessibility3/PLIST6
-rw-r--r--misc/kdepim3/PLIST6
-rw-r--r--misc/kdepim3/options.mk7
-rw-r--r--misc/koffice/PLIST26
-rw-r--r--misc/koffice/options.mk17
-rw-r--r--misc/screen/Makefile7
-rw-r--r--misc/screen/PLIST10
8 files changed, 40 insertions, 46 deletions
diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile
index ee7bde3766a..6b78caa8b67 100644
--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/03/06 14:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:04 jlam Exp $
DISTNAME= kdeaccessibility-${_KDE_VERSION}
PKGREVISION= 1
@@ -15,14 +15,13 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.kdeaccessibility
PKG_SUPPORTED_OPTIONS= gstreamer
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= gstreamer
.if !empty(PKG_OPTIONS:Mgstreamer)
CONFIGURE_ARGS+= --enable-kttsd-gstreamer
CONFIGURE_ARGS+= --with-gstreamer
.include "../../multimedia/gstreamer0.8/buildlink3.mk"
.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
-PLIST_SUBST+= HAVE_GST=""
-.else
-PLIST_SUBST+= HAVE_GST="@comment "
+PLIST.gstreamer= yes
.endif
.include "../../meta-pkgs/kde3/kde3.mk"
diff --git a/misc/kdeaccessibility3/PLIST b/misc/kdeaccessibility3/PLIST
index ac84e123d3e..ecd540a7b44 100644
--- a/misc/kdeaccessibility3/PLIST
+++ b/misc/kdeaccessibility3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2007/05/23 13:35:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:04 jlam Exp $
bin/kmag
bin/kmousetool
bin/kmouth
@@ -15,7 +15,7 @@ lib/kde3/libkttsd_eposplugin.la
lib/kde3/libkttsd_festivalintplugin.la
lib/kde3/libkttsd_fliteplugin.la
lib/kde3/libkttsd_freettsplugin.la
-${HAVE_GST}lib/kde3/libkttsd_gstplugin.la
+${PLIST.gstreamer}lib/kde3/libkttsd_gstplugin.la
lib/kde3/libkttsd_hadifixplugin.la
lib/kde3/libkttsd_sbdplugin.la
lib/kde3/libkttsd_stringreplacerplugin.la
@@ -2866,7 +2866,7 @@ share/kde/services/kttsd_eposplugin.desktop
share/kde/services/kttsd_festivalintplugin.desktop
share/kde/services/kttsd_fliteplugin.desktop
share/kde/services/kttsd_freettsplugin.desktop
-${HAVE_GST}share/kde/services/kttsd_gstplugin.desktop
+${PLIST.gstreamer}share/kde/services/kttsd_gstplugin.desktop
share/kde/services/kttsd_hadifixplugin.desktop
share/kde/services/kttsd_sbdplugin.desktop
share/kde/services/kttsd_stringreplacerplugin.desktop
diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST
index aa21afc6a81..548d7c50055 100644
--- a/misc/kdepim3/PLIST
+++ b/misc/kdepim3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2008/02/20 10:09:20 markd Exp $
+@comment $NetBSD: PLIST,v 1.31 2008/04/12 22:43:04 jlam Exp $
bin/akregator
bin/egroupwarewizard
bin/exchangewizard
@@ -304,7 +304,7 @@ lib/kde3/kio_groupwise.la
lib/kde3/kio_imap4.la
lib/kde3/kio_mbox.la
lib/kde3/kio_scalix.la
-${HAVE_SASL}lib/kde3/kio_sieve.la
+${PLIST.sasl}lib/kde3/kio_sieve.la
lib/kde3/knotes_kolab.la
lib/kde3/knotes_local.la
lib/kde3/knotes_scalix.la
@@ -1909,7 +1909,7 @@ share/kde/services/notepad-conduit.desktop
share/kde/services/popmail-conduit.desktop
share/kde/services/scalix.protocol
share/kde/services/scalixs.protocol
-${HAVE_SASL}share/kde/services/sieve.protocol
+${PLIST.sasl}share/kde/services/sieve.protocol
share/kde/services/sysinfo_conduit.desktop
share/kde/services/time_conduit.desktop
share/kde/services/todo-conduit.desktop
diff --git a/misc/kdepim3/options.mk b/misc/kdepim3/options.mk
index 35649c6e962..d8ac0096c36 100644
--- a/misc/kdepim3/options.mk
+++ b/misc/kdepim3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/01/26 03:17:09 markd Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:04 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kdepim
PKG_SUPPORTED_OPTIONS= sasl
@@ -6,9 +6,8 @@ PKG_SUGGESTED_OPTIONS= sasl
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= sasl
.if !empty(PKG_OPTIONS:Msasl)
.include "../../security/cyrus-sasl/buildlink3.mk"
-PLIST_SUBST+= HAVE_SASL=""
-.else
-PLIST_SUBST+= HAVE_SASL="@comment "
+PLIST.sasl= yes
.endif
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index 7dc20c1a7aa..faa09de37ae 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2007/06/08 12:50:14 markd Exp $
+@comment $NetBSD: PLIST,v 1.27 2008/04/12 22:43:04 jlam Exp $
bin/karbon
bin/kchart
bin/kexi
@@ -332,8 +332,8 @@ lib/kde3/karbon_whirlpinchplugin.la
lib/kde3/karbon_zoomtoolplugin.la
lib/kde3/kchart.la
lib/kde3/kexi.la
-${HAVE_MYSQL}lib/kde3/kexidb_mysqldriver.la
-${HAVE_PGSQL}lib/kde3/kexidb_pqxxsqldriver.la
+${PLIST.mysql}lib/kde3/kexidb_mysqldriver.la
+${PLIST.pgsql}lib/kde3/kexidb_pqxxsqldriver.la
lib/kde3/kexidb_sqlite2driver.la
lib/kde3/kexidb_sqlite3driver.la
lib/kde3/kexihandler_csv_importexport.la
@@ -343,8 +343,8 @@ lib/kde3/kexihandler_query.la
lib/kde3/kexihandler_relation.la
lib/kde3/kexihandler_script.la
lib/kde3/kexihandler_table.la
-${HAVE_MYSQL}lib/kde3/keximigrate_mysql.la
-${HAVE_PGSQL}lib/kde3/keximigrate_pqxx.la
+${PLIST.mysql}lib/kde3/keximigrate_mysql.la
+${PLIST.pgsql}lib/kde3/keximigrate_pqxx.la
lib/kde3/kfile_abiword.la
lib/kde3/kfile_gnumeric.la
lib/kde3/kfile_koffice.la
@@ -525,7 +525,7 @@ lib/kde3/libkugarpart.la
lib/kde3/libkwordkword1dot3import.la
lib/kde3/libkwordlatexexport.la
lib/kde3/libkwordpart.la
-${HAVE_WV2}lib/kde3/libmswordimport.la
+${PLIST.wv2}lib/kde3/libmswordimport.la
lib/kde3/libmswriteexport.la
lib/kde3/libmswriteimport.la
lib/kde3/libolefilter.la
@@ -548,7 +548,7 @@ lib/kde3/libwmfimport.la
lib/kde3/libwmlexport.la
lib/kde3/libwmlimport.la
lib/kde3/libwpexport.la
-${HAVE_WPD}lib/kde3/libwpimport.la
+${PLIST.libwpd}lib/kde3/libwpimport.la
lib/kde3/libxsltexport.la
lib/kde3/libxsltimport.la
lib/kde3/straight_connector.la
@@ -4628,12 +4628,12 @@ share/kde/services/kexi/kexiqueryhandler.desktop
share/kde/services/kexi/kexirelationhandler.desktop
share/kde/services/kexi/kexiscripthandler.desktop
share/kde/services/kexi/kexitablehandler.desktop
-${HAVE_MYSQL}share/kde/services/kexidb_mysqldriver.desktop
-${HAVE_PGSQL}share/kde/services/kexidb_pqxxsqldriver.desktop
+${PLIST.mysql}share/kde/services/kexidb_mysqldriver.desktop
+${PLIST.pgsql}share/kde/services/kexidb_pqxxsqldriver.desktop
share/kde/services/kexidb_sqlite2driver.desktop
share/kde/services/kexidb_sqlite3driver.desktop
-${HAVE_MYSQL}share/kde/services/keximigrate_mysql.desktop
-${HAVE_PGSQL}share/kde/services/keximigrate_pqxx.desktop
+${PLIST.mysql}share/kde/services/keximigrate_mysql.desktop
+${PLIST.pgsql}share/kde/services/keximigrate_pqxx.desktop
share/kde/services/kfile_abiword.desktop
share/kde/services/kfile_gnumeric.desktop
share/kde/services/kfile_koffice.desktop
@@ -4777,7 +4777,7 @@ share/kde/services/kword_html_export.desktop
share/kde/services/kword_html_import.desktop
share/kde/services/kword_kword1dot3_import.desktop
share/kde/services/kword_latex_export.desktop
-${HAVE_WV2}share/kde/services/kword_msword_import.desktop
+${PLIST.wv2}share/kde/services/kword_msword_import.desktop
share/kde/services/kword_mswrite_export.desktop
share/kde/services/kword_mswrite_import.desktop
share/kde/services/kword_oowriter_export.desktop
@@ -4790,7 +4790,7 @@ share/kde/services/kword_rtf_import.desktop
share/kde/services/kword_wml_export.desktop
share/kde/services/kword_wml_import.desktop
share/kde/services/kword_wp_export.desktop
-${HAVE_WPD}share/kde/services/kword_wp_import.desktop
+${PLIST.libwpd}share/kde/services/kword_wp_import.desktop
share/kde/services/kwordpart.desktop
share/kde/services/kwserialletter_classic.desktop
share/kde/services/kwserialletter_qtsqldb_power.desktop
diff --git a/misc/koffice/options.mk b/misc/koffice/options.mk
index 65e1c518627..f0f692a26b3 100644
--- a/misc/koffice/options.mk
+++ b/misc/koffice/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2007/02/22 19:26:49 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:04 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.koffice
PKG_SUPPORTED_OPTIONS= mysql pgsql koffice-wv2 koffice-libwpd
@@ -6,12 +6,13 @@ PKG_SUGGESTED_OPTIONS= koffice-wv2 koffice-libwpd
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= libwpd mysql pgsql wv2
+
.if !empty(PKG_OPTIONS:Mmysql)
.include "../../mk/mysql.buildlink3.mk"
-PLIST_SUBST+= HAVE_MYSQL=
+PLIST.mysql= yes
.else
CONFIGURE_ARGS+= --disable-mysql
-PLIST_SUBST+= HAVE_MYSQL="@comment "
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
@@ -21,23 +22,19 @@ CONFIGURE_ARGS+= --with-pgsql-includes=${PGSQL_PREFIX}/include
CONFIGURE_ARGS+= --with-pgsql-libraries=${PGSQL_PREFIX}/lib
CONFIGURE_ARGS+= --with-pqxx-includes=${BUILDLINK_PREFIX.libpqxx}/include
CONFIGURE_ARGS+= --with-pqxx-libraries=${BUILDLINK_PREFIX.libpqxx}/lib
-PLIST_SUBST+= HAVE_PGSQL=
+PLIST.pgsql= yes
.else
CONFIGURE_ARGS+= --disable-pgsql
-PLIST_SUBST+= HAVE_PGSQL="@comment "
.endif
.if !empty(PKG_OPTIONS:Mkoffice-wv2)
.include "../../converters/wv2/buildlink3.mk"
-PLIST_SUBST+= HAVE_WV2=
+PLIST.wv2= yes
.else
CONFIGURE_ARGS+= --without-libwv2
-PLIST_SUBST+= HAVE_WV2="@comment "
.endif
.if !empty(PKG_OPTIONS:Mkoffice-libwpd)
.include "../../converters/libwpd/buildlink3.mk"
-PLIST_SUBST+= HAVE_WPD=
-.else
-PLIST_SUBST+= HAVE_WPD="@comment "
+PLIST.libwpd= yes
.endif
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 84d1cdd7b91..941ac141082 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2008/04/04 21:09:16 tonnerre Exp $
+# $NetBSD: Makefile,v 1.76 2008/04/12 22:43:07 jlam Exp $
DISTNAME= screen-4.0.3
PKGREVISION= 2
@@ -34,12 +34,11 @@ SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
SUBST_SED.paths+= -e 's,@EXAMPLES@,${PREFIX}/share/examples/screen,g'
SUBST_STAGE.paths= post-patch
+PLIST_VARS+= terminfo
.if (${OPSYS} == "SunOS") && exists(/usr/5bin/tic)
INSTALLATION_DIRS+= share/lib/terminfo
-PLIST_SUBST+= SCREEN_TERMINFO=
+PLIST.terminfo= yes
post-install: screen-terminfo
-.else
-PLIST_SUBST+= SCREEN_TERMINFO="@comment "
.endif
.if empty(UNPRIVILEGED:M[Yy][Ee][Ss])
diff --git a/misc/screen/PLIST b/misc/screen/PLIST
index d7a6aa9d150..21492a94b64 100644
--- a/misc/screen/PLIST
+++ b/misc/screen/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/05 23:06:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:07 jlam Exp $
bin/screen
bin/${DISTNAME}
info/screen.info
man/man1/screen.1
share/examples/screen/etcscreenrc
share/examples/screen/screenrc
-${SCREEN_TERMINFO}share/lib/terminfo/s/screen
-${SCREEN_TERMINFO}share/lib/terminfo/s/screen-bce
-${SCREEN_TERMINFO}share/lib/terminfo/s/screen-s
+${PLIST.terminfo}share/lib/terminfo/s/screen
+${PLIST.terminfo}share/lib/terminfo/s/screen-bce
+${PLIST.terminfo}share/lib/terminfo/s/screen-s
share/screen/utf8encodings/01
share/screen/utf8encodings/02
share/screen/utf8encodings/03
@@ -27,5 +27,5 @@ share/screen/utf8encodings/cd
share/screen/utf8encodings/d6
@dirrm share/screen/utf8encodings
@dirrm share/screen
-${SCREEN_TERMINFO}@unexec ${RMDIR} -p %D/share/lib/terminfo/s 2>/dev/null || ${TRUE}
+${PLIST.terminfo}@unexec ${RMDIR} -p %D/share/lib/terminfo/s 2>/dev/null || ${TRUE}
@dirrm share/examples/screen