[Midnightbsd-cvs] mports [24294] trunk/security/gnupg1: update to 1.4.23

Sun Sep 9 18:25:36 EDT 2018

Revision: 24294
          http://svnweb.midnightbsd.org/mports/?rev=24294
Author:   laffer1
Date:     2018-09-09 18:25:36 -0400 (Sun, 09 Sep 2018)
Log Message:
-----------
update to 1.4.23

Modified Paths:
--------------
    trunk/security/gnupg1/Makefile
    trunk/security/gnupg1/distinfo
    trunk/security/gnupg1/pkg-plist

Modified: trunk/security/gnupg1/Makefile
===================================================================

--- trunk/security/gnupg1/Makefile	2018-09-09 22:22:02 UTC (rev 24293)
+++ trunk/security/gnupg1/Makefile	2018-09-09 22:25:36 UTC (rev 24294)
@@ -1,104 +1,68 @@
 # $MidnightBSD$
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.22
+PORTVERSION=	1.4.23
 PORTREVISION=	0
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR=	gnupg
+MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	1
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	The GNU Privacy Guard
 
-LICENSE=	gpl2
+LICENSE=	gpl3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=      gnupg-[0-9]*
+CPE_VENDOR=	gnupg
 
-USES=		charsetfix gmake tar:bzip2
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--infodir=${PREFIX}/info --mandir=${PREFIX}/man
-.if ${MACHINE_CPU:Mi586}
-MACHINE_ARCH=	i586
-.endif
-CFLAGS:=	${CFLAGS:S/-pipe//g}
+USES=		charsetfix compiler cpe gmake readline tar:bzip2
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-camellia \
+		--enable-noexecstack
+
 INFO=		gnupg1
 DOCSDIR=	${PREFIX}/share/doc/gnupg1
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	LDAP LIBICONV LIBUSB SUID_GPG NLS CURL DOCS
-OPTIONS_DEFAULT=	CURL
+TEST_TARGET=	check
+
+OPTIONS_DEFINE=	CURL DOCS LDAP ICONV LIBUSB NLS SUID_GPG
+OPTIONS_DEFAULT=CURL
+OPTIONS_SUB=	yes
+
+CURL_DESC=	Use libcurl for the keyserver interface
 LDAP_DESC=	LDAP keyserver interface
-LIBICONV_DESC=	use libiconv
-LIBUSB_DESC=	use libusb
-SUID_GPG_DESC=	install GPG with suid
-CURL_DESC=	use libcurl for the keyserver interface
+LIBUSB_DESC=	Support for USB smart cards
+SUID_GPG_DESC=	Install GPG setuid
 
-.include <bsd.mport.options.mk>
+CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
+CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
+# Work around a GnuPG configure buglet
+CURL_CONFIGURE_ENV=	_libcurl_config=${LOCALBASE}/bin/curl-config
 
-.if ${CC} == "clang"
-CFLAGS:=	${CFLAGS:S/$/ -std=c89/}
-.if (${ARCH} == "i386")
-CFLAGS:=	${CFLAGS:S/$/ -fheinous-gnu-extensions/}
-.endif
-.endif
+ICONV_USES=		iconv
+ICONV_CONFIGURE_ENABLE=	gnupg-iconv
 
-.if ${PORT_OPTIONS:MLIBICONV}
-USES+=		iconv
-.else
-CONFIGURE_ARGS+=	--disable-gnupg-iconv
-.endif
+LIBUSB_CONFIGURE_WITH=	libusb=${LOCALBASE}
 
-.if ${PORT_OPTIONS:MLIBUSB}
-CONFIGURE_ARGS+=	--with-libusb=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-libusb
-.endif
+LDAP_USE=		OPENLDAP=yes
+LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-PLIST_SUB+=	WITH_LDAP=""
-CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
-#CONFIGURE_ENV+=	LDFLAGS="-L/usr/lib"
-.else
-PLIST_SUB+=	WITH_LDAP="@comment "
-CONFIGURE_ARGS+=	--disable-ldap
-.endif
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+.include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
-# Work around a GnuPG configure buglet
-CONFIGURE_ENV+=	_libcurl_config=${LOCALBASE}/bin/curl-config
-.else
-CONFIGURE_ARGS+=--without-libcurl
+.if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang"
+CFLAGS+=	-fheinous-gnu-extensions
 .endif
 
-post-install:
-
-	${MKDIR} ${DOCSDIR}
-.for i in DETAILS FAQ HACKING OpenPGP
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
-.endfor
-.for i in ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for i in doc/DETAILS doc/FAQ doc/HACKING doc/OpenPGP \
+	ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
 	README THANKS TODO VERSION
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.if ${PORT_OPTIONS:MSUID_GPG}
-	${CHMOD} u+s ${PREFIX}/bin/gpg
-.endif
 
-check:
-	(cd ${WRKSRC}; ${MAKE} check)
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: trunk/security/gnupg1/distinfo
===================================================================
--- trunk/security/gnupg1/distinfo	2018-09-09 22:22:02 UTC (rev 24293)
+++ trunk/security/gnupg1/distinfo	2018-09-09 22:25:36 UTC (rev 24294)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1518895536
-SHA256 (gnupg-1.4.22.tar.bz2) = 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4
-SIZE (gnupg-1.4.22.tar.bz2) = 3746546
-SHA256 (gnupg-1.4.22.tar.bz2.sig) = 3e2267edca293131e3f65a0a21329e4399434e05e278f3c529f901c4c1dc440a
-SIZE (gnupg-1.4.22.tar.bz2.sig) = 620
+TIMESTAMP = 1536531821
+SHA256 (gnupg-1.4.23.tar.bz2) = c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba
+SIZE (gnupg-1.4.23.tar.bz2) = 3749353
+SHA256 (gnupg-1.4.23.tar.bz2.sig) = 5e7ecebefcfbdf5d0445813f23ae4405671e63af1a8a8e61bdde660f42d159fa
+SIZE (gnupg-1.4.23.tar.bz2.sig) = 310

Modified: trunk/security/gnupg1/pkg-plist
===================================================================
--- trunk/security/gnupg1/pkg-plist	2018-09-09 22:22:02 UTC (rev 24293)
+++ trunk/security/gnupg1/pkg-plist	2018-09-09 22:25:36 UTC (rev 24294)
@@ -2,7 +2,7 @@
 bin/gpg-zip
 bin/gpgsplit
 bin/gpgv
-%%WITH_LDAP%%libexec/gnupg/gpgkeys_ldap
+%%LDAP%%libexec/gnupg/gpgkeys_ldap
 libexec/gnupg/gpgkeys_curl
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp

