diff options
| author | fhajny <fhajny@pkgsrc.org> | 2015-10-08 13:35:39 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2015-10-08 13:35:39 +0000 |
| commit | 569f74a5c6a19eade19c223b1f89f53d3e45e184 (patch) | |
| tree | 2eaa684c614bf708082e76c1717df2e27b994de9 | |
| parent | 2c30ffd32f75528b0f1f6daa289dbdf13a6792ad (diff) | |
| download | pkgsrc-569f74a5c6a19eade19c223b1f89f53d3e45e184.tar.gz | |
Add options.mk to properly select, detect and link in LDAP support.
Bump PKGREVISION as this removes dirmngr_ldap from default PLIST.
| -rw-r--r-- | security/gnupg21/Makefile | 6 | ||||
| -rw-r--r-- | security/gnupg21/PLIST | 4 | ||||
| -rw-r--r-- | security/gnupg21/options.mk | 16 |
3 files changed, 22 insertions, 4 deletions
diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile index 58727038747..790ac916671 100644 --- a/security/gnupg21/Makefile +++ b/security/gnupg21/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2015/10/03 12:44:10 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.9 2015/10/08 13:35:39 fhajny Exp $ DISTNAME= gnupg-2.1.6 PKGNAME= ${DISTNAME:S/gnupg-/gnupg21-/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ EXTRACT_SUFX= .tar.bz2 @@ -23,6 +23,8 @@ USE_LIBTOOL= yes INFO_FILES= yes GNU_CONFIGURE= yes +.include "options.mk" + BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.16 .include "../../security/libgpg-error/buildlink3.mk" BUILDLINK_API_DEPENDS.libassuan+= libassuan>=2.1.0 diff --git a/security/gnupg21/PLIST b/security/gnupg21/PLIST index a072f328225..12e44a14d29 100644 --- a/security/gnupg21/PLIST +++ b/security/gnupg21/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/07/04 05:26:21 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2015/10/08 13:35:39 fhajny Exp $ bin/dirmngr bin/dirmngr-client bin/g13 @@ -15,7 +15,7 @@ bin/gpgv2 bin/kbxutil bin/watchgnupg info/gnupg.info -libexec/dirmngr_ldap +${PLIST.ldap}libexec/dirmngr_ldap libexec/gpg-check-pattern libexec/gpg-preset-passphrase libexec/gpg-protect-tool diff --git a/security/gnupg21/options.mk b/security/gnupg21/options.mk new file mode 100644 index 00000000000..5ca944d1997 --- /dev/null +++ b/security/gnupg21/options.mk @@ -0,0 +1,16 @@ +# $NetBSD: options.mk,v 1.1 2015/10/08 13:35:39 fhajny Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gnupg21 +PKG_SUPPORTED_OPTIONS= ldap +PKG_SUGGESTED_OPTIONS= # empty + +.include "../../mk/bsd.options.mk" + +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" +.else +CONFIGURE_ARGS+= --disable-ldap +.endif |