svn commit: r349108 - head/security/gnupg1

[Guido Falsi]

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 at 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 at 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