- Since security/gnupg (2.x) installs symlink $PREFIX/bin/gpg,

  depending on $PREFIX/bin/gpg for security/gnupg1 (1.4.x) is not
  correct.  To work around this, change dependency line from bin/gpg
  to bin/gpgv which exists in security/gnupg1 port only.

Spotted by:	ume

17 files changed, 37 insertions, 37 deletions

diff --git a/security/gnome-gpg/Makefile b/security/gnome-gpg/Makefile
index 94dbe31ef2ca..ab74c93ebfbc 100644
--- a/security/gnome-gpg/Makefile
+++ b/security/gnome-gpg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-gpg
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Simple commandline wrapper around gpg for gnome-keyring
 
-BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 LIB_DEPENDS=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/security/gnupg-idea/Makefile b/security/gnupg-idea/Makefile
index d2223231d446..e6c8211526e5 100644
--- a/security/gnupg-idea/Makefile
+++ b/security/gnupg-idea/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnupg-idea
 PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG} \
 		ftp://ftp.gnupg.org/gcrypt/%SUBDIR%/ \
@@ -22,7 +22,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	IDEA extension module for gnupg (and RSA for demonstration)
 
-RUN_DEPENDS=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	${LOCALBASE}/bin/gpgv:${PORTSDIR}/security/gnupg1
 
 EXTRACT_AFTER_ARGS=	> ${WRKSRC}/idea.c
 RESTRICTED=	IDEA is Patented in the USA and many European countries
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index e5d75c9dd683..f6e3e944403e 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpa
 PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://wald.intevation.org/frs/download.php/241/
 
@@ -15,8 +15,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical frontend for the GNU Privacy Guard
 
 LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme
-BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index f86ec5a1810b..aa378ac5aa2d 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpgme
 PORTVERSION=	1.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	gpgme
 MAINTAINER=	lofi@FreeBSD.org
 COMMENT=	A library to make access to GnuPG easier
 
-BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1 \
+BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1 \
 		gpgsm:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	gpg-error.3:${PORTSDIR}/security/libgpg-error
 
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 646409733869..f1c0e0555854 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gpgme
 PORTVERSION=	0.3.16
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	gpgme
 MAINTAINER=	markun@onohara.to
 COMMENT=	A library to make access to GnuPG easier
 
-BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
 LATEST_LINK=	gpgme03
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index a406bb94cce7..221a4db71d92 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkpasman
 PORTVERSION=	0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	phil@teaser.fr
 COMMENT=	A GTK+ passwords manager for system and network administrators
 
-RUN_DEPENDS+=	gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS+=	gpgv:${PORTSDIR}/security/gnupg1
 BUILD_DEPENDS+=	gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
 
 USE_X_PREFIX=	yes
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 48d491e234e6..f47e139872f7 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -18,7 +18,7 @@ COMMENT=	Utilities for the KDE integrated X11 desktop
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		netsnmp:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 
 CONFLICTS=	kgpg-[0-9]* superkaramba-[0-9]*
 
diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
index 96705226e5f4..fbd978c88521 100644
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=		kgpg
 PORTVERSION=		1.0.0
-PORTREVISION=		5
+PORTREVISION=		6
 CATEGORIES=		security kde
 MASTER_SITES=		http://developer.kde.org/~kgpg/src/
 
 MAINTAINER=		rick@rptn.net
 COMMENT=		A simple KDE frontend for GnuPG
 
-RUN_DEPENDS=		gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=		gpgv:${PORTSDIR}/security/gnupg1
 
 CONFLICTS=		kdeutils-3.[2-4].*
 
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 48d491e234e6..f47e139872f7 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -18,7 +18,7 @@ COMMENT=	Utilities for the KDE integrated X11 desktop
 
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		netsnmp:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 
 CONFLICTS=	kgpg-[0-9]* superkaramba-[0-9]*
 
diff --git a/security/nofgpg/Makefile b/security/nofgpg/Makefile
index cb2eb8f08e06..8df2ec7846a8 100644
--- a/security/nofgpg/Makefile
+++ b/security/nofgpg/Makefile
@@ -8,14 +8,14 @@
 
 PORTNAME=	nofgpg
 PORTVERSION=	0.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security python
 MASTER_SITES=	http://www.cgabriel.org/download/nofgpg/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	No One Fears GPG
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1 \
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1 \
 		${PYTHON_SITELIBDIR}/gtk-1.2/gnome/ui.py:${PORTSDIR}/x11-toolkits/py-gnome
 
 USE_PYTHON=	yes
diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index bf149bf13430..c348afbc7170 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	GnuPG-Interface
 PORTVERSION=	0.34
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnupg-interface
@@ -18,7 +18,7 @@ COMMENT=	Perl module for interfacing with GnuPG
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker \
 		${RUN_DEPENDS}
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 
 PERL_CONFIGURE=	yes
 
diff --git a/security/p5-Module-Signature/Makefile b/security/p5-Module-Signature/Makefile
index 79503c7e536e..140767a17cc7 100644
--- a/security/p5-Module-Signature/Makefile
+++ b/security/p5-Module-Signature/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Module-Signature
 PORTVERSION=	0.55
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Module
@@ -18,7 +18,7 @@ COMMENT=	Module signature file manipulation
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA \
 		${SITE_PERL}/PAR/Dist.pm:${PORTSDIR}/devel/p5-PAR-Dist \
-		${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg1
+		${LOCALBASE}/bin/gpgv:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
diff --git a/security/pgpgpg/Makefile b/security/pgpgpg/Makefile
index 2cd505ee3549..f56d21b16091 100644
--- a/security/pgpgpg/Makefile
+++ b/security/pgpgpg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pgpgpg
 PORTVERSION=	0.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_PACKETSTORM} \
 		ftp://ftp.gnupg.org/gcrypt/historic/ \
@@ -21,8 +21,8 @@ COMMENT=	Wrapper for GnuPG to simulate PGP 2.6.x
 # if it can't find gpg.  RUN_DEPENDS is necessary to make the package
 # dependency register correctly.  Hence the apparent redundancy.
 
-BUILD_DEPENDS=	${PREFIX}/bin/gpg:${PORTSDIR}/security/gnupg1
-RUN_DEPENDS=	${PREFIX}/bin/gpg:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	${PREFIX}/bin/gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	${PREFIX}/bin/gpgv:${PORTSDIR}/security/gnupg1
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gpg-path=${PREFIX}/bin/gpg
diff --git a/security/pwman/Makefile b/security/pwman/Makefile
index 4f041c2f8332..a17a34367dbb 100644
--- a/security/pwman/Makefile
+++ b/security/pwman/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pwman
 PORTVERSION=	0.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	anders@FreeBSD.org
 COMMENT=	Console password management application based on gpg(me)
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index eab0499a2cbf..bf1c9556bb8e 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	seahorse
 PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.8
@@ -17,7 +17,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A front end for GnuPG
 
-BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1
+BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	gpgme.17:${PORTSDIR}/security/gpgme
 
diff --git a/security/sguil-client/Makefile b/security/sguil-client/Makefile
index 57ce339ab830..680685525395 100644
--- a/security/sguil-client/Makefile
+++ b/security/sguil-client/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sguil-client
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sguil
@@ -16,7 +16,7 @@ MAINTAINER=	pauls@utdallas.edu
 COMMENT=	Sguil is a network security monitoring program
 
 RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib \
-		gpg:${PORTSDIR}/security/gnupg1 \
+		gpgv:${PORTSDIR}/security/gnupg1 \
 		${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX \
 		${LOCALBASE}/lib/iwidgets/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwidgets
 
diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile
index 02e29dd4259c..403101f1d6c1 100644
--- a/security/signing-party/Makefile
+++ b/security/signing-party/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	signing-party
 PORTVERSION=	0.4.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/s/signing-party
@@ -21,7 +21,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	johans@stack.nl
 COMMENT=	Various OpenPGP related tools
 
-RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1 \
+RUN_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1 \
 		${SITE_PERL}/GnuPG/Interface.pm:${PORTSDIR}/security/p5-GnuPG-Interface \
 		${SITE_PERL}/Mail/Util.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${SITE_PERL}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \