svn commit: r431051 - in head/security/gnupg20: . files
Adam Weinberger
adamw at FreeBSD.org
Tue Jan 10 02:34:34 UTC 2017
Author: adamw
Date: Tue Jan 10 02:34:33 2017
New Revision: 431051
URL: https://svnweb.freebsd.org/changeset/ports/431051
Log:
Modernize, reformat, and simplify this port.
User-facing changes, some of which required a PORTREVISION bump:
* Explicitly depend upon libgpg-error.so
* Just depend on readline for everybody, rather that silently linking
against it on 10.x and when certain knobs were enabled
* Don't download the .sig file
* Install manpages for everybody. As a side effect, everybody gets
the info files. Also, put the help docs into DOCSDIR, not DATADIR.
AFAICT, they weren't called from gpg itself
* Reword the pkg-descr and COMMENT
* Fold the pkg-install into pkg-plist, and loosen the semantics for
creating the gpg symlink, and tighten those for removing it
* Remove the pkg-message. The pinentry port installs a dialogue
Deleted:
head/security/gnupg20/pkg-install
head/security/gnupg20/pkg-message
Modified:
head/security/gnupg20/Makefile
head/security/gnupg20/files/patch-doc-Makefile.in
head/security/gnupg20/pkg-descr
head/security/gnupg20/pkg-plist
Modified: head/security/gnupg20/Makefile
==============================================================================
--- head/security/gnupg20/Makefile Tue Jan 10 02:20:58 2017 (r431050)
+++ head/security/gnupg20/Makefile Tue Jan 10 02:34:33 2017 (r431051)
@@ -2,15 +2,13 @@
PORTNAME= gnupg
PORTVERSION= 2.0.29
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= GNUPG
PKGNAMESUFFIX= 20
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= adamw at FreeBSD.org
-COMMENT= The GNU Privacy Guard
+COMMENT= The GNU Privacy Guard (stable version)
LICENSE= GPLv3 LGPL3
LICENSE_COMB= multi
@@ -19,69 +17,58 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LI
LIB_DEPENDS= libassuan.so:security/libassuan \
libgcrypt.so:security/libgcrypt \
+ libgpg-error.so:security/libgpg-error \
libksba.so:security/libksba \
libpth.so:devel/pth
BUILD_DEPENDS= libgpg-error>=1.11:security/libgpg-error
-RUN_DEPENDS= pinentry>0:security/pinentry
+RUN_DEPENDS= pinentry:security/pinentry
-GNU_CONFIGURE= YES
-USES= cpe gmake iconv tar:bzip2
-USE_LDCONFIG= YES
-CONFIGURE_ARGS+= --enable-symcryptrun
CONFLICTS= gnupg-2.1.*
CPE_VENDOR= gnupg
-OPTIONS_DEFINE= LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG
-LDAP_DESC= LDAP keyserver interface
-SCDAEMON_DESC= Enable Smartcard daemon (with libusb)
-CURL_DESC= Use the real curl library (worked around if no)
-GPGSM_DESC= Enable GPGSM (requires LDAP)
-KDNS_DESC= Use DNS CERT helper
-STD_SOCKET_DESC= Use standard socket for agent
-SUID_GPG_DESC= Install GPG with suid
-OPTIONS_DEFAULT= CURL
-NO_OPTIONS_SORT= YES
-OPTIONS_SUB= YES
+USES= cpe gmake iconv readline tar:bzip2
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-symcryptrun
+INFO= gnupg
+
+OPTIONS_DEFINE= LDAP SCDAEMON CURL GPGSM KDNS STD_SOCKET NLS DOCS SUID_GPG
+OPTIONS_DEFAULT=CURL
+NO_OPTIONS_SORT=yes
+OPTIONS_SUB= yes
+
+GPGSM_DESC= Enable GPGSM (requires LDAP)
+LDAP_DESC= LDAP keyserver interface
+KDNS_DESC= Use DNS CERT helper
+SCDAEMON_DESC= Enable Smartcard daemon (with libusb)
+STD_SOCKET_DESC=Use standard socket for agent
+SUID_GPG_DESC= Install GPG setuid
+
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+CURL_CONFIGURE_WITH= libcurl=${LOCALBASE}
-DOCS_CONFIGURE_ENABLE= doc
GPGSM_RUN_DEPENDS= dirmngr:security/dirmngr
GPGSM_CONFIGURE_ENABLE= gpgsm
+GPGSM_IMPLIES= LDAP
+
KDNS_LIB_DEPENDS= libadns.so:dns/adns
-KDNS_CONFIGURE_ON= --with-adns=${LOCALBASE}
-STD_SOCKET_CONFIGURE_ENABLE= standard-socket
-NLS_USES= gettext
-NLS_CONFIGURE_ENABLE= nls
-SCDAEMON_CONFIGURE_ENABLE= scdaemon
-CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}
-CURL_CONFIGURE_OFF= --without-libcurl
+KDNS_CONFIGURE_WITH= adns=${LOCALBASE}
-.include <bsd.port.options.mk>
+LDAP_USE= OPENLDAP=yes
+LDAP_CONFIGURE_WITH= ldap=${LOCALBASE}
-.if ${PORT_OPTIONS:MDOCS}
-INFO= gnupg
-.endif
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
-.if ${PORT_OPTIONS:MGPGSM}
-PORT_OPTIONS+= LDAP
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP= YES
-CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=--disable-ldap
-.endif
-
-.if ! ${PORT_OPTIONS:MKDNS}
-CONFIGURE_SUB= -e '/GPGKEYS_KDNS=/s/".*"/""/'
-.endif
+SCDAEMON_CONFIGURE_ENABLE= scdaemon
-verify: checksum
- gpg2 --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.sig
+STD_SOCKET_CONFIGURE_ENABLE= standard-socket
post-patch:
@${REINPLACE_CMD} -e "/#include <utmp.h>/d" \
${WRKSRC}/tools/symcryptrun.c
+post-install:
+ @${MV} ${STAGEDIR}${DATADIR}/*.txt ${STAGEDIR}${DOCSDIR}
+
.include <bsd.port.mk>
Modified: head/security/gnupg20/files/patch-doc-Makefile.in
==============================================================================
--- head/security/gnupg20/files/patch-doc-Makefile.in Tue Jan 10 02:20:58 2017 (r431050)
+++ head/security/gnupg20/files/patch-doc-Makefile.in Tue Jan 10 02:34:33 2017 (r431051)
@@ -1,6 +1,6 @@
---- doc/Makefile.in 2012-08-05 12:21:36.163578307 +0900
-+++ doc/Makefile.in.orig 2012-08-05 12:21:25.241287984 +0900
-@@ -367,7 +367,7 @@
+--- doc/Makefile.in.orig 2015-09-08 14:12:05 UTC
++++ doc/Makefile.in
+@@ -473,7 +473,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 \
Modified: head/security/gnupg20/pkg-descr
==============================================================================
--- head/security/gnupg20/pkg-descr Tue Jan 10 02:20:58 2017 (r431050)
+++ head/security/gnupg20/pkg-descr Tue Jan 10 02:34:33 2017 (r431051)
@@ -1,7 +1,9 @@
-GnuPG is a complete and free replacement for PGP.
+GnuPG is a complete and free replacement for PGP. This is the "stable"
+version.
-Because it does not use the patented IDEA algorithm, it can be used
-without any restrictions. GnuPG is an RFC2440 (OpenPGP) compliant
-application.
+GnuPG allows encrypting and signing your data and communication, and
+features a versatile key management system as well as access modules
+for many public key directories. GnuPG, also known as GPG, is a command
+line tool with features for easy integration with other applications.
-WWW: http://www.gnupg.org/
+WWW: https://www.gnupg.org/
Modified: head/security/gnupg20/pkg-plist
==============================================================================
--- head/security/gnupg20/pkg-plist Tue Jan 10 02:20:58 2017 (r431050)
+++ head/security/gnupg20/pkg-plist Tue Jan 10 02:34:33 2017 (r431051)
@@ -1,8 +1,7 @@
bin/gpg-agent
bin/gpg-connect-agent
-%%SUID_GPG%%@mode 4555
-bin/gpg2
-%%SUID_GPG%%@mode
+%%SUID_GPG%%@(,,4555) bin/gpg2
+%%NO_SUID_GPG%%bin/gpg2
bin/gpgconf
bin/gpgkey2ssh
bin/gpgparsemail
@@ -13,29 +12,29 @@ bin/gpgv2
bin/symcryptrun
bin/watchgnupg
libexec/gpg-check-pattern
-%%KDNS%%libexec/gpg2keys_kdns
%%SCDAEMON%%libexec/gnupg-pcsc-wrapper
libexec/gpg-preset-passphrase
libexec/gpg-protect-tool
libexec/gpg2keys_curl
libexec/gpg2keys_finger
libexec/gpg2keys_hkp
+%%KDNS%%libexec/gpg2keys_kdns
%%LDAP%%libexec/gpg2keys_ldap
%%SCDAEMON%%libexec/scdaemon
-%%PORTDOCS%%man/man1/gpg-agent.1.gz
-%%PORTDOCS%%man/man1/gpg-connect-agent.1.gz
-%%PORTDOCS%%man/man1/gpg-preset-passphrase.1.gz
-%%PORTDOCS%%man/man1/gpg2.1.gz
-%%PORTDOCS%%man/man1/gpgconf.1.gz
-%%PORTDOCS%%man/man1/gpgparsemail.1.gz
-%%PORTDOCS%%man/man1/gpgsm-gencert.sh.1.gz
-%%PORTDOCS%%man/man1/gpgsm.1.gz
-%%PORTDOCS%%man/man1/gpgv2.1.gz
-%%PORTDOCS%%man/man1/scdaemon.1.gz
-%%PORTDOCS%%man/man1/symcryptrun.1.gz
-%%PORTDOCS%%man/man1/watchgnupg.1.gz
-%%PORTDOCS%%man/man8/addgnupghome.8.gz
-%%PORTDOCS%%man/man8/applygnupgdefaults.8.gz
+man/man1/gpg-agent.1.gz
+man/man1/gpg-connect-agent.1.gz
+man/man1/gpg-preset-passphrase.1.gz
+man/man1/gpg2.1.gz
+man/man1/gpgconf.1.gz
+man/man1/gpgparsemail.1.gz
+man/man1/gpgsm-gencert.sh.1.gz
+man/man1/gpgsm.1.gz
+man/man1/gpgv2.1.gz
+man/man1/scdaemon.1.gz
+man/man1/symcryptrun.1.gz
+man/man1/watchgnupg.1.gz
+man/man8/addgnupghome.8.gz
+man/man8/applygnupgdefaults.8.gz
sbin/addgnupghome
sbin/applygnupgdefaults
%%PORTDOCS%%%%DOCSDIR%%/DETAILS
@@ -43,44 +42,44 @@ sbin/applygnupgdefaults
%%PORTDOCS%%%%DOCSDIR%%/HACKING
%%PORTDOCS%%%%DOCSDIR%%/KEYSERVER
%%PORTDOCS%%%%DOCSDIR%%/OpenPGP
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TRANSLATE
%%PORTDOCS%%%%DOCSDIR%%/examples/README
%%PORTDOCS%%%%DOCSDIR%%/examples/gpgconf.conf
%%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list
%%PORTDOCS%%%%DOCSDIR%%/examples/scd-event
%%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt
-%%PORTDOCS%%%%DATADIR%%/com-certs.pem
+%%PORTDOCS%%%%DOCSDIR%%/help.be.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.ca.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.cs.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.da.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.de.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.el.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.eo.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.es.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.et.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.fi.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.fr.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.gl.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.hu.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.id.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.it.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.nb.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.pl.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.pt.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.pt_BR.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.ro.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.ru.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.sk.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.sv.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.tr.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.zh_CN.txt
+%%PORTDOCS%%%%DOCSDIR%%/help.zh_TW.txt
+%%PORTDOCS%%%%DOCSDIR%%/qualified.txt
+%%DATADIR%%/com-certs.pem
%%DATADIR%%/gpg-conf.skel
-%%PORTDOCS%%%%DATADIR%%/help.be.txt
-%%PORTDOCS%%%%DATADIR%%/help.ca.txt
-%%PORTDOCS%%%%DATADIR%%/help.cs.txt
-%%PORTDOCS%%%%DATADIR%%/help.da.txt
-%%PORTDOCS%%%%DATADIR%%/help.de.txt
-%%PORTDOCS%%%%DATADIR%%/help.el.txt
-%%PORTDOCS%%%%DATADIR%%/help.eo.txt
-%%PORTDOCS%%%%DATADIR%%/help.es.txt
-%%PORTDOCS%%%%DATADIR%%/help.et.txt
-%%PORTDOCS%%%%DATADIR%%/help.fi.txt
-%%PORTDOCS%%%%DATADIR%%/help.fr.txt
-%%PORTDOCS%%%%DATADIR%%/help.gl.txt
-%%PORTDOCS%%%%DATADIR%%/help.hu.txt
-%%PORTDOCS%%%%DATADIR%%/help.id.txt
-%%PORTDOCS%%%%DATADIR%%/help.it.txt
-%%PORTDOCS%%%%DATADIR%%/help.ja.txt
-%%PORTDOCS%%%%DATADIR%%/help.nb.txt
-%%PORTDOCS%%%%DATADIR%%/help.pl.txt
-%%PORTDOCS%%%%DATADIR%%/help.pt.txt
-%%PORTDOCS%%%%DATADIR%%/help.pt_BR.txt
-%%PORTDOCS%%%%DATADIR%%/help.ro.txt
-%%PORTDOCS%%%%DATADIR%%/help.ru.txt
-%%PORTDOCS%%%%DATADIR%%/help.sk.txt
-%%PORTDOCS%%%%DATADIR%%/help.sv.txt
-%%PORTDOCS%%%%DATADIR%%/help.tr.txt
-%%PORTDOCS%%%%DATADIR%%/help.txt
-%%PORTDOCS%%%%DATADIR%%/help.zh_CN.txt
-%%PORTDOCS%%%%DATADIR%%/help.zh_TW.txt
-%%PORTDOCS%%%%DATADIR%%/qualified.txt
%%NLS%%share/locale/be/LC_MESSAGES/gnupg2.mo
%%NLS%%share/locale/ca/LC_MESSAGES/gnupg2.mo
%%NLS%%share/locale/cs/LC_MESSAGES/gnupg2.mo
@@ -112,4 +111,5 @@ sbin/applygnupgdefaults
%%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
- at unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true
+ at postexec [ -e %D/bin/gpg ] || ln -s gpg2 %D/bin/gpg
+ at postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true
More information about the svn-ports-all
mailing list