7 files changed, 138 insertions, 122 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 78f10c37e853..24bba8ba24af 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bonobo
 PORTVERSION=	1.0.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/bonobo
@@ -22,9 +22,11 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOMECTRL=	yes
-GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libefs/configure
+CONFIGURE_ARGS=	--disable-gtk-doc \
+		--with-html-dir=${PREFIX}/share/doc/bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
new file mode 100644
index 000000000000..f3a7060be798
--- /dev/null
+++ b/devel/bonobo/files/patch-components::audio-ulaw::doc::C::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- components/audio-ulaw/doc/C/Makefile.in	2002/05/01 01:17:50	1.1
++++ components/audio-ulaw/doc/C/Makefile.in	2002/05/01 01:28:03
+@@ -168,7 +168,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-audio_ulaw_helpdir = $(datadir)/bonobo/docs/audio_ulaw/C
++audio_ulaw_helpdir = $(datadir)/help/audio_ulaw/C
+ 
+ # 
+ # Module configuration information
diff --git a/devel/bonobo/files/patch-configure b/devel/bonobo/files/patch-configure
new file mode 100644
index 000000000000..59bac8984902
--- /dev/null
+++ b/devel/bonobo/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/05/01 00:28:19	1.1
++++ configure	2002/05/01 00:28:29
+@@ -7377,6 +7377,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/bonobo/files/patch-libefs::configure b/devel/bonobo/files/patch-libefs::configure
new file mode 100644
index 000000000000..b1beaffbc526
--- /dev/null
+++ b/devel/bonobo/files/patch-libefs::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- libefs/configure	2002/05/01 00:30:49	1.1
++++ libefs/configure	2002/05/01 00:30:58
+@@ -6397,6 +6397,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/bonobo/files/patch-ltmain.sh b/devel/bonobo/files/patch-ltmain.sh
deleted file mode 100644
index 91c341790451..000000000000
--- a/devel/bonobo/files/patch-ltmain.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-
-$FreeBSD$
-
---- 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/devel/bonobo/files/patch-storage-modules::Makefile.in b/devel/bonobo/files/patch-storage-modules::Makefile.in
new file mode 100644
index 000000000000..448f47666038
--- /dev/null
+++ b/devel/bonobo/files/patch-storage-modules::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- storage-modules/Makefile.in	2002/05/01 01:03:30	1.1
++++ storage-modules/Makefile.in	2002/05/01 01:15:16
+@@ -180,7 +180,7 @@
+ libstorage_efs_la_SOURCES =  	bonobo-storage-efs.c		bonobo-storage-efs.h		bonobo-stream-efs.c		bonobo-stream-efs.h
+ 
+ 
+-libstorage_efs_la_LDFLAGS =  	$(common_ldflags) 				-L$(top_builddir)/libefs/src			-lefs
++libstorage_efs_la_LDFLAGS =  	$(common_ldflags) 				$(top_builddir)/libefs/src/libefs.la
+ 
+ 
+ #
diff --git a/devel/bonobo/pkg-plist b/devel/bonobo/pkg-plist
index 58e93115897c..42e8abccacef 100644
--- a/devel/bonobo/pkg-plist
+++ b/devel/bonobo/pkg-plist
@@ -105,79 +105,79 @@ lib/libefs.a
 lib/libefs.so
 lib/libefs.so.1
 libdata/pkgconfig/libefs.pc
-share/gnome/bonobo/docs/audio_ulaw/C/index.html
-share/gnome/bonobo/html/bonobo-api.html
-share/gnome/bonobo/html/bonobo-api.sgml
-share/gnome/bonobo/html/bonobo-decl.txt
-share/gnome/bonobo/html/bonobo-sections.txt
-share/gnome/bonobo/html/bonobo.hierarchy
-share/gnome/bonobo/html/bonobo.signals
-share/gnome/bonobo/html/bonobo.types
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-arg.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-async.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-canvas-component.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-canvas-item.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-client-site.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-context.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-control-frame.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-control.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-embeddable.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-event-source.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-exception.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-generic-factory.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-item-container.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-item-handler.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-listener.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-main.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-extender.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-simple.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker-util.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-moniker.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-object-client.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-object.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist-file.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist-stream.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-persist.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-plug.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-print-client.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-print.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag-client.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag-xml.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-bag.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-property-control.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-selector.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-socket.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-storage-plugin.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-storage.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream-client.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream-memory.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-stream.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-transient.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-component.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-container.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-engine.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-node.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-sync.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-ui-util.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-view-frame.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-view.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-widget.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-win.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-wrapper.html
-share/gnome/bonobo/html/bonobo/bonobo-bonobo-xobject.html
-share/gnome/bonobo/html/bonobo/bonobo-controls.html
-share/gnome/bonobo/html/bonobo/bonobo-core.html
-share/gnome/bonobo/html/bonobo/bonobo-documents.html
-share/gnome/bonobo/html/bonobo/bonobo-moniker-handlers.html
-share/gnome/bonobo/html/bonobo/bonobo-notification.html
-share/gnome/bonobo/html/bonobo/bonobo-object-activation.html
-share/gnome/bonobo/html/bonobo/bonobo-print.html
-share/gnome/bonobo/html/bonobo/bonobo-properties.html
-share/gnome/bonobo/html/bonobo/bonobo-storage.html
-share/gnome/bonobo/html/bonobo/bonobo-support-utilities.html
-share/gnome/bonobo/html/bonobo/bonobo-ui.html
-share/gnome/bonobo/html/bonobo/bonobo-view.html
-share/gnome/bonobo/html/bonobo/book1.html
+share/doc/bonobo/bonobo-api.html
+share/doc/bonobo/bonobo-api.sgml
+share/doc/bonobo/bonobo-decl.txt
+share/doc/bonobo/bonobo-sections.txt
+share/doc/bonobo/bonobo.hierarchy
+share/doc/bonobo/bonobo.signals
+share/doc/bonobo/bonobo.types
+share/doc/bonobo/bonobo/bonobo-bonobo-arg.html
+share/doc/bonobo/bonobo/bonobo-bonobo-async.html
+share/doc/bonobo/bonobo/bonobo-bonobo-canvas-component.html
+share/doc/bonobo/bonobo/bonobo-bonobo-canvas-item.html
+share/doc/bonobo/bonobo/bonobo-bonobo-client-site.html
+share/doc/bonobo/bonobo/bonobo-bonobo-context.html
+share/doc/bonobo/bonobo/bonobo-bonobo-control-frame.html
+share/doc/bonobo/bonobo/bonobo-bonobo-control.html
+share/doc/bonobo/bonobo/bonobo-bonobo-embeddable.html
+share/doc/bonobo/bonobo/bonobo-bonobo-event-source.html
+share/doc/bonobo/bonobo/bonobo-bonobo-exception.html
+share/doc/bonobo/bonobo/bonobo-bonobo-generic-factory.html
+share/doc/bonobo/bonobo/bonobo-bonobo-item-container.html
+share/doc/bonobo/bonobo/bonobo-bonobo-item-handler.html
+share/doc/bonobo/bonobo/bonobo-bonobo-listener.html
+share/doc/bonobo/bonobo/bonobo-bonobo-main.html
+share/doc/bonobo/bonobo/bonobo-bonobo-moniker-extender.html
+share/doc/bonobo/bonobo/bonobo-bonobo-moniker-simple.html
+share/doc/bonobo/bonobo/bonobo-bonobo-moniker-util.html
+share/doc/bonobo/bonobo/bonobo-bonobo-moniker.html
+share/doc/bonobo/bonobo/bonobo-bonobo-object-client.html
+share/doc/bonobo/bonobo/bonobo-bonobo-object.html
+share/doc/bonobo/bonobo/bonobo-bonobo-persist-file.html
+share/doc/bonobo/bonobo/bonobo-bonobo-persist-stream.html
+share/doc/bonobo/bonobo/bonobo-bonobo-persist.html
+share/doc/bonobo/bonobo/bonobo-bonobo-plug.html
+share/doc/bonobo/bonobo/bonobo-bonobo-print-client.html
+share/doc/bonobo/bonobo/bonobo-bonobo-print.html
+share/doc/bonobo/bonobo/bonobo-bonobo-property-bag-client.html
+share/doc/bonobo/bonobo/bonobo-bonobo-property-bag-xml.html
+share/doc/bonobo/bonobo/bonobo-bonobo-property-bag.html
+share/doc/bonobo/bonobo/bonobo-bonobo-property-control.html
+share/doc/bonobo/bonobo/bonobo-bonobo-selector.html
+share/doc/bonobo/bonobo/bonobo-bonobo-socket.html
+share/doc/bonobo/bonobo/bonobo-bonobo-storage-plugin.html
+share/doc/bonobo/bonobo/bonobo-bonobo-storage.html
+share/doc/bonobo/bonobo/bonobo-bonobo-stream-client.html
+share/doc/bonobo/bonobo/bonobo-bonobo-stream-memory.html
+share/doc/bonobo/bonobo/bonobo-bonobo-stream.html
+share/doc/bonobo/bonobo/bonobo-bonobo-transient.html
+share/doc/bonobo/bonobo/bonobo-bonobo-ui-component.html
+share/doc/bonobo/bonobo/bonobo-bonobo-ui-container.html
+share/doc/bonobo/bonobo/bonobo-bonobo-ui-engine.html
+share/doc/bonobo/bonobo/bonobo-bonobo-ui-node.html
+share/doc/bonobo/bonobo/bonobo-bonobo-ui-sync.html
+share/doc/bonobo/bonobo/bonobo-bonobo-ui-util.html
+share/doc/bonobo/bonobo/bonobo-bonobo-view-frame.html
+share/doc/bonobo/bonobo/bonobo-bonobo-view.html
+share/doc/bonobo/bonobo/bonobo-bonobo-widget.html
+share/doc/bonobo/bonobo/bonobo-bonobo-win.html
+share/doc/bonobo/bonobo/bonobo-bonobo-wrapper.html
+share/doc/bonobo/bonobo/bonobo-bonobo-xobject.html
+share/doc/bonobo/bonobo/bonobo-controls.html
+share/doc/bonobo/bonobo/bonobo-core.html
+share/doc/bonobo/bonobo/bonobo-documents.html
+share/doc/bonobo/bonobo/bonobo-moniker-handlers.html
+share/doc/bonobo/bonobo/bonobo-notification.html
+share/doc/bonobo/bonobo/bonobo-object-activation.html
+share/doc/bonobo/bonobo/bonobo-print.html
+share/doc/bonobo/bonobo/bonobo-properties.html
+share/doc/bonobo/bonobo/bonobo-storage.html
+share/doc/bonobo/bonobo/bonobo-support-utilities.html
+share/doc/bonobo/bonobo/bonobo-ui.html
+share/doc/bonobo/bonobo/bonobo-view.html
+share/doc/bonobo/bonobo/book1.html
+share/gnome/help/audio_ulaw/C/index.html
 share/gnome/idl/Bonobo.idl
 share/gnome/idl/Bonobo_Advise.idl
 share/gnome/idl/Bonobo_Canvas.idl
@@ -245,16 +245,12 @@ share/locale/wa/LC_MESSAGES/bonobo.mo
 share/locale/zh_CN/LC_MESSAGES/bonobo.mo
 share/locale/zh_TW/LC_MESSAGES/bonobo.mo
 @dirrm share/gnome/ui
-@dirrm share/gnome/libefs/html/libefs
-@dirrm share/gnome/libefs/html
-@dirrm share/gnome/libefs
-@dirrm share/gnome/bonobo/html/bonobo
-@dirrm share/gnome/bonobo/html
-@dirrm share/gnome/bonobo/docs/audio_ulaw/C/images
-@dirrm share/gnome/bonobo/docs/audio_ulaw/C
-@dirrm share/gnome/bonobo/docs/audio_ulaw
-@dirrm share/gnome/bonobo/docs
-@dirrm share/gnome/bonobo
+@dirrm share/gnome/help/audio_ulaw/C/images
+@dirrm share/gnome/help/audio_ulaw/C
+@dirrm share/gnome/help/audio_ulaw
+@dirrm share/doc/bonobo/libefs
+@dirrm share/doc/bonobo/bonobo
+@dirrm share/doc/bonobo
 @dirrm lib/bonobo/plugin
 @dirrm include/gnome-1.0/bonobo
 @unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true