From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 25 07:24:42 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 77773B6F;
 Tue, 25 Mar 2014 07:24:42 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 64CEE304;
 Tue, 25 Mar 2014 07:24:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2P7Ogd0052656;
 Tue, 25 Mar 2014 07:24:42 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2P7OggQ052655;
 Tue, 25 Mar 2014 07:24:42 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201403250724.s2P7OggQ052655@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Tue, 25 Mar 2014 07:24:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349108 - head/security/gnupg1
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Mar 2014 07:24:42 -0000

Author: madpilot
Date: Tue Mar 25 07:24:41 2014
New Revision: 349108
URL: http://svnweb.freebsd.org/changeset/ports/349108
QAT: https://qat.redports.org/buildarchive/r349108/

Log:
  - Really disable iconv support when LIBICONV option is not selected [1]
    This fixes build on 10 and head when libiconv is installed and
    LIBICONV option is disabled
  
  While here:
  
  - Convert to USES gmake and USES tar [2]
  - Convert to new LIB_DEPENDS format [2]
  
  Reported by:	Mike Harding <mvharding@gmail.com> (via email)
  Approved by:	portmgr (bapt, implicit) [1]
  Approved by:	implicit portmgr@ blanket approval [2]

Modified:
  head/security/gnupg1/Makefile

Modified: head/security/gnupg1/Makefile
==============================================================================
--- head/security/gnupg1/Makefile	Tue Mar 25 07:23:06 2014	(r349107)
+++ head/security/gnupg1/Makefile	Tue Mar 25 07:24:41 2014	(r349108)
@@ -2,7 +2,6 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.16
-#PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -13,9 +12,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	The GNU Privacy Guard
 
-USES=		charsetfix
-USE_BZIP2=	YES
-USE_GMAKE=	YES
+USES=		charsetfix gmake tar:bzip2
 GNU_CONFIGURE=	YES
 .if ${MACHINE_CPU:Mi586}
 MACHINE_ARCH=	i586
@@ -45,7 +42,7 @@ CFLAGS:=	${CFLAGS:S/$/ -fheinous-gnu-ext
 .if ${PORT_OPTIONS:MLIBICONV}
 USES+=		iconv
 .else
-CONFIGURE_ARGS+=	--without-libiconv-prefix
+CONFIGURE_ARGS+=	--disable-gnupg-iconv
 .endif
 
 .if ${PORT_OPTIONS:MLIBUSB}
@@ -73,7 +70,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
 # Work around a GnuPG configure buglet
 CONFIGURE_ENV+=	_libcurl_config=${LOCALBASE}/bin/curl-config