- Upgrade gnupg to 2.0.1. Old stable version (1.4.6) was repocopied

  to security/gnupg1.

Thanks to:	dougb, lofi

8 files changed, 16 insertions, 12 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 4a2380992f86..88a6407dd306 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cone
 PORTVERSION=	0.69
+PORTREVISION=	1
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
@@ -19,7 +20,7 @@ MAINTAINER=	ler@lerctr.org
 COMMENT=	Console based mail client with POP3/IMAP/SMAP support
 
 LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell
-BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_FAM=	yes
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index aed7a9ef1a3b..feb18ea8fcf3 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enigmail
 PORTVERSION=	0.94.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.mozilla-enigmail.org/downloads/src/
 PKGNAMEPREFIX?=	thunderbird-
@@ -23,7 +23,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		nss3:${PORTSDIR}/security/nss \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \
-		gpg:${PORTSDIR}/security/gnupg
+		gpg:${PORTSDIR}/security/gnupg1
 
 GECKO=		${PKGNAMEPREFIX:S/-//}
 .if ${GECKO} == "thunderbird"
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index ecd5167654e8..57b0cfb417d6 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	enigmail
 PORTVERSION?=	0.93.0
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	mail security
 MASTER_SITES=	\
 		http://mozdev.secsup.org/enigmail/src/ \
@@ -30,7 +30,7 @@ BUILD_DEPENDS?=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS?=	nspr4:${PORTSDIR}/devel/nspr
 RUN_DEPENDS?=	mozilla:${PORTSDIR}/${LOCAL_SRCDIR}
 
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg1
 
 IPCVERSION?=	1.1.3
 
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 57b34274208b..acd00bbdfc18 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.1.3
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
@@ -89,7 +90,7 @@ USE_PHP+=	openssl
 .endif
 
 .if !defined(NOCRYPT)
-RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
 .endif
 
 .if !defined(WITHOUT_ASPELL)
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 57b34274208b..acd00bbdfc18 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.1.3
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
@@ -89,7 +90,7 @@ USE_PHP+=	openssl
 .endif
 
 .if !defined(NOCRYPT)
-RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
 .endif
 
 .if !defined(WITHOUT_ASPELL)
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 57b34274208b..acd00bbdfc18 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imp
 PORTVERSION=	4.1.3
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
 		ftp://ftp.planetmirror.com/pub/horde/imp/		\
@@ -89,7 +90,7 @@ USE_PHP+=	openssl
 .endif
 
 .if !defined(NOCRYPT)
-RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
 .endif
 
 .if !defined(WITHOUT_ASPELL)
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index d15c2a451862..4eaa5513fb83 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	3.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	p5-Net-DNS>=0.53:${PORTSDIR}/dns/p5-Net-DNS \
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
-		gpg:${PORTSDIR}/security/gnupg
+		gpg:${PORTSDIR}/security/gnupg1
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
diff --git a/mail/pygmy/Makefile b/mail/pygmy/Makefile
index b8466646db74..50c3b8d5069b 100644
--- a/mail/pygmy/Makefile
+++ b/mail/pygmy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pygmy
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail python gnome
 MASTER_SITES=	http://pygmy.sourceforge.net/
 
@@ -16,7 +16,7 @@ COMMENT=	A tiny GNOME mail client written in the Python programming language
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
-		gpg:${PORTSDIR}/security/gnupg
+		gpg:${PORTSDIR}/security/gnupg1
 
 USE_PYTHON=	yes