diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 84db467ec7c8386066718011f8d47775d5608811 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca | |
| parent | 7082f8c2044621c8641f3c82a2da95c2d442048c (diff) | |
| download | pkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
370 files changed, 2335 insertions, 2514 deletions
diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index 3048c179211..7dff607c5bb 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2008/04/02 22:03:07 tonnerre Exp $ +# $NetBSD: Makefile,v 1.62 2008/04/12 22:42:57 jlam Exp $ DISTNAME= tar-1.15.1 PKGNAME= gtar-base-1.15.1 @@ -43,20 +43,17 @@ CONFIGURE_ENV+= gt_cv_func_gnugettext2_libintl=yes PLIST_SUBST+= GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX BUILD_DEFS+= GTAR_PROGRAM_PREFIX +PLIST_VARS+= gtar rmt TEST_TARGET= check .if ${GTAR_PROGRAM_PREFIX} != "g" -PLIST_SUBST+= IF_BIN_GTAR="" -.else -PLIST_SUBST+= IF_BIN_GTAR="@comment " +PLIST.gtar= yes .endif # don't include rmt if gtar won't build it .if ${OPSYS} != "Interix" -PLIST_SUBST+= IF_LIBEXEC_RMT="" -.else -PLIST_SUBST+= IF_LIBEXEC_RMT="@comment " +PLIST.rmt= yes .endif post-install: diff --git a/archivers/gtar-base/PLIST b/archivers/gtar-base/PLIST index c067fc13672..8283733b3b7 100644 --- a/archivers/gtar-base/PLIST +++ b/archivers/gtar-base/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.11 2006/04/17 07:07:11 jlam Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:42:57 jlam Exp $ bin/${GTAR_PROGRAM_PREFIX}tar -${IF_BIN_GTAR}bin/gtar -${IF_LIBEXEC_RMT}libexec/${GTAR_PROGRAM_PREFIX}rmt +${PLIST.gtar}bin/gtar +${PLIST.rmt}libexec/${GTAR_PROGRAM_PREFIX}rmt man/man1/${GTAR_PROGRAM_PREFIX}tar.1 share/locale/cs/LC_MESSAGES/tar.mo share/locale/da/LC_MESSAGES/tar.mo diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile index b670a583d19..5137db46174 100644 --- a/archivers/p7zip/Makefile +++ b/archivers/p7zip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2008/04/07 17:48:14 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2008/04/12 22:42:57 jlam Exp $ DISTNAME= p7zip_4.57_src_all PKGNAME= p7zip-4.57 @@ -18,14 +18,13 @@ MAKE_FILE= makefile MAKE_JOBS_SAFE= no # missing header when compiling sfx NO_CONFIGURE= yes PTHREAD_OPTS+= require +PLIST_VARS= dll # compiles, but does not recognize any archives as supported DYNAMIC_7Z= NO .if !empty(DYNAMIC_7Z:MYES) BUILD_TARGET= all2 -PLIST_SUBST+= DYNAMIC_7Z="" -.else -PLIST_SUBST+= DYNAMIC_7Z="@comment " +PLIST.dll= yes .endif WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/-/_/} diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST index 49a4982c8dc..2c4f8dc25ab 100644 --- a/archivers/p7zip/PLIST +++ b/archivers/p7zip/PLIST @@ -1,29 +1,29 @@ -@comment $NetBSD: PLIST,v 1.13 2007/12/16 09:25:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:42:57 jlam Exp $ bin/7z bin/7za -${DYNAMIC_7Z}lib/7z/7z -${DYNAMIC_7Z}lib/7z/Codecs/7zAES.dll -${DYNAMIC_7Z}lib/7z/Codecs/AES.dll -${DYNAMIC_7Z}lib/7z/Codecs/BZip2.dll -${DYNAMIC_7Z}lib/7z/Codecs/Branch.dll -${DYNAMIC_7Z}lib/7z/Codecs/Copy.dll -${DYNAMIC_7Z}lib/7z/Codecs/Deflate.dll -${DYNAMIC_7Z}lib/7z/Codecs/Implode.dll -${DYNAMIC_7Z}lib/7z/Codecs/LZMA.dll -${DYNAMIC_7Z}lib/7z/Codecs/PPMD.dll -${DYNAMIC_7Z}lib/7z/Codecs/Swap.dll -${DYNAMIC_7Z}lib/7z/Formats/7z.dll -${DYNAMIC_7Z}lib/7z/Formats/Rar.dll -${DYNAMIC_7Z}lib/7z/Formats/Tar.dll -${DYNAMIC_7Z}lib/7z/Formats/Zip.dll -${DYNAMIC_7Z}lib/7z/Formats/arj.dll -${DYNAMIC_7Z}lib/7z/Formats/bz2.dll -${DYNAMIC_7Z}lib/7z/Formats/cab.dll -${DYNAMIC_7Z}lib/7z/Formats/cpio.dll -${DYNAMIC_7Z}lib/7z/Formats/deb.dll -${DYNAMIC_7Z}lib/7z/Formats/gz.dll -${DYNAMIC_7Z}lib/7z/Formats/rpm.dll -${DYNAMIC_7Z}lib/7z/Formats/split.dll +${PLIST.dll}lib/7z/7z +${PLIST.dll}lib/7z/Codecs/7zAES.dll +${PLIST.dll}lib/7z/Codecs/AES.dll +${PLIST.dll}lib/7z/Codecs/BZip2.dll +${PLIST.dll}lib/7z/Codecs/Branch.dll +${PLIST.dll}lib/7z/Codecs/Copy.dll +${PLIST.dll}lib/7z/Codecs/Deflate.dll +${PLIST.dll}lib/7z/Codecs/Implode.dll +${PLIST.dll}lib/7z/Codecs/LZMA.dll +${PLIST.dll}lib/7z/Codecs/PPMD.dll +${PLIST.dll}lib/7z/Codecs/Swap.dll +${PLIST.dll}lib/7z/Formats/7z.dll +${PLIST.dll}lib/7z/Formats/Rar.dll +${PLIST.dll}lib/7z/Formats/Tar.dll +${PLIST.dll}lib/7z/Formats/Zip.dll +${PLIST.dll}lib/7z/Formats/arj.dll +${PLIST.dll}lib/7z/Formats/bz2.dll +${PLIST.dll}lib/7z/Formats/cab.dll +${PLIST.dll}lib/7z/Formats/cpio.dll +${PLIST.dll}lib/7z/Formats/deb.dll +${PLIST.dll}lib/7z/Formats/gz.dll +${PLIST.dll}lib/7z/Formats/rpm.dll +${PLIST.dll}lib/7z/Formats/split.dll man/man1/7z.1 man/man1/7za.1 man/man1/7zr.1 @@ -69,6 +69,6 @@ share/doc/p7zip/syntax.htm @dirrm share/doc/p7zip/switches @dirrm share/doc/p7zip/commands @dirrm share/doc/p7zip -${DYNAMIC_7Z}@dirrm lib/7z/Formats -${DYNAMIC_7Z}@dirrm lib/7z/Codecs -${DYNAMIC_7Z}@dirrm lib/7z +${PLIST.dll}@dirrm lib/7z/Formats +${PLIST.dll}@dirrm lib/7z/Codecs +${PLIST.dll}@dirrm lib/7z diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST index 8e5e2808f7c..6ac89cd8e1c 100644 --- a/audio/amarok/PLIST +++ b/audio/amarok/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2007/08/30 00:01:35 wiz Exp $ +@comment $NetBSD: PLIST,v 1.27 2008/04/12 22:42:57 jlam Exp $ bin/amarok bin/amarok_daapserver.rb bin/amarok_libvisual @@ -8,7 +8,7 @@ bin/amarokcollectionscanner lib/kde3/konqsidebar_universalamarok.la lib/kde3/libamarok_daap-mediadevice.la lib/kde3/libamarok_generic-mediadevice.la -${IPOD}lib/kde3/libamarok_ipod-mediadevice.la +${PLIST.ipod}lib/kde3/libamarok_ipod-mediadevice.la lib/kde3/libamarok_massstorage-device.la lib/kde3/libamarok_nfs-device.la lib/kde3/libamarok_smb-device.la @@ -952,7 +952,7 @@ share/kde/config.kcfg/xinecfg.kcfg share/kde/config/amarokrc share/kde/services/amarok_daap-mediadevice.desktop share/kde/services/amarok_generic-mediadevice.desktop -${IPOD}share/kde/services/amarok_ipod-mediadevice.desktop +${PLIST.ipod}share/kde/services/amarok_ipod-mediadevice.desktop share/kde/services/amarok_massstorage-device.desktop share/kde/services/amarok_nfs-device.desktop share/kde/services/amarok_smb-device.desktop diff --git a/audio/amarok/options.mk b/audio/amarok/options.mk index d741b6561bd..3614ef3468e 100644 --- a/audio/amarok/options.mk +++ b/audio/amarok/options.mk @@ -1,17 +1,17 @@ -# $NetBSD: options.mk,v 1.4 2008/04/08 21:04:07 jlam Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:42:57 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.amarok PKG_SUPPORTED_OPTIONS= libgpod mysql pgsql .include "../../mk/bsd.options.mk" +PLIST_VARS+= ipod + .if !empty(PKG_OPTIONS:Mlibgpod) +PLIST.ipod= yes CONFIGURE_ARGS+= --enable-libgpod BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.4.2 . include "../../audio/libgpod/buildlink3.mk" -PLIST_SUBST+= IPOD="" -.else -PLIST_SUBST+= IPOD="@comment " .endif .if !empty(PKG_OPTIONS:Mmysql) diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile index 19122a5c801..4ff6ebaefd1 100644 --- a/audio/bmp/Makefile +++ b/audio/bmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2008/03/06 14:53:47 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2008/04/12 22:42:57 jlam Exp $ # BMP_ENABLE_ENCODERS= yes @@ -9,12 +9,11 @@ PKGREVISION= 5 DEPENDS+= unzip-[0-9]*:../../archivers/unzip -.if ${OPSYS} == "Darwin" -PLIST_SUBST+= CDAUDIO="@comment " -.else -PLIST_SUBST+= CDAUDIO="" +PLIST_VARS+= cdaudio +.if ${OPSYS} != "Darwin" +PLIST.cdaudio= yes .endif -PRINT_PLIST_AWK+= /cdaudio/ { print "$${CDAUDIO}" $$0; next } +PRINT_PLIST_AWK+= /cdaudio/ { print "$${PLIST.cdaudio}" $$0; next } # XXX Workaround a crash during shutdown that happens when dlclose(3)ing # any open plugin. libstdc++ gets dynamically linked in when the id3lib diff --git a/audio/bmp/PLIST b/audio/bmp/PLIST index 6ef47bed50e..830e9bc4448 100644 --- a/audio/bmp/PLIST +++ b/audio/bmp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2006/07/31 21:43:55 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:42:58 jlam Exp $ bin/beep-media-player include/bmp/beepctrl.h include/bmp/configdb.h @@ -11,7 +11,7 @@ include/bmp/rcfile.h include/bmp/titlestring.h include/bmp/util.h include/bmp/vfs.h -${CDAUDIO}lib/bmp/Input/libcdaudio.la +${PLIST.cdaudio}lib/bmp/Input/libcdaudio.la lib/bmp/Input/libmpg123.la lib/bmp/Input/libvorbis.la lib/bmp/Input/libwav.la diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 27040005179..a2489a72fc5 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/11/19 00:10:31 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 2008/04/12 22:42:58 jlam Exp $ # DISTNAME= cmus-2.1.0 @@ -18,11 +18,10 @@ CONFIGURE_ARGS+= prefix=${PREFIX} CONFIGURE_ARGS+= CONFIG_ALSA=n CONFIGURE_ARGS+= CONFIG_OSS=y CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/ +PLIST_VARS= sunaudio .if exists(/usr/include/sys/audioio.h) -PLIST_SUBST+= SUN="" -.else -PLIST_SUBST+= SUN="@comment " +PLIST.sunaudio= yes .endif .include "../../mk/bsd.prefs.mk" diff --git a/audio/cmus/PLIST b/audio/cmus/PLIST index a41881fdc7b..8f0c5270b16 100644 --- a/audio/cmus/PLIST +++ b/audio/cmus/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2007/01/13 08:57:56 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $ bin/cmus bin/cmus-remote lib/cmus/ip/flac.so @@ -8,7 +8,7 @@ lib/cmus/ip/vorbis.so lib/cmus/ip/wav.so lib/cmus/op/ao.so lib/cmus/op/oss.so -${SUN}lib/cmus/op/sun.so +${PLIST.sunaudio}lib/cmus/op/sun.so man/man1/cmus-remote.1 man/man1/cmus.1 share/cmus/cyan.theme diff --git a/audio/jack-devel/Makefile b/audio/jack-devel/Makefile index 6f2e4765b9c..5a718c4b477 100644 --- a/audio/jack-devel/Makefile +++ b/audio/jack-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/04/08 01:44:47 bjs Exp $ +# $NetBSD: Makefile,v 1.4 2008/04/12 22:42:58 jlam Exp $ # DISTNAME= jack-audio-connection-kit-${JACK_VERSION} @@ -50,28 +50,29 @@ CONFIGURE_ARGS+= --with-default-tmpdir=/dev/shm CONFIGURE_ARGS+= --with-default-tmpdir=${JACKD_DEFAULT_TMPDIR:Q} .endif +PLIST_VARS= oss sunaudio + ### ### XXX The sun driver is buggy on NetBSD right now. I hope to remedy ### this shortly. ### .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Solaris" CONFIGURE_ARGS+= --enable-sun -PLIST_SUBST+= SUN="" +PLIST.sunaudio= yes .else CONFIGURE_ARGS+= --disable-sun -PLIST_SUBST+= SUN="@comment " .endif .include "../../mk/oss.buildlink3.mk" .if ${OSS_TYPE} != "none" CONFIGURE_ARGS+= --enable-oss +PLIST.oss= yes PLIST_SUBST+= OSS="" MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q} CFLAGS+= -DDEVOSSAUDIO=\"${DEVOSSAUDIO:U/dev/dsp}\" .else CONFIGURE_ARGS+= --disable-oss -PLIST_SUBST+= OSS="@comment " .endif diff --git a/audio/jack-devel/PLIST b/audio/jack-devel/PLIST index 3ecf40e90f5..5fc00223e00 100644 --- a/audio/jack-devel/PLIST +++ b/audio/jack-devel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2008/04/08 01:44:47 bjs Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $ bin/jack_alias bin/jack_connect bin/jack_disconnect @@ -30,8 +30,8 @@ lib/jack/inprocess.la lib/jack/intime.la lib/jack/jack_dummy.la lib/jack/jack_net.la -${OSS}lib/jack/jack_oss.la -${SUN}lib/jack/jack_sun.la +${PLIST.oss}lib/jack/jack_oss.la +${PLIST.sunaudio}lib/jack/jack_sun.la lib/jack/netsource.la lib/libjack.la lib/libjackserver.la diff --git a/audio/moc-devel/PLIST b/audio/moc-devel/PLIST index 2cb89b1915d..faa1b06681d 100644 --- a/audio/moc-devel/PLIST +++ b/audio/moc-devel/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/04/07 16:10:37 bjs Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/04/12 22:42:58 jlam Exp $ bin/mocp -${FLAC}lib/moc/decoder_plugins/libflac_decoder.la +${PLIST.flac}lib/moc/decoder_plugins/libflac_decoder.la lib/moc/decoder_plugins/libmp3_decoder.la -${VORBIS}lib/moc/decoder_plugins/libvorbis_decoder.la -${SNDFILE}lib/moc/decoder_plugins/libsndfile_formats_decoder.la -${SPEEX}lib/moc/decoder_plugins/libspeex_decoder.la +${PLIST.vorbis}lib/moc/decoder_plugins/libvorbis_decoder.la +${PLIST.sndfile}lib/moc/decoder_plugins/libsndfile_formats_decoder.la +${PLIST.speex}lib/moc/decoder_plugins/libspeex_decoder.la man/man1/mocp.1 share/doc/moc/README share/doc/moc/THANKS diff --git a/audio/moc-devel/options.mk b/audio/moc-devel/options.mk index b5437013bd2..cbfd40eb89d 100644 --- a/audio/moc-devel/options.mk +++ b/audio/moc-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2008/04/08 01:52:41 bjs Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:58 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.moc PKG_SUPPORTED_OPTIONS= sndfile flac vorbis speex curl samplerate jack @@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS= sndfile flac vorbis curl .include "../../mk/bsd.options.mk" +PLIST_VARS+= flac sndfile speex vorbis + .if !empty(PKG_OPTIONS:Mjack) CONFIGURE_ARGS+= --with-jack ### @@ -30,38 +32,34 @@ CONFIGURE_ARGS+= --without-samplerate .endif .if !empty(PKG_OPTIONS:Msndfile) -PLIST_SUBST+= SNDFILE= +PLIST.sndfile= yes CONFIGURE_ARGS+= --with-sndfile . include "../../audio/libsndfile/buildlink3.mk" .else -PLIST_SUBST+= SNDFILE='@comment ' CONFIGURE_ARGS+= --without-sndfile .endif .if !empty(PKG_OPTIONS:Mflac) -PLIST_SUBST+= FLAC= +PLIST.flac= yes CONFIGURE_ARGS+= --with-flac . include "../../audio/flac/buildlink3.mk" .else -PLIST_SUBST+= FLAC='@comment ' CONFIGURE_ARGS+= --without-flac .endif .if !empty(PKG_OPTIONS:Mvorbis) -PLIST_SUBST+= VORBIS= +PLIST.vorbis= yes CONFIGURE_ARGS+= --with-vorbis . include "../../audio/libvorbis/buildlink3.mk" .else -PLIST_SUBST+= VORBIS='@comment ' CONFIGURE_ARGS+= --without-vorbis .endif .if !empty(PKG_OPTIONS:Mspeex) -PLIST_SUBST+= SPEEX= +PLIST.speex= yes CONFIGURE_ARGS+= --with-speex . include "../../audio/speex/buildlink3.mk" .else -PLIST_SUBST+= SPEEX='@comment ' CONFIGURE_ARGS+= --without-speex .endif diff --git a/audio/moc/PLIST b/audio/moc/PLIST index 848aa7d665b..9a01cd2da09 100644 --- a/audio/moc/PLIST +++ b/audio/moc/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2006/02/12 18:35:55 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:42:58 jlam Exp $ bin/mocp -${FLAC}lib/moc/decoder_plugins/libflac_decoder.la +${PLIST.flac}lib/moc/decoder_plugins/libflac_decoder.la lib/moc/decoder_plugins/libmp3_decoder.la -${VORBIS}lib/moc/decoder_plugins/libvorbis_decoder.la -${SNDFILE}lib/moc/decoder_plugins/libsndfile_formats_decoder.la -${SPEEX}lib/moc/decoder_plugins/libspeex_decoder.la +${PLIST.vorbis}lib/moc/decoder_plugins/libvorbis_decoder.la +${PLIST.sndfile}lib/moc/decoder_plugins/libsndfile_formats_decoder.la +${PLIST.speex}lib/moc/decoder_plugins/libspeex_decoder.la man/man1/mocp.1 share/doc/moc/README share/doc/moc/THANKS diff --git a/audio/moc/options.mk b/audio/moc/options.mk index aa301ee44f1..6d16cb4a5e9 100644 --- a/audio/moc/options.mk +++ b/audio/moc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2008/04/07 16:15:25 bjs Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:58 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.moc PKG_SUPPORTED_OPTIONS= sndfile flac vorbis speex curl samplerate @@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS= sndfile flac vorbis curl .include "../../mk/bsd.options.mk" +PLIST_VARS+= fac sndfile speex vorbis + .if !empty(PKG_OPTIONS:Msamplerate) PKG_OPTIONS+= sndfile CONFIGURE_ARGS+= --with-samplerate @@ -15,38 +17,34 @@ CONFIGURE_ARGS+= --without-samplerate .endif .if !empty(PKG_OPTIONS:Msndfile) || defined(PKG_OPTIONS:Msamplerate) -PLIST_SUBST+= SNDFILE= +PLIST.sndfile= yes CONFIGURE_ARGS+= --with-sndfile . include "../../audio/libsndfile/buildlink3.mk" .else -PLIST_SUBST+= SNDFILE='@comment ' CONFIGURE_ARGS+= --without-sndfile .endif .if !empty(PKG_OPTIONS:Mflac) -PLIST_SUBST+= FLAC= +PLIST.flac= yes CONFIGURE_ARGS+= --with-flac . include "../../audio/flac/buildlink3.mk" .else -PLIST_SUBST+= FLAC='@comment ' CONFIGURE_ARGS+= --without-flac .endif .if !empty(PKG_OPTIONS:Mvorbis) -PLIST_SUBST+= VORBIS= +PLIST.vorbis= yes CONFIGURE_ARGS+= --with-vorbis . include "../../audio/libvorbis/buildlink3.mk" .else -PLIST_SUBST+= VORBIS='@comment ' CONFIGURE_ARGS+= --without-vorbis .endif .if !empty(PKG_OPTIONS:Mspeex) -PLIST_SUBST+= SPEEX= +PLIST.speex= yes CONFIGURE_ARGS+= --with-speex . include "../../audio/speex/buildlink3.mk" .else -PLIST_SUBST+= SPEEX='@comment ' CONFIGURE_ARGS+= --without-speex .endif diff --git a/audio/normalize/PLIST b/audio/normalize/PLIST index b73cfec2311..8100c5a1dba 100644 --- a/audio/normalize/PLIST +++ b/audio/normalize/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2006/04/21 09:28:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:42:58 jlam Exp $ bin/normalize bin/normalize-mp3 bin/normalize-ogg -${XMMS_PLUGIN}lib/xmms/Effect/librva.la +${PLIST.xmms}lib/xmms/Effect/librva.la man/man1/normalize-mp3.1 man/man1/normalize.1 share/locale/en_GB/LC_MESSAGES/normalize.mo diff --git a/audio/normalize/options.mk b/audio/normalize/options.mk index 060d1e27adc..e81b3754e02 100644 --- a/audio/normalize/options.mk +++ b/audio/normalize/options.mk @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.1 2006/04/21 09:28:47 adam Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:58 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.normalize PKG_SUPPORTED_OPTIONS= xmms .include "../../mk/bsd.options.mk" +PLIST_VARS+= xmms + .if !empty(PKG_OPTIONS:Mxmms) -PLIST_SUBST+= XMMS_PLUGIN= +PLIST.xmms= yes .include "../../audio/xmms/buildlink3.mk" -.else -PLIST_SUBST+= XMMS_PLUGIN="@comment " .endif diff --git a/audio/streamtuner/PLIST b/audio/streamtuner/PLIST index 4244f750f6a..1afc9882360 100644 --- a/audio/streamtuner/PLIST +++ b/audio/streamtuner/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:12 jlam Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:42:58 jlam Exp $ bin/streamtuner include/streamtuner/st-action-api.h include/streamtuner/st-category-api.h @@ -21,10 +21,10 @@ include/streamtuner/st-version-api.h include/streamtuner/streamtuner.h lib/pkgconfig/streamtuner.pc lib/streamtuner/plugins/live365.la -${LOCAL_PLUGIN}lib/streamtuner/plugins/local.la -${PYTHON_PLUGIN}lib/streamtuner/plugins/python.la +${PLIST.local}lib/streamtuner/plugins/local.la +${PLIST.python}lib/streamtuner/plugins/python.la lib/streamtuner/plugins/shoutcast.la -${XIPH_PLUGIN}lib/streamtuner/plugins/xiph.la +${PLIST.xiph}lib/streamtuner/plugins/xiph.la share/applications/streamtuner.desktop share/doc/streamtuner/api-reference.html share/doc/streamtuner/ch01s02.html @@ -66,12 +66,12 @@ share/locale/ja/LC_MESSAGES/streamtuner.mo share/locale/pt/LC_MESSAGES/streamtuner.mo share/omf/streamtuner/streamtuner-C.omf share/pixmaps/streamtuner.png -${PYTHON_PLUGIN}share/streamtuner/python/icons/basic.ch.png -${PYTHON_PLUGIN}share/streamtuner/python/icons/google-stations.png -${PYTHON_PLUGIN}share/streamtuner/python/icons/punkcast.com.png -${PYTHON_PLUGIN}share/streamtuner/python/scripts/basic.ch.py -${PYTHON_PLUGIN}share/streamtuner/python/scripts/google-stations.py -${PYTHON_PLUGIN}share/streamtuner/python/scripts/punkcast.com.py +${PLIST.python}share/streamtuner/python/icons/basic.ch.png +${PLIST.python}share/streamtuner/python/icons/google-stations.png +${PLIST.python}share/streamtuner/python/icons/punkcast.com.png +${PLIST.python}share/streamtuner/python/scripts/basic.ch.py +${PLIST.python}share/streamtuner/python/scripts/google-stations.py +${PLIST.python}share/streamtuner/python/scripts/punkcast.com.py share/streamtuner/ui/applications.png share/streamtuner/ui/bookmarks.png share/streamtuner/ui/browse.png @@ -84,7 +84,7 @@ share/streamtuner/ui/local.png share/streamtuner/ui/logo.png share/streamtuner/ui/main-category-running.png share/streamtuner/ui/main-category.png -${PYTHON_PLUGIN}share/streamtuner/ui/python.png +${PLIST.python}share/streamtuner/ui/python.png share/streamtuner/ui/preselections.png share/streamtuner/ui/record.png share/streamtuner/ui/search-category-running.png @@ -95,9 +95,9 @@ share/streamtuner/ui/streamtuner.png share/streamtuner/ui/tune-in.png share/streamtuner/ui/xiph.png @dirrm share/streamtuner/ui -${PYTHON_PLUGIN}@dirrm share/streamtuner/python/scripts -${PYTHON_PLUGIN}@dirrm share/streamtuner/python/icons -${PYTHON_PLUGIN}@dirrm share/streamtuner/python +${PLIST.python}@dirrm share/streamtuner/python/scripts +${PLIST.python}@dirrm share/streamtuner/python/icons +${PLIST.python}@dirrm share/streamtuner/python @dirrm share/streamtuner @comment in xdg-dirs: @dirrm share/pixmaps @dirrm share/omf/streamtuner diff --git a/audio/streamtuner/options.mk b/audio/streamtuner/options.mk index b7a93ede259..5e47d362531 100644 --- a/audio/streamtuner/options.mk +++ b/audio/streamtuner/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/10/19 09:45:09 xtraeme Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:58 jlam Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.streamtuner @@ -7,29 +7,28 @@ PKG_SUGGESTED_OPTIONS= streamtuner-local streamtuner-xiph .include "../../mk/bsd.options.mk" +PLIST_VARS+= local python xiph + .if !empty(PKG_OPTIONS:Mstreamtuner-local) -PLIST_SUBST+= LOCAL_PLUGIN= +PLIST.local= yes CONFIGURE_ARGS+= --enable-local . include "../../audio/taglib/buildlink3.mk" .else -PLIST_SUBST+= LOCAL_PLUGIN='@comment ' CONFIGURE_ARGS+= --disable-local .endif .if !empty(PKG_OPTIONS:Mstreamtuner-xiph) -PLIST_SUBST+= XIPH_PLUGIN= +PLIST.xiph= yes CONFIGURE_ARGS+= --enable-xiph . include "../../textproc/libxml2/buildlink3.mk" .else -PLIST_SUBST+= XIPH_PLUGIN='@comment ' CONFIGURE_ARGS+= --disable-xiph .endif .if !empty(PKG_OPTIONS:Mpython) -PLIST_SUBST+= PYTHON_PLUGIN= +PLIST.python= yes CONFIGURE_ARGS+= --enable-python . include "../../x11/py-gtk2/buildlink3.mk" .else -PLIST_SUBST+= PYTHON_PLUGIN='@comment ' CONFIGURE_ARGS+= --disable-python .endif diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile index 5f8bbaf5752..1a0732f53f0 100644 --- a/audio/xmms-modplug/Makefile +++ b/audio/xmms-modplug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/02/22 19:26:08 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2008/04/12 22:42:58 jlam Exp $ # DISTNAME= modplugxmms-2.05 @@ -21,6 +21,7 @@ USE_TOOLS+= pkg-config CFLAGS+= -DDEVICE_NAME="\"${DEVOSSSOUND}\"" USE_LANGUAGES= c c++ +PLIST_VARS= modplugplay PKG_INSTALLATION_TYPES= overwrite pkgviews @@ -31,10 +32,8 @@ SUBST_MESSAGE.mpplay= Skipping modplugplay SUBST_STAGE.mpplay= pre-build SUBST_FILES.mpplay= Makefile SUBST_SED.mpplay= -e 's,^\(SUBDIRS = modplugxmms glade\) modplugplay,\1,' - -PLIST_SUBST+= NOTFOROSX="@comment " .else -PLIST_SUBST+= NOTFOROSX="" +PLIST.modplugplay= yes .endif .include "../../audio/libmodplug/buildlink3.mk" diff --git a/audio/xmms-modplug/PLIST b/audio/xmms-modplug/PLIST index 804c3eacf48..4f8e8d3fbdc 100644 --- a/audio/xmms-modplug/PLIST +++ b/audio/xmms-modplug/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.3 2006/08/29 04:40:53 ben Exp $ -${NOTFOROSX}bin/modplugplay +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $ +${PLIST.modplugplay}bin/modplugplay lib/xmms/Input/libmodplugxmms.la diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index b1cdf9e3e9a..a549ce6344a 100644 --- a/audio/xmms/Makefile +++ b/audio/xmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2007/12/21 23:23:58 joerg Exp $ +# $NetBSD: Makefile,v 1.70 2008/04/12 22:42:58 jlam Exp $ # .include "Makefile.common" @@ -7,11 +7,12 @@ USE_TOOLS+= msgfmt CONFIGURE_ARGS+= --disable-esd +PLIST_VARS+= cdaudio + .if ${OPSYS} == "Darwin" -PLIST_SUBST+= CDAUDIO="@comment " _INSTALL_UNSTRIPPED= yes .else -PLIST_SUBST+= CDAUDIO="" +PLIST.cdaudio= yes .endif BUILDLINK_DEPMETHOD.libXt?= build diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common index d35807f8d9d..41e0b16b28c 100644 --- a/audio/xmms/Makefile.common +++ b/audio/xmms/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2007/11/29 18:36:35 wiz Exp $ +# $NetBSD: Makefile.common,v 1.28 2008/04/12 22:42:58 jlam Exp $ # DISTNAME= xmms-1.2.11 @@ -14,6 +14,7 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes +PLIST_VARS= oss DISTINFO_FILE= ${.CURDIR}/../../audio/xmms/distinfo FILESDIR= ${.CURDIR}/../../audio/xmms/files @@ -65,9 +66,8 @@ post-patch: .if ${OPSYS} != "FreeBSD" && ${OPSYS} != "Linux" && ${OPSYS} != "NetBSD" && \ ${OPSYS} != "OpenBSD" && ${OPSYS} != "DragonFly" CONFIGURE_ARGS+= --disable-oss -PLIST_SUBST+= OSS="@comment " .else -PLIST_SUBST+= OSS="" +PLIST.oss= yes .endif .include "../../audio/libmikmod/buildlink3.mk" diff --git a/audio/xmms/PLIST.common b/audio/xmms/PLIST.common index 6a5a3daf886..5c752eca9ea 100644 --- a/audio/xmms/PLIST.common +++ b/audio/xmms/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.10 2007/12/06 10:30:53 martti Exp $ +@comment $NetBSD: PLIST.common,v 1.11 2008/04/12 22:42:58 jlam Exp $ bin/wmxmms bin/xmms bin/xmms-config @@ -16,13 +16,13 @@ lib/xmms/Effect/libstereo.la lib/xmms/Effect/libvoice.la lib/xmms/General/libir.la lib/xmms/General/libsong_change.la -${CDAUDIO}lib/xmms/Input/libcdaudio.la +${PLIST.cdaudio}lib/xmms/Input/libcdaudio.la lib/xmms/Input/libmikmod.la lib/xmms/Input/libmpg123.la lib/xmms/Input/libtonegen.la lib/xmms/Input/libvorbis.la lib/xmms/Input/libwav.la -${OSS}lib/xmms/Output/libOSS.la +${PLIST.oss}lib/xmms/Output/libOSS.la lib/xmms/Output/libdisk_writer.la lib/xmms/Visualization/libbscope.la lib/xmms/Visualization/libogl_spectrum.la diff --git a/cad/lc/Makefile b/cad/lc/Makefile index 0fa1c7e27a1..50293900e32 100644 --- a/cad/lc/Makefile +++ b/cad/lc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/03/03 01:43:01 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2008/04/12 22:42:58 jlam Exp $ DISTNAME= lc # overridden below PKGNAME= lc-2.10 @@ -45,11 +45,12 @@ DISTFILES+= lc_irix64.tar.gz DISTFILES+= lc_solaris.tar.gz .endif +PLIST_VARS+= lcspice + .if ${EMUL_PLATFORM} == "linux-x86_64" WRKSRC= ${WRKDIR}/lc -PLIST_SUBST+= HAVE_LCSPICE="@comment " .else -PLIST_SUBST+= HAVE_LCSPICE="" +PLIST.lcspice= yes .endif INSTALLATION_DIRS= bin share diff --git a/cad/lc/PLIST b/cad/lc/PLIST index fa27cec97a1..3b80ec50082 100644 --- a/cad/lc/PLIST +++ b/cad/lc/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.3 2007/02/24 00:54:26 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $ bin/lc bin/lcplot -${HAVE_LCSPICE}bin/lcspice +${PLIST.lcspice}bin/lcspice share/lc2.10/README share/lc2.10/app-defaults/Lc share/lc2.10/app-defaults/Lcplot diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile index 2267ed6109e..6544b0a5e67 100644 --- a/chat/eggdrop/Makefile +++ b/chat/eggdrop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2008/03/03 02:19:51 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2008/04/12 22:42:58 jlam Exp $ DISTNAME= eggdrop1.6.18 PKGNAME= eggdrop-1.6.18 @@ -12,6 +12,7 @@ COMMENT= IRC robot with TCL scripting and multi-channel ability PKG_DESTDIR_SUPPORT= user-destdir +PLIST_VARS= dynamic GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ENV+= TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include" @@ -64,10 +65,9 @@ do-install-program: .if defined(NOPIC) BUILD_TARGET= static -PLIST_SUBST+= NOPIC="@comment " .else BUILD_TARGET= eggdrop -PLIST_SUBST+= NOPIC= +PLIST.dynamic= yes do-install: do-install-modules do-install-modules: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/eggdrop diff --git a/chat/eggdrop/PLIST b/chat/eggdrop/PLIST index c66b36bb985..c6bcf31c7f4 100644 --- a/chat/eggdrop/PLIST +++ b/chat/eggdrop/PLIST @@ -1,21 +1,21 @@ -@comment $NetBSD: PLIST,v 1.9 2007/10/18 09:15:33 obache Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:42:58 jlam Exp $ bin/eggdrop -${NOPIC}lib/eggdrop/assoc.so -${NOPIC}lib/eggdrop/blowfish.so -${NOPIC}lib/eggdrop/channels.so -${NOPIC}lib/eggdrop/compress.so -${NOPIC}lib/eggdrop/console.so -${NOPIC}lib/eggdrop/ctcp.so -${NOPIC}lib/eggdrop/dns.so -${NOPIC}lib/eggdrop/filesys.so -${NOPIC}lib/eggdrop/irc.so -${NOPIC}lib/eggdrop/notes.so -${NOPIC}lib/eggdrop/seen.so -${NOPIC}lib/eggdrop/server.so -${NOPIC}lib/eggdrop/share.so -${NOPIC}lib/eggdrop/transfer.so -${NOPIC}lib/eggdrop/uptime.so -${NOPIC}lib/eggdrop/wire.so +${PLIST.dynamic}lib/eggdrop/assoc.so +${PLIST.dynamic}lib/eggdrop/blowfish.so +${PLIST.dynamic}lib/eggdrop/channels.so +${PLIST.dynamic}lib/eggdrop/compress.so +${PLIST.dynamic}lib/eggdrop/console.so +${PLIST.dynamic}lib/eggdrop/ctcp.so +${PLIST.dynamic}lib/eggdrop/dns.so +${PLIST.dynamic}lib/eggdrop/filesys.so +${PLIST.dynamic}lib/eggdrop/irc.so +${PLIST.dynamic}lib/eggdrop/notes.so +${PLIST.dynamic}lib/eggdrop/seen.so +${PLIST.dynamic}lib/eggdrop/server.so +${PLIST.dynamic}lib/eggdrop/share.so +${PLIST.dynamic}lib/eggdrop/transfer.so +${PLIST.dynamic}lib/eggdrop/uptime.so +${PLIST.dynamic}lib/eggdrop/wire.so man/man1/eggdrop.1 share/doc/eggdrop/BANS share/doc/eggdrop/BOTNET @@ -127,4 +127,4 @@ share/examples/eggdrop/eggdrop.conf @dirrm share/eggdrop @dirrm share/doc/eggdrop/html @dirrm share/doc/eggdrop -${NOPIC}@dirrm lib/eggdrop +${PLIST.dynamic}@dirrm lib/eggdrop diff --git a/chat/jabberd2/PLIST b/chat/jabberd2/PLIST index e54f26df224..b4b04053d59 100644 --- a/chat/jabberd2/PLIST +++ b/chat/jabberd2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2008/02/20 14:33:04 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:42:58 jlam Exp $ bin/c2s bin/jabberd bin/migrate.pl @@ -8,12 +8,12 @@ bin/router bin/s2s bin/sm lib/jabberd/authreg_anon.la -${DB_OPT}lib/jabberd/authreg_db.la -${LDAP_OPT}lib/jabberd/authreg_ldap.la -${MYSQL_OPT}lib/jabberd/authreg_mysql.la -${PAM_OPT}lib/jabberd/authreg_pam.la -${PGSQL_OPT}lib/jabberd/authreg_pgsql.la -${SQLITE_OPT}lib/jabberd/authreg_sqlite.la +${PLIST.db}lib/jabberd/authreg_db.la +${PLIST.ldap}lib/jabberd/authreg_ldap.la +${PLIST.mysql}lib/jabberd/authreg_mysql.la +${PLIST.pam}lib/jabberd/authreg_pam.la +${PLIST.pgsql}lib/jabberd/authreg_pgsql.la +${PLIST.sqlite}lib/jabberd/authreg_sqlite.la lib/jabberd/authreg_pipe.la lib/jabberd/mod_active.la lib/jabberd/mod_amp.la @@ -40,10 +40,10 @@ lib/jabberd/mod_template-roster.la lib/jabberd/mod_vacation.la lib/jabberd/mod_validate.la lib/jabberd/storage_fs.la -${DB_OPT}lib/jabberd/storage_db.la -${MYSQL_OPT}lib/jabberd/storage_mysql.la -${PGSQL_OPT}lib/jabberd/storage_pgsql.la -${SQLITE_OPT}lib/jabberd/storage_sqlite.la +${PLIST.db}lib/jabberd/storage_db.la +${PLIST.mysql}lib/jabberd/storage_mysql.la +${PLIST.pgsql}lib/jabberd/storage_pgsql.la +${PLIST.sqlite}lib/jabberd/storage_sqlite.la man/man8/c2s.8 man/man8/jabberd.8 man/man8/resolver.8 diff --git a/chat/jabberd2/options.mk b/chat/jabberd2/options.mk index 102da9f35ea..eeb18bbf313 100644 --- a/chat/jabberd2/options.mk +++ b/chat/jabberd2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.19 2008/02/20 14:33:04 xtraeme Exp $ +# $NetBSD: options.mk,v 1.20 2008/04/12 22:42:58 jlam Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.jabberd2 @@ -14,6 +14,8 @@ PKG_SUGGESTED_OPTIONS= auth-sqlite storage-sqlite .include "../../mk/bsd.options.mk" +PLIST_VARS+= db ldap mysql pam pgsql sqlite + .if !empty(PKG_OPTIONS:Mauth-db) || !empty(PKG_OPTIONS:Mstorage-db) SUBST_CLASSES+= fixdb SUBST_STAGE.fixdb= post-configure @@ -21,57 +23,51 @@ SUBST_FILES.fixdb= storage/Makefile.in SUBST_SED.fixdb= -e "s|@DB_LIBS@||g" BUILDLINK_TRANSFORM+= rm:-ldb BDB_ACCEPTED= db4 -PLIST_SUBST+= DB_OPT= +PLIST.db= yes CONFIGURE_ARGS+= --enable-db . include "../../mk/bdb.buildlink3.mk" .else -PLIST_SUBST+= DB_OPT='@comment ' CONFIGURE_ARGS+= --disable-db .endif .if !empty(PKG_OPTIONS:Mauth-mysql) || !empty(PKG_OPTIONS:Mstorage-mysql) -PLIST_SUBST+= MYSQL_OPT= +PLIST.mysql= yes CONFIGURE_ARGS+= --enable-mysql CPPFLAGS+= -I${BUILDLINK_PREFIX.mysql-client}/include/mysql . include "../../mk/mysql.buildlink3.mk" .else -PLIST_SUBST+= MYSQL_OPT='@comment ' CONFIGURE_ARGS+= --disable-mysql .endif .if !empty(PKG_OPTIONS:Mauth-pgsql) || !empty(PKG_OPTIONS:Mstorage-pgsql) -PLIST_SUBST+= PGSQL_OPT= +PLIST.pgsql= yes CONFIGURE_ARGS+= --enable-pgsql . include "../../mk/pgsql.buildlink3.mk" .else -PLIST_SUBST+= PGSQL_OPT='@comment ' CONFIGURE_ARGS+= --disable-pgsql .endif .if !empty(PKG_OPTIONS:Mauth-sqlite) || !empty(PKG_OPTIONS:Mstorage-sqlite) -PLIST_SUBST+= SQLITE_OPT= +PLIST.sqlite= yes CONFIGURE_ARGS+= --enable-sqlite . include "../../databases/sqlite3/buildlink3.mk" .else -PLIST_SUBST+= SQLITE_OPT='@comment ' CONFIGURE_ARGS+= --disable-sqlite .endif .if !empty(PKG_OPTIONS:Mauth-ldap) -PLIST_SUBST+= LDAP_OPT= +PLIST.ldap= yes CONFIGURE_ARGS+= --enable-ldap . include "../../databases/openldap-client/buildlink3.mk" .else -PLIST_SUBST+= LDAP_OPT='@comment ' CONFIGURE_ARGS+= --disable-ldap .endif .if !empty(PKG_OPTIONS:Mauth-pam) -PLIST_SUBST+= PAM_OPT= +PLIST.pam= yes CONFIGURE_ARGS+= --enable-pam . include "../../mk/pam.buildlink3.mk" .else -PLIST_SUBST+= PAM_OPT='@comment ' CONFIGURE_ARGS+= --disable-pam .endif diff --git a/chat/libpurple/PLIST b/chat/libpurple/PLIST index 5e40b0f80e3..88caf5fcb05 100644 --- a/chat/libpurple/PLIST +++ b/chat/libpurple/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2008/03/04 17:22:40 tnn Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:42:58 jlam Exp $ include/libpurple/account.h include/libpurple/accountopt.h include/libpurple/blist.h @@ -161,18 +161,18 @@ share/sounds/purple/login.wav share/sounds/purple/logout.wav share/sounds/purple/receive.wav share/sounds/purple/send.wav -${DBUS}bin/purple-client-example -${DBUS}bin/purple-remote -${DBUS}bin/purple-send -${DBUS}bin/purple-send-async -${DBUS}bin/purple-url-handler -${DBUS}include/libpurple/dbus-bindings.h -${DBUS}include/libpurple/dbus-define-api.h -${DBUS}include/libpurple/dbus-purple.h -${DBUS}include/libpurple/dbus-server.h -${DBUS}include/libpurple/dbus-useful.h -${DBUS}lib/libpurple-client.la -${DBUS}lib/purple-2/dbus-example.la +${PLIST.dbus}bin/purple-client-example +${PLIST.dbus}bin/purple-remote +${PLIST.dbus}bin/purple-send +${PLIST.dbus}bin/purple-send-async +${PLIST.dbus}bin/purple-url-handler +${PLIST.dbus}include/libpurple/dbus-bindings.h +${PLIST.dbus}include/libpurple/dbus-define-api.h +${PLIST.dbus}include/libpurple/dbus-purple.h +${PLIST.dbus}include/libpurple/dbus-server.h +${PLIST.dbus}include/libpurple/dbus-useful.h +${PLIST.dbus}lib/libpurple-client.la +${PLIST.dbus}lib/purple-2/dbus-example.la @dirrm lib/purple-2 @dirrm include/libpurple @dirrm share/purple/ca-certs diff --git a/chat/libpurple/options.mk b/chat/libpurple/options.mk index 9cada942d8e..fb0456f2dac 100644 --- a/chat/libpurple/options.mk +++ b/chat/libpurple/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2007/12/01 22:46:42 rillig Exp $ +# $NetBSD: options.mk,v 1.7 2008/04/12 22:42:58 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libpurple PKG_SUPPORTED_OPTIONS+= gnutls perl tcl debug dbus sasl @@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS+= gnutls .include "../../mk/bsd.options.mk" +PLIST_VARS+= dbus + .if !empty(PKG_OPTIONS:Mgnutls) CONFIGURE_ARGS+= --disable-nss CONFIGURE_ARGS+= --with-gnutls-includes=${BUILDLINK_PREFIX.gnutls}/include @@ -39,7 +41,7 @@ CONFIGURE_ARGS+= --disable-tcl .if !empty(PKG_OPTIONS:Mdbus) CONFIGURE_ARGS+= --enable-dbus CONFIGURE_ARGS+= --with-python=${PYTHONBIN} -PLIST_SUBST+= DBUS= +PLIST.dbus= yes REPLACE_SH+= libpurple/purple-send REPLACE_SH+= libpurple/purple-send-async REPLACE_PYTHON+= libpurple/purple-remote @@ -50,7 +52,6 @@ REPLACE_PYTHON+= libpurple/purple-url-handler . include "../../lang/python/application.mk" .else CONFIGURE_ARGS+= --disable-dbus -PLIST_SUBST+= DBUS="@comment " .endif .if !empty(PKG_OPTIONS:Mdebug) diff --git a/chat/weechat/PLIST b/chat/weechat/PLIST index 234d6b47685..991d9309232 100644 --- a/chat/weechat/PLIST +++ b/chat/weechat/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.8 2007/10/12 18:38:41 tonio Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:42:58 jlam Exp $ bin/weechat-curses -${WITHLUA}lib/weechat/plugins/lua.la -${WITHPYTHON}lib/weechat/plugins/python.la -${WITHCHARSET}lib/weechat/plugins/charset.la +${PLIST.lua}lib/weechat/plugins/lua.la +${PLIST.python}lib/weechat/plugins/python.la +${PLIST.charset}lib/weechat/plugins/charset.la man/man1/weechat-curses.1 share/doc/weechat/html/de/weechat-doc.css share/doc/weechat/html/en/weechat-doc.css @@ -26,5 +26,5 @@ share/locale/ru/LC_MESSAGES/weechat.mo @dirrm share/doc/weechat/html/de @dirrm share/doc/weechat/html @dirrm share/doc/weechat -${WITHPLUGIN}@dirrm lib/weechat/plugins -${WITHPLUGIN}@dirrm lib/weechat +${PLIST.plugin}@dirrm lib/weechat/plugins +${PLIST.plugin}@dirrm lib/weechat diff --git a/chat/weechat/options.mk b/chat/weechat/options.mk index 3f6c79ac981..5b21c0717bb 100644 --- a/chat/weechat/options.mk +++ b/chat/weechat/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/06/10 22:20:10 tonio Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:58 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.weechat PKG_SUPPORTED_OPTIONS= charset gnutls python lua @@ -6,12 +6,13 @@ PKG_SUGGESTED_OPTIONS= charset .include "../../mk/bsd.options.mk" +PLIST_VARS+= charset lua plugin python + .if !empty(PKG_OPTIONS:Mcharset) CONFIGURE_ARGS+= --enable-charset -PLIST_SUBST+= WITHCHARSET="" +PLIST.charset= yes .else CONFIGURE_ARGS+= --disable-charset -PLIST_SUBST+= WITHCHARSET="@comment " .endif .if !empty(PKG_OPTIONS:Mgnutls) @@ -21,24 +22,21 @@ PLIST_SUBST+= WITHCHARSET="@comment " .if !empty(PKG_OPTIONS:Mpython) .include "../../lang/python/extension.mk" CONFIGURE_ARGS+= --enable-python -PLIST_SUBST+= WITHPYTHON="" +PLIST.python= yes .else CONFIGURE_ARGS+= --disable-python -PLIST_SUBST+= WITHPYTHON="@comment " .endif .if !empty(PKG_OPTIONS:Mlua) .include "../../lang/lua/buildlink3.mk" CONFIGURE_ARGS+= --enable-lua -PLIST_SUBST+= WITHLUA="" +PLIST.lua= yes .else CONFIGURE_ARGS+= --disable-lua -PLIST_SUBST+= WITHLUA="@comment " .endif -.if !empty(PKG_OPTIONS:Mpython) || !empty(PKG_OPTIONS:Mlua) \ - || !empty(PKG_OPTIONS:Mcharset) -PLIST_SUBST+= WITHPLUGIN="" -.else -PLIST_SUBST+= WITHPLUGIN="@comment " +.if !empty(PKG_OPTIONS:Mpython) || \ + !empty(PKG_OPTIONS:Mlua) || \ + !empty(PKG_OPTIONS:Mcharset) +PLIST.plugin= yes .endif diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST index d434ca70e1e..3f1850b7b95 100644 --- a/chat/xchat/PLIST +++ b/chat/xchat/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.17 2007/09/25 10:54:10 hira Exp $ +@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:42:58 jlam Exp $ bin/xchat share/applications/xchat.desktop -${GNOME}share/dbus-1/services/org.xchat.service.service +${PLIST.dbus}share/dbus-1/services/org.xchat.service.service share/doc/xchat/README share/doc/xchat/faq.html share/doc/xchat/plugin20.html -${GNOME}share/gconf/schemas/apps_xchat_url_handler.schemas +${PLIST.dbus}share/gconf/schemas/apps_xchat_url_handler.schemas share/locale/be/LC_MESSAGES/xchat.mo share/locale/ca/LC_MESSAGES/xchat.mo share/locale/cs/LC_MESSAGES/xchat.mo diff --git a/chat/xchat/options.mk b/chat/xchat/options.mk index 7493b44d450..fb2d11ccce8 100644 --- a/chat/xchat/options.mk +++ b/chat/xchat/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2007/09/25 15:38:54 hira Exp $ +# $NetBSD: options.mk,v 1.11 2008/04/12 22:42:58 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -11,6 +11,8 @@ PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" +PLIST_VARS+= dbus + ### ### Use OpenSSL libraries for connecting to ircs servers ### @@ -49,7 +51,7 @@ CONFIGURE_ARGS+= --disable-shm ### .if !empty(PKG_OPTIONS:Mgnome) CONFIGURE_ARGS+= --enable-dbus -PLIST_SUBST+= GNOME="" +PLIST.dbus= yes SUBST_CLASSES+= gconf SUBST_STAGE.gconf+= pre-configure SUBST_MESSAGE.gconf+= Disabling schema registration/installation. @@ -61,7 +63,6 @@ USE_DIRS+= gnome2-1.5 .else # We set this to ${FALSE} to avoid detection. CONFIGURE_ARGS+= --disable-dbus -PLIST_SUBST= GNOME="@comment " USE_DIRS+= xdg-1.1 .endif diff --git a/comms/asterisk/PLIST.common b/comms/asterisk/PLIST.common index 6e50493d3f1..02593f861a8 100644 --- a/comms/asterisk/PLIST.common +++ b/comms/asterisk/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.10 2008/02/20 10:14:19 wiz Exp $ +@comment $NetBSD: PLIST.common,v 1.11 2008/04/12 22:42:58 jlam Exp $ include/asterisk/acl.h include/asterisk/adsi.h include/asterisk/aes.h @@ -190,14 +190,14 @@ lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_monitor.so lib/asterisk/modules/res_musiconhold.so -${GTK}lib/asterisk/modules/pbx_gtkconsole.so -${ZAPTEL}lib/asterisk/modules/app_flash.so -${ZAPTEL}lib/asterisk/modules/app_meetme.so -${ZAPTEL}lib/asterisk/modules/app_page.so -${ZAPTEL}lib/asterisk/modules/app_zapbarge.so -${ZAPTEL}lib/asterisk/modules/app_zapras.so -${ZAPTEL}lib/asterisk/modules/app_zapscan.so -${ZAPTEL}lib/asterisk/modules/chan_zap.so +${PLIST.gtk}lib/asterisk/modules/pbx_gtkconsole.so +${PLIST.zaptel}lib/asterisk/modules/app_flash.so +${PLIST.zaptel}lib/asterisk/modules/app_meetme.so +${PLIST.zaptel}lib/asterisk/modules/app_page.so +${PLIST.zaptel}lib/asterisk/modules/app_zapbarge.so +${PLIST.zaptel}lib/asterisk/modules/app_zapras.so +${PLIST.zaptel}lib/asterisk/modules/app_zapscan.so +${PLIST.zaptel}lib/asterisk/modules/chan_zap.so lib/pkgconfig/asterisk.pc libdata/asterisk/agi-bin/agi-test.agi libdata/asterisk/agi-bin/eagi-sphinx-test diff --git a/comms/asterisk/options.mk b/comms/asterisk/options.mk index 6949ce7aec5..e6a0a4ce25d 100644 --- a/comms/asterisk/options.mk +++ b/comms/asterisk/options.mk @@ -1,22 +1,22 @@ -# $NetBSD: options.mk,v 1.2 2006/01/13 20:32:38 riz Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:58 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk PKG_SUPPORTED_OPTIONS= zaptel gtk + .include "../../mk/bsd.options.mk" +PLIST_VARS+= zaptel gtk + .if !empty(PKG_OPTIONS:Mzaptel) # zaptel only supported under NetBSD at the moment . include "../../comms/zaptel-netbsd/buildlink3.mk" -PLIST_SUBST+= ZAPTEL= +PLIST.zaptel= yes .else -MAKE_FLAGS+= WITHOUT_ZAPTEL=1 -PLIST_SUBST+= ZAPTEL="@comment " +MAKE_FLAGS+= WITHOUT_ZAPTEL=1 .endif .if !empty(PKG_OPTIONS:Mgtk) . include "../../x11/gtk/buildlink3.mk" -MAKE_FLAGS+= ASTERISK_USE_GTK=1 -PLIST_SUBST+= GTK= -.else -PLIST_SUBST+= GTK="@comment " +MAKE_FLAGS+= ASTERISK_USE_GTK=1 +PLIST.gtk= yes .endif diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 0464cb44e25..9ca74d5eb0f 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2008/01/13 09:30:57 joerg Exp $ +# $NetBSD: Makefile,v 1.54 2008/04/12 22:42:58 jlam Exp $ DISTNAME= libiconv-1.12 PKGREVISION= 1 @@ -39,13 +39,12 @@ MAKE_JOBS_SAFE= no # ENOENT(srclib) CFLAGS+= -c99 .endif - .include "options.mk" +PLIST_VARS+= preload + .if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "OSF1" -PLIST_SUBST+= PRELOADABLE_LIBICONV="" -.else -PLIST_SUBST+= PRELOADABLE_LIBICONV="@comment " +PLIST.preload= yes .endif # remove any existing charset.alias; if it already exists, libiconv does diff --git a/converters/libiconv/PLIST b/converters/libiconv/PLIST index bcbb09e45d8..c2216e1bdd7 100644 --- a/converters/libiconv/PLIST +++ b/converters/libiconv/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.6 2007/04/12 10:27:15 tnn Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:42:59 jlam Exp $ bin/iconv include/iconv.h include/libcharset.h include/localcharset.h lib/libcharset.la lib/libiconv.la -${PRELOADABLE_LIBICONV}lib/preloadable_libiconv.so +${PLIST.preload}lib/preloadable_libiconv.so man/man1/iconv.1 man/man3/iconv.3 man/man3/iconv_close.3 diff --git a/databases/freetds/PLIST b/databases/freetds/PLIST index c92af6c247b..ea5fac1dc8e 100644 --- a/databases/freetds/PLIST +++ b/databases/freetds/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2005/12/31 04:05:31 jlam Exp $ +@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:42:59 jlam Exp $ bin/bsqldb bin/defncopy bin/freebcp @@ -21,7 +21,7 @@ include/tdsver.h lib/libct.la lib/libsybdb.la lib/libtds.la -${ODBC}lib/libtdsodbc.la +${PLIST.odbc}lib/libtdsodbc.la lib/libtdssrv.la man/man1/bsqldb.1 man/man1/defncopy.1 diff --git a/databases/freetds/options.mk b/databases/freetds/options.mk index 7e384b8c7f2..ac89d090fd3 100644 --- a/databases/freetds/options.mk +++ b/databases/freetds/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/12/30 21:07:42 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:59 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.freetds PKG_OPTIONS_OPTIONAL_GROUPS+= odbc @@ -6,6 +6,8 @@ PKG_OPTIONS_GROUP.odbc= iodbc #unixodbc .include "../../mk/bsd.options.mk" +PLIST_VARS+= odbc + ### ### Whether to build with iODBC to enable ODBC access to TDS servers. ### @@ -14,7 +16,7 @@ ODBC_DRIVER= yes . include "../../databases/iodbc/buildlink3.mk" CONFIGURE_ARGS+= --enable-odbc CONFIGURE_ARGS+= --with-iodbc=${BUILDLINK_PREFIX.iodbc} -PLIST_SUBST+= ODBC= +PLIST.odbc= yes .endif ### @@ -24,10 +26,9 @@ PLIST_SUBST+= ODBC= . include "../../databases/unixodbc/buildlink3.mk" CONFIGURE_ARGS+= --enable-odbc CONFIGURE_ARGS+= --with-unixodbc=${BUILDLINK_PREFIX.unixodbc} -PLIST_SUBST+= ODBC= +PLIST.odbc= yes .endif .if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc) CONFIGURE_ARGS+= --disable-odbc -PLIST_SUBST+= ODBC="@comment " .endif diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile index 745f5282088..6b3c200649e 100644 --- a/databases/lbdb/Makefile +++ b/databases/lbdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/06/10 21:12:51 tonio Exp $ +# $NetBSD: Makefile,v 1.20 2008/04/12 22:42:59 jlam Exp $ DISTNAME= lbdb_0.35.1 PKGNAME= ${DISTNAME:S/_/-/} @@ -33,10 +33,9 @@ EGDIR= ${PREFIX}/share/examples/lbdb CONF_FILES+= ${EGDIR}/lbdb.rc ${PKG_SYSCONFDIR}/lbdb.rc CONF_FILES+= ${EGDIR}/lbdb_ldap.rc ${PKG_SYSCONFDIR}/lbdb_ldap.rc -.if ${OPSYS} == "Interix" -PLIST_SUBST+= WITHYP='@comment ' -.else -PLIST_SUBST+= WITHYP='' +PLIST_VARS+= yp +.if ${OPSYS} != "Interix" +PLIST.yp= yes .endif .include "../../mk/bsd.pkg.mk" diff --git a/databases/lbdb/PLIST b/databases/lbdb/PLIST index 2f2e5f097ad..80a79a78260 100644 --- a/databases/lbdb/PLIST +++ b/databases/lbdb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2005/11/08 01:32:56 tv Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:59 jlam Exp $ bin/lbdb-fetchaddr bin/lbdb_dotlock bin/lbdbq @@ -11,8 +11,8 @@ libexec/lbdb/m_bbdb libexec/lbdb/m_fido libexec/lbdb/m_finger libexec/lbdb/m_gnomecard -${WITHGPG}libexec/lbdb/m_gpg -${WITHABOOK}libexec/lbdb/m_abook +${PLIST.gnupg}libexec/lbdb/m_gpg +${PLIST.abook}libexec/lbdb/m_abook libexec/lbdb/m_inmail libexec/lbdb/m_ldap libexec/lbdb/m_muttalias @@ -20,15 +20,15 @@ libexec/lbdb/m_palm libexec/lbdb/m_passwd libexec/lbdb/m_pine libexec/lbdb/m_wanderlust -${WITHYP}libexec/lbdb/m_yppasswd +${PLIST.yp}libexec/lbdb/m_yppasswd libexec/lbdb/munge libexec/lbdb/munge-keeporder libexec/lbdb/mutt_ldap_query libexec/lbdb/palm_lsaddr libexec/lbdb/qpto8bit libexec/lbdb/tac -${OSXADDRESSBOOK}libexec/lbdb/ABQuery -${OSXADDRESSBOOK}libexec/lbdb/m_osx_addressbook +${PLIST.osx-addressbook}libexec/lbdb/ABQuery +${PLIST.osx-addressbook}libexec/lbdb/m_osx_addressbook man/man1/lbdb-fetchaddr.1 man/man1/lbdb_dotlock.1 man/man1/lbdbq.1 diff --git a/databases/lbdb/options.mk b/databases/lbdb/options.mk index cceea988520..0b406d00518 100644 --- a/databases/lbdb/options.mk +++ b/databases/lbdb/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/09/03 12:09:58 tonio Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:42:59 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lbdb PKG_SUPPORTED_OPTIONS= osx-addressbook gnupg abook @@ -6,28 +6,27 @@ PKG_SUGGESTED_OPTIONS= gnupg abook .include "../../mk/bsd.options.mk" +PLIST_VARS+= osx-addressbook gnupg abook + .if !empty(PKG_OPTIONS:Mosx-addressbook) CONFIGURE_ARGS+= --with-osx-addressbook -PLIST_SUBST+= OSXADDRESSBOOK="" +PLIST.osx-addressbook= yes .else CONFIGURE_ARGS+= --without-osx-addressbook -PLIST_SUBST+= OSXADDRESSBOOK="@comment " .endif .if !empty(PKG_OPTIONS:Mgnupg) -DEPENDS+=gnupg-[0-9]*:../../security/gnupg +DEPENDS+= gnupg-[0-9]*:../../security/gnupg CONFIGURE_ARGS+= --with-gpg -PLIST_SUBST+= WITHGPG="" +PLIST.gnupg= yes .else CONFIGURE_ARGS+= --without-gpg -PLIST_SUBST+= WITHGPG="@comment " .endif .if !empty(PKG_OPTIONS:Mabook) -DEPENDS+=abook-[0-9]*:../../databases/abook +DEPENDS+= abook-[0-9]*:../../databases/abook CONFIGURE_ARGS+= --with-abook -PLIST_SUBST+= WITHABOOK="" +PLIST.abook= yes .else CONFIGURE_ARGS+= --without-abook -PLIST_SUBST+= WITHABOOK="@comment " .endif diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST index 79fe114380c..e85922c9961 100644 --- a/databases/myodbc/PLIST +++ b/databases/myodbc/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.3 2006/01/23 18:53:45 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:59 jlam Exp $ bin/myodbc3m lib/libmyodbc3.la -${WITH_GUI}lib/libmyodbc3S.la +${PLIST.gui}lib/libmyodbc3S.la lib/libmyodbc3_r.la share/doc/myodbc/README share/doc/myodbc/README.osx diff --git a/databases/myodbc/options.mk b/databases/myodbc/options.mk index 02ab69d6907..71ff3be9c9a 100644 --- a/databases/myodbc/options.mk +++ b/databases/myodbc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/01/14 12:28:56 obache Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:59 jlam Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.myodbc @@ -9,14 +9,15 @@ PKG_SUGGESTED_OPTIONS= myodbc-iodbc .include "../../mk/bsd.options.mk" +PLIST_VARS+= gui + .if !empty(PKG_OPTIONS:Mmyodbc-gui) . include "../../x11/qt3-tools/buildlink3.mk" CONFIGURE_ARGS+= --enable-gui USE_LANGUAGES= c c++ -PLIST_SUBST+= WITH_GUI= +PLIST.gui= yes .else CONFIGURE_ARGS+= --disable-gui -PLIST_SUBST+= WITH_GUI='@comment ' .endif .if !empty(PKG_OPTIONS:Mmyodbc-iodbc) diff --git a/databases/sqlrelay/PLIST b/databases/sqlrelay/PLIST index e0410256f68..db09eaf2fbb 100644 --- a/databases/sqlrelay/PLIST +++ b/databases/sqlrelay/PLIST @@ -1,18 +1,18 @@ -@comment $NetBSD: PLIST,v 1.5 2006/04/30 16:01:21 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:42:59 jlam Exp $ bin/backupschema bin/fields bin/query bin/sqlr-cachemanager -${COND_FREETDS}bin/sqlr-connection-freetds -${COND_FREETDS}bin/sqlr-connection-freetds-debug -${COND_MYSQL}bin/sqlr-connection-mysql -${COND_MYSQL}bin/sqlr-connection-mysql-debug -${COND_ODBC}bin/sqlr-connection-odbc -${COND_ODBC}bin/sqlr-connection-odbc-debug -${COND_PGSQL}bin/sqlr-connection-postgresql -${COND_PGSQL}bin/sqlr-connection-postgresql-debug -${COND_SQLITE}bin/sqlr-connection-sqlite -${COND_SQLITE}bin/sqlr-connection-sqlite-debug +${PLIST.freetds}bin/sqlr-connection-freetds +${PLIST.freetds}bin/sqlr-connection-freetds-debug +${PLIST.mysql}bin/sqlr-connection-mysql +${PLIST.mysql}bin/sqlr-connection-mysql-debug +${PLIST.odbc}bin/sqlr-connection-odbc +${PLIST.odbc}bin/sqlr-connection-odbc-debug +${PLIST.pgsql}bin/sqlr-connection-postgresql +${PLIST.pgsql}bin/sqlr-connection-postgresql-debug +${PLIST.sqlite}bin/sqlr-connection-sqlite +${PLIST.sqlite}bin/sqlr-connection-sqlite-debug bin/sqlr-export bin/sqlr-import bin/sqlr-listener @@ -56,12 +56,12 @@ man/man8/sqlr-listener.8 man/man8/sqlr-scaler.8 man/man8/sqlr-start.8 man/man8/sqlr-stop.8 -${COND_PERL}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Connection.3 -${COND_PERL}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Cursor.3 -${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Connection.pm -${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Cursor.pm -${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Connection/Connection.so -${COND_PERL}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Cursor/Cursor.so +${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Connection.3 +${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SQLRelay::Cursor.3 +${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Connection.pm +${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/SQLRelay/Cursor.pm +${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Connection/Connection.so +${PLIST.perl}${PERL5_SUB_INSTALLVENDORARCH}/auto/SQLRelay/Cursor/Cursor.so share/doc/sqlrelay/api/c++/sqlrclient.h.html share/doc/sqlrelay/api/c/sqlrclientwrapper.h.html share/doc/sqlrelay/api/java/allclasses-frame.html diff --git a/databases/sqlrelay/options.mk b/databases/sqlrelay/options.mk index db86d97bb63..4bfb8431daf 100644 --- a/databases/sqlrelay/options.mk +++ b/databases/sqlrelay/options.mk @@ -1,10 +1,12 @@ -# $NetBSD: options.mk,v 1.5 2006/04/30 16:01:21 joerg Exp $ +# $NetBSD: options.mk,v 1.6 2008/04/12 22:42:59 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sqlrelay PKG_SUPPORTED_OPTIONS+= mysql pgsql sqlite odbc freetds perl .include "../../mk/bsd.options.mk" +PLIST_VARS+= freetds mysql odbc perl pgsql sqlite + .if !empty(PKG_OPTIONS:Mperl) PERL5_PACKLIST= auto/SQLRelay/Connection/.packlist PERL5_PACKLIST+= auto/SQLRelay/Cursor/.packlist @@ -14,7 +16,7 @@ CONFIGURE_ARGS+= --with-perl-site-arch=${PERL5_INSTALLVENDORARCH:Q} CONFIGURE_ARGS+= --with-perl-site-lib=${PERL5_INSTALLVENDORLIB:Q} CONFIGURE_ARGS+= --with-perl-install-man3-dir=${PERL5_INSTALLVENDORMAN3DIR:Q} -PLIST_SUBST+= COND_PERL="" +PLIST.perl= yes .include "../../lang/perl5/buildlink3.mk" .include "../../lang/perl5/packlist.mk" @@ -22,50 +24,44 @@ PLIST_SUBST+= COND_PERL="" .else CONFIGURE_ARGS+= --disable-perl -PLIST_SUBST+= COND_PERL="@comment " .endif .if !empty(PKG_OPTIONS:Mmysql) CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client:Q} -PLIST_SUBST+= COND_MYSQL="" +PLIST.mysql= yes .include "../../mk/mysql.buildlink3.mk" .else CONFIGURE_ARGS+= --disable-mysql -PLIST_SUBST+= COND_MYSQL="@comment " .endif .if !empty(PKG_OPTIONS:Mpgsql) CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX:Q} +PLIST.pgsql= yes .include "../../mk/pgsql.buildlink3.mk" -PLIST_SUBST+= COND_PGSQL="" .else CONFIGURE_ARGS+= --disable-postgresql -PLIST_SUBST+= COND_PGSQL="@comment " .endif .if !empty(PKG_OPTIONS:Msqlite) CONFIGURE_ARGS+= --with-sqlite=${BUILDLINK_PREFIX.sqlite3:Q} -PLIST_SUBST+= COND_SQLITE="" +PLIST.sqlite= yes .include "../../databases/sqlite3/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-sqlite -PLIST_SUBST+= COND_SQLITE="@comment " .endif .if !empty(PKG_OPTIONS:Modbc) CONFIGURE_ARGS+= --with-odbc=${BUILDLINK_PREFIX.unixodbc:Q} -PLIST_SUBST+= COND_ODBC="" +PLIST.odbc= yes .include "../../databases/unixodbc/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-odbc -PLIST_SUBST+= COND_ODBC="@comment " .endif .if !empty(PKG_OPTIONS:Mfreetds) CONFIGURE_ARGS+= --with-freetds=${BUILDLINK_PREFIX.freetds:Q} -PLIST_SUBST+= COND_FREETDS="" +PLIST.freetds= yes .include "../../databases/freetds/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-freetds -PLIST_SUBST+= COND_FREETDS="@comment " .endif 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!?!?!? diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common index e11b358332e..b1e13faa22c 100644 --- a/editors/emacs21/Makefile.common +++ b/editors/emacs21/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2007/10/29 12:38:02 uebayasi Exp $ +# $NetBSD: Makefile.common,v 1.3 2008/04/12 22:43:00 jlam Exp $ DISTNAME= emacs-${EMACSVERSION}a @@ -49,11 +49,11 @@ LDFLAGS+= -Wl,-z,nocombreloc CPPFLAGS+= -DDFLY_PRE_17_CRT .endif +PLIST_VARS+= fns.el .if ${OPSYS} == "Darwin" -PLIST_SUBST+= FNS_EL="@comment " PLIST_SUBST+= DOCTAIL="" .else -PLIST_SUBST+= FNS_EL="" +PLIST.fns.el= yes PLIST_SUBST+= DOCTAIL="-${EMACSVERSION}.1" .endif diff --git a/editors/emacs21/PLIST b/editors/emacs21/PLIST index 91caf1d9c8b..d39b92d0b78 100644 --- a/editors/emacs21/PLIST +++ b/editors/emacs21/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2007/10/29 12:37:13 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:00 jlam Exp $ bin/emacs bin/emacs-${EMACSVERSION} bin/emacs-b2m @@ -12,7 +12,7 @@ libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/cvtmail libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/digest-doc libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/emacsserver libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fakemail -${FNS_EL}libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el +${PLIST.fns.el}libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/fns-${EMACSVERSION}.1.el libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/hexl libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/movemail libexec/emacs/${EMACSVERSION}/${MACHINE_GNU_PLATFORM}/profile diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index 034266a906e..4beb2e9cb47 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2007/11/12 15:29:49 uebayasi Exp $ +# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:00 jlam Exp $ DISTNAME= tamago-4.0.6 PKGNAME= ${EMACS_PKGNAME_PREFIX}tamago-20020909 @@ -17,10 +17,10 @@ EMACS_MODULES+= leim .include "../../mk/emacs.mk" +PLIST_VARS+= jisx0213 + .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} >= 21 -PLIST_SUBST+= HAVE_JISX0213= # empty -.else -PLIST_SUBST+= HAVE_JISX0213="@comment " +PLIST.jisx0213= yes .endif .include "../../mk/bsd.pkg.mk" diff --git a/editors/tamago/PLIST b/editors/tamago/PLIST index 7a0bd3269f9..b9969fff807 100644 --- a/editors/tamago/PLIST +++ b/editors/tamago/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2007/08/18 14:30:52 taca Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:00 jlam Exp $ ${EMACS_LISPPREFIX}/egg/egg-cnv.el ${EMACS_LISPPREFIX}/egg/egg-cnv.elc ${EMACS_LISPPREFIX}/egg/egg-com.el @@ -34,8 +34,8 @@ ${EMACS_LISPPREFIX}/egg/its.el ${EMACS_LISPPREFIX}/egg/its.elc ${EMACS_LISPPREFIX}/egg/its/ascii.el ${EMACS_LISPPREFIX}/egg/its/ascii.elc -${HAVE_JISX0213}${EMACS_LISPPREFIX}/egg/its/aynu.el -${HAVE_JISX0213}${EMACS_LISPPREFIX}/egg/its/aynu.elc +${PLIST.jisx0213}${EMACS_LISPPREFIX}/egg/its/aynu.el +${PLIST.jisx0213}${EMACS_LISPPREFIX}/egg/its/aynu.elc ${EMACS_LISPPREFIX}/egg/its/bixing.el ${EMACS_LISPPREFIX}/egg/its/bixing.elc ${EMACS_LISPPREFIX}/egg/its/erpin.el diff --git a/editors/xemacs-nox11/Makefile b/editors/xemacs-nox11/Makefile index 548de5d8931..f771dc4909b 100644 --- a/editors/xemacs-nox11/Makefile +++ b/editors/xemacs-nox11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/02/15 14:27:48 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2008/04/12 22:43:00 jlam Exp $ .include "../../editors/xemacs/Makefile.common" @@ -23,6 +23,4 @@ CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib CONFIGURE_ARGS+= --site-runtime-libraries=${LOCALBASE}/lib -PLIST_SUBST+= X11ONLY="@comment " - .include "../../mk/bsd.pkg.mk" diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 06706897df3..385585a7f60 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2007/02/15 14:27:48 joerg Exp $ +# $NetBSD: Makefile,v 1.84 2008/04/12 22:43:00 jlam Exp $ .include "../../editors/xemacs/Makefile.common" @@ -9,7 +9,7 @@ CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/i CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR} CONFIGURE_ARGS+= --site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib -PLIST_SUBST+= X11ONLY="" +PLIST.x11= yes .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common index 408c0a77014..8573465893d 100644 --- a/editors/xemacs/Makefile.common +++ b/editors/xemacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2007/04/20 15:05:22 joerg Exp $ +# $NetBSD: Makefile.common,v 1.20 2008/04/12 22:43:00 jlam Exp $ DISTNAME= xemacs-21.4.17 CATEGORIES= editors @@ -17,6 +17,7 @@ USE_TOOLS+= gtar DIST_SUBDIR= xemacs EXTRA_FILES= ${DISTNAME}-elc.tar.gz ${DISTNAME}-info.tar.gz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +PLIST_VARS+= x11 PLIST_SUBST+= DISTNAME=${DISTNAME:Q} FILES_SUBST+= DISTNAME=${DISTNAME:Q} MESSAGE_SUBST+= DISTNAME="${DISTNAME}" diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST index 3fb3763c492..76100c4737b 100644 --- a/editors/xemacs/PLIST +++ b/editors/xemacs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2007/02/15 14:27:48 joerg Exp $ +@comment $NetBSD: PLIST,v 1.15 2008/04/12 22:43:00 jlam Exp $ bin/${DISTNAME} bin/ellcc bin/gnuattach @@ -1040,7 +1040,7 @@ lib/${DISTNAME}/lisp/mule/arabic.elc lib/${DISTNAME}/lisp/mule/auto-autoloads.el${ELSUFX} lib/${DISTNAME}/lisp/mule/auto-autoloads.elc lib/${DISTNAME}/lisp/mule/canna-leim.el${ELSUFX} -${FOR_MULE}lib/${DISTNAME}/lisp/mule/canna-leim.elc +${PLIST.mule}lib/${DISTNAME}/lisp/mule/canna-leim.elc lib/${DISTNAME}/lisp/mule/chinese.el${ELSUFX} lib/${DISTNAME}/lisp/mule/chinese.elc lib/${DISTNAME}/lisp/mule/custom-load.el${ELSUFX} @@ -1086,7 +1086,7 @@ lib/${DISTNAME}/lisp/mule/mule-misc.elc lib/${DISTNAME}/lisp/mule/mule-tty-init.el${ELSUFX} lib/${DISTNAME}/lisp/mule/mule-tty-init.elc lib/${DISTNAME}/lisp/mule/mule-x-init.el${ELSUFX} -${X11ONLY}lib/${DISTNAME}/lisp/mule/mule-x-init.elc +${PLIST.x11}lib/${DISTNAME}/lisp/mule/mule-x-init.elc lib/${DISTNAME}/lisp/mule/thai-xtis-chars.el${ELSUFX} lib/${DISTNAME}/lisp/mule/thai-xtis-chars.elc lib/${DISTNAME}/lisp/mule/thai-xtis.el${ELSUFX} diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index 4eb5482f54f..9637db8758a 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -1,10 +1,12 @@ -# $NetBSD: options.mk,v 1.6 2006/05/31 18:22:23 ghen Exp $ +# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:00 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS= ldap xface canna .include "../../mk/bsd.options.mk" +PLIST_VARS+= mule + .if !empty(PKG_OPTIONS:Mldap) CONFIGURE_ARGS+= --with-ldap . include "../../databases/openldap-client/buildlink3.mk" @@ -22,8 +24,7 @@ CONFIGURE_ARGS+= --without-xface .if !empty(PKG_OPTIONS:Mcanna) . include "../../inputmethod/canna-lib/buildlink3.mk" CONFIGURE_ARGS+= --with-canna -PLIST_SUBST+= FOR_MULE='' +PLIST.mule= yes .else CONFIGURE_ARGS+= --without-canna -PLIST_SUBST+= FOR_MULE='@comment ' .endif diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile index 2092c731e9e..676ac7d4764 100644 --- a/emulators/p11/Makefile +++ b/emulators/p11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2007/01/27 12:02:16 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:00 jlam Exp $ # DISTNAME= p11-2.10i @@ -16,27 +16,23 @@ USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= bpf tap tun + # bfp, tap, and tun tests taken from p11 configure script .if exists(/dev/bpf0) -PLIST_SUBST+= BPF= -.else -PLIST_SUBST+= BPF="@comment " +PLIST.bpf= yes .endif .if exists(/dev/tap0) || exists(/dev/net/tun) -PLIST_SUBST+= TAP= -.elif ${OPSYS} == "DragonFly" -PLIST_SUBST+= TAP= # DragonFly has TAP -.else -PLIST_SUBST+= TAP="@comment " +PLIST.tap= yes .endif -.if exists(/dev/tun) || exists(/dev/tun0) || exists(/dev/net/tun) || ${OPSYS} == "DragonFly" -PLIST_SUBST+= TUN= -.else -PLIST_SUBST+= TUN="@comment " +.if exists(/dev/tun) || exists(/dev/tun0) || exists(/dev/net/tun) +PLIST.tun= yes .endif # Force the bpf, tun, and tap epp backends to be built on DragonFly. .if ${OPSYS} == "DragonFly" +PLIST.tap= yes +PLIST.tun= yes CONFIGURE_ENV+= ac_cv_epp_bpf=yes ac_cv_epp_tun=yes ac_cv_epp_tap=yes .endif diff --git a/emulators/p11/PLIST b/emulators/p11/PLIST index 626502a0085..4cb3dfb5755 100644 --- a/emulators/p11/PLIST +++ b/emulators/p11/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.3 2006/06/16 16:15:42 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:00 jlam Exp $ bin/p11 -${BPF}libexec/p11/epp_bpf +${PLIST.bpf}libexec/p11/epp_bpf libexec/p11/epp_fifo -${TAP}libexec/p11/epp_tap -${TUN}libexec/p11/epp_tun +${PLIST.tap}libexec/p11/epp_tap +${PLIST.tun}libexec/p11/epp_tun libexec/p11/fmt libexec/p11/lp_file libexec/p11/tty_fifo diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index 3e6698f23ab..e78f986c631 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.67 2007/08/11 11:06:09 adam Exp $ +@comment $NetBSD: PLIST,v 1.68 2008/04/12 22:43:00 jlam Exp $ bin/bin2res bin/fnt2bdf bin/function_grep.pl @@ -562,7 +562,7 @@ lib/wine/faultrep.dll.so lib/wine/gdi.exe16 lib/wine/gdi32.dll.so lib/wine/gdiplus.dll.so -${WINE_OPENGL}lib/wine/glu32.dll.so +${PLIST.opengl}lib/wine/glu32.dll.so lib/wine/gphoto2.ds.so lib/wine/hal.dll.so lib/wine/hh.exe.so @@ -629,7 +629,7 @@ lib/wine/libdxerr9.a lib/wine/libdxguid.a lib/wine/libgdi32.def lib/wine/libgdiplus.def -${WINE_OPENGL}lib/wine/libglu32.def +${PLIST.opengl}lib/wine/libglu32.def lib/wine/libhid.def lib/wine/libhlink.def lib/wine/libicmp.def @@ -669,7 +669,7 @@ lib/wine/libolecli32.def lib/wine/liboledlg.def lib/wine/libolepro32.def lib/wine/libolesvr32.def -${WINE_OPENGL}lib/wine/libopengl32.def +${PLIST.opengl}lib/wine/libopengl32.def lib/wine/libpdh.def lib/wine/libpowrprof.def lib/wine/libpsapi.def @@ -704,7 +704,7 @@ lib/wine/libuxtheme.def lib/wine/libvdmdbg.def lib/wine/libversion.def lib/wine/libwinecrt0.a -${WINE_OPENGL}lib/wine/libwined3d.def +${PLIST.opengl}lib/wine/libwined3d.def lib/wine/libwinedos.def lib/wine/libwininet.def lib/wine/libwinmm.def @@ -789,7 +789,7 @@ lib/wine/oledlg.dll.so lib/wine/olepro32.dll.so lib/wine/olesvr.dll16 lib/wine/olesvr32.dll.so -${WINE_OPENGL}lib/wine/opengl32.dll.so +${PLIST.opengl}lib/wine/opengl32.dll.so lib/wine/oleview.exe.so lib/wine/pdh.dll.so lib/wine/powrprof.dll.so @@ -878,7 +878,7 @@ lib/wine/winebrowser.exe.so lib/wine/winecfg.exe.so lib/wine/wineconsole.exe.so lib/wine/winecoreaudio.drv.so -${WINE_OPENGL}lib/wine/wined3d.dll.so +${PLIST.opengl}lib/wine/wined3d.dll.so lib/wine/winedbg.exe.so lib/wine/winedevice.exe.so lib/wine/winedos.dll.so diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk index 68a9c2e4229..2321013e327 100644 --- a/emulators/wine/options.mk +++ b/emulators/wine/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2007/04/13 21:25:48 adam Exp $ +# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:00 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wine PKG_SUPPORTED_OPTIONS= cups opengl sane @@ -6,17 +6,18 @@ PKG_SUGGESTED_OPTIONS= opengl .include "../../mk/bsd.options.mk" +PLIST_VARS+= opengl + .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mopengl) -PLIST_SUBST+= WINE_OPENGL="" +PLIST.opengl= yes .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" .else CONFIGURE_ARGS+= --without-opengl -PLIST_SUBST+= WINE_OPENGL="@comment " .endif .if !empty(PKG_OPTIONS:Msane) diff --git a/finance/kmymoney2/PLIST b/finance/kmymoney2/PLIST index 25027dc1b5e..ee758dc17cc 100644 --- a/finance/kmymoney2/PLIST +++ b/finance/kmymoney2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2007/05/23 13:38:23 obache Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:00 jlam Exp $ bin/kmymoney bin/kmymoney2 include/kmymoney/export.h @@ -30,7 +30,7 @@ include/kmymoney/mymoneytransactionfilter.h include/kmymoney/mymoneyutils.h include/kmymoney/statementinterface.h include/kmymoney/viewinterface.h -${HAS_LIBOFX}lib/kde3/kmm_ofximport.la +${PLIST.libofx}lib/kde3/kmm_ofximport.la lib/libkmm_mymoney.la lib/libkmm_plugin.la man/man1/kmymoney2.1 @@ -330,7 +330,7 @@ share/kde/apps/kmymoney2/templates/pt_BR/default_accounts.kmt share/kde/apps/kmymoney2/templates/ru_SU/default_accounts.kmt share/kde/apps/kmymoney2/tips share/kde/mimelnk/application/x-kmymoney2.desktop -${HAS_LIBOFX}share/kde/services/kmm_ofximport.desktop +${PLIST.libofx}share/kde/services/kmm_ofximport.desktop share/kde/servicetypes/kmymoneyimporterplugin.desktop share/kde/servicetypes/kmymoneyplugin.desktop share/locale/ca/LC_MESSAGES/kmymoney2.mo diff --git a/finance/kmymoney2/options.mk b/finance/kmymoney2/options.mk index dc145d01dc6..a86ed9525d1 100644 --- a/finance/kmymoney2/options.mk +++ b/finance/kmymoney2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2006/02/09 21:46:47 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:00 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kmymoney2 PKG_SUPPORTED_OPTIONS= libofx @@ -6,9 +6,9 @@ PKG_SUGGESTED_OPTIONS= libofx .include "../../mk/bsd.options.mk" +PLIST_VARS+= libofx + .if !empty(PKG_OPTIONS:Mlibofx) .include "../../finance/libofx/buildlink3.mk" -PLIST_SUBST+= HAS_LIBOFX="" -.else -PLIST_SUBST+= HAS_LIBOFX="@comment " +PLIST.libofx= yes .endif diff --git a/games/openttd/PLIST b/games/openttd/PLIST index b8f1fbb4f2c..a493480eaf8 100644 --- a/games/openttd/PLIST +++ b/games/openttd/PLIST @@ -1,41 +1,41 @@ -@comment $NetBSD: PLIST,v 1.9 2008/04/07 19:44:19 tnn Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:01 jlam Exp $ bin/openttd share/openttd/data/generictrams_v0.4.grf share/openttd/data/openttdd.grf share/openttd/data/openttdw.grf share/openttd/data/opntitle.dat -${TTD_DATA}share/openttd/data/sample.cat -${TTD_DATA}share/openttd/data/trg1r.grf -${TTD_DATA}share/openttd/data/trgcr.grf -${TTD_DATA}share/openttd/data/trghr.grf -${TTD_DATA}share/openttd/data/trgir.grf -${TTD_DATA}share/openttd/data/trgtr.grf +${PLIST.ttd-data}share/openttd/data/sample.cat +${PLIST.ttd-data}share/openttd/data/trg1r.grf +${PLIST.ttd-data}share/openttd/data/trgcr.grf +${PLIST.ttd-data}share/openttd/data/trghr.grf +${PLIST.ttd-data}share/openttd/data/trgir.grf +${PLIST.ttd-data}share/openttd/data/trgtr.grf share/openttd/docs/32bpp.txt share/openttd/docs/changelog.txt share/openttd/docs/known-bugs.txt share/openttd/docs/multiplayer.txt -${TTD_DATA}share/openttd/gm/gm_tt00.gm -${TTD_DATA}share/openttd/gm/gm_tt01.gm -${TTD_DATA}share/openttd/gm/gm_tt02.gm -${TTD_DATA}share/openttd/gm/gm_tt03.gm -${TTD_DATA}share/openttd/gm/gm_tt04.gm -${TTD_DATA}share/openttd/gm/gm_tt05.gm -${TTD_DATA}share/openttd/gm/gm_tt06.gm -${TTD_DATA}share/openttd/gm/gm_tt07.gm -${TTD_DATA}share/openttd/gm/gm_tt08.gm -${TTD_DATA}share/openttd/gm/gm_tt09.gm -${TTD_DATA}share/openttd/gm/gm_tt10.gm -${TTD_DATA}share/openttd/gm/gm_tt11.gm -${TTD_DATA}share/openttd/gm/gm_tt12.gm -${TTD_DATA}share/openttd/gm/gm_tt13.gm -${TTD_DATA}share/openttd/gm/gm_tt14.gm -${TTD_DATA}share/openttd/gm/gm_tt15.gm -${TTD_DATA}share/openttd/gm/gm_tt16.gm -${TTD_DATA}share/openttd/gm/gm_tt17.gm -${TTD_DATA}share/openttd/gm/gm_tt18.gm -${TTD_DATA}share/openttd/gm/gm_tt19.gm -${TTD_DATA}share/openttd/gm/gm_tt20.gm -${TTD_DATA}share/openttd/gm/gm_tt21.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt00.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt01.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt02.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt03.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt04.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt05.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt06.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt07.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt08.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt09.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt10.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt11.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt12.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt13.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt14.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt15.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt16.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt17.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt18.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt19.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt20.gm +${PLIST.ttd-data}share/openttd/gm/gm_tt21.gm share/openttd/lang/afrikaans.lng share/openttd/lang/brazilian_portuguese.lng share/openttd/lang/bulgarian.lng diff --git a/games/openttd/options.mk b/games/openttd/options.mk index b3ea7d0657f..f6eacb44af1 100644 --- a/games/openttd/options.mk +++ b/games/openttd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2008/04/07 19:44:19 tnn Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:01 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -8,8 +8,10 @@ PKG_SUGGESTED_OPTIONS= # empty .include "../../mk/bsd.options.mk" +PLIST_VARS+= ttd-data + .if !empty(PKG_OPTIONS:Mttd-data) -PLIST_SUBST+= TTD_DATA="" +PLIST.ttd-data= yes LICENSE= ttd-pseudolicense RESTRICTED= No redistribution allowed NO_BIN_ON_CDROM= ${RESTRICTED} @@ -37,6 +39,4 @@ post-install-ttd-data: .PHONY ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/data; done ${RUN} for f in ${GMFILES}; do \ ${INSTALL_DATA} ${WRKDIR}/$$f ${DATA_DIR}/gm; done -.else -PLIST_SUBST+= TTD_DATA="@comment " .endif diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index cda9ae63c17..fe93391270e 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/09/07 22:12:12 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2008/04/12 22:43:01 jlam Exp $ DISTNAME= quakeforge-0.5.5 PKGREVISION= 7 @@ -34,10 +34,9 @@ CONFIGURE_ARGS+= --with-ipv6 CONFIGURE_ARGS+= --without-ipv6 .endif +PLIST_VARS+= sunaudio .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" -PLIST_SUBST+= COND_SUN="" -.else -PLIST_SUBST+= COND_SUN="@comment " +PLIST.sunaudio= yes .endif INSTALLATION_DIRS= include/QF/GL include/QF/plugin include/QF/ruamoko/gui diff --git a/games/quakeforge/PLIST b/games/quakeforge/PLIST index 0818cafb7e4..adc74bc49b7 100644 --- a/games/quakeforge/PLIST +++ b/games/quakeforge/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2008/01/31 17:39:49 tnn Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:01 jlam Exp $ bin/bsp2img bin/hw-master bin/nq-glx @@ -179,7 +179,7 @@ lib/quakeforge/console_server.la lib/quakeforge/snd_output_disk.la lib/quakeforge/snd_output_oss.la lib/quakeforge/snd_output_sdl.la -${COND_SUN}lib/quakeforge/snd_output_sun.la +${PLIST.sunaudio}lib/quakeforge/snd_output_sun.la lib/quakeforge/snd_render_default.la lib/ruamoko/libcsqc.a lib/ruamoko/libgui.a diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 1526e73cee2..6c317c2be99 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2008/03/12 20:48:11 drochner Exp $ +# $NetBSD: Makefile,v 1.60 2008/04/12 22:43:01 jlam Exp $ DISTNAME= cairo-1.4.14 CATEGORIES= graphics @@ -21,12 +21,11 @@ CONFIGURE_ARGS+= --enable-glitz CONFIGURE_ARGS+= --enable-pdf CONFIGURE_ARGS+= --enable-ps +PLIST_VARS+= carbon .if exists(/System/Library/Frameworks/Carbon.framework) CONFIGURE_ARGS+= --enable-quartz CONFIGURE_ARGS+= --enable-atsui -PLIST_SUBST+= CARBON= -.else -PLIST_SUBST+= CARBON="@comment " +PLIST.carbon= yes .endif .include "options.mk" diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST index 9840d494c56..aee90f7eafc 100644 --- a/graphics/cairo/PLIST +++ b/graphics/cairo/PLIST @@ -1,27 +1,27 @@ -@comment $NetBSD: PLIST,v 1.17 2007/06/15 17:47:59 drochner Exp $ -${CARBON}include/cairo/cairo-atsui.h +@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:01 jlam Exp $ +${PLIST.carbon}include/cairo/cairo-atsui.h include/cairo/cairo-deprecated.h include/cairo/cairo-features.h include/cairo/cairo-ft.h include/cairo/cairo-glitz.h include/cairo/cairo-pdf.h include/cairo/cairo-ps.h -${CARBON}include/cairo/cairo-quartz.h +${PLIST.carbon}include/cairo/cairo-quartz.h include/cairo/cairo-svg.h -${X11}include/cairo/cairo-xlib-xrender.h -${X11}include/cairo/cairo-xlib.h +${PLIST.x11}include/cairo/cairo-xlib-xrender.h +${PLIST.x11}include/cairo/cairo-xlib.h include/cairo/cairo.h lib/libcairo.la -${CARBON}lib/pkgconfig/cairo-atsui.pc +${PLIST.carbon}lib/pkgconfig/cairo-atsui.pc lib/pkgconfig/cairo-ft.pc lib/pkgconfig/cairo-glitz.pc lib/pkgconfig/cairo-pdf.pc lib/pkgconfig/cairo-png.pc lib/pkgconfig/cairo-ps.pc -${CARBON}lib/pkgconfig/cairo-quartz.pc +${PLIST.carbon}lib/pkgconfig/cairo-quartz.pc lib/pkgconfig/cairo-svg.pc -${X11}lib/pkgconfig/cairo-xlib-xrender.pc -${X11}lib/pkgconfig/cairo-xlib.pc +${PLIST.x11}lib/pkgconfig/cairo-xlib-xrender.pc +${PLIST.x11}lib/pkgconfig/cairo-xlib.pc lib/pkgconfig/cairo.pc share/gtk-doc/html/cairo/Drawing.html share/gtk-doc/html/cairo/Fonts.html diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk index 348dbca0290..0c4b45e8444 100644 --- a/graphics/cairo/options.mk +++ b/graphics/cairo/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/11/29 22:13:58 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:01 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cairo PKG_SUPPORTED_OPTIONS= x11 @@ -6,12 +6,14 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= x11 + ### ### X11 support ### .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --enable-xlib --enable-xlib-xrender -PLIST_SUBST+= X11="" +PLIST.x11= yes .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" @@ -21,5 +23,4 @@ BUILDLINK_DEPMETHOD.libXt?= build # only for configure .include "../../x11/libXt/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-xlib --disable-xlib-xrender -PLIST_SUBST+= X11="@comment " .endif diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index 5f53ae36b78..05f1fe42cfc 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/09/21 13:03:47 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2008/04/12 22:43:01 jlam Exp $ DISTNAME= camlimages-2.2.0 PKGREVISION= 5 @@ -28,10 +28,10 @@ BUILD_TARGET+= all PLIST_SRC+= ${PKGDIR}/PLIST.opt .endif -.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD" -PLIST_SUBST+= COND_DLL="" -.else -PLIST_SUBST+= COND_DLL="@comment " +PLIST_VARS+= dll +.if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || \ + ${OPSYS} == "Darwin" || ${OPSYS} == "NetBSD" +PLIST.dll= yes .endif .include "../../lang/ocaml/buildlink3.mk" diff --git a/graphics/camlimages/PLIST b/graphics/camlimages/PLIST index d6108db14d5..010718b10fd 100644 --- a/graphics/camlimages/PLIST +++ b/graphics/camlimages/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2006/04/22 17:07:19 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:01 jlam Exp $ lib/ocaml/camlimages/Makefile.config lib/ocaml/camlimages/bitmap.cmi lib/ocaml/camlimages/bitmap.cmo @@ -47,12 +47,12 @@ lib/ocaml/camlimages/colorhist.cmo lib/ocaml/camlimages/colorhist.cmx lib/ocaml/camlimages/colorhist.o lib/ocaml/camlimages/config.h -${COND_DLL}lib/ocaml/camlimages/dllci_freetype.so -${COND_DLL}lib/ocaml/camlimages/dllci_gif.so -${COND_DLL}lib/ocaml/camlimages/dllci_jpeg.so -${COND_DLL}lib/ocaml/camlimages/dllci_png.so -${COND_DLL}lib/ocaml/camlimages/dllci_tiff.so -${COND_DLL}lib/ocaml/camlimages/dllci_xpm.so +${PLIST.dll}lib/ocaml/camlimages/dllci_freetype.so +${PLIST.dll}lib/ocaml/camlimages/dllci_gif.so +${PLIST.dll}lib/ocaml/camlimages/dllci_jpeg.so +${PLIST.dll}lib/ocaml/camlimages/dllci_png.so +${PLIST.dll}lib/ocaml/camlimages/dllci_tiff.so +${PLIST.dll}lib/ocaml/camlimages/dllci_xpm.so lib/ocaml/camlimages/freetype.cmi lib/ocaml/camlimages/freetype.cmo lib/ocaml/camlimages/freetype.cmx diff --git a/graphics/dia/options.mk b/graphics/dia/options.mk index c11897839f5..ba663cba612 100644 --- a/graphics/dia/options.mk +++ b/graphics/dia/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2007/02/22 19:01:19 wiz Exp $ +# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:01 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dia #PKG_SUPPORTED_OPTIONS= gnome cairo @@ -7,16 +7,17 @@ PKG_SUGGESTED_OPTIONS= gnome .include "../../mk/bsd.options.mk" +PLIST_VARS+= cairo gnome + .if !empty(PKG_OPTIONS:Mgnome) USE_DIRS+= gnome2-1.5 CONFIGURE_ARGS+= --enable-gnome . include "../../devel/libgnome/buildlink3.mk" . include "../../devel/libgnomeui/buildlink3.mk" -PLIST_SUBST+= GNOME_OPTION= +PLIST.gnome= yes PLIST_SUBST+= DIA_HELPDIR=share/gnome/help/dia .else CONFIGURE_ARGS+= --disable-gnome -PLIST_SUBST+= GNOME_OPTION='@comment ' PLIST_SUBST+= DIA_HELPDIR=share/dia/help .endif @@ -24,8 +25,7 @@ PLIST_SUBST+= DIA_HELPDIR=share/dia/help .if !empty(PKG_OPTIONS:Mcairo) CONFIGURE_ARGS+= --with-cairo . include "../../graphics/cairo/buildlink3.mk" -PLIST_SUBST+= CAIRO_OPTION= +PLIST.cairo= yes .else CONFIGURE_ARGS+= --without-cairo -PLIST_SUBST+= CAIRO_OPTION='@comment ' .endif diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 9ec0fb39fa3..3f5d5808c5d 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.173 2008/03/02 15:49:24 adam Exp $ +# $NetBSD: Makefile,v 1.174 2008/04/12 22:43:01 jlam Exp $ DISTNAME= gimp-2.4.5 CATEGORIES= graphics @@ -48,10 +48,9 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} +PLIST_VARS+= remote twain .if exists(/System/Library/Frameworks/TWAIN.framework) -PLIST_SUBST+= TWAIN="" -.else -PLIST_SUBST+= TWAIN="@comment " +PLIST.twain= yes .endif .include "options.mk" @@ -68,10 +67,8 @@ PLIST_SUBST+= TWAIN="@comment " .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.if empty(PKG_BUILD_OPTIONS.gtk2:Mx11) -PLIST_SUBST+= REMOTE="@comment " -.else -PLIST_SUBST+= REMOTE="" +.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11) +PLIST.remote= yes .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST index ffa8478ef94..358dba0da8c 100644 --- a/graphics/gimp/PLIST +++ b/graphics/gimp/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.33 2007/11/21 19:52:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.34 2008/04/12 22:43:01 jlam Exp $ bin/gimp bin/gimp-2.4 bin/gimp-console bin/gimp-console-2.4 -${REMOTE}bin/gimp-remote -${REMOTE}bin/gimp-remote-2.4 +${PLIST.remote}bin/gimp-remote +${PLIST.remote}bin/gimp-remote-2.4 bin/gimptool-2.0 include/gimp-2.0/libgimp/gimp.h include/gimp-2.0/libgimp/gimp_pdb.h @@ -226,7 +226,7 @@ lib/gimp/2.0/plug-ins/CML_explorer lib/gimp/2.0/plug-ins/FractalExplorer lib/gimp/2.0/plug-ins/Lighting lib/gimp/2.0/plug-ins/MapObject -${AALIB}lib/gimp/2.0/plug-ins/aa +${PLIST.aalib}lib/gimp/2.0/plug-ins/aa lib/gimp/2.0/plug-ins/align_layers lib/gimp/2.0/plug-ins/animationplay lib/gimp/2.0/plug-ins/animoptimize @@ -295,7 +295,7 @@ lib/gimp/2.0/plug-ins/gtm lib/gimp/2.0/plug-ins/guillotine lib/gimp/2.0/plug-ins/header lib/gimp/2.0/plug-ins/help -${GNOME}lib/gimp/2.0/plug-ins/helpbrowser +${PLIST.gnome}lib/gimp/2.0/plug-ins/helpbrowser lib/gimp/2.0/plug-ins/hot lib/gimp/2.0/plug-ins/ifscompose lib/gimp/2.0/plug-ins/illusion @@ -313,7 +313,7 @@ lib/gimp/2.0/plug-ins/max_rgb lib/gimp/2.0/plug-ins/maze lib/gimp/2.0/plug-ins/mblur lib/gimp/2.0/plug-ins/metadata -${MNG}lib/gimp/2.0/plug-ins/mng +${PLIST.mng}lib/gimp/2.0/plug-ins/mng lib/gimp/2.0/plug-ins/mosaic lib/gimp/2.0/plug-ins/neon lib/gimp/2.0/plug-ins/newsprint @@ -367,7 +367,7 @@ lib/gimp/2.0/plug-ins/spheredesigner lib/gimp/2.0/plug-ins/spread lib/gimp/2.0/plug-ins/struc lib/gimp/2.0/plug-ins/sunras -${SVG}lib/gimp/2.0/plug-ins/svg +${PLIST.svg}lib/gimp/2.0/plug-ins/svg lib/gimp/2.0/plug-ins/tga lib/gimp/2.0/plug-ins/threshold_alpha lib/gimp/2.0/plug-ins/tiff-load @@ -375,7 +375,7 @@ lib/gimp/2.0/plug-ins/tiff-save lib/gimp/2.0/plug-ins/tile lib/gimp/2.0/plug-ins/tileit lib/gimp/2.0/plug-ins/tiler -${TWAIN}lib/gimp/2.0/plug-ins/twain +${PLIST.twain}lib/gimp/2.0/plug-ins/twain lib/gimp/2.0/plug-ins/uniteditor lib/gimp/2.0/plug-ins/unsharp lib/gimp/2.0/plug-ins/uri @@ -995,7 +995,7 @@ share/gimp/2.0/themes/Default/images/stock-question-64.png share/gimp/2.0/themes/Default/images/stock-warning-64.png share/gimp/2.0/themes/Small/gtkrc share/gimp/2.0/tips/gimp-tips.xml -${TWAIN}share/gimp/2.0/twain/gimp-twain.png +${PLIST.twain}share/gimp/2.0/twain/gimp-twain.png share/gtk-doc/html/libgimp/GimpAspectPreview.html share/gtk-doc/html/libgimp/GimpBrushSelectButton.html share/gtk-doc/html/libgimp/GimpDrawablePreview.html @@ -1975,7 +1975,7 @@ share/mime-info/gimp.keys @dirrm share/gtk-doc/html/libgimpcolor @dirrm share/gtk-doc/html/libgimpbase @dirrm share/gtk-doc/html/libgimp -${TWAIN}@dirrm share/gimp/2.0/twain +${PLIST.twain}@dirrm share/gimp/2.0/twain @dirrm share/gimp/2.0/tips @dirrm share/gimp/2.0/themes/Small @dirrm share/gimp/2.0/themes/Default/images/preferences diff --git a/graphics/gimp/options.mk b/graphics/gimp/options.mk index 4e1b4916e0a..1fe0ddfada2 100644 --- a/graphics/gimp/options.mk +++ b/graphics/gimp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/10/28 16:43:00 dogcow Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gimp PKG_SUPPORTED_OPTIONS= aalib gnome mng svg @@ -6,30 +6,24 @@ PKG_SUGGESTED_OPTIONS= aalib gnome mng svg .include "../../mk/bsd.options.mk" +PLIST_VARS+= aalib gnome mng svg + .if !empty(PKG_OPTIONS:Maalib) .include "../../graphics/aalib/buildlink3.mk" -PLIST_SUBST+= AALIB= -.else -PLIST_SUBST+= AALIB="@comment " +PLIST.aalib= yes .endif .if !empty(PKG_OPTIONS:Mgnome) .include "../../www/libgtkhtml/buildlink3.mk" -PLIST_SUBST+= GNOME= -.else -PLIST_SUBST+= GNOME="@comment " +PLIST.gnome= yes .endif .if !empty(PKG_OPTIONS:Mmng) .include "../../graphics/mng/buildlink3.mk" -PLIST_SUBST+= MNG= -.else -PLIST_SUBST+= MNG="@comment " +PLIST.mng= yes .endif .if !empty(PKG_OPTIONS:Msvg) .include "../../graphics/librsvg/buildlink3.mk" -PLIST_SUBST+= SVG= -.else -PLIST_SUBST+= SVG="@comment " +PLIST.svg= yes .endif diff --git a/graphics/glitz/Makefile b/graphics/glitz/Makefile index d8516ce00e3..54254fb302b 100644 --- a/graphics/glitz/Makefile +++ b/graphics/glitz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/12/02 22:32:59 jschauma Exp $ +# $NetBSD: Makefile,v 1.24 2008/04/12 22:43:01 jlam Exp $ DISTNAME= glitz-0.5.6 PKGREVISION= 2 @@ -17,11 +17,10 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \ src/glitz.pc.in +PLIST_VARS+= agl .if exists(/System/Library/Frameworks/AGL.framework) -PLIST_SUBST+= AGL="" -CONFIGURE_ENV+= AGL_LIBS="-framework AGL" -.else -PLIST_SUBST+= AGL="@comment " +PLIST.agl= yes +CONFIGURE_ENV+= AGL_LIBS="-framework AGL" .endif .include "options.mk" diff --git a/graphics/glitz/PLIST b/graphics/glitz/PLIST index 2237cc0b24e..6c0f4cb04ad 100644 --- a/graphics/glitz/PLIST +++ b/graphics/glitz/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.4 2006/07/23 03:42:43 minskim Exp $ -${AGL}include/glitz-agl.h -${X11}include/glitz-glx.h +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:01 jlam Exp $ +${PLIST.agl}include/glitz-agl.h +${PLIST.x11}include/glitz-glx.h include/glitz.h -${AGL}lib/libglitz-agl.la -${X11}lib/libglitz-glx.la +${PLIST.agl}lib/libglitz-agl.la +${PLIST.x11}lib/libglitz-glx.la lib/libglitz.la -${AGL}lib/pkgconfig/glitz-agl.pc -${X11}lib/pkgconfig/glitz-glx.pc +${PLIST.agl}lib/pkgconfig/glitz-agl.pc +${PLIST.x11}lib/pkgconfig/glitz-glx.pc lib/pkgconfig/glitz.pc diff --git a/graphics/glitz/options.mk b/graphics/glitz/options.mk index 739e8709daf..3b736b814f8 100644 --- a/graphics/glitz/options.mk +++ b/graphics/glitz/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2006/11/06 11:28:02 joerg Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.glitz PKG_SUPPORTED_OPTIONS= x11 @@ -6,17 +6,18 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= x11 + ### ### X11 support ### .if !empty(PKG_OPTIONS:Mx11) LIBS.Darwin+= -lXext -PLIST_SUBST+= X11="" +PLIST.x11= yes .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build # only for configure .include "../../x11/libXt/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-glx -PLIST_SUBST+= X11="@comment " .endif diff --git a/graphics/gocr/PLIST b/graphics/gocr/PLIST index acd9825bc68..a9c03c56408 100644 --- a/graphics/gocr/PLIST +++ b/graphics/gocr/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2005/10/25 02:06:57 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:01 jlam Exp $ bin/gocr -${TK}bin/gocr.tcl +${PLIST.tk}bin/gocr.tcl include/gocr.h lib/libPgm2asc.a man/man1/gocr.1 diff --git a/graphics/gocr/options.mk b/graphics/gocr/options.mk index 71fb9929446..103feb959f6 100644 --- a/graphics/gocr/options.mk +++ b/graphics/gocr/options.mk @@ -1,16 +1,16 @@ -# $NetBSD: options.mk,v 1.1 2005/10/25 02:06:57 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:01 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gocr PKG_SUPPORTED_OPTIONS= tk .include "../../mk/bsd.options.mk" +PLIST_VARS+= tk + .if !empty(PKG_OPTIONS:Mtk) DEPENDS+= tk>=8.4:../../x11/tk -PLIST_SUBST+= TK="" +PLIST.tk= yes post-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/gocr.tcl ${PREFIX}/bin -.else -PLIST_SUBST+= TK="@comment " .endif diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST index 4b4b71c2ebd..42fe1723375 100644 --- a/graphics/graphviz/PLIST +++ b/graphics/graphviz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2008/03/14 12:56:01 gdt Exp $ +@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:43:01 jlam Exp $ bin/acyclic bin/bcomps bin/ccomps @@ -54,14 +54,14 @@ include/graphviz/usershape.h lib/graphviz/libgvplugin_core.la lib/graphviz/libgvplugin_dot_layout.la lib/graphviz/libgvplugin_gd.la -${GTK}lib/graphviz/libgvplugin_gdk_pixbuf.la -${GTK}lib/graphviz/libgvplugin_gtk.la -${TCL}${GUILE}lib/graphviz/guile/libgv_guile.la +${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la +${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la +${PLIST.tcl}${PLIST.guile}lib/graphviz/guile/libgv_guile.la lib/graphviz/libgvplugin_neato_layout.la lib/graphviz/libgvplugin_pango.la lib/graphviz/libgvplugin_xlib.la lib/graphviz/lua/gv.so -${LUA}lib/graphviz/lua/libgv_lua.la +${PLIST.lua}lib/graphviz/lua/libgv_lua.la lib/graphviz/perl/gv.so lib/graphviz/pkgIndex.tcl lib/graphviz/python/_gv.so @@ -71,12 +71,12 @@ lib/graphviz/python25/_gv.so lib/graphviz/r/gv.so lib/graphviz/ruby/gv.so lib/graphviz/tcl/gv.so -${TCL}lib/graphviz/tcl/libgdtclft.la -${TCL}${LUA}lib/graphviz/tcl/libgv_tcl.la -${TCL}lib/graphviz/tcl/libtcldot.la -${TCL}lib/graphviz/tcl/libtcldot_builtin.la -${TCL}lib/graphviz/tcl/libtclplan.la -${TCL}lib/graphviz/tcl/libtkspline.la +${PLIST.tcl}lib/graphviz/tcl/libgdtclft.la +${PLIST.tcl}${PLIST.lua}lib/graphviz/tcl/libgv_tcl.la +${PLIST.tcl}lib/graphviz/tcl/libtcldot.la +${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la +${PLIST.tcl}lib/graphviz/tcl/libtclplan.la +${PLIST.tcl}lib/graphviz/tcl/libtkspline.la lib/libagraph.la lib/libcdt.la lib/libcgraph.la @@ -121,35 +121,35 @@ man/man3/graph.3 man/man3/gvc.3 man/man3/pathplan.3 man/man7/graphviz.7 -${TCL}man/mann/gdtclft.n -${TCL}${GUILE}man/mann/gv_guile.n -${LUA}man/mann/gv_lua.n -${TCL}${LUA}man/mann/gv_tcl.n -${TCL}man/mann/tcldot.n -${TCL}man/mann/tkspline.n -${TCL}share/graphviz/demo/doted -${TCL}share/graphviz/demo/doted.README -${TCL}share/graphviz/demo/entities -${TCL}share/graphviz/demo/entities.README -${TCL}share/graphviz/demo/entities.html -${TCL}share/graphviz/demo/gcat -${TCL}share/graphviz/demo/gcat.README -${TCL}share/graphviz/demo/pathplan -${TCL}share/graphviz/demo/pathplan.README -${TCL}share/graphviz/demo/pathplan_data/boxes.dat -${TCL}share/graphviz/demo/pathplan_data/dpd.dat -${TCL}share/graphviz/demo/pathplan_data/funny.dat -${TCL}share/graphviz/demo/pathplan_data/maze.dat -${TCL}share/graphviz/demo/pathplan_data/nested.dat -${TCL}share/graphviz/demo/pathplan_data/northo.dat -${TCL}share/graphviz/demo/pathplan_data/obs.dat -${TCL}share/graphviz/demo/pathplan_data/other.dat -${TCL}share/graphviz/demo/pathplan_data/paths.dat -${TCL}share/graphviz/demo/pathplan_data/rotor.dat -${TCL}share/graphviz/demo/pathplan_data/u.dat -${TCL}share/graphviz/demo/pathplan_data/unknown.dat -${TCL}share/graphviz/demo/spline -${TCL}share/graphviz/demo/spline.README +${PLIST.tcl}man/mann/gdtclft.n +${PLIST.tcl}${PLIST.guile}man/mann/gv_guile.n +${PLIST.lua}man/mann/gv_lua.n +${PLIST.tcl}${PLIST.lua}man/mann/gv_tcl.n +${PLIST.tcl}man/mann/tcldot.n +${PLIST.tcl}man/mann/tkspline.n +${PLIST.tcl}share/graphviz/demo/doted +${PLIST.tcl}share/graphviz/demo/doted.README +${PLIST.tcl}share/graphviz/demo/entities +${PLIST.tcl}share/graphviz/demo/entities.README +${PLIST.tcl}share/graphviz/demo/entities.html +${PLIST.tcl}share/graphviz/demo/gcat +${PLIST.tcl}share/graphviz/demo/gcat.README +${PLIST.tcl}share/graphviz/demo/pathplan +${PLIST.tcl}share/graphviz/demo/pathplan.README +${PLIST.tcl}share/graphviz/demo/pathplan_data/boxes.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/dpd.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/funny.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/maze.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/nested.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/northo.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/obs.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/other.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/paths.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/rotor.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/u.dat +${PLIST.tcl}share/graphviz/demo/pathplan_data/unknown.dat +${PLIST.tcl}share/graphviz/demo/spline +${PLIST.tcl}share/graphviz/demo/spline.README share/graphviz/doc/AUTHORS share/graphviz/doc/COPYING share/graphviz/doc/ChangeLog @@ -267,7 +267,7 @@ share/graphviz/doc/html/info/trapezium.gif share/graphviz/doc/html/info/triangle.gif share/graphviz/doc/html/info/tripleoctagon.gif share/graphviz/doc/html/pspdf.png -${TCL}share/graphviz/doc/html/tcldot.html +${PLIST.tcl}share/graphviz/doc/html/tcldot.html share/graphviz/doc/html/winbuild.html share/graphviz/doc/latex_suggestions.txt share/graphviz/doc/pdf/acyclic.pdf @@ -285,7 +285,7 @@ share/graphviz/doc/pdf/dotty.pdf share/graphviz/doc/pdf/dottyguide.pdf share/graphviz/doc/pdf/fdp.pdf share/graphviz/doc/pdf/gc.pdf -${TCL}share/graphviz/doc/pdf/gdtclft.pdf +${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf share/graphviz/doc/pdf/graph.pdf share/graphviz/doc/pdf/gvc.pdf share/graphviz/doc/pdf/gvcolor.pdf @@ -301,8 +301,8 @@ share/graphviz/doc/pdf/nop.pdf share/graphviz/doc/pdf/pathplan.pdf share/graphviz/doc/pdf/prune.pdf share/graphviz/doc/pdf/sccmap.pdf -${TCL}share/graphviz/doc/pdf/tcldot.pdf -${TCL}share/graphviz/doc/pdf/tkspline.pdf +${PLIST.tcl}share/graphviz/doc/pdf/tcldot.pdf +${PLIST.tcl}share/graphviz/doc/pdf/tkspline.pdf share/graphviz/doc/pdf/tred.pdf share/graphviz/doc/pdf/twopi.pdf share/graphviz/doc/pdf/unflatten.pdf diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk index 7aa7e47b457..a4142f31326 100644 --- a/graphics/graphviz/options.mk +++ b/graphics/graphviz/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2008/03/11 15:46:57 joerg Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:01 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz PKG_SUPPORTED_OPTIONS= guile lua ocaml swig tcl gtk @@ -6,21 +6,21 @@ PKG_SUGGESTED_OPTIONS= lua swig tcl .include "../../mk/bsd.options.mk" +PLIST_VARS+= guile gtk lua tcl + .if !empty(PKG_OPTIONS:Mguile) .include "../../lang/guile/buildlink3.mk" CONFIGURE_ARGS+= --enable-guile -PLIST_SUBST+= GUILE="" +PLIST.guile= yes .else CONFIGURE_ARGS+= --disable-guile -PLIST_SUBST+= GUILE="@comment " .endif .if !empty(PKG_OPTIONS:Mlua) .include "../../lang/lua/buildlink3.mk" -PLIST_SUBST+= LUA= +PLIST.lua= yes .else CONFIGURE_ARGS+= --disable-lua -PLIST_SUBST+= LUA="@comment " .endif .if !empty(PKG_OPTIONS:Mocaml) @@ -39,17 +39,15 @@ CONFIGURE_ARGS+= --disable-swig .include "../../x11/tk/buildlink3.mk" CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} -PLIST_SUBST+= TCL= +PLIST.tcl= yes .else CONFIGURE_ARGS+= --disable-tcl -PLIST_SUBST+= TCL="@comment " .endif .if !empty(PKG_OPTIONS:Mgtk) .include "../../x11/gtk2/buildlink3.mk" -PLIST_SUBST+= GTK= +PLIST.gtk= yes .else CONFIGURE_ARGS+= --without-gdk-pixbuf CONFIGURE_ARGS+= --without-gtk -PLIST_SUBST+= GTK="@comment " .endif diff --git a/graphics/imlib2/PLIST b/graphics/imlib2/PLIST index c0c0f2383db..fe6bbbf4e9b 100644 --- a/graphics/imlib2/PLIST +++ b/graphics/imlib2/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.9 2007/11/17 01:40:50 obache Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:01 jlam Exp $ bin/imlib2-config -${X11}bin/imlib2_bumpmap -${X11}bin/imlib2_colorspace +${PLIST.x11}bin/imlib2_bumpmap +${PLIST.x11}bin/imlib2_colorspace bin/imlib2_conv -${X11}bin/imlib2_grab -${X11}bin/imlib2_poly -${X11}bin/imlib2_show -${X11}bin/imlib2_test -${X11}bin/imlib2_view +${PLIST.x11}bin/imlib2_grab +${PLIST.x11}bin/imlib2_poly +${PLIST.x11}bin/imlib2_show +${PLIST.x11}bin/imlib2_test +${PLIST.x11}bin/imlib2_view include/Imlib2.h lib/imlib2/filters/bumpmap.la lib/imlib2/filters/colormod.la diff --git a/graphics/imlib2/options.mk b/graphics/imlib2/options.mk index 1b2c6ebbf06..357477d21df 100644 --- a/graphics/imlib2/options.mk +++ b/graphics/imlib2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2007/11/17 01:40:50 obache Exp $ +# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:01 jlam Exp $ .include "../../mk/bsd.prefs.mk" @@ -22,13 +22,14 @@ CONFIGURE_ARGS+= --enable-mmx CONFIGURE_ARGS+= --enable-amd64 .endif +PLIST_VARS+= x11 + .if !empty(PKG_OPTIONS:Mx11) .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -PLIST_SUBST+= X11="" +PLIST.x11= yes .else CONFIGURE_ARGS+= --without-x -PLIST_SUBST+= X11="@comment " .endif diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index c568beaa7ff..17a8b449a22 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2007/02/04 15:26:34 joerg Exp $ +# $NetBSD: Makefile,v 1.44 2008/04/12 22:43:01 jlam Exp $ # DISTNAME= libggi-2.1.1.src @@ -27,20 +27,18 @@ CONF_FILES= ${EGDIR}/libggi.conf ${PKG_SYSCONFDIR}/libggi.conf .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= libvgl terminfo xf86dga + .if ${OPSYS} == "NetBSD" -.if !empty(OS_VERSION:M1.[56].*) -PLIST_SUBST+= COND_TERMINFO="@comment " -.else -PLIST_SUBST+= COND_TERMINFO="" -.endif +. if empty(OS_VERSION:M1.[56].*) +PLIST.terminfo= yes +. endif .else -PLIST_SUBST+= COND_TERMINFO="" +PLIST.terminfo= yes .endif .if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" -PLIST_SUBST+= COND_LIBVGL="" -.else -PLIST_SUBST+= COND_LIBVGL="@comment " +PLIST.libvgl= yes .endif .if ${X11_TYPE} == "modular" @@ -48,9 +46,7 @@ PLIST_SUBST+= COND_LIBVGL="@comment " .include "../../x11/libXxf86vm/buildlink3.mk" PLIST_SUBST+= COND_XF86DGA="" .elif exists(${X11BASE}/include/X11/extensions/xf86dga.h) -PLIST_SUBST+= COND_XF86DGA="" -.else -PLIST_SUBST+= COND_XF86DGA="@comment " +PLIST.xf86dga= yes .endif BUILDLINK_DEPMETHOD.libXt?= build diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST index 2a57f4e6284..339bd60e306 100644 --- a/graphics/libggi/PLIST +++ b/graphics/libggi/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2006/04/20 16:28:54 joerg Exp $ +@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:01 jlam Exp $ bin/cube3d bin/ggiteleserver bin/monitest @@ -75,13 +75,13 @@ lib/ggi/display/multi.la lib/ggi/display/palemu.la lib/ggi/display/sub.la lib/ggi/display/tele.la -${COND_TERMINFO}lib/ggi/display/terminfo.la +${PLIST.terminfo}lib/ggi/display/terminfo.la lib/ggi/display/tile.la lib/ggi/display/trueemu.la -${COND_LIBVGL}lib/ggi/display/vgl.la -${COND_XF86DGA}lib/ggi/display/xf86dga.la +${PLIST.libvgl}lib/ggi/display/vgl.la +${PLIST.xf86dga}lib/ggi/display/xf86dga.la lib/ggi/helper/helper_x_dbe.la -${COND_XF86DGA}lib/ggi/helper/helper_x_dga.la +${PLIST.xf86dga}lib/ggi/helper/helper_x_dga.la lib/ggi/helper/helper_x_evi.la lib/ggi/helper/helper_x_shm.la lib/ggi/helper/helper_x_vidmode.la diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile index 3d3da4114c1..e4b5ab2b521 100644 --- a/graphics/libgii/Makefile +++ b/graphics/libgii/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2007/02/02 19:17:31 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2008/04/12 22:43:01 jlam Exp $ DISTNAME= libgii-0.9.1.src PKGNAME= ${DISTNAME:S/.src//} @@ -31,10 +31,9 @@ PTHREAD_OPTS+= native .include "../../mk/pthread.buildlink3.mk" +PLIST_VARS+= ggtick .if empty(PTHREAD_TYPE:Mnative) -PLIST_SUBST+= GGTICK="" -.else -PLIST_SUBST+= GGTICK="@comment " +PLIST.ggtick= yes .endif BUILDLINK_DEPMETHOD.libXt?= build diff --git a/graphics/libgii/PLIST b/graphics/libgii/PLIST index c0740184dd4..a2c03079f68 100644 --- a/graphics/libgii/PLIST +++ b/graphics/libgii/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.9 2005/04/18 15:53:35 wiz Exp $ -${GGTICK}bin/ggtick +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:01 jlam Exp $ +${PLIST.ggtick}bin/ggtick bin/mhub bin/xsendbut include/ggi/errors.h diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile index d9bd387cec4..b88da893dd4 100644 --- a/graphics/py-matplotlib/Makefile +++ b/graphics/py-matplotlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/06/08 12:22:58 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:01 jlam Exp $ # DISTNAME= matplotlib-0.87.2 @@ -20,10 +20,9 @@ PYDISTUTILSPKG= yes PYTHON_VERSIONS_ACCEPTED= 24 23 +PLIST_VARS+= subprocess .if ${PYPACKAGE} == "python22" || ${PYPACKAGE} == "python23" -PLIST_SUBST+= COND_SUBPROCESS="" -.else -PLIST_SUBST+= COND_SUBPROCESS="@comment " +PLIST.subprocess= yes .endif .include "../../devel/zlib/buildlink3.mk" diff --git a/graphics/py-matplotlib/PLIST b/graphics/py-matplotlib/PLIST index a96d572c406..d5ceeac02b9 100644 --- a/graphics/py-matplotlib/PLIST +++ b/graphics/py-matplotlib/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2006/04/30 22:30:43 joerg Exp $ -@comment $NetBSD: PLIST,v 1.7 2006/04/30 22:30:43 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:01 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:01 jlam Exp $ ${PYSITELIB}/matplotlib/__init__.py ${PYSITELIB}/matplotlib/__init__.pyc ${PYSITELIB}/matplotlib/__init__.pyo @@ -474,9 +474,9 @@ ${PYSITELIB}/matplotlib/widgets.pyo ${PYSITELIB}/matplotlib/windowing.py ${PYSITELIB}/matplotlib/windowing.pyc ${PYSITELIB}/matplotlib/windowing.pyo -${COND_SUBPROCESS}${PYSITELIB}/subprocess/__init__.py -${COND_SUBPROCESS}${PYSITELIB}/subprocess/__init__.pyc -${COND_SUBPROCESS}${PYSITELIB}/subprocess/__init__.pyo +${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.py +${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.pyc +${PLIST.subprocess}${PYSITELIB}/subprocess/__init__.pyo ${PYSITELIB}/pylab.py ${PYSITELIB}/pylab.pyc ${PYSITELIB}/pylab.pyo @@ -497,4 +497,4 @@ ${PYSITELIB}/pylab.pyo @dirrm ${PYSITELIB}/matplotlib/enthought @dirrm ${PYSITELIB}/matplotlib/backends @dirrm ${PYSITELIB}/matplotlib -${COND_SUBPROCESS}@dirrm ${PYSITELIB}/subprocess +${PLIST.subprocess}@dirrm ${PYSITELIB}/subprocess diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile index ef6bb3cbfd1..b96c90f8623 100644 --- a/graphics/radiance/Makefile +++ b/graphics/radiance/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2007/05/28 20:35:38 heinz Exp $ +# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:01 jlam Exp $ # DISTNAME= rad3R6P1 @@ -32,21 +32,19 @@ PATCHEES= makeall ./src/rt/Rmakefile ./src/util/Rmakefile \ .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= gl + .if ${OPSYS} == "NetBSD" PKGSRC_ARCH= 9 -PLIST_SUBST+= USE_GL="@comment " .elif ${OPSYS} == "FreeBSD" PKGSRC_ARCH= 8 -PLIST_SUBST+= USE_GL="@comment " .elif ${OPSYS} == "DragonFly" PKGSRC_ARCH= 12 -PLIST_SUBST+= USE_GL="@comment " .elif ${OPSYS} == "Linux" -PLIST_SUBST+= USE_GL="@comment " PKGSRC_ARCH= 6 .elif ${OPSYS} == "IRIX" PKGSRC_ARCH= 3 -PLIST_SUBST+= USE_GL="" +PLIST.gl= yes .endif MAKE_ENV+= MV=${MV:Q} RM=${RM:Q} CP=${CP:Q} \ diff --git a/graphics/radiance/PLIST b/graphics/radiance/PLIST index 8d9b55cb795..56cb9e445ac 100644 --- a/graphics/radiance/PLIST +++ b/graphics/radiance/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2007/05/28 20:35:38 heinz Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:01 jlam Exp $ radiance/bin/arch2rad radiance/bin/bgraph radiance/bin/cnt @@ -26,7 +26,7 @@ radiance/bin/getinfo radiance/bin/glare radiance/bin/glarendx radiance/bin/glaze -${USE_GL}radiance/bin/glrad +${PLIST.gl}radiance/bin/glrad radiance/bin/histo radiance/bin/icalc radiance/bin/ies2rad @@ -123,16 +123,16 @@ radiance/bin/xglaresrc radiance/bin/ximage radiance/bin/xshowtrace radiance/bin/xyzimage -${USE_GL}radiance/dev/glx1.hdi -${USE_GL}radiance/dev/glx1h.hdi -${USE_GL}radiance/dev/ogl.hdi -${USE_GL}radiance/dev/oglh.hdi -${USE_GL}radiance/dev/oglo.hdi -${USE_GL}radiance/dev/ogloh.hdi -${USE_GL}radiance/dev/ogls.hdi -${USE_GL}radiance/dev/oglsh.hdi -${USE_GL}radiance/dev/oglso.hdi -${USE_GL}radiance/dev/oglsoh.hdi +${PLIST.gl}radiance/dev/glx1.hdi +${PLIST.gl}radiance/dev/glx1h.hdi +${PLIST.gl}radiance/dev/ogl.hdi +${PLIST.gl}radiance/dev/oglh.hdi +${PLIST.gl}radiance/dev/oglo.hdi +${PLIST.gl}radiance/dev/ogloh.hdi +${PLIST.gl}radiance/dev/ogls.hdi +${PLIST.gl}radiance/dev/oglsh.hdi +${PLIST.gl}radiance/dev/oglso.hdi +${PLIST.gl}radiance/dev/oglsoh.hdi radiance/dev/x11.hdi radiance/dev/x11h.hdi radiance/lib/Earth.cal diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index f47aba763d1..3c6b7366fcb 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2007/06/08 20:50:55 gdt Exp $ +# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:02 jlam Exp $ .include "Makefile.common" COMMENT= API for access to scanners, digitals camera, frame grabbers etc. @@ -20,15 +20,15 @@ CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/sane-${SANE_VERSION} .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= pint sm3600 + .if (${OPSYS} == "SunOS") -PLIST_SUBST+= SANE_PINT="@comment " -PLIST_SUBST+= SANE_SM3600="@comment " +# nothing .elif (${OPSYS} == "Linux") || (${OPSYS} == "DragonFly") -PLIST_SUBST+= SANE_PINT="@comment " -PLIST_SUBST+= SANE_SM3600="" +PLIST.sm3600= yes .else -PLIST_SUBST+= SANE_PINT="" -PLIST_SUBST+= SANE_SM3600="" +PLIST.pint= yes +PLIST.sm3600= yes .endif OWN_DIRS+= ${PKG_SYSCONFDIR}/sane.d diff --git a/graphics/sane-backends/PLIST b/graphics/sane-backends/PLIST index ff3383d4987..69cde491ace 100644 --- a/graphics/sane-backends/PLIST +++ b/graphics/sane-backends/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2006/08/05 22:41:49 wiz Exp $ +@comment $NetBSD: PLIST,v 1.19 2008/04/12 22:43:02 jlam Exp $ bin/gamma4scanimage bin/sane-config bin/sane-find-scanner @@ -29,7 +29,7 @@ lib/sane/libsane-genesys.la lib/sane/libsane-gt68xx.la lib/sane/libsane-hp.la lib/sane/libsane-hp3500.la -${SANE_HP3900}lib/sane/libsane-hp3900.la +${PLIST.hp3900}lib/sane/libsane-hp3900.la lib/sane/libsane-hp4200.la lib/sane/libsane-hp5400.la lib/sane/libsane-ibm.la @@ -46,7 +46,7 @@ lib/sane/libsane-nec.la lib/sane/libsane-net.la lib/sane/libsane-niash.la lib/sane/libsane-pie.la -${SANE_PINT}lib/sane/libsane-pint.la +${PLIST.pint}lib/sane/libsane-pint.la lib/sane/libsane-pixma.la lib/sane/libsane-plustek.la lib/sane/libsane-plustek_pp.la @@ -54,7 +54,7 @@ lib/sane/libsane-ricoh.la lib/sane/libsane-s9036.la lib/sane/libsane-sceptre.la lib/sane/libsane-sharp.la -${SANE_SM3600}lib/sane/libsane-sm3600.la +${PLIST.sm3600}lib/sane/libsane-sm3600.la lib/sane/libsane-sm3840.la lib/sane/libsane-snapscan.la lib/sane/libsane-sp15c.la @@ -98,7 +98,7 @@ man/man5/sane-gphoto2.5 man/man5/sane-gt68xx.5 man/man5/sane-hp.5 man/man5/sane-hp3500.5 -${SANE_HP3900}man/man5/sane-hp3900.5 +${PLIST.hp3900}man/man5/sane-hp3900.5 man/man5/sane-hp4200.5 man/man5/sane-hp5400.5 man/man5/sane-hpsj5s.5 @@ -252,7 +252,7 @@ share/examples/sane/fujitsu.conf share/examples/sane/genesys.conf share/examples/sane/gt68xx.conf share/examples/sane/hp.conf -${SANE_HP3900}share/examples/sane/hp3900.conf +${PLIST.hp3900}share/examples/sane/hp3900.conf share/examples/sane/hp4200.conf share/examples/sane/hp5400.conf share/examples/sane/ibm.conf diff --git a/graphics/sane-backends/options.mk b/graphics/sane-backends/options.mk index a1a474a7a30..9bc7beaab55 100644 --- a/graphics/sane-backends/options.mk +++ b/graphics/sane-backends/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2007/10/20 03:49:17 obache Exp $ +# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:02 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sane-backends PKG_SUPPORTED_OPTIONS= inet6 sane-backends-hp3900 @@ -14,16 +14,17 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif + ### ### hp3900 support ### +PLIST_VARS+= hp3900 + .if !empty(PKG_OPTIONS:Mhp3900) -PLIST_SUBST+= SANE_HP3900="" +PLIST.hp3900= yes DISTFILES+= hp3900-sane1017_src_0.5.tar.gz SITES.hp3900-sane1017_src_0.5.tar.gz=${MASTER_SITE_SOURCEFORGE:=hp3900-series/} post-patch: cd ${WRKSRC} && \ ${PATCH} -p1 <${WRKDIR}/hp3900-sane1017_src_0.5/hp3900-sane1017_0.5.diff -.else -PLIST_SUBST+= SANE_HP3900="@comment " .endif diff --git a/graphics/zphoto/PLIST b/graphics/zphoto/PLIST index 6e160b29d79..69d007bf361 100644 --- a/graphics/zphoto/PLIST +++ b/graphics/zphoto/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/08/12 16:20:35 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/04/12 22:43:02 jlam Exp $ bin/zphoto -${WX_COMMENT}bin/wxzphoto +${PLIST.wx}bin/wxzphoto share/locale/ja/LC_MESSAGES/zphoto.mo share/locale/ja_JP.SJIS/LC_MESSAGES/zphoto.mo share/zphoto/doc/images/wxzphoto-linux-mini.png diff --git a/graphics/zphoto/options.mk b/graphics/zphoto/options.mk index 5d46274b572..3750f8f2aff 100644 --- a/graphics/zphoto/options.mk +++ b/graphics/zphoto/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/11/17 01:47:02 obache Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:02 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.zphoto PKG_SUPPORTED_OPTIONS= zip wx @@ -37,10 +37,10 @@ CONFIGURE_ARGS+= --disable-zip #CONFIGURE_ARGS+= --disable-avifile #.endif +PLIST_VARS+= wx .if !empty(PKG_OPTIONS:Mwx) .include "../../x11/wxGTK/buildlink3.mk" -PLIST_SUBST+= WX_COMMENT= +PLIST.wx= yes .else CONFIGURE_ARGS+= --disable-wx -PLIST_SUBST+= WX_COMMENT="@comment " .endif diff --git a/inputmethod/skk/PLIST b/inputmethod/skk/PLIST index 179f0519533..e0b3c81222e 100644 --- a/inputmethod/skk/PLIST +++ b/inputmethod/skk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2008/03/11 01:26:08 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:02 jlam Exp $ ${EMACS_INFOPREFIX}/skk.info ${FOR_emacs20}${EMACS_LISPPREFIX}/skk/ccc.el ${FOR_emacs21}${EMACS_LISPPREFIX}/skk/ccc.el @@ -75,8 +75,8 @@ ${EMACS_LISPPREFIX}/skk/skk-leim.el ${EMACS_LISPPREFIX}/skk/skk-leim.elc ${EMACS_LISPPREFIX}/skk/skk-look.el ${EMACS_LISPPREFIX}/skk/skk-look.elc -${FOR_LOOKUP}${EMACS_LISPPREFIX}/skk/skk-lookup.el -${FOR_LOOKUP}${EMACS_LISPPREFIX}/skk/skk-lookup.elc +${PLIST.lookup}${EMACS_LISPPREFIX}/skk/skk-lookup.el +${PLIST.lookup}${EMACS_LISPPREFIX}/skk/skk-lookup.elc ${EMACS_LISPPREFIX}/skk/skk-macs.el ${EMACS_LISPPREFIX}/skk/skk-macs.elc ${EMACS_LISPPREFIX}/skk/skk-num.el diff --git a/inputmethod/skk/options.mk b/inputmethod/skk/options.mk index eadadd4b028..061f7719864 100644 --- a/inputmethod/skk/options.mk +++ b/inputmethod/skk/options.mk @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.4 2007/10/29 13:25:26 uebayasi Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:02 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.skk PKG_SUPPORTED_OPTIONS= lookup .include "../../mk/bsd.options.mk" +PLIST_VARS+= lookup + .if !empty(PKG_OPTIONS:Mlookup) .include "../../misc/lookup/buildlink3.mk" -PLIST_SUBST+= FOR_LOOKUP="" -.else -PLIST_SUBST+= FOR_LOOKUP="@comment " +PLIST.lookup= yes .endif diff --git a/inputmethod/uim/PLIST b/inputmethod/uim/PLIST index 5b6e8e38805..296da877898 100644 --- a/inputmethod/uim/PLIST +++ b/inputmethod/uim/PLIST @@ -1,18 +1,18 @@ -@comment $NetBSD: PLIST,v 1.4 2008/03/02 01:57:37 obache Exp $ -${QT}bin/uim-chardict-qt -${UIM_DICT_GTK}bin/uim-dict-gtk +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:02 jlam Exp $ +${PLIST.qt}bin/uim-chardict-qt +${PLIST.uim-dict-gtk}bin/uim-dict-gtk bin/uim-fep bin/uim-fep-tick -${GTK}bin/uim-im-switcher-gtk -${QT}bin/uim-im-switcher-qt -${GTK}bin/uim-input-pad-ja +${PLIST.gtk}bin/uim-im-switcher-gtk +${PLIST.qt}bin/uim-im-switcher-qt +${PLIST.gtk}bin/uim-input-pad-ja bin/uim-module-manager -${GTK}bin/uim-pref-gtk -${QT}bin/uim-pref-qt +${PLIST.gtk}bin/uim-pref-gtk +${PLIST.qt}bin/uim-pref-qt bin/uim-sh -${GTK}bin/uim-toolbar-gtk -${QT}bin/uim-toolbar-qt -${GTK}bin/uim-toolbar-gtk-systray +${PLIST.gtk}bin/uim-toolbar-gtk +${PLIST.qt}bin/uim-toolbar-qt +${PLIST.gtk}bin/uim-toolbar-gtk-systray bin/uim-xim include/uim/plugin.h include/uim/uim-compat-scm.h @@ -24,15 +24,15 @@ include/uim/uim-util.h include/uim/uim.h lib/libuim-custom.la lib/libuim.la -${GTK}lib/gtk-2.0/2.10.0/immodules/im-uim.la -${KDE}lib/kde3/uim_panelapplet.la +${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la +${PLIST.kde}lib/kde3/uim_panelapplet.la lib/pkgconfig/uim.pc -${ANTHY}lib/uim/plugin/libuim-anthy.la -${CANNA}lib/uim/plugin/libuim-canna.la +${PLIST.anthy}lib/uim/plugin/libuim-anthy.la +${PLIST.canna}lib/uim/plugin/libuim-canna.la lib/uim/plugin/libuim-custom-enabler.la lib/uim/plugin/libuim-skk.la -${GTK}libexec/uim-candwin-gtk -${QT}libexec/uim-candwin-qt +${PLIST.gtk}libexec/uim-candwin-gtk +${PLIST.qt}libexec/uim-candwin-qt libexec/uim-helper-server man/man1/uim-xim.1 share/applications/uim.desktop @@ -51,8 +51,8 @@ share/doc/uim/uim-fep/README.ja share/locale/fr/LC_MESSAGES/uim.mo share/locale/ja/LC_MESSAGES/uim.mo share/locale/ko/LC_MESSAGES/uim.mo -${QT}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo -${KDE}share/kde/apps/kicker/applets/uimapplet.desktop +${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo +${PLIST.kde}share/kde/apps/kicker/applets/uimapplet.desktop share/uim/action.scm share/uim/anthy-custom.scm share/uim/anthy-key-custom.scm @@ -75,8 +75,8 @@ share/uim/generic.scm share/uim/hangul.scm share/uim/hangul2.scm share/uim/hangul3.scm -${QT}share/uim/helperdata/bushu.t -${UIM_DICT_GTK}share/uim/helperdata/uim-dict-ui.xml +${PLIST.qt}share/uim/helperdata/bushu.t +${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml share/uim/i18n.scm share/uim/im-custom.scm share/uim/im-switcher.scm @@ -210,7 +210,7 @@ share/uim/ustr.scm share/uim/util.scm share/uim/viqr.scm share/uim/zaurus.scm -${HELPERDATA}@dirrm share/uim/helperdata +${PLIST.helperdata}@dirrm share/uim/helperdata @dirrm share/uim/pixmaps @dirrm share/uim @comment in kde: @dirrm share/kde/apps/kicker/applets diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk index 4b8771564f3..3d3aba28beb 100644 --- a/inputmethod/uim/options.mk +++ b/inputmethod/uim/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2008/03/02 01:57:37 obache Exp $ +# $NetBSD: options.mk,v 1.12 2008/04/12 22:43:02 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.uim PKG_SUPPORTED_OPTIONS= anthy canna eb gtk qt kde @@ -6,29 +6,27 @@ PKG_SUGGESTED_OPTIONS= anthy canna gtk .include "../../mk/bsd.options.mk" -PLIST_SUBST+= HELPERDATA="@comment " -PLIST_SUBST+= UIM_DICT_GTK="@comment " +PLIST_VARS+= helperdata uim-dict-gtk +PLIST_VARS+= anthy canna gtk kde qt .if !empty(PKG_OPTIONS:Manthy) . include "../../inputmethod/anthy/buildlink3.mk" CONFIGURE_ARGS+= --with-anthy --enable-dict -PLIST_SUBST+= ANTHY= +PLIST.anthy= yes . if !empty(PKG_OPTIONS:Mgtk) -PLIST_SUBST+= HELPERDATA= -PLIST_SUBST+= UIM_DICT_GTK= +PLIST.helperdata= yes +PLIST.uim-dict-gtk= yes . endif .else CONFIGURE_ARGS+= --without-anthy -PLIST_SUBST+= ANTHY="@comment " .endif .if !empty(PKG_OPTIONS:Mcanna) . include "../../inputmethod/canna-lib/buildlink3.mk" CONFIGURE_ARGS+= --with-canna -PLIST_SUBST+= CANNA= +PLIST.canna= yes .else CONFIGURE_ARGS+= --without-canna -PLIST_SUBST+= CANNA="@comment " .endif .if !empty(PKG_OPTIONS:Meb) @@ -39,10 +37,9 @@ CONFIGURE_ARGS+= --without-eb .if !empty(PKG_OPTIONS:Mgtk) .include "../../x11/gtk2/modules.mk" -PLIST_SUBST+= GTK= +PLIST.gtk= yes .else CONFIGURE_ARGS+= --without-gtk2 -PLIST_SUBST+= GTK="@comment " .endif .if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) @@ -51,17 +48,13 @@ BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc # This option don't work. Need immodule patch for Qt3(uim-1.4.x not support Qt4) #CONFIGURE_ARGS+= --with-qt-immodule -PLIST_SUBST+= HELPERDATA= -PLIST_SUBST+= QT= -.else -PLIST_SUBST+= QT="@comment " +PLIST.helperdata= yes +PLIST.qt= yes .endif .if !empty(PKG_OPTIONS:Mkde) . include "../../x11/kdelibs3/buildlink3.mk" . include "../../x11/qt3-libs/buildlink3.mk" CONFIGURE_ARGS+= --enable-kde-applet=yes -PLIST_SUBST+= KDE= -.else -PLIST_SUBST+= KDE="@comment " +PLIST.kde= yes .endif 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 diff --git a/mail/bogofilter/PLIST b/mail/bogofilter/PLIST index be5637d4068..2af1f821296 100644 --- a/mail/bogofilter/PLIST +++ b/mail/bogofilter/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.5 2007/02/16 15:47:39 obache Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:03 jlam Exp $ bin/bf_compact bin/bf_copy bin/bf_tar -${QDBM}bin/bogoQDBMupgrade +${PLIST.qdbm}bin/bogoQDBMupgrade bin/bogofilter bin/bogolexer bin/bogotune diff --git a/mail/bogofilter/options.mk b/mail/bogofilter/options.mk index 19286529c6c..0151420f270 100644 --- a/mail/bogofilter/options.mk +++ b/mail/bogofilter/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/02/16 15:47:39 obache Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:03 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bogofilter PKG_OPTIONS_REQUIRED_GROUPS= database @@ -13,12 +13,11 @@ CONFIGURE_ARGS+= --with-database=db BUILDLINK_TRANSFORM+= l:db:db4 .endif +PLIST_VARS+= qdbm .if !empty(PKG_OPTIONS:Mqdbm) CONFIGURE_ARGS+= --with-database=qdbm -PLIST_SUBST+= QDBM= +PLIST.qdbm= yes .include "../../databases/qdbm/buildlink3.mk" -.else -PLIST_SUBST+= QDBM="@comment " .endif .if !empty(PKG_OPTIONS:Msqlite) diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST index d01c1092e42..d68019264ff 100644 --- a/mail/clamav/PLIST +++ b/mail/clamav/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2007/12/18 08:16:11 martti Exp $ +@comment $NetBSD: PLIST,v 1.20 2008/04/12 22:43:03 jlam Exp $ bin/clamav-config bin/clamconf bin/clamdscan @@ -19,7 +19,7 @@ man/man5/clamd.conf.5 man/man5/freshclam.conf.5 man/man8/clamav-milter.8 man/man8/clamd.8 -${MILTER}sbin/clamav-milter +${PLIST.milter}sbin/clamav-milter sbin/clamd share/examples/clamav/clamd.conf share/examples/clamav/daily.cvd diff --git a/mail/clamav/options.mk b/mail/clamav/options.mk index c62df15397c..da405bb594c 100644 --- a/mail/clamav/options.mk +++ b/mail/clamav/options.mk @@ -1,10 +1,12 @@ -# $NetBSD: options.mk,v 1.3 2007/07/11 17:44:22 xtraeme Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:03 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.clamav PKG_SUPPORTED_OPTIONS= milter clamav-experimental .include "../../mk/bsd.options.mk" +PLIST_VARS+= milter + .if !empty(PKG_OPTIONS:Mmilter) # force use of pkgsrc version of libmilter -- clamav uses the sendmail binary # to check API compatibility(!), so it must build with as new a version of @@ -12,12 +14,11 @@ PKG_SUPPORTED_OPTIONS= milter clamav-experimental USE_BUILTIN.libmilter= no . include "../../mail/libmilter/buildlink3.mk" CONFIGURE_ARGS+= --enable-milter -PLIST_SUBST+= MILTER= +PLIST.milter= yes .else CONFIGURE_ARGS+= --disable-milter # XXX --disable-milter doesn't work as expected, so we need this CONFIGURE_ENV+= ac_cv_header_libmilter_mfapi_h=no -PLIST_SUBST+= MILTER="@comment " .endif .if !empty(PKG_OPTIONS:Mclamav-experimental) diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 53184063db0..25ab51d47ef 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2008/01/18 05:08:22 tnn Exp $ +# $NetBSD: Makefile,v 1.76 2008/04/12 22:43:03 jlam Exp $ DISTNAME= cyrus-imapd-2.2.13 PKGREVISION= 5 @@ -74,12 +74,11 @@ CONFIGURE_ARGS+= --without-krb CONFIGURE_ARGS+= --disable-gssapi .endif +PLIST_VARS+= ldap .if !empty(PKG_OPTIONS:Mldap) CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} +PLIST.ldap= yes . include "../../databases/openldap-client/buildlink3.mk" -PLIST_SUBST+= LDAP= -.else -PLIST_SUBST+= LDAP="@comment " .endif .if exists(/usr/bin/compile_et) @@ -99,15 +98,14 @@ CONFIGURE_ARGS+= --with-com-err=yes # CYRUS_IDLE?= poll BUILD_DEFS+= CYRUS_IDLE +PLIST_VARS+= idled .if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \ (${CYRUS_IDLE} != "no") PKG_FAIL_REASON+= "CYRUS_IDLE must be poll, idled or no" .endif CONFIGURE_ARGS+= --with-idle=${CYRUS_IDLE:Q} .if ${CYRUS_IDLE} == "idled" -PLIST_SUBST+= IDLED= -.else -PLIST_SUBST+= IDLED="@comment " +PLIST.idled= yes .endif MAKE_ENV+= PERL=${PERL5:Q} diff --git a/mail/cyrus-imapd/PLIST b/mail/cyrus-imapd/PLIST index a78cb7e0748..df947b83f13 100644 --- a/mail/cyrus-imapd/PLIST +++ b/mail/cyrus-imapd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2007/12/22 21:15:06 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:03 jlam Exp $ bin/imtest bin/installsieve bin/lmtptest @@ -19,7 +19,7 @@ cyrus/bin/cyrdump cyrus/bin/deliver cyrus/bin/fetchnews cyrus/bin/fud -${IDLED}cyrus/bin/idled +${PLIST.idled}cyrus/bin/idled cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd @@ -36,9 +36,9 @@ cyrus/bin/notifyd cyrus/bin/pop3d cyrus/bin/pop3proxyd cyrus/bin/proxyd -${LDAP}cyrus/bin/ptdump -${LDAP}cyrus/bin/ptexpire -${LDAP}cyrus/bin/ptloader +${PLIST.ldap}cyrus/bin/ptdump +${PLIST.ldap}cyrus/bin/ptexpire +${PLIST.ldap}cyrus/bin/ptloader cyrus/bin/quota cyrus/bin/reconstruct cyrus/bin/rehash diff --git a/mail/dbmail/PLIST b/mail/dbmail/PLIST index 0ba83bae9f7..9ee77e11d8e 100644 --- a/mail/dbmail/PLIST +++ b/mail/dbmail/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.7 2007/12/13 07:43:20 obache Exp $ -${MYSQL}lib/dbmail/libmysql.la -${PGSQL}lib/dbmail/libpgsql.la -${SQLITE}lib/dbmail/libsqlite.la -${LDAP}lib/dbmail/libauth_ldap.la +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:03 jlam Exp $ +${PLIST.mysql}lib/dbmail/libmysql.la +${PLIST.pgsql}lib/dbmail/libpgsql.la +${PLIST.sqlite}lib/dbmail/libsqlite.la +${PLIST.ldap}lib/dbmail/libauth_ldap.la lib/dbmail/libauth_sql.la lib/dbmail/libdbmail.la -${SIEVE}lib/dbmail/libsort_sieve.la +${PLIST.sieve}lib/dbmail/libsort_sieve.la man/man1/dbmail-smtp.1 man/man1/dbmail.1 man/man5/dbmail.conf.5 @@ -21,9 +21,9 @@ sbin/dbmail-export sbin/dbmail-imapd sbin/dbmail-lmtpd sbin/dbmail-pop3d -${SIEVE}sbin/dbmail-sievecmd +${PLIST.sieve}sbin/dbmail-sievecmd sbin/dbmail-smtp -${SIEVE}sbin/dbmail-timsieved +${PLIST.sieve}sbin/dbmail-timsieved sbin/dbmail-users sbin/dbmail-util share/doc/dbmail/AUTHORS @@ -44,26 +44,26 @@ share/doc/dbmail/README.usermap share/doc/dbmail/THANKS share/doc/dbmail/UPGRADING share/examples/dbmail/dbmail.conf -${MYSQL}share/dbmail/sql/mysql/2_1_7-2_2_0.mysql -${MYSQL}share/dbmail/sql/mysql/create_tables.mysql -${MYSQL}share/dbmail/sql/mysql/migrate_from_1.x_to_2.0_innodb.mysql -${MYSQL}share/dbmail/sql/mysql/migrate_from_2.0_to_2.2.mysql -${MYSQL}share/dbmail/sql/mysql/update_headervalue_01.mysql -${PGSQL}share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql -${PGSQL}share/dbmail/sql/postgresql/create_tables.pgsql -${PGSQL}share/dbmail/sql/postgresql/migrate_from_1.x_to_2.0.pgsql -${PGSQL}share/dbmail/sql/postgresql/migrate_from_2.0_to_2.2.pgsql -${SQLITE}share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite -${SQLITE}share/dbmail/sql/sqlite/create_tables.sqlite +${PLIST.mysql}share/dbmail/sql/mysql/2_1_7-2_2_0.mysql +${PLIST.mysql}share/dbmail/sql/mysql/create_tables.mysql +${PLIST.mysql}share/dbmail/sql/mysql/migrate_from_1.x_to_2.0_innodb.mysql +${PLIST.mysql}share/dbmail/sql/mysql/migrate_from_2.0_to_2.2.mysql +${PLIST.mysql}share/dbmail/sql/mysql/update_headervalue_01.mysql +${PLIST.pgsql}share/dbmail/sql/postgresql/2_1_7-2_2_0.pgsql +${PLIST.pgsql}share/dbmail/sql/postgresql/create_tables.pgsql +${PLIST.pgsql}share/dbmail/sql/postgresql/migrate_from_1.x_to_2.0.pgsql +${PLIST.pgsql}share/dbmail/sql/postgresql/migrate_from_2.0_to_2.2.pgsql +${PLIST.sqlite}share/dbmail/sql/sqlite/2_1_7-2_2_0.sqlite +${PLIST.sqlite}share/dbmail/sql/sqlite/create_tables.sqlite share/examples/rc.d/dbmail share/examples/rc.d/dbmailimapd share/examples/rc.d/dbmaillmtpd share/examples/rc.d/dbmailpop3d -${SIEVE}share/examples/rc.d/dbmailtimsieved +${PLIST.sieve}share/examples/rc.d/dbmailtimsieved @dirrm share/examples/dbmail -${SQLITE}@dirrm share/dbmail/sql/sqlite -${PGSQL}@dirrm share/dbmail/sql/postgresql -${MYSQL}@dirrm share/dbmail/sql/mysql +${PLIST.sqlite}@dirrm share/dbmail/sql/sqlite +${PLIST.pgsql}@dirrm share/dbmail/sql/postgresql +${PLIST.mysql}@dirrm share/dbmail/sql/mysql @dirrm share/dbmail/sql @dirrm share/doc/dbmail @dirrm lib/dbmail diff --git a/mail/dbmail/options.mk b/mail/dbmail/options.mk index a71813ec64c..6b5b82c5e3c 100644 --- a/mail/dbmail/options.mk +++ b/mail/dbmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2007/12/13 07:43:20 obache Exp $ +# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:03 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dbmail PKG_SUPPORTED_OPTIONS= ldap sieve @@ -8,16 +8,16 @@ PKG_SUGGESTED_OPTIONS= mysql sieve .include "../../mk/bsd.options.mk" +PLIST_VARS+= ldap mysql pgsql sieve sqlite + ### ### MySQL database support ### .if !empty(PKG_OPTIONS:Mmysql) .include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --with-mysql -PLIST_SUBST+= MYSQL="" +PLIST.mysql= yes INSTALLATION_DIRS+= ${DATADIR}/sql/mysql -.else -PLIST_SUBST+= MYSQL="@comment " .endif ### @@ -26,10 +26,8 @@ PLIST_SUBST+= MYSQL="@comment " .if !empty(PKG_OPTIONS:Mpgsql) .include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-pgsql -PLIST_SUBST+= PGSQL="" +PLIST.pgsql= yes INSTALLATION_DIRS+= ${DATADIR}/sql/pgsql -.else -PLIST_SUBST+= PGSQL="@comment " .endif ### @@ -38,10 +36,8 @@ PLIST_SUBST+= PGSQL="@comment " .if !empty(PKG_OPTIONS:Msqlite) .include "../../databases/sqlite3/buildlink3.mk" CONFIGURE_ARGS+= --with-sqlite -PLIST_SUBST+= SQLITE="" +PLIST.sqlite= yes INSTALLATION_DIRS+= ${DATADIR}/sql/sqlite -.else -PLIST_SUBST+= SQLITE="@comment " .endif ### @@ -50,11 +46,10 @@ PLIST_SUBST+= SQLITE="@comment " .if !empty(PKG_OPTIONS:Msieve) .include "../../mail/libsieve/buildlink3.mk" CONFIGURE_ARGS+= --with-sieve=${BUILDLINK_PREFIX.libsieve} -PLIST_SUBST+= SIEVE="" +PLIST.sieve= yes FILES_SUBST+= TIMSIEVED="dbmailtimsieved" RCD_SCRIPTS+= dbmailtimsieved .else -PLIST_SUBST+= SIEVE="@comment " FILES_SUBST+= TIMSIEVED="" .endif @@ -64,9 +59,7 @@ FILES_SUBST+= TIMSIEVED="" .if !empty(PKG_OPTIONS:Mldap) .include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} -PLIST_SUBST+= LDAP="" -.else -PLIST_SUBST+= LDAP="@comment " +PLIST.ldap= yes .endif ### diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST index f7b49e9e50b..78449d05488 100644 --- a/mail/dkim-milter/PLIST +++ b/mail/dkim-milter/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.5 2008/04/06 12:59:11 adrianp Exp $ -${WITH_ARLIB}lib/libar.a -${WITH_ARLIB}man/man3/ar.3 +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:03 jlam Exp $ +${PLIST.arlib}lib/libar.a +${PLIST.arlib}man/man3/ar.3 lib/libdkim.a include/dkim.h libexec/dkim-filter diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk index 61eb4199b99..84656a84b56 100644 --- a/mail/dkim-milter/options.mk +++ b/mail/dkim-milter/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2008/03/09 14:02:08 adrianp Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:03 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dkim-milter PKG_SUPPORTED_OPTIONS= inet6 dkim-milter-arlib debug @@ -26,12 +26,12 @@ SUBST_SED.libs+= -e 's|@DEBUG@|dnl|g' ### ### Use asynchronous DNS resolver library shipping with dkim-milter. ### +PLIST_VARS+= arlib .if !empty(PKG_OPTIONS:Mdkim-milter-arlib) -PLIST_SUBST+= WITH_ARLIB='' +PLIST.arlib= yes SUBST_SED.libs+= -e 's|@RESOLVLIB@||g' SUBST_SED.libs+= -e 's|@ARLIB@||g' .else -PLIST_SUBST+= WITH_ARLIB='@comment ' SUBST_SED.libs+= -e 's|@RESOLVLIB@|resolv bind|g' SUBST_SED.libs+= -e 's|@ARLIB@|dnl|g' .endif diff --git a/mail/dspam/PLIST b/mail/dspam/PLIST index 83c07a760b9..aaeea874e0b 100644 --- a/mail/dspam/PLIST +++ b/mail/dspam/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.17 2007/05/07 09:29:54 adrianp Exp $ -${HASH}bin/cssstat -${HASH}bin/csscompress -${HASH}bin/cssclean -${HASH}bin/cssconvert +@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:03 jlam Exp $ +${PLIST.hash}bin/cssstat +${PLIST.hash}bin/csscompress +${PLIST.hash}bin/cssclean +${PLIST.hash}bin/cssconvert bin/dspam bin/dspam_2sql bin/dspam_admin @@ -14,7 +14,7 @@ bin/dspam_merge bin/dspam_stats bin/dspam_train bin/dspamc -${PGSQL}bin/dspam_pg2int8 +${PLIST.pgsql}bin/dspam_pg2int8 include/dspam/buffer.h include/dspam/config.h include/dspam/config_shared.h @@ -84,27 +84,27 @@ share/dspam/webui/cgi-bin/templates/nav_quarantine.html share/dspam/webui/cgi-bin/templates/nav_viewmessage.html share/dspam/webui/htdocs/base.css share/dspam/webui/htdocs/dspam-logo-small.gif -${MYSQL}share/dspam/mysql/mysql_objects-4.1.sql -${MYSQL}share/dspam/mysql/mysql_objects-space.sql -${MYSQL}share/dspam/mysql/mysql_objects-speed.sql -${MYSQL}share/dspam/mysql/purge.sql -${MYSQL}share/dspam/mysql/purge-4.1.sql -${MYSQL}share/dspam/mysql/virtual_users.sql -${MYSQL}share/dspam/mysql/virtual_user_aliases.sql -${PGSQL}share/dspam/pgsql/pgsql_objects.sql -${PGSQL}share/dspam/pgsql/purge.sql -${PGSQL}share/dspam/pgsql/virtual_users.sql -${SQLITE}share/dspam/sqlite/purge-2.sql -${SQLITE}share/dspam/sqlite/purge-3.sql +${PLIST.mysql}share/dspam/mysql/mysql_objects-4.1.sql +${PLIST.mysql}share/dspam/mysql/mysql_objects-space.sql +${PLIST.mysql}share/dspam/mysql/mysql_objects-speed.sql +${PLIST.mysql}share/dspam/mysql/purge.sql +${PLIST.mysql}share/dspam/mysql/purge-4.1.sql +${PLIST.mysql}share/dspam/mysql/virtual_users.sql +${PLIST.mysql}share/dspam/mysql/virtual_user_aliases.sql +${PLIST.pgsql}share/dspam/pgsql/pgsql_objects.sql +${PLIST.pgsql}share/dspam/pgsql/purge.sql +${PLIST.pgsql}share/dspam/pgsql/virtual_users.sql +${PLIST.sqlite}share/dspam/sqlite/purge-2.sql +${PLIST.sqlite}share/dspam/sqlite/purge-3.sql share/examples/dspam/cgi-admins share/examples/dspam/cgi-default.prefs share/examples/dspam/configure.pl share/examples/dspam/dspam.conf share/examples/rc.d/dspam @dirrm share/examples/dspam -${PGSQL}@dirrm share/dspam/pgsql -${MYSQL}@dirrm share/dspam/mysql -${SQLITE}@dirrm share/dspam/sqlite +${PLIST.pgsql}@dirrm share/dspam/pgsql +${PLIST.mysql}@dirrm share/dspam/mysql +${PLIST.sqlite}@dirrm share/dspam/sqlite @dirrm share/dspam/webui/htdocs @dirrm share/dspam/webui/cgi-bin/templates @dirrm share/dspam/webui/cgi-bin diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk index 5de07dd21bd..25cd67bf2fb 100644 --- a/mail/dspam/options.mk +++ b/mail/dspam/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.21 2007/06/22 13:14:22 adrianp Exp $ +# $NetBSD: options.mk,v 1.22 2008/04/12 22:43:03 jlam Exp $ .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom) DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS} @@ -38,6 +38,8 @@ CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} PKG_FAIL_REASON+= "${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}'" .endif +PLIST_VARS+= hash mysql pgsql sqlite + ### ### This is the backend database used to store the DSPAM signatures as ### well as other state information. The recommended storage driver is @@ -54,7 +56,7 @@ PKG_OPTIONS:= ${PKG_OPTIONS:Nldap} .endif .if !empty(DSPAM_STORAGE_DRIVER:Mhash) CONFIGURE_ARGS+= --with-storage-driver=hash_drv -HASH_PLIST_SUBST+= HASH= +PLIST.hash= yes .elif !empty(DSPAM_STORAGE_DRIVER:Mmysql) . include "../../mk/mysql.buildlink3.mk" CONFIGURE_ARGS+= --enable-mysql4-initialization @@ -62,22 +64,22 @@ CONFIGURE_ARGS+= --with-storage-driver=mysql_drv CONFIGURE_ARGS+= \ --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/mysql \ --with-mysql-libraries=${BUILDLINK_PREFIX.mysql-client}/lib -MYSQL_PLIST_SUBST= MYSQL= +PLIST.mysql= yes .elif !empty(DSPAM_STORAGE_DRIVER:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv CONFIGURE_ARGS+= \ --with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql \ --with-pgsql-libraries=${PGSQL_PREFIX}/lib -PGSQL_PLIST_SUBST= PGSQL= +PLIST.pgsql= yes .elif !empty(DSPAM_STORAGE_DRIVER:Msqlite) . include "../../databases/sqlite/buildlink3.mk" CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv -SQLITE_PLIST_SUBST= SQLITE= +PLIST.sqlite= yes .elif !empty(DSPAM_STORAGE_DRIVER:Msqlite3) . include "../../databases/sqlite3/buildlink3.mk" CONFIGURE_ARGS+= --with-storage-driver=sqlite3_drv -SQLITE_PLIST_SUBST+= SQLITE= +PLIST.sqlite= yes .else PKG_FAIL_REASON+= "${PKGBASE}: unknown storage driver \\'${DSPAM_STORAGE_DRIVER}\\'" .endif @@ -91,16 +93,6 @@ CONFIGURE_ARGS+= --enable-daemon . endif .endif -MYSQL_PLIST_SUBST?= MYSQL="@comment " -PGSQL_PLIST_SUBST?= PGSQL="@comment " -SQLITE_PLIST_SUBST?= SQLITE="@comment " -HASH_PLIST_SUBST?= HASH="@comment " - -PLIST_SUBST+= ${MYSQL_PLIST_SUBST} -PLIST_SUBST+= ${PGSQL_PLIST_SUBST} -PLIST_SUBST+= ${SQLITE_PLIST_SUBST} -PLIST_SUBST+= ${HASH_PLIST_SUBST} - ### ### The following are only available for mysql and pgsql backends. ### diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 2d9803d9b7f..07c6c7d8b48 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.128 2008/03/05 19:08:05 drochner Exp $ +# $NetBSD: Makefile,v 1.129 2008/04/12 22:43:03 jlam Exp $ DISTNAME= evolution-2.12.3 PKGREVISION= 2 @@ -67,9 +67,10 @@ CONFIGURE_ARGS+= --with-krb5 CONFIGURE_ARGS+= --without-krb5 .endif +PLIST_VARS+= smime .if !empty(PKG_OPTIONS:Mssl) CONFIGURE_ARGS+= --enable-nss=yes -PLIST_SUBST+= HAVE_SMIME= +PLIST.smime= yes PRINT_PLIST_AWK+= /smime/ { print "$${HAVE_SMIME}" $$0; next; } # XXX Workaround for the following problem: addressbook/util/libeabutil.la # is compiled as a static library only which uses the NSS stuff. When other @@ -89,7 +90,6 @@ post-wrapper: cd ${BUILDLINK_DIR}/lib/pkgconfig && ${LN} -s nss.pc mozilla-nss.pc .else CONFIGURE_ARGS+= --disable-nss -PLIST_SUBST+= HAVE_SMIME="@comment " .endif PKGCONFIG_OVERRIDE= evolution-plugin.pc.in diff --git a/mail/evolution/PLIST b/mail/evolution/PLIST index 196b44ae3d4..744c579325b 100644 --- a/mail/evolution/PLIST +++ b/mail/evolution/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.32 2007/11/03 21:55:00 drochner Exp $ +@comment $NetBSD: PLIST,v 1.33 2008/04/12 22:43:03 jlam Exp $ bin/evolution include/evolution-2.12/addressbook/gui/widgets/eab-config.h include/evolution-2.12/addressbook/gui/widgets/eab-menu.h @@ -226,7 +226,7 @@ lib/evolution/2.12/libecontactlisteditor.la lib/evolution/2.12/libefilterbar.la lib/evolution/2.12/libemiscwidgets.la lib/evolution/2.12/libeshell.la -${HAVE_SMIME}lib/evolution/2.12/libessmime.la +${PLIST.smime}lib/evolution/2.12/libessmime.la lib/evolution/2.12/libetable.la lib/evolution/2.12/libetext.la lib/evolution/2.12/libetimezonedialog.la @@ -237,7 +237,7 @@ lib/evolution/2.12/libevolution-addressbook-importers.la lib/evolution/2.12/libevolution-calendar-a11y.la lib/evolution/2.12/libevolution-calendar-importers.la lib/evolution/2.12/libevolution-mail-importers.la -${HAVE_SMIME}lib/evolution/2.12/libevolution-smime.la +${PLIST.smime}lib/evolution/2.12/libevolution-smime.la lib/evolution/2.12/libevolution-widgets-a11y.la lib/evolution/2.12/libfilter.la lib/evolution/2.12/libmenus.la @@ -431,7 +431,7 @@ share/evolution/2.12/glade/proxy-login-dialog.glade share/evolution/2.12/glade/publish-calendar.glade share/evolution/2.12/glade/recurrence-page.glade share/evolution/2.12/glade/schedule-page.glade -${HAVE_SMIME}share/evolution/2.12/glade/smime-ui.glade +${PLIST.smime}share/evolution/2.12/glade/smime-ui.glade share/evolution/2.12/glade/task-details-page.glade share/evolution/2.12/glade/task-page.glade share/evolution/2.12/help/quickref/C/quickref.pdf diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index bab2a55d31a..914be853834 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2008/02/22 01:16:58 gdt Exp $ +# $NetBSD: Makefile,v 1.67 2008/04/12 22:43:03 jlam Exp $ DISTNAME= mutt-1.5.17 PKGREVISION= 5 @@ -60,10 +60,9 @@ INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} # Define WRKSRC explicitly so we can use its value below. WRKSRC= ${WRKDIR}/${DISTNAME} +PLIST_VARS+= dotlock .if exists(${WRKSRC}/mutt_dotlock) -PLIST_SUBST+= MUTT_DOTLOCK= -.else -PLIST_SUBST+= MUTT_DOTLOCK="@comment " +PLIST.dotlock= yes .endif INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} diff --git a/mail/mutt-devel/PLIST b/mail/mutt-devel/PLIST index 8f36e1197c0..00a704af001 100644 --- a/mail/mutt-devel/PLIST +++ b/mail/mutt-devel/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.16 2007/11/07 21:19:36 tonio Exp $ +@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:03 jlam Exp $ bin/flea bin/mutt bin/muttbug -${MUTT_DOTLOCK}bin/mutt_dotlock +${PLIST.dotlock}bin/mutt_dotlock bin/pgpewrap bin/pgpring -${WITHSMIME}bin/smime_keys +${PLIST.smime}bin/smime_keys man/man1/flea.1 man/man1/mutt.1 man/man1/mutt_dotlock.1 diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk index 087992edcda..d78ba3a2fe0 100644 --- a/mail/mutt-devel/options.mk +++ b/mail/mutt-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.28 2008/03/08 14:28:32 joerg Exp $ +# $NetBSD: options.mk,v 1.29 2008/04/12 22:43:03 jlam Exp $ # Global and legacy options @@ -68,15 +68,15 @@ CONFIGURE_ARGS+= --without-ssl ### ### S/MIME ### +PLIST_VARS+= smime .if !empty(PKG_OPTIONS:Msmime) USE_TOOLS+= perl:run REPLACE_PERL+= *.pl */*.pl . include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --enable-smime -PLIST_SUBST+= WITHSMIME='' +PLIST.smime= yes .else CONFIGURE_ARGS+= --disable-smime -PLIST_SUBST+= WITHSMIME='@comment ' .endif ### diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 62eaa0252a1..317d2026372 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.155 2008/02/22 00:36:12 gdt Exp $ +# $NetBSD: Makefile,v 1.156 2008/04/12 22:43:04 jlam Exp $ DISTNAME= mutt-1.4.2.3 PKGREVISION= 2 @@ -86,10 +86,9 @@ FILES_SUBST+= DOCDIR=${DOCDIR:Q} INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} +PLIST_VARS+= dotlock .if exists(${WRKSRC}/mutt_dotlock) -PLIST_SUBST+= MUTT_DOTLOCK= -.else -PLIST_SUBST+= MUTT_DOTLOCK="@comment " +PLIST.dotlock= yes .endif INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} diff --git a/mail/mutt/PLIST b/mail/mutt/PLIST index 9ad5b1d4517..4cd31228a82 100644 --- a/mail/mutt/PLIST +++ b/mail/mutt/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.12 2006/06/20 09:14:46 tron Exp $ +@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:04 jlam Exp $ bin/flea bin/mutt bin/muttbug -${MUTT_DOTLOCK}bin/mutt_dotlock +${PLIST.dotlock}bin/mutt_dotlock bin/pgpewrap bin/pgpring man/man1/flea.1 diff --git a/mail/perdition/PLIST b/mail/perdition/PLIST index 3e65f2f2dc5..f4c60700aeb 100644 --- a/mail/perdition/PLIST +++ b/mail/perdition/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2006/03/04 16:06:29 tv Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:04 jlam Exp $ include/jain.h lib/libjain.la lib/libperditiondb_nis.la @@ -16,7 +16,7 @@ sbin/perdition.imap4s sbin/perdition.imaps sbin/perdition.pop3 sbin/perdition.pop3s -${PERDITION_HAVE_PAM}share/examples/pam.d/perdition +${PLIST.pam}share/examples/pam.d/perdition share/examples/perdition/Makefile share/examples/perdition/Makefile.popmap share/examples/perdition/perdition.conf diff --git a/mail/perdition/options.mk b/mail/perdition/options.mk index da5430a6472..676cbf6f2c5 100644 --- a/mail/perdition/options.mk +++ b/mail/perdition/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/03/02 12:05:32 grant Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:04 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.perdition PKG_SUPPORTED_OPTIONS= ssl pam @@ -6,16 +6,17 @@ PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" +PLIST_VARS+= pam + ### ### Build with PAM support. ### .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" -PLIST_SUBST+= PERDITION_HAVE_PAM= +PLIST.pam= yes .else # prevent recognition of PAM in the base system CONFIGURE_ENV+= ac_cv_header_security_pam_appl_h=no -PLIST_SUBST+= PERDITION_HAVE_PAM="@comment " .endif ### diff --git a/mail/postfix-current/PLIST b/mail/postfix-current/PLIST index a5b6051ca7c..ffd1b3be8eb 100644 --- a/mail/postfix-current/PLIST +++ b/mail/postfix-current/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2008/02/18 17:46:22 ghen Exp $ +@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:04 jlam Exp $ bin/mailq bin/newaliases libexec/postfix/anvil @@ -167,7 +167,7 @@ share/examples/postfix/master.cf share/examples/postfix/post-install share/examples/postfix/postfix-script share/examples/postfix/relocated -${SASL}share/examples/postfix/smtpd.conf +${PLIST.csasl}share/examples/postfix/smtpd.conf share/examples/postfix/transport share/examples/postfix/virtual share/examples/rc.d/postfix diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk index fa2e7e0f01f..33190db67d1 100644 --- a/mail/postfix-current/options.mk +++ b/mail/postfix-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.21 2008/02/04 13:07:54 ghen Exp $ +# $NetBSD: options.mk,v 1.22 2008/04/12 22:43:04 jlam Exp $ # Global and legacy options @@ -86,6 +86,7 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ ### Cyrus SASL support for SMTP authentication. ### (Dovecot SASL support is built in by default.) ### +PLIST_VARS+= csasl .if !empty(PKG_OPTIONS:Msasl) . include "../../security/cyrus-sasl/buildlink3.mk" BUILDLINK_INCDIRS.cyrus-sasl= include/sasl @@ -95,13 +96,12 @@ CCARGS+= -DUSE_CYRUS_SASL AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl2 -PLIST_SUBST+= SASL= +PLIST.csasl= yes MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} MAKE_DIRS+= ${SASLLIBDIR} CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf .else -PLIST_SUBST+= SASL="@comment " CCARGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" .endif diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST index 56bb5a406bc..5dcfaa313dc 100644 --- a/mail/postfix/PLIST +++ b/mail/postfix/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2008/02/18 17:45:34 ghen Exp $ +@comment $NetBSD: PLIST,v 1.20 2008/04/12 22:43:04 jlam Exp $ bin/mailq bin/newaliases libexec/postfix/anvil @@ -165,7 +165,7 @@ share/examples/postfix/post-install share/examples/postfix/postfix-files share/examples/postfix/postfix-script share/examples/postfix/relocated -${SASL}share/examples/postfix/smtpd.conf +${PLIST.csasl}share/examples/postfix/smtpd.conf share/examples/postfix/transport share/examples/postfix/virtual share/examples/rc.d/postfix diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk index 34a0f4bc7e6..367f82c080e 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.30 2008/02/18 17:45:34 ghen Exp $ +# $NetBSD: options.mk,v 1.31 2008/04/12 22:43:04 jlam Exp $ # Global and legacy options @@ -86,6 +86,7 @@ AUXLIBS+= -L${PGSQL_PREFIX}/lib -lpq \ ### Cyrus SASL support for SMTP authentication. ### (Dovecot SASL support is built in by default.) ### +PLIST_VARS+= csasl .if !empty(PKG_OPTIONS:Msasl) . include "../../security/cyrus-sasl/buildlink3.mk" BUILDLINK_INCDIRS.cyrus-sasl= include/sasl @@ -95,13 +96,12 @@ CCARGS+= -DUSE_CYRUS_SASL AUXLIBS+= -L${BUILDLINK_PREFIX.cyrus-sasl}/lib \ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \ -lsasl2 -PLIST_SUBST+= SASL= +PLIST.csasl= yes MESSAGE_SRC+= ${PKGDIR}/MESSAGE.sasl MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} MESSAGE_SUBST+= SASLLIBDIR=${SASLLIBDIR} MAKE_DIRS+= ${SASLLIBDIR} CONF_FILES+= ${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf .else -PLIST_SUBST+= SASL="@comment " CCARGS+= -DDEF_SERVER_SASL_TYPE=\"dovecot\" .endif diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST index 59b100365e9..2678f942a30 100644 --- a/mail/qmail/PLIST +++ b/mail/qmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2007/03/09 12:34:22 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:04 jlam Exp $ bin/bouncesaying bin/condredirect bin/datemail @@ -43,7 +43,7 @@ bin/qsmhook bin/sendmail bin/splogger bin/tcp-env -${QMAIL_TLS}bin/update_tmprsadh +${PLIST.tls}bin/update_tmprsadh man/cat1/bouncesaying.0 man/cat1/condredirect.0 man/cat1/except.0 @@ -164,7 +164,7 @@ share/doc/qmail/PIC.relaybad share/doc/qmail/PIC.relaygood share/doc/qmail/PIC.rem2local share/doc/qmail/README.pkgsrc -${QMAIL_QREGEX}share/doc/qmail/README.qregex +${PLIST.qregex}share/doc/qmail/README.qregex share/doc/qmail/REMOVE.binmail share/doc/qmail/REMOVE.sendmail share/doc/qmail/SENDMAIL${DARWINSUFX} diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index 83bf03d3e3d..4273854d95b 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.29 2008/03/20 03:30:32 schmonz Exp $ +# $NetBSD: options.mk,v 1.30 2008/04/12 22:43:04 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail PKG_OPTIONS_OPTIONAL_GROUPS= rcpt @@ -45,13 +45,13 @@ PATCHFILES+= ${OUTGOINGIP_PATCH} SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/ .endif -PLIST_SUBST+= QMAIL_QREGEX="@comment " +PLIST_VARS+= qregex .if !empty(PKG_OPTIONS:Mqmail-qregex) QREGEX_PATCH= qregex-20060423.patch PATCHFILES+= ${QREGEX_PATCH} SITES.${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/ PATCH_DIST_STRIP.${QREGEX_PATCH}= -p3 -PLIST_SUBST+= QMAIL_QREGEX="" +PLIST.qregex= yes .endif .if !empty(PKG_OPTIONS:Mqmail-realrcptto) @@ -61,7 +61,7 @@ SITES.${REALRCPTTO_PATCH}= http://code.dogmap.org/qmail/ PATCH_DIST_STRIP.${REALRCPTTO_PATCH}= -p1 .endif -PLIST_SUBST+= QMAIL_TLS="@comment " +PLIST_VARS+= tls .if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mtls) . if empty(PKG_OPTIONS:Msasl) PKG_OPTIONS+= sasl @@ -74,7 +74,7 @@ SITES.${TLSSASL_PATCH}= http://shupp.org/patches/ CFLAGS+= -DTLS=20060104 # NOTE: update according to the patch DJB_INSTALL_TARGETS= cert tmprsadh USE_TOOLS+= gmake -PLIST_SUBST+= QMAIL_TLS="" +PLIST.tls= yes . endif .endif diff --git a/mail/wl/PLIST b/mail/wl/PLIST index 82f39d0fbf8..91a5485f76b 100644 --- a/mail/wl/PLIST +++ b/mail/wl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2007/10/29 13:06:05 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:04 jlam Exp $ ${EMACS_INFOPREFIX}/wl-ja.info ${EMACS_INFOPREFIX}/wl.info ${EMACS_LISPPREFIX}/wl/acap.el @@ -55,8 +55,8 @@ ${EMACS_LISPPREFIX}/wl/elmo-pop3.el ${EMACS_LISPPREFIX}/wl/elmo-pop3.elc ${EMACS_LISPPREFIX}/wl/elmo-sendlog.el ${EMACS_LISPPREFIX}/wl/elmo-sendlog.elc -${FOR_emacs_w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.el -${FOR_emacs_w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc +${PLIST.emacs-w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.el +${PLIST.emacs-w3m}${EMACS_LISPPREFIX}/wl/elmo-shimbun.elc ${EMACS_LISPPREFIX}/wl/elmo-signal.el ${EMACS_LISPPREFIX}/wl/elmo-signal.elc ${EMACS_LISPPREFIX}/wl/elmo-spam.el @@ -203,7 +203,7 @@ ${FOR_emacs_x}share/wl/pipe.xpm ${FOR_emacs_x}share/wl/plugged.xpm ${FOR_emacs_x}share/wl/pop.xpm ${FOR_emacs_x}share/wl/queue.xpm -${FOR_emacs_x}${FOR_emacs_w3m}share/wl/shimbun.xpm +${FOR_emacs_x}${PLIST.emacs-w3m}share/wl/shimbun.xpm ${FOR_emacs_x}share/wl/trash-e.xpm ${FOR_emacs_x}share/wl/trash.xpm ${FOR_emacs_x}share/wl/unplugged.xpm diff --git a/mail/wl/options.mk b/mail/wl/options.mk index 62494bb8b07..a57c0f69fba 100644 --- a/mail/wl/options.mk +++ b/mail/wl/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2007/10/29 13:06:05 uebayasi Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:04 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wl PKG_SUPPORTED_OPTIONS= emacs-w3m @@ -6,9 +6,8 @@ PKG_SUGGESTED_OPTIONS= emacs-w3m .include "../../mk/bsd.options.mk" +PLIST_VARS+= emacs-w3m .if !empty(PKG_OPTIONS:Memacs-w3m) .include "../../www/emacs-w3m/buildlink3.mk" -PLIST_SUBST+= FOR_emacs_w3m="" -.else -PLIST_SUBST+= FOR_emacs_w3m="@comment " +PLIST.emacs-w3m= yes .endif diff --git a/math/maxima/PLIST b/math/maxima/PLIST index 9dca5c70f70..cc0685f1893 100644 --- a/math/maxima/PLIST +++ b/math/maxima/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.9 2008/01/28 12:08:49 reinoud Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:04 jlam Exp $ bin/maxima bin/rmaxima bin/xmaxima info/maxima-index.lisp info/maxima.info info/xmaxima.info -${clisp}lib/maxima/${PKGVERSION}/binary-clisp/lisp.run -${clisp}lib/maxima/${PKGVERSION}/binary-clisp/maxima.mem -${sbcl}lib/maxima/${PKGVERSION}/binary-sbcl/maxima.core +${PLIST.clisp}lib/maxima/${PKGVERSION}/binary-clisp/lisp.run +${PLIST.clisp}lib/maxima/${PKGVERSION}/binary-clisp/maxima.mem +${PLIST.sbcl}lib/maxima/${PKGVERSION}/binary-sbcl/maxima.core libexec/maxima/${PKGVERSION}/mgnuplot man/man1/maxima.1 share/maxima/${PKGVERSION}/demo/array.dem @@ -1646,7 +1646,7 @@ share/maxima/${PKGVERSION}/xmaxima/plotmaxima.html @dirrm share/maxima @dirrm libexec/maxima/${PKGVERSION} @dirrm libexec/maxima -${clisp}@dirrm lib/maxima/${PKGVERSION}/binary-clisp -${sbcl}@dirrm lib/maxima/${PKGVERSION}/binary-sbcl +${PLIST.clisp}@dirrm lib/maxima/${PKGVERSION}/binary-clisp +${PLIST.sbcl}@dirrm lib/maxima/${PKGVERSION}/binary-sbcl @dirrm lib/maxima/${PKGVERSION} @dirrm lib/maxima diff --git a/math/maxima/options.mk b/math/maxima/options.mk index 3484ea750fb..7c048090e31 100644 --- a/math/maxima/options.mk +++ b/math/maxima/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2008/01/28 12:08:49 reinoud Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:04 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.maxima PKG_OPTIONS_REQUIRED_GROUPS= lisp @@ -19,10 +19,9 @@ CONFIGURE_ARGS+= --enable-sbcl .endif # Modify PLIST -.for opt in clisp sbcl -.if !empty(PKG_OPTIONS:M${opt}) -PLIST_SUBST+= ${opt}="" -.else -PLIST_SUBST+= ${opt}="@comment " -.endif +PLIST_VARS+= ${PKG_OPTIONS_GROUP.lisp} +.for opt in ${PKG_OPTIONS_GROUP.lisp} +. if !empty(PKG_OPTIONS:M${opt}) +PLIST.${opt}= yes +. endif .endfor diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile index 95f47d67e4b..19a97449faf 100644 --- a/math/py-Numeric/Makefile +++ b/math/py-Numeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2007/08/24 08:58:28 heinz Exp $ +# $NetBSD: Makefile,v 1.44 2008/04/12 22:43:04 jlam Exp $ DISTNAME= Numeric-24.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,11 +16,10 @@ PYTHON_VERSIONS_ACCEPTED= 24 23 22 PYBINMODULE= yes PYSETUP= setup.py +PLIST_VARS+= blas .if exists(/System/Library/Frameworks/vecLib.framework) BUILDLINK_PASSTHRU_DIRS+= /System/Library/Frameworks/vecLib.framework/Headers -PLIST_SUBST+= DOTBLAS="" -.else -PLIST_SUBST+= DOTBLAS="@comment " +PLIST.blas= yes .endif .include "../../lang/python/extension.mk" diff --git a/math/py-Numeric/PLIST b/math/py-Numeric/PLIST index 284e4f08dae..4082090638c 100644 --- a/math/py-Numeric/PLIST +++ b/math/py-Numeric/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2006/03/01 19:15:07 minskim Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:04 jlam Exp $ ${PYINC}/Numeric/arrayobject.h ${PYINC}/Numeric/f2c.h ${PYINC}/Numeric/ranlib.h @@ -54,12 +54,12 @@ ${PYSITELIB}/Numeric/RandomArray.pyo ${PYSITELIB}/Numeric/UserArray.py ${PYSITELIB}/Numeric/UserArray.pyc ${PYSITELIB}/Numeric/UserArray.pyo -${DOTBLAS}${PYSITELIB}/Numeric/_dotblas.so +${PLIST.blas}${PYSITELIB}/Numeric/_dotblas.so ${PYSITELIB}/Numeric/_numpy.so ${PYSITELIB}/Numeric/arrayfns.so -${DOTBLAS}${PYSITELIB}/Numeric/dotblas/__init__.py -${DOTBLAS}${PYSITELIB}/Numeric/dotblas/__init__.pyc -${DOTBLAS}${PYSITELIB}/Numeric/dotblas/__init__.pyo +${PLIST.blas}${PYSITELIB}/Numeric/dotblas/__init__.py +${PLIST.blas}${PYSITELIB}/Numeric/dotblas/__init__.pyc +${PLIST.blas}${PYSITELIB}/Numeric/dotblas/__init__.pyo ${PYSITELIB}/Numeric/lapack_lite.so ${PYSITELIB}/Numeric/multiarray.so ${PYSITELIB}/Numeric/numeric_version.py @@ -67,7 +67,7 @@ ${PYSITELIB}/Numeric/numeric_version.pyc ${PYSITELIB}/Numeric/numeric_version.pyo ${PYSITELIB}/Numeric/ranlib.so ${PYSITELIB}/Numeric/umath.so -${DOTBLAS}@dirrm ${PYSITELIB}/Numeric/dotblas +${PLIST.blas}@dirrm ${PYSITELIB}/Numeric/dotblas @dirrm ${PYSITELIB}/Numeric/RNG @dirrm ${PYSITELIB}/Numeric/Numeric_headers @dirrm ${PYSITELIB}/Numeric/MA diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile index c7b5a5f8c77..58f8b704bce 100644 --- a/math/py-numarray/Makefile +++ b/math/py-numarray/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/10/17 14:25:43 drochner Exp $ +# $NetBSD: Makefile,v 1.13 2008/04/12 22:43:04 jlam Exp $ # DISTNAME= numarray-1.5.2 @@ -13,11 +13,10 @@ COMMENT= Array manipulation PYDISTUTILSPKG= yes PYTHON_VERSIONS_ACCEPTED= 24 23 22 +PLIST_VARS+= blas .if exists(/System/Library/Frameworks/vecLib.framework/Headers) BUILDLINK_PASSTHRU_DIRS+= /System/Library/Frameworks/vecLib.framework/Headers -PLIST_SUBST+= DOTBLAS="" -.else -PLIST_SUBST+= DOTBLAS="@comment " +PLIST.blas= yes .endif do-test: diff --git a/math/py-numarray/PLIST b/math/py-numarray/PLIST index fee92efb2a6..2623f8d61a4 100644 --- a/math/py-numarray/PLIST +++ b/math/py-numarray/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2006/03/08 17:21:34 minskim Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:43:04 jlam Exp $ ${PYINC}/numarray/arraybase.h ${PYINC}/numarray/arrayif.h ${PYINC}/numarray/arrayobject.h @@ -20,7 +20,7 @@ ${PYSITELIB}/numarray/_bytes.so ${PYSITELIB}/numarray/_chararray.so ${PYSITELIB}/numarray/_conv.so ${PYSITELIB}/numarray/_converter.so -${DOTBLAS}${PYSITELIB}/numarray/_dotblas.so +${PLIST.blas}${PYSITELIB}/numarray/_dotblas.so ${PYSITELIB}/numarray/_ndarray.so ${PYSITELIB}/numarray/_numarray.so ${PYSITELIB}/numarray/_numerictype.so 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 diff --git a/multimedia/gstreamer0.10/Makefile b/multimedia/gstreamer0.10/Makefile index be75da55557..8f142b5a7c2 100644 --- a/multimedia/gstreamer0.10/Makefile +++ b/multimedia/gstreamer0.10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2008/04/10 11:54:40 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2008/04/12 22:43:07 jlam Exp $ # DISTNAME= gstreamer-0.10.19 @@ -47,12 +47,11 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.gstreamer PKG_SUPPORTED_OPTIONS= gstcheck .include "../../mk/bsd.options.mk" +PLIST_VARS+= gstcheck .if !empty(PKG_OPTIONS:Mgstcheck) .include "../../devel/check/buildlink3.mk" -PLIST_SUBST+= GSTCHECK="" +PLIST.gstcheck= yes TEST_TARGET= check-torture -.else -PLIST_SUBST+= GSTCHECK="@comment " .endif .include "../../devel/glib2/buildlink3.mk" diff --git a/multimedia/gstreamer0.10/PLIST b/multimedia/gstreamer0.10/PLIST index 840fab76d21..fd1cd54f1ff 100644 --- a/multimedia/gstreamer0.10/PLIST +++ b/multimedia/gstreamer0.10/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2008/04/10 11:54:40 drochner Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:07 jlam Exp $ bin/gst-feedback-0.10 bin/gst-inspect-0.10 bin/gst-launch-0.10 @@ -13,8 +13,8 @@ include/gstreamer-0.10/gst/base/gstcollectpads.h include/gstreamer-0.10/gst/base/gstdataqueue.h include/gstreamer-0.10/gst/base/gstpushsrc.h include/gstreamer-0.10/gst/base/gsttypefindhelper.h -${GSTCHECK}include/gstreamer-0.10/gst/check/gstbufferstraw.h -${GSTCHECK}include/gstreamer-0.10/gst/check/gstcheck.h +${PLIST.gstcheck}include/gstreamer-0.10/gst/check/gstbufferstraw.h +${PLIST.gstcheck}include/gstreamer-0.10/gst/check/gstcheck.h include/gstreamer-0.10/gst/controller/gstcontroller.h include/gstreamer-0.10/gst/controller/gstcontrolsource.h include/gstreamer-0.10/gst/controller/gstinterpolationcontrolsource.h @@ -80,14 +80,14 @@ include/gstreamer-0.10/gst/net/gstnettimeprovider.h lib/gstreamer-0.10/libgstcoreelements.la lib/gstreamer-0.10/libgstcoreindexers.la lib/libgstbase-0.10.la -${GSTCHECK}lib/libgstcheck-0.10.la +${PLIST.gstcheck}lib/libgstcheck-0.10.la lib/libgstcontroller-0.10.la lib/libgstdataprotocol-0.10.la lib/libgstnet-0.10.la lib/libgstreamer-0.10.la lib/pkgconfig/gstreamer-0.10.pc lib/pkgconfig/gstreamer-base-0.10.pc -${GSTCHECK}lib/pkgconfig/gstreamer-check-0.10.pc +${PLIST.gstcheck}lib/pkgconfig/gstreamer-check-0.10.pc lib/pkgconfig/gstreamer-controller-0.10.pc lib/pkgconfig/gstreamer-dataprotocol-0.10.pc lib/pkgconfig/gstreamer-net-0.10.pc @@ -246,7 +246,7 @@ share/locale/zh_TW/LC_MESSAGES/gstreamer-0.10.mo @dirrm include/gstreamer-0.10/gst/net @dirrm include/gstreamer-0.10/gst/dataprotocol @dirrm include/gstreamer-0.10/gst/controller -${GSTCHECK}@dirrm include/gstreamer-0.10/gst/check +${PLIST.gstcheck}@dirrm include/gstreamer-0.10/gst/check @dirrm include/gstreamer-0.10/gst/base @dirrm include/gstreamer-0.10/gst @dirrm include/gstreamer-0.10 diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile index c1a9f1b7fcd..9d232bfe367 100644 --- a/multimedia/mpeg4ip/Makefile +++ b/multimedia/mpeg4ip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/08/09 20:02:36 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2008/04/12 22:43:07 jlam Exp $ DISTNAME= mpeg4ip-1.5.0.1 CATEGORIES= multimedia @@ -19,10 +19,9 @@ OVERRIDE_DIRDEPTH= 3 # */*/*/libtool .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" -PLIST_SUBST+= MPEG4IPSDL="@comment " -.else -PLIST_SUBST+= MPEG4IPSDL= +PLIST_VARS+= mpeg4ipSDL +.if ${OPSYS} != "Darwin" +PLIST.mpeg4ipSDL= yes .endif .include "../../devel/SDL/buildlink3.mk" diff --git a/multimedia/mpeg4ip/PLIST b/multimedia/mpeg4ip/PLIST index cef5c7367b0..3be09002e9d 100644 --- a/multimedia/mpeg4ip/PLIST +++ b/multimedia/mpeg4ip/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2007/01/05 19:35:46 rillig Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:07 jlam Exp $ bin/avi2raw bin/avidump bin/h264_parse @@ -54,7 +54,7 @@ lib/libmp4.la lib/libmp4av.la lib/libmp4util.la lib/libmp4v2.la -${MPEG4IPSDL}lib/libmpeg4ipSDL.la +${PLIST.mpeg4ipSDL}lib/libmpeg4ipSDL.la lib/libmpeg4ip_celp.la lib/libmpeg4ip_celpbs.la lib/libmpeg4ip_faad.la diff --git a/multimedia/smpeg/PLIST b/multimedia/smpeg/PLIST index 588184d07a0..c78da85f8be 100644 --- a/multimedia/smpeg/PLIST +++ b/multimedia/smpeg/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.3 2005/09/04 05:20:05 xtraeme Exp $ -${OPENGL_PLAYER}bin/glmovie -${GTK_PLAYER}bin/gtv +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:07 jlam Exp $ +${PLIST.opengl}bin/glmovie +${PLIST.gtk}bin/gtv bin/plaympeg bin/smpeg-config include/smpeg/MPEG.h @@ -15,7 +15,7 @@ include/smpeg/MPEGsystem.h include/smpeg/MPEGvideo.h include/smpeg/smpeg.h lib/libsmpeg.la -${GTK_PLAYER}man/man1/gtv.1 +${PLIST.gtk}man/man1/gtv.1 man/man1/plaympeg.1 share/aclocal/smpeg.m4 @dirrm include/smpeg diff --git a/multimedia/smpeg/options.mk b/multimedia/smpeg/options.mk index 0809af00571..68bd85bb2e5 100644 --- a/multimedia/smpeg/options.mk +++ b/multimedia/smpeg/options.mk @@ -1,24 +1,24 @@ -# $NetBSD: options.mk,v 1.2 2005/11/04 17:22:08 rillig Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:07 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.smpeg PKG_SUPPORTED_OPTIONS= gtk-player opengl-player .include "../../mk/bsd.options.mk" +PLIST_VARS+= gtk opengl + .if !empty(PKG_OPTIONS:Mgtk-player) -PLIST_SUBST+= GTK_PLAYER= +PLIST.gtk= yes CONFIGURE_ARGS+= --enable-gtk-player . include "../../x11/gtk/buildlink3.mk" .else -PLIST_SUBST+= GTK_PLAYER="@comment " CONFIGURE_ARGS+= --disable-gtk-player --disable-gtk-test .endif .if !empty(PKG_OPTIONS:Mopengl-player) -PLIST_SUBST+= OPENGL_PLAYER= +PLIST.opengl= yes CONFIGURE_ARGS+= --enable-opengl-player . include "../../graphics/glu/buildlink3.mk" .else -PLIST_SUBST+= OPENGL_PLAYER="@comment " CONFIGURE_ARGS+= --disable-opengl-player .endif diff --git a/multimedia/transcode/PLIST b/multimedia/transcode/PLIST index eeaae51f7e5..4746aa43ba2 100644 --- a/multimedia/transcode/PLIST +++ b/multimedia/transcode/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2008/02/20 12:06:16 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:08 jlam Exp $ bin/avifix bin/aviindex bin/avimerge @@ -16,7 +16,7 @@ bin/tcscan bin/tcxmlcheck bin/tcxpm2rgb bin/transcode -${A52}lib/transcode/a52_decore.la +${PLIST.a52}lib/transcode/a52_decore.la lib/transcode/af6_decore.la lib/transcode/export_ac3.la lib/transcode/export_af6.conf @@ -25,17 +25,17 @@ lib/transcode/export_divx4.la lib/transcode/export_divx4raw.la lib/transcode/export_divx5.la lib/transcode/export_divx5raw.la -${DV}lib/transcode/export_dv.la -${DV}lib/transcode/export_dvraw.la +${PLIST.dv}lib/transcode/export_dv.la +${PLIST.dv}lib/transcode/export_dvraw.la lib/transcode/export_ffmpeg.la -${IMAGEMAGICK}lib/transcode/export_im.la +${PLIST.imagemagick}lib/transcode/export_im.la lib/transcode/export_jpg.la lib/transcode/export_lame.la lib/transcode/export_mjpeg.la lib/transcode/export_mp1e.la lib/transcode/export_mp2.la -${MJPEGTOOLS}lib/transcode/export_mp2enc.la -${MJPEGTOOLS}lib/transcode/export_mpeg2enc.la +${PLIST.mjpegtools}lib/transcode/export_mp2enc.la +${PLIST.mjpegtools}lib/transcode/export_mpeg2enc.la lib/transcode/export_null.la lib/transcode/export_ogg.la lib/transcode/export_pcm.la @@ -48,7 +48,7 @@ lib/transcode/export_xvid.so lib/transcode/export_xvid2.la lib/transcode/export_xvid3.la lib/transcode/export_xvid4.la -${MJPEGTOOLS}lib/transcode/export_yuv4mpeg.la +${PLIST.mjpegtools}lib/transcode/export_yuv4mpeg.la lib/transcode/filter_29to23.la lib/transcode/filter_32detect.la lib/transcode/filter_32drop.la @@ -56,7 +56,7 @@ lib/transcode/filter_aclip.la lib/transcode/filter_ascii.la lib/transcode/filter_astat.la lib/transcode/filter_clone.la -${IMAGEMAGICK}lib/transcode/filter_compare.la +${PLIST.imagemagick}lib/transcode/filter_compare.la lib/transcode/filter_control.la lib/transcode/filter_cpaudio.la lib/transcode/filter_cshift.la @@ -80,8 +80,8 @@ lib/transcode/filter_invert.la lib/transcode/filter_ivtc.la lib/transcode/filter_levels.la lib/transcode/filter_list.awk -${IMAGEMAGICK}lib/transcode/filter_logo.la -${IMAGEMAGICK}lib/transcode/filter_logoaway.la +${PLIST.imagemagick}lib/transcode/filter_logo.la +${PLIST.imagemagick}lib/transcode/filter_logoaway.la lib/transcode/filter_lowpass.la lib/transcode/filter_mask.la lib/transcode/filter_modfps.la @@ -89,7 +89,7 @@ lib/transcode/filter_msharpen.la lib/transcode/filter_nored.la lib/transcode/filter_normalize.la lib/transcode/filter_null.la -${DV}lib/transcode/filter_preview.la +${PLIST.dv}lib/transcode/filter_preview.la lib/transcode/filter_pp.la lib/transcode/filter_pv.la lib/transcode/filter_resample.la @@ -99,12 +99,12 @@ lib/transcode/filter_smartbob.la lib/transcode/filter_smartdeinter.la lib/transcode/filter_smartyuv.la lib/transcode/filter_smooth.la -${MPEG3}lib/transcode/filter_subtitler.la +${PLIST.mpeg3}lib/transcode/filter_subtitler.la lib/transcode/filter_tc_audio.la lib/transcode/filter_tc_video.la lib/transcode/filter_test.la lib/transcode/filter_testframe.la -${FREETYPE2}lib/transcode/filter_text.la +${PLIST.freetype2}lib/transcode/filter_text.la lib/transcode/filter_tomsmocomp.la lib/transcode/filter_unsharp.la lib/transcode/filter_videocore.la @@ -122,12 +122,12 @@ lib/transcode/import_dvd.la lib/transcode/import_ffbin.la lib/transcode/import_ffmpeg.la lib/transcode/import_fraps.la -${IMAGEMAGICK}lib/transcode/import_im.la -${IMAGEMAGICK}lib/transcode/import_imlist.la +${PLIST.imagemagick}lib/transcode/import_im.la +${PLIST.imagemagick}lib/transcode/import_imlist.la lib/transcode/import_lav.la lib/transcode/import_mp3.la lib/transcode/import_mpeg2.la -${MPEG3}lib/transcode/import_mpeg3.la +${PLIST.mpeg3}lib/transcode/import_mpeg3.la lib/transcode/import_mplayer.la lib/transcode/import_null.la lib/transcode/import_nuv.la diff --git a/multimedia/transcode/options.mk b/multimedia/transcode/options.mk index be27e70d6e7..9f812c48cc6 100644 --- a/multimedia/transcode/options.mk +++ b/multimedia/transcode/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2008/02/20 12:14:53 xtraeme Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:08 jlam Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.transcode @@ -10,78 +10,72 @@ PKG_SUGGESTED_OPTIONS+= imagemagick .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Ma52) . include "../../audio/liba52/buildlink3.mk" CONFIGURE_ARGS+= --enable-a52 CONFIGURE_ARGS+= --enable-a52-default-decoder -PLIST_SUBST+= A52= +PLIST.a52= yes .else -PLIST_SUBST+= A52='@comment ' CONFIGURE_ARGS+= --disable-a52 .endif .if !empty(PKG_OPTIONS:Mfreetype2) . include "../../graphics/freetype2/buildlink3.mk" CONFIGURE_ARGS+= --enable-freetype2 -PLIST_SUBST+= FREETYPE2= +PLIST.freetype2= yes .else -PLIST_SUBST+= FREETYPE2='@comment ' CONFIGURE_ARGS+= --disable-freetype2 .endif .if !empty(PKG_OPTIONS:Mmjpegtools) . include "../../multimedia/mjpegtools/buildlink3.mk" -PLIST_SUBST+= MJPEGTOOLS= +PLIST.mjpegtools= yes CONFIGURE_ARGS+= --enable-mjpegtools .else -PLIST_SUBST+= MJPEGTOOLS='@comment ' CONFIGURE_ARGS+= --disable-mjpegtools .endif .if !empty(PKG_OPTIONS:Mmpeg3) BUILDLINK_API_DEPENDS.libmpeg3+= libmpeg3>=1.7 -PLIST_SUBST+= MPEG3= . include "../../multimedia/libmpeg3/buildlink3.mk" +PLIST.mpeg3= yes CONFIGURE_ARGS+= --with-libmpeg3-prefix=${BUILDLINK_PREFIX.libmpeg3} CONFIGURE_ARGS+= --enable-libmpeg3 .else -PLIST_SUBST+= MPEG3='@comment ' CONFIGURE_ARGS+= --disable-libmpeg3 .endif .if !empty(PKG_OPTIONS:Mlzo) -PLIST_SUBST+= LZO= . include "../../archivers/lzo/buildlink3.mk" +PLIST.lzo= yes CONFIGURE_ARGS+= --enable-lzo CONFIGURE_ARGS+= --with-lzo-prefix=${BUILDLINK_PREFIX.lzo} .else -PLIST_SUBST+= LZO='@comment ' CONFIGURE_ARGS+= --disable-lzo .endif .if !empty(PKG_OPTIONS:Mlibxml2) -PLIST_SUBST+= LIBXML2= . include "../../textproc/libxml2/buildlink3.mk" +PLIST.libxml2= yes CONFIGURE_ARGS+= --enable-libxml2 .else -PLIST_SUBST+= LIBXML2='@comment ' CONFIGURE_ARGS+= --disable-libxml2 .endif .if !empty(PKG_OPTIONS:Mdv) -PLIST_SUBST+= DV= . include "../../multimedia/libdv/buildlink3.mk" +PLIST.dv= yes CONFIGURE_ARGS+= --enable-libdv .else -PLIST_SUBST+= DV='@comment ' CONFIGURE_ARGS+= --disable-libdv .endif .if !empty(PKG_OPTIONS:Mimagemagick) -PLIST_SUBST+= IMAGEMAGICK= . include "../../graphics/ImageMagick/buildlink3.mk" +PLIST.imagemagick= yes CONFIGURE_ARGS+= --enable-imagemagick .else -PLIST_SUBST+= IMAGEMAGICK='@comment ' CONFIGURE_ARGS+= --disable-imagemagick .endif diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index f6eeb6da2b9..f202280c62c 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2008/03/26 02:32:17 tnn Exp $ +# $NetBSD: Makefile,v 1.51 2008/04/12 22:43:08 jlam Exp $ # DISTNAME= vlc-${VLC_VER} @@ -84,12 +84,10 @@ SUBST_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT}," SUBST_FILES.fnt= modules/misc/freetype.c SUBST_MESSAGE.fnt= Fixing hardcoded paths. -.if ${OPSYS} == "NetBSD" -PLIST_SUBST+= COND_CDDA="@comment " -PLIST_SUBST+= COND_VCD="@comment " -.else -PLIST_SUBST+= COND_CDDA="" -PLIST_SUBST+= COND_VCD="" +PLIST_VARS+= cdda vcd +.if ${OPSYS} != "NetBSD" +PLIST.cdda= yes +PLIST.vcd= yes .endif .if ${X11_TYPE} == "modular" diff --git a/multimedia/vlc/PLIST b/multimedia/vlc/PLIST index 75065aef97a..3f7c7d47d11 100644 --- a/multimedia/vlc/PLIST +++ b/multimedia/vlc/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.11 2008/03/08 05:19:57 kefren Exp $ -${COND_SKINS}bin/svlc +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:08 jlam Exp $ +${PLIST.skins}bin/svlc bin/vlc bin/vlc-config -${COND_WXWIDGETS}bin/wxvlc +${PLIST.wxwidgets}bin/wxvlc include/vlc/aout.h include/vlc/decoder.h include/vlc/input.h @@ -22,12 +22,12 @@ lib/vlc/access/libaccess_http_plugin.so lib/vlc/access/libaccess_mms_plugin.so lib/vlc/access/libaccess_tcp_plugin.so lib/vlc/access/libaccess_udp_plugin.so -${COND_CDDA}lib/vlc/access/libcddax_plugin.so +${PLIST.cdda}lib/vlc/access/libcddax_plugin.so lib/vlc/access/libcddax_plugin.so lib/vlc/access/libdvdnav_plugin.so lib/vlc/access/libdvdread_plugin.so lib/vlc/access/libscreen_plugin.so -${COND_VCD}lib/vlc/access/libvcd_plugin.so +${PLIST.vcd}lib/vlc/access/libvcd_plugin.so lib/vlc/access_filter/libaccess_filter_dump_plugin.so lib/vlc/access_filter/libaccess_filter_record_plugin.so lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so @@ -68,7 +68,7 @@ lib/vlc/audio_mixer/libspdif_mixer_plugin.so lib/vlc/audio_mixer/libtrivial_mixer_plugin.so lib/vlc/audio_output/libaout_file_plugin.so lib/vlc/audio_output/libaout_sdl_plugin.so -${COND_ARTS}lib/vlc/audio_output/libarts_plugin.so +${PLIST.arts}lib/vlc/audio_output/libarts_plugin.so lib/vlc/audio_output/liboss_plugin.so lib/vlc/codec/liba52_plugin.so lib/vlc/codec/libadpcm_plugin.so @@ -78,7 +78,7 @@ lib/vlc/codec/libcmml_plugin.so lib/vlc/codec/libcvdsub_plugin.so lib/vlc/codec/libdts_plugin.so lib/vlc/codec/libdvbsub_plugin.so -${COND_FAAD}lib/vlc/codec/libfaad_plugin.so +${PLIST.faad}lib/vlc/codec/libfaad_plugin.so lib/vlc/codec/libfake_plugin.so lib/vlc/codec/libflacdec_plugin.so lib/vlc/codec/liblibmpeg2_plugin.so @@ -135,8 +135,8 @@ lib/vlc/demux/libvobsub_plugin.so lib/vlc/demux/libvoc_plugin.so lib/vlc/demux/libwav_plugin.so lib/vlc/demux/libxa_plugin.so -${COND_SKINS}lib/vlc/gui/libskins2_plugin.so -${COND_WXWIDGETS}lib/vlc/gui/libwxwidgets_plugin.so +${PLIST.skins}lib/vlc/gui/libskins2_plugin.so +${PLIST.wxwidgets}lib/vlc/gui/libwxwidgets_plugin.so lib/vlc/libffmpeg.a lib/vlc/libi420_rgb_mmx.a lib/vlc/libi420_ymga_mmx.a diff --git a/multimedia/vlc/options.mk b/multimedia/vlc/options.mk index 6db553ab3ce..a83b5275cf7 100644 --- a/multimedia/vlc/options.mk +++ b/multimedia/vlc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2008/03/08 05:19:57 kefren Exp $ +# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:08 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vlc PKG_SUPPORTED_OPTIONS= skins wxwidgets faad arts @@ -6,37 +6,35 @@ PKG_SUGGESTED_OPTIONS= wxwidgets faad .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Mskins) CONFIGURE_ARGS+= --enable-skins2 -PLIST_SUBST+= COND_SKINS= +PLIST.skins= yes .else CONFIGURE_ARGS+= --disable-skins2 -PLIST_SUBST+= COND_SKINS="@comment " .endif .if !empty(PKG_OPTIONS:Mwxwidgets) .include "../../x11/wxGTK/buildlink3.mk" CONFIGURE_ARGS+= --enable-wxwidgets -PLIST_SUBST+= COND_WXWIDGETS= +PLIST.wxwidgets= yes .else CONFIGURE_ARGS+= --disable-wxwidgets -PLIST_SUBST+= COND_WXWIDGETS="@comment " .endif .if !empty(PKG_OPTIONS:Mfaad) CONFIGURE_ARGS+= --enable-faad -PLIST_SUBST+= COND_FAAD= +PLIST.faad= yes .include "../../audio/faad2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-faad -PLIST_SUBST+= COND_FAAD="@comment " .endif .if !empty(PKG_OPTIONS:Marts) CONFIGURE_ARGS+= --enable-arts -PLIST_SUBST+= COND_ARTS= +PLIST.arts= yes .include "../../audio/arts/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-arts -PLIST_SUBST+= COND_ARTS="@comment " .endif diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 02af9d18c5e..98ad3575c4b 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.47 2008/04/10 11:48:58 drochner Exp $ +# $NetBSD: Makefile.common,v 1.48 2008/04/12 22:43:08 jlam Exp $ # # used by audio/xine-arts/Makefile @@ -36,12 +36,11 @@ PKGSRC_MAKE_ENV+= "mkdir_p"="mkdir -p" .include "../../mk/bsd.prefs.mk" -.if ${X11_TYPE} == "native" && !exists(${X11BASE}/lib/libXv.so) -PLIST_SUBST+= HAVE_XV="@comment " -.else -.include "../../x11/libXv/buildlink3.mk" +PLIST_VARS+= xv +.if ${X11_TYPE} != "native" +. include "../../x11/libXv/buildlink3.mk" CONFIGURE_ARGS+= --with-xv-path='${X11BASE}/lib' -PLIST_SUBST+= HAVE_XV= +PLIST.xv= yes .endif pre-configure: diff --git a/multimedia/xine-lib/PLIST.common b/multimedia/xine-lib/PLIST.common index 4f1d7566f2d..f579d6d5b35 100644 --- a/multimedia/xine-lib/PLIST.common +++ b/multimedia/xine-lib/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.23 2008/04/10 11:48:58 drochner Exp $ +@comment $NetBSD: PLIST.common,v 1.24 2008/04/12 22:43:08 jlam Exp $ bin/xine-config include/xine.h include/xine/alphablend.h @@ -51,8 +51,8 @@ lib/xine/plugins/1.20/post/xineplug_post_planar.a lib/xine/plugins/1.20/post/xineplug_post_planar.so lib/xine/plugins/1.20/post/xineplug_post_switch.a lib/xine/plugins/1.20/post/xineplug_post_switch.so -${HAVE_XV}lib/xine/plugins/1.20/post/xineplug_post_tvtime.a -${HAVE_XV}lib/xine/plugins/1.20/post/xineplug_post_tvtime.so +${PLIST.xv}lib/xine/plugins/1.20/post/xineplug_post_tvtime.a +${PLIST.xv}lib/xine/plugins/1.20/post/xineplug_post_tvtime.so lib/xine/plugins/1.20/post/xineplug_post_visualizations.a lib/xine/plugins/1.20/post/xineplug_post_visualizations.so lib/xine/plugins/1.20/xineplug_ao_out_file.a @@ -193,8 +193,8 @@ lib/xine/plugins/1.20/xineplug_vo_out_none.so @comment lib/xine/plugins/1.20/xineplug_vo_out_sdl.so lib/xine/plugins/1.20/xineplug_vo_out_xshm.a lib/xine/plugins/1.20/xineplug_vo_out_xshm.so -${HAVE_XV}lib/xine/plugins/1.20/xineplug_vo_out_xv.a -${HAVE_XV}lib/xine/plugins/1.20/xineplug_vo_out_xv.so +${PLIST.xv}lib/xine/plugins/1.20/xineplug_vo_out_xv.a +${PLIST.xv}lib/xine/plugins/1.20/xineplug_vo_out_xv.so man/man1/xine-config.1 man/man5/xine.5 share/aclocal/xine.m4 diff --git a/net/arla/PLIST b/net/arla/PLIST index 9a20f3ae99e..42af52a24bd 100644 --- a/net/arla/PLIST +++ b/net/arla/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.21 2006/08/24 17:59:04 wennmach Exp $ +@comment $NetBSD: PLIST,v 1.22 2008/04/12 22:43:08 jlam Exp $ bin/afsfsperf bin/afstool -${X11_SUPPORT}bin/amon +${PLIST.x11}bin/amon bin/arla-send-pr bin/bos bin/fs diff --git a/net/arla/options.mk b/net/arla/options.mk index 2bf5f2efc22..d3c414a5384 100644 --- a/net/arla/options.mk +++ b/net/arla/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/08/17 21:03:51 joerg Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:08 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.arla PKG_SUPPORTED_OPTIONS= x11 @@ -6,11 +6,12 @@ PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" +PLIST_VARS+= x11 + .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --with-x -PLIST_SUBST+= X11_SUPPORT= +PLIST.x11= yes .include "../../x11/libXaw/buildlink3.mk" .else CONFIGURE_ARGS+= --without-x -PLIST_SUBST+= X11_SUPPORT='@comment ' .endif diff --git a/net/bind9/Makefile b/net/bind9/Makefile index 7837b0069cd..87bd9b2a6b6 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2008/01/18 05:08:40 tnn Exp $ +# $NetBSD: Makefile,v 1.96 2008/04/12 22:43:08 jlam Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P1/pl1/} @@ -45,10 +45,9 @@ FILES_SUBST+= BIND_GROUP=${BIND_GROUP:Q} BIND_USER=${BIND_USER:Q} PAX=${PAX:Q} MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER} # include/isc/ipv6.h is installed on non-ipv6 platforms +PLIST_VARS+= inet6 .if !empty(MISSING_FEATURES:Minet6) -PLIST_SUBST+= IPV6H= -.else -PLIST_SUBST+= IPV6H="@comment " +PLIST.inet6= yes .endif PLIST_SRC= ${WRKDIR}/PLIST diff --git a/net/bind9/PLIST b/net/bind9/PLIST index 64ee08b01c2..4375b0a9ea6 100644 --- a/net/bind9/PLIST +++ b/net/bind9/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.20 2007/04/15 18:56:49 cjs Exp $ +@comment $NetBSD: PLIST,v 1.21 2008/04/12 22:43:08 jlam Exp $ bin/dig bin/host bin/isc-config.sh bin/nslookup bin/nsupdate -${IPV6H}include/isc/ipv6.h +${PLIST.inet6}include/isc/ipv6.h include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index a843158e1fc..0948a111c44 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:02 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2008/04/12 22:43:08 jlam Exp $ DISTNAME= flow-tools-0.68 PKGREVISION= 2 @@ -44,19 +44,18 @@ CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX:Q} .endif # Python scripts support. +PLIST_VARS+= python .if !empty(PKG_OPTIONS:Mpython) . include "../../lang/python/application.mk" PYTHON_PATCH_SCRIPTS= bin/flow-rpt2rrd bin/flow-log2rrd bin/flow-rptfmt -PLIST_SUBST+= PYTHON_OPT="" +PLIST.python= yes post-install: . for s in flow-rpt2rrd flow-log2rrd flow-rptfmt ${INSTALL_SCRIPT} ${WRKSRC}/bin/${s} ${PREFIX}/bin/${s} ${INSTALL_MAN} ${WRKSRC}/docs/${s}.1 ${PREFIX}/${PKGMANDIR}/man1/${s}.1 . endfor -.else -PLIST_SUBST+= PYTHON_OPT="@comment " .endif # To avoid providing more patch files we do the following... diff --git a/net/flow-tools/PLIST b/net/flow-tools/PLIST index 8897acec3ab..9cb259e734c 100644 --- a/net/flow-tools/PLIST +++ b/net/flow-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/06/23 14:20:56 seb Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:08 jlam Exp $ bin/flow-capture bin/flow-cat bin/flow-dscan @@ -9,15 +9,15 @@ bin/flow-filter bin/flow-gen bin/flow-header bin/flow-import -${PYTHON_OPT}bin/flow-log2rrd +${PLIST.python}bin/flow-log2rrd bin/flow-mask bin/flow-merge bin/flow-nfilter bin/flow-print bin/flow-receive bin/flow-report -${PYTHON_OPT}bin/flow-rpt2rrd -${PYTHON_OPT}bin/flow-rptfmt +${PLIST.python}bin/flow-rpt2rrd +${PLIST.python}bin/flow-rptfmt bin/flow-send bin/flow-split bin/flow-stat @@ -39,15 +39,15 @@ man/man1/flow-filter.1 man/man1/flow-gen.1 man/man1/flow-header.1 man/man1/flow-import.1 -${PYTHON_OPT}man/man1/flow-log2rrd.1 +${PLIST.python}man/man1/flow-log2rrd.1 man/man1/flow-mask.1 man/man1/flow-merge.1 man/man1/flow-nfilter.1 man/man1/flow-print.1 man/man1/flow-receive.1 man/man1/flow-report.1 -${PYTHON_OPT}man/man1/flow-rpt2rrd.1 -${PYTHON_OPT}man/man1/flow-rptfmt.1 +${PLIST.python}man/man1/flow-rpt2rrd.1 +${PLIST.python}man/man1/flow-rptfmt.1 man/man1/flow-send.1 man/man1/flow-split.1 man/man1/flow-stat.1 diff --git a/net/net-snmp/PLIST b/net/net-snmp/PLIST index 2bd45250f6d..0969a2baf8e 100644 --- a/net/net-snmp/PLIST +++ b/net/net-snmp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2007/08/11 11:05:56 adam Exp $ +@comment $NetBSD: PLIST,v 1.17 2008/04/12 22:43:08 jlam Exp $ bin/encode_keychange bin/fixproc bin/ipf-mod.pl @@ -102,9 +102,9 @@ include/net-snmp/library/snmp-tc.h include/net-snmp/library/snmp.h include/net-snmp/library/snmpCallbackDomain.h include/net-snmp/library/snmpTCPDomain.h -${IPV6H}include/net-snmp/library/snmpTCPIPv6Domain.h +${PLIST.inet6}include/net-snmp/library/snmpTCPIPv6Domain.h include/net-snmp/library/snmpUDPDomain.h -${IPV6H}include/net-snmp/library/snmpUDPIPv6Domain.h +${PLIST.inet6}include/net-snmp/library/snmpUDPIPv6Domain.h include/net-snmp/library/snmpUnixDomain.h include/net-snmp/library/snmp_alarm.h include/net-snmp/library/snmp_api.h diff --git a/net/net-snmp/options.mk b/net/net-snmp/options.mk index 07850bb16f6..42c827a1df3 100644 --- a/net/net-snmp/options.mk +++ b/net/net-snmp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2007/11/20 07:51:35 dsainty Exp $ +# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:08 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.net-snmp PKG_SUPPORTED_OPTIONS= ssl @@ -12,12 +12,12 @@ PKG_SUPPORTED_OPTIONS+= inet6 .include "../../mk/bsd.options.mk" +PLIST_VARS+= inet6 .if !empty(PKG_OPTIONS:Minet6) CONFIGURE_ARGS+= --enable-ipv6 -PLIST_SUBST+= IPV6H= +PLIST.inet6= yes .else CONFIGURE_ARGS+= --disable-ipv6 -PLIST_SUBST+= IPV6H="@comment " .endif .if !empty(PKG_OPTIONS:Mssl) diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index c8de110c40d..5bfb3bce45a 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2008/04/06 20:21:52 christos Exp $ +# $NetBSD: Makefile,v 1.59 2008/04/12 22:43:08 jlam Exp $ DISTNAME= netatalk-2.0.3 PKGREVISION= 10 @@ -77,24 +77,24 @@ CONFIGURE_ARGS+= --enable-cups CONFIGURE_ARGS+= --disable-cups .endif +PLIST_VARS+= gssapi .if !empty(PKG_OPTIONS:Mkerberos) .include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-gssapi --enable-krbV-uam -CONFIGURE_ENV+= GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err" -PLIST_SUBST+= GSSAPI="" +CONFIGURE_ENV+= GSSAPI_LIBS="-lkrb5 -lroken -lasn1 -lcrypto -lcom_err" +PLIST.gssapi= yes .else CONFIGURE_ARGS+= --without-gssapi -PLIST_SUBST+= GSSAPI="@comment " .endif +PLIST_VARS+= pam .if !empty(PKG_OPTIONS:Mpam) .include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam -PLIST_SUBST+= PAM="" +PLIST.pam= yes MESSAGE_SRC+= MESSAGE MESSAGE.pam .else CONFIGURE_ARGS+= --without-pam -PLIST_SUBST+= PAM="@comment " .endif .if !empty(PKG_OPTIONS:Mslp) diff --git a/net/netatalk/PLIST b/net/netatalk/PLIST index 634c2b91a27..903954aa492 100644 --- a/net/netatalk/PLIST +++ b/net/netatalk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2008/03/22 04:40:45 taca Exp $ +@comment $NetBSD: PLIST,v 1.16 2008/04/12 22:43:08 jlam Exp $ bin/achfile bin/acleandir.rc bin/adv1tov2 @@ -99,11 +99,11 @@ libexec/netatalk/tfwpaprev libexec/netatalk/timelord libexec/netatalk/uams/uams_clrtxt.so libexec/netatalk/uams/uams_dhx.so -${PAM}libexec/netatalk/uams/uams_dhx_pam.la +${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la libexec/netatalk/uams/uams_dhx_passwd.la -${GSSAPI}libexec/netatalk/uams/uams_gss.la +${PLIST.gssapi}libexec/netatalk/uams/uams_gss.la libexec/netatalk/uams/uams_guest.la -${PAM}libexec/netatalk/uams/uams_pam.la +${PLIST.pam}libexec/netatalk/uams/uams_pam.la libexec/netatalk/uams/uams_passwd.la libexec/netatalk/uams/uams_randnum.la man/man1/achfile.1 @@ -157,7 +157,7 @@ share/examples/netatalk/afpd.conf share/examples/netatalk/atalkd.conf share/examples/netatalk/netatalk.conf share/examples/netatalk/papd.conf -${PAM}share/examples/netatalk/netatalk.pamd +${PLIST.pam}share/examples/netatalk/netatalk.pamd share/examples/rc.d/afpd share/examples/rc.d/atalkd share/examples/rc.d/cnid_metad diff --git a/net/netatalk1/PLIST b/net/netatalk1/PLIST index dba67b49804..966a4265b85 100644 --- a/net/netatalk1/PLIST +++ b/net/netatalk1/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2005/06/05 23:40:56 taca Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:08 jlam Exp $ bin/achfile bin/acleandir.rc bin/add_netatalk_printer @@ -100,8 +100,8 @@ libexec/netatalk/timelord libexec/netatalk/uams/uams_clrtxt.so libexec/netatalk/uams/uams_dhx.so libexec/netatalk/uams/uams_dhx_passwd.la -${PAM}libexec/netatalk/uams/uams_dhx_pam.la -${PAM}libexec/netatalk/uams/uams_pam.la +${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la +${PLIST.pam}libexec/netatalk/uams/uams_pam.la libexec/netatalk/uams/uams_guest.la libexec/netatalk/uams/uams_passwd.la libexec/netatalk/uams/uams_randnum.la diff --git a/net/netatalk1/options.mk b/net/netatalk1/options.mk index 67bc9d95fbc..dd6655c8dfe 100644 --- a/net/netatalk1/options.mk +++ b/net/netatalk1/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/02/22 19:26:56 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:08 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.netatalk1 PKG_SUPPORTED_OPTIONS= pam @@ -7,11 +7,11 @@ PKG_SUPPORTED_OPTIONS= pam ### ### Support PAM authentication and build smbpass and winbind PAM modules. ### +PLIST_VARS+= pam .if !empty(PKG_OPTIONS:Mpam) . include "../../security/PAM/module.mk" CONFIGURE_ARGS+= --with-pam -PLIST_SUBST+= PAM= +PLIST.pam= yes .else CONFIGURE_ARGS+= --without-pam -PLIST_SUBST+= PAM="@comment " .endif diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index 59916541a3a..c52c084bb22 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2008/01/24 11:55:42 is Exp $ +# $NetBSD: Makefile,v 1.54 2008/04/12 22:43:08 jlam Exp $ # DISTNAME= ntp-4.2.0 @@ -37,8 +37,7 @@ post-install: .include "../../mk/bsd.prefs.mk" -TIMETRIM= "" -NO_TIMETRIM= "@comment " +PLIST_VARS+= ntptime timetrim .if ${OPSYS} == "NetBSD" # @@ -55,15 +54,11 @@ LOWER_OPSYS_VERSUFFIX= 2 # Don't pick up libwww's -lmd5, until buildlink can be fixed. # CONFIGURE_ENV+= ac_cv_lib_md5_MD5Init=no +PLIST.ntptime= yes .elif ${OPSYS} == "IRIX" -TIMETRIM= "@comment " -NO_TIMETRIM= "" -.elif ${OPSYS} == "SunOS" && ${LOWER_OPSYS} == "solaris" -TIMETRIM= "@comment " +PLIST.timetrim= yes .endif -PLIST_SUBST+= TIMETRIM=${TIMETRIM} NO_TIMETRIM=${NO_TIMETRIM} - .include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-openssl-incdir=${SSLBASE}/include diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST index c10b977cb50..e8ab2f9474a 100644 --- a/net/ntp4/PLIST +++ b/net/ntp4/PLIST @@ -1,14 +1,14 @@ -@comment $NetBSD: PLIST,v 1.8 2006/07/12 17:41:54 rillig Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:43:08 jlam Exp $ bin/ntp-keygen bin/ntp-wait bin/ntpd bin/ntpdate bin/ntpdc bin/ntpq -${TIMETRIM}bin/ntptime +${PLIST.ntptime}bin/ntptime bin/ntptrace -${TIMETRIM}bin/tickadj -${NO_TIMETRIM}bin/timetrim +${PLIST.ntptime}bin/tickadj +${PLIST.timetrim}bin/timetrim share/doc/ntp4/accopt.html share/doc/ntp4/assoc.html share/doc/ntp4/audio.html diff --git a/net/py-mimelib/Makefile b/net/py-mimelib/Makefile index 4d6f8fe0b86..8c2a0c08eb3 100644 --- a/net/py-mimelib/Makefile +++ b/net/py-mimelib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:23 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2008/04/12 22:43:08 jlam Exp $ # DISTNAME= email-2.5 @@ -19,10 +19,11 @@ PYTHON_VERSIONS_ACCEPTED= 21 22 23 .include "../../lang/python/extension.mk" # _compat22.py is not byte-compiled if built with 2.1(-) +PLIST_VARS+= compat22 .if !empty(PYPKGPREFIX:Mpy21*) -PLIST_SUBST+= NOT21="@comment " +# nothing .else -PLIST_SUBST+= NOT21="" +PLIST.compat22= yes .endif .include "../../mk/bsd.pkg.mk" diff --git a/net/py-mimelib/PLIST b/net/py-mimelib/PLIST index 1e0f29c9ab0..160e0bf5716 100644 --- a/net/py-mimelib/PLIST +++ b/net/py-mimelib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/10/21 12:43:33 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:08 jlam Exp $ ${PYSITELIB}/email/Charset.py ${PYSITELIB}/email/Charset.pyc ${PYSITELIB}/email/Charset.pyo @@ -54,8 +54,8 @@ ${PYSITELIB}/email/_compat21.py ${PYSITELIB}/email/_compat21.pyc ${PYSITELIB}/email/_compat21.pyo ${PYSITELIB}/email/_compat22.py -${NOT21}${PYSITELIB}/email/_compat22.pyc -${NOT21}${PYSITELIB}/email/_compat22.pyo +${PLIST.compat22}${PYSITELIB}/email/_compat22.pyc +${PLIST.compat22}${PYSITELIB}/email/_compat22.pyo ${PYSITELIB}/email/_parseaddr.py ${PYSITELIB}/email/_parseaddr.pyc ${PYSITELIB}/email/_parseaddr.pyo diff --git a/net/samba/Makefile b/net/samba/Makefile index a6ca90af5ec..76dbdeab250 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.180 2008/04/03 20:19:42 jlam Exp $ +# $NetBSD: Makefile,v 1.181 2008/04/12 22:43:08 jlam Exp $ .include "Makefile.mirrors" @@ -70,11 +70,10 @@ CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} # Only Linux supports mount.cifs for mounting a CIFS share into the # filesystem. # +PLIST_VARS+= cifsmount .if ${OPSYS} == "Linux" CONFIGURE_ARGS+= --with-cifsmount -PLIST_SUBST+= CIFSMOUNT= -.else -PLIST_SUBST+= CIFSMOUNT="@comment " +PLIST.cifsmount= yes .endif # mktemp is useful for the replacement adduser script, but don't require diff --git a/net/samba/PLIST b/net/samba/PLIST index 7a2bc0422fd..6e2ce5987fe 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.38 2008/04/03 20:19:42 jlam Exp $ +@comment $NetBSD: PLIST,v 1.39 2008/04/12 22:43:08 jlam Exp $ bin/eventlogadm bin/findsmb bin/net @@ -21,11 +21,11 @@ bin/tdbbackup bin/tdbdump bin/tdbtool bin/testparm -${WINBIND}bin/wbinfo +${PLIST.winbind}bin/wbinfo include/libmsrpc.h include/libsmbclient.h -${NSS_WINBIND} -${NSS_WINS} +${PLIST.winbind}${NSS_WINBIND} +${PLIST.winbind}${NSS_WINS} lib/samba/auth/script.so lib/samba/charset/CP437.so lib/samba/charset/CP850.so @@ -61,14 +61,14 @@ lib/samba/vfs/extd_audit.so lib/samba/vfs/fake_perms.so lib/samba/vfs/full_audit.so lib/samba/vfs/netatalk.so -${FAM}lib/samba/vfs/notify_fam.so +${PLIST.fam}lib/samba/vfs/notify_fam.so lib/samba/vfs/readahead.so lib/samba/vfs/readonly.so lib/samba/vfs/recycle.so lib/samba/vfs/shadow_copy.so -${PAM_SMBPASS} -${PAM_WINBIND} -${CUPS}libexec/cups/backend/smb +${PLIST.pam}lib/security/pam_smbpass.so +${PLIST.pam}${PLIST.winbind}lib/security/pam_winbind.so +${PLIST.cups}libexec/cups/backend/smb man/man1/findsmb.1 man/man1/log2pcap.1 man/man1/nmblookup.1 @@ -129,15 +129,15 @@ man/man8/vfs_readonly.8 man/man8/vfs_recycle.8 man/man8/vfs_shadow_copy.8 man/man8/winbindd.8 -${CIFSMOUNT}sbin/mount.cifs +${PLIST.cifsmount}sbin/mount.cifs sbin/nmbd sbin/smbd sbin/swat -${CIFSMOUNT}sbin/umount.cifs -${WINBIND}sbin/winbindd +${PLIST.cifsmount}sbin/umount.cifs +${PLIST.winbind}sbin/winbindd share/doc/samba/NT4-Locking.reg share/doc/samba/NT4_PlainPassword.reg -${PAM}share/doc/samba/README.pam_smbpass +${PLIST.pam}share/doc/samba/README.pam_smbpass share/doc/samba/Win-2Kx-XPP-DeleteCachedProfiles.reg share/doc/samba/Win-2Kx-XPP-ForceLocalProfile.reg share/doc/samba/Win-NT-DeleteRoamingProfile.reg @@ -151,16 +151,16 @@ share/doc/samba/WindowsTerminalServer.reg share/examples/rc.d/nmbd share/examples/rc.d/samba share/examples/rc.d/smbd -${WINBIND}share/examples/rc.d/winbindd +${PLIST.winbind}share/examples/rc.d/winbindd share/examples/samba/adduser.sh share/examples/samba/deluser.sh share/examples/samba/mknissmbpasswd.sh share/examples/samba/mknissmbpwdtbl.sh share/examples/samba/mksmbpasswd.sh -${PAM}share/examples/samba/pam_smbpass/kdc-pdc -${PAM}share/examples/samba/pam_smbpass/password-mature -${PAM}share/examples/samba/pam_smbpass/password-migration -${PAM}share/examples/samba/pam_smbpass/password-sync +${PLIST.pam}share/examples/samba/pam_smbpass/kdc-pdc +${PLIST.pam}share/examples/samba/pam_smbpass/password-mature +${PLIST.pam}share/examples/samba/pam_smbpass/password-migration +${PLIST.pam}share/examples/samba/pam_smbpass/password-sync share/examples/samba/samba.schema share/examples/samba/smb.conf.default share/examples/samba/updatesmbpasswd.sh @@ -639,7 +639,7 @@ share/samba/swat/using_samba/toc.html @dirrm share/samba/swat/help @dirrm share/samba/swat @dirrm share/samba -${PAM}@dirrm share/examples/samba/pam_smbpass +${PLIST.pam}@dirrm share/examples/samba/pam_smbpass @dirrm share/examples/samba @dirrm share/doc/samba @dirrm lib/samba/vfs diff --git a/net/samba/options.mk b/net/samba/options.mk index 0adc5c05810..b96f6361b88 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.23 2008/04/03 20:19:42 jlam Exp $ +# $NetBSD: options.mk,v 1.24 2008/04/12 22:43:08 jlam Exp $ # Recommended package options for various setups: # @@ -51,10 +51,11 @@ CONFIGURE_ARGS+= --with-acl-support ### ### Native CUPS support for providing printing services. ### +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) . include "../../print/cups/buildlink3.mk" CONFIGURE_ARGS+= --enable-cups -PLIST_SUBST+= CUPS= +PLIST.cups= yes INSTALLATION_DIRS+= libexec/cups/backend .PHONY: samba-cups-install @@ -64,19 +65,18 @@ samba-cups-install: ${LN} -fs ../../../bin/smbspool smb .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif ### ### Access Control List support. ### +PLIST_VARS+= fam .if !empty(PKG_OPTIONS:Mfam) . include "../../mk/fam.buildlink3.mk" CONFIGURE_ARGS+= --enable-fam -PLIST_SUBST+= FAM= +PLIST.fam= yes .else CONFIGURE_ARGS+= --disable-fam -PLIST_SUBST+= FAM="@comment " .endif ### @@ -92,13 +92,13 @@ CONFIGURE_ARGS+= --without-ldap ### ### Support PAM authentication and build smbpass and winbind PAM modules. ### +PLIST_VARS+= pam .if !empty(PKG_OPTIONS:Mpam) . include "../../security/PAM/module.mk" CONFIGURE_ARGS+= --with-pam CONFIGURE_ARGS+= --with-pam_smbpass CONFIGURE_ARGS+= --with-pammodulesdir=${PAM_INSTMODULEDIR} -PLIST_SUBST+= PAM_SMBPASS=lib/security/pam_smbpass.so -PLIST_SUBST+= PAM= +PLIST.pam= yes INSTALLATION_DIRS+= ${EGDIR}/pam_smbpass .PHONY: samba-pam-smbpass-install @@ -110,15 +110,13 @@ samba-pam-smbpass-install: ${INSTALL_DATA} $${f} \ ${DESTDIR}${PREFIX}/${EGDIR}/pam_smbpass/$${f}; \ done -.else -PLIST_SUBST+= PAM_SMBPASS="@comment no PAM smbpass module" -PLIST_SUBST+= PAM="@comment " .endif ### ### Support querying a PDC for domain user and group information, e.g., ### through NSS or PAM. ### +PLIST_VARS+= winbind .if !empty(PKG_OPTIONS:Mwinbind) CONFIGURE_ARGS+= --with-winbind @@ -128,14 +126,7 @@ SAMBA_STATIC_MODULES:= ${SAMBA_STATIC_MODULES},idmap_ad . endif WINBINDD_RCD_SCRIPT= winbindd -PLIST_SUBST+= WINBIND= - -# Install the PAM winbind module if we're also building with PAM support. -. if empty(PKG_OPTIONS:Mpam) -PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module" -. else -PLIST_SUBST+= PAM_WINBIND=lib/security/pam_winbind.so -. endif +PLIST.winbind= yes # Install the NSS winbind module if it exists. PLIST_SUBST+= NSS_WINBIND=${NSS_WINBIND:Q} @@ -174,10 +165,8 @@ samba-nss-wins-install: ${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX:Q}/lib .else CONFIGURE_ARGS+= --without-winbind -PLIST_SUBST+= WINBIND="@comment " -PLIST_SUBST+= PAM_WINBIND="@comment no PAM winbind module" -PLIST_SUBST+= NSS_WINBIND="@comment no NSS winbind module" -PLIST_SUBST+= NSS_WINS="@comment no NSS WINS module" +PLIST_SUBST+= NSS_WINBIND="no NSS winbind module" +PLIST_SUBST+= NSS_WINS="no NSS WINS module" .endif ### diff --git a/net/ser/PLIST b/net/ser/PLIST index 99346506b79..0f71f78d2f2 100644 --- a/net/ser/PLIST +++ b/net/ser/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2007/06/01 00:26:36 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:08 jlam Exp $ sbin/ser sbin/serctl sbin/ser_mysql.sh @@ -18,7 +18,7 @@ lib/ser/modules/mangler.so lib/ser/modules/maxfwd.so lib/ser/modules/mediaproxy.so lib/ser/modules/msilo.so -${WITH_MYSQL}lib/ser/modules/mysql.so +${PLIST.mysql}lib/ser/modules/mysql.so lib/ser/modules/nathelper.so lib/ser/modules/pa.so lib/ser/modules/pdt.so diff --git a/net/ser/options.mk b/net/ser/options.mk index 57d0b5751e7..41eab5bbda9 100644 --- a/net/ser/options.mk +++ b/net/ser/options.mk @@ -1,14 +1,13 @@ -# $NetBSD: options.mk,v 1.1 2007/06/01 00:26:36 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:08 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ser PKG_SUPPORTED_OPTIONS= mysql .include "../../mk/bsd.options.mk" +PLIST_VARS+= mysql .if !empty(PKG_OPTIONS:Mmysql) MAKE_ENV+= include_modules="mysql" .include "../../mk/mysql.buildlink3.mk" -PLIST_SUBST+= WITH_MYSQL="" -.else -PLIST_SUBST+= WITH_MYSQL="@comment " +PLIST.mysql= yes .endif diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile index f30b576f45c..1451e15f78b 100644 --- a/net/speedtouch/Makefile +++ b/net/speedtouch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:59 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2008/04/12 22:43:08 jlam Exp $ DISTNAME= speedtouch-1.3.1 PKGREVISION= 4 @@ -29,11 +29,12 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} RCD_SCRIPTS= adsl +PLIST_VARS+= pppoa3 + .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native" -PLIST_SUBST+= PPPOA3="" +PLIST.pppoa3= yes .else -PLIST_SUBST+= PPPOA3="@comment " CONFIGURE_ENV+= ac_cv_lib_pthread_pthread_create=no .endif diff --git a/net/speedtouch/PLIST b/net/speedtouch/PLIST index 1724186154c..9318cbdc008 100644 --- a/net/speedtouch/PLIST +++ b/net/speedtouch/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2005/06/18 11:29:10 kristerw Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:08 jlam Exp $ share/examples/rc.d/adsl @exec ${MKDIR} ${PKG_SYSCONFDIR}/speedtouch bin/speedtouch-setup @@ -14,7 +14,7 @@ man/man8/pppoa2.8 man/man8/pppoa3.8 sbin/modem_run sbin/pppoa2 -${PPPOA3}sbin/pppoa3 +${PLIST.pppoa3}sbin/pppoa3 share/doc/speedtouch/FAQ share/doc/speedtouch/FAQ-fr share/doc/speedtouch/INSTALL diff --git a/net/wireshark/PLIST b/net/wireshark/PLIST index 6977e47dc90..45e42e3c380 100644 --- a/net/wireshark/PLIST +++ b/net/wireshark/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2008/03/31 13:13:40 tron Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:08 jlam Exp $ bin/capinfos bin/dftest bin/dumpcap @@ -9,7 +9,7 @@ bin/randpkt bin/rawshark bin/text2pcap bin/tshark -${WIRESHARK}bin/wireshark +${PLIST.x11}bin/wireshark lib/libwireshark.la lib/libwiretap.la lib/wireshark/plugins/${PKGVERSION}/agentx.la @@ -50,7 +50,7 @@ man/man1/mergecap.1 man/man1/rawshark.1 man/man1/text2pcap.1 man/man1/tshark.1 -${WIRESHARK}man/man1/wireshark.1 +${PLIST.x11}man/man1/wireshark.1 man/man4/wireshark-filter.4 share/wireshark/AUTHORS-SHORT share/wireshark/COPYING diff --git a/net/wireshark/options.mk b/net/wireshark/options.mk index 8f1943acc22..dcb9034d9fd 100644 --- a/net/wireshark/options.mk +++ b/net/wireshark/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2008/02/13 20:10:20 tron Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wireshark PKG_SUPPORTED_OPTIONS= x11 @@ -6,14 +6,13 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= x11 + .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --enable-gtk2 CONFIGURE_ARGS+= --with-gtk-prefix=${BUILDLINK_PREFIX.gtk2} - -PLIST_SUBST+= WIRESHARK= +PLIST.x11= yes .include "../../x11/gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-wireshark - -PLIST_SUBST+= WIRESHARK="@comment " .endif diff --git a/pkgtools/bootstrap-extras/Makefile b/pkgtools/bootstrap-extras/Makefile index 7954bd485ac..4ef3af6a7da 100644 --- a/pkgtools/bootstrap-extras/Makefile +++ b/pkgtools/bootstrap-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2007/07/02 13:34:14 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2008/04/12 22:43:09 jlam Exp $ DISTNAME= bootstrap-extra-files-20070702 CATEGORIES= pkgtools @@ -15,49 +15,55 @@ NO_BUILD= yes .include "../../mk/bsd.prefs.mk" -OPSYSVARS+= NEED_FAKELDD -NEED_FAKELDD.IRIX= # empty -NEED_FAKELDD.*= "@comment " -PLIST_SUBST+= NEED_FAKELDD=${NEED_FAKELDD} +EXTRA_FILES= fakeldd mkdir strip xargs +PLIST_VARS+= ${EXTRA_FILES} -OPSYSVARS+= NEED_MKDIR -NEED_MKDIR.UnixWare= # empty -NEED_MKDIR.*= "@comment " -PLIST_SUBST+= NEED_MKDIR=${NEED_MKDIR} +.PHONY: ${EXTRA_FILES:S/^/do-install-/} -OPSYSVARS+= NEED_STRIP -NEED_STRIP.AIX= # empty -NEED_STRIP.*= "@comment " -PLIST_SUBST+= NEED_STRIP=${NEED_STRIP} +NEED_FAKELDD= IRIX +.if !empty(NEED_FAKELDD:M${OPSYS}) +PLIST.fakeldd= yes +do-install: do-install-fakeldd +.endif -OPSYSVARS+= NEED_XARGS -NEED_XARGS.Interix= # empty -NEED_XARGS.*= "@comment " -PLIST_SUBST+= NEED_XARGS=${NEED_XARGS} +NEED_MKDIR= UnixWare +.if !empty(NEED_MKDIR:M${OPSYS}) +PLIST.mkdir= yes +do-install: do-install-mkdir +.endif + +NEED_STRIP= AIX +.if !empty(NEED_STRIP:M${OPSYS}) +PLIST.strip= yes +do-install: do-install-strip +.endif + +NEED_XARGS= Interix +.if !empty(NEED_XARGS:M${OPSYS}) +PLIST.xargs= yes +do-install: do-install-xargs +.endif do-extract: ${CP} -R ${FILESDIR} ${WRKSRC} do-install: - if ${TEST} -z ${NEED_FAKELDD:M*:Q}""; then \ - ${INSTALL_SCRIPT_DIR} ${PREFIX}/sbin; \ - ${INSTALL_SCRIPT} ${WRKSRC}/fakeldd \ - ${PREFIX}/sbin/fakeldd; \ - fi - if ${TEST} -z ${NEED_MKDIR:M*:Q}""; then \ - ${INSTALL_SCRIPT_DIR} ${PREFIX}/bin; \ - ${INSTALL_SCRIPT} ${WRKSRC}/mkdir-sh \ - ${PREFIX}/bin/mkdir-sh; \ - fi - if ${TEST} -z ${NEED_STRIP:M*:Q}""; then \ - ${INSTALL_SCRIPT_DIR} ${PREFIX}/bin; \ - ${INSTALL_SCRIPT} ${WRKSRC}/strip-sh \ - ${PREFIX}/bin/strip; \ - fi - if ${TEST} -z ${NEED_XARGS:M*:Q}""; then \ - ${INSTALL_SCRIPT_DIR} ${PREFIX}/bin; \ - ${INSTALL_SCRIPT} ${WRKSRC}/xargs-sh \ - ${PREFIX}/bin/xargs; \ - fi + @${ECHO} ${.ALLSRC} + +do-install-fakeldd: + ${INSTALL_SCRIPT_DIR} ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/fakeldd ${PREFIX}/sbin/fakeldd + +do-install-mkdir: + ${INSTALL_SCRIPT_DIR} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/mkdir-sh ${PREFIX}/bin/mkdir-sh + +do-install-strip: + ${INSTALL_SCRIPT_DIR} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/strip-sh ${PREFIX}/bin/strip + +do-install-xargs: + ${INSTALL_SCRIPT_DIR} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/xargs-sh ${PREFIX}/bin/xargs .include "../../mk/bsd.pkg.mk" diff --git a/pkgtools/bootstrap-extras/PLIST b/pkgtools/bootstrap-extras/PLIST index 22a972df021..7c900925ee2 100644 --- a/pkgtools/bootstrap-extras/PLIST +++ b/pkgtools/bootstrap-extras/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2007/07/01 23:27:43 tnn Exp $ -${NEED_MKDIR}bin/mkdir-sh -${NEED_STRIP}bin/strip -${NEED_FAKELDD}sbin/fakeldd -${NEED_XARGS}bin/xargs +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:09 jlam Exp $ +${PLIST.mkdir}bin/mkdir-sh +${PLIST.strip}bin/strip +${PLIST.fakeldd}sbin/fakeldd +${PLIST.xargs}bin/xargs diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile index 3a4bb6522bc..b0ed8471516 100644 --- a/pkgtools/libkver/Makefile +++ b/pkgtools/libkver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2007/07/26 12:24:52 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2008/04/12 22:43:09 jlam Exp $ DISTNAME= libkver-${VERSION} CATEGORIES= pkgtools @@ -26,13 +26,13 @@ ONLY_FOR_PLATFORM= NetBSD-*-* BUILDLINK_PASSTHRU_DIRS= ${BSDSRCDIR}/sys +PLIST_VARS= sysctl LDD_SYSCTL!= ldd /sbin/sysctl 2>&1 || ${TRUE} MAKE_ENV+= LDD_SYSCTL=${LDD_SYSCTL:Q} # save another ldd run .if empty(LDD_SYSCTL:M*libc*) -PLIST_SUBST+= HAS_SYSCTL= +PLIST.sysctl= yes FILES_SUBST+= HAS_SYSCTL=true .else -PLIST_SUBST+= HAS_SYSCTL="@comment " FILES_SUBST+= HAS_SYSCTL=false .endif diff --git a/pkgtools/libkver/PLIST b/pkgtools/libkver/PLIST index 1303710dbb6..56ed050cf42 100644 --- a/pkgtools/libkver/PLIST +++ b/pkgtools/libkver/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2003/12/13 17:45:59 seb Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:09 jlam Exp $ lib/libkver.a lib/libkver.so lib/libkver.so.1 lib/libkver.so.1.0 man/cat3/kver.0 man/man3/kver.3 -${HAS_SYSCTL}sbin/sysctl +${PLIST.sysctl}sbin/sysctl diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 22e4404abdb..0174c0b8f1f 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2007/12/16 12:43:50 tron Exp $ +# $NetBSD: Makefile,v 1.75 2008/04/12 22:43:09 jlam Exp $ DISTNAME= xpkgwedge-1.16 CATEGORIES= pkgtools devel x11 @@ -44,29 +44,24 @@ FILES_SUBST+= FONT_PROGS=${FONT_PROGS:Q} FILES_SUBST+= MAKE=${IMAKE_MAKE:Q} USE_TOOLS+= ${IMAKE_TOOLS} +PLIST_VARS+= Darwin IRIX IRIX5 IRIX6 + .if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) APPLY_DARWIN_PATCH= ${TRUE} -PLIST_SUBST+= IS_DARWIN= +PLIST.Darwin= yes USE_TOOLS+= patch .else APPLY_DARWIN_PATCH= ${FALSE} -PLIST_SUBST+= IS_DARWIN="@comment " .endif .if ${OPSYS} == "IRIX" -PLIST_SUBST+= IS_IRIX= +PLIST.IRIX= yes USE_TOOLS+= patch . if !empty(OS_VERSION:M6*) -PLIST_SUBST+= IS_IRIX5="@comment " -PLIST_SUBST+= IS_IRIX6= +PLIST.IRIX6= yes . else -PLIST_SUBST+= IS_IRIX5= -PLIST_SUBST+= IS_IRIX6="@comment " +PLIST.IRIX5= yes . endif -.else -PLIST_SUBST+= IS_IRIX="@comment " -PLIST_SUBST+= IS_IRIX5="@comment " -PLIST_SUBST+= IS_IRIX6="@comment " .endif .include "../../mk/x11.buildlink3.mk" diff --git a/pkgtools/xpkgwedge/PLIST b/pkgtools/xpkgwedge/PLIST index adfbe44ebbd..16d1b446644 100644 --- a/pkgtools/xpkgwedge/PLIST +++ b/pkgtools/xpkgwedge/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.6 2006/09/09 20:31:46 schwarz Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:09 jlam Exp $ bin/pkgxmkmf lib/X11/config/xpkgwedge.def -${IS_DARWIN}lib/X11/config/darwin.cf -${IS_IRIX}lib/X11/config/sgi.cf -${IS_IRIX5}lib/X11/config/sgiLib.rules -${IS_IRIX6}lib/X11/config/X11.rules +${PLIST.Darwin}lib/X11/config/darwin.cf +${PLIST.IRIX}lib/X11/config/sgi.cf +${PLIST.IRIX5}lib/X11/config/sgiLib.rules +${PLIST.IRIX6}lib/X11/config/X11.rules diff --git a/print/cups/PLIST b/print/cups/PLIST index 9e0ff8e2c03..4ff85969135 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2008/04/03 04:06:27 markd Exp $ +@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:43:09 jlam Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -1567,7 +1567,7 @@ share/doc/cups/zh_TW/images/button-view-error-log.gif share/doc/cups/zh_TW/images/button-view-page-log.gif share/doc/cups/zh_TW/images/button-view-printable-version.gif share/doc/cups/zh_TW/index.html -${PAM}share/examples/cups/cups.pam +${PLIST.pam}share/examples/cups/cups.pam share/examples/cups/cupsd.conf share/examples/cups/mime.convs share/examples/cups/mime.types diff --git a/print/cups/options.mk b/print/cups/options.mk index 9f7fe0dae03..6842b7644e1 100644 --- a/print/cups/options.mk +++ b/print/cups/options.mk @@ -1,20 +1,20 @@ -# $NetBSD: options.mk,v 1.1 2008/01/22 23:58:13 markd Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups PKG_SUPPORTED_OPTIONS= dnssd kerberos pam slp PKG_SUGGESTED_OPTIONS= dnssd kerberos slp .include "../../mk/bsd.options.mk" +PLIST_VARS+= pam .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --enable-pam MESSAGE_SRC= ${PKGDIR}/MESSAGE MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam -PLIST_SUBST+= PAM= +PLIST.pam= yes .else CONFIGURE_ARGS+= --disable-pam MESSAGE_SRC= ${.CURDIR}/MESSAGE -PLIST_SUBST+= PAM="@comment " .endif .if !empty(PKG_OPTIONS:Mslp) diff --git a/print/evince/Makefile b/print/evince/Makefile index 6a80c5654b7..29dad766b21 100644 --- a/print/evince/Makefile +++ b/print/evince/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2008/03/06 14:53:53 wiz Exp $ -# +# $NetBSD: Makefile,v 1.40 2008/04/12 22:43:09 jlam Exp $ .include "../../print/evince/Makefile.common" @@ -17,26 +16,24 @@ PKG_SUGGESTED_OPTIONS= # none .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Mdvi) CONFIGURE_ARGS+= --enable-dvi -PLIST_SUBST+= DVI= # empty +PLIST.dvi= yes GCONF_SCHEMAS+= evince-thumbnailer-dvi.schemas .include "../../mk/tex.buildlink3.mk" -.else -PLIST_SUBST+= DVI="@comment " .endif .if !empty(PKG_OPTIONS:Mdjvu) CONFIGURE_ARGS+= --enable-djvu -PLIST_SUBST+= DJVU= #empty +PLIST.djvu= yes GCONF_SCHEMAS+= evince-thumbnailer-djvu.schemas .include "../../graphics/djvulibre-lib/buildlink3.mk" -.else -PLIST_SUBST+= DJVU="@comment " .endif CONFIGURE_ARGS+= --enable-comics -GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas +GCONF_SCHEMAS+= evince-thumbnailer-comics.schemas BUILDLINK_DEPMETHOD.libXt?= build diff --git a/print/evince/PLIST b/print/evince/PLIST index cbd888e994b..0644262adfb 100644 --- a/print/evince/PLIST +++ b/print/evince/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2007/11/03 16:12:48 drochner Exp $ +@comment $NetBSD: PLIST,v 1.18 2008/04/12 22:43:09 jlam Exp $ bin/evince bin/evince-thumbnailer man/man1/evince.1 @@ -28,8 +28,8 @@ share/evince/icons/hicolor/32x32/actions/view-page-facing.png share/evince/icons/hicolor/48x48/actions/view-page-continuous.png share/evince/icons/hicolor/48x48/actions/view-page-facing.png share/gconf/schemas/evince-thumbnailer-comics.schemas -${DJVU}share/gconf/schemas/evince-thumbnailer-djvu.schemas -${DVI}share/gconf/schemas/evince-thumbnailer-dvi.schemas +${PLIST.djvu}share/gconf/schemas/evince-thumbnailer-djvu.schemas +${PLIST.dvi}share/gconf/schemas/evince-thumbnailer-dvi.schemas share/gconf/schemas/evince-thumbnailer-ps.schemas share/gconf/schemas/evince-thumbnailer.schemas share/gconf/schemas/evince.schemas diff --git a/print/ghostscript-esp/PLIST b/print/ghostscript-esp/PLIST index b7457d97b39..8040b4dc980 100644 --- a/print/ghostscript-esp/PLIST +++ b/print/ghostscript-esp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2008/03/10 12:34:10 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:43:09 jlam Exp $ bin/bdftops bin/dvipdf bin/eps2eps @@ -29,8 +29,8 @@ bin/ps2ps bin/pv.sh bin/unix-lpr.sh bin/wftopfa -${CUPS}libexec/cups/filter/pstopxl -${CUPS}libexec/cups/filter/pstoraster +${PLIST.cups}libexec/cups/filter/pstopxl +${PLIST.cups}libexec/cups/filter/pstoraster man/de/man1/dvipdf.1 man/de/man1/eps2eps.1 man/de/man1/font2c.1 @@ -69,8 +69,8 @@ man/man1/ps2pdf13.1 man/man1/ps2pdfwr.1 man/man1/ps2ps.1 man/man1/wftopfa.1 -${CUPS}share/cups/model/pxlcolor.ppd -${CUPS}share/cups/model/pxlmono.ppd +${PLIST.cups}share/cups/model/pxlcolor.ppd +${PLIST.cups}share/cups/model/pxlmono.ppd share/doc/ghostscript/API.htm share/doc/ghostscript/Bug-form.htm share/doc/ghostscript/Bug-info.htm @@ -113,7 +113,7 @@ share/doc/ghostscript/Use.htm share/doc/ghostscript/Xfonts.htm share/doc/ghostscript/gs.css share/doc/ghostscript/index.html -${CUPS}share/examples/cups/pstoraster.convs +${PLIST.cups}share/examples/cups/pstoraster.convs share/examples/ghostscript/alphabet.ps share/examples/ghostscript/colorcir.ps share/examples/ghostscript/doretree.ps diff --git a/print/ghostscript-esp/options.mk b/print/ghostscript-esp/options.mk index f1bb99d847c..cf88bbd7775 100644 --- a/print/ghostscript-esp/options.mk +++ b/print/ghostscript-esp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2007/02/22 19:27:03 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript-esp PKG_SUPPORTED_OPTIONS= x11 cups @@ -15,9 +15,10 @@ CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --without-x .endif +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) CONFIGURE_ARGS+= --enable-cups -PLIST_SUBST+= CUPS= +PLIST.cups= yes CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups CUPS_EGDIR= ${PREFIX}/share/examples/cups @@ -39,5 +40,4 @@ ghostscript-esp-cups-install: ${INSTALL_DATA} ${WRKSRC}/pstoraster/pstoraster.convs ${CUPS_EGDIR} .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif diff --git a/print/ghostscript/PLIST b/print/ghostscript/PLIST index b5d610a5c42..30cb1036dc2 100644 --- a/print/ghostscript/PLIST +++ b/print/ghostscript/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2008/03/10 12:34:10 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:09 jlam Exp $ bin/bdftops bin/dumphint bin/dvipdf @@ -31,8 +31,8 @@ bin/ps2ps2 bin/pv.sh bin/unix-lpr.sh bin/wftopfa -${CUPS}libexec/cups/filter/pstopxl -${CUPS}libexec/cups/filter/pstoraster +${PLIST.cups}libexec/cups/filter/pstopxl +${PLIST.cups}libexec/cups/filter/pstoraster man/de/man1/dvipdf.1 man/de/man1/eps2eps.1 man/de/man1/font2c.1 @@ -71,9 +71,9 @@ man/man1/ps2pdf13.1 man/man1/ps2pdfwr.1 man/man1/ps2ps.1 man/man1/wftopfa.1 -${CUPS}share/cups/model/pxlcolor.ppd -${CUPS}share/cups/model/pxlmono.ppd -${CUPS}share/examples/cups/pstoraster.convs +${PLIST.cups}share/cups/model/pxlcolor.ppd +${PLIST.cups}share/cups/model/pxlmono.ppd +${PLIST.cups}share/examples/cups/pstoraster.convs share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-H share/ghostscript/${PKGVERSION}/Resource/CMap/78-EUC-V share/ghostscript/${PKGVERSION}/Resource/CMap/78-H diff --git a/print/ghostscript/options.mk b/print/ghostscript/options.mk index a2919b2180e..a3b449a5f3b 100644 --- a/print/ghostscript/options.mk +++ b/print/ghostscript/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2008/01/24 15:17:30 gdt Exp $ +# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript PKG_SUPPORTED_OPTIONS= x11 cups fontconfig @@ -15,9 +15,10 @@ CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --without-x .endif +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) CONFIGURE_ARGS+= --enable-cups -PLIST_SUBST+= CUPS= +PLIST.cups= yes CUPS_CONFDIR?= ${PKG_SYSCONFBASEDIR}/cups CUPS_EGDIR= ${PREFIX}/share/examples/cups @@ -32,7 +33,6 @@ SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g' .include "../../print/cups/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif .if !empty(PKG_OPTIONS:Mfontconfig) diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index ca675a9a420..fc3bd5641e8 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2008/02/13 19:39:26 drochner Exp $ +# $NetBSD: Makefile,v 1.65 2008/04/12 22:43:09 jlam Exp $ # DISTNAME= libgnomeprint-2.18.4 @@ -27,13 +27,13 @@ PKG_SUPPORTED_OPTIONS= cups .include "../../mk/bsd.options.mk" +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/libgnomecups/buildlink3.mk" CONFIGURE_ARGS+= --with-cups -PLIST_SUBST+= USE_CUPS= +PLIST.cups= yes .else CONFIGURE_ARGS+= --without-cups -PLIST_SUBST+= USE_CUPS="@comment " .endif CONFIGURE_ARGS+= --without-papi diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST index f33496d586e..e91516b0443 100644 --- a/print/libgnomeprint/PLIST +++ b/print/libgnomeprint/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2008/02/13 19:39:26 drochner Exp $ +@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:43:09 jlam Exp $ include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h include/libgnomeprint-2.2/libgnomeprint/gnome-font.h include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h @@ -46,7 +46,7 @@ lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-reverse.la lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-rotate.la lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-select.la lib/libgnomeprint/${PKGVERSION}/modules/filters/libgnomeprint-zoom.la -${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.la +${PLIST.cups}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.la lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintlpd.la lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.la lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.la diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile index 74e7d1c067f..6ff4d5a40f7 100644 --- a/print/xfce4-print/Makefile +++ b/print/xfce4-print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/04/12 09:55:12 martti Exp $ +# $NetBSD: Makefile,v 1.21 2008/04/12 22:43:09 jlam Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -13,10 +13,9 @@ CONFIGURE_ARGS+= --with-printcap=/etc/printcap .include "options.mk" -.if ${OPSYS} == "SunOS" -PLIST_SUBST+= SOLARIS="@comment " -.else -PLIST_SUBST+= SOLARIS="" +PLIST_VARS+= bsdlpr +.if ${OPSYS} != "SunOS" +PLIST.bsdlpr= yes .endif .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/print/xfce4-print/PLIST b/print/xfce4-print/PLIST index 65840415c7f..46c602dba9c 100644 --- a/print/xfce4-print/PLIST +++ b/print/xfce4-print/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.18 2007/12/07 19:43:22 martti Exp $ -${SOLARIS}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la +@comment $NetBSD: PLIST,v 1.19 2008/04/12 22:43:09 jlam Exp $ +${PLIST.bsdlpr}lib/xfce4/xfprint-plugins/bsdlpr_plugin.la bin/xfprint4 bin/xfprint4-manager include/xfce4/libxfprint/common.h @@ -12,7 +12,7 @@ include/xfce4/libxfprint/printing-system.h lib/libxfprint.la lib/pkgconfig/xfprint-1.0.pc lib/xfce4/mcs-plugins/xfprint_plugin.la -${CUPS}lib/xfce4/xfprint-plugins/cups_plugin.la +${PLIST.cups}lib/xfce4/xfprint-plugins/cups_plugin.la share/applications/xfce-xfprint-settings.desktop share/applications/xfprint-manager.desktop share/applications/xfprint.desktop diff --git a/print/xfce4-print/options.mk b/print/xfce4-print/options.mk index 06c7b7b6709..061d03509f4 100644 --- a/print/xfce4-print/options.mk +++ b/print/xfce4-print/options.mk @@ -1,14 +1,14 @@ -# $NetBSD: options.mk,v 1.4 2007/04/14 22:13:38 dillo Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xfce4-print PKG_SUPPORTED_OPTIONS= cups .include "../../mk/bsd.options.mk" +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" -PLIST_SUBST+= CUPS= +PLIST.cups= yes .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 597b6caf326..c2d4e29f5e2 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2007/07/09 04:27:55 minskim Exp $ +# $NetBSD: Makefile,v 1.43 2008/04/12 22:43:09 jlam Exp $ # DISTNAME= Linux-PAM-0.77 @@ -47,12 +47,12 @@ PKG_SUPPORTED_OPTIONS= libcrack ### ### Support using libcrack to protect against weak passwords. ### +PLIST_VARS+= libcrack .if !empty(PKG_OPTIONS:Mlibcrack) . include "../../security/libcrack/buildlink3.mk" -PLIST_SUBST+= USE_LIBCRACK= +PLIST.libcrack= yes .else CONFIGURE_ARGS+= --disable-crack -PLIST_SUBST+= USE_LIBCRACK="@comment " .endif .if !empty(OPSYS:M*BSD) @@ -69,11 +69,10 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CFILES= access.conf pam_env.conf group.conf time.conf +PLIST_VARS+= limits .if ${OPSYS} == "Linux" CFILES+= limits.conf -PLIST_SUBST+= PAM_LIMITS= -.else -PLIST_SUBST+= PAM_LIMITS="@comment " +PLIST.limits= yes .endif CONF_FILES= ${EGDIR}/pam.conf ${PKG_SYSCONFBASEDIR}/pam.conf diff --git a/security/PAM/PLIST b/security/PAM/PLIST index 9ff54bce459..62248c9cf92 100644 --- a/security/PAM/PLIST +++ b/security/PAM/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/11/16 07:46:57 jlam Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:09 jlam Exp $ include/security/_pam_aconf.h include/security/_pam_compat.h include/security/_pam_macros.h @@ -12,7 +12,7 @@ lib/libpam.la lib/libpam_misc.la lib/libpamc.la lib/security/pam_access.la -${USE_LIBCRACK}lib/security/pam_cracklib.la +${PLIST.libcrack}lib/security/pam_cracklib.la lib/security/pam_debug.la lib/security/pam_deny.la lib/security/pam_env.la @@ -22,7 +22,7 @@ lib/security/pam_ftp.la lib/security/pam_group.la lib/security/pam_issue.la lib/security/pam_lastlog.la -${PAM_LIMITS}lib/security/pam_limits.la +${PLIST.limits}lib/security/pam_limits.la lib/security/pam_listfile.la lib/security/pam_mail.la lib/security/pam_mkhomedir.la @@ -62,7 +62,7 @@ sbin/pam_tally sbin/unix_chkpwd share/examples/${PKGBASE}/access.conf share/examples/${PKGBASE}/group.conf -${PAM_LIMITS}share/examples/${PKGBASE}/limits.conf +${PLIST.limits}share/examples/${PKGBASE}/limits.conf share/examples/${PKGBASE}/pam.conf share/examples/${PKGBASE}/pam_env.conf share/examples/${PKGBASE}/time.conf diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 78b8961ac14..3cf4989ce75 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2008/02/19 16:20:15 reed Exp $ +# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:09 jlam Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -69,6 +69,7 @@ PKG_SUPPORTED_OPTIONS= milter .include "../../mk/bsd.options.mk" +PLIST_VARS+= milter .if !empty(PKG_OPTIONS:Mmilter) GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-runtime-dir=${AMAVIS_DIR:Q} @@ -80,14 +81,13 @@ CONFIGURE_DIRS= ${WRKSRC}/helper-progs BUILD_DIRS= ${WRKSRC}/helper-progs RCD_SCRIPTS+= amavismilter MESSAGE_SRC+= ${PKGDIR}/MESSAGE.milter -PLIST_SUBST+= MILTER= +PLIST.milter= yes PTHREAD_OPTS+= require native # doesn't work with pth . include "../../mail/libmilter/buildlink3.mk" . include "../../mk/pthread.buildlink3.mk" .else USE_LANGUAGES= # none, not even C -PLIST_SUBST+= MILTER="@comment " do-build: replace-interpreter .endif diff --git a/security/amavisd-new/PLIST b/security/amavisd-new/PLIST index a8d1eb27b48..1937af324c5 100644 --- a/security/amavisd-new/PLIST +++ b/security/amavisd-new/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.12 2008/02/19 16:18:18 reed Exp $ -${MILTER}sbin/amavis -${MILTER}sbin/amavis-milter +@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:09 jlam Exp $ +${PLIST.milter}sbin/amavis +${PLIST.milter}sbin/amavis-milter sbin/amavisd sbin/amavisd-agent sbin/amavisd-nanny @@ -42,6 +42,6 @@ share/examples/amavisd-new/amavisd.conf-default share/examples/amavisd-new/amavisd.conf-minimal share/examples/amavisd-new/amavisd.conf-sample share/examples/rc.d/amavisd -${MILTER}share/examples/rc.d/amavismilter +${PLIST.milter}share/examples/rc.d/amavismilter @dirrm share/examples/amavisd-new @dirrm share/doc/amavisd-new diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile index c941cf76a71..0a1cdce7035 100644 --- a/security/chkrootkit/Makefile +++ b/security/chkrootkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/07/11 20:16:33 adrianp Exp $ +# $NetBSD: Makefile,v 1.13 2008/04/12 22:43:09 jlam Exp $ # DISTNAME= chkrootkit-0.47 @@ -33,9 +33,10 @@ SUBST_SED.helper= -e "s|./chklastlog|${PREFIX}/bin/chklastlog|g" \ .include "../../mk/compiler.mk" +PLIST_VARS+= wtmpx .if ${OPSYS} == "SunOS" PROGRAMS+= check_wtmpx -PLIST_SUBST+= WTMPX="" +PLIST.wtmpx= yes CFLAGS+= -DSOLARIS2 LDFLAGS+= -lsocket . if empty(CC_VERSION:Mgcc-*) @@ -44,7 +45,6 @@ MAKE_ENV+= STATIC="-B static" MAKE_ENV+= STATIC="-static" . endif .else -PLIST_SUBST+= WTMPX="@comment " MAKE_ENV+= STATIC="-static" .endif diff --git a/security/chkrootkit/PLIST b/security/chkrootkit/PLIST index 55fbf3f6c7d..faf08a5de8a 100644 --- a/security/chkrootkit/PLIST +++ b/security/chkrootkit/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/28 10:41:59 adrianp Exp $ -${WTMPX}bin/check_wtmpx +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:09 jlam Exp $ +${PLIST.wtmpx}bin/check_wtmpx bin/chkdirs bin/chklastlog bin/chkproc diff --git a/security/cyrus-saslauthd/PLIST b/security/cyrus-saslauthd/PLIST index 7513dd9df83..3667f2adf6a 100644 --- a/security/cyrus-saslauthd/PLIST +++ b/security/cyrus-saslauthd/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.7 2006/10/04 12:07:53 obache Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:09 jlam Exp $ bin/saslcache bin/testsaslauthd man/man8/saslauthd.8 sbin/saslauthd sbin/testsaslauthd -${LDAP}share/doc/cyrus-saslauthd/LDAP_SASLAUTHD -${LDAP}@dirrm share/doc/cyrus-saslauthd +${PLIST.ldap}share/doc/cyrus-saslauthd/PLIST.ldap_SASLAUTHD +${PLIST.ldap}@dirrm share/doc/cyrus-saslauthd share/examples/rc.d/saslauthd diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk index e03d0db01ba..10b71f54ff9 100644 --- a/security/cyrus-saslauthd/options.mk +++ b/security/cyrus-saslauthd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2006/05/31 18:22:25 ghen Exp $ +# $NetBSD: options.mk,v 1.11 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-saslauthd PKG_SUPPORTED_OPTIONS= pam kerberos ldap gssapi @@ -18,15 +18,15 @@ CONFIGURE_ARGS+= --without-pam ### ### Authentication against information stored in an LDAP directory ### +PLIST_VARS+= ldap .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" . include "../../security/cyrus-sasl/buildlink3.mk" BUILDLINK_INCDIRS.cyrus-sasl= include/sasl CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} -PLIST_SUBST+= LDAP= +PLIST.ldap= yes .else CONFIGURE_ARGS+= --without-ldap -PLIST_SUBST+= LDAP="@comment " .endif ### diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST index e89944db87b..4107bbe658f 100644 --- a/security/gnupg/PLIST +++ b/security/gnupg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2007/03/07 11:31:24 drochner Exp $ +@comment $NetBSD: PLIST,v 1.22 2008/04/12 22:43:09 jlam Exp $ bin/gpg bin/gpg-zip bin/gpgsplit @@ -7,7 +7,7 @@ info/gnupg1.info libexec/gnupg/gpgkeys_curl libexec/gnupg/gpgkeys_finger libexec/gnupg/gpgkeys_hkp -${OPENLDAP}libexec/gnupg/gpgkeys_ldap +${PLIST.ldap}libexec/gnupg/gpgkeys_ldap man/man1/gpg.1 man/man1/gpg.ru.1 man/man1/gpgv.1 diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk index e778f7057e1..cde9bbb4348 100644 --- a/security/gnupg/options.mk +++ b/security/gnupg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.12 2007/10/31 12:29:33 rillig Exp $ +# $NetBSD: options.mk,v 1.13 2008/04/12 22:43:09 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg PKG_SUPPORTED_OPTIONS= curl idea ldap @@ -43,16 +43,16 @@ pre-configure: ${GZCAT} ${DISTDIR}/idea.c.gz > ${WRKSRC}/cipher/idea.c .endif +PLIST_VARS+= ldap .if !empty(PKG_OPTIONS:Mldap) .include "../../databases/openldap-client/buildlink3.mk" -PLIST_SUBST+= OPENLDAP="" +PLIST.ldap= yes .else -CONFIGURE_ARGS+=--disable-ldap -PLIST_SUBST+= OPENLDAP="@comment " +CONFIGURE_ARGS+= --disable-ldap .endif .if !empty(PKG_OPTIONS:Mm68060-optimized) # be more efficient on M68060 machines -CONFIGURE_ENV+= M68060=${M68060:Q} -CFLAGS+= -m68060 +CONFIGURE_ENV+= M68060=${M68060:Q} +CFLAGS+= -m68060 .endif diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index ef25d742f9e..3bf7fe286f9 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2008/03/04 22:37:46 jlam Exp $ +# $NetBSD: Makefile,v 1.69 2008/04/12 22:43:09 jlam Exp $ DISTNAME= heimdal-1.1 CATEGORIES= security @@ -52,10 +52,9 @@ CONFIGURE_ENV.SunOS+= ac_cv_header_vis_h=no CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline +PLIST_VARS+= afskauth .if ${OPSYS} == "IRIX" -PLIST_SUBST+= IF_IRIX="" -.else -PLIST_SUBST+= IF_IRIX="@comment " +PLIST.afskauth= yes .endif OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${ROOT_USER} ${ROOT_GROUP} 0700 diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST index 9099fee3228..a119cb9d6c0 100644 --- a/security/heimdal/PLIST +++ b/security/heimdal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2008/02/28 08:14:41 jlam Exp $ +@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:09 jlam Exp $ bin/afslog bin/compile_et bin/gss @@ -88,7 +88,7 @@ include/krb5/ss/ss.h include/krb5/xdbm.h info/heimdal.info info/hx509.info -${IF_IRIX}lib/afskauthlib.so +${PLIST.afskauth}lib/afskauthlib.so lib/libasn1.la lib/libcom_err.la lib/libeditline.la @@ -825,11 +825,11 @@ sbin/iprop-log sbin/kadmin sbin/kstash sbin/ktutil -${LDAP}share/examples/heimdal/hdb.schema +${PLIST.ldap}share/examples/heimdal/hdb.schema share/examples/rc.d/kadmind share/examples/rc.d/kcm share/examples/rc.d/kdc share/examples/rc.d/kpasswdd -${LDAP}@dirrm share/examples/heimdal +${PLIST.ldap}@dirrm share/examples/heimdal @dirrm include/krb5/kadm5 @dirrm include/krb5/ss diff --git a/security/heimdal/options.mk b/security/heimdal/options.mk index b1c27bbcc44..8e7559aa27a 100644 --- a/security/heimdal/options.mk +++ b/security/heimdal/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2008/02/28 14:11:55 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:10 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.heimdal PKG_SUPPORTED_OPTIONS= inet6 kerberos-prefix-cmds ldap @@ -18,18 +18,17 @@ CONFIGURE_ARGS+= --without-ipv6 ### ### Support using LDAP as a KDC backend. ### +PLIST_VARS+= ldap .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-openldap=${BUILDLINK_PREFIX.openldap-client} -PLIST_SUBST+= LDAP="" +PLIST.ldap= yes post-install: heimdal-ldap-schema heimdal-ldap-schema: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/heimdal ${INSTALL_DATA} ${WRKSRC}/lib/hdb/hdb.schema \ ${DESTDIR}${PREFIX}/share/examples/heimdal -.else -PLIST_SUBST+= LDAP="@comment " .endif ### diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common index 6d6a0641b8d..6cf4171b92d 100644 --- a/security/openssl/PLIST.common +++ b/security/openssl/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.12 2008/01/17 06:42:47 tnn Exp $ +@comment $NetBSD: PLIST.common,v 1.13 2008/04/12 22:43:12 jlam Exp $ bin/c_rehash bin/openssl include/openssl/aes.h @@ -29,14 +29,14 @@ include/openssl/engine.h include/openssl/err.h include/openssl/evp.h include/openssl/hmac.h -${IDEA}include/openssl/idea.h +${PLIST.idea}include/openssl/idea.h include/openssl/krb5_asn.h include/openssl/kssl.h include/openssl/lhash.h include/openssl/md2.h include/openssl/md4.h include/openssl/md5.h -${MDC2}include/openssl/mdc2.h +${PLIST.mdc2}include/openssl/mdc2.h include/openssl/obj_mac.h include/openssl/objects.h include/openssl/ocsp.h @@ -52,7 +52,7 @@ include/openssl/pqueue.h include/openssl/rand.h include/openssl/rc2.h include/openssl/rc4.h -${RC5}include/openssl/rc5.h +${PLIST.rc5}include/openssl/rc5.h include/openssl/ripemd.h include/openssl/rsa.h include/openssl/safestack.h diff --git a/security/openssl/options.mk b/security/openssl/options.mk index 47e309ff069..25696de0f5a 100644 --- a/security/openssl/options.mk +++ b/security/openssl/options.mk @@ -1,11 +1,14 @@ -# $NetBSD: options.mk,v 1.4 2008/01/17 06:42:48 tnn Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openssl PKG_SUPPORTED_OPTIONS= idea mdc2 rc5 + .include "../../mk/bsd.options.mk" OPENSSL_LICENSE= # empty +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + ### ### Support for the IDEA algorithm ### US Patent: 5214703 @@ -14,10 +17,9 @@ OPENSSL_LICENSE= # empty ### .if !empty(PKG_OPTIONS:Midea) OPENSSL_LICENSE+= idea-license -PLIST_SUBST+= IDEA= +PLIST.idea= yes .else CONFIGURE_ARGS+= no-idea -PLIST_SUBST+= IDEA="@comment " .endif ### @@ -28,10 +30,9 @@ PLIST_SUBST+= IDEA="@comment " # A license file is needed. OPENSSL_LICENSE+= mdc2-nonlicense CONFIGURE_ARGS+= enable-mdc2 -PLIST_SUBST+= MDC2= +PLIST.mdc2= yes .else CONFIGURE_ARGS+= no-mdc2 -PLIST_SUBST+= MDC2="@comment " .endif ### @@ -42,10 +43,9 @@ PLIST_SUBST+= MDC2="@comment " # A license file is needed. OPENSSL_LICENSE+= rc5-nonlicense CONFIGURE_ARGS+= enable-rc5 -PLIST_SUBST+= RC5= +PLIST.rc5= yes .else CONFIGURE_ARGS+= no-rc5 -PLIST_SUBST+= RC5="@comment " .endif .if !empty(OPENSSL_LICENSE) diff --git a/security/pinentry/PLIST b/security/pinentry/PLIST index dcbb86e9536..70a6f2a73b3 100644 --- a/security/pinentry/PLIST +++ b/security/pinentry/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.6 2006/11/22 11:56:14 shannonjr Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:12 jlam Exp $ bin/pinentry bin/pinentry-curses info/pinentry.info -${USE_GTK}bin/pinentry-gtk -${USE_GTK2}bin/pinentry-gtk-2 -${USE_QT}bin/pinentry-qt +${PLIST.gtk}bin/pinentry-gtk +${PLIST.gtk2}bin/pinentry-gtk-2 +${PLIST.qt}bin/pinentry-qt diff --git a/security/pinentry/options.mk b/security/pinentry/options.mk index 5fbfce06b6e..f950d2ccaff 100644 --- a/security/pinentry/options.mk +++ b/security/pinentry/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2006/10/11 18:53:38 shannonjr Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $ # # XXX This usage of bsd.options.mk is incorrect. The package should @@ -11,22 +11,22 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.pinentry PKG_SUPPORTED_OPTIONS= gtk gtk2 qt .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Mgtk) CONFIGURE_ARGS+= --enable-pinentry-gtk -PLIST_SUBST+= USE_GTK= +PLIST.gtk= yes . include "../../x11/gtk/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-pinentry-gtk -PLIST_SUBST+= USE_GTK='@comment ' .endif .if !empty(PKG_OPTIONS:Mgtk2) CONFIGURE_ARGS+= --enable-pinentry-gtk2 -PLIST_SUBST+= USE_GTK2= +PLIST.gtk2= yes . include "../../x11/gtk2/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-pinentry-gtk2 -PLIST_SUBST+= USE_GTK2='@comment ' .endif .if !empty(PKG_OPTIONS:Mqt) @@ -36,9 +36,8 @@ CONFIGURE_ARGS+= --enable-pinentry-qt CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} CONFIGURE_ARGS+= --with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include CONFIGURE_ARGS+= --with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib -PLIST_SUBST+= USE_QT= +PLIST.qt= yes . include "../../x11/qt3-libs/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-pinentry-qt -PLIST_SUBST+= USE_QT='@comment ' .endif diff --git a/security/ssh2/PLIST b/security/ssh2/PLIST index 3907e921708..aca5c85ab13 100644 --- a/security/ssh2/PLIST +++ b/security/ssh2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:05 reed Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:12 jlam Exp $ bin/scp bin/scp2 bin/sftp @@ -10,8 +10,8 @@ bin/ssh-add bin/ssh-add2 bin/ssh-agent bin/ssh-agent2 -${X11_SUPPORT}bin/ssh-askpass -${X11_SUPPORT}bin/ssh-askpass2 +${PLIST.x11}bin/ssh-askpass +${PLIST.x11}bin/ssh-askpass2 bin/ssh-dummy-shell bin/ssh-keygen bin/ssh-keygen2 diff --git a/security/ssh2/options.mk b/security/ssh2/options.mk index eeb0c8e7d76..85111a30286 100644 --- a/security/ssh2/options.mk +++ b/security/ssh2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/08/09 20:28:10 tnn Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:12 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ssh2 PKG_SUPPORTED_OPTIONS= x11 @@ -6,9 +6,11 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= x11 + .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --with-x -PLIST_SUBST+= X11_SUPPORT= +PLIST.x11= yes .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" BUILDLINK_DEPMETHOD.libXt?= build @@ -19,5 +21,4 @@ CONFIGURE_ENV+= ac_cv_path_XAUTH_PATH=${PREFIX:Q}/bin/xauth .endif .else CONFIGURE_ARGS+= --without-x -PLIST_SUBST+= X11_SUPPORT='@comment ' .endif diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile index 486bf80eda1..686c1fcb18d 100644 --- a/sysutils/amanda-server/Makefile +++ b/sysutils/amanda-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2008/02/15 16:23:09 gdt Exp $ +# $NetBSD: Makefile,v 1.44 2008/04/12 22:43:12 jlam Exp $ PKGNAME= amanda-server-${VERS} SVR4_PKGNAME= amase @@ -39,11 +39,9 @@ CONFIGURE_ENV+= ac_cv_lib_readline_readline=no # ${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \ # done -.if ${OPSYS} == "SunOS" -PLIST_SRC= ${WRKDIR}/PLIST-src - -pre-install: - ${SED} -e 's|^libexec/chg-scsi$$|@comment libexec/chg-scsi needs headers...|' ${PKGDIR}/PLIST > ${PLIST_SRC} +PLIST_VARS+= scsi +.if ${OPSYS} != "SunOS" +PLIST.scsi= yes .endif .include "../../sysutils/amanda-common/buildlink3.mk" diff --git a/sysutils/amanda-server/PLIST b/sysutils/amanda-server/PLIST index 9f4d1f9897c..1df17795544 100644 --- a/sysutils/amanda-server/PLIST +++ b/sysutils/amanda-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2008/02/15 16:23:09 gdt Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:12 jlam Exp $ lib/libamserver.la lib/libamtape.la lib/librestore.la @@ -21,7 +21,7 @@ libexec/chg-multi libexec/chg-null libexec/chg-rait libexec/chg-rth -libexec/chg-scsi +${PLIST.scsi}libexec/chg-scsi libexec/chg-zd-mtx libexec/chunker libexec/driver diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST index 360130436cd..e2617297108 100644 --- a/sysutils/apcupsd/PLIST +++ b/sysutils/apcupsd/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.10 2007/10/29 12:40:58 sborrill Exp $ -${CGI}libexec/cgi-bin/upsstats.cgi -${CGI}libexec/cgi-bin/upsfstats.cgi -${CGI}libexec/cgi-bin/upsimage.cgi -${CGI}libexec/cgi-bin/multimon.cgi +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:12 jlam Exp $ +${PLIST.cgi}libexec/cgi-bin/upsstats.cgi +${PLIST.cgi}libexec/cgi-bin/upsfstats.cgi +${PLIST.cgi}libexec/cgi-bin/upsimage.cgi +${PLIST.cgi}libexec/cgi-bin/multimon.cgi sbin/apcaccess sbin/apctest sbin/apcupsd diff --git a/sysutils/apcupsd/options.mk b/sysutils/apcupsd/options.mk index d710560f3b2..ddf04b5f197 100644 --- a/sysutils/apcupsd/options.mk +++ b/sysutils/apcupsd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2007/10/29 12:40:58 sborrill Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:12 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apcupsd PKG_SUPPORTED_OPTIONS= snmp cgi @@ -11,10 +11,9 @@ PKG_SUGGESTED_OPTIONS= snmp cgi CONFIGURE_ARGS+= --enable-snmp # enable SNMP driver .endif +PLIST_VARS+= cgi .if !empty(PKG_OPTIONS:Mcgi) CONFIGURE_ARGS+= --enable-cgi # include CGI support CONFIGURE_ARGS+= --with-cgi-bin=${PREFIX}/libexec/cgi-bin -PLIST_SUBST+= CGI= -.else -PLIST_SUBST+= CGI="@comment " +PLIST.cgi= yes .endif diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index 7efc2b87a1f..e19c0fe16d9 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2008/03/08 01:09:50 tnn Exp $ +# $NetBSD: Makefile,v 1.45 2008/04/12 22:43:12 jlam Exp $ DISTNAME= coreutils-6.10 CATEGORIES= sysutils @@ -35,10 +35,9 @@ CONFIGURE_ENV+= ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes .endif # Exclude programs from PLIST which aren't built on a platform. -.if ${OPSYS} == "Interix" -PLIST_SUBST+= COREUTILS_HAVE_HOSTID="@comment " -.else -PLIST_SUBST+= COREUTILS_HAVE_HOSTID="" +PLIST_VARS+= hostid +.if ${OPSYS} != "Interix" +PLIST.hostid= yes .endif # XXX - this hack is bound to cause fallout on some platform at some point. diff --git a/sysutils/coreutils/PLIST b/sysutils/coreutils/PLIST index f03a96f2656..2424e74e62f 100644 --- a/sysutils/coreutils/PLIST +++ b/sysutils/coreutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2008/03/08 01:06:52 tnn Exp $ +@comment $NetBSD: PLIST,v 1.10 2008/04/12 22:43:12 jlam Exp $ bin/${GNU_PROGRAM_PREFIX}[ bin/${GNU_PROGRAM_PREFIX}base64 bin/${GNU_PROGRAM_PREFIX}basename @@ -30,7 +30,7 @@ bin/${GNU_PROGRAM_PREFIX}fmt bin/${GNU_PROGRAM_PREFIX}fold bin/${GNU_PROGRAM_PREFIX}groups bin/${GNU_PROGRAM_PREFIX}head -${COREUTILS_HAVE_HOSTID}bin/${GNU_PROGRAM_PREFIX}hostid +${PLIST.hostid}bin/${GNU_PROGRAM_PREFIX}hostid bin/${GNU_PROGRAM_PREFIX}id bin/${GNU_PROGRAM_PREFIX}install bin/${GNU_PROGRAM_PREFIX}join diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 12c04436b93..41c213938ff 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/03/07 22:40:29 tron Exp $ +# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:12 jlam Exp $ DISTNAME= e2fsprogs-1.40.7 CATEGORIES= sysutils @@ -16,16 +16,13 @@ INFO_FILES= # PLIST .include "../../mk/bsd.prefs.mk" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} + # Only build fsck(8) on platforms that need it. -.if (${OPSYS} != "Linux") -FSCK= "@comment " +PLIST_VARS+= fsck +.if ${OPSYS} == "Linux" +PLIST.fsck= yes .else -FSCK= # empty -.endif -PLIST_SUBST+= FSCK=${FSCK} - -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} -.if !empty(FSCK) CONFIGURE_ARGS+= --disable-fsck .endif diff --git a/sysutils/e2fsprogs/PLIST b/sysutils/e2fsprogs/PLIST index 904fcb200fc..b5687b93e13 100644 --- a/sysutils/e2fsprogs/PLIST +++ b/sysutils/e2fsprogs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2008/03/07 22:40:29 tron Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:12 jlam Exp $ bin/chattr bin/lsattr bin/uuidgen @@ -18,7 +18,7 @@ man/man8/e2image.8 man/man8/e2label.8 man/man8/filefrag.8 man/man8/findfs.8 -${FSCK}man/man8/fsck.8 +${PLIST.fsck}man/man8/fsck.8 man/man8/fsck.ext2.8 man/man8/fsck.ext3.8 man/man8/logsave.8 @@ -38,7 +38,7 @@ sbin/e2image sbin/e2label sbin/filefrag sbin/findfs -${FSCK}sbin/fsck +${PLIST.fsck}sbin/fsck sbin/fsck.ext2 sbin/fsck.ext3 sbin/logsave diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 7722f97f224..7496f8386cb 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2007/10/07 18:00:55 xtraeme Exp $ +# $NetBSD: Makefile,v 1.49 2008/04/12 22:43:12 jlam Exp $ DISTNAME= grub-0.97 PKGREVISION= 8 @@ -25,9 +25,10 @@ BUILD_DEFS+= GRUB_SCAN_ARGS .include "../../mk/curses.buildlink3.mk" +PLIST_VARS+= netboot .if defined(GRUB_NETWORK_CARDS) CONFIGURE_ARGS+= --enable-diskless -PLIST_SUBST+= NETBOOT= +PLIST.netboot= yes .for nic in ${GRUB_NETWORK_CARDS} CONFIGURE_ARGS+= --enable-${nic} @@ -38,8 +39,6 @@ grub-netboot-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \ ${PREFIX}/share/doc/grub -.else -PLIST_SUBST+= NETBOOT="@comment " .endif .if defined(GRUB_PRESET_COMMAND) && !empty(GRUB_PRESET_COMMAND) diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST index da0ceb4056a..3e5e8bf77b8 100644 --- a/sysutils/grub/PLIST +++ b/sysutils/grub/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2006/04/07 19:54:17 jlam Exp $ +@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:12 jlam Exp $ bin/mbchk info/grub.info info/multiboot.info @@ -13,8 +13,8 @@ lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/ffs_stage1_5 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/iso9660_stage1_5 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/jfs_stage1_5 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/minix_stage1_5 -${NETBOOT}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/nbgrub -${NETBOOT}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/pxegrub +${PLIST.netboot}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/nbgrub +${PLIST.netboot}lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/pxegrub lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/reiserfs_stage1_5 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage1 lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR}/stage2 @@ -27,7 +27,7 @@ sbin/grub-install sbin/grub-md5-crypt sbin/grub-set-default sbin/grub-terminfo -${NETBOOT}share/doc/grub/README.netboot +${PLIST.netboot}share/doc/grub/README.netboot @dirrm lib/grub/${MACHINE_ARCH}-${LOWER_VENDOR} @dirrm lib/grub -${NETBOOT}@dirrm share/doc/grub +${PLIST.netboot}@dirrm share/doc/grub diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile index 2ec269a29ab..007acb82a8a 100644 --- a/sysutils/libgtop/Makefile +++ b/sysutils/libgtop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2008/03/18 17:46:27 drochner Exp $ +# $NetBSD: Makefile,v 1.18 2008/04/12 22:43:12 jlam Exp $ DISTNAME= libgtop-2.20.2 CATEGORIES= sysutils gnome @@ -43,18 +43,17 @@ PRINT_PLIST_AWK+= /^include\/libgtop-2.0\/glibtop_suid.h$$/ \ CONFIGURE_ENV+= fu_cv_sys_mounted_getmntinfo=yes .endif +PLIST_VARS+= server suid.h .if ${OPSYS} == "Linux" -PLIST_SUBST+= LIBGTOP_SERVER="@comment " -PLIST_SUBST+= LIBGTOP_SUID_H="@comment " +# nothing .elif ${OPSYS} == "SunOS" -PLIST_SUBST+= LIBGTOP_SERVER="" -PLIST_SUBST+= LIBGTOP_SUID_H="@comment " +PLIST.server= yes .else -PLIST_SUBST+= LIBGTOP_SERVER="" -PLIST_SUBST+= LIBGTOP_SUID_H="" +PLIST.server= yes +PLIST.suid.h= yes .endif -.if ${OPSYS} != "Linux" +.if defined(PLIST.server) post-install: ${CHMOD} g+s ${PREFIX}/bin/libgtop_server2 .endif diff --git a/sysutils/libgtop/PLIST b/sysutils/libgtop/PLIST index d754b73e98b..9062acf7e60 100644 --- a/sysutils/libgtop/PLIST +++ b/sysutils/libgtop/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.5 2007/11/05 19:06:02 drochner Exp $ -${LIBGTOP_SERVER}bin/libgtop_daemon2 -${LIBGTOP_SERVER}bin/libgtop_server2 +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:12 jlam Exp $ +${PLIST.server}bin/libgtop_daemon2 +${PLIST.server}bin/libgtop_server2 include/libgtop-2.0/glibtop.h include/libgtop-2.0/glibtop/close.h include/libgtop-2.0/glibtop/command.h @@ -40,7 +40,7 @@ include/libgtop-2.0/glibtop/uptime.h include/libgtop-2.0/glibtop/version.h include/libgtop-2.0/glibtop_machine.h include/libgtop-2.0/glibtop_server.h -${LIBGTOP_SUID_H}include/libgtop-2.0/glibtop_suid.h +${PLIST.suid.h}include/libgtop-2.0/glibtop_suid.h include/libgtop-2.0/libgtopconfig.h info/libgtop2.info lib/libgtop-2.0.la diff --git a/sysutils/memtestplus/PLIST b/sysutils/memtestplus/PLIST index 53cc38fe6bc..5f9fcf05214 100644 --- a/sysutils/memtestplus/PLIST +++ b/sysutils/memtestplus/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2006/11/01 15:38:15 mlelstv Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:12 jlam Exp $ mdec/memtestplus.bin mdec/memtestplus -${HAVE_ISO}mdec/memtestplus.iso +${PLIST.iso}mdec/memtestplus.iso share/doc/memtestplus/README share/doc/memtestplus/FAQ @unexec ${RMDIR} %D/mdec 2>/dev/null || ${TRUE} diff --git a/sysutils/memtestplus/options.mk b/sysutils/memtestplus/options.mk index 9e892e7c8ce..7b8f3b59b16 100644 --- a/sysutils/memtestplus/options.mk +++ b/sysutils/memtestplus/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2007/12/30 18:40:52 mlelstv Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.memtestplus PKG_SUPPORTED_OPTIONS= iso serialconsole @@ -6,12 +6,11 @@ PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" +PLIST_VARS+= iso .if !empty(PKG_OPTIONS:Miso) BUILD_TARGET= memtest.iso BUILD_DEPENDS+= {cdrtools,cdrtools-ossdvd}>=2.01:../../sysutils/cdrtools -PLIST_SUBST+= HAVE_ISO="" -.else -PLIST_SUBST+= HAVE_ISO="@comment " +PLIST.iso= yes .endif .if !empty(PKG_OPTIONS:Mserialconsole) diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile index 613ac60d075..40b6b1ef60b 100644 --- a/textproc/aspell/Makefile +++ b/textproc/aspell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2008/03/11 18:47:41 tnn Exp $ +# $NetBSD: Makefile,v 1.55 2008/04/12 22:43:13 jlam Exp $ # DISTNAME= aspell-0.60.5 @@ -46,12 +46,12 @@ PKG_SUPPORTED_OPTIONS= # none .include "../../mk/bsd.options.mk" +PLIST_VARS+= filters .if !empty(PKG_OPTIONS:Maspell-loadable-filters) CONFIGURE_ARGS+= --disable-compile-in-filters -PLIST_SUBST+= FILTER="" +PLIST.filters= yes .else CONFIGURE_ARGS+= --enable-compile-in-filters -PLIST_SUBST+= FILTER="@comment " .endif REPLACE_PERL= scripts/aspell-import diff --git a/textproc/aspell/PLIST b/textproc/aspell/PLIST index 7038427ec53..e20ecb103e7 100644 --- a/textproc/aspell/PLIST +++ b/textproc/aspell/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2007/01/06 22:07:42 wiz Exp $ +@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:13 jlam Exp $ bin/aspell bin/aspell-import bin/precat @@ -14,19 +14,19 @@ info/aspell-dev.info info/aspell.info lib/aspell/ccpp.amf lib/aspell/comment.amf -${FILTER}lib/aspell/context-filter.la -${FILTER}lib/aspell/email-filter.la +${PLIST.filters}lib/aspell/context-filter.la +${PLIST.filters}lib/aspell/email-filter.la lib/aspell/email.amf lib/aspell/html.amf lib/aspell/none.amf -${FILTER}lib/aspell/nroff-filter.la +${PLIST.filters}lib/aspell/nroff-filter.la lib/aspell/nroff.amf lib/aspell/perl.amf -${FILTER}lib/aspell/sgml-filter.la +${PLIST.filters}lib/aspell/sgml-filter.la lib/aspell/sgml.amf -${FILTER}lib/aspell/tex-filter.la +${PLIST.filters}lib/aspell/tex-filter.la lib/aspell/tex.amf -${FILTER}lib/aspell/texinfo-filter.la +${PLIST.filters}lib/aspell/texinfo-filter.la lib/aspell/texinfo.amf lib/aspell/url.amf lib/libaspell.la @@ -37,7 +37,7 @@ man/man1/prezip-bin.1 man/man1/pspell-config.1 man/man1/run-with-aspell.1 man/man1/word-list-compress.1 -${FILTER}share/aspell/context-filter.info +${PLIST.filters}share/aspell/context-filter.info share/aspell/cp1250.cmap share/aspell/cp1250.cset share/aspell/cp1251.cmap @@ -57,8 +57,8 @@ share/aspell/cp1257.cset share/aspell/cp1258.cmap share/aspell/cp1258.cset share/aspell/dvorak.kbd -${FILTER}share/aspell/email-filter.info -${FILTER}share/aspell/html-filter.info +${PLIST.filters}share/aspell/email-filter.info +${PLIST.filters}share/aspell/html-filter.info share/aspell/iso-8859-1.cmap share/aspell/iso-8859-1.cset share/aspell/iso-8859-10.cmap @@ -94,13 +94,13 @@ share/aspell/koi8-r.cmap share/aspell/koi8-r.cset share/aspell/koi8-u.cmap share/aspell/koi8-u.cset -${FILTER}share/aspell/nroff-filter.info -${FILTER}share/aspell/sgml-filter.info +${PLIST.filters}share/aspell/nroff-filter.info +${PLIST.filters}share/aspell/sgml-filter.info share/aspell/spell share/aspell/split.kbd share/aspell/standard.kbd -${FILTER}share/aspell/tex-filter.info -${FILTER}share/aspell/texinfo-filter.info +${PLIST.filters}share/aspell/tex-filter.info +${PLIST.filters}share/aspell/texinfo-filter.info share/locale/be/LC_MESSAGES/aspell.mo share/locale/ca/LC_MESSAGES/aspell.mo share/locale/cs/LC_MESSAGES/aspell.mo diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile index 99ac79bdd80..4852ad97824 100644 --- a/textproc/py-docutils/Makefile +++ b/textproc/py-docutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2007/06/17 14:34:12 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2008/04/12 22:43:13 jlam Exp $ DISTNAME= docutils-0.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,10 +17,9 @@ PYDISTUTILSPKG= YES .include "../../lang/python/extension.mk" +PLIST_VARS+= std .if !empty(PYVERSSUFFIX:M2*[12]) -PLIST_SUBST+= PYSTDMODULE="" -.else -PLIST_SUBST+= PYSTDMODULE="@comment " +PLIST.std= yes .endif .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-docutils/PLIST b/textproc/py-docutils/PLIST index 45dd1f42584..314ef42b621 100644 --- a/textproc/py-docutils/PLIST +++ b/textproc/py-docutils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2007/06/17 14:34:12 joerg Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:13 jlam Exp $ bin/rst2html.py bin/rst2latex.py bin/rst2newlatex.py @@ -335,12 +335,12 @@ ${PYSITELIB}/docutils/writers/s5_html/themes/small-white/pretty.css ${PYSITELIB}/roman.py ${PYSITELIB}/roman.pyc ${PYSITELIB}/roman.pyo -${PYSTDMODULE}${PYSITELIB}/optparse.py -${PYSTDMODULE}${PYSITELIB}/optparse.pyc -${PYSTDMODULE}${PYSITELIB}/optparse.pyo -${PYSTDMODULE}${PYSITELIB}/textwrap.py -${PYSTDMODULE}${PYSITELIB}/textwrap.pyc -${PYSTDMODULE}${PYSITELIB}/textwrap.pyo +${PLIST.std}${PYSITELIB}/optparse.py +${PLIST.std}${PYSITELIB}/optparse.pyc +${PLIST.std}${PYSITELIB}/optparse.pyo +${PLIST.std}${PYSITELIB}/textwrap.py +${PLIST.std}${PYSITELIB}/textwrap.pyc +${PLIST.std}${PYSITELIB}/textwrap.pyo @dirrm ${PYSITELIB}/docutils/writers/s5_html/themes/small-white @dirrm ${PYSITELIB}/docutils/writers/s5_html/themes/small-black @dirrm ${PYSITELIB}/docutils/writers/s5_html/themes/medium-white diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile index 315e50f522b..ca02f3a4e4c 100644 --- a/textproc/xerces-c/Makefile +++ b/textproc/xerces-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/11/03 04:29:13 yyamano Exp $ +# $NetBSD: Makefile,v 1.33 2008/04/12 22:43:13 jlam Exp $ # DISTNAME= xerces-c-src_2_7_0 @@ -37,13 +37,13 @@ CONFIGURE_ARGS+= -m inmem # message loader CONFIGURE_ARGS+= -r none # threading CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} +PLIST_VARS+= gnu-iconv native-iconv + CONFIGURE_ARGS.gnu-iconv+= -t IconvGNU # transcoder -PLIST_SUBST.gnu-iconv+= NATIVEICONV="@comment " -PLIST_SUBST.gnu-iconv+= GNUICONV="" +PLIST.gnu-iconv= yes CONFIGURE_ARGS.native-iconv+= -t native # transcoder -PLIST_SUBST.native-iconv+= NATIVEICONV="" -PLIST_SUBST.native-iconv+= GNUICONV="@comment " +PLIST.native-iconv= yes CONFIGURE_ENV+= ${XERCES_ENV} MAKE_ENV+= ${XERCES_ENV} diff --git a/textproc/xerces-c/PLIST b/textproc/xerces-c/PLIST index 674c728d704..5869e66fcc0 100644 --- a/textproc/xerces-c/PLIST +++ b/textproc/xerces-c/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2006/08/22 16:30:46 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:13 jlam Exp $ include/xercesc/dom/DOM.hpp include/xercesc/dom/DOMAttr.hpp include/xercesc/dom/DOMBuilder.hpp @@ -319,8 +319,8 @@ include/xercesc/util/SynchronizedStringPool.hpp include/xercesc/util/TransENameMap.c include/xercesc/util/TransENameMap.hpp include/xercesc/util/TransService.hpp -${GNUICONV}include/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp -${NATIVEICONV}include/xercesc/util/Transcoders/Iconv/IconvTransService.hpp +${PLIST.gnu-iconv}include/xercesc/util/Transcoders/IconvGNU/IconvGNUTransService.hpp +${PLIST.native-iconv}include/xercesc/util/Transcoders/Iconv/IconvTransService.hpp include/xercesc/util/TranscodingException.hpp include/xercesc/util/UTFDataFormatException.hpp include/xercesc/util/UnexpectedEOFException.hpp @@ -514,8 +514,8 @@ lib/libxerces-depdom.so.27.0 @dirrm include/xercesc/validators/DTD @dirrm include/xercesc/validators @dirrm include/xercesc/util/regx -${GNUICONV}@dirrm include/xercesc/util/Transcoders/IconvGNU -${NATIVEICONV}@dirrm include/xercesc/util/Transcoders/Iconv +${PLIST.gnu-iconv}@dirrm include/xercesc/util/Transcoders/IconvGNU +${PLIST.native-iconv}@dirrm include/xercesc/util/Transcoders/Iconv @dirrm include/xercesc/util/Transcoders @dirrm include/xercesc/util/Platforms/${OPSYS} @dirrm include/xercesc/util/Platforms diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile index 2f9e39db597..92930b59907 100644 --- a/wm/compiz/Makefile +++ b/wm/compiz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/03/06 14:53:55 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2008/04/12 22:43:13 jlam Exp $ # DISTNAME= compiz-0.4.0 @@ -29,6 +29,8 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.compiz .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + # this is as much as needed for the basic window decorator .include "../../graphics/cairo/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" @@ -36,20 +38,16 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.compiz .if !empty(PKG_OPTIONS:Mgnome) CONFIGURE_ARGS+= --enable-librsvg -PLIST_SUBST+= GNOME="" +PLIST.gnome= yes .include "../../x11/gnome-control-center/buildlink3.mk" .include "../../wm/metacity/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" -.else -PLIST_SUBST+= GNOME="@comment " .endif .if !empty(PKG_OPTIONS:Mkde) -PLIST_SUBST+= KDE="" +PLIST.kde= yes .include "../../x11/kdebase3/buildlink3.mk" .include "../../sysutils/dbus-qt3/buildlink3.mk" -.else -PLIST_SUBST+= KDE="@comment " .endif # While we don't use threads, we link against libpthread because diff --git a/wm/compiz/PLIST b/wm/compiz/PLIST index ed0eec9f889..576df02f0a9 100644 --- a/wm/compiz/PLIST +++ b/wm/compiz/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.3 2007/09/25 10:54:19 hira Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:13 jlam Exp $ bin/compiz bin/gtk-window-decorator -${KDE}bin/kde-window-decorator +${PLIST.kde}bin/kde-window-decorator include/compiz/compiz.h include/compiz/decoration.h lib/compiz/libannotate.la @@ -21,7 +21,7 @@ lib/compiz/libresize.la lib/compiz/librotate.la lib/compiz/libscale.la lib/compiz/libscreenshot.la -${GNOME}lib/compiz/libsvg.la +${PLIST.gnome}lib/compiz/libsvg.la lib/compiz/libswitcher.la lib/compiz/libwater.la lib/compiz/libwobbly.la @@ -29,12 +29,12 @@ lib/compiz/libzoom.la lib/libdecoration.la lib/pkgconfig/compiz.pc lib/pkgconfig/libdecoration.pc -${GNOME}lib/window-manager-settings/libcompiz.la +${PLIST.gnome}lib/window-manager-settings/libcompiz.la share/compiz/freedesktop.png share/compiz/icon.png share/gconf/schemas/compiz.schemas share/gconf/schemas/gwd.schemas -${GNOME}share/gnome/wm-properties/compiz.desktop +${PLIST.gnome}share/gnome/wm-properties/compiz.desktop share/locale/af/LC_MESSAGES/compiz.mo share/locale/ar/LC_MESSAGES/compiz.mo share/locale/bg/LC_MESSAGES/compiz.mo diff --git a/wm/golem/Makefile b/wm/golem/Makefile index d27767b0d47..7ae6c4a2572 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/11/17 12:04:14 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2008/04/12 22:43:13 jlam Exp $ # DISTNAME= golem-0.0.5 @@ -27,12 +27,11 @@ PKG_SUPPORTED_OPTIONS= esound .include "../../mk/bsd.options.mk" +PLIST_VARS+= esound .if !empty(PKG_OPTIONS:Mesound) CONFIGURE_ARGS+= --enable-sound -PLIST_SUBST+= NOT_SOUND= +PLIST.esound= yes .include "../../audio/esound/buildlink3.mk" -.else -PLIST_SUBST+= NOT_SOUND="@comment " .endif CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" diff --git a/wm/golem/PLIST b/wm/golem/PLIST index 462e7ff5a99..dc878e17730 100644 --- a/wm/golem/PLIST +++ b/wm/golem/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/15 11:19:43 salo Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/04/12 22:43:13 jlam Exp $ bin/golem bin/golem.install lib/golem/plugins/animations.so @@ -9,7 +9,7 @@ lib/golem/plugins/pager.so lib/golem/plugins/pier.so lib/golem/plugins/setroot.so lib/golem/plugins/simple_menus.so -${NOT_SOUND}lib/golem/plugins/sound.so +${PLIST.esound}lib/golem/plugins/sound.so lib/golem/plugins/start_slide.so lib/golem/plugins/wmclass_defs.so man/man1/golem.1 @@ -25,7 +25,7 @@ share/golem/plugins/pier/netscape.xpm share/golem/plugins/pier/rc share/golem/plugins/setroot/rc share/golem/plugins/simple_menus/rc -${NOT_SOUND}share/golem/plugins/sound/rc +${PLIST.esound}share/golem/plugins/sound/rc share/golem/plugins/start_slide/README share/golem/plugins/start_slide/rc share/golem/plugins/wmclass_defs/rc @@ -257,7 +257,7 @@ share/golem/themes/twm/topbar.xpm @dirrm share/golem/themes @dirrm share/golem/plugins/wmclass_defs @dirrm share/golem/plugins/start_slide -${NOT_SOUND}@dirrm share/golem/plugins/sound +${PLIST.esound}@dirrm share/golem/plugins/sound @dirrm share/golem/plugins/simple_menus @dirrm share/golem/plugins/setroot @dirrm share/golem/plugins/pier diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 19561847017..c5e0d45eb45 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2006/10/07 19:16:57 schwarz Exp $ +# $NetBSD: Makefile,v 1.50 2008/04/12 22:43:13 jlam Exp $ DISTNAME= amaya-fullsrc-9.2.1 PKGNAME= ${DISTNAME:S/-fullsrc//} @@ -30,10 +30,11 @@ FONTS_DIRS.ttf+= ${PREFIX}/share/Amaya/fonts REQD_DIRS+= ${PREFIX}/share/Amaya ${PREFIX}/share/Amaya/fonts .include "../../mk/bsd.prefs.mk" + +# GNOME/KDE integration (only for Linux) +PLIST_VARS+= desktop .if ${OPSYS} == "Linux" -PLIST_SUBST+= LINUX= -.else -PLIST_SUBST+= LINUX="@comment " +PLIST.desktop= yes .endif post-extract: diff --git a/www/amaya/PLIST b/www/amaya/PLIST index 3881d8831d4..b4afedafb0e 100644 --- a/www/amaya/PLIST +++ b/www/amaya/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2006/10/07 19:16:57 schwarz Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:13 jlam Exp $ bin/amaya bin/amaya-gtk share/Amaya/amaya/Amaya.svg @@ -1419,8 +1419,8 @@ share/Amaya/resources/xrc/TextDlgWX.xrc share/Amaya/resources/xrc/TitleDlgWX.xrc share/Amaya/resources/xrc/Toolbar.xrc share/Amaya/resources/xrc/WinPrintDlgWX.xrc -${LINUX}share/applications/amaya-8.8.1.desktop -${LINUX}share/pixmaps/amaya-8.8.1.png +${PLIST.desktop}share/applications/amaya-8.8.1.desktop +${PLIST.desktop}share/pixmaps/amaya-8.8.1.png @dirrm share/Amaya/resources/xrc @dirrm share/Amaya/resources/icons/misc @dirrm share/Amaya/resources/icons/22x22 diff --git a/www/apache2/Makefile b/www/apache2/Makefile index eb469418273..ae477a0a82b 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.121 2008/01/21 14:37:22 taca Exp $ +# $NetBSD: Makefile,v 1.122 2008/04/12 22:43:13 jlam Exp $ .include "Makefile.common" @@ -46,11 +46,8 @@ APACHE_MODULES?= ${DFLT_APACHE_MODULES} APACHE_MPM?= prefork CONFIGURE_ARGS+= --with-mpm=${APACHE_MPM:Q} BUILD_DEFS+= APACHE_MPM -.for mpm in prefork worker -PLIST_SUBST.${mpm}?= MPM_COMMENT.${mpm}="@comment " -PLIST_SUBST+= ${PLIST_SUBST.${mpm}} -.endfor -PLIST_SUBST.${APACHE_MPM}= MPM_COMMENT.${APACHE_MPM}= +PLIST_VARS+= mpm-prefork mpm-worker +PLIST.${APACHE_MPM}= yes CONFIGURE_ARGS+= --disable-access CONFIGURE_ARGS+= --disable-auth diff --git a/www/apache2/PLIST b/www/apache2/PLIST index 749cf6a4ef3..e4eaa59e828 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.35 2007/09/07 23:11:40 tron Exp $ +@comment $NetBSD: PLIST,v 1.36 2008/04/12 22:43:13 jlam Exp $ include/httpd/ap_compat.h include/httpd/ap_config.h include/httpd/ap_config_auto.h @@ -9,7 +9,7 @@ include/httpd/ap_mpm.h include/httpd/ap_provider.h include/httpd/ap_regkey.h include/httpd/ap_release.h -${MPM_COMMENT.worker}include/httpd/fdqueue.h +${PLIST.mpm-worker}include/httpd/fdqueue.h include/httpd/http_config.h include/httpd/http_connection.h include/httpd/http_core.h @@ -33,7 +33,7 @@ include/httpd/mpm_default.h include/httpd/os.h include/httpd/pcre.h include/httpd/pcreposix.h -${MPM_COMMENT.worker}include/httpd/pod.h +${PLIST.mpm-worker}include/httpd/pod.h include/httpd/rfc1413.h include/httpd/scoreboard.h include/httpd/ssl_expr.h @@ -79,7 +79,7 @@ sbin/httxt2dbm sbin/logresolve sbin/mkcert sbin/rotatelogs -${SUEXEC_COMMENT}sbin/suexec +${PLIST.suexec}sbin/suexec share/examples/httpd/highperformance-std.conf share/examples/httpd/httpd-std.conf share/examples/httpd/magic diff --git a/www/apache2/options.mk b/www/apache2/options.mk index 072af02318b..0726f306c94 100644 --- a/www/apache2/options.mk +++ b/www/apache2/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.7 2007/07/04 20:55:03 jlam Exp $ +# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec .include "../../mk/bsd.options.mk" +PLIST_VARS+= suexec .if !empty(PKG_OPTIONS:Msuexec) PKG_USERS_VARS+= APACHE_USER BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH @@ -23,7 +24,5 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ APACHE_MODULES+= suexec CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS -PLIST_SUBST+= SUEXEC_COMMENT= -.else -PLIST_SUBST+= SUEXEC_COMMENT="@comment " +PLIST.suexec= yes .endif diff --git a/www/apache22/PLIST b/www/apache22/PLIST index 33f063e7302..d5420596657 100644 --- a/www/apache22/PLIST +++ b/www/apache22/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2008/01/21 15:07:10 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:13 jlam Exp $ include/httpd/ap_compat.h include/httpd/ap_config.h include/httpd/ap_config_auto.h @@ -75,7 +75,7 @@ sbin/httxt2dbm sbin/logresolve sbin/mkcert sbin/rotatelogs -${SUEXEC_COMMENT}sbin/suexec +${PLIST.suexec}sbin/suexec share/examples/httpd/extra/httpd-autoindex.conf share/examples/httpd/extra/httpd-dav.conf share/examples/httpd/extra/httpd-default.conf diff --git a/www/apache22/options.mk b/www/apache22/options.mk index 57c12e5f48a..6933435a6ae 100644 --- a/www/apache22/options.mk +++ b/www/apache22/options.mk @@ -1,10 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2007/07/04 20:55:04 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= suexec .include "../../mk/bsd.options.mk" +PLIST_VARS+= suexec .if !empty(PKG_OPTIONS:Msuexec) PKG_USERS_VARS+= APACHE_USER BUILD_DEFS+= VARBASE APACHE_SUEXEC_PATH @@ -23,7 +24,5 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ APACHE_MODULES+= suexec CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS -PLIST_SUBST+= SUEXEC_COMMENT= -.else -PLIST_SUBST+= SUEXEC_COMMENT="@comment " +PLIST.suexec= yes .endif diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 3dafc71a672..f7908b3e006 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/10/29 13:11:11 uebayasi Exp $ +# $NetBSD: Makefile,v 1.22 2008/04/12 22:43:13 jlam Exp $ DISTNAME= emacs-w3m-1.4.4 PKGREVISION= 1 @@ -30,11 +30,10 @@ SUBST_SED.fix-icondir= -e 's|etc/images/w3m|etc/w3m|g' \ .include "../../mk/emacs.mk" # GNU Emacs 21 or later and XEmacs have GUI support +PLIST_VARS+= gui .if (${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} > 20) || \ ${EMACS_FLAVOR} == "xemacs" -PLIST_SUBST+= FOR_gui="" -.else -PLIST_SUBST+= FOR_gui="@comment " +PLIST.gui= yes .endif DOCUMENTS= COPYING ChangeLog ChangeLog.1 README README.ja diff --git a/www/emacs-w3m/PLIST b/www/emacs-w3m/PLIST index 4b4e7a0d7c9..97777abbaab 100644 --- a/www/emacs-w3m/PLIST +++ b/www/emacs-w3m/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.10 2007/10/29 13:11:11 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.11 2008/04/12 22:43:13 jlam Exp $ ${EMACS_LISPPREFIX}/w3m/ChangeLog ${EMACS_LISPPREFIX}/w3m/ChangeLog.1 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el -${FOR_mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc +${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-w3m.elc ${EMACS_LISPPREFIX}/w3m/mime-w3m.el ${EMACS_LISPPREFIX}/w3m/mime-w3m.elc ${EMACS_LISPPREFIX}/w3m/octet.el @@ -68,7 +68,7 @@ ${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc ${EMACS_LISPPREFIX}/w3m/w3m.el ${EMACS_LISPPREFIX}/w3m/w3m.elc ${EMACS_LISPPREFIX}/w3m/mew-shimbun.el -${FOR_mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc +${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc ${EMACS_LISPPREFIX}/w3m/w3m-ccl.el ${EMACS_LISPPREFIX}/w3m/w3m-favicon.el ${EMACS_LISPPREFIX}/w3m/w3m-filter.el @@ -317,27 +317,27 @@ ${ETCDIR}/ChangeLog ${ETCDIR}/ChangeLog.1 ${ETCDIR}/README ${ETCDIR}/README.ja -${FOR_gui}${ETCDIR}/antenna-up.xpm -${FOR_gui}${ETCDIR}/back-disabled.xpm -${FOR_gui}${ETCDIR}/back-up.xpm -${FOR_gui}${ETCDIR}/copy-up.xpm -${FOR_gui}${ETCDIR}/db-history-up.xpm -${FOR_gui}${ETCDIR}/forward-disabled.xpm -${FOR_gui}${ETCDIR}/forward-up.xpm -${FOR_gui}${ETCDIR}/history-up.xpm -${FOR_gui}${ETCDIR}/home-up.xpm -${FOR_gui}${ETCDIR}/image-up.xpm -${FOR_gui}${ETCDIR}/open-up.xpm -${FOR_gui}${ETCDIR}/parent-disabled.xpm -${FOR_gui}${ETCDIR}/parent-up.xpm -${FOR_gui}${ETCDIR}/reload-up.xpm -${FOR_gui}${ETCDIR}/search-up.xpm -${FOR_gui}${ETCDIR}/spinner.gif -${FOR_gui}${ETCDIR}/state-00.xpm -${FOR_gui}${ETCDIR}/state-01.xpm -${FOR_gui}${ETCDIR}/state-10.xpm -${FOR_gui}${ETCDIR}/state-11.xpm -${FOR_gui}${ETCDIR}/weather-up.xpm +${PLIST.gui}${ETCDIR}/antenna-up.xpm +${PLIST.gui}${ETCDIR}/back-disabled.xpm +${PLIST.gui}${ETCDIR}/back-up.xpm +${PLIST.gui}${ETCDIR}/copy-up.xpm +${PLIST.gui}${ETCDIR}/db-history-up.xpm +${PLIST.gui}${ETCDIR}/forward-disabled.xpm +${PLIST.gui}${ETCDIR}/forward-up.xpm +${PLIST.gui}${ETCDIR}/history-up.xpm +${PLIST.gui}${ETCDIR}/home-up.xpm +${PLIST.gui}${ETCDIR}/image-up.xpm +${PLIST.gui}${ETCDIR}/open-up.xpm +${PLIST.gui}${ETCDIR}/parent-disabled.xpm +${PLIST.gui}${ETCDIR}/parent-up.xpm +${PLIST.gui}${ETCDIR}/reload-up.xpm +${PLIST.gui}${ETCDIR}/search-up.xpm +${PLIST.gui}${ETCDIR}/spinner.gif +${PLIST.gui}${ETCDIR}/state-00.xpm +${PLIST.gui}${ETCDIR}/state-01.xpm +${PLIST.gui}${ETCDIR}/state-10.xpm +${PLIST.gui}${ETCDIR}/state-11.xpm +${PLIST.gui}${ETCDIR}/weather-up.xpm info/emacs-w3m-ja.info info/emacs-w3m.info @dirrm ${EMACS_LISPPREFIX}/w3m diff --git a/www/emacs-w3m/options.mk b/www/emacs-w3m/options.mk index 9a611060270..b798cbe175d 100644 --- a/www/emacs-w3m/options.mk +++ b/www/emacs-w3m/options.mk @@ -1,13 +1,12 @@ -# $NetBSD: options.mk,v 1.1 2007/10/29 13:11:11 uebayasi Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs-w3m PKG_SUPPORTED_OPTIONS= emacs-w3m-mew .include "../../mk/bsd.options.mk" +PLIST_VARS+= mew .if !empty(PKG_OPTIONS:Memacs-w3m-mew) .include "../../mail/mew/buildlink3.mk" -PLIST_SUBST+= FOR_mew= -.else -PLIST_SUBST+= FOR_mew="@comment " +PLIST.mew= yes .endif diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 480ea6a0d80..7024be4f878 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2008/01/02 15:39:57 reed Exp $ +# $NetBSD: Makefile,v 1.11 2008/04/12 22:43:13 jlam Exp $ # DISTNAME= ikiwiki_2.15 @@ -47,13 +47,13 @@ DEPENDS+= p5-PerlMagick-[0-9]*:../../graphics/p5-PerlMagick DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base .endif +PLIST_VARS+= w3m .if !empty(PKG_OPTIONS:Mw3m) DEPENDS+= w3m-[0-9]*:../../www/w3m -PLIST_SUBST+= W3M="" +PLIST.w3m= yes SUBST_SED.makefile+= -e 's,/lib/w3m/cgi-bin,/libexec/w3m/cgi-bin,' INSTALLATION_DIRS+= share/doc/ikiwiki/w3mmode .else -PLIST_SUBST+= W3M="@comment " SUBST_SED.makefile+= -e 's,^\(.*install .*/lib/w3m/cgi-bin\),\#\1,' .endif diff --git a/www/ikiwiki/PLIST b/www/ikiwiki/PLIST index b978073784e..465495a2bc9 100644 --- a/www/ikiwiki/PLIST +++ b/www/ikiwiki/PLIST @@ -1,18 +1,18 @@ -@comment $NetBSD: PLIST,v 1.3 2007/12/05 04:09:53 reed Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:13 jlam Exp $ bin/ikiwiki bin/ikiwiki-makerepo bin/ikiwiki-update-wikilist lib/ikiwiki/plugins/externaldemo lib/ikiwiki/plugins/rst -${W3M}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi +${PLIST.w3m}libexec/w3m/cgi-bin/ikiwiki-w3m.cgi man/man1/ikiwiki-makerepo.1 man/man1/ikiwiki-update-wikilist.1 man/man1/ikiwiki.1 man/man8/ikiwiki-mass-rebuild.8 sbin/ikiwiki-mass-rebuild share/doc/ikiwiki/ikiwiki.setup -${W3M}share/doc/ikiwiki/w3mmode.html -${W3M}share/doc/ikiwiki/w3mmode/ikiwiki.setup +${PLIST.w3m}share/doc/ikiwiki/w3mmode.html +${PLIST.w3m}share/doc/ikiwiki/w3mmode/ikiwiki.setup share/ikiwiki/basewiki/blog.mdwn share/ikiwiki/basewiki/favicon.ico share/ikiwiki/basewiki/helponformatting.mdwn @@ -96,8 +96,8 @@ share/locale/vi/LC_MESSAGES/ikiwiki.mo @dirrm share/ikiwiki/basewiki/subpage @dirrm share/ikiwiki/basewiki @dirrm share/ikiwiki -${W3M}@dirrm share/doc/ikiwiki/w3mmode +${PLIST.w3m}@dirrm share/doc/ikiwiki/w3mmode @dirrm share/doc/ikiwiki -${W3M}@dirrm libexec/w3m/cgi-bin +${PLIST.w3m}@dirrm libexec/w3m/cgi-bin @dirrm lib/ikiwiki/plugins @dirrm lib/ikiwiki diff --git a/www/libwww/Makefile b/www/libwww/Makefile index d374951a1bf..46e3a27284b 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2008/03/11 18:47:41 tnn Exp $ +# $NetBSD: Makefile,v 1.78 2008/04/12 22:43:13 jlam Exp $ DISTNAME= w3c-libwww-5.4.0 PKGNAME= libwww-5.4.0 @@ -47,16 +47,16 @@ pre-configure: CONFIGURE_ARGS+= --with-regex .endif +PLIST_VARS+= md5 .if ${OPSYS} == "SunOS" -# Solaris has a /usr/lib/libmd5 which seems to be enouth, and +# Solaris has a /usr/lib/libmd5 which seems to be enough, and # /usr/local/lib/libmd5 breaks /usr/lib/librt -CONFIGURE_ARGS+= --without-md5 -PLIST_SUBST+= MD5LIB="@comment " +CONFIGURE_ARGS+= --without-md5 .else +PLIST.md5= yes . if !exists(/usr/include/md5.h) CONFIGURE_ARGS+= --with-md5=${SSLBASE:Q} . endif -PLIST_SUBST+= MD5LIB="" .endif .include "../../devel/zlib/buildlink3.mk" diff --git a/www/libwww/PLIST b/www/libwww/PLIST index 429f4e4ddcd..b843948d8e6 100644 --- a/www/libwww/PLIST +++ b/www/libwww/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2005/05/31 20:52:00 salo Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:13 jlam Exp $ bin/libwww-config bin/w3c bin/webbot @@ -163,7 +163,7 @@ include/w3c-libwww/WWWZip.h include/w3c-libwww/wwwsys.h include/w3c-libwww/xmlparse.h include/wwwconf.h -${MD5LIB}lib/libmd5.la +${PLIST.md5}lib/libmd5.la lib/libpics.la lib/libwwwapp.la lib/libwwwcache.la diff --git a/www/py-django/PLIST b/www/py-django/PLIST index 94c2ea5626e..6d10018b7dc 100644 --- a/www/py-django/PLIST +++ b/www/py-django/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2007/08/11 17:20:16 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2008/04/12 22:43:13 jlam Exp $ bin/django-admin.py ${PYSITELIB}/django/__init__.py ${PYSITELIB}/django/__init__.pyc @@ -691,21 +691,21 @@ ${PYSITELIB}/django/db/backends/dummy/creation.pyo ${PYSITELIB}/django/db/backends/dummy/introspection.py ${PYSITELIB}/django/db/backends/dummy/introspection.pyc ${PYSITELIB}/django/db/backends/dummy/introspection.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/__init__.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/__init__.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/__init__.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/base.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/base.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/base.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/client.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/client.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/client.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/creation.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/creation.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/creation.pyo -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/introspection.py -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/introspection.pyc -${COND_MYSQL}${PYSITELIB}/django/db/backends/mysql/introspection.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/__init__.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/base.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/client.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/creation.pyo +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.py +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.pyc +${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.pyo ${PYSITELIB}/django/db/backends/mysql_old/__init__.py ${PYSITELIB}/django/db/backends/mysql_old/__init__.pyc ${PYSITELIB}/django/db/backends/mysql_old/__init__.pyo @@ -721,51 +721,51 @@ ${PYSITELIB}/django/db/backends/mysql_old/creation.pyo ${PYSITELIB}/django/db/backends/mysql_old/introspection.py ${PYSITELIB}/django/db/backends/mysql_old/introspection.pyc ${PYSITELIB}/django/db/backends/mysql_old/introspection.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/__init__.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/base.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/base.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/base.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/client.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/client.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/client.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/creation.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/creation.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/creation.pyo -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/introspection.py -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyc -${COND_PSYCOPG1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyo -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.py -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyc -${COND_PSYCOPG2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/__init__.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/base.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/base.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/base.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/client.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/client.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/client.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/creation.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/creation.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/creation.pyo -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/introspection.py -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyc -${COND_SQLITE}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/__init__.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/base.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/client.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/creation.pyo +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.py +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyc +${PLIST.psycopg1}${PYSITELIB}/django/db/backends/postgresql/introspection.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/__init__.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/base.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/client.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/creation.pyo +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.py +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyc +${PLIST.psycopg2}${PYSITELIB}/django/db/backends/postgresql_psycopg2/introspection.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/__init__.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/base.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/client.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/creation.pyo +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.py +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyc +${PLIST.sqlite}${PYSITELIB}/django/db/backends/sqlite3/introspection.pyo ${PYSITELIB}/django/db/backends/util.py ${PYSITELIB}/django/db/backends/util.pyc ${PYSITELIB}/django/db/backends/util.pyo @@ -1095,11 +1095,11 @@ ${PYSITELIB}/django/views/static.pyo @dirrm ${PYSITELIB}/django/dispatch @dirrm ${PYSITELIB}/django/db/models/fields @dirrm ${PYSITELIB}/django/db/models -${COND_SQLITE}@dirrm ${PYSITELIB}/django/db/backends/sqlite3 -${COND_PSYCOPG2}@dirrm ${PYSITELIB}/django/db/backends/postgresql_psycopg2 -${COND_PSYCOPG1}@dirrm ${PYSITELIB}/django/db/backends/postgresql +${PLIST.sqlite}@dirrm ${PYSITELIB}/django/db/backends/sqlite3 +${PLIST.psycopg2}@dirrm ${PYSITELIB}/django/db/backends/postgresql_psycopg2 +${PLIST.psycopg1}@dirrm ${PYSITELIB}/django/db/backends/postgresql @dirrm ${PYSITELIB}/django/db/backends/mysql_old -${COND_MYSQL}@dirrm ${PYSITELIB}/django/db/backends/mysql +${PLIST.mysql}@dirrm ${PYSITELIB}/django/db/backends/mysql @dirrm ${PYSITELIB}/django/db/backends/dummy @dirrm ${PYSITELIB}/django/db/backends @dirrm ${PYSITELIB}/django/db diff --git a/www/py-django/options.mk b/www/py-django/options.mk index 6e3b50462b2..c400dcd333e 100644 --- a/www/py-django/options.mk +++ b/www/py-django/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2007/02/22 19:27:24 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:13 jlam Exp $ PKG_OPTIONS_VAR = PKG_OPTIONS.django PKG_SUPPORTED_OPTIONS= mysql psycopg1 psycopg2 sqlite @@ -6,11 +6,11 @@ PKG_SUGGESTED_OPTIONS= psycopg1 .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Mmysql) DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb -PLIST_SUBST+= COND_MYSQL= -.else -PLIST_SUBST+= COND_MYSQL="@comment " +PLIST.mysql= yes .endif .if !empty(PKG_OPTIONS:Mpsycopg1) @@ -19,20 +19,14 @@ DEPENDS+= ${PYPKGPREFIX}-psycopg-[0-9]*:../../databases/py-psycopg .if !empty(PKG_OPTIONS:Mpsycopg2) DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 -PLIST_SUBST+= COND_PSYCOPG2= -.else -PLIST_SUBST+= COND_PSYCOPG2="@comment " +PLIST.psycopg2= yes .endif .if !empty(PKG_OPTIONS:Mpsycopg1) || !empty(PKG_OPTIONS:Mpsycopg2) -PLIST_SUBST+= COND_PSYCOPG1= -.else -PLIST_SUBST+= COND_PSYCOPG1="@comment " +PLIST.psycopg1= yes .endif .if !empty(PKG_OPTIONS:Msqlite) DEPENDS+= ${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2 -PLIST_SUBST+= COND_SQLITE= -.else -PLIST_SUBST+= COND_SQLITE="@comment " +PLIST.sqlite= yes .endif diff --git a/www/w3m/PLIST b/www/w3m/PLIST index 1b718975769..320c08c80e3 100644 --- a/www/w3m/PLIST +++ b/www/w3m/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2007/01/29 23:05:09 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:14 jlam Exp $ bin/w3m bin/w3mman man/man1/w3m.1 @@ -56,7 +56,7 @@ share/w3m/w3mhelp-w3m_en.html share/w3m/w3mhelp-w3m_ja.html share/w3m/w3mhelp.html libexec/w3m/inflate -${USE_IMAGE}libexec/w3m/w3mimgdisplay +${PLIST.image}libexec/w3m/w3mimgdisplay libexec/w3m/cgi-bin/dirlist.cgi libexec/w3m/cgi-bin/multipart.cgi libexec/w3m/cgi-bin/w3mbookmark diff --git a/www/w3m/options.mk b/www/w3m/options.mk index 11a40139788..0559573c5fe 100644 --- a/www/w3m/options.mk +++ b/www/w3m/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2007/10/15 15:44:52 obache Exp $ +# $NetBSD: options.mk,v 1.7 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.w3m PKG_SUPPORTED_OPTIONS= inet6 w3m-lynx-key w3m-m17n w3m-unicode @@ -53,6 +53,7 @@ CONFIGURE_ARGS+= --enable-keymap=lynx CONFIGURE_ARGS+= --enable-keymap=w3m .endif +PLIST_VARS+= image .if ${_W3M_USE_IMAGE} == "YES" . for _imagelib in ${PKG_OPTIONS_GROUP.imagelib} . if !empty(PKG_OPTIONS:M${_imagelib}) @@ -61,9 +62,8 @@ _W3M_IMAGELIB= ${_imagelib:C|^w3m-image-||} . endfor USE_X11= YES CONFIGURE_ARGS+= --enable-image=x11 --with-imagelib=${_W3M_IMAGELIB:Q} -PLIST_SUBST+= USE_IMAGE='' +PLIST.image= yes . include "../../graphics/${_W3M_IMAGELIB}/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-image -PLIST_SUBST+= USE_IMAGE='@comment ' .endif diff --git a/x11/efltk/PLIST b/x11/efltk/PLIST index a9e01ac5818..5a304d6499e 100644 --- a/x11/efltk/PLIST +++ b/x11/efltk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:38 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:14 jlam Exp $ bin/efltk-config include/efltk/Enumerations.h include/efltk/Fl.h @@ -208,9 +208,9 @@ lib/fltk/eblue.theme.la lib/fltk/essai.theme.la lib/fltk/motif.theme.la lib/libefltk.la -${OPENGL}lib/libefltk_gl.la +${PLIST.opengl}lib/libefltk_gl.la lib/libefltk_images.la -${MYSQL}lib/libefltk_mysql.la +${PLIST.mysql}lib/libefltk_mysql.la lib/libefltk_net.la lib/libefltk_xml.la share/locale/fi/LC_MESSAGES/efltk.mo diff --git a/x11/efltk/options.mk b/x11/efltk/options.mk index 1e49702af10..4c530e203a6 100644 --- a/x11/efltk/options.mk +++ b/x11/efltk/options.mk @@ -1,26 +1,26 @@ -# $NetBSD: options.mk,v 1.2 2006/02/18 14:07:54 joerg Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.efltk PKG_SUPPORTED_OPTIONS= opengl mysql .include "../../mk/bsd.options.mk" +PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} + .if !empty(PKG_OPTIONS:Mopengl) -PLIST_SUBST+= OPENGL= +PLIST.opengl= yes CONFIGURE_ARGS+= --enable-opengl MAKE_ENV+= HAVE_OPENGL=yes . include "../../graphics/MesaLib/buildlink3.mk" .else -PLIST_SUBST+= OPENGL="@comment " CONFIGURE_ARGS+= --disable-opengl MAKE_ENV+= HAVE_OPENGL=no .endif .if !empty(PKG_OPTIONS:Mmysql) -PLIST_SUBST+= MYSQL= +PLIST.mysql= yes CONFIGURE_ARGS+= --enable-mysql . include "../../mk/mysql.buildlink3.mk" .else -PLIST_SUBST+= MYSQL="@comment " CONFIGURE_ARGS+= --disable-mysql .endif diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index acb993d0698..cc60036b422 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2007/03/16 21:40:33 joerg Exp $ +# $NetBSD: Makefile,v 1.64 2008/04/12 22:43:14 jlam Exp $ DISTNAME= fltk-1.1.7-source PKGNAME= ${DISTNAME:S/-source//} @@ -31,11 +31,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL:Q} CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= ac_cv_have_overlay=yes -.if exists(./descr) -PLIST_SUBST+= WITH_LINKS="@comment " -.else + +PLIST_VARS+= cs # case-sensitive +.if !exists(./descr) CONFIGURE_ARGS+= --with-links -PLIST_SUBST+= WITH_LINKS="" +PLIST.cs= yes .endif BUILDLINK_DEPMETHOD.libXt?= build diff --git a/x11/fltk/PLIST b/x11/fltk/PLIST index 90b9fdb9069..18be1f385ac 100644 --- a/x11/fltk/PLIST +++ b/x11/fltk/PLIST @@ -1,250 +1,250 @@ -@comment $NetBSD: PLIST,v 1.11 2006/06/01 13:14:18 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2008/04/12 22:43:14 jlam Exp $ bin/fltk-config bin/fluid include/FL/Enumerations.H -${WITH_LINKS}include/FL/Enumerations.h +${PLIST.cs}include/FL/Enumerations.h include/FL/Fl.H -${WITH_LINKS}include/FL/Fl.h +${PLIST.cs}include/FL/Fl.h include/FL/Fl_Adjuster.H -${WITH_LINKS}include/FL/Fl_Adjuster.h +${PLIST.cs}include/FL/Fl_Adjuster.h include/FL/Fl_BMP_Image.H -${WITH_LINKS}include/FL/Fl_BMP_Image.h +${PLIST.cs}include/FL/Fl_BMP_Image.h include/FL/Fl_Bitmap.H -${WITH_LINKS}include/FL/Fl_Bitmap.h +${PLIST.cs}include/FL/Fl_Bitmap.h include/FL/Fl_Box.H -${WITH_LINKS}include/FL/Fl_Box.h +${PLIST.cs}include/FL/Fl_Box.h include/FL/Fl_Browser.H -${WITH_LINKS}include/FL/Fl_Browser.h +${PLIST.cs}include/FL/Fl_Browser.h include/FL/Fl_Browser_.H -${WITH_LINKS}include/FL/Fl_Browser_.h +${PLIST.cs}include/FL/Fl_Browser_.h include/FL/Fl_Button.H -${WITH_LINKS}include/FL/Fl_Button.h +${PLIST.cs}include/FL/Fl_Button.h include/FL/Fl_Chart.H -${WITH_LINKS}include/FL/Fl_Chart.h +${PLIST.cs}include/FL/Fl_Chart.h include/FL/Fl_Check_Browser.H -${WITH_LINKS}include/FL/Fl_Check_Browser.h +${PLIST.cs}include/FL/Fl_Check_Browser.h include/FL/Fl_Check_Button.H -${WITH_LINKS}include/FL/Fl_Check_Button.h +${PLIST.cs}include/FL/Fl_Check_Button.h include/FL/Fl_Choice.H -${WITH_LINKS}include/FL/Fl_Choice.h +${PLIST.cs}include/FL/Fl_Choice.h include/FL/Fl_Clock.H -${WITH_LINKS}include/FL/Fl_Clock.h +${PLIST.cs}include/FL/Fl_Clock.h include/FL/Fl_Color_Chooser.H -${WITH_LINKS}include/FL/Fl_Color_Chooser.h +${PLIST.cs}include/FL/Fl_Color_Chooser.h include/FL/Fl_Counter.H -${WITH_LINKS}include/FL/Fl_Counter.h +${PLIST.cs}include/FL/Fl_Counter.h include/FL/Fl_Dial.H -${WITH_LINKS}include/FL/Fl_Dial.h +${PLIST.cs}include/FL/Fl_Dial.h include/FL/Fl_Double_Window.H -${WITH_LINKS}include/FL/Fl_Double_Window.h +${PLIST.cs}include/FL/Fl_Double_Window.h include/FL/Fl_Export.H -${WITH_LINKS}include/FL/Fl_Export.h +${PLIST.cs}include/FL/Fl_Export.h include/FL/Fl_File_Browser.H -${WITH_LINKS}include/FL/Fl_File_Browser.h +${PLIST.cs}include/FL/Fl_File_Browser.h include/FL/Fl_File_Chooser.H -${WITH_LINKS}include/FL/Fl_File_Chooser.h +${PLIST.cs}include/FL/Fl_File_Chooser.h include/FL/Fl_File_Icon.H -${WITH_LINKS}include/FL/Fl_File_Icon.h +${PLIST.cs}include/FL/Fl_File_Icon.h include/FL/Fl_File_Input.H -${WITH_LINKS}include/FL/Fl_File_Input.h +${PLIST.cs}include/FL/Fl_File_Input.h include/FL/Fl_Fill_Dial.H -${WITH_LINKS}include/FL/Fl_Fill_Dial.h +${PLIST.cs}include/FL/Fl_Fill_Dial.h include/FL/Fl_Fill_Slider.H -${WITH_LINKS}include/FL/Fl_Fill_Slider.h +${PLIST.cs}include/FL/Fl_Fill_Slider.h include/FL/Fl_Float_Input.H -${WITH_LINKS}include/FL/Fl_Float_Input.h +${PLIST.cs}include/FL/Fl_Float_Input.h include/FL/Fl_FormsBitmap.H -${WITH_LINKS}include/FL/Fl_FormsBitmap.h +${PLIST.cs}include/FL/Fl_FormsBitmap.h include/FL/Fl_FormsPixmap.H -${WITH_LINKS}include/FL/Fl_FormsPixmap.h +${PLIST.cs}include/FL/Fl_FormsPixmap.h include/FL/Fl_Free.H -${WITH_LINKS}include/FL/Fl_Free.h +${PLIST.cs}include/FL/Fl_Free.h include/FL/Fl_GIF_Image.H -${WITH_LINKS}include/FL/Fl_GIF_Image.h +${PLIST.cs}include/FL/Fl_GIF_Image.h include/FL/Fl_Gl_Window.H -${WITH_LINKS}include/FL/Fl_Gl_Window.h +${PLIST.cs}include/FL/Fl_Gl_Window.h include/FL/Fl_Group.H -${WITH_LINKS}include/FL/Fl_Group.h +${PLIST.cs}include/FL/Fl_Group.h include/FL/Fl_Help_Dialog.H -${WITH_LINKS}include/FL/Fl_Help_Dialog.h +${PLIST.cs}include/FL/Fl_Help_Dialog.h include/FL/Fl_Help_View.H -${WITH_LINKS}include/FL/Fl_Help_View.h +${PLIST.cs}include/FL/Fl_Help_View.h include/FL/Fl_Hold_Browser.H -${WITH_LINKS}include/FL/Fl_Hold_Browser.h +${PLIST.cs}include/FL/Fl_Hold_Browser.h include/FL/Fl_Hor_Fill_Slider.H -${WITH_LINKS}include/FL/Fl_Hor_Fill_Slider.h +${PLIST.cs}include/FL/Fl_Hor_Fill_Slider.h include/FL/Fl_Hor_Nice_Slider.H -${WITH_LINKS}include/FL/Fl_Hor_Nice_Slider.h +${PLIST.cs}include/FL/Fl_Hor_Nice_Slider.h include/FL/Fl_Hor_Slider.H -${WITH_LINKS}include/FL/Fl_Hor_Slider.h +${PLIST.cs}include/FL/Fl_Hor_Slider.h include/FL/Fl_Hor_Value_Slider.H -${WITH_LINKS}include/FL/Fl_Hor_Value_Slider.h +${PLIST.cs}include/FL/Fl_Hor_Value_Slider.h include/FL/Fl_Image.H -${WITH_LINKS}include/FL/Fl_Image.h +${PLIST.cs}include/FL/Fl_Image.h include/FL/Fl_Input.H -${WITH_LINKS}include/FL/Fl_Input.h +${PLIST.cs}include/FL/Fl_Input.h include/FL/Fl_Input_.H -${WITH_LINKS}include/FL/Fl_Input_.h +${PLIST.cs}include/FL/Fl_Input_.h include/FL/Fl_Input_Choice.H -${WITH_LINKS}include/FL/Fl_Input_Choice.h +${PLIST.cs}include/FL/Fl_Input_Choice.h include/FL/Fl_Int_Input.H -${WITH_LINKS}include/FL/Fl_Int_Input.h +${PLIST.cs}include/FL/Fl_Int_Input.h include/FL/Fl_JPEG_Image.H -${WITH_LINKS}include/FL/Fl_JPEG_Image.h +${PLIST.cs}include/FL/Fl_JPEG_Image.h include/FL/Fl_Light_Button.H -${WITH_LINKS}include/FL/Fl_Light_Button.h +${PLIST.cs}include/FL/Fl_Light_Button.h include/FL/Fl_Line_Dial.H -${WITH_LINKS}include/FL/Fl_Line_Dial.h +${PLIST.cs}include/FL/Fl_Line_Dial.h include/FL/Fl_Menu.H -${WITH_LINKS}include/FL/Fl_Menu.h +${PLIST.cs}include/FL/Fl_Menu.h include/FL/Fl_Menu_.H -${WITH_LINKS}include/FL/Fl_Menu_.h +${PLIST.cs}include/FL/Fl_Menu_.h include/FL/Fl_Menu_Bar.H -${WITH_LINKS}include/FL/Fl_Menu_Bar.h +${PLIST.cs}include/FL/Fl_Menu_Bar.h include/FL/Fl_Menu_Button.H -${WITH_LINKS}include/FL/Fl_Menu_Button.h +${PLIST.cs}include/FL/Fl_Menu_Button.h include/FL/Fl_Menu_Item.H -${WITH_LINKS}include/FL/Fl_Menu_Item.h +${PLIST.cs}include/FL/Fl_Menu_Item.h include/FL/Fl_Menu_Window.H -${WITH_LINKS}include/FL/Fl_Menu_Window.h +${PLIST.cs}include/FL/Fl_Menu_Window.h include/FL/Fl_Multi_Browser.H -${WITH_LINKS}include/FL/Fl_Multi_Browser.h +${PLIST.cs}include/FL/Fl_Multi_Browser.h include/FL/Fl_Multi_Label.H -${WITH_LINKS}include/FL/Fl_Multi_Label.h +${PLIST.cs}include/FL/Fl_Multi_Label.h include/FL/Fl_Multiline_Input.H -${WITH_LINKS}include/FL/Fl_Multiline_Input.h +${PLIST.cs}include/FL/Fl_Multiline_Input.h include/FL/Fl_Multiline_Output.H -${WITH_LINKS}include/FL/Fl_Multiline_Output.h +${PLIST.cs}include/FL/Fl_Multiline_Output.h include/FL/Fl_Nice_Slider.H -${WITH_LINKS}include/FL/Fl_Nice_Slider.h +${PLIST.cs}include/FL/Fl_Nice_Slider.h include/FL/Fl_Object.H -${WITH_LINKS}include/FL/Fl_Object.h +${PLIST.cs}include/FL/Fl_Object.h include/FL/Fl_Output.H -${WITH_LINKS}include/FL/Fl_Output.h +${PLIST.cs}include/FL/Fl_Output.h include/FL/Fl_Overlay_Window.H -${WITH_LINKS}include/FL/Fl_Overlay_Window.h +${PLIST.cs}include/FL/Fl_Overlay_Window.h include/FL/Fl_PNG_Image.H -${WITH_LINKS}include/FL/Fl_PNG_Image.h +${PLIST.cs}include/FL/Fl_PNG_Image.h include/FL/Fl_PNM_Image.H -${WITH_LINKS}include/FL/Fl_PNM_Image.h +${PLIST.cs}include/FL/Fl_PNM_Image.h include/FL/Fl_Pack.H -${WITH_LINKS}include/FL/Fl_Pack.h +${PLIST.cs}include/FL/Fl_Pack.h include/FL/Fl_Pixmap.H -${WITH_LINKS}include/FL/Fl_Pixmap.h +${PLIST.cs}include/FL/Fl_Pixmap.h include/FL/Fl_Positioner.H -${WITH_LINKS}include/FL/Fl_Positioner.h +${PLIST.cs}include/FL/Fl_Positioner.h include/FL/Fl_Preferences.H -${WITH_LINKS}include/FL/Fl_Preferences.h +${PLIST.cs}include/FL/Fl_Preferences.h include/FL/Fl_Progress.H -${WITH_LINKS}include/FL/Fl_Progress.h +${PLIST.cs}include/FL/Fl_Progress.h include/FL/Fl_Radio_Button.H -${WITH_LINKS}include/FL/Fl_Radio_Button.h +${PLIST.cs}include/FL/Fl_Radio_Button.h include/FL/Fl_Radio_Light_Button.H -${WITH_LINKS}include/FL/Fl_Radio_Light_Button.h +${PLIST.cs}include/FL/Fl_Radio_Light_Button.h include/FL/Fl_Radio_Round_Button.H -${WITH_LINKS}include/FL/Fl_Radio_Round_Button.h +${PLIST.cs}include/FL/Fl_Radio_Round_Button.h include/FL/Fl_Repeat_Button.H -${WITH_LINKS}include/FL/Fl_Repeat_Button.h +${PLIST.cs}include/FL/Fl_Repeat_Button.h include/FL/Fl_Return_Button.H -${WITH_LINKS}include/FL/Fl_Return_Button.h +${PLIST.cs}include/FL/Fl_Return_Button.h include/FL/Fl_Roller.H -${WITH_LINKS}include/FL/Fl_Roller.h +${PLIST.cs}include/FL/Fl_Roller.h include/FL/Fl_Round_Button.H -${WITH_LINKS}include/FL/Fl_Round_Button.h +${PLIST.cs}include/FL/Fl_Round_Button.h include/FL/Fl_Round_Clock.H -${WITH_LINKS}include/FL/Fl_Round_Clock.h +${PLIST.cs}include/FL/Fl_Round_Clock.h include/FL/Fl_Scroll.H -${WITH_LINKS}include/FL/Fl_Scroll.h +${PLIST.cs}include/FL/Fl_Scroll.h include/FL/Fl_Scrollbar.H -${WITH_LINKS}include/FL/Fl_Scrollbar.h +${PLIST.cs}include/FL/Fl_Scrollbar.h include/FL/Fl_Secret_Input.H -${WITH_LINKS}include/FL/Fl_Secret_Input.h +${PLIST.cs}include/FL/Fl_Secret_Input.h include/FL/Fl_Select_Browser.H -${WITH_LINKS}include/FL/Fl_Select_Browser.h +${PLIST.cs}include/FL/Fl_Select_Browser.h include/FL/Fl_Shared_Image.H -${WITH_LINKS}include/FL/Fl_Shared_Image.h +${PLIST.cs}include/FL/Fl_Shared_Image.h include/FL/Fl_Simple_Counter.H -${WITH_LINKS}include/FL/Fl_Simple_Counter.h +${PLIST.cs}include/FL/Fl_Simple_Counter.h include/FL/Fl_Single_Window.H -${WITH_LINKS}include/FL/Fl_Single_Window.h +${PLIST.cs}include/FL/Fl_Single_Window.h include/FL/Fl_Slider.H -${WITH_LINKS}include/FL/Fl_Slider.h +${PLIST.cs}include/FL/Fl_Slider.h include/FL/Fl_Spinner.H -${WITH_LINKS}include/FL/Fl_Spinner.h +${PLIST.cs}include/FL/Fl_Spinner.h include/FL/Fl_Sys_Menu_Bar.H -${WITH_LINKS}include/FL/Fl_Sys_Menu_Bar.h +${PLIST.cs}include/FL/Fl_Sys_Menu_Bar.h include/FL/Fl_Tabs.H -${WITH_LINKS}include/FL/Fl_Tabs.h +${PLIST.cs}include/FL/Fl_Tabs.h include/FL/Fl_Text_Buffer.H -${WITH_LINKS}include/FL/Fl_Text_Buffer.h +${PLIST.cs}include/FL/Fl_Text_Buffer.h include/FL/Fl_Text_Display.H -${WITH_LINKS}include/FL/Fl_Text_Display.h +${PLIST.cs}include/FL/Fl_Text_Display.h include/FL/Fl_Text_Editor.H -${WITH_LINKS}include/FL/Fl_Text_Editor.h +${PLIST.cs}include/FL/Fl_Text_Editor.h include/FL/Fl_Tile.H -${WITH_LINKS}include/FL/Fl_Tile.h +${PLIST.cs}include/FL/Fl_Tile.h include/FL/Fl_Tiled_Image.H -${WITH_LINKS}include/FL/Fl_Tiled_Image.h +${PLIST.cs}include/FL/Fl_Tiled_Image.h include/FL/Fl_Timer.H -${WITH_LINKS}include/FL/Fl_Timer.h +${PLIST.cs}include/FL/Fl_Timer.h include/FL/Fl_Toggle_Button.H -${WITH_LINKS}include/FL/Fl_Toggle_Button.h +${PLIST.cs}include/FL/Fl_Toggle_Button.h include/FL/Fl_Toggle_Light_Button.H -${WITH_LINKS}include/FL/Fl_Toggle_Light_Button.h +${PLIST.cs}include/FL/Fl_Toggle_Light_Button.h include/FL/Fl_Toggle_Round_Button.H -${WITH_LINKS}include/FL/Fl_Toggle_Round_Button.h +${PLIST.cs}include/FL/Fl_Toggle_Round_Button.h include/FL/Fl_Tooltip.H -${WITH_LINKS}include/FL/Fl_Tooltip.h +${PLIST.cs}include/FL/Fl_Tooltip.h include/FL/Fl_Valuator.H -${WITH_LINKS}include/FL/Fl_Valuator.h +${PLIST.cs}include/FL/Fl_Valuator.h include/FL/Fl_Value_Input.H -${WITH_LINKS}include/FL/Fl_Value_Input.h +${PLIST.cs}include/FL/Fl_Value_Input.h include/FL/Fl_Value_Output.H -${WITH_LINKS}include/FL/Fl_Value_Output.h +${PLIST.cs}include/FL/Fl_Value_Output.h include/FL/Fl_Value_Slider.H -${WITH_LINKS}include/FL/Fl_Value_Slider.h +${PLIST.cs}include/FL/Fl_Value_Slider.h include/FL/Fl_Widget.H -${WITH_LINKS}include/FL/Fl_Widget.h +${PLIST.cs}include/FL/Fl_Widget.h include/FL/Fl_Window.H -${WITH_LINKS}include/FL/Fl_Window.h +${PLIST.cs}include/FL/Fl_Window.h include/FL/Fl_Wizard.H -${WITH_LINKS}include/FL/Fl_Wizard.h +${PLIST.cs}include/FL/Fl_Wizard.h include/FL/Fl_XBM_Image.H -${WITH_LINKS}include/FL/Fl_XBM_Image.h +${PLIST.cs}include/FL/Fl_XBM_Image.h include/FL/Fl_XPM_Image.H -${WITH_LINKS}include/FL/Fl_XPM_Image.h +${PLIST.cs}include/FL/Fl_XPM_Image.h include/FL/dirent.h include/FL/filename.H -${WITH_LINKS}include/FL/filename.h +${PLIST.cs}include/FL/filename.h include/FL/fl_ask.H -${WITH_LINKS}include/FL/fl_ask.h +${PLIST.cs}include/FL/fl_ask.h include/FL/fl_draw.H -${WITH_LINKS}include/FL/fl_draw.h -${WITH_LINKS}include/FL/fl_file_chooser.H -${WITH_LINKS}include/FL/fl_file_chooser.h +${PLIST.cs}include/FL/fl_draw.h +${PLIST.cs}include/FL/fl_file_chooser.H +${PLIST.cs}include/FL/fl_file_chooser.h include/FL/fl_message.H -${WITH_LINKS}include/FL/fl_message.h +${PLIST.cs}include/FL/fl_message.h include/FL/fl_show_colormap.H -${WITH_LINKS}include/FL/fl_show_colormap.h +${PLIST.cs}include/FL/fl_show_colormap.h include/FL/fl_show_input.H -${WITH_LINKS}include/FL/fl_show_input.h +${PLIST.cs}include/FL/fl_show_input.h include/FL/forms.H -${WITH_LINKS}include/FL/forms.h +${PLIST.cs}include/FL/forms.h include/FL/gl.h include/FL/gl2opengl.h include/FL/gl_draw.H -${WITH_LINKS}include/FL/gl_draw.h +${PLIST.cs}include/FL/gl_draw.h include/FL/glut.H -${WITH_LINKS}include/FL/glut.h +${PLIST.cs}include/FL/glut.h include/FL/mac.H -${WITH_LINKS}include/FL/mac.h +${PLIST.cs}include/FL/mac.h include/FL/mac.r include/FL/math.h include/FL/win32.H -${WITH_LINKS}include/FL/win32.h +${PLIST.cs}include/FL/win32.h include/FL/x.H -${WITH_LINKS}include/FL/x.h -${WITH_LINKS}include/Fl +${PLIST.cs}include/FL/x.h +${PLIST.cs}include/Fl lib/libfltk.la lib/libfltk_forms.la lib/libfltk_gl.la diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index c3aa8d5a1c8..3e7ebb18beb 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.138 2008/03/12 21:41:21 drochner Exp $ +# $NetBSD: Makefile,v 1.139 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= gdm-2.20.4 @@ -112,33 +112,28 @@ CONFIGURE_ARGS+= --disable-ipv6 CONFIGURE_ARGS+= X_SERVER_ARGS="vt05" .endif +PLIST_VARS+= pam .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --enable-authentication-scheme=pam . if ${PAM_TYPE} == "linux-pam" -PLIST_SUBST+= PAM_MISC="" -. else -PLIST_SUBST+= PAM_MISC="@comment " +PLIST.pam= yes . endif .elif exists(/etc/shadow) CONFIGURE_ARGS+= --enable-authentication-scheme=shadow -PLIST_SUBST+= PAM_MISC="@comment " .else CONFIGURE_ARGS+= --enable-authentication-scheme=crypt -PLIST_SUBST+= PAM_MISC="@comment " .endif +PLIST_VARS+= dmx .if exists(${X11BASE}/include/X11/extensions/dmxext.h) -PLIST_SUBST+= DMX="" -.else -PLIST_SUBST+= DMX="@comment " +PLIST.dmx= yes .endif PRINT_PLIST_AWK+= /dmx/ { print "$${DMX}" $$0; next } +PLIST_VARS+= gdmopen .if exists(/usr/include/linux/vt.h) -PLIST_SUBST+= GDMOPEN="" -.else -PLIST_SUBST+= GDMOPEN="@comment " +PLIST.gdmopen= yes .endif PRINT_PLIST_AWK+= /gdmopen/ { print "$${GDMOPEN}" $$0; next } diff --git a/x11/gdm/PLIST b/x11/gdm/PLIST index b7247e5226a..c15e465b259 100644 --- a/x11/gdm/PLIST +++ b/x11/gdm/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.36 2007/12/16 22:19:43 drochner Exp $ -${DMX}bin/gdm-dmx-reconnect-proxy +@comment $NetBSD: PLIST,v 1.37 2008/04/12 22:43:14 jlam Exp $ +${PLIST.dmx}bin/gdm-dmx-reconnect-proxy bin/gdmXnest bin/gdmXnestchooser bin/gdmdynamic @@ -8,11 +8,11 @@ bin/gdmphotosetup bin/gdmthemetester lib/gtk-2.0/modules/libdwellmouselistener.la lib/gtk-2.0/modules/libkeymouselistener.la -${PAM_MISC}libexec/gdmaskpass +${PLIST.pam}libexec/gdmaskpass libexec/gdmchooser libexec/gdmgreeter libexec/gdmlogin -${GDMOPEN}libexec/gdmopen +${PLIST.gdmopen}libexec/gdmopen libexec/gdmtranslate man/man1/gdm.1 sbin/gdm diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 7d211105163..17f458bbe0e 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2008/03/06 14:53:56 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= gnome-applets-2.20.1 @@ -48,25 +48,25 @@ CONFIGURE_ARGS+= --enable-ipv6 CONFIGURE_ARGS+= --disable-ipv6 .endif +PLIST_VARS+= battstat .if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \ (${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h)) GCONF_SCHEMAS+= battstat.schemas -PLIST_SUBST+= BATTSTAT= +PLIST.battstat= yes CONF_FILES+= ${EGDIR}/sound/events/battstat_applet.soundlist \ ${PKG_SYSCONFDIR}/sound/events/battstat_applet.soundlist .else -PLIST_SUBST+= BATTSTAT="@comment " CONFIGURE_ARGS+= --disable-battstat .endif PRINT_PLIST_AWK+= /[Bb]attstat/ { print "$${BATTSTAT}"$$0; next; } PRINT_PLIST_AWK+= /examples/ { print "$${BATTSTAT}"$$0; next; } +PLIST_VARS+= cpufreq .if ${OPSYS} == "Linux" && exists(/usr/include/cpufreq.h) GCONF_SCHEMAS+= cpufreq-applet.schemas -PLIST_SUBST+= CPUFREQ= +PLIST.cpufreq= yes .else -PLIST_SUBST+= CPUFREQ="@comment " CONFIGURE_ARGS+= --disable-cpufreq .endif diff --git a/x11/gnome-applets/PLIST b/x11/gnome-applets/PLIST index 4a2258e15a3..10e612a6e94 100644 --- a/x11/gnome-applets/PLIST +++ b/x11/gnome-applets/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.12 2008/01/11 13:34:16 drochner Exp $ +@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:14 jlam Exp $ bin/invest-chart include/libgweather/gweather-gconf.h include/libgweather/gweather-prefs.h include/libgweather/weather.h lib/bonobo/servers/GNOME_AccessxStatusApplet.server -${BATTSTAT}lib/bonobo/servers/GNOME_BattstatApplet.server +${PLIST.battstat}lib/bonobo/servers/GNOME_BattstatApplet.server lib/bonobo/servers/GNOME_CDPlayerApplet.server lib/bonobo/servers/GNOME_CharpickerApplet.server lib/bonobo/servers/GNOME_DriveMountApplet.server @@ -47,7 +47,7 @@ ${PYSITELIB}/invest/widgets.py ${PYSITELIB}/invest/widgets.pyc ${PYSITELIB}/invest/widgets.pyo libexec/accessx-status-applet -${BATTSTAT}libexec/battstat-applet-2 +${PLIST.battstat}libexec/battstat-applet-2 libexec/charpick_applet2 libexec/drivemount_applet2 libexec/geyes_applet2 @@ -58,8 +58,8 @@ libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet -${BATTSTAT}share/examples/gnome-applets/sound/events/battstat_applet.soundlist -${BATTSTAT}share/gconf/schemas/battstat.schemas +${PLIST.battstat}share/examples/gnome-applets/sound/events/battstat_applet.soundlist +${PLIST.battstat}share/gconf/schemas/battstat.schemas share/gconf/schemas/charpick.schemas share/gconf/schemas/drivemount.schemas share/gconf/schemas/geyes.schemas @@ -68,7 +68,7 @@ share/gconf/schemas/mixer.schemas share/gconf/schemas/multiload.schemas share/gconf/schemas/stickynotes.schemas share/gnome-2.0/ui/GNOME_AccessxApplet.xml -${BATTSTAT}share/gnome-2.0/ui/GNOME_BattstatApplet.xml +${PLIST.battstat}share/gnome-2.0/ui/GNOME_BattstatApplet.xml share/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome-2.0/ui/GNOME_GWeatherApplet.xml @@ -96,7 +96,7 @@ share/gnome-applets/geyes/Horrid/horrid_pupil.png share/gnome-applets/geyes/Tango/config share/gnome-applets/geyes/Tango/tango-eye.png share/gnome-applets/geyes/Tango/tango-pupil.png -${BATTSTAT}share/gnome-applets/glade/battstat_applet.glade +${PLIST.battstat}share/gnome-applets/glade/battstat_applet.glade share/gnome-applets/glade/financialchart.glade share/gnome-applets/glade/prefs-dialog.glade share/gnome-applets/glade/stickynotes.glade @@ -239,67 +239,67 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-keys.png share/gnome/help/accessx-status/uk/figures/accessx_sticky-meta-key.png share/gnome/help/accessx-status/uk/figures/accessx_sticky-shift-key.png share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png -${BATTSTAT}share/gnome/help/battstat/C/battstat.xml -${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/C/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/C/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/C/legal.xml -${BATTSTAT}share/gnome/help/battstat/bg/battstat.xml -${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/bg/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/bg/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/en_GB/battstat.xml -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/en_GB/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/es/battstat.xml -${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/es/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/es/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/fr/battstat.xml -${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/fr/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/fr/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/ko/battstat.xml -${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/ko/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/ko/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/oc/battstat.xml -${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/oc/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/oc/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/pa/battstat.xml -${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/pa/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/pa/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/sv/battstat.xml -${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/sv/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/sv/figures/context-menu.png -${BATTSTAT}share/gnome/help/battstat/uk/battstat.xml -${BATTSTAT}share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png -${BATTSTAT}share/gnome/help/battstat/uk/figures/battstat-applet.png -${BATTSTAT}share/gnome/help/battstat/uk/figures/battstat-credits-hal.png -${BATTSTAT}share/gnome/help/battstat/uk/figures/battstat-preferences.png -${BATTSTAT}share/gnome/help/battstat/uk/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/C/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/C/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/C/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/C/legal.xml +${PLIST.battstat}share/gnome/help/battstat/bg/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/bg/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/bg/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/bg/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/bg/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/bg/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/en_GB/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/es/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/es/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/es/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/es/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/es/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/es/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/fr/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/fr/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/fr/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/fr/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/fr/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/fr/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/ko/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/ko/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/ko/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/ko/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/ko/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/ko/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/oc/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/oc/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/oc/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/oc/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/oc/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/oc/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/pa/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/pa/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/pa/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/pa/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/pa/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/pa/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/sv/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/sv/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/sv/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/sv/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/sv/figures/context-menu.png +${PLIST.battstat}share/gnome/help/battstat/uk/battstat.xml +${PLIST.battstat}share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png +${PLIST.battstat}share/gnome/help/battstat/uk/figures/battstat-applet.png +${PLIST.battstat}share/gnome/help/battstat/uk/figures/battstat-credits-hal.png +${PLIST.battstat}share/gnome/help/battstat/uk/figures/battstat-preferences.png +${PLIST.battstat}share/gnome/help/battstat/uk/figures/context-menu.png share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png @@ -891,16 +891,16 @@ share/omf/accessx-status/accessx-status-nl.omf share/omf/accessx-status/accessx-status-oc.omf share/omf/accessx-status/accessx-status-sv.omf share/omf/accessx-status/accessx-status-uk.omf -${BATTSTAT}share/omf/battstat/battstat-C.omf -${BATTSTAT}share/omf/battstat/battstat-bg.omf -${BATTSTAT}share/omf/battstat/battstat-en_GB.omf -${BATTSTAT}share/omf/battstat/battstat-es.omf -${BATTSTAT}share/omf/battstat/battstat-fr.omf -${BATTSTAT}share/omf/battstat/battstat-ko.omf -${BATTSTAT}share/omf/battstat/battstat-oc.omf -${BATTSTAT}share/omf/battstat/battstat-pa.omf -${BATTSTAT}share/omf/battstat/battstat-sv.omf -${BATTSTAT}share/omf/battstat/battstat-uk.omf +${PLIST.battstat}share/omf/battstat/battstat-C.omf +${PLIST.battstat}share/omf/battstat/battstat-bg.omf +${PLIST.battstat}share/omf/battstat/battstat-en_GB.omf +${PLIST.battstat}share/omf/battstat/battstat-es.omf +${PLIST.battstat}share/omf/battstat/battstat-fr.omf +${PLIST.battstat}share/omf/battstat/battstat-ko.omf +${PLIST.battstat}share/omf/battstat/battstat-oc.omf +${PLIST.battstat}share/omf/battstat/battstat-pa.omf +${PLIST.battstat}share/omf/battstat/battstat-sv.omf +${PLIST.battstat}share/omf/battstat/battstat-uk.omf share/omf/char-palette/char-palette-C.omf share/omf/char-palette/char-palette-bg.omf share/omf/char-palette/char-palette-en_GB.omf @@ -1134,7 +1134,7 @@ share/xmodmap/xmodmap.yu @dirrm share/omf/geyes @dirrm share/omf/drivemount @dirrm share/omf/char-palette -${BATTSTAT}@dirrm share/omf/battstat +${PLIST.battstat}@dirrm share/omf/battstat @dirrm share/omf/accessx-status @comment in rarian: @dirrm share/omf @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps @@ -1338,27 +1338,27 @@ ${BATTSTAT}@dirrm share/omf/battstat @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette -${BATTSTAT}@dirrm share/gnome/help/battstat/uk/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/uk -${BATTSTAT}@dirrm share/gnome/help/battstat/sv/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/sv -${BATTSTAT}@dirrm share/gnome/help/battstat/pa/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/pa -${BATTSTAT}@dirrm share/gnome/help/battstat/oc/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/oc -${BATTSTAT}@dirrm share/gnome/help/battstat/ko/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/ko -${BATTSTAT}@dirrm share/gnome/help/battstat/fr/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/fr -${BATTSTAT}@dirrm share/gnome/help/battstat/es/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/es -${BATTSTAT}@dirrm share/gnome/help/battstat/en_GB/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/en_GB -${BATTSTAT}@dirrm share/gnome/help/battstat/bg/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/bg -${BATTSTAT}@dirrm share/gnome/help/battstat/C/figures -${BATTSTAT}@dirrm share/gnome/help/battstat/C -${BATTSTAT}@dirrm share/gnome/help/battstat +${PLIST.battstat}@dirrm share/gnome/help/battstat/uk/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/uk +${PLIST.battstat}@dirrm share/gnome/help/battstat/sv/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/sv +${PLIST.battstat}@dirrm share/gnome/help/battstat/pa/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/pa +${PLIST.battstat}@dirrm share/gnome/help/battstat/oc/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/oc +${PLIST.battstat}@dirrm share/gnome/help/battstat/ko/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/ko +${PLIST.battstat}@dirrm share/gnome/help/battstat/fr/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/fr +${PLIST.battstat}@dirrm share/gnome/help/battstat/es/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/es +${PLIST.battstat}@dirrm share/gnome/help/battstat/en_GB/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/en_GB +${PLIST.battstat}@dirrm share/gnome/help/battstat/bg/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/bg +${PLIST.battstat}@dirrm share/gnome/help/battstat/C/figures +${PLIST.battstat}@dirrm share/gnome/help/battstat/C +${PLIST.battstat}@dirrm share/gnome/help/battstat @dirrm share/gnome/help/accessx-status/uk/figures @dirrm share/gnome/help/accessx-status/uk @dirrm share/gnome/help/accessx-status/sv/figures @@ -1396,9 +1396,9 @@ ${BATTSTAT}@dirrm share/gnome/help/battstat @dirrm share/gnome-applets @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui @comment in GConf: @dirrm share/gconf/schemas -${BATTSTAT}@dirrm share/examples/gnome-applets/sound/events -${BATTSTAT}@dirrm share/examples/gnome-applets/sound -${BATTSTAT}@dirrm share/examples/gnome-applets +${PLIST.battstat}@dirrm share/examples/gnome-applets/sound/events +${PLIST.battstat}@dirrm share/examples/gnome-applets/sound +${PLIST.battstat}@dirrm share/examples/gnome-applets @dirrm ${PYSITELIB}/invest @comment in libbonobo: @dirrm lib/bonobo/servers @dirrm include/libgweather diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile index f3f4eb10cb1..9092a220b28 100644 --- a/x11/gnome-control-center/Makefile +++ b/x11/gnome-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/03/06 14:53:56 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= gnome-control-center-2.20.3 @@ -58,11 +58,10 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-control-center PKG_SUPPORTED_OPTIONS= evolution PKG_SUGGESTED_OPTIONS= evolution .include "../../mk/bsd.options.mk" +PLIST_VARS+= evolution .if !empty(PKG_OPTIONS:Mevolution) CONFIGURE_ARGS+= --enable-aboutme -PLIST_SUBST+= EVOLUTION="" -.else -PLIST_SUBST+= EVOLUTION="@comment " +PLIST.evolution= yes .endif .include "../../audio/esound/buildlink3.mk" diff --git a/x11/gnome-control-center/PLIST b/x11/gnome-control-center/PLIST index 4d9b265e3bb..2d8731f7003 100644 --- a/x11/gnome-control-center/PLIST +++ b/x11/gnome-control-center/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2008/01/11 13:31:18 drochner Exp $ -${EVOLUTION}bin/gnome-about-me +@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:14 jlam Exp $ +${PLIST.evolution}bin/gnome-about-me bin/gnome-accessibility-keyboard-properties bin/gnome-appearance-properties bin/gnome-at-mobility @@ -35,7 +35,7 @@ share/applications/accessibility-keyboard.desktop share/applications/at-properties.desktop share/applications/default-applications.desktop share/applications/display-properties.desktop -${EVOLUTION}share/applications/gnome-about-me.desktop +${PLIST.evolution}share/applications/gnome-about-me.desktop share/applications/gnome-appearance-properties.desktop share/applications/gnome-font-viewer.desktop share/applications/gnome-network-preferences.desktop @@ -65,7 +65,7 @@ share/gnome-control-center/glade/acme.glade share/gnome-control-center/glade/appearance.glade share/gnome-control-center/glade/apply-font.glade share/gnome-control-center/glade/at-enable-dialog.glade -${EVOLUTION}share/gnome-control-center/glade/gnome-about-me.glade +${PLIST.evolution}share/gnome-control-center/glade/gnome-about-me.glade share/gnome-control-center/glade/gnome-accessibility-keyboard-properties.glade share/gnome-control-center/glade/gnome-default-applications-properties.glade share/gnome-control-center/glade/gnome-keybinding-properties.glade @@ -93,8 +93,8 @@ share/gnome-control-center/pixmaps/bar.png share/gnome-control-center/pixmaps/double-click-maybe.png share/gnome-control-center/pixmaps/double-click-off.png share/gnome-control-center/pixmaps/double-click-on.png -${EVOLUTION}share/gnome-control-center/pixmaps/gnome-about-me-lock-open.png -${EVOLUTION}share/gnome-control-center/pixmaps/gnome-about-me-lock.png +${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock-open.png +${PLIST.evolution}share/gnome-control-center/pixmaps/gnome-about-me-lock.png share/gnome-control-center/pixmaps/gtk-theme-thumbnailing.png share/gnome-control-center/pixmaps/icon-theme-thumbnailing.png share/gnome-control-center/pixmaps/keyboard-bell.png diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST index aec50ecdbeb..595474b6d6f 100644 --- a/x11/gtk2/PLIST +++ b/x11/gtk2/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.56 2008/02/03 11:20:21 drochner Exp $ +@comment $NetBSD: PLIST,v 1.57 2008/04/12 22:43:14 jlam Exp $ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-builder-convert bin/gtk-demo bin/gtk-query-immodules-2.0 bin/gtk-update-icon-cache -${X11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h -${X11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +${PLIST.x11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h +${PLIST.x11}include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-core.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h @@ -49,7 +49,7 @@ include/gtk-2.0/gdk/gdkspawn.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h -${X11}include/gtk-2.0/gdk/gdkx.h +${PLIST.x11}include/gtk-2.0/gdk/gdkx.h include/gtk-2.0/gtk/gtk.h include/gtk-2.0/gtk/gtkaboutdialog.h include/gtk-2.0/gtk/gtkaccelgroup.h @@ -266,7 +266,7 @@ lib/gtk-2.0/2.10.0/immodules/im-thai.la lib/gtk-2.0/2.10.0/immodules/im-ti-er.la lib/gtk-2.0/2.10.0/immodules/im-ti-et.la lib/gtk-2.0/2.10.0/immodules/im-viqr.la -${X11}lib/gtk-2.0/2.10.0/immodules/im-xim.la +${PLIST.x11}lib/gtk-2.0/2.10.0/immodules/im-xim.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.la @@ -281,25 +281,25 @@ lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.la lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la -${CUPS}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la +${PLIST.cups}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la lib/gtk-2.0/include/gdkconfig.h -${QUARTZ}lib/libgdk-quartz-2.0.la -${X11}lib/libgdk-x11-2.0.la +${PLIST.quartz}lib/libgdk-quartz-2.0.la +${PLIST.x11}lib/libgdk-x11-2.0.la lib/libgdk_pixbuf-2.0.la -${X11}lib/libgdk_pixbuf_xlib-2.0.la -${QUARTZ}lib/libgtk-quartz-2.0.la -${X11}lib/libgtk-x11-2.0.la +${PLIST.x11}lib/libgdk_pixbuf_xlib-2.0.la +${PLIST.quartz}lib/libgtk-quartz-2.0.la +${PLIST.x11}lib/libgtk-x11-2.0.la lib/pkgconfig/gdk-2.0.pc lib/pkgconfig/gdk-pixbuf-2.0.pc -${X11}lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc -${QUARTZ}lib/pkgconfig/gdk-quartz-2.0.pc -${X11}lib/pkgconfig/gdk-x11-2.0.pc +${PLIST.x11}lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc +${PLIST.quartz}lib/pkgconfig/gdk-quartz-2.0.pc +${PLIST.x11}lib/pkgconfig/gdk-x11-2.0.pc lib/pkgconfig/gtk+-2.0.pc -${QUARTZ}lib/pkgconfig/gtk+-quartz-2.0.pc +${PLIST.quartz}lib/pkgconfig/gtk+-quartz-2.0.pc lib/pkgconfig/gtk+-unix-print-2.0.pc -${X11}lib/pkgconfig/gtk+-x11-2.0.pc +${PLIST.x11}lib/pkgconfig/gtk+-x11-2.0.pc libdata/gtk-2.0/im-multipress.conf man/man1/gdk-pixbuf-csource.1 man/man1/gdk-pixbuf-query-loaders.1 @@ -1177,7 +1177,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc @dirrm include/gtk-unix-print-2.0/gtk @dirrm include/gtk-unix-print-2.0 @dirrm include/gtk-2.0/gtk -${X11}@dirrm include/gtk-2.0/gdk-pixbuf-xlib +${PLIST.x11}@dirrm include/gtk-2.0/gdk-pixbuf-xlib @dirrm include/gtk-2.0/gdk-pixbuf @dirrm include/gtk-2.0/gdk @dirrm include/gtk-2.0 diff --git a/x11/gtk2/options.mk b/x11/gtk2/options.mk index 5d70b29452c..9863516d4ac 100644 --- a/x11/gtk2/options.mk +++ b/x11/gtk2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2007/10/21 01:18:36 obache Exp $ +# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk2 PKG_SUPPORTED_OPTIONS= cups debug @@ -11,11 +11,11 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" -PLIST_SUBST+= CUPS= +PLIST.cups= yes .else -PLIST_SUBST+= CUPS="@comment " CONFIGURE_ENV+= ac_cv_path_CUPS_CONFIG=no .endif @@ -26,17 +26,16 @@ CONFIGURE_ARGS+= --enable-debug=yes ### ### GDK target ### +PLIST_VARS+= quartz x11 .if !empty(PKG_OPTIONS:Mquartz) CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --with-gdktarget=quartz -PLIST_SUBST+= QUARTZ="" -PLIST_SUBST+= X11="@comment " +PLIST.quartz= yes .else CONFIGURE_ARGS+= --with-xinput=xfree CONFIGURE_ENV+= ac_cv_header_X11_extensions_Xinerama_h=no CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no -PLIST_SUBST+= QUARTZ="@comment " -PLIST_SUBST+= X11="" +PLIST.x11= yes BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index cef9bd5b56c..67ad97b7319 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.143 2008/02/20 09:53:03 markd Exp $ +# $NetBSD: Makefile,v 1.144 2008/04/12 22:43:14 jlam Exp $ DISTNAME= kdebase-${_KDE_VERSION} CATEGORIES= x11 @@ -93,16 +93,14 @@ DEPENDS+= htdig>=3.2.0:../../www/htdig-devel CONFIGURE_ARGS+= --without-libusb .endif +PLIST_VARS+= usbview .if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" -PLIST_SUBST+= HAVE_USBVIEW="" -.else -PLIST_SUBST+= HAVE_USBVIEW="@comment " +PLIST.usbview= yes .endif +PLIST_VARS+= joystick .if ${OPSYS} == "Linux" -PLIST_SUBST+= HAVE_JOYSTICK="" -.else -PLIST_SUBST+= HAVE_JOYSTICK="@comment " +PLIST.joystick= yes .endif ICONDIR= share/icons diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index 0ed72213c52..0817ebf5076 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.49 2008/01/04 21:05:56 markd Exp $ +@comment $NetBSD: PLIST,v 1.50 2008/04/12 22:43:14 jlam Exp $ bin/appletproxy bin/drkonqi bin/extensionproxy @@ -53,7 +53,7 @@ bin/klipper bin/klocaldomainurifilterhelper bin/kmenuedit bin/knetattach -${HAVE_COMPOSITE}bin/kompmgr +${PLIST.composite}bin/kompmgr bin/konqueror bin/konsole bin/kpager @@ -181,7 +181,7 @@ lib/kde3/kcm_icons.la lib/kde3/kcm_info.la lib/kde3/kcm_input.la lib/kde3/kcm_ioslaveinfo.la -${HAVE_JOYSTICK}lib/kde3/kcm_joystick.la +${PLIST.joystick}lib/kde3/kcm_joystick.la lib/kde3/kcm_kded.la lib/kde3/kcm_kdm.la lib/kde3/kcm_kdnssd.la @@ -216,7 +216,7 @@ lib/kde3/kcm_smserver.la lib/kde3/kcm_spellchecking.la lib/kde3/kcm_style.la lib/kde3/kcm_taskbar.la -${HAVE_USBVIEW}lib/kde3/kcm_usb.la +${PLIST.usbview}lib/kde3/kcm_usb.la lib/kde3/kcm_useraccount.la lib/kde3/kcm_xinerama.la lib/kde3/kcminit.la @@ -273,7 +273,7 @@ lib/kde3/kio_print.la lib/kde3/kio_remote.la lib/kde3/kio_settings.la lib/kde3/kio_sftp.la -${HAVE_SMB}lib/kde3/kio_smb.la +${PLIST.smb}lib/kde3/kio_smb.la lib/kde3/kio_smtp.la lib/kde3/kio_system.la lib/kde3/kio_tar.la @@ -414,7 +414,7 @@ share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop -${HAVE_JOYSTICK}share/applications/kde/joystick.desktop +${PLIST.joystick}share/applications/kde/joystick.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop share/applications/kde/kcm_kdnssd.desktop @@ -431,7 +431,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop -${HAVE_USBVIEW}share/applications/kde/kcmusb.desktop +${PLIST.usbview}share/applications/kde/kcmusb.desktop share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop @@ -2257,7 +2257,7 @@ share/kde/apps/kcmkeys/win3.kksrc share/kde/apps/kcmkeys/win4.kksrc share/kde/apps/kcmkeys/wm3.kksrc share/kde/apps/kcmlocale/pics/background.png -${HAVE_USBVIEW}share/kde/apps/kcmusb/usb.ids +${PLIST.usbview}share/kde/apps/kcmusb/usb.ids share/kde/apps/kconf_update/convertShortcuts.pl share/kde/apps/kconf_update/favicons.upd share/kde/apps/kconf_update/kaccel.upd @@ -2800,7 +2800,7 @@ share/kde/apps/konqueror/about/plugins_rtl.html share/kde/apps/konqueror/about/specs.html share/kde/apps/konqueror/about/tips.html share/kde/apps/konqueror/about/top-right-konqueror.png -${HAVE_SMB}share/kde/apps/konqueror/dirtree/remote/smb-network.desktop +${PLIST.smb}share/kde/apps/konqueror/dirtree/remote/smb-network.desktop share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png @@ -3015,7 +3015,7 @@ share/kde/apps/kwrite/kwriteui.rc share/kde/apps/naughtyapplet/pics/naughty-happy.png share/kde/apps/naughtyapplet/pics/naughty-sad.png share/kde/apps/plugin/nspluginpart.rc -${HAVE_SMB}share/kde/apps/remoteview/smb-network.desktop +${PLIST.smb}share/kde/apps/remoteview/smb-network.desktop share/kde/apps/systemview/documents.desktop share/kde/apps/systemview/home.desktop share/kde/apps/systemview/media.desktop @@ -3062,8 +3062,8 @@ share/kde/doc/kdm/README share/kde/mimelnk/application/x-konsole.desktop share/kde/mimelnk/application/x-ksysguard.desktop share/kde/mimelnk/application/x-ktheme.desktop -${HAVE_SMB}share/kde/mimelnk/application/x-smb-server.desktop -${HAVE_SMB}share/kde/mimelnk/application/x-smb-workgroup.desktop +${PLIST.smb}share/kde/mimelnk/application/x-smb-server.desktop +${PLIST.smb}share/kde/mimelnk/application/x-smb-workgroup.desktop share/kde/mimelnk/fonts/folder.desktop share/kde/mimelnk/fonts/package.desktop share/kde/mimelnk/fonts/system-folder.desktop @@ -3266,7 +3266,7 @@ share/kde/services/searchproviders/wiktionary.desktop share/kde/services/searchproviders/wordref.desktop share/kde/services/settings.protocol share/kde/services/sftp.protocol -${HAVE_SMB}share/kde/services/smb.protocol +${PLIST.smb}share/kde/services/smb.protocol share/kde/services/smtp.protocol share/kde/services/smtps.protocol share/kde/services/system.protocol @@ -4397,7 +4397,7 @@ share/locale/l10n/zw/flag.png @dirrm share/kde/apps/kcontrol/about @comment in kde: @dirrm share/kde/apps/kcontrol @comment in kde: @dirrm share/kde/apps/kconf_update -${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb +${PLIST.usbview}@dirrm share/kde/apps/kcmusb @dirrm share/kde/apps/kcmlocale/pics @dirrm share/kde/apps/kcmlocale @dirrm share/kde/apps/kcmkeys diff --git a/x11/kdebase3/options.mk b/x11/kdebase3/options.mk index 102faa7875c..3b9e552dc0e 100644 --- a/x11/kdebase3/options.mk +++ b/x11/kdebase3/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2008/01/04 21:05:56 markd Exp $ +# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kdebase PKG_SUPPORTED_OPTIONS= inet6 sasl samba debug pam composite @@ -6,20 +6,19 @@ PKG_SUGGESTED_OPTIONS= sasl .include "../../mk/bsd.options.mk" +PLIST_VARS+= composite .if !empty(PKG_OPTIONS:Mcomposite) CONFIGURE_ARGS+= --with-composite -PLIST_SUBST+= HAVE_COMPOSITE="" +PLIST.composite= yes .else CONFIGURE_ARGS+= --without-composite -PLIST_SUBST+= HAVE_COMPOSITE="@comment " .endif +PLIST_VARS+= smb .if !empty(PKG_OPTIONS:Msamba) .include "../../net/samba/buildlink3.mk" LIBS+= -L${BUILDLINK_PREFIX.samba}/lib/samba ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.samba}/lib/samba -PLIST_SUBST+= HAVE_SMB="" -.else -PLIST_SUBST+= HAVE_SMB="@comment " +PLIST.smb= yes .endif .if !empty(PKG_OPTIONS:Mdebug) diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 2711907c96d..51e99d4a46e 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2008/02/20 09:49:56 markd Exp $ +# $NetBSD: Makefile,v 1.136 2008/04/12 22:43:14 jlam Exp $ DISTNAME= kdelibs-${_KDE_VERSION} CATEGORIES= x11 @@ -63,16 +63,17 @@ SPECIAL_PERMS+= ${PREFIX}/bin/kpac_dhcp_helper ${SETUID_ROOT_PERMS} .include "options.mk" +PLIST_VARS+= kded .if ${OPSYS} == "NetBSD" . if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*} -PLIST_SUBST+= KDED_WORKAROUND="@comment " +# nothing . else -PLIST_SUBST+= KDED_WORKAROUND="" +PLIST.kded= yes . endif # make sure zone.tab is installed DEPENDS+= zonetab-[0-9]*:../../time/zonetab .else -PLIST_SUBST+= KDED_WORKAROUND="" +PLIST.kded= yes .endif .include "../../mk/krb5.buildlink3.mk" diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST index a2274924c73..c6e94d5f3cd 100644 --- a/x11/kdelibs3/PLIST +++ b/x11/kdelibs3/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.41 2007/11/13 11:19:18 markd Exp $ +@comment $NetBSD: PLIST,v 1.42 2008/04/12 22:43:14 jlam Exp $ bin/artsmessage bin/checkXML -${CUPS}bin/cupsdconf -${CUPS}bin/cupsdoprint +${PLIST.cups}bin/cupsdconf +${PLIST.cups}bin/cupsdoprint bin/dcop bin/dcopclient bin/dcopfind @@ -55,7 +55,7 @@ bin/ktradertest bin/kunittestmodrunner bin/kwrapper bin/lnusertemp -${CUPS}bin/make_driver_db_cups +${PLIST.cups}bin/make_driver_db_cups bin/make_driver_db_lpr bin/makekdewidgets bin/meinproc @@ -757,7 +757,7 @@ include/renamedlgplugin.h include/scriptclientinterface.h include/scriptinterface.h include/scriptmanager.h -${CUPS}lib/kde3/cupsdconf.la +${PLIST.cups}lib/kde3/cupsdconf.la lib/kde3/dcopserver.la lib/kde3/kabc_dir.la lib/kde3/kabc_file.la @@ -770,7 +770,7 @@ lib/kde3/kcm_kresources.la lib/kde3/kcmshell.la lib/kde3/kconf_update.la lib/kde3/kcookiejar.la -${KDED_WORKAROUND}lib/kde3/kded.la +${PLIST.kded}lib/kde3/kded.la lib/kde3/kded_kcookiejar.la lib/kde3/kded_kdeprintd.la lib/kde3/kded_kdetrayproxy.la @@ -778,7 +778,7 @@ lib/kde3/kded_kpasswdserver.la lib/kde3/kded_kssld.la lib/kde3/kded_kwalletd.la lib/kde3/kded_proxyscout.la -${CUPS}lib/kde3/kdeprint_cups.la +${PLIST.cups}lib/kde3/kdeprint_cups.la lib/kde3/kdeprint_ext.la lib/kde3/kdeprint_lpdunix.la lib/kde3/kdeprint_lpr.la @@ -843,7 +843,7 @@ lib/libkdecore.la lib/libkdefakes.la lib/libkdefakes_nonpic.a lib/libkdefx.la -${CUPS}lib/libkdeinit_cupsdconf.la +${PLIST.cups}lib/libkdeinit_cupsdconf.la lib/libkdeinit_dcopserver.la lib/libkdeinit_kaddprinterwizard.la lib/libkdeinit_kbuildsycoca.la @@ -3057,8 +3057,8 @@ share/kde/apps/kconf_update/proxytype.pl share/kde/apps/kconf_update/useragent.pl share/kde/apps/kdeprint/apsdriver1 share/kde/apps/kdeprint/apsdriver2 -${CUPS}share/kde/apps/kdeprint/cups_logo.png -${CUPS}share/kde/apps/kdeprint/cupsd.conf.template +${PLIST.cups}share/kde/apps/kdeprint/cups_logo.png +${PLIST.cups}share/kde/apps/kdeprint/cupsd.conf.template share/kde/apps/kdeprint/filters/enscript.desktop share/kde/apps/kdeprint/filters/enscript.xml share/kde/apps/kdeprint/filters/imagetops.desktop @@ -3136,7 +3136,7 @@ share/kde/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer.png share/kde/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer_class.png share/kde/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png share/kde/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png -${CUPS}share/kde/apps/kdeprint/kde_logo.png +${PLIST.cups}share/kde/apps/kdeprint/kde_logo.png share/kde/apps/kdeprint/lprngtooldriver1 share/kde/apps/kdeprint/pics/kdeprint_collate.png share/kde/apps/kdeprint/pics/kdeprint_collate_reverse.png @@ -3156,13 +3156,13 @@ share/kde/apps/kdeprint/pics/kdeprint_revlandscape.png share/kde/apps/kdeprint/pics/kdeprint_revportrait.png share/kde/apps/kdeprint/pics/kdeprint_uncollate.png share/kde/apps/kdeprint/pics/kdeprint_uncollate_reverse.png -${CUPS}share/kde/apps/kdeprint/plugins/cups.print +${PLIST.cups}share/kde/apps/kdeprint/plugins/cups.print share/kde/apps/kdeprint/plugins/ext.print share/kde/apps/kdeprint/plugins/lpdunix.print share/kde/apps/kdeprint/plugins/lpr.print share/kde/apps/kdeprint/plugins/rlpr.print -${CUPS}share/kde/apps/kdeprint/preview-mini.png -${CUPS}share/kde/apps/kdeprint/preview.png +${PLIST.cups}share/kde/apps/kdeprint/preview-mini.png +${PLIST.cups}share/kde/apps/kdeprint/preview.png share/kde/apps/kdeprint/side.png share/kde/apps/kdeprint/specials.desktop share/kde/apps/kdeprint/testprint.ps diff --git a/x11/kdelibs3/options.mk b/x11/kdelibs3/options.mk index 705ca358a64..bc65baa73f9 100644 --- a/x11/kdelibs3/options.mk +++ b/x11/kdelibs3/options.mk @@ -1,16 +1,16 @@ -# $NetBSD: options.mk,v 1.1 2007/01/26 02:44:28 markd Exp $ +# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.kdelibs PKG_SUPPORTED_OPTIONS= cups debug .include "../../mk/bsd.options.mk" +PLIST_VARS+= cups .if !empty(PKG_OPTIONS:Mcups) .include "../../print/cups/buildlink3.mk" -PLIST_SUBST+= CUPS= +PLIST.cups= yes .else CONFIGURE_ARGS+= --disable-cups -PLIST_SUBST+= CUPS="@comment " .endif .if !empty(PKG_OPTIONS:Mdebug) diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 32097704803..b7f11d17c96 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2008/03/04 14:47:29 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= lablgtk-2.10.1 @@ -21,12 +21,11 @@ CONFLICTS= lablgtk2-2.* .include "../../mk/bsd.prefs.mk" # Stub libraries for functions missing from base system. +PLIST_VARS+= stubs .if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \ ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \ ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" -PLIST_SUBST+= HAVE_STUBS="" -.else -PLIST_SUBST+= HAVE_STUBS="@comment " +PLIST.stubs= yes .endif .include "options.mk" diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST index eda14a7a00e..a287adb0a17 100644 --- a/x11/lablgtk/PLIST +++ b/x11/lablgtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2007/10/27 13:29:38 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:14 jlam Exp $ bin/gdk-pixbuf-mlsource bin/lablgtk2 lib/ocaml/lablgtk2/gAction.cmi @@ -254,8 +254,8 @@ lib/ocaml/lablgtk2/varcc lib/ocaml/lablgtk2/win32.h lib/ocaml/lablgtk2/wrappers.h lib/ocaml/lablgtk2/xml_lexer.mli -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtk2.so -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtkspell.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgtk2.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgtkspell.so @comment in ocaml: lib/ocaml/stublibs @dirrm lib/ocaml/lablgtk2 @comment in ocaml: lib/ocaml diff --git a/x11/lablgtk/PLIST.glade b/x11/lablgtk/PLIST.glade index d8ebf475808..a2786e73835 100644 --- a/x11/lablgtk/PLIST.glade +++ b/x11/lablgtk/PLIST.glade @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.glade,v 1.1 2007/09/21 13:00:51 wiz Exp $ +@comment $NetBSD: PLIST.glade,v 1.2 2008/04/12 22:43:14 jlam Exp $ bin/lablgladecc2 lib/ocaml/lablgtk2/glade.cmi lib/ocaml/lablgtk2/glade.cmx @@ -7,4 +7,4 @@ lib/ocaml/lablgtk2/lablglade.a lib/ocaml/lablgtk2/lablglade.cma lib/ocaml/lablgtk2/lablglade.cmxa lib/ocaml/lablgtk2/liblablglade2.a -${HAVE_STUBS}lib/ocaml/stublibs/dlllablglade2.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablglade2.so diff --git a/x11/lablgtk/PLIST.gnome b/x11/lablgtk/PLIST.gnome index 3cf92d20514..6a62ef7af08 100644 --- a/x11/lablgtk/PLIST.gnome +++ b/x11/lablgtk/PLIST.gnome @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gnome,v 1.1 2007/09/21 13:00:51 wiz Exp $ +@comment $NetBSD: PLIST.gnome,v 1.2 2008/04/12 22:43:14 jlam Exp $ lib/ocaml/lablgtk2/gnoDruid.cmi lib/ocaml/lablgtk2/gnoDruid.cmx lib/ocaml/lablgtk2/gnoDruid.ml @@ -10,4 +10,4 @@ lib/ocaml/lablgtk2/lablgnomeui.a lib/ocaml/lablgtk2/lablgnomeui.cma lib/ocaml/lablgtk2/lablgnomeui.cmxa lib/ocaml/lablgtk2/liblablgnomeui.a -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomeui.so diff --git a/x11/lablgtk/PLIST.gnomecanvas b/x11/lablgtk/PLIST.gnomecanvas index dd629b9e7d0..48a1d3eaa47 100644 --- a/x11/lablgtk/PLIST.gnomecanvas +++ b/x11/lablgtk/PLIST.gnomecanvas @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gnomecanvas,v 1.1 2007/09/21 13:00:52 wiz Exp $ +@comment $NetBSD: PLIST.gnomecanvas,v 1.2 2008/04/12 22:43:14 jlam Exp $ lib/ocaml/lablgtk2/gnoCanvas.cmi lib/ocaml/lablgtk2/gnoCanvas.cmx lib/ocaml/lablgtk2/gnoCanvas.ml @@ -17,5 +17,5 @@ lib/ocaml/lablgtk2/panel.cmi lib/ocaml/lablgtk2/panel.cmx lib/ocaml/lablgtk2/panel.ml lib/ocaml/lablgtk2/panel_tags.h -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomecanvas.so -${HAVE_STUBS}lib/ocaml/stublibs/dlllablpanel.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomecanvas.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablpanel.so diff --git a/x11/lablgtk/PLIST.gtksourceview b/x11/lablgtk/PLIST.gtksourceview index ed5621df5a2..19d512690a5 100644 --- a/x11/lablgtk/PLIST.gtksourceview +++ b/x11/lablgtk/PLIST.gtksourceview @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gtksourceview,v 1.1 2007/10/27 13:29:38 wiz Exp $ +@comment $NetBSD: PLIST.gtksourceview,v 1.2 2008/04/12 22:43:14 jlam Exp $ lib/ocaml/lablgtk2/gSourceView.cmi lib/ocaml/lablgtk2/gSourceView.cmx lib/ocaml/lablgtk2/gSourceView.ml @@ -13,4 +13,4 @@ lib/ocaml/lablgtk2/sourceViewEnums.cmi lib/ocaml/lablgtk2/sourceViewEnums.cmx lib/ocaml/lablgtk2/sourceViewEnums.ml lib/ocaml/lablgtk2/sourceView_tags.h -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgtksourceview.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgtksourceview.so diff --git a/x11/lablgtk/PLIST.svg b/x11/lablgtk/PLIST.svg index 4fe38479743..8ac969e1aae 100644 --- a/x11/lablgtk/PLIST.svg +++ b/x11/lablgtk/PLIST.svg @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.svg,v 1.1 2007/09/21 13:00:53 wiz Exp $ +@comment $NetBSD: PLIST.svg,v 1.2 2008/04/12 22:43:14 jlam Exp $ lib/ocaml/lablgtk2/gnoDruid.cmi lib/ocaml/lablgtk2/gnoDruid.cmx lib/ocaml/lablgtk2/gnoDruid.ml @@ -17,5 +17,5 @@ lib/ocaml/lablgtk2/liblablrsvg.a lib/ocaml/lablgtk2/rsvg.cmi lib/ocaml/lablgtk2/rsvg.cmx lib/ocaml/lablgtk2/rsvg.ml -${HAVE_STUBS}lib/ocaml/stublibs/dlllablgnomeui.so -${HAVE_STUBS}lib/ocaml/stublibs/dlllablrsvg.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablgnomeui.so +${PLIST.stubs}lib/ocaml/stublibs/dlllablrsvg.so diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile index 33d1ca83d2f..df9afb62bda 100644 --- a/x11/matchbox-panel/Makefile +++ b/x11/matchbox-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/01/26 23:47:33 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2008/04/12 22:43:14 jlam Exp $ # DISTNAME= matchbox-panel-0.9.2 @@ -24,10 +24,9 @@ CONFIGURE_ARGS+= --enable-nls .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "DragonFly" -PLIST_SUBST+= COND_APM="@comment " -.else -PLIST_SUBST+= COND_APM="" +PLIST_VARS= apm +.if ${OPSYS} != "DragonFly" +PLIST.apm= yes .endif .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/x11/matchbox-panel/PLIST b/x11/matchbox-panel/PLIST index 729dd9ad4e1..136b2100dc6 100644 --- a/x11/matchbox-panel/PLIST +++ b/x11/matchbox-panel/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.3 2006/06/21 22:05:02 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:43:14 jlam Exp $ bin/matchbox-panel -${COND_APM}bin/mb-applet-battery +${PLIST.apm}bin/mb-applet-battery bin/mb-applet-clock bin/mb-applet-launcher bin/mb-applet-menu-launcher bin/mb-applet-system-monitor bin/mb-applet-xterm-wrapper.sh -${COND_APM}share/applications/mb-applet-battery.desktop +${PLIST.apm}share/applications/mb-applet-battery.desktop share/applications/mb-applet-clock.desktop share/applications/mb-applet-menu-launcher.desktop share/applications/mb-applet-system-monitor.desktop diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST index ef99d9e6bc0..ed5c37de1ae 100644 --- a/x11/mlterm/PLIST +++ b/x11/mlterm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2006/12/19 07:53:57 wiz Exp $ +@comment $NetBSD: PLIST,v 1.19 2008/04/12 22:43:14 jlam Exp $ bin/mlcc bin/mlclient bin/mlterm @@ -6,7 +6,7 @@ lib/libkik.la lib/libmkf.la lib/mlterm/libathena.la lib/mlterm/libim-kbd.la -${UIM}lib/mlterm/libim-uim.la +${PLIST.uim}lib/mlterm/libim-uim.la lib/mlterm/libmotif.la lib/mlterm/libmozmodern.la lib/mlterm/libnext.la diff --git a/x11/mlterm/options.mk b/x11/mlterm/options.mk index 17c9311e275..1786a6ded5a 100644 --- a/x11/mlterm/options.mk +++ b/x11/mlterm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/01/13 12:11:13 hira Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:14 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mlterm PKG_SUPPORTED_OPTIONS= uim xft2 @@ -6,12 +6,11 @@ PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" +PLIST_VARS+= uim .if !empty(PKG_OPTIONS:Muim) .include "../../inputmethod/uim/buildlink3.mk" CONFIGURE_ARGS+= --enable-uim -PLIST_SUBST+= UIM= -.else -PLIST_SUBST+= UIM="@comment " +PLIST.uim= yes .endif .if !empty(PKG_OPTIONS:Mxft2) diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index 71b30975fb7..1e24e46034b 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2008/03/29 17:54:40 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:15 jlam Exp $ bin/X bin/Xnest bin/Xorg @@ -1084,11 +1084,11 @@ lib/X11/xserver/zh_TW.big5 lib/X11/xserver/zh_TW.euctw lib/X11/xserver/zh_TW.utf8 lib/pkgconfig/xorg-server.pc -${USE_DRI}lib/xorg/modules/extensions/libGLcore.la +${PLIST.dri}lib/xorg/modules/extensions/libGLcore.la lib/xorg/modules/extensions/libdbe.la lib/xorg/modules/extensions/libdri.la lib/xorg/modules/extensions/libextmod.la -${USE_DRI}lib/xorg/modules/extensions/libglx.la +${PLIST.dri}lib/xorg/modules/extensions/libglx.la lib/xorg/modules/extensions/librecord.la lib/xorg/modules/extensions/libxtrap.la lib/xorg/modules/fonts/libfreetype.la diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk index 274128551a1..726e23e8955 100644 --- a/x11/modular-xorg-server/options.mk +++ b/x11/modular-xorg-server/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/12/08 09:23:16 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2008/04/12 22:43:15 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server PKG_SUPPORTED_OPTIONS= dri inet6 @@ -11,6 +11,7 @@ PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable PKG_OPTIONS.xorg-server us .include "../../mk/bsd.options.mk" +PLIST_VARS+= dri .if !empty(PKG_OPTIONS:Mdri) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= MesaLib-6.5.2.tar.bz2 @@ -28,14 +29,13 @@ CONFIGURE_ENV+= GLX_DEFINES=${GLX_DEFINES:M*:Q} # the newer ones. #BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.8nb1 #BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.3nb1 -PLIST_SUBST+= USE_DRI="" +PLIST.dri= yes dri-post-extract: ${LN} -s ${MESA_SRC:Q}/include/GL ${WRKSRC:Q}/GL/glx/GL .else CONFIGURE_ARGS+= --disable-glx -PLIST_SUBST+= USE_DRI="@comment " dri-post-extract: @${DO_NADA} diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile index 83bea67b872..a982c1b91a5 100644 --- a/x11/ocaml-graphics/Makefile +++ b/x11/ocaml-graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/01/30 20:56:13 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2008/04/12 22:43:15 jlam Exp $ .include "../../lang/ocaml/Makefile.common" @@ -14,13 +14,13 @@ CONFIGURE_ARGS+= -no-tk BUILD_DIRS= ${WRKSRC}/otherlibs/graph BUILD_TARGET= all INSTALL_TARGET= install + +PLIST_VARS+= opt .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ (${MACHINE_ARCH} == "sparc") BUILD_TARGET+= allopt INSTALL_TARGET+= installopt -PLIST_SUBST+= OPT= -.else -PLIST_SUBST+= OPT='@comment ' +PLIST.opt= yes .endif PLIST_SRC= ${WRKDIR}/.PLIST_SRC diff --git a/x11/ocaml-graphics/PLIST b/x11/ocaml-graphics/PLIST index 1213e3639b3..5ca64236310 100644 --- a/x11/ocaml-graphics/PLIST +++ b/x11/ocaml-graphics/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2006/02/22 21:00:32 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $ lib/ocaml/graphics.a lib/ocaml/graphics.cma lib/ocaml/graphics.cmi -${OPT}lib/ocaml/graphics.cmxa +${PLIST.opt}lib/ocaml/graphics.cmxa lib/ocaml/graphics.mli lib/ocaml/graphicsX11.cmi lib/ocaml/graphicsX11.mli diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile index 6369a278b74..25178be9319 100644 --- a/x11/py-gnome2-desktop/Makefile +++ b/x11/py-gnome2-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/03/06 14:53:57 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:15 jlam Exp $ # DISTNAME= gnome-python-desktop-2.20.0 @@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in PYTHON_VERSIONS_ACCEPTED= 24 # XXX not yet, needs hal -PLIST_SUBST+= NAUTILUSBURN="@comment " +PLIST_VARS+= nautilusburn #.include "../../sysutils/nautilus-cd-burner/buildlink3.mk" .include "../../graphics/py-cairo/buildlink3.mk" diff --git a/x11/py-gnome2-desktop/PLIST b/x11/py-gnome2-desktop/PLIST index de42ce38b5c..4a0fe9a8dfc 100644 --- a/x11/py-gnome2-desktop/PLIST +++ b/x11/py-gnome2-desktop/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2007/04/11 18:12:15 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $ lib/pkgconfig/gnome-python-desktop-2.0.pc ${PYSITELIB}/gtk-2.0/bugbuddy.py ${PYSITELIB}/gtk-2.0/bugbuddy.pyc @@ -20,7 +20,7 @@ ${PYSITELIB}/gtk-2.0/gnomeprint/ui.la ${PYSITELIB}/gtk-2.0/gtksourceview.la ${PYSITELIB}/gtk-2.0/gtop.la ${PYSITELIB}/gtk-2.0/mediaprofiles.la -${NAUTILUSBURN}${PYSITELIB}/gtk-2.0/nautilusburn.la +${PLIST.nautilusburn}${PYSITELIB}/gtk-2.0/nautilusburn.la ${PYSITELIB}/gtk-2.0/rsvg.la ${PYSITELIB}/gtk-2.0/totem/__init__.py ${PYSITELIB}/gtk-2.0/totem/__init__.pyc @@ -68,7 +68,7 @@ share/pygtk/2.0/defs/art.defs share/pygtk/2.0/defs/gnomekeyring.defs share/pygtk/2.0/defs/gtksourceview.defs share/pygtk/2.0/defs/mediaprofiles.defs -${NAUTILUSBURN}share/pygtk/2.0/defs/nautilus_burn.defs +${PLIST.nautilusburn}share/pygtk/2.0/defs/nautilus_burn.defs share/pygtk/2.0/defs/print.defs share/pygtk/2.0/defs/printui.defs share/pygtk/2.0/defs/wnck.defs diff --git a/x11/rxvt-unicode/PLIST b/x11/rxvt-unicode/PLIST index 0c65060af3a..f812a4e172d 100644 --- a/x11/rxvt-unicode/PLIST +++ b/x11/rxvt-unicode/PLIST @@ -1,35 +1,35 @@ -@comment $NetBSD: PLIST,v 1.7 2007/10/20 06:11:25 obache Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/04/12 22:43:15 jlam Exp $ bin/urxvt bin/urxvtc bin/urxvtd -${PERL}lib/urxvt/perl/automove-background -${PERL}lib/urxvt/perl/block-graphics-to-ascii -${PERL}lib/urxvt/perl/digital-clock -${PERL}lib/urxvt/perl/example-refresh-hooks -${PERL}lib/urxvt/perl/kuake -${PERL}lib/urxvt/perl/macosx-clipboard -${PERL}lib/urxvt/perl/matcher -${PERL}lib/urxvt/perl/option-popup -${PERL}lib/urxvt/perl/readline -${PERL}lib/urxvt/perl/remote-clipboard -${PERL}lib/urxvt/perl/searchable-scrollback -${PERL}lib/urxvt/perl/selection -${PERL}lib/urxvt/perl/selection-autotransform -${PERL}lib/urxvt/perl/selection-pastebin -${PERL}lib/urxvt/perl/selection-popup -${PERL}lib/urxvt/perl/tabbed -${PERL}lib/urxvt/perl/urxvt-popup -${PERL}lib/urxvt/perl/xim-onthespot -${PERL}lib/urxvt/urxvt.pm +${PLIST.perl}lib/urxvt/perl/automove-background +${PLIST.perl}lib/urxvt/perl/block-graphics-to-ascii +${PLIST.perl}lib/urxvt/perl/digital-clock +${PLIST.perl}lib/urxvt/perl/example-refresh-hooks +${PLIST.perl}lib/urxvt/perl/kuake +${PLIST.perl}lib/urxvt/perl/macosx-clipboard +${PLIST.perl}lib/urxvt/perl/matcher +${PLIST.perl}lib/urxvt/perl/option-popup +${PLIST.perl}lib/urxvt/perl/readline +${PLIST.perl}lib/urxvt/perl/remote-clipboard +${PLIST.perl}lib/urxvt/perl/searchable-scrollback +${PLIST.perl}lib/urxvt/perl/selection +${PLIST.perl}lib/urxvt/perl/selection-autotransform +${PLIST.perl}lib/urxvt/perl/selection-pastebin +${PLIST.perl}lib/urxvt/perl/selection-popup +${PLIST.perl}lib/urxvt/perl/tabbed +${PLIST.perl}lib/urxvt/perl/urxvt-popup +${PLIST.perl}lib/urxvt/perl/xim-onthespot +${PLIST.perl}lib/urxvt/urxvt.pm man/man1/urxvt.1 man/man1/urxvtc.1 man/man1/urxvtd.1 -${PERL}man/man3/urxvtperl.3 +${PLIST.perl}man/man3/urxvtperl.3 man/man7/urxvt.7 share/doc/rxvt-unicode/README.FAQ share/examples/rxvt-unicode/rxvt-unicode.termcap share/examples/rxvt-unicode/rxvt-unicode.terminfo @dirrm share/doc/rxvt-unicode @dirrm share/examples/rxvt-unicode -${PERL}@dirrm lib/urxvt/perl -${PERL}@dirrm lib/urxvt +${PLIST.perl}@dirrm lib/urxvt/perl +${PLIST.perl}@dirrm lib/urxvt diff --git a/x11/rxvt-unicode/options.mk b/x11/rxvt-unicode/options.mk index 0e308ba5da9..59a0b9577e3 100644 --- a/x11/rxvt-unicode/options.mk +++ b/x11/rxvt-unicode/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2007/11/22 11:59:06 obache Exp $ +# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:15 jlam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.rxvt-unicode PKG_SUPPORTED_OPTIONS= perl unicode3 xft2 rxvt-term @@ -10,14 +10,14 @@ PKG_SUGGESTED_OPTIONS= perl unicode3 xft2 CONFIGURE_ARGS+= --with-term=rxvt .endif +PLIST_VARS+= perl .if !empty(PKG_OPTIONS:Mperl) CONFIGURE_ARGS+= --enable-perl -PLIST_SUBST+= PERL= +PLIST.perl= yes .include "../../lang/perl5/buildlink3.mk" USE_TOOLS+= perl .else CONFIGURE_ARGS+= --disable-perl -PLIST_SUBST+= PERL='@comment ' .endif # use 21 instead of 16 bits to represent unicode characters diff --git a/x11/xf86-video-via/Makefile b/x11/xf86-video-via/Makefile index e36fca94571..62346df30c5 100644 --- a/x11/xf86-video-via/Makefile +++ b/x11/xf86-video-via/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/10/09 19:19:17 martti Exp $ +# $NetBSD: Makefile,v 1.6 2008/04/12 22:43:15 jlam Exp $ # DISTNAME= xf86-video-via-0.2.2 @@ -19,10 +19,9 @@ USE_TOOLS+= pkg-config .include "../../mk/bsd.prefs.mk" +PLIST_VARS+= XvMC .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" -PLIST_SUBST+= XVMC_SUPPORT="" -.else -PLIST_SUBST+= XVMC_SUPPORT="@comment " +PLIST.XvMC= yes .endif .include "../../x11/modular-xorg-server/buildlink3.mk" diff --git a/x11/xf86-video-via/PLIST b/x11/xf86-video-via/PLIST index e0de500601f..43cf62d71a2 100644 --- a/x11/xf86-video-via/PLIST +++ b/x11/xf86-video-via/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2007/08/16 14:17:09 joerg Exp $ -${XVMC_SUPPORT}lib/libviaXvMC.la -${XVMC_SUPPORT}lib/libviaXvMCPro.la +@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $ +${PLIST.XvMC}lib/libviaXvMC.la +${PLIST.XvMC}lib/libviaXvMCPro.la lib/xorg/modules/drivers/via_drv.la man/man4/via.4 @comment @dirrm lib/xorg/modules/drivers |
