[pkgsrc/trunk]: pkgsrc/security/gnupg2 gnupg2: add options for bzip2 and zlib

[tm <tm%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a38575febfef
branches:  trunk
changeset: 379954:a38575febfef
user:      tm <tm%pkgsrc.org@localhost>
date:      Tue May 08 11:56:21 2018 +0000

description:
gnupg2: add options for bzip2 and zlib

diffstat:

 security/gnupg2/Makefile   |   3 ++-
 security/gnupg2/options.mk |  18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r 4d1b47cbe867 -r a38575febfef security/gnupg2/Makefile
--- a/security/gnupg2/Makefile  Tue May 08 11:33:16 2018 +0000
+++ b/security/gnupg2/Makefile  Tue May 08 11:56:21 2018 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2018/05/04 06:08:40 adam Exp $
+# $NetBSD: Makefile,v 1.86 2018/05/08 11:56:21 tm Exp $
 
 DISTNAME=      gnupg-2.2.7
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg2-/}
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/
 EXTRACT_SUFX=  .tar.bz2
diff -r 4d1b47cbe867 -r a38575febfef security/gnupg2/options.mk
--- a/security/gnupg2/options.mk        Tue May 08 11:33:16 2018 +0000
+++ b/security/gnupg2/options.mk        Tue May 08 11:56:21 2018 +0000
@@ -1,11 +1,18 @@
-# $NetBSD: options.mk,v 1.11 2017/08/29 12:11:35 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2018/05/08 11:56:21 tm Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnupg2
-PKG_SUPPORTED_OPTIONS= ldap libusb-1
+PKG_SUPPORTED_OPTIONS= bzip2 ldap libusb-1 zlib
 PKG_SUGGESTED_OPTIONS= libusb-1
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mbzip2)
+CONFIGURE_ARGS+=       --with-bzip2=${BUILDLINK_PREFIX.bzip2}
+.include "../../archivers/bzip2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-bzip2
+.endif
+
 PLIST_VARS+=           ldap
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=       --with-ldap=${BUILDLINK_PREFIX.openldap-client}
@@ -23,3 +30,10 @@
 .else
 CONFIGURE_ARGS+=       --disable-ccid-driver
 .endif
+
+.if !empty(PKG_OPTIONS:Mzlib)
+CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
+.include "../../devel/zlib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-zip
+.endif