diff options
| author | kuriyama <kuriyama@FreeBSD.org> | 2014-11-22 17:55:13 +0800 |
|---|---|---|
| committer | kuriyama <kuriyama@FreeBSD.org> | 2014-11-22 17:55:13 +0800 |
| commit | 6c3914c6ac1f602a7d36f176cfec951fca4d5aa4 (patch) | |
| tree | bcfbc072e560927f25934d03a5fa00ee9af020ca | |
| parent | 4ace9084669c19c941b281027b496498a4a2c4d9 (diff) | |
| download | freebsd-ports-gnome-6c3914c6ac1f602a7d36f176cfec951fca4d5aa4.tar.gz freebsd-ports-gnome-6c3914c6ac1f602a7d36f176cfec951fca4d5aa4.tar.zst freebsd-ports-gnome-6c3914c6ac1f602a7d36f176cfec951fca4d5aa4.zip | |
- Turn pinentry dependency mandatory, not option. [1]
- Remove gpg-zip.1.gz manpage which command is not installed. [2]
PR: ports/194788 [1], ports/195229 [2]
Submitted by: donaldcallen@gmail.com [1], crest@sahiro.org [2]
| -rw-r--r-- | security/gnupg/Makefile | 10 | ||||
| -rw-r--r-- | security/gnupg/files/patch-doc-Makefile.in | 11 | ||||
| -rw-r--r-- | security/gnupg/pkg-plist | 1 |
3 files changed, 16 insertions, 6 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index c59581e1862c..02910317f0b4 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -2,7 +2,7 @@ PORTNAME= gnupg PORTVERSION= 2.1.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg @@ -22,25 +22,25 @@ LIB_DEPENDS= libassuan.so:${PORTSDIR}/security/libassuan \ libksba.so:${PORTSDIR}/security/libksba \ libnpth.so:${PORTSDIR}/devel/npth BUILD_DEPENDS= libgpg-error>=1.11:${PORTSDIR}/security/libgpg-error +RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry GNU_CONFIGURE= YES USES= gmake iconv tar:bzip2 USE_LDCONFIG= YES CONFIGURE_ARGS+= --enable-symcryptrun --enable-gpgsm +CONFLICTS= gnupg-2.0.* -OPTIONS_DEFINE= PINENTRY LDAP SCDAEMON KDNS NLS DOCS SUID_GPG -PINENTRY_DESC= Use pinentry +OPTIONS_DEFINE= LDAP SCDAEMON KDNS NLS DOCS SUID_GPG LDAP_DESC= LDAP keyserver interface SCDAEMON_DESC= Enable Smartcard daemon (with libusb) KDNS_DESC= Use DNS CERT helper SUID_GPG_DESC= Install GPG with suid -OPTIONS_DEFAULT= PINENTRY +OPTIONS_DEFAULT= # NO_OPTIONS_SORT= YES OPTIONS_SUB= YES # In jail, SUID is required to avoid warning (security.bsd.unprivileged_mlock sysctl is not used in jail). DOCS_CONFIGURE_ENABLE= doc -PINENTRY_RUN_DEPENDS= pinentry>0:${PORTSDIR}/security/pinentry KDNS_LIB_DEPENDS= libadns.so:${PORTSDIR}/dns/adns KDNS_CONFIGURE_ON= --with-adns=${LOCALBASE} NLS_USES= gettext diff --git a/security/gnupg/files/patch-doc-Makefile.in b/security/gnupg/files/patch-doc-Makefile.in new file mode 100644 index 000000000000..b025b0690786 --- /dev/null +++ b/security/gnupg/files/patch-doc-Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig 2014-11-22 17:40:32.499461775 +0900 ++++ doc/Makefile.in 2014-11-22 17:41:10.997462066 +0900 +@@ -415,7 +415,7 @@ + myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \ + watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ + gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \ +- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 \ ++ gpgsm-gencert.sh.1 applygnupgdefaults.8 \ + dirmngr-client.1 + + man_MANS = $(myman_pages) gnupg.7 diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index c5da75490c85..93a3ab278e98 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -25,7 +25,6 @@ libexec/gpg-protect-tool %%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/gpg-zip.1.gz %%PORTDOCS%%man/man1/gpg2.1.gz %%PORTDOCS%%man/man1/gpgconf.1.gz %%PORTDOCS%%man/man1/gpgparsemail.1.gz |