5 files changed, 20 insertions, 37 deletions

diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 41c1dbaa4c2e..7039a5961b08 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtranslator
-PORTVERSION=	0.41
-PORTREVISION=	1
+PORTVERSION=	0.43
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://www.gtranslator.org/download/releases/${PORTVERSION}/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -17,8 +16,9 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs gal gnomevfs
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-debug
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv -lgnuregex"
@@ -26,11 +26,8 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv -lgnuregex"
 MAN1=		gtranslator.1 pozilla.sh.1
 MANCOMPRESSED=	yes
 
-pre-patch:
+post-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 \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/devel/gtranslator/distinfo b/devel/gtranslator/distinfo
index fff14c6db0c1..7a18caaa7be7 100644
--- a/devel/gtranslator/distinfo
+++ b/devel/gtranslator/distinfo
@@ -1 +1 @@
-MD5 (gtranslator-0.41.tar.gz) = eac1d7d3c83c49807bab0f20803283dd
+MD5 (gtranslator-0.43.tar.gz) = ce198b8a23ba3f36c2d554ccc027ca2b
diff --git a/devel/gtranslator/files/patch-configure b/devel/gtranslator/files/patch-configure
new file mode 100644
index 000000000000..9e400f4361b8
--- /dev/null
+++ b/devel/gtranslator/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/07/25 11:40:03	1.1
++++ configure	2002/07/25 11:40:14
+@@ -5566,6 +5566,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/gtranslator/files/patch-ltmain.sh b/devel/gtranslator/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/devel/gtranslator/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,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/pkg-plist b/devel/gtranslator/pkg-plist
index e8942cd9129d..5b3d9937d6f4 100644
--- a/devel/gtranslator/pkg-plist
+++ b/devel/gtranslator/pkg-plist
@@ -88,6 +88,7 @@ share/locale/sv/LC_MESSAGES/gtranslator.mo
 share/locale/ta/LC_MESSAGES/gtranslator.mo
 share/locale/tr/LC_MESSAGES/gtranslator.mo
 share/locale/uk/LC_MESSAGES/gtranslator.mo
+share/locale/vi/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