diff -ruN gpa.orig/Makefile gpa/Makefile
--- gpa.orig/Makefile	2009-07-15 12:47:45.000000000 -0400
+++ gpa/Makefile	2009-07-22 20:24:07.000000000 -0400
@@ -6,25 +6,36 @@
 #
 
 PORTNAME=	gpa
-PORTVERSION=	0.7.6
-PORTREVISION=	3
+PORTVERSION=	0.9.0
 CATEGORIES=	security
-MASTER_SITES=	http://wald.intevation.org/frs/download.php/350/
+MASTER_SITES=	http://wald.intevation.org/frs/download.php/603/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	A graphical frontend for the GNU Privacy Guard
 
-LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme
-BUILD_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg
+LIB_DEPENDS=	gpgme.18:${PORTSDIR}/security/gpgme
+BUILD_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg \
+		libassuan>=1.0.4:${PORTSDIR}/security/libassuan
 RUN_DEPENDS=	gpgv2:${PORTSDIR}/security/gnupg
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share
+MAKE_JOBS_SAFE=	yes
+
+OPTIONS=	NLS "Native language support" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN gpa.orig/distinfo gpa/distinfo
--- gpa.orig/distinfo	2007-09-23 08:12:59.000000000 -0400
+++ gpa/distinfo	2009-07-22 20:08:39.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (gpa-0.7.6.tar.bz2) = 8ee26d7fe829e81eb8bce2d974a7c500
-SHA256 (gpa-0.7.6.tar.bz2) = abba59525a2a216df89a5ac4f9d9d564bd137f4c07e772636dec0046a0344e1c
-SIZE (gpa-0.7.6.tar.bz2) = 607469
+MD5 (gpa-0.9.0.tar.bz2) = 8859f9cf69e94e10e4895f633a0b268a
+SHA256 (gpa-0.9.0.tar.bz2) = 3633ebe4409d8b79f2d9bf29305910a4d917a954f4d92bb08f3f1a6b11d749c9
+SIZE (gpa-0.9.0.tar.bz2) = 703314
diff -ruN gpa.orig/pkg-descr gpa/pkg-descr
--- gpa.orig/pkg-descr	2001-01-03 13:30:53.000000000 -0500
+++ gpa/pkg-descr	2009-07-22 20:08:39.000000000 -0400
@@ -2,4 +2,4 @@
 used to manage the keys and encrypt/decrypt/sign/check files. It is much
 like Seahorse.
 
-WWW: http://www.gnupg.org/gpa.html
+WWW: http://gpa.wald.intevation.org/
diff -ruN gpa.orig/pkg-plist gpa/pkg-plist
--- gpa.orig/pkg-plist	2007-09-23 08:12:59.000000000 -0400
+++ gpa/pkg-plist	2009-07-22 20:08:39.000000000 -0400
@@ -1,21 +1,20 @@
 bin/gpa
 share/applications/gpa.desktop
-share/locale/cs/LC_MESSAGES/gpa.mo
-share/locale/de/LC_MESSAGES/gpa.mo
-share/locale/es/LC_MESSAGES/gpa.mo
-share/locale/fr/LC_MESSAGES/gpa.mo
-share/locale/ja/LC_MESSAGES/gpa.mo
-share/locale/nl/LC_MESSAGES/gpa.mo
-share/locale/pl/LC_MESSAGES/gpa.mo
-share/locale/pt_BR/LC_MESSAGES/gpa.mo
-share/locale/ru/LC_MESSAGES/gpa.mo
-share/locale/sv/LC_MESSAGES/gpa.mo
-share/locale/tr/LC_MESSAGES/gpa.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gpa.mo
-%%DATADIR%%/gpa.png
-%%DATADIR%%/gpa_tips.en
-%%DATADIR%%/gpa_tips.de
-%%DATADIR%%/gpa_logo.ppm
+share/gpa/gpa-logo.ppm
+share/gpa/gpa.png
+%%NLS%%share/locale/ar/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gpa.mo
+%%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/gpa.mo
 share/pixmaps/gpa.png
+@dirrm share/gpa
 @dirrmtry share/applications
-@dirrm %%DATADIR%%