pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Convert to use PLIST_VARS instead of manually passing ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a82b0186632
branches:  trunk
changeset: 540978:6a82b0186632
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Apr 12 22:42:57 2008 +0000

description:
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.

diffstat:

 archivers/gtar-base/Makefile        |   11 +-
 archivers/gtar-base/PLIST           |    6 +-
 archivers/p7zip/Makefile            |    7 +-
 archivers/p7zip/PLIST               |   54 +++---
 audio/amarok/PLIST                  |    6 +-
 audio/amarok/options.mk             |    8 +-
 audio/bmp/Makefile                  |   11 +-
 audio/bmp/PLIST                     |    4 +-
 audio/cmus/Makefile                 |    7 +-
 audio/cmus/PLIST                    |    4 +-
 audio/jack-devel/Makefile           |    9 +-
 audio/jack-devel/PLIST              |    6 +-
 audio/moc-devel/PLIST               |   10 +-
 audio/moc-devel/options.mk          |   16 +-
 audio/moc/PLIST                     |   10 +-
 audio/moc/options.mk                |   16 +-
 audio/normalize/PLIST               |    4 +-
 audio/normalize/options.mk          |    8 +-
 audio/streamtuner/PLIST             |   28 ++--
 audio/streamtuner/options.mk        |   13 +-
 audio/xmms-modplug/Makefile         |    7 +-
 audio/xmms-modplug/PLIST            |    4 +-
 audio/xmms/Makefile                 |    7 +-
 audio/xmms/Makefile.common          |    6 +-
 audio/xmms/PLIST.common             |    6 +-
 cad/lc/Makefile                     |    7 +-
 cad/lc/PLIST                        |    4 +-
 chat/eggdrop/Makefile               |    6 +-
 chat/eggdrop/PLIST                  |   36 ++--
 chat/jabberd2/PLIST                 |   22 +-
 chat/jabberd2/options.mk            |   22 +-
 chat/libpurple/PLIST                |   26 +-
 chat/libpurple/options.mk           |    7 +-
 chat/weechat/PLIST                  |   12 +-
 chat/weechat/options.mk             |   22 +-
 chat/xchat/PLIST                    |    6 +-
 chat/xchat/options.mk               |    7 +-
 comms/asterisk/PLIST.common         |   18 +-
 comms/asterisk/options.mk           |   16 +-
 converters/libiconv/Makefile        |    9 +-
 converters/libiconv/PLIST           |    4 +-
 databases/freetds/PLIST             |    4 +-
 databases/freetds/options.mk        |    9 +-
 databases/lbdb/Makefile             |    9 +-
 databases/lbdb/PLIST                |   12 +-
 databases/lbdb/options.mk           |   17 +-
 databases/myodbc/PLIST              |    4 +-
 databases/myodbc/options.mk         |    7 +-
 databases/sqlrelay/PLIST            |   34 ++--
 databases/sqlrelay/options.mk       |   22 +-
 devel/allegro/PLIST                 |    4 +-
 devel/allegro/options.mk            |    8 +-
 devel/binutils/Makefile             |    9 +-
 devel/binutils/PLIST.common         |   30 ++--
 devel/doxygen/Makefile              |    8 +-
 devel/doxygen/PLIST                 |   18 +-
 devel/gmake/Makefile                |    8 +-
 devel/gmake/PLIST                   |    4 +-
 devel/hdf5/PLIST                    |   86 ++++++------
 devel/hdf5/options.mk               |    8 +-
 devel/kdesdk3/PLIST                 |  108 +++++++-------
 devel/kdesdk3/options.mk            |    8 +-
 devel/kdevelop-base/PLIST           |   26 +-
 devel/kdevelop-base/options.mk      |    8 +-
 devel/libgphoto2/Makefile           |   13 +-
 devel/libgphoto2/PLIST.common       |    4 +-
 devel/libtool-base/Makefile         |    9 +-
 devel/libtool-base/PLIST            |    4 +-
 devel/m17n-lib/PLIST                |   24 +-
 devel/m17n-lib/options.mk           |    7 +-
 devel/m4/Makefile                   |    8 +-
 devel/m4/PLIST                      |    4 +-
 devel/ncurses/Makefile.common       |    7 +-
 devel/ncurses/PLIST                 |   32 ++--
 devel/nspr/Makefile                 |    8 +-
 devel/nspr/PLIST                    |    6 +-
 devel/pango/PLIST                   |   26 +-
 devel/pango/options.mk              |    7 +-
 devel/patch/Makefile                |    8 +-
 devel/patch/PLIST                   |    4 +-
 devel/pilrc/Makefile                |    9 +-
 devel/pilrc/PLIST                   |    4 +-
 devel/rt3/Makefile                  |    6 +-
 devel/rt3/PLIST                     |    4 +-
 devel/rudiments/Makefile            |    9 +-
 devel/rudiments/PLIST               |    8 +-
 devel/semi/PLIST                    |    6 +-
 devel/semi/options.mk               |   12 +-
 editors/emacs21/Makefile.common     |    6 +-
 editors/emacs21/PLIST               |    4 +-
 editors/tamago/Makefile             |    8 +-
 editors/tamago/PLIST                |    6 +-
 editors/xemacs-nox11/Makefile       |    4 +-
 editors/xemacs/Makefile             |    4 +-
 editors/xemacs/Makefile.common      |    3 +-
 editors/xemacs/PLIST                |    6 +-
 editors/xemacs/options.mk           |    7 +-
 emulators/p11/Makefile              |   22 +-
 emulators/p11/PLIST                 |    8 +-
 emulators/wine/PLIST                |   14 +-
 emulators/wine/options.mk           |    7 +-
 finance/kmymoney2/PLIST             |    6 +-
 finance/kmymoney2/options.mk        |    8 +-
 games/openttd/PLIST                 |   58 ++++----
 games/openttd/options.mk            |    8 +-
 games/quakeforge/Makefile           |    7 +-
 games/quakeforge/PLIST              |    4 +-
 graphics/cairo/Makefile             |    7 +-
 graphics/cairo/PLIST                |   18 +-
 graphics/cairo/options.mk           |    7 +-
 graphics/camlimages/Makefile        |   10 +-
 graphics/camlimages/PLIST           |   14 +-
 graphics/dia/options.mk             |   10 +-
 graphics/gimp/Makefile              |   13 +-
 graphics/gimp/PLIST                 |   20 +-
 graphics/gimp/options.mk            |   20 +-
 graphics/glitz/Makefile             |    9 +-
 graphics/glitz/PLIST                |   14 +-
 graphics/glitz/options.mk           |    7 +-
 graphics/gocr/PLIST                 |    4 +-
 graphics/gocr/options.mk            |    8 +-
 graphics/graphviz/PLIST             |   88 ++++++------
 graphics/graphviz/options.mk        |   16 +-
 graphics/imlib2/PLIST               |   16 +-
 graphics/imlib2/options.mk          |    7 +-
 graphics/libggi/Makefile            |   22 +-
 graphics/libggi/PLIST               |   10 +-
 graphics/libgii/Makefile            |    7 +-
 graphics/libgii/PLIST               |    4 +-
 graphics/py-matplotlib/Makefile     |    7 +-
 graphics/py-matplotlib/PLIST        |   12 +-
 graphics/radiance/Makefile          |   10 +-
 graphics/radiance/PLIST             |   24 +-
 graphics/sane-backends/Makefile     |   14 +-
 graphics/sane-backends/PLIST        |   12 +-
 graphics/sane-backends/options.mk   |    9 +-
 graphics/zphoto/PLIST               |    4 +-
 graphics/zphoto/options.mk          |    6 +-
 inputmethod/skk/PLIST               |    6 +-
 inputmethod/skk/options.mk          |    8 +-
 inputmethod/uim/PLIST               |   44 +++---
 inputmethod/uim/options.mk          |   29 +--
 lang/cint/Makefile                  |    9 +-
 lang/cint/PLIST                     |    4 +-
 lang/clisp/PLIST                    |   28 ++--
 lang/clisp/options.mk               |    8 +-
 lang/coq/Makefile                   |    7 +-
 lang/coq/PLIST                      |    6 +-
 lang/elk/Makefile                   |    3 +-
 lang/elk/PLIST                      |   20 +-
 lang/elk/options.mk                 |   20 +-
 lang/gauche/PLIST                   |    6 +-
 lang/gauche/options.mk              |    7 +-
 lang/python21/Makefile              |   20 +-
 lang/python21/PLIST.common          |   16 +-
 lang/python23/Makefile.common       |   39 ++---
 lang/python23/PLIST.common          |   20 +-
 lang/python24/Makefile              |   44 ++---
 lang/python24/PLIST.Darwin          |    4 +-
 lang/python24/PLIST.common          |   20 +-
 lang/ruby18-base/Makefile           |    9 +-
 lang/ruby18-base/PLIST              |    6 +-
 lang/smlnj/Makefile.common          |    8 +-
 lang/smlnj/PLIST                    |   32 ++--
 lang/sun-jre14/Makefile             |    7 +-
 lang/sun-jre14/PLIST                |    6 +-
 lang/sun-jre15/Makefile             |    7 +-
 lang/sun-jre15/PLIST.linux-i386     |    6 +-
 lang/sun-jre6/Makefile              |    7 +-
 lang/sun-jre6/PLIST.linux-i386      |    6 +-
 mail/bogofilter/PLIST               |    4 +-
 mail/bogofilter/options.mk          |    7 +-
 mail/clamav/PLIST                   |    4 +-
 mail/clamav/options.mk              |    7 +-
 mail/cyrus-imapd/Makefile           |   12 +-
 mail/cyrus-imapd/PLIST              |   10 +-
 mail/dbmail/PLIST                   |   46 +++---
 mail/dbmail/options.mk              |   23 +--
 mail/dkim-milter/PLIST              |    6 +-
 mail/dkim-milter/options.mk         |    6 +-
 mail/dspam/PLIST                    |   42 +++---
 mail/dspam/options.mk               |   24 +--
 mail/evolution/Makefile             |    6 +-
 mail/evolution/PLIST                |    8 +-
 mail/mutt-devel/Makefile            |    7 +-
 mail/mutt-devel/PLIST               |    6 +-
 mail/mutt-devel/options.mk          |    6 +-
 mail/mutt/Makefile                  |    7 +-
 mail/mutt/PLIST                     |    4 +-
 mail/perdition/PLIST                |    4 +-
 mail/perdition/options.mk           |    7 +-
 mail/postfix-current/PLIST          |    4 +-
 mail/postfix-current/options.mk     |    6 +-
 mail/postfix/PLIST                  |    4 +-
 mail/postfix/options.mk             |    6 +-
 mail/qmail/PLIST                    |    6 +-
 mail/qmail/options.mk               |   10 +-
 mail/wl/PLIST                       |    8 +-
 mail/wl/options.mk                  |    7 +-
 math/maxima/PLIST                   |   12 +-
 math/maxima/options.mk              |   13 +-
 math/py-Numeric/Makefile            |    7 +-
 math/py-Numeric/PLIST               |   12 +-
 math/py-numarray/Makefile           |    7 +-
 math/py-numarray/PLIST              |    4 +-
 misc/kdeaccessibility3/Makefile     |    7 +-
 misc/kdeaccessibility3/PLIST        |    6 +-
 misc/kdepim3/PLIST                  |    6 +-
 misc/kdepim3/options.mk             |    7 +-
 misc/koffice/PLIST                  |   26 +-
 misc/koffice/options.mk             |   17 +-
 misc/screen/Makefile                |    7 +-
 misc/screen/PLIST                   |   10 +-
 multimedia/gstreamer0.10/Makefile   |    7 +-
 multimedia/gstreamer0.10/PLIST      |   12 +-
 multimedia/mpeg4ip/Makefile         |    9 +-
 multimedia/mpeg4ip/PLIST            |    4 +-
 multimedia/smpeg/PLIST              |    8 +-
 multimedia/smpeg/options.mk         |   10 +-
 multimedia/transcode/PLIST          |   34 ++--
 multimedia/transcode/options.mk     |   28 +--
 multimedia/vlc/Makefile             |   12 +-
 multimedia/vlc/PLIST                |   18 +-
 multimedia/vlc/options.mk           |   16 +-
 multimedia/xine-lib/Makefile.common |   11 +-
 multimedia/xine-lib/PLIST.common    |   10 +-
 net/arla/PLIST                      |    4 +-
 net/arla/options.mk                 |    7 +-
 net/bind9/Makefile                  |    7 +-
 net/bind9/PLIST                     |    4 +-
 net/flow-tools/Makefile             |    7 +-
 net/flow-tools/PLIST                |   14 +-
 net/net-snmp/PLIST                  |    6 +-
 net/net-snmp/options.mk             |    6 +-
 net/netatalk/Makefile               |   12 +-
 net/netatalk/PLIST                  |   10 +-
 net/netatalk1/PLIST                 |    6 +-
 net/netatalk1/options.mk            |    6 +-
 net/ntp4/Makefile                   |   13 +-
 net/ntp4/PLIST                      |    8 +-
 net/py-mimelib/Makefile             |    7 +-
 net/py-mimelib/PLIST                |    6 +-
 net/samba/Makefile                  |    7 +-
 net/samba/PLIST                     |   36 ++--
 net/samba/options.mk                |   33 +---
 net/ser/PLIST                       |    4 +-
 net/ser/options.mk                  |    7 +-
 net/speedtouch/Makefile             |    7 +-
 net/speedtouch/PLIST                |    4 +-
 net/wireshark/PLIST                 |    6 +-
 net/wireshark/options.mk            |    9 +-
 pkgtools/bootstrap-extras/Makefile  |   80 ++++++-----
 pkgtools/bootstrap-extras/PLIST     |   10 +-
 pkgtools/libkver/Makefile           |    6 +-
 pkgtools/libkver/PLIST              |    4 +-
 pkgtools/xpkgwedge/Makefile         |   19 +-
 pkgtools/xpkgwedge/PLIST            |   10 +-
 print/cups/PLIST                    |    4 +-
 print/cups/options.mk               |    6 +-
 print/evince/Makefile               |   15 +-
 print/evince/PLIST                  |    6 +-
 print/ghostscript-esp/PLIST         |   12 +-
 print/ghostscript-esp/options.mk    |    6 +-
 print/ghostscript/PLIST             |   12 +-
 print/ghostscript/options.mk        |    6 +-
 print/libgnomeprint/Makefile        |    6 +-
 print/libgnomeprint/PLIST           |    4 +-
 print/xfce4-print/Makefile          |    9 +-
 print/xfce4-print/PLIST             |    6 +-
 print/xfce4-print/options.mk        |    6 +-
 security/PAM/Makefile               |   11 +-
 security/PAM/PLIST                  |    8 +-
 security/amavisd-new/Makefile       |    6 +-
 security/amavisd-new/PLIST          |    8 +-
 security/chkrootkit/Makefile        |    6 +-
 security/chkrootkit/PLIST           |    4 +-
 security/cyrus-saslauthd/PLIST      |    6 +-
 security/cyrus-saslauthd/options.mk |    6 +-
 security/gnupg/PLIST                |    4 +-
 security/gnupg/options.mk           |   12 +-
 security/heimdal/Makefile           |    7 +-
 security/heimdal/PLIST              |    8 +-
 security/heimdal/options.mk         |    7 +-
 security/openssl/PLIST.common       |    8 +-
 security/openssl/options.mk         |   14 +-
 security/pinentry/PLIST             |    8 +-
 security/pinentry/options.mk        |   13 +-
 security/ssh2/PLIST                 |    6 +-
 security/ssh2/options.mk            |    7 +-
 sysutils/amanda-server/Makefile     |   10 +-
 sysutils/amanda-server/PLIST        |    4 +-
 sysutils/apcupsd/PLIST              |   10 +-
 sysutils/apcupsd/options.mk         |    7 +-
 sysutils/coreutils/Makefile         |    9 +-
 sysutils/coreutils/PLIST            |    4 +-
 sysutils/e2fsprogs/Makefile         |   15 +-
 sysutils/e2fsprogs/PLIST            |    6 +-
 sysutils/grub/Makefile              |    7 +-
 sysutils/grub/PLIST                 |   10 +-
 sysutils/libgtop/Makefile           |   15 +-
 sysutils/libgtop/PLIST              |    8 +-
 sysutils/memtestplus/PLIST          |    4 +-
 sysutils/memtestplus/options.mk     |    7 +-
 textproc/aspell/Makefile            |    6 +-
 textproc/aspell/PLIST               |   28 ++--
 textproc/py-docutils/Makefile       |    7 +-
 textproc/py-docutils/PLIST          |   14 +-
 textproc/xerces-c/Makefile          |   10 +-
 textproc/xerces-c/PLIST             |   10 +-
 wm/compiz/Makefile                  |   12 +-
 wm/compiz/PLIST                     |   10 +-
 wm/golem/Makefile                   |    7 +-
 wm/golem/PLIST                      |    8 +-
 www/amaya/Makefile                  |    9 +-
 www/amaya/PLIST                     |    6 +-
 www/apache2/Makefile                |    9 +-
 www/apache2/PLIST                   |    8 +-
 www/apache2/options.mk              |    7 +-
 www/apache22/PLIST                  |    4 +-
 www/apache22/options.mk             |    7 +-
 www/emacs-w3m/Makefile              |    7 +-
 www/emacs-w3m/PLIST                 |   48 +++---
 www/emacs-w3m/options.mk            |    7 +-
 www/ikiwiki/Makefile                |    6 +-
 www/ikiwiki/PLIST                   |   12 +-
 www/libwww/Makefile                 |   10 +-
 www/libwww/PLIST                    |    4 +-
 www/py-django/PLIST                 |  130 +++++++++---------
 www/py-django/options.mk            |   20 +-
 www/w3m/PLIST                       |    4 +-
 www/w3m/options.mk                  |    6 +-
 x11/efltk/PLIST                     |    6 +-
 x11/efltk/options.mk                |   10 +-
 x11/fltk/Makefile                   |   10 +-
 x11/fltk/PLIST                      |  244 ++++++++++++++++++------------------
 x11/gdm/Makefile                    |   19 +-
 x11/gdm/PLIST                       |    8 +-
 x11/gnome-applets/Makefile          |   10 +-
 x11/gnome-applets/PLIST             |  206 +++++++++++++++---------------
 x11/gnome-control-center/Makefile   |    7 +-
 x11/gnome-control-center/PLIST      |   12 +-
 x11/gtk2/PLIST                      |   34 ++--
 x11/gtk2/options.mk                 |   13 +-
 x11/kdebase3/Makefile               |   12 +-
 x11/kdebase3/PLIST                  |   28 ++--
 x11/kdebase3/options.mk             |   11 +-
 x11/kdelibs3/Makefile               |    9 +-
 x11/kdelibs3/PLIST                  |   28 ++--
 x11/kdelibs3/options.mk             |    6 +-
 x11/lablgtk/Makefile                |    7 +-
 x11/lablgtk/PLIST                   |    6 +-
 x11/lablgtk/PLIST.glade             |    4 +-
 x11/lablgtk/PLIST.gnome             |    4 +-
 x11/lablgtk/PLIST.gnomecanvas       |    6 +-
 x11/lablgtk/PLIST.gtksourceview     |    4 +-
 x11/lablgtk/PLIST.svg               |    6 +-
 x11/matchbox-panel/Makefile         |    9 +-
 x11/matchbox-panel/PLIST            |    6 +-
 x11/mlterm/PLIST                    |    4 +-
 x11/mlterm/options.mk               |    7 +-
 x11/modular-xorg-server/PLIST       |    6 +-
 x11/modular-xorg-server/options.mk  |    6 +-
 x11/ocaml-graphics/Makefile         |    8 +-
 x11/ocaml-graphics/PLIST            |    4 +-
 x11/py-gnome2-desktop/Makefile      |    4 +-
 x11/py-gnome2-desktop/PLIST         |    6 +-
 x11/rxvt-unicode/PLIST              |   46 +++---
 x11/rxvt-unicode/options.mk         |    6 +-
 x11/xf86-video-via/Makefile         |    7 +-
 x11/xf86-video-via/PLIST            |    6 +-
 370 files changed, 2335 insertions(+), 2514 deletions(-)

diffs (truncated from 12841 to 300 lines):

diff -r 9c3dcdbd6424 -r 6a82b0186632 archivers/gtar-base/Makefile
--- a/archivers/gtar-base/Makefile      Sat Apr 12 22:40:22 2008 +0000
+++ b/archivers/gtar-base/Makefile      Sat Apr 12 22:42:57 2008 +0000
@@ -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 @@
 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 -r 9c3dcdbd6424 -r 6a82b0186632 archivers/gtar-base/PLIST
--- a/archivers/gtar-base/PLIST Sat Apr 12 22:40:22 2008 +0000
+++ b/archivers/gtar-base/PLIST Sat Apr 12 22:42:57 2008 +0000
@@ -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 -r 9c3dcdbd6424 -r 6a82b0186632 archivers/p7zip/Makefile
--- a/archivers/p7zip/Makefile  Sat Apr 12 22:40:22 2008 +0000
+++ b/archivers/p7zip/Makefile  Sat Apr 12 22:42:57 2008 +0000
@@ -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_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 -r 9c3dcdbd6424 -r 6a82b0186632 archivers/p7zip/PLIST
--- a/archivers/p7zip/PLIST     Sat Apr 12 22:40:22 2008 +0000
+++ b/archivers/p7zip/PLIST     Sat Apr 12 22:42:57 2008 +0000
@@ -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 @@
 @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 -r 9c3dcdbd6424 -r 6a82b0186632 audio/amarok/PLIST
--- a/audio/amarok/PLIST        Sat Apr 12 22:40:22 2008 +0000
+++ b/audio/amarok/PLIST        Sat Apr 12 22:42:57 2008 +0000
@@ -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 @@
 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/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 -r 9c3dcdbd6424 -r 6a82b0186632 audio/amarok/options.mk
--- a/audio/amarok/options.mk   Sat Apr 12 22:40:22 2008 +0000
+++ b/audio/amarok/options.mk   Sat Apr 12 22:42:57 2008 +0000
@@ -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 -r 9c3dcdbd6424 -r 6a82b0186632 audio/bmp/Makefile
--- a/audio/bmp/Makefile        Sat Apr 12 22:40:22 2008 +0000
+++ b/audio/bmp/Makefile        Sat Apr 12 22:42:57 2008 +0000
@@ -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 @@
 
 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 -r 9c3dcdbd6424 -r 6a82b0186632 audio/bmp/PLIST
--- a/audio/bmp/PLIST   Sat Apr 12 22:40:22 2008 +0000
+++ b/audio/bmp/PLIST   Sat Apr 12 22:42:57 2008 +0000
@@ -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/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 -r 9c3dcdbd6424 -r 6a82b0186632 audio/cmus/Makefile
--- a/audio/cmus/Makefile       Sat Apr 12 22:40:22 2008 +0000
+++ b/audio/cmus/Makefile       Sat Apr 12 22:42:57 2008 +0000
@@ -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+=       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 -r 9c3dcdbd6424 -r 6a82b0186632 audio/cmus/PLIST
--- a/audio/cmus/PLIST  Sat Apr 12 22:40:22 2008 +0000
+++ b/audio/cmus/PLIST  Sat Apr 12 22:42:57 2008 +0000
@@ -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/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 -r 9c3dcdbd6424 -r 6a82b0186632 audio/jack-devel/Makefile
--- a/audio/jack-devel/Makefile Sat Apr 12 22:40:22 2008 +0000
+++ b/audio/jack-devel/Makefile Sat Apr 12 22:42:57 2008 +0000
@@ -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=${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



Home | Main Index | Thread Index | Old Index