Index: head/security/gnupg1/Makefile
===================================================================
--- head/security/gnupg1/Makefile	(revision 431095)
+++ head/security/gnupg1/Makefile	(revision 431096)
@@ -1,68 +1,68 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	1
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	The GNU Privacy Guard (minimalist "classic" version)
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CPE_VENDOR=	gnupg
 
 USES=		charsetfix compiler cpe gmake readline tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-camellia \
 		--enable-noexecstack
 
 INFO=		gnupg1
 DOCSDIR=	${PREFIX}/share/doc/gnupg1
 PORTDOCS=	*
 
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=	CURL DOCS LDAP ICONV LIBUSB NLS SUID_GPG
 OPTIONS_DEFAULT=CURL
 OPTIONS_SUB=	yes
 
 CURL_DESC=	Use libcurl for the keyserver interface
 LDAP_DESC=	LDAP keyserver interface
 LIBUSB_DESC=	Support for USB smart cards
 SUID_GPG_DESC=	Install GPG setuid
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl=${LOCALBASE}
 # Work around a GnuPG configure buglet
 CURL_CONFIGURE_ENV=	_libcurl_config=${LOCALBASE}/bin/curl-config
 
 ICONV_USES=		iconv
 ICONV_CONFIGURE_ENABLE=	gnupg-iconv
 
 LIBUSB_CONFIGURE_WITH=	libusb=${LOCALBASE}
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang"
 CFLAGS+=	-fheinous-gnu-extensions
 .endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in doc/DETAILS doc/FAQ doc/HACKING doc/OpenPGP \
 	ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
 	README THANKS TODO VERSION
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/security/gnupg1/pkg-plist
===================================================================
--- head/security/gnupg1/pkg-plist	(revision 431095)
+++ head/security/gnupg1/pkg-plist	(revision 431096)
@@ -1,44 +1,45 @@
 %%SUID_GPG%%@(,,4555) bin/gpg
 %%NO_SUID_GPG%%bin/gpg
 bin/gpg-zip
 bin/gpgsplit
 bin/gpgv
 %%LDAP%%libexec/gnupg/gpgkeys_ldap
 libexec/gnupg/gpgkeys_curl
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
 man/man1/gpg-zip.1.gz
 man/man1/gpg.1.gz
 man/man1/gpgv.1.gz
 %%DATADIR%%1/options.skel
 %%NLS%%share/locale/be/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/da/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/el/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/es/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/et/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/id/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
+@postunexec [ ! -e %D/bin/gpg2 ] || ln -sf gpg2 %D/bin/gpg