Index: head/security/gnupg1/Makefile
===================================================================
--- head/security/gnupg1/Makefile	(revision 424963)
+++ head/security/gnupg1/Makefile	(revision 424964)
@@ -1,76 +1,70 @@
 # $FreeBSD$
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.21
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	1
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	The GNU Privacy Guard
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CPE_VENDOR=	gnupg
 
 USES=		charsetfix cpe gmake tar:bzip2
 GNU_CONFIGURE=	YES
 
 INFO=		gnupg1
 DOCSDIR=	${PREFIX}/share/doc/gnupg1
 PORTDOCS=	*
 
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=	CURL DOCS LDAP LIBICONV LIBUSB NLS SUID_GPG
+OPTIONS_DEFINE=	CURL DOCS LDAP ICONV LIBUSB NLS SUID_GPG
 OPTIONS_DEFAULT=CURL
 OPTIONS_SUB=	yes
 
-CURL_DESC=	use libcurl for the keyserver interface
+CURL_DESC=	Use libcurl for the keyserver interface
 LDAP_DESC=	LDAP keyserver interface
-LIBICONV_DESC=	use libiconv
-LIBUSB_DESC=	use libusb
-SUID_GPG_DESC=	install GPG with suid
+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
 
-LIBICONV_USES=		iconv
-LIBICONV_CONFIGURE_ENABLE=	gnupg-iconv
+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
 
+SUID_GPG_PLIST_SUB=	GPGMODE=4555
+SUID_GPG_PLIST_SUB_OFF=	GPGMODE=
+
 .include <bsd.port.options.mk>
 
-.if ${CC} == "clang" || ${OSVERSION} >= 1000024
-CFLAGS:=	${CFLAGS:S/$/ -std=c89/}
-.if (${ARCH} == "i386")
-CFLAGS:=	${CFLAGS:S/$/ -fheinous-gnu-extensions/}
+.if ${ARCH} == "i386" && (${CC} == "clang" || ${OSVERSION} >= 1000024)
+CFLAGS+=	-fheinous-gnu-extensions
 .endif
-.endif
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in DETAILS FAQ HACKING OpenPGP
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for i in ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
 	README THANKS TODO VERSION
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-
-post-install-SUID_GPG-on:
-	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/gpg
 
 .include <bsd.port.mk>
Index: head/security/gnupg1/files/patch-doc_Makefile.in
===================================================================
--- head/security/gnupg1/files/patch-doc_Makefile.in	(revision 424963)
+++ head/security/gnupg1/files/patch-doc_Makefile.in	(revision 424964)
@@ -1,40 +1,11 @@
 --- doc/Makefile.in.orig	2015-12-20 07:53:15 UTC
 +++ doc/Makefile.in
 @@ -77,7 +77,7 @@ am__make_running_with_option = \
    test $$has_opt = yes
  am__make_dryrun = (target_option=n; $(am__make_running_with_option))
  am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/doc/gnupg1
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -422,7 +422,11 @@ gnupg1_TEXINFOS = gnupg1.texi
- 
- # Need this to avoid building of dvis with automake 1.4
- DVIS = 
-+ifdef NOPORTDOCS 
-+pkgdata_DATA =
-+else
- pkgdata_DATA = FAQ
-+endif
- 
- # we can't add gpg.texi gpgv.texi here because automake does not like them to
- # be built files.
-@@ -670,6 +674,8 @@ uninstall-man1:
- 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
- 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
- install-pkgdataDATA: $(pkgdata_DATA)
-+ifdef NOPORTDOCS
-+else
- 	@$(NORMAL_INSTALL)
- 	@list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
- 	if test -n "$$list"; then \
-@@ -684,6 +690,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
- 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
- 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
- 	done
-+endif
- 
- uninstall-pkgdataDATA:
- 	@$(NORMAL_UNINSTALL)
Index: head/security/gnupg1/files/patch-g10_Makefile.in
===================================================================
--- head/security/gnupg1/files/patch-g10_Makefile.in	(revision 424963)
+++ head/security/gnupg1/files/patch-g10_Makefile.in	(revision 424964)
@@ -1,40 +1,11 @@
 --- g10/Makefile.in.orig	2015-12-20 07:53:15 UTC
 +++ g10/Makefile.in
 @@ -79,7 +79,7 @@ am__make_running_with_option = \
    test $$has_opt = yes
  am__make_dryrun = (target_option=n; $(am__make_running_with_option))
  am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/gnupg1
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
  pkglibexecdir = $(libexecdir)/@PACKAGE@
-@@ -465,7 +465,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I
- 	@LIBUSB_CPPFLAGS@ $(am__append_1)
- needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
- other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
-+ifdef NOPORTDOCS
-+dist_pkgdata_DATA = 
-+else
- dist_pkgdata_DATA = options.skel
-+endif
- @ENABLE_BZIP2_SUPPORT_FALSE@bzip2_source = 
- @ENABLE_BZIP2_SUPPORT_TRUE@bzip2_source = compress-bz2.c
- common_source = \
-@@ -731,6 +735,8 @@ distclean-compile:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
- install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
-+ifdef NOPORTDOCS
-+else
- 	@$(NORMAL_INSTALL)
- 	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
- 	if test -n "$$list"; then \
-@@ -745,6 +751,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata
- 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
- 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
- 	done
-+endif
- 
- uninstall-dist_pkgdataDATA:
- 	@$(NORMAL_UNINSTALL)
Index: head/security/gnupg1/pkg-descr
===================================================================
--- head/security/gnupg1/pkg-descr	(revision 424963)
+++ head/security/gnupg1/pkg-descr	(revision 424964)
@@ -1,9 +1,6 @@
-GnuPG is a complete and free replacement for PGP.
+GnuPG is a complete and free replacement for PGP. The security/gnupg
+port is the modern 2.x branch with support for newer algorithms, but
+the 1.x branch has few dependencies and is sufficient for most PGP
+operations using common algorithms.
 
-Because it does not use the patented IDEA algorithm, it can be used
-without any restrictions.  GnuPG is an RFC2440 (OpenPGP) compliant
-application.
-
-WWW: http://www.gnupg.org/
-
-kuriyama@FreeBSD.org
+WWW: https://www.gnupg.org/
Index: head/security/gnupg1/pkg-plist
===================================================================
--- head/security/gnupg1/pkg-plist	(revision 424963)
+++ head/security/gnupg1/pkg-plist	(revision 424964)
@@ -1,44 +1,44 @@
-bin/gpg
+@(,,%%GPGMODE%%) 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 [ -r %D/bin/gpg2 ] && ln -s gpg2 %D/bin/gpg || true