6 files changed, 58 insertions, 58 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index e541a2ad3466..d7bdbc5f07ce 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTVERSION=	1.2.6
+PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -57,13 +57,13 @@ CONFIGURE_ARGS+=	--disable-ldap
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/gnupg
+	${MKDIR} ${DOCSDIR}
 .for i in DETAILS FAQ HACKING OpenPGP
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/gnupg
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .for i in ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
 	README THANKS TODO VERSION
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/gnupg
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 .if defined(WITH_SUID_GPG)
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 504cc9ec15e7..2000024ad9bd 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnupg-1.2.5.tar.bz2) = e4991e46fde52b216410ef0f485b4217
-SIZE (gnupg-1.2.5.tar.bz2) = 2488670
-MD5 (gnupg-1.2.5.tar.bz2.sig) = 586a602b2517fc4d16cc5403b1e08450
-SIZE (gnupg-1.2.5.tar.bz2.sig) = 65
+MD5 (gnupg-1.2.6.tar.bz2) = b1890f5dfacd2ba7ab15448c5ff08a4e
+SIZE (gnupg-1.2.6.tar.bz2) = 2550665
+MD5 (gnupg-1.2.6.tar.bz2.sig) = ff4f53e9a7473891216c8253cc72d0a6
+SIZE (gnupg-1.2.6.tar.bz2.sig) = 65
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index dcc7c13a1dc2..0ed7c785c3dc 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -6,24 +6,24 @@ libexec/gnupg/gpgkeys_mailto
 @dirrm libexec/gnupg
 info/gpg.info
 info/gpgv.info
-share/gnupg/FAQ
-share/gnupg/faq.html
-share/gnupg/options.skel
-%%PORTDOCS%%share/doc/gnupg/README
-%%PORTDOCS%%share/doc/gnupg/DETAILS
-%%PORTDOCS%%share/doc/gnupg/FAQ
-%%PORTDOCS%%share/doc/gnupg/HACKING
-%%PORTDOCS%%share/doc/gnupg/OpenPGP
-%%PORTDOCS%%share/doc/gnupg/ABOUT-NLS
-%%PORTDOCS%%share/doc/gnupg/AUTHORS
-%%PORTDOCS%%share/doc/gnupg/BUGS
-%%PORTDOCS%%share/doc/gnupg/COPYING
-%%PORTDOCS%%share/doc/gnupg/INSTALL
-%%PORTDOCS%%share/doc/gnupg/NEWS
-%%PORTDOCS%%share/doc/gnupg/PROJECTS
-%%PORTDOCS%%share/doc/gnupg/THANKS
-%%PORTDOCS%%share/doc/gnupg/TODO
-%%PORTDOCS%%share/doc/gnupg/VERSION
+%%DATADIR%%/FAQ
+%%DATADIR%%/faq.html
+%%DATADIR%%/options.skel
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/DETAILS
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/OpenPGP
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PROJECTS
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
 %%NLS%%share/locale/be/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gnupg.mo
@@ -51,7 +51,7 @@ share/gnupg/options.skel
 %%NLS%%share/locale/tr/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
-@dirrm share/gnupg
+@dirrm %%DATADIR%%
 @unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/be 2>/dev/null || true
 @unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
@@ -89,4 +89,4 @@ share/gnupg/options.skel
 @unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@dirrm share/doc/gnupg
+@dirrm %%DOCSDIR%%
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index e541a2ad3466..d7bdbc5f07ce 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTVERSION=	1.2.6
+PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
@@ -57,13 +57,13 @@ CONFIGURE_ARGS+=	--disable-ldap
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/gnupg
+	${MKDIR} ${DOCSDIR}
 .for i in DETAILS FAQ HACKING OpenPGP
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/gnupg
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
 .endfor
 .for i in ABOUT-NLS AUTHORS BUGS COPYING INSTALL NEWS PROJECTS \
 	README THANKS TODO VERSION
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/gnupg
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 .if defined(WITH_SUID_GPG)
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index 504cc9ec15e7..2000024ad9bd 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnupg-1.2.5.tar.bz2) = e4991e46fde52b216410ef0f485b4217
-SIZE (gnupg-1.2.5.tar.bz2) = 2488670
-MD5 (gnupg-1.2.5.tar.bz2.sig) = 586a602b2517fc4d16cc5403b1e08450
-SIZE (gnupg-1.2.5.tar.bz2.sig) = 65
+MD5 (gnupg-1.2.6.tar.bz2) = b1890f5dfacd2ba7ab15448c5ff08a4e
+SIZE (gnupg-1.2.6.tar.bz2) = 2550665
+MD5 (gnupg-1.2.6.tar.bz2.sig) = ff4f53e9a7473891216c8253cc72d0a6
+SIZE (gnupg-1.2.6.tar.bz2.sig) = 65
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index dcc7c13a1dc2..0ed7c785c3dc 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -6,24 +6,24 @@ libexec/gnupg/gpgkeys_mailto
 @dirrm libexec/gnupg
 info/gpg.info
 info/gpgv.info
-share/gnupg/FAQ
-share/gnupg/faq.html
-share/gnupg/options.skel
-%%PORTDOCS%%share/doc/gnupg/README
-%%PORTDOCS%%share/doc/gnupg/DETAILS
-%%PORTDOCS%%share/doc/gnupg/FAQ
-%%PORTDOCS%%share/doc/gnupg/HACKING
-%%PORTDOCS%%share/doc/gnupg/OpenPGP
-%%PORTDOCS%%share/doc/gnupg/ABOUT-NLS
-%%PORTDOCS%%share/doc/gnupg/AUTHORS
-%%PORTDOCS%%share/doc/gnupg/BUGS
-%%PORTDOCS%%share/doc/gnupg/COPYING
-%%PORTDOCS%%share/doc/gnupg/INSTALL
-%%PORTDOCS%%share/doc/gnupg/NEWS
-%%PORTDOCS%%share/doc/gnupg/PROJECTS
-%%PORTDOCS%%share/doc/gnupg/THANKS
-%%PORTDOCS%%share/doc/gnupg/TODO
-%%PORTDOCS%%share/doc/gnupg/VERSION
+%%DATADIR%%/FAQ
+%%DATADIR%%/faq.html
+%%DATADIR%%/options.skel
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/DETAILS
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/OpenPGP
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PROJECTS
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
 %%NLS%%share/locale/be/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gnupg.mo
@@ -51,7 +51,7 @@ share/gnupg/options.skel
 %%NLS%%share/locale/tr/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
-@dirrm share/gnupg
+@dirrm %%DATADIR%%
 @unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/be 2>/dev/null || true
 @unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
@@ -89,4 +89,4 @@ share/gnupg/options.skel
 @unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@dirrm share/doc/gnupg
+@dirrm %%DOCSDIR%%