[pkgsrc/trunk]: pkgsrc/security/gnupg21 Add default-on option for libusb1 sup...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ce403e1e9fc
branches:  trunk
changeset: 349237:1ce403e1e9fc
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jul 02 15:16:11 2016 +0000

description:
Add default-on option for libusb1 support.

Based on patch by Jonathan Schleifer in PR 51303, with some
changes by myself.

diffstat:

 security/gnupg21/Makefile   |   3 ++-
 security/gnupg21/options.mk |  15 ++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 9254f72b2341 -r 1ce403e1e9fc security/gnupg21/Makefile
--- a/security/gnupg21/Makefile Sat Jul 02 15:07:47 2016 +0000
+++ b/security/gnupg21/Makefile Sat Jul 02 15:16:11 2016 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/06/17 11:56:24 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2016/07/02 15:16:11 wiz Exp $
 
 DISTNAME=      gnupg-2.1.13
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg21-/}
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/
diff -r 9254f72b2341 -r 1ce403e1e9fc security/gnupg21/options.mk
--- a/security/gnupg21/options.mk       Sat Jul 02 15:07:47 2016 +0000
+++ b/security/gnupg21/options.mk       Sat Jul 02 15:16:11 2016 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2015/10/08 13:35:39 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2016/07/02 15:16:11 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gnupg21
-PKG_SUPPORTED_OPTIONS= ldap
-PKG_SUGGESTED_OPTIONS= # empty
+PKG_SUPPORTED_OPTIONS= ldap libusb-1
+PKG_SUGGESTED_OPTIONS= libusb-1
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,3 +14,12 @@
 .else
 CONFIGURE_ARGS+=       --disable-ldap
 .endif
+
+.if !empty(PKG_OPTIONS:Mlibusb-1)
+# gnupg unfortunately doesn't use pkg-config
+CONFIGURE_ARGS+=       CPPFLAGS="${CPPFLAGS} -I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0"
+CONFIGURE_ARGS+=       LDFLAGS="${LDFLAGS} ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libusb1}/lib -L${BUILDLINK_PREFIX.libusb1}/lib"
+.include "../../devel/libusb1/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-ccid-driver
+.endif