- Update to 1.115.0 (version found in the GNOME2 beta4);

- use USE_LIBTOOL.

5 files changed, 20 insertions, 50 deletions

diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index f72fdd55e117..eb9ac45f2a76 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgnomeui
-PORTVERSION=	1.114.0
-PORTREVISION=	1
+PORTVERSION=	1.115.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 USE_BISON=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
 		--datadir=${PREFIX}/share/gnome2 \
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 2d7bc572ae5c..e356216e9ae6 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-1.114.0.tar.bz2) = 44296edf066c9f10fa8ff2245979d1b2
+MD5 (gnome2/libgnomeui-1.115.0.tar.bz2) = 34c5bdfdc675d0de1936c0e72c888dd7
diff --git a/x11-toolkits/libgnomeui/files/patch-configure b/x11-toolkits/libgnomeui/files/patch-configure
new file mode 100644
index 000000000000..54a31067fcc7
--- /dev/null
+++ b/x11-toolkits/libgnomeui/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/04/26 12:31:45	1.1
++++ configure	2002/04/26 12:32:10
+@@ -7099,6 +7099,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/x11-toolkits/libgnomeui/files/patch-ltmain.sh b/x11-toolkits/libgnomeui/files/patch-ltmain.sh
deleted file mode 100644
index 44876d32d501..000000000000
--- a/x11-toolkits/libgnomeui/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-toolkits/libgnomeui/files/Attic/patch-ltmain.sh,v 1.1 2002-04-08 21:05:28 marcus Exp $
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,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
-@@ -4179,10 +4190,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/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index f7a08538dd3a..2d69de40e06c 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -125,6 +125,7 @@ share/gnome2/pixmaps/gnome-question.png
 share/gnome2/pixmaps/gnome-warning.png
 share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/et/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnomeui-2.0.mo
@@ -139,6 +140,7 @@ share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/no/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
@@ -146,6 +148,7 @@ share/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo