diff options
author | rillig <rillig> | 2006-06-17 13:46:34 +0000 |
---|---|---|
committer | rillig <rillig> | 2006-06-17 13:46:34 +0000 |
commit | 2901aa98ed4d56146fb287a194005125f9941f19 (patch) | |
tree | 00f6ee2da50c1785190d8dafab120b459b05a6ed /security | |
parent | 76bbde41cfddfb3dc438c0a0d29ee69ffb2e536d (diff) | |
download | pkgsrc-2901aa98ed4d56146fb287a194005125f9941f19.tar.gz |
Fixed the set of installed files when the "qt" or "gtk" options are
selected. Fixed pkglint warnings. Bumped PKGREVISION.
Diffstat (limited to 'security')
-rw-r--r-- | security/pinentry/Makefile | 29 | ||||
-rw-r--r-- | security/pinentry/buildlink3.mk | 4 | ||||
-rw-r--r-- | security/pinentry/options.mk | 31 |
3 files changed, 37 insertions, 27 deletions
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile index ed8e474c7f2..e48ceed55f5 100644 --- a/security/pinentry/Makefile +++ b/security/pinentry/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2006/04/17 13:46:47 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2006/06/17 13:46:34 rillig Exp $ # DISTNAME= pinentry-0.7.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/pinentry/ @@ -13,30 +13,9 @@ COMMENT= Applications for entering PINs or Passphrases GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} -INFO_FILES= # PLIST +INFO_FILES= yes -# XXX This usage of bsd.options.mk is wrong and has to be fixed. The -# package has to be splitted into different packages, such as pinentry-gtk -# and pinentry-qt, so that the frontends can be built on their own and -# can be distributed in different binary packages. -PKG_OPTIONS_VAR= PKG_OPTIONS.pinentry -PKG_SUPPORTED_OPTIONS= gtk qt -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mgtk) -PLIST_SUBST+= USE_GTK= -. include "../../x11/gtk/buildlink3.mk" -.else -PLIST_SUBST+= USE_GTK='@comment ' -.endif - -.if !empty(PKG_OPTIONS:Mqt) -USE_TOOLS+= gmake -PLIST_SUBST+= USE_QT= -. include "../../x11/qt3-libs/buildlink3.mk" -.else -PLIST_SUBST+= USE_QT='@comment ' -.endif +.include "options.mk" BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.0.0 diff --git a/security/pinentry/buildlink3.mk b/security/pinentry/buildlink3.mk index 7f3cfa57a9e..4730835e17d 100644 --- a/security/pinentry/buildlink3.mk +++ b/security/pinentry/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:34 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2006/06/17 13:46:34 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PINENTRY_BUILDLINK3_MK:= ${PINENTRY_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= pinentry .if !empty(PINENTRY_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.pinentry+= pinentry>=0.7.1 -BUILDLINK_ABI_DEPENDS.pinentry?= pinentry>=0.7.1nb3 +BUILDLINK_ABI_DEPENDS.pinentry+= pinentry>=0.7.1nb3 BUILDLINK_PKGSRCDIR.pinentry?= ../../security/pinentry .endif # PINENTRY_BUILDLINK3_MK diff --git a/security/pinentry/options.mk b/security/pinentry/options.mk new file mode 100644 index 00000000000..c2ae8c8176b --- /dev/null +++ b/security/pinentry/options.mk @@ -0,0 +1,31 @@ +# $NetBSD: options.mk,v 1.1 2006/06/17 13:46:34 rillig Exp $ +# + +# XXX This usage of bsd.options.mk is wrong and has to be fixed. The +# package has to be splitted into different packages, such as pinentry-gtk +# and pinentry-qt, so that the frontends can be built on their own and +# can be distributed in different binary packages. + +PKG_OPTIONS_VAR= PKG_OPTIONS.pinentry +PKG_SUPPORTED_OPTIONS= gtk qt +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mgtk) +CONFIGURE_ARGS+= --enable-pinentry-gtk +PLIST_SUBST+= USE_GTK= +. include "../../x11/gtk/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-pinentry-gtk +PLIST_SUBST+= USE_GTK='@comment ' +.endif + +.if !empty(PKG_OPTIONS:Mqt) +USE_LANGUAGES+= c c++ +USE_TOOLS+= gmake +CONFIGURE_ARGS+= --enable-pinentry-qt +PLIST_SUBST+= USE_QT= +. include "../../x11/qt3-libs/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-pinentry-qt +PLIST_SUBST+= USE_QT='@comment ' +.endif |