CVS commit: pkgsrc/security/gnupg21

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul  2 15:16:12 UTC 2016

Modified Files:
        pkgsrc/security/gnupg21: Makefile options.mk

Log Message:
Add default-on option for libusb1 support.

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


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/gnupg21/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/gnupg21/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gnupg21/Makefile
diff -u pkgsrc/security/gnupg21/Makefile:1.19 pkgsrc/security/gnupg21/Makefile:1.20
--- pkgsrc/security/gnupg21/Makefile:1.19       Fri Jun 17 11:56:24 2016
+++ pkgsrc/security/gnupg21/Makefile    Sat Jul  2 15:16:11 2016
@@ -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/

Index: pkgsrc/security/gnupg21/options.mk
diff -u pkgsrc/security/gnupg21/options.mk:1.1 pkgsrc/security/gnupg21/options.mk:1.2
--- pkgsrc/security/gnupg21/options.mk:1.1      Thu Oct  8 13:35:39 2015
+++ pkgsrc/security/gnupg21/options.mk  Sat Jul  2 15:16:11 2016
@@ -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 @@ PLIST.ldap=          yes
 .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