Import of pkgsrc-2016Q3

security/gnupg2/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2015/09/09 18:15:34 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2016/04/13 18:01:55 wiz Exp $
 
-DISTNAME=	gnupg-2.0.29
+DISTNAME=	gnupg-2.0.30
 PKGNAME=	${DISTNAME:S/gnupg/gnupg2/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/
@@ -18,7 +18,7 @@ USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sharedstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-pinentry-pgm=${BUILDLINK_PREFIX.pinentry}/bin/pinentry
+CONFIGURE_ARGS+=	--with-pinentry-pgm=${PREFIX}/bin/pinentry
 
 .include "../../mk/bsd.prefs.mk"
 

security/gnupg2/buildlink3.mk

@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2012/05/07 01:53:56 dholland Exp $
-
-BUILDLINK_TREE+=	gnupg2
-
-.if !defined(GNUPG2_BUILDLINK3_MK)
-GNUPG2_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gnupg2+=	gnupg2>=2.0.0
-BUILDLINK_ABI_DEPENDS.gnupg2+=	gnupg2>=2.0.17nb1
-BUILDLINK_PKGSRCDIR.gnupg2?=	../../security/gnupg2
-BUILDLINK_PREFIX.gnupg2?=	${LOCALBASE}
-
-.endif # GNUPG2_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-gnupg2

security/gnupg2/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.36 2015/09/09 18:15:34 wiz Exp $
+$NetBSD: distinfo,v 1.38 2016/04/13 18:01:55 wiz Exp $
 
-SHA1 (gnupg-2.0.29.tar.bz2) = 87eb0df18f9953675f979405a1af10ab6c5322b3
-RMD160 (gnupg-2.0.29.tar.bz2) = 364388c339b4bb9bb040ddbcbe3fa4d66ec62cb5
-Size (gnupg-2.0.29.tar.bz2) = 4416251 bytes
-SHA1 (patch-ao) = b0d0dfb9234ec332f826e3c93008c2fbb1c955f5
+SHA1 (gnupg-2.0.30.tar.bz2) = a9f024588c356a55e2fd413574bfb55b2e18794a
+RMD160 (gnupg-2.0.30.tar.bz2) = 7d682c3e0e1c188d026519b0511ecde6a0cc6bd7
+SHA512 (gnupg-2.0.30.tar.bz2) = e60a57f7dc74b44f884fd50d5a9c51cef7df8c098644ebab9ef7d945a40b0e4a285d0dc80b10fe39d8e4c2cc9d6cbbe800a0ddae54883180dc755fe47ced3314
+Size (gnupg-2.0.30.tar.bz2) = 4414652 bytes
 SHA1 (patch-tools_gpgkey2ssh.c) = 38ccb1980d6248b11316ccc49cd3dda06bab0d3b

security/gnupg2/patches/patch-ao

@@ -1,17 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2015/09/09 18:15:34 wiz Exp $
-
-gpg-zip script will not be installed, so man page also should not be installed.
-If will introduce conflict with security/gnupg.
-https://bugs.gnupg.org/gnupg/issue2095
-
---- doc/Makefile.in.orig	2010-07-19 07:05:40.000000000 +0000
-+++ doc/Makefile.in
-@@ -351,7 +351,7 @@ myman_sources = gnupg7.texi gpg.texi gpg
- myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \
-                 watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \
- 		gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \
--		gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1
-+		gpgsm-gencert.sh.1 applygnupgdefaults.8
- 
- man_MANS = $(myman_pages)
- noinst_MANS = gnupg.7