svn commit: r383891 - head/security/gnupg

[Jun Kuriyama]

Author: kuriyama
Date: Mon Apr 13 02:55:29 2015
New Revision: 383891
URL: https://svnweb.freebsd.org/changeset/ports/383891

Log:
  - Add CPE information [1].
  - Fix accidentally linking devel/readline if installed [2].
  
  # I'm working on 2.1.3 update, but it requires LDAP header even if
  # disabled.  Stay tuned (or patches are welcome).
  
  PR:		ports/198849 [1], ports/198036 and ports/198354 [2]
  Submitted by:	shun.fbsd.pr at dropcut.net [1], amdmi3 and jf at fahrner.name [2]

Modified:
  head/security/gnupg/Makefile

Modified: head/security/gnupg/Makefile
==============================================================================
--- head/security/gnupg/Makefile	Sun Apr 12 23:01:32 2015	(r383890)
+++ head/security/gnupg/Makefile	Mon Apr 13 02:55:29 2015	(r383891)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	2.1.2
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/gnupg
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -24,10 +24,15 @@ BUILD_DEPENDS=	libgpg-error>=1.16:${PORT
 RUN_DEPENDS=	pinentry>0:${PORTSDIR}/security/pinentry
 
 GNU_CONFIGURE=	YES
-USES=		gmake iconv pkgconfig tar:bzip2
+USES=		cpe gmake iconv pkgconfig tar:bzip2
 USE_LDCONFIG=	YES
-CONFIGURE_ARGS+=	--disable-ntbtls --enable-symcryptrun
+# libreadline.so.8 is placed in /lib, but --with-readline argument
+# will be treated as $value/lib, so try using /usr instead.
+# Otherwise, $PREFIX/lib/libreadline.so.6 will be linked when
+# devel/readline is installed.
+CONFIGURE_ARGS+=	--disable-ntbtls --enable-symcryptrun --with-readline=/usr
 CONFLICTS=	gnupg-2.0.* dirmngr-*
+CPE_VENDOR=	gnupg
 
 OPTIONS_DEFINE=		GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG
 LDAP_DESC=		LDAP keyserver interface