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 /security/pinentry | |
| 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.
Diffstat (limited to 'security/pinentry')
| -rw-r--r-- | security/pinentry/PLIST | 8 | ||||
| -rw-r--r-- | security/pinentry/options.mk | 13 |
2 files changed, 10 insertions, 11 deletions
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 |