8 files changed, 58 insertions, 30 deletions

diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index e99c896c09ee..001c68473265 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gtranslator
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/gtranslator/distinfo b/devel/gtranslator/distinfo
index 188c742afa8f..e5d0ce324ce6 100644
--- a/devel/gtranslator/distinfo
+++ b/devel/gtranslator/distinfo
@@ -1 +1 @@
-MD5 (gtranslator-0.40.tar.gz) = 993c118d5b88488a09dd8be258a878e9
+MD5 (gtranslator-0.40.tar.gz) = 3f1d4bd5db84d56f1ca418bccf47f733
diff --git a/devel/gtranslator/files/patch-intltool-merge.in b/devel/gtranslator/files/patch-intltool-merge.in
new file mode 100644
index 000000000000..686362bda663
--- /dev/null
+++ b/devel/gtranslator/files/patch-intltool-merge.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- intltool-merge.in	2002/03/15 08:59:58	1.1
++++ intltool-merge.in	2002/03/15 09:00:07
+@@ -287,7 +287,7 @@
+             if (lc $encoding eq "utf-8") {
+                 open PO_FILE, "<$po_file";	
+             } else {
+-                open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
++                open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
+             }
+         } else {
+             open PO_FILE, "<$po_file";	
diff --git a/devel/gtranslator/files/patch-src::backends::text::Makefile.in b/devel/gtranslator/files/patch-src::backends::text::Makefile.in
index 0d4935aac4ab..c8bb9a6c85ff 100644
--- a/devel/gtranslator/files/patch-src::backends::text::Makefile.in
+++ b/devel/gtranslator/files/patch-src::backends::text::Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- src/backends/text/Makefile.in	2002/03/01 16:48:42	1.1
-+++ src/backends/text/Makefile.in	2002/03/01 16:49:22
-@@ -152,7 +152,7 @@
+--- src/backends/text/Makefile.in.orig	Fri Mar 15 10:57:16 2002
++++ src/backends/text/Makefile.in	Fri Mar 15 10:58:27 2002
+@@ -154,7 +154,7 @@
  backends_DATA = text.xml
  backendslib_LTLIBRARIES = text.la
  
--INCLUDES =  	-I$(top_srcdir) 	-I$(includedir) 	-DG_LOG_DOMAIN=\""gtranslator"\" 	$(GLIB_CFLAGS)
-+INCLUDES =  	-I$(top_srcdir) 	-I$(includedir) 	$(GNOME_INCLUDEDIR)	-DG_LOG_DOMAIN=\""gtranslator"\" 	$(GLIB_CFLAGS)
+-INCLUDES =  	-I$(top_srcdir) 	-I$(includedir) 	-DG_LOG_DOMAIN=\""gtranslator"\" 	$(GLIB_CFLAGS)				$(GAL_CFLAGS)
++INCLUDES =  	-I$(top_srcdir) 	-I$(includedir) 	$(GNOME_INCLUDEDIR)	-DG_LOG_DOMAIN=\""gtranslator"\" 	$(GLIB_CFLAGS)				$(GAL_CFLAGS)
  
  
  text_la_SOURCES = text.c
diff --git a/devel/gtranslator/files/patch-src::find.c b/devel/gtranslator/files/patch-src::find.c
new file mode 100644
index 000000000000..8ee4e9b7e947
--- /dev/null
+++ b/devel/gtranslator/files/patch-src::find.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/find.c	2002/03/15 09:02:54	1.1
++++ src/find.c	2002/03/15 09:03:04
+@@ -31,7 +31,7 @@
+ #include "utils.h"
+ 
+ #include <string.h>
+-#include <regex.h>
++#include <gnuregex.h>
+ #include <gtk/gtkeditable.h>
+ #include <libgnomeui/gnome-app-util.h>
+ 
diff --git a/devel/gtranslator/files/patch-src::message.c b/devel/gtranslator/files/patch-src::message.c
new file mode 100644
index 000000000000..db4ca7119c4a
--- /dev/null
+++ b/devel/gtranslator/files/patch-src::message.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/message.c	2002/03/15 09:03:55	1.1
++++ src/message.c	2002/03/15 09:04:04
+@@ -39,7 +39,7 @@
+ #include "utils_gui.h"
+ 
+ #include <string.h>
+-#include <regex.h>
++#include <gnuregex.h>
+ #include <gtk/gtk.h>
+ 
+ #include <libgnomeui/gnome-app.h>
diff --git a/devel/gtranslator/files/patch-xml-i18n-merge.in b/devel/gtranslator/files/patch-xml-i18n-merge.in
deleted file mode 100644
index 8bcff954ac26..000000000000
--- a/devel/gtranslator/files/patch-xml-i18n-merge.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- xml-i18n-merge.in	2002/03/01 16:43:27	1.1
-+++ xml-i18n-merge.in	2002/03/01 16:43:35
-@@ -243,7 +243,7 @@
- 
-         if ($UTF8_ARG) {
-             my $encoding = get_po_encoding($po_file);
--            open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|";	
-+            open PO_FILE, "giconv -f $encoding -t UTF-8 $po_file|";	
-         } else {
-             open PO_FILE, "<$po_file";	
-         }
diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist
index f2c80befa4e9..7008b078bc17 100644
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@@ -1,10 +1,5 @@
 bin/gtranslator
 bin/pozilla.sh
-etc/gconf/gconf.xml.defaults/apps/gtranslator/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtranslator/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator/history/%gconf.xml
-etc/gconf/schemas/gtranslator.schemas
 lib/gtranslator/backends/docbook.xml
 lib/gtranslator/backends/docbook/docbook.so
 lib/gtranslator/backends/text.xml
@@ -13,6 +8,7 @@ share/gnome/apps/Development/gtranslator.desktop
 share/gnome/gtranslator/colorschemes/arek.xml
 share/gnome/gtranslator/colorschemes/boom-boom.xml
 share/gnome/gtranslator/colorschemes/clean.xml
+share/gnome/gtranslator/colorschemes/curlymonster.xml
 share/gnome/gtranslator/colorschemes/default.xml
 share/gnome/gtranslator/colorschemes/extremely-kabalak.xml
 share/gnome/gtranslator/colorschemes/kabalak.xml
@@ -20,13 +16,18 @@ share/gnome/gtranslator/colorschemes/kbabel.xml
 share/gnome/gtranslator/colorschemes/menesis.xml
 share/gnome/gtranslator/colorschemes/mmc.xml
 share/gnome/gtranslator/colorschemes/nizuu.xml
+share/gnome/gtranslator/colorschemes/pdmc.xml
 share/gnome/gtranslator/colorschemes/sepia.xml
 share/gnome/gtranslator/colorschemes/spiffE.xml
+share/gnome/gtranslator/colorschemes/thinice.xml
+share/gnome/gtranslator/colorschemes/toyfactory.xml
 share/gnome/gtranslator/colorschemes/tuey.xml
 share/gnome/gtranslator/colorschemes/vim.xml
 share/gnome/gtranslator/colorschemes/waliays.xml
+share/gnome/gtranslator/colorschemes/yef.xml
 share/gnome/gtranslator/colorschemes/zuper.xml
 share/gnome/gtranslator/etspecs/messages-table.etspec
+share/gnome/gtranslator/scripts/build-gtranslator-learn-buffer.sh
 share/gnome/gtranslator/scripts/cleanup-gtranslator-settings.sh
 share/gnome/gtranslator/scripts/my-update.sh
 share/gnome/help/gtranslator/C/authors.html
@@ -43,7 +44,6 @@ share/gnome/help/gtranslator/C/topic.dat
 share/gnome/help/gtranslator/C/usage.html
 share/gnome/help/gtranslator/ja/authors.html
 share/gnome/help/gtranslator/ja/commandlinearguments.html
-share/gnome/help/gtranslator/ja/docbook.css
 share/gnome/help/gtranslator/ja/features.html
 share/gnome/help/gtranslator/ja/index.html
 share/gnome/help/gtranslator/ja/thanks.html
@@ -66,6 +66,7 @@ share/locale/de/LC_MESSAGES/gtranslator.mo
 share/locale/el/LC_MESSAGES/gtranslator.mo
 share/locale/en_GB/LC_MESSAGES/gtranslator.mo
 share/locale/es/LC_MESSAGES/gtranslator.mo
+share/locale/et/LC_MESSAGES/gtranslator.mo
 share/locale/eu/LC_MESSAGES/gtranslator.mo
 share/locale/fi/LC_MESSAGES/gtranslator.mo
 share/locale/fr/LC_MESSAGES/gtranslator.mo
@@ -76,10 +77,12 @@ share/locale/ja/LC_MESSAGES/gtranslator.mo
 share/locale/ko/LC_MESSAGES/gtranslator.mo
 share/locale/lt/LC_MESSAGES/gtranslator.mo
 share/locale/nl/LC_MESSAGES/gtranslator.mo
+share/locale/nn/LC_MESSAGES/gtranslator.mo
 share/locale/no/LC_MESSAGES/gtranslator.mo
 share/locale/pl/LC_MESSAGES/gtranslator.mo
 share/locale/pt_BR/LC_MESSAGES/gtranslator.mo
 share/locale/ru/LC_MESSAGES/gtranslator.mo
+share/locale/sk/LC_MESSAGES/gtranslator.mo
 share/locale/sv/LC_MESSAGES/gtranslator.mo
 share/locale/ta/LC_MESSAGES/gtranslator.mo
 share/locale/tr/LC_MESSAGES/gtranslator.mo
@@ -101,7 +104,3 @@ share/locale/zh_TW/LC_MESSAGES/gtranslator.mo
 @dirrm lib/gtranslator/backends/docbook
 @dirrm lib/gtranslator/backends
 @dirrm lib/gtranslator
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator/history
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtranslator/history
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtranslator