Date: Sat, 17 Sep 2016 15:58:50 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422332 - head/security/gnupg1 Message-ID: <201609171558.u8HFwomF042988@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Sat Sep 17 15:58:49 2016 New Revision: 422332 URL: https://svnweb.freebsd.org/changeset/ports/422332 Log: Complete the adoption of options helpers, remove old cruft, and take maintainership. PR: 212352 Approved by: maintainer timeout Modified: head/security/gnupg1/Makefile head/security/gnupg1/pkg-plist Modified: head/security/gnupg1/Makefile ============================================================================== --- head/security/gnupg1/Makefile Sat Sep 17 15:33:35 2016 (r422331) +++ head/security/gnupg1/Makefile Sat Sep 17 15:58:49 2016 (r422332) @@ -2,61 +2,55 @@ PORTNAME= gnupg PORTVERSION= 1.4.21 -#PORTREVISION= 0 CATEGORIES= security MASTER_SITES= GNUPG PKGNAMESUFFIX= 1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= kuriyama@FreeBSD.org +MAINTAINER= adamw@FreeBSD.org COMMENT= The GNU Privacy Guard LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +CPE_VENDOR= gnupg + USES= charsetfix cpe gmake tar:bzip2 GNU_CONFIGURE= YES -CPE_VENDOR= gnupg -.if ${MACHINE_CPU:Mi586} -MACHINE_ARCH= i586 -.endif -CFLAGS:= ${CFLAGS:S/-pipe//g} + INFO= gnupg1 DOCSDIR= ${PREFIX}/share/doc/gnupg1 PORTDOCS= * TEST_TARGET= check -OPTIONS_DEFINE= LDAP LIBICONV LIBUSB SUID_GPG NLS CURL DOCS -OPTIONS_DEFAULT= CURL +OPTIONS_DEFINE= CURL DOCS LDAP LIBICONV 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 + +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 LIBICONV_USES= iconv -LIBICONV_CONFIGURE_OFF= --disable-gnupg-iconv +LIBICONV_CONFIGURE_ENABLE= gnupg-iconv -LIBUSB_CONFIGURE_ON= --with-libusb=${LOCALBASE} -LIBUSB_CONFIGURE_OFF= --without-libusb +LIBUSB_CONFIGURE_WITH= libusb=${LOCALBASE} LDAP_USE= OPENLDAP=yes -LDAP_CONFIGURE_ON= --with-ldap=${LOCALBASE} -#LDAP_CONFIGURE_ENV+= LDFLAGS="-L/usr/lib" -LDAP_CONFIGURE_OFF= --disable-ldap +LDAP_CONFIGURE_WITH= ldap=${LOCALBASE} NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls -CURL_LIB_DEPENDS= libcurl.so:ftp/curl -CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE} -# Work around a GnuPG configure buglet -CURL_CONFIGURE_ENV= _libcurl_config=${LOCALBASE}/bin/curl-config -CURL_CONFIGURE_OFF= --without-libcurl - .include <bsd.port.options.mk> .if ${CC} == "clang" || ${OSVERSION} >= 1000024 @@ -66,7 +60,7 @@ CFLAGS:= ${CFLAGS:S/$/ -fheinous-gnu-ext .endif .endif -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in DETAILS FAQ HACKING OpenPGP ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} @@ -75,8 +69,8 @@ post-install: README THANKS TODO VERSION ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.if ${PORT_OPTIONS:MSUID_GPG} + +post-install-SUID_GPG-on: ${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/gpg -.endif .include <bsd.port.mk> Modified: head/security/gnupg1/pkg-plist ============================================================================== --- head/security/gnupg1/pkg-plist Sat Sep 17 15:33:35 2016 (r422331) +++ head/security/gnupg1/pkg-plist Sat Sep 17 15:58:49 2016 (r422332) @@ -41,4 +41,4 @@ man/man1/gpgv.1.gz %%NLS%%share/locale/uk/LC_MESSAGES/gnupg.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo -@unexec [ -r %D/bin/gpg2 ] && ln -s gpg2 %D/bin/gpg || true +@postunexec [ -r %D/bin/gpg2 ] && ln -s gpg2 %D/bin/gpg || true
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609171558.u8HFwomF042988>