From owner-svn-ports-head@FreeBSD.ORG Sat Nov 22 09:55:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8047134F; Sat, 22 Nov 2014 09:55:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6CBC8BF2; Sat, 22 Nov 2014 09:55:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAM9tE2A064856; Sat, 22 Nov 2014 09:55:14 GMT (envelope-from kuriyama@FreeBSD.org) Received: (from kuriyama@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAM9tDfG064853; Sat, 22 Nov 2014 09:55:13 GMT (envelope-from kuriyama@FreeBSD.org) Message-Id: <201411220955.sAM9tDfG064853@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kuriyama set sender to kuriyama@FreeBSD.org using -f From: Jun Kuriyama Date: Sat, 22 Nov 2014 09:55:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373043 - in head/security/gnupg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Nov 2014 09:55:14 -0000 Author: kuriyama Date: Sat Nov 22 09:55:13 2014 New Revision: 373043 URL: https://svnweb.freebsd.org/changeset/ports/373043 QAT: https://qat.redports.org/buildarchive/r373043/ Log: - 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] Added: head/security/gnupg/files/ head/security/gnupg/files/patch-doc-Makefile.in (contents, props changed) Modified: head/security/gnupg/Makefile head/security/gnupg/pkg-plist Modified: head/security/gnupg/Makefile ============================================================================== --- head/security/gnupg/Makefile Sat Nov 22 09:53:16 2014 (r373042) +++ head/security/gnupg/Makefile Sat Nov 22 09:55:13 2014 (r373043) @@ -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}/se 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 Added: head/security/gnupg/files/patch-doc-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/gnupg/files/patch-doc-Makefile.in Sat Nov 22 09:55:13 2014 (r373043) @@ -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 Modified: head/security/gnupg/pkg-plist ============================================================================== --- head/security/gnupg/pkg-plist Sat Nov 22 09:53:16 2014 (r373042) +++ head/security/gnupg/pkg-plist Sat Nov 22 09:55:13 2014 (r373043) @@ -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