From owner-svn-ports-all@FreeBSD.ORG Thu Dec 27 14:04:18 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B1A8BCC0; Thu, 27 Dec 2012 14:04:18 +0000 (UTC) (envelope-from kuriyama@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 940218FC0A; Thu, 27 Dec 2012 14:04:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBRE4Is5091339; Thu, 27 Dec 2012 14:04:18 GMT (envelope-from kuriyama@svn.freebsd.org) Received: (from kuriyama@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBRE4Imm091337; Thu, 27 Dec 2012 14:04:18 GMT (envelope-from kuriyama@svn.freebsd.org) Message-Id: <201212271404.qBRE4Imm091337@svn.freebsd.org> From: Jun Kuriyama Date: Thu, 27 Dec 2012 14:04:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309542 - head/security/gnupg X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Dec 2012 14:04:18 -0000 Author: kuriyama Date: Thu Dec 27 14:04:17 2012 New Revision: 309542 URL: http://svnweb.freebsd.org/changeset/ports/309542 Log: - Fix with NOPORTDOCS=yes [1,2] - Fix CURL option handled incorrectly [3,4] PR: ports/170543 [1], ports/171848 [2], ports/171370 [3], ports/174075 [4] Submitted by: Rainer Duffner [1], Konstantinos Koukopoulos [2], John Marshall [3], Phil Pennock [4] Modified: head/security/gnupg/Makefile head/security/gnupg/pkg-plist Modified: head/security/gnupg/Makefile ============================================================================== --- head/security/gnupg/Makefile Thu Dec 27 13:57:57 2012 (r309541) +++ head/security/gnupg/Makefile Thu Dec 27 14:04:17 2012 (r309542) @@ -1,13 +1,8 @@ -# New ports collection makefile for: gnupg -# Date created: Sep 30, 1998 -# Whom: kuriyama@FreeBSD.org -# # $FreeBSD$ -# PORTNAME= gnupg PORTVERSION= 2.0.19 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg @@ -112,10 +107,10 @@ PLIST_SUB+= SCDAEMON="@comment " .endif .if ${PORT_OPTIONS:MCURL} -CONFIGURE_ARGS+=--without-libcurl -.else LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} +.else +CONFIGURE_ARGS+=--without-libcurl .endif verify: checksum Modified: head/security/gnupg/pkg-plist ============================================================================== --- head/security/gnupg/pkg-plist Thu Dec 27 13:57:57 2012 (r309541) +++ head/security/gnupg/pkg-plist Thu Dec 27 14:04:17 2012 (r309542) @@ -34,37 +34,37 @@ sbin/applygnupgdefaults %%PORTDOCS%%%%DOCSDIR%%/examples/pwpattern.list %%PORTDOCS%%%%DOCSDIR%%/examples/scd-event %%PORTDOCS%%%%DOCSDIR%%/examples/trustlist.txt -%%PORTDATA%%%%DATADIR%%/com-certs.pem +%%PORTDOCS%%%%DATADIR%%/com-certs.pem %%DATADIR%%/gpg-conf.skel -%%PORTDATA%%%%DATADIR%%/help.be.txt -%%PORTDATA%%%%DATADIR%%/help.ca.txt -%%PORTDATA%%%%DATADIR%%/help.cs.txt -%%PORTDATA%%%%DATADIR%%/help.da.txt -%%PORTDATA%%%%DATADIR%%/help.de.txt -%%PORTDATA%%%%DATADIR%%/help.el.txt -%%PORTDATA%%%%DATADIR%%/help.eo.txt -%%PORTDATA%%%%DATADIR%%/help.es.txt -%%PORTDATA%%%%DATADIR%%/help.et.txt -%%PORTDATA%%%%DATADIR%%/help.fi.txt -%%PORTDATA%%%%DATADIR%%/help.fr.txt -%%PORTDATA%%%%DATADIR%%/help.gl.txt -%%PORTDATA%%%%DATADIR%%/help.hu.txt -%%PORTDATA%%%%DATADIR%%/help.id.txt -%%PORTDATA%%%%DATADIR%%/help.it.txt -%%PORTDATA%%%%DATADIR%%/help.ja.txt -%%PORTDATA%%%%DATADIR%%/help.nb.txt -%%PORTDATA%%%%DATADIR%%/help.pl.txt -%%PORTDATA%%%%DATADIR%%/help.pt.txt -%%PORTDATA%%%%DATADIR%%/help.pt_BR.txt -%%PORTDATA%%%%DATADIR%%/help.ro.txt -%%PORTDATA%%%%DATADIR%%/help.ru.txt -%%PORTDATA%%%%DATADIR%%/help.sk.txt -%%PORTDATA%%%%DATADIR%%/help.sv.txt -%%PORTDATA%%%%DATADIR%%/help.tr.txt -%%PORTDATA%%%%DATADIR%%/help.txt -%%PORTDATA%%%%DATADIR%%/help.zh_CN.txt -%%PORTDATA%%%%DATADIR%%/help.zh_TW.txt -%%PORTDATA%%%%DATADIR%%/qualified.txt +%%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