7 files changed, 13 insertions, 47 deletions

diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 10e1506c16ea..27e529d5ec89 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gpa
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4.0
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/devel/
+MASTER_SITES=	ftp://ftp.guug.de/pub/fruis/gpa/
 
 MAINTAINER=	clive@FreeBSD.org
 
@@ -20,5 +20,6 @@ USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share
 
 .include <bsd.port.mk>
diff --git a/security/gpa/distinfo b/security/gpa/distinfo
index 59a25dc2fc5e..acd5a51e6ab1 100644
--- a/security/gpa/distinfo
+++ b/security/gpa/distinfo
@@ -1 +1 @@
-MD5 (gpa-0.3.1.tar.gz) = 9076bd76dc1496b6d7e384c5b95e8810
+MD5 (gpa-0.4.0.tar.gz) = e6462d49f8b722f2f4a12cd4902412df
diff --git a/security/gpa/files/patch-aa b/security/gpa/files/patch-aa
deleted file mode 100644
index 9457f0ca50a2..000000000000
--- a/security/gpa/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- jnlib/argparse.h.orig	Thu Aug 17 00:31:34 2000
-+++ jnlib/argparse.h	Thu Aug 17 00:31:54 2000
-@@ -34,7 +34,7 @@
-      union {
- 	 int   ret_int;
- 	 long  ret_long;
--	 ulong ret_ulong;
-+	 unsigned long ret_ulong;
- 	 char *ret_str;
-      } r;		    /* Return values */
-      struct {
diff --git a/security/gpa/files/patch-ab b/security/gpa/files/patch-ab
deleted file mode 100644
index ece7ecf0348d..000000000000
--- a/security/gpa/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- jnlib/stringhelp.c.orig	Wed Aug 16 23:59:35 2000
-+++ jnlib/stringhelp.c	Thu Aug 17 00:14:30 2000
-@@ -26,6 +26,7 @@
- #include "libjnlib-config.h"
- #include "stringhelp.h"
- 
-+#include <gtk/gtk.h>
- 
- /****************
-  * look for the substring SUB in buffer and return a pointer to that
diff --git a/security/gpa/files/patch-ad b/security/gpa/files/patch-ad
deleted file mode 100644
index 7e8e141a840c..000000000000
--- a/security/gpa/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/gpa.c.orig	Thu Aug 17 01:57:46 2000
-+++ src/gpa.c	Thu Aug 17 01:58:17 2000
-@@ -135,6 +135,7 @@
-     #ifdef HAVE_LC_MESSAGES
-        setlocale( LC_TIME, "" );
-        setlocale( LC_MESSAGES, "" );
-+       gtk_set_locale ();
-     #else
-        setlocale( LC_ALL, "" );
-     #endif
-@@ -161,8 +162,8 @@
- 
-     set_strusage( my_strusage );
-     /*log_set_name ("gpa"); notyet implemented in logging.c */
--    i18n_init ();
-     gtk_init (&argc, &argv);
-+    i18n_init ();
- 
-     opt.homedir = getenv("GNUPGHOME");
-     if( !opt.homedir || !*opt.homedir ) {
diff --git a/security/gpa/files/patch-ac b/security/gpa/files/patch-configure
index b2ee16789350..757a0356cfe0 100644
--- a/security/gpa/files/patch-ac
+++ b/security/gpa/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Aug 17 01:48:35 2000
-+++ configure	Thu Aug 17 01:49:01 2000
-@@ -2685,7 +2685,7 @@
+--- configure~	Wed Feb 28 17:34:30 2001
++++ configure	Wed Feb 28 17:34:38 2001
+@@ -2707,7 +2707,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
diff --git a/security/gpa/pkg-plist b/security/gpa/pkg-plist
index 67a1e0bff464..16ddf161be86 100644
--- a/security/gpa/pkg-plist
+++ b/security/gpa/pkg-plist
@@ -1,2 +1,8 @@
 bin/gpa
+share/gpa/gpa_tips.en
+share/gpa/gpa_tips.de
+share/gpa/gtkrc
+share/gpa/gpa_logo.ppm
 share/locale/de/LC_MESSAGES/gpa.mo
+share/locale/fr/LC_MESSAGES/gpa.mo
+@dirrm share/gpa