[Midnightbsd-cvs] mports [17354] trunk/security/gnupg1/Makefile: fix fake problem and duplicate index issue

[laffer1 at midnightbsd.org]

Revision: 17354
          http://svnweb.midnightbsd.org/mports/?rev=17354
Author:   laffer1
Date:     2014-09-16 18:44:26 -0400 (Tue, 16 Sep 2014)
Log Message:
-----------
fix fake problem and duplicate index issue

Modified Paths:
--------------
    trunk/security/gnupg1/Makefile

Modified: trunk/security/gnupg1/Makefile
===================================================================
--- trunk/security/gnupg1/Makefile	2014-09-16 22:44:12 UTC (rev 17353)
+++ trunk/security/gnupg1/Makefile	2014-09-16 22:44:26 UTC (rev 17354)
@@ -2,9 +2,11 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.18
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
+PKGNAMESUFFIX=	1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -22,12 +24,8 @@
 MACHINE_ARCH=	i586
 .endif
 CFLAGS:=	${CFLAGS:S/-pipe//g}
-MAN1=		gpg.1 gpgv.1 gpg.ru.1 gpg-zip.1
-MAN7=		gnupg.7
 INFO=		gnupg1
 DOCSDIR=	${PREFIX}/share/doc/gnupg1
-LATEST_LINK=	gnupg1
-
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	LDAP LIBICONV LIBUSB SUID_GPG NLS CURL DOCS
@@ -50,7 +48,7 @@
 .if ${PORT_OPTIONS:MLIBICONV}
 USES+=		iconv
 .else
-CONFIGURE_ARGS+=	--without-libiconv-prefix
+CONFIGURE_ARGS+=	--disable-gnupg-iconv
 .endif
 
 .if ${PORT_OPTIONS:MLIBUSB}
@@ -78,7 +76,7 @@
 .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
@@ -87,7 +85,7 @@
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
+
 	${MKDIR} ${DOCSDIR}
 .for i in DETAILS FAQ HACKING OpenPGP
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
@@ -96,7 +94,6 @@
 	README THANKS TODO VERSION
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.endif
 .if ${PORT_OPTIONS:MSUID_GPG}
 	${CHMOD} u+s ${PREFIX}/bin/gpg
 .endif