Index: Makefile
===================================================================
--- Makefile	(revision 329485)
+++ Makefile	(working copy)
@@ -8,21 +8,18 @@
 MASTER_SITE_SUBDIR=	gnupg
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	The GNU Privacy Guard
 
-USES=		charsetfix
+USES=		charsetfix gmake
 USE_BZIP2=	YES
-USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
 .if ${MACHINE_CPU:Mi586}
 MACHINE_ARCH=	i586
 .endif
 CFLAGS:=	${CFLAGS:S/-pipe//g}
-MAN1=		gpg.1 gpgv.1 gpg.ru.1 gpg-zip.1
-MAN7=		gnupg.7
-INFO=		gnupg1
 DOCSDIR=	${PREFIX}/share/doc/gnupg1
 LATEST_LINK=	gnupg1
 
@@ -36,7 +33,6 @@
 SUID_GPG_DESC=	install GPG with suid
 CURL_DESC=	use libcurl for the keyserver interface
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${CC} == "clang" || ${OSVERSION} >= 1000024
@@ -77,7 +73,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE}
 # Work around a GnuPG configure buglet
 CONFIGURE_ENV+=	_libcurl_config=${LOCALBASE}/bin/curl-config
@@ -86,18 +82,16 @@
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in DETAILS FAQ HACKING OpenPGP
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+	${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} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 .if ${PORT_OPTIONS:MSUID_GPG}
-	${CHMOD} u+s ${PREFIX}/bin/gpg
+	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/gpg
 .endif
 
 check:
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 329485)
+++ pkg-plist	(working copy)
@@ -6,7 +6,11 @@
 libexec/gnupg/gpgkeys_curl
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
-@dirrm libexec/gnupg
+man/man1/gpg-zip.1.gz
+man/man1/gpg.1.gz
+man/man1/gpg.ru.1.gz
+man/man1/gpgv.1.gz
+man/man7/gnupg.7.gz
 %%NLS%%share/locale/be/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gnupg.mo
@@ -38,4 +42,8 @@
 %%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
+@dirrmtry share/locale/en@quot/LC_MESSAGES
+@dirrmtry share/locale/en@quot
+@dirrmtry share/locale/en@boldquot/LC_MESSAGES
+@dirrmtry share/locale/en@boldquot
 @unexec [ -r %D/bin/gpg2 ] && ln -s gpg2 %D/bin/gpg || true