diff options
author | drochner <drochner@pkgsrc.org> | 2010-02-07 15:36:58 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2010-02-07 15:36:58 +0000 |
commit | 3ef73591a9f92aaaaf96b1b3ca6a5981cb28476b (patch) | |
tree | cec37baff0bbabf37f5799e6c3826110b50ad527 /security/pinentry | |
parent | 6d2b93c2f39dafabd7024ff27b2160357ee7639b (diff) | |
download | pkgsrc-3ef73591a9f92aaaaf96b1b3ca6a5981cb28476b.tar.gz |
put the pinentry variants which depend on a toolkit into seperate
pkgs rather than having their build controlled by options
(no change in the default case)
Diffstat (limited to 'security/pinentry')
-rw-r--r-- | security/pinentry/Makefile | 8 | ||||
-rw-r--r-- | security/pinentry/PLIST | 5 | ||||
-rw-r--r-- | security/pinentry/options.mk | 33 |
3 files changed, 18 insertions, 28 deletions
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index 6b66a064e36..3e60fe27cce 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2009/12/15 19:50:47 drochner Exp $ +# $NetBSD: Makefile,v 1.23 2010/02/07 15:36:58 drochner Exp $ # DISTNAME= pinentry-0.7.6 @@ -18,6 +18,12 @@ INFO_FILES= yes .include "options.mk" +.if defined(PINENTRY_DEFAULT) +post-install: + ${LN} -sf ${DESTDIR}${PREFIX}/bin/pinentry-${PINENTRY_DEFAULT} \ + ${DESTDIR}${PREFIX}/bin/pinentry +.endif + BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0 .include "../../converters/libiconv/buildlink3.mk" diff --git a/security/pinentry/PLIST b/security/pinentry/PLIST index 70a6f2a73b3..a2d7ac30731 100644 --- a/security/pinentry/PLIST +++ b/security/pinentry/PLIST @@ -1,7 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:12 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/02/07 15:36:58 drochner Exp $ bin/pinentry bin/pinentry-curses info/pinentry.info -${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 f950d2ccaff..9f4c9e41aa8 100644 --- a/security/pinentry/options.mk +++ b/security/pinentry/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $ +# $NetBSD: options.mk,v 1.6 2010/02/07 15:36:58 drochner Exp $ # # XXX This usage of bsd.options.mk is incorrect. The package should @@ -11,33 +11,20 @@ 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.gtk= yes -. include "../../x11/gtk/buildlink3.mk" -.else CONFIGURE_ARGS+= --disable-pinentry-gtk +.if !empty(PKG_OPTIONS:Mgtk) +DEPENDS+= pinentry-gtk-[0-9]*:../../security/pinentry-gtk +PINENTRY_DEFAULT= gtk .endif -.if !empty(PKG_OPTIONS:Mgtk2) -CONFIGURE_ARGS+= --enable-pinentry-gtk2 -PLIST.gtk2= yes -. include "../../x11/gtk2/buildlink3.mk" -.else CONFIGURE_ARGS+= --disable-pinentry-gtk2 +.if !empty(PKG_OPTIONS:Mgtk2) +DEPENDS+= pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2 +PINENTRY_DEFAULT= gtk2 .endif -.if !empty(PKG_OPTIONS:Mqt) -USE_LANGUAGES+= c c++ -USE_TOOLS+= gmake -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.qt= yes -. include "../../x11/qt3-libs/buildlink3.mk" -.else CONFIGURE_ARGS+= --disable-pinentry-qt +.if !empty(PKG_OPTIONS:Mqt) +DEPENDS+= pinentry-qt-[0-9]*:../../security/pinentry-qt +PINENTRY_DEFAULT= qt .endif |