Upgrade to 1.2.0.

PR:		ports/43211
Submitted by:	Jason Harris <jharris@widomaker.com>
Modified by:	kuriyama (for WITH_LDAP)

5 files changed, 38 insertions, 46 deletions

diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 47a8919c660c..94f9bde34d9e 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -6,31 +6,45 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.0.7
+PORTVERSION=	1.2.0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/%SUBDIR%/ \
+		http://ftp.planetmirror.com/pub/gnupg/%SUBDIR%/ \
+		http://sunsite.dk/pub/security/gcrypt/%SUBDIR%/ \
 		ftp://pgp.iijlab.net/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/gnupg/&,}
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/gnupg/&,} \
+		ftp://ftp.demon.nl/pub/mirrors/gnupg/%SUBDIR%/
 MASTER_SITE_SUBDIR=	gnupg
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
+USE_BZIP2=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
+CONFIGURE_ARGS=	--enable-tiger
 CONFIGURE_TARGET=	--build ${MACHINE_ARCH}-portbld-freebsd${OSREL}
 .if ${MACHINE_CPU:Mi586}
 MACHINE_ARCH=	i586
 .endif
 CFLAGS:=	${CFLAGS:S/-pipe//g}
 MAN1=		gpg.1 gpgv.1
+MAN7=		gnupg.7
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_LIBICONV) || exists(${PREFIX}/lib/libiconv.so)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 .endif
+.if defined(WITH_LDAP) || exists(${PREFIX}/lib/libldap.so)
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+PLIST_SUB+=	WITH_LDAP=""
+.else
+PLIST_SUB+=	WITH_LDAP="@comment "
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index edb76b57b1a5..eabbd5a0a8d3 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1 +1,2 @@
-MD5 (gnupg-1.0.7.tar.gz) = d8b36d4dfd213a1a1027b1877acbc897
+MD5 (gnupg-1.2.0.tar.bz2) = b22b10dacfeb5c2b0bc4ce9def2d1120
+MD5 (gnupg-1.2.0.tar.bz2.sig) = cf7eaa4a77940a0436073473618d8f16
diff --git a/security/gnupg1/files/patch-configure b/security/gnupg1/files/patch-configure
deleted file mode 100644
index eb07a457fb76..000000000000
--- a/security/gnupg1/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Apr 29 23:59:16 2002
-+++ configure	Thu Aug 29 10:23:41 2002
-@@ -3799,7 +3799,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lldap -llber -lresolv $LIBS"
-+LIBS="-lldap -llber $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line 3804 "configure"
- #include "confdefs.h"
diff --git a/security/gnupg1/files/patch-keyserver:Makefile.in b/security/gnupg1/files/patch-keyserver:Makefile.in
deleted file mode 100644
index bbb5a48850f7..000000000000
--- a/security/gnupg1/files/patch-keyserver:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- keyserver/Makefile.in.orig	Tue Apr 30 00:06:11 2002
-+++ keyserver/Makefile.in	Tue Sep 10 16:47:18 2002
-@@ -141,7 +141,7 @@
- bin_SCRIPTS = @GPGKEYS_MAILTO@
- noinst_SCRIPTS = gpgkeys_test
- 
--gpgkeys_ldap_LDADD = -lldap -llber -lresolv
-+gpgkeys_ldap_LDADD = -lldap -llber
- subdir = keyserver
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index 6ba6dffbf3c1..487c778535e7 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -1,14 +1,29 @@
 bin/gpg
-bin/gpgkeys_mailto
 bin/gpgsplit
 bin/gpgv
+%%WITH_LDAP%%libexec/gnupg/gpgkeys_ldap
+libexec/gnupg/gpgkeys_mailto
+info/gpg.info
 info/gpgv.info
-lib/gnupg/rndegd
-lib/gnupg/rndunix
-lib/gnupg/tiger
 share/gnupg/FAQ
 share/gnupg/faq.html
 share/gnupg/options.skel
+%%PORTDOCS%%share/doc/gnupg/README
+%%PORTDOCS%%share/doc/gnupg/DETAILS
+%%PORTDOCS%%share/doc/gnupg/FAQ
+%%PORTDOCS%%share/doc/gnupg/HACKING
+%%PORTDOCS%%share/doc/gnupg/OpenPGP
+%%PORTDOCS%%share/doc/gnupg/ABOUT-NLS
+%%PORTDOCS%%share/doc/gnupg/AUTHORS
+%%PORTDOCS%%share/doc/gnupg/BUGS
+%%PORTDOCS%%share/doc/gnupg/COPYING
+%%PORTDOCS%%share/doc/gnupg/INSTALL
+%%PORTDOCS%%share/doc/gnupg/NEWS
+%%PORTDOCS%%share/doc/gnupg/PROJECTS
+%%PORTDOCS%%share/doc/gnupg/THANKS
+%%PORTDOCS%%share/doc/gnupg/TODO
+%%PORTDOCS%%share/doc/gnupg/VERSION
+share/locale/ca/LC_MESSAGES/gnupg.mo
 share/locale/cs/LC_MESSAGES/gnupg.mo
 share/locale/da/LC_MESSAGES/gnupg.mo
 share/locale/de/LC_MESSAGES/gnupg.mo
@@ -16,8 +31,8 @@ share/locale/el/LC_MESSAGES/gnupg.mo
 share/locale/eo/LC_MESSAGES/gnupg.mo
 share/locale/es/LC_MESSAGES/gnupg.mo
 share/locale/et/LC_MESSAGES/gnupg.mo
-share/locale/gl/LC_MESSAGES/gnupg.mo
 share/locale/fr/LC_MESSAGES/gnupg.mo
+share/locale/gl/LC_MESSAGES/gnupg.mo
 share/locale/id/LC_MESSAGES/gnupg.mo
 share/locale/it/LC_MESSAGES/gnupg.mo
 share/locale/ja/LC_MESSAGES/gnupg.mo
@@ -27,22 +42,6 @@ share/locale/pt/LC_MESSAGES/gnupg.mo
 share/locale/pt_BR/LC_MESSAGES/gnupg.mo
 share/locale/sv/LC_MESSAGES/gnupg.mo
 share/locale/tr/LC_MESSAGES/gnupg.mo
-%%PORTDOCS%%share/doc/gnupg/README
-%%PORTDOCS%%share/doc/gnupg/DETAILS
-%%PORTDOCS%%share/doc/gnupg/FAQ
-%%PORTDOCS%%share/doc/gnupg/HACKING
-%%PORTDOCS%%share/doc/gnupg/OpenPGP
-%%PORTDOCS%%share/doc/gnupg/ABOUT-NLS
-%%PORTDOCS%%share/doc/gnupg/AUTHORS
-%%PORTDOCS%%share/doc/gnupg/BUGS
-%%PORTDOCS%%share/doc/gnupg/COPYING
-%%PORTDOCS%%share/doc/gnupg/INSTALL
-%%PORTDOCS%%share/doc/gnupg/NEWS
-%%PORTDOCS%%share/doc/gnupg/PROJECTS
-%%PORTDOCS%%share/doc/gnupg/THANKS
-%%PORTDOCS%%share/doc/gnupg/TODO
-%%PORTDOCS%%share/doc/gnupg/VERSION
-@dirrm lib/gnupg
 @dirrm share/gnupg
 @unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/da 2>/dev/null || true