svn commit: r358767 - in head: . security/gpgme

[Jason E. Hale]

Author: jhale
Date: Sun Jun 22 07:07:42 2014
New Revision: 358767
URL: http://svnweb.freebsd.org/changeset/ports/358767
QAT: https://qat.redports.org/buildarchive/r358767/

Log:
  - Update to 1.5.0
  - Simplify MASTER_SITES
  - Drop signature download and verify target
  - Strip libraries
  - Add UPDATING entry documenting behavior change since gpgme now
    autodetects the gpg binary

Modified:
  head/UPDATING
  head/security/gpgme/Makefile
  head/security/gpgme/distinfo
  head/security/gpgme/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Sun Jun 22 05:06:22 2014	(r358766)
+++ head/UPDATING	Sun Jun 22 07:07:42 2014	(r358767)
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20140622:
+  AFFECTS: users of security/gpgme
+  AUTHOR: jhale at FreeBSD.org
+
+  If you have both security/gnupg AND security/gnupg1 installed, gpgme will
+  now automatically detect and use security/gnupg.  Specifically, it will
+  search for gpgconf(1) first and use the paths for the binaries provided
+  by it.  Failing that, it will search for a binary named "gpg".
+
+  It is no longer possible to specify the location of the gpg binary at
+  buildtime to differentiate between version 1.x and version 2.x.  The port
+  options GNUPG1 and GNUPG2 now merely add their respective versions of gnupg
+  as build and runtime dependencies.
+
 20140618:
   AFFECTS: users of devel/m17n-* textproc/*m17n*
   AUTHOR: Nikola Lecic <nikola.lecic at anthesphoria.net>

Modified: head/security/gpgme/Makefile
==============================================================================
--- head/security/gpgme/Makefile	Sun Jun 22 05:06:22 2014	(r358766)
+++ head/security/gpgme/Makefile	Sun Jun 22 07:07:42 2014	(r358767)
@@ -2,13 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	gpgme
-PORTVERSION=	1.4.3
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR=	gpgme
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	GNUPG/gpgme
 
 MAINTAINER=	jhale at FreeBSD.org
 COMMENT=	Library to make access to GnuPG easier
@@ -22,8 +18,7 @@ GNU_CONFIGURE=	yes
 USES=		gmake libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gpgme \
-		--with-g13=no
+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gpgme
 
 INFO=		gpgme
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
@@ -36,32 +31,14 @@ OPTIONS_DEFAULT=	GNUPG2 UISERVER
 GNUPG1_DESC=		Build gpgme library for GnuPG 1.x
 GNUPG1_BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 GNUPG1_RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
-GNUPG1_CONFIGURE_ON=	--with-gpg=${LOCALBASE}/bin/gpg \
-			--with-gpgconf=no \
-			--with-gpgsm=no
 
 GNUPG2_DESC=		Build gpgme library for GnuPG 2.x
 GNUPG2_BUILD_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 GNUPG2_RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
-GNUPG2_CONFIGURE_ON=	--with-gpg=${LOCALBASE}/bin/gpg2 \
-			--with-gpgconf=${LOCALBASE}/bin/gpgconf
 
 UISERVER_DESC=			GnuPG UI server support
 UISERVER_CONFIGURE_ENABLE=	fd-passing
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNUPG2}
-.if exists(${LOCALBASE}/bin/gpgsm)
-CONFIGURE_ARGS+=--with-gpgsm=${LOCALBASE}/bin/gpgsm
-.else
-CONFIGURE_ARGS+=--with-gpgsm=no
-.endif
-.endif
-
-verify: checksum
-	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 					${WRKSRC}/${CONFIGURE_SCRIPT} \
@@ -74,5 +51,6 @@ post-patch:
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgpgme*.so.*
 
 .include <bsd.port.mk>

Modified: head/security/gpgme/distinfo
==============================================================================
--- head/security/gpgme/distinfo	Sun Jun 22 05:06:22 2014	(r358766)
+++ head/security/gpgme/distinfo	Sun Jun 22 07:07:42 2014	(r358767)
@@ -1,4 +1,2 @@
-SHA256 (gpgme-1.4.3.tar.bz2) = 2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496
-SIZE (gpgme-1.4.3.tar.bz2) = 972497
-SHA256 (gpgme-1.4.3.tar.bz2.sig) = 5b8269678c1ec6a73ad56475f731c1247359167a921b1dc0ae3b1e8d38a9273c
-SIZE (gpgme-1.4.3.tar.bz2.sig) = 287
+SHA256 (gpgme-1.5.0.tar.bz2) = d1127ed730976468255e692d91f1c25b49fe2a97aad1379fc443f2c83c683c83
+SIZE (gpgme-1.5.0.tar.bz2) = 964134

Modified: head/security/gpgme/pkg-plist
==============================================================================
--- head/security/gpgme/pkg-plist	Sun Jun 22 05:06:22 2014	(r358766)
+++ head/security/gpgme/pkg-plist	Sun Jun 22 07:07:42 2014	(r358767)
@@ -6,11 +6,11 @@ lib/common-lisp/gpgme/gpgme.lisp
 lib/libgpgme-pthread.la
 lib/libgpgme-pthread.so
 lib/libgpgme-pthread.so.11
-lib/libgpgme-pthread.so.11.11.0
+lib/libgpgme-pthread.so.11.12.0
 lib/libgpgme.la
 lib/libgpgme.so
 lib/libgpgme.so.11
-lib/libgpgme.so.11.11.0
+lib/libgpgme.so.11.12.0
 share/aclocal/gpgme.m4
 @dirrm lib/common-lisp/gpgme
 @dirrmtry lib/common-lisp