pkg/51303: security/gnupg21 does not properly specify libusb1 dependency / builds without libusb support on OS X

[js-pkgsrc%heap.zone@localhost]

>Number:         51303
>Category:       pkg
>Synopsis:       security/gnupg21 does not properly specify libusb1 dependency / builds without libusb support on OS X
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jul 02 15:10:00 +0000 2016
>Originator:     Jonathan Schleifer
>Release:        current
>Organization:
>Environment:
Darwin obuolys.local 15.5.0 Darwin Kernel Version 15.5.0: Tue Apr 19 18:36:36 PDT 2016; root:xnu-3248.50.21~8/RELEASE_X86_64 x86_64
>Description:
security/gnupg21 is not built with libusb support on OS X. On other platforms, it is built with libusb support if it is installed.

Additionally, it might be desirable to run make check after the build.
>How-To-Repeat:
Install security/gnupg21
>Fix:
diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index ebd84b3..4e578bc 100644
--- a/security/gnupg21/Makefile
+++ b/security/gnupg21/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.19 2016/06/17 11:56:24 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 --git a/security/gnupg21/options.mk b/security/gnupg21/options.mk
index 5ca944d..1148590 100644
--- a/security/gnupg21/options.mk
+++ b/security/gnupg21/options.mk
@@ -1,8 +1,8 @@
 # $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
+PKG_SUPPORTED_OPTIONS=	ldap libusb1
+PKG_SUGGESTED_OPTIONS=	libusb1
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,3 +14,12 @@ PLIST.ldap=		yes
 .else
 CONFIGURE_ARGS+=	--disable-ldap
 .endif
+
+.if !empty(PKG_OPTIONS:Mlibusb1)
+# gnupg unfortunately doesn't use pkg-config
+CONFIGURE_ARGS+=	CPPFLAGS="${CPPFLAGS} -I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0"
+CONFIGURE_ARGS+=	LDFLAGS="${LDFLAGS} -L${BUILDLINK_PREFIX.libusb1}/lib"
+.include "../../devel/libusb1/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-ccid-driver
+.endif