diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2014-03-25 07:24:41 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2014-03-25 07:24:41 +0000 |
| commit | f11cff3167eee3aacbceb5a607640d87b7136b49 (patch) | |
| tree | fbb0b688ad392d507bc0736b15927bbf7a642631 /security/gnupg1 | |
| parent | cb3a8e9513ed0b49b44e5e85169b3305c71fcc47 (diff) | |
| download | ports-f11cff3167eee3aacbceb5a607640d87b7136b49.tar.gz ports-f11cff3167eee3aacbceb5a607640d87b7136b49.zip | |
- 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]
Notes
Notes:
svn path=/head/; revision=349108
Diffstat (limited to 'security/gnupg1')
| -rw-r--r-- | security/gnupg1/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index 7ed28dff8785..d9de650dc058 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -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-extensions/} .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 |