5 files changed, 19 insertions, 43 deletions

diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index a9341f85785c..f71ae7c2189b 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	1.113.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
@@ -21,7 +20,7 @@ LIB_DEPENDS=	gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas \
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
 		--datadir=${PREFIX}/share/gnome2
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 0620650499a8..700c1cc598a0 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-1.113.0.tar.bz2) = 91fcff2d01dc7d32c44197b6e53cc146
+MD5 (gnome2/libbonoboui-1.115.0.tar.bz2) = e7678b3947ae9e6135288b8c2f282d1c
diff --git a/x11-toolkits/libbonoboui/files/patch-configure b/x11-toolkits/libbonoboui/files/patch-configure
new file mode 100644
index 000000000000..e33f9e6ceb4e
--- /dev/null
+++ b/x11-toolkits/libbonoboui/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/04/26 11:11:58	1.1
++++ configure	2002/04/26 11:12:23
+@@ -7013,6 +7013,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/libbonoboui/files/patch-ltmain.sh b/x11-toolkits/libbonoboui/files/patch-ltmain.sh
deleted file mode 100644
index ffdb1ed47af8..000000000000
--- a/x11-toolkits/libbonoboui/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-toolkits/libbonoboui/files/Attic/patch-ltmain.sh,v 1.1 2002-04-08 21:01:48 marcus Exp $
-
---- ltmain.sh.orig	Sun Jan 20 16:11:07 2002
-+++ ltmain.sh	Tue Jan 22 13:34:20 2002
-@@ -1060,6 +1060,7 @@
- 
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2442,6 +2443,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4208,10 +4212,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/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist
index 1a5788bfe2ef..a2a7f1139b21 100644
--- a/x11-toolkits/libbonoboui/pkg-plist
+++ b/x11-toolkits/libbonoboui/pkg-plist
@@ -66,7 +66,7 @@ share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
-@dirrm share/gnome/gnome-2.0/ui
-@dirrm share/gnome/gnome-2.0
+@dirrm share/gnome2/gnome-2.0/ui
+@dirrm share/gnome2/gnome-2.0
 @dirrm include/libbonoboui-2.0/bonobo
 @dirrm include/libbonoboui-2.0