Update to 0.39.

7 files changed, 93 insertions, 68 deletions

diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index f4b6fdfc2bda..9f3d6544571d 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -6,35 +6,33 @@
 #
 
 PORTNAME=	gtranslator
-PORTVERSION=	0.38
-PORTREVISION=	2
+PORTVERSION=	0.39
 CATEGORIES=	devel gnome
-MASTER_SITES=	http://www.gtranslator.org/download/releases/${PORTVERSION}/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-USE_BZIP2=	yes
+BUILD_DEPENDS=	msgfmt-new:${PORTSDIR}/devel/gettext-devel
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-debug
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lgiconv" \
+		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
+		XGETTEXT=${LOCALBASE}/bin/xgettext-new
 
-MAN1=		gtranslator.1 nautilus-gtranslator-view.1 pozilla.sh.1
+MAN1=		gtranslator.1 pozilla.sh.1
 MANCOMPRESSED=	yes
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
-.if defined(PARALLEL_PACKAGE_BUILD)
-FORBIDDEN=	hang
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/gtranslator/distinfo b/devel/gtranslator/distinfo
index 84fa7d29ee40..6cb8ec7725ad 100644
--- a/devel/gtranslator/distinfo
+++ b/devel/gtranslator/distinfo
@@ -1 +1 @@
-MD5 (gtranslator-0.38.tar.bz2) = 4bb1232847e754f1862d3dc78b6de21a
+MD5 (gtranslator-0.39.tar.gz) = 36716695a3f7b8d816e70120b0a145c9
diff --git a/devel/gtranslator/files/patch-help::C::Makefile.in b/devel/gtranslator/files/patch-help::C::Makefile.in
deleted file mode 100644
index 002ed407a7ad..000000000000
--- a/devel/gtranslator/files/patch-help::C::Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- help/C/Makefile.in	2001/04/09 08:23:20	1.1
-+++ help/C/Makefile.in	2001/04/09 08:37:19
-@@ -142,12 +142,14 @@
- @SCROLLKEEPER_PRESENT_TRUE@gtranslator_help_DATA = $(gtranslator_htmlfiles) topic.dat $(gtranslator_sgmlfile)
- @SCROLLKEEPER_PRESENT_FALSE@gtranslator_help_DATA = $(gtranslator_htmlfiles) topic.dat
- 
--EXTRA_DIST = $(gtranslator_sgmlfile) 	$(gtranslator_htmlfiles) 	$(gtranslator_omffile).presetup 	topic.dat
-+@SCROLLKEEPER_PRESENT_TRUE@EXTRA_DIST = $(gtranslator_sgmlfile) 	$(gtranslator_htmlfiles) 	$(gtranslator_omffile).presetup	topic.dat
-+@SCROLLKEEPER_PRESENT_FALSE@EXTRA_DIST = $(gtranslator_sgmlfile) 	$(gtranslator_htmlfiles) 	topic.dat
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
--DATA =  $(gtranslator_help_DATA) $(gtranslator_omf_DATA)
-+@SCROLLKEEPER_PRESENT_TRUE@DATA =  $(gtranslator_help_DATA) $(gtranslator_omf_DATA)
-+@SCROLLKEEPER_PRESENT_FALSE@DATA =  $(gtranslator_help_DATA)
- 
- DIST_COMMON =  Makefile.am Makefile.in
- 
-@@ -233,8 +235,10 @@
- install-exec-am:
- install-exec: install-exec-am
- 
--install-data-am: install-gtranslator_helpDATA \
--		install-gtranslator_omfDATA install-data-local
-+@SCROLLKEEPER_PRESENT_TRUE@install-data-am: install-gtranslator_helpDATA \
-+@SCROLLKEEPER_PRESENT_TRUE@		install-gtranslator_omfDATA install-data-local
-+@SCROLLKEEPER_PRESENT_FALSE@install-data-am: install-gtranslator_helpDATA \
-+@SCROLLKEEPER_PRESENT_FALSE@		install-data-local
- install-data: install-data-am
- 
- install-am: all-am
diff --git a/devel/gtranslator/files/patch-ltmain.sh b/devel/gtranslator/files/patch-ltmain.sh
new file mode 100644
index 000000000000..33bc7983f107
--- /dev/null
+++ b/devel/gtranslator/files/patch-ltmain.sh
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -4175,10 +4175,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/gtranslator/files/patch-po::Makefile.in.in b/devel/gtranslator/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..dc0deacc32b9
--- /dev/null
+++ b/devel/gtranslator/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/09/10 10:14:08	1.1
++++ po/Makefile.in.in	2001/09/10 10:14:36
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/devel/gtranslator/files/patch-src::convert.c b/devel/gtranslator/files/patch-src::convert.c
new file mode 100644
index 000000000000..2f2a510d4008
--- /dev/null
+++ b/devel/gtranslator/files/patch-src::convert.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/convert.c	2001/09/10 10:08:11	1.1
++++ src/convert.c	2001/09/10 10:08:22
+@@ -24,7 +24,7 @@
+ #include "convert.h"
+ #include "utils.h"
+ 
+-#include <iconv.h>
++#include <giconv.h>
+ #include <string.h>
+ 
+ /*
diff --git a/devel/gtranslator/pkg-plist b/devel/gtranslator/pkg-plist
index 7ed45224f063..5acdf7b49327 100644
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@@ -2,39 +2,45 @@ 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/apps/gtranslator/informations/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtranslator/language/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gtranslator/translator/%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/gconf.xml.defaults/schemas/apps/gtranslator/informations/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator/language/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator/translator/%gconf.xml
 etc/gconf/schemas/gtranslator.schemas
+lib/gtranslator/backends/docbook.xml
+lib/gtranslator/backends/docbook/docbook.so
+lib/gtranslator/backends/text.xml
+lib/gtranslator/backends/text/text.so
 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/default.xml
 share/gnome/gtranslator/colorschemes/extremely-kabalak.xml
 share/gnome/gtranslator/colorschemes/kabalak.xml
 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/sepia.xml
+share/gnome/gtranslator/colorschemes/spiffE.xml
 share/gnome/gtranslator/colorschemes/tuey.xml
 share/gnome/gtranslator/colorschemes/vim.xml
 share/gnome/gtranslator/colorschemes/waliays.xml
 share/gnome/gtranslator/colorschemes/zuper.xml
+share/gnome/gtranslator/etspecs/messages-table.etspec
+share/gnome/gtranslator/scripts/cleanup-gtranslator-settings.sh
 share/gnome/gtranslator/scripts/my-update.sh
-share/gnome/help/gtranslator/C/aa.html
 share/gnome/help/gtranslator/C/authors.html
-share/gnome/help/gtranslator/C/colorschemes.html
-share/gnome/help/gtranslator/C/commandlinearguments.html
-share/gnome/help/gtranslator/C/docbook.css
-share/gnome/help/gtranslator/C/features.html
+share/gnome/help/gtranslator/C/bugs.html
+share/gnome/help/gtranslator/C/figures/mainwindow.png
+share/gnome/help/gtranslator/C/figures/prefs.png
+share/gnome/help/gtranslator/C/figures/toolbar.png
+share/gnome/help/gtranslator/C/glossary.html
 share/gnome/help/gtranslator/C/gtranslator.sgml
 share/gnome/help/gtranslator/C/index.html
-share/gnome/help/gtranslator/C/resources.html
-share/gnome/help/gtranslator/C/thanks.html
+share/gnome/help/gtranslator/C/license.html
+share/gnome/help/gtranslator/C/prefs.html
 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
@@ -45,15 +51,21 @@ share/gnome/help/gtranslator/ja/topic.dat
 share/gnome/help/gtranslator/ja/use-of-gtranslator.html
 share/gnome/mime-info/gtranslator.keys
 share/gnome/mime-info/gtranslator.mime
+share/gnome/omf/gtranslator/gtranslator-C.omf
 share/gnome/pixmaps/gnome-application-x-gmo.png
 share/gnome/pixmaps/gnome-application-x-po.png
 share/gnome/pixmaps/gtranslator.png
+share/gnome/pixmaps/gtranslator/fuzzy.png
+share/gnome/pixmaps/gtranslator/fuzzy_small.png
+share/gnome/pixmaps/gtranslator/untranslated.png
+share/gnome/pixmaps/gtranslator/untranslated_small.png
 share/locale/az/LC_MESSAGES/gtranslator.mo
 share/locale/da/LC_MESSAGES/gtranslator.mo
 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/eu/LC_MESSAGES/gtranslator.mo
 share/locale/fi/LC_MESSAGES/gtranslator.mo
 share/locale/fr/LC_MESSAGES/gtranslator.mo
 share/locale/gl/LC_MESSAGES/gtranslator.mo
@@ -71,19 +83,23 @@ share/locale/sv/LC_MESSAGES/gtranslator.mo
 share/locale/tr/LC_MESSAGES/gtranslator.mo
 share/locale/uk/LC_MESSAGES/gtranslator.mo
 share/locale/wa/LC_MESSAGES/gtranslator.mo
+share/locale/zh_CN/LC_MESSAGES/gtranslator.mo
+share/locale/zh_TW/LC_MESSAGES/gtranslator.mo
+@dirrm share/gnome/pixmaps/gtranslator
+@dirrm share/gnome/omf/gtranslator
 @dirrm share/gnome/help/gtranslator/ja
+@dirrm share/gnome/help/gtranslator/C/figures
 @dirrm share/gnome/help/gtranslator/C
 @dirrm share/gnome/help/gtranslator
 @dirrm share/gnome/gtranslator/scripts
+@dirrm share/gnome/gtranslator/etspecs
 @dirrm share/gnome/gtranslator/colorschemes
 @dirrm share/gnome/gtranslator
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator/translator
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator/language
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtranslator/informations
+@dirrm lib/gtranslator/backends/text
+@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/translator
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtranslator/language
-@dirrm etc/gconf/gconf.xml.defaults/apps/gtranslator/informations
 @dirrm etc/gconf/gconf.xml.defaults/apps/gtranslator/history
 @dirrm etc/gconf/gconf.xml.defaults/apps/gtranslator