Update bonobo to 1.0.9 and while at it, buildlinkify. Changes include:

        * Features
                * UI parse / translate caching (Alex Larsson)
                * parallel build fixes (Havoc)
                * gnome 1.4.1 spec file (Ludovic Danigo)

        * Bugs fixed
                * moniker escaping bug (Me)
                * storage-fs fixes (David Kaelbling)
                * more preconditions on UI component (Me)
                * toolbar shadow fix (Ettore)
                * xml18ntools config issue (Darin)
                * property bag leak (Larry Ewing)
                * pixmap leak (Larry Ewing)
                * event source UMR (Dan Winship)
                * stream-memory segv (Jody)
                * build fixes (Darin)
                * require new libxml (Radek Doulik)
                * exception env. leak fixage (Anders Carlsson)

4 files changed, 173 insertions, 200 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index d12489094c3..587011ae1eb 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2001/09/27 23:17:54 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/10/04 19:14:58 rh Exp $
 #
 
-DISTNAME=		bonobo-1.0.7
+DISTNAME=		bonobo-1.0.9
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/bonobo/}
 
@@ -10,12 +10,10 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Architecture for creating reusable software components
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-DEPENDS+=		ORBit>=0.5.8:../../net/ORBit
-DEPENDS+=		gdk-pixbuf-gnome>=0.10.0:../../graphics/gdk-pixbuf-gnome
-DEPENDS+=		oaf>=0.6.5:../../devel/oaf
-DEPENDS+=		gnome-libs>=1.2.13:../../x11/gnome-libs
-DEPENDS+=		gnome-print>=0.28:../../print/gnome-print
 
+BUILDLINK_DEPENDS.ORBit=ORBit>0.5.8
+
+USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
@@ -23,9 +21,13 @@ GNU_CONFIGURE=		YES
 
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=		X11BASE="${X11BASE}"
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+LDFLAGS+=		-Wl,-R${LOCALBASE}/lib
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+.include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
+.include "../../print/gnome-print/buildlink.mk"
+.include "../../devel/popt/buildlink.mk"
+.include "../../devel/oaf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bonobo/buildlink.mk b/devel/bonobo/buildlink.mk
new file mode 100644
index 00000000000..a0e869f64e3
--- /dev/null
+++ b/devel/bonobo/buildlink.mk
@@ -0,0 +1,67 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/10/04 19:14:58 rh Exp $
+#
+# This Makefile fragment is included by packages that use bonobo.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.bonobo to the dependency pattern
+#     for the version of bonobo desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(BONOBO_BUILDLINK_MK)
+BONOBO_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.bonobo?=	bonobo>=1.0.9
+DEPENDS+=	${BUILDLINK_DEPENDS.bonobo}:../../devel/bonobo
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.bonobo=bonobo
+BUILDLINK_PREFIX.bonobo_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.bonobo=		include/bonobo.h
+BUILDLINK_FILES.bonobo=		include/efs*
+BUILDLINK_FILES.bonobo+=	include/gnome-1.0/bonobo/*
+BUILDLINK_FILES.bonobo+=	lib/bonobo/*/*
+BUILDLINK_FILES.bonobo+=	lib/libbonobo.*
+BUILDLINK_FILES.bonobo+=	lib/libbonobo-print.*
+BUILDLINK_FILES.bonobo+=	lib/libefs.*
+
+BUILDLINK_CPPFLAGS+=		-I${BUILDLINK_DIR}/include/gnome-1.0
+
+BUILDLINK_CONFIG_WRAPPER_SED+=	\
+	-e "s|-I${BUILDLINK_PREFIX.bonobo}/\(include/gnome-1.0\)|-I${BUILDLINK_DIR}/\1|g"
+
+.include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
+.include "../../print/gnome-print/buildlink.mk"
+.include "../../devel/popt/buildlink.mk"
+.include "../../devel/oaf/buildlink.mk"
+
+BUILDLINK_TARGETS.bonobo=	bonobo-buildlink
+BUILDLINK_TARGETS.bonobo+=	bonobo-buildlink-config-wrapper
+BUILDLINK_TARGETS.bonobo+=	libefs-buildlink-config-wrapper
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.bonobo}
+
+BUILDLINK_CONFIG.bonobo=		${BUILDLINK_PREFIX.bonobo}/lib/bonoboConf.sh
+BUILDLINK_CONFIG_WRAPPER.bonobo=	${BUILDLINK_DIR}/lib/bonoboConf.s
+BUILDLINK_CONFIG.libefs=		${BUILDLINK_PREFIX.bonobo}/bin/libefs-config
+BUILDLINK_CONFIG_WRAPPER.libefs=	${BUILDLINK_DIR}/bin/libefs-config
+
+.if defined(USE_CONFIG_WRAPPER)
+BONOBO_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.bonobo}
+LIBEFS_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libefs}
+CONFIGURE_ENV+=		BONOBO_CONFIG="${BONOBO_CONFIG}"
+CONFIGURE_ENV+=		LIBEFS_CONFIG="${LIBEFS_CONFIG}"
+MAKE_ENV+=		BONOBO_CONFIG="${BONOBO_CONFIG}"
+MAKE_ENV+=		LIBEFS_CONFIG="${LIBEFS_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.bonobo}
+bonobo-buildlink: _BUILDLINK_USE
+bonobo-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+libefs-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# BONOBO_BUILDLINK_MK
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 7db3d62a51e..9f3c08b3ac7 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2001/08/11 18:26:56 rh Exp $
+$NetBSD: distinfo,v 1.7 2001/10/04 19:14:58 rh Exp $
 
-SHA1 (bonobo-1.0.7.tar.gz) = aaecf84d58fc16f3059f90164c3f8295726d0ee5
-Size (bonobo-1.0.7.tar.gz) = 1544408 bytes
+SHA1 (bonobo-1.0.9.tar.gz) = 236fcb3b37932637870a41523b354735d35bb3d9
+Size (bonobo-1.0.9.tar.gz) = 1266185 bytes
 SHA1 (patch-aa) = abb08c79e9971e755f4fef72bce46a88e9299397
 SHA1 (patch-ab) = dcb60df7c4eed7efbf8086135a9f1e6fdecc1d36
diff --git a/devel/bonobo/pkg/PLIST b/devel/bonobo/pkg/PLIST
index 374b8f9cb58..4f79debf6d0 100644
--- a/devel/bonobo/pkg/PLIST
+++ b/devel/bonobo/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2001/04/14 14:16:55 rh Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/10/04 19:14:59 rh Exp $
 bin/bonobo-application-x-mines
 bin/bonobo-audio-ulaw
 bin/bonobo-echo
@@ -18,101 +18,101 @@ bin/moniker-test
 bin/sample-container
 bin/sample-control-container
 include/bonobo.h
-include/bonobo/Bonobo.h
-include/bonobo/bonobo-arg.h
-include/bonobo/bonobo-async.h
-include/bonobo/bonobo-canvas-component.h
-include/bonobo/bonobo-canvas-item.h
-include/bonobo/bonobo-client-site.h
-include/bonobo/bonobo-context.h
-include/bonobo/bonobo-control-frame.h
-include/bonobo/bonobo-control.h
-include/bonobo/bonobo-desktop-window.h
-include/bonobo/bonobo-embeddable.h
-include/bonobo/bonobo-event-source.h
-include/bonobo/bonobo-exception.h
-include/bonobo/bonobo-generic-factory.h
-include/bonobo/bonobo-item-container.h
-include/bonobo/bonobo-item-handler.h
-include/bonobo/bonobo-listener.h
-include/bonobo/bonobo-main.h
-include/bonobo/bonobo-moniker-extender.h
-include/bonobo/bonobo-moniker-simple.h
-include/bonobo/bonobo-moniker-util.h
-include/bonobo/bonobo-moniker.h
-include/bonobo/bonobo-object-client.h
-include/bonobo/bonobo-object-directory.h
-include/bonobo/bonobo-object-io.h
-include/bonobo/bonobo-object.h
-include/bonobo/bonobo-persist-file.h
-include/bonobo/bonobo-persist-stream.h
-include/bonobo/bonobo-persist.h
-include/bonobo/bonobo-plug.h
-include/bonobo/bonobo-print-client.h
-include/bonobo/bonobo-print.h
-include/bonobo/bonobo-progressive.h
-include/bonobo/bonobo-property-bag-client.h
-include/bonobo/bonobo-property-bag.h
-include/bonobo/bonobo-property-bag-xml.h
-include/bonobo/bonobo-property-control.h
-include/bonobo/bonobo-property.h
-include/bonobo/bonobo-selector.h
-include/bonobo/bonobo-selector-widget.h
-include/bonobo/bonobo-socket.h
-include/bonobo/bonobo-shlib-factory.h
-include/bonobo/bonobo-storage.h
-include/bonobo/bonobo-storage-plugin.h
-include/bonobo/bonobo-stream-client.h
-include/bonobo/bonobo-stream-memory.h
-include/bonobo/bonobo-stream.h
-include/bonobo/bonobo-transient.h
-include/bonobo/bonobo-ui-component.h
-include/bonobo/bonobo-ui-config-widget.h
-include/bonobo/bonobo-ui-container.h
-include/bonobo/bonobo-ui-engine.h
-include/bonobo/bonobo-ui-node.h
-include/bonobo/bonobo-ui-sync.h
-include/bonobo/bonobo-ui-toolbar-button-item.h
-include/bonobo/bonobo-ui-toolbar-icon.h
-include/bonobo/bonobo-ui-toolbar-item.h
-include/bonobo/bonobo-ui-toolbar-toggle-button-item.h
-include/bonobo/bonobo-ui-util.h
-include/bonobo/bonobo-view-frame.h
-include/bonobo/bonobo-view.h
-include/bonobo/bonobo-widget.h
-include/bonobo/bonobo-win.h
-include/bonobo/bonobo-wrapper.h
-include/bonobo/bonobo-xobject.h
-include/bonobo/bonobo-zoomable-frame.h
-include/bonobo/bonobo-zoomable.h
 include/efs.h
 include/efs_error.h
-lib/bonoboConf.sh
-lib/bonoboxConf.sh
-lib/bonobox_printConf.sh
-lib/bonobo/plugin/libstorage_efs.la
+include/gnome-1.0/bonobo/Bonobo.h
+include/gnome-1.0/bonobo/bonobo-arg.h
+include/gnome-1.0/bonobo/bonobo-async.h
+include/gnome-1.0/bonobo/bonobo-canvas-component.h
+include/gnome-1.0/bonobo/bonobo-canvas-item.h
+include/gnome-1.0/bonobo/bonobo-client-site.h
+include/gnome-1.0/bonobo/bonobo-context.h
+include/gnome-1.0/bonobo/bonobo-control-frame.h
+include/gnome-1.0/bonobo/bonobo-control.h
+include/gnome-1.0/bonobo/bonobo-desktop-window.h
+include/gnome-1.0/bonobo/bonobo-embeddable.h
+include/gnome-1.0/bonobo/bonobo-event-source.h
+include/gnome-1.0/bonobo/bonobo-exception.h
+include/gnome-1.0/bonobo/bonobo-generic-factory.h
+include/gnome-1.0/bonobo/bonobo-item-container.h
+include/gnome-1.0/bonobo/bonobo-item-handler.h
+include/gnome-1.0/bonobo/bonobo-listener.h
+include/gnome-1.0/bonobo/bonobo-main.h
+include/gnome-1.0/bonobo/bonobo-moniker-extender.h
+include/gnome-1.0/bonobo/bonobo-moniker-simple.h
+include/gnome-1.0/bonobo/bonobo-moniker-util.h
+include/gnome-1.0/bonobo/bonobo-moniker.h
+include/gnome-1.0/bonobo/bonobo-object-client.h
+include/gnome-1.0/bonobo/bonobo-object-directory.h
+include/gnome-1.0/bonobo/bonobo-object-io.h
+include/gnome-1.0/bonobo/bonobo-object.h
+include/gnome-1.0/bonobo/bonobo-persist-file.h
+include/gnome-1.0/bonobo/bonobo-persist-stream.h
+include/gnome-1.0/bonobo/bonobo-persist.h
+include/gnome-1.0/bonobo/bonobo-plug.h
+include/gnome-1.0/bonobo/bonobo-print-client.h
+include/gnome-1.0/bonobo/bonobo-print.h
+include/gnome-1.0/bonobo/bonobo-progressive.h
+include/gnome-1.0/bonobo/bonobo-property-bag-client.h
+include/gnome-1.0/bonobo/bonobo-property-bag-xml.h
+include/gnome-1.0/bonobo/bonobo-property-bag.h
+include/gnome-1.0/bonobo/bonobo-property-control.h
+include/gnome-1.0/bonobo/bonobo-property.h
+include/gnome-1.0/bonobo/bonobo-selector-widget.h
+include/gnome-1.0/bonobo/bonobo-selector.h
+include/gnome-1.0/bonobo/bonobo-shlib-factory.h
+include/gnome-1.0/bonobo/bonobo-socket.h
+include/gnome-1.0/bonobo/bonobo-storage-plugin.h
+include/gnome-1.0/bonobo/bonobo-storage.h
+include/gnome-1.0/bonobo/bonobo-stream-client.h
+include/gnome-1.0/bonobo/bonobo-stream-memory.h
+include/gnome-1.0/bonobo/bonobo-stream.h
+include/gnome-1.0/bonobo/bonobo-transient.h
+include/gnome-1.0/bonobo/bonobo-ui-component.h
+include/gnome-1.0/bonobo/bonobo-ui-config-widget.h
+include/gnome-1.0/bonobo/bonobo-ui-container.h
+include/gnome-1.0/bonobo/bonobo-ui-engine.h
+include/gnome-1.0/bonobo/bonobo-ui-node.h
+include/gnome-1.0/bonobo/bonobo-ui-sync.h
+include/gnome-1.0/bonobo/bonobo-ui-toolbar-button-item.h
+include/gnome-1.0/bonobo/bonobo-ui-toolbar-icon.h
+include/gnome-1.0/bonobo/bonobo-ui-toolbar-item.h
+include/gnome-1.0/bonobo/bonobo-ui-toolbar-toggle-button-item.h
+include/gnome-1.0/bonobo/bonobo-ui-util.h
+include/gnome-1.0/bonobo/bonobo-view-frame.h
+include/gnome-1.0/bonobo/bonobo-view.h
+include/gnome-1.0/bonobo/bonobo-widget.h
+include/gnome-1.0/bonobo/bonobo-win.h
+include/gnome-1.0/bonobo/bonobo-wrapper.h
+include/gnome-1.0/bonobo/bonobo-xobject.h
+include/gnome-1.0/bonobo/bonobo-zoomable-frame.h
+include/gnome-1.0/bonobo/bonobo-zoomable.h
+lib/bonobo/monikers/libmoniker_std.a
+lib/bonobo/monikers/libmoniker_std.la
+lib/bonobo/monikers/libmoniker_std.so
+lib/bonobo/monikers/libmoniker_std.so.0
+lib/bonobo/monikers/libmoniker_std.so.0.0
 lib/bonobo/plugin/libstorage_efs.a
+lib/bonobo/plugin/libstorage_efs.la
 lib/bonobo/plugin/libstorage_efs.so
-lib/bonobo/plugin/libstorage_fs.la
 lib/bonobo/plugin/libstorage_fs.a
+lib/bonobo/plugin/libstorage_fs.la
 lib/bonobo/plugin/libstorage_fs.so
-lib/bonobo/monikers/libmoniker_std.a
-lib/bonobo/monikers/libmoniker_std.la
-lib/bonobo/monikers/libmoniker_std.so.0.0
-lib/bonobo/monikers/libmoniker_std.so.0
-lib/bonobo/monikers/libmoniker_std.so
-lib/libbonobo-print.la
+lib/bonoboConf.sh
+lib/bonoboxConf.sh
+lib/bonobox_printConf.sh
 lib/libbonobo-print.a
+lib/libbonobo-print.la
 lib/libbonobo-print.so
 lib/libbonobo-print.so.2
 lib/libbonobo-print.so.2.0
-lib/libbonobo.la
 lib/libbonobo.a
+lib/libbonobo.la
 lib/libbonobo.so
 lib/libbonobo.so.2
 lib/libbonobo.so.2.0
-lib/libbonobox.la
 lib/libbonobox.a
+lib/libbonobox.la
 lib/libbonobox.so
 lib/libbonobox.so.2
 lib/libbonobox.so.2.0
@@ -122,110 +122,13 @@ lib/libefs.so
 lib/libefs.so.1
 lib/libefs.so.1.0
 lib/pkgconfig/libefs.pc
-share/bonobo/html/bonobo-api.html
 share/bonobo/html/bonobo-api.sgml
 share/bonobo/html/bonobo-decl.txt
 share/bonobo/html/bonobo-sections.txt
 share/bonobo/html/bonobo.hierarchy
 share/bonobo/html/bonobo.signals
 share/bonobo/html/bonobo.types
-share/bonobo/html/bonobo/bonobo-bonobo-arg.html
-share/bonobo/html/bonobo/bonobo-bonobo-async.html
-share/bonobo/html/bonobo/bonobo-bonobo-canvas-component.html
-share/bonobo/html/bonobo/bonobo-bonobo-canvas-item.html
-share/bonobo/html/bonobo/bonobo-bonobo-client-site.html
-share/bonobo/html/bonobo/bonobo-bonobo-component-io.html
-share/bonobo/html/bonobo/bonobo-bonobo-context.html
-share/bonobo/html/bonobo/bonobo-bonobo-control-frame.html
-share/bonobo/html/bonobo/bonobo-bonobo-control.html
-share/bonobo/html/bonobo/bonobo-bonobo-desktop-window.html
-share/bonobo/html/bonobo/bonobo-bonobo-embeddable.html
-share/bonobo/html/bonobo/bonobo-bonobo-event-source.html
-share/bonobo/html/bonobo/bonobo-bonobo-exception.html
-share/bonobo/html/bonobo/bonobo-bonobo-generic-factory.html
-share/bonobo/html/bonobo/bonobo-bonobo-item-container.html
-share/bonobo/html/bonobo/bonobo-bonobo-item-handler.html
-share/bonobo/html/bonobo/bonobo-bonobo-listener.html
-share/bonobo/html/bonobo/bonobo-bonobo-main.html
-share/bonobo/html/bonobo/bonobo-bonobo-moniker-extender.html
-share/bonobo/html/bonobo/bonobo-bonobo-moniker-simple.html
-share/bonobo/html/bonobo/bonobo-bonobo-moniker-util.html
-share/bonobo/html/bonobo/bonobo-bonobo-moniker.html
-share/bonobo/html/bonobo/bonobo-bonobo-object-client.html
-share/bonobo/html/bonobo/bonobo-bonobo-object-directory.html
-share/bonobo/html/bonobo/bonobo-bonobo-object-io.html
-share/bonobo/html/bonobo/bonobo-bonobo-object.html
-share/bonobo/html/bonobo/bonobo-bonobo-persist-file.html
-share/bonobo/html/bonobo/bonobo-bonobo-persist-stream.html
-share/bonobo/html/bonobo/bonobo-bonobo-persist.html
-share/bonobo/html/bonobo/bonobo-bonobo-plug.html
-share/bonobo/html/bonobo/bonobo-bonobo-print-client.html
-share/bonobo/html/bonobo/bonobo-bonobo-print.html
-share/bonobo/html/bonobo/bonobo-bonobo-progressive.html
-share/bonobo/html/bonobo/bonobo-bonobo-property-bag-client.html
-share/bonobo/html/bonobo/bonobo-bonobo-property-bag-xml.html
-share/bonobo/html/bonobo/bonobo-bonobo-property-bag.html
-share/bonobo/html/bonobo/bonobo-bonobo-property-control.html
-share/bonobo/html/bonobo/bonobo-bonobo-property.html
-share/bonobo/html/bonobo/bonobo-bonobo-selector.html
-share/bonobo/html/bonobo/bonobo-bonobo-socket.html
-share/bonobo/html/bonobo/bonobo-bonobo-storage-plugin.html
-share/bonobo/html/bonobo/bonobo-bonobo-storage.html
-share/bonobo/html/bonobo/bonobo-bonobo-stream-client.html
-share/bonobo/html/bonobo/bonobo-bonobo-stream-memory.html
-share/bonobo/html/bonobo/bonobo-bonobo-stream.html
-share/bonobo/html/bonobo/bonobo-bonobo-transient.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-component.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-container.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-engine.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-node.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-sync.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-button-item.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-icon.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-item.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-toggle-button-item.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-util.html
-share/bonobo/html/bonobo/bonobo-bonobo-ui-xml.html
-share/bonobo/html/bonobo/bonobo-bonobo-view-frame.html
-share/bonobo/html/bonobo/bonobo-bonobo-view.html
-share/bonobo/html/bonobo/bonobo-bonobo-widget.html
-share/bonobo/html/bonobo/bonobo-bonobo-win.html
-share/bonobo/html/bonobo/bonobo-bonobo-wrapper.html
-share/bonobo/html/bonobo/bonobo-bonobo-xobject.html
-share/bonobo/html/bonobo/bonobo-bonobo-zoomable-frame.html
-share/bonobo/html/bonobo/bonobo-bonobo-zoomable.html
-share/bonobo/html/bonobo/bonobo-controls.html
-share/bonobo/html/bonobo/bonobo-core.html
-share/bonobo/html/bonobo/bonobo-documents-widgets.html
-share/bonobo/html/bonobo/bonobo-documents.html
-share/bonobo/html/bonobo/bonobo-moniker-handlers.html
-share/bonobo/html/bonobo/bonobo-notification.html
-share/bonobo/html/bonobo/bonobo-object-activation.html
-share/bonobo/html/bonobo/bonobo-print.html
-share/bonobo/html/bonobo/bonobo-properties.html
-share/bonobo/html/bonobo/bonobo-storage.html
-share/bonobo/html/bonobo/bonobo-support-utilities.html
-share/bonobo/html/bonobo/bonobo-ugly.html
-share/bonobo/html/bonobo/bonobo-ui.html
-share/bonobo/html/bonobo/bonobo-useful-widgets.html
-share/bonobo/html/bonobo/bonobo-view.html
-share/bonobo/html/bonobo/book1.html
-share/bonobo/html/bonobo/misc-ugly.html
-share/bonobo/html/bonobo/x10104.html
-share/bonobo/html/bonobo/x10146.html
-share/bonobo/html/bonobo/x10147.html
-share/bonobo/html/bonobo/x10189.html
-share/bonobo/html/bonobo/x10996.html
-share/bonobo/html/bonobo/x11010.html
-share/bonobo/html/bonobo/x11207.html
-share/bonobo/html/bonobo/x11335.html
-share/bonobo/html/bonobo/x11349.html
-share/bonobo/html/bonobo/x11351.html
-share/bonobo/html/bonobo/x11391.html
-share/bonobo/html/bonobo/x11418.html
-share/bonobo/html/bonobo/x11419.html
-share/bonobo/html/bonobo/x11421.html
-share/bonobo/html/bonobo/x11462.html
+share/gnome/bonobo/docs/audio_ulaw/C/index.html
 share/gnome/ui/gshell-ui.xml
 share/idl/Bonobo.idl
 share/idl/Bonobo_Advise.idl
@@ -276,7 +179,8 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bonobo.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/bonobo.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/bonobo.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/bonobo.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/bonobo.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/bonobo.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/bonobo.mo
 share/oaf/Bonobo_Moniker_gzip.oaf
 share/oaf/Bonobo_Moniker_http.oaf
 share/oaf/Bonobo_Moniker_std.oaf
@@ -289,18 +193,18 @@ share/oaf/Bonobo_Sample_Mines.oaf
 share/oaf/Bonobo_Sample_Paint.oaf
 share/oaf/Bonobo_Sample_Text.oaf
 share/oaf/Bonobo_Selector.oaf
-@exec mkdir -p %D/share/gnome/bonobo/docs/audio_ulaw/C/images
-@dirrm include/bonobo
-@dirrm share/bonobo/html/bonobo
-@dirrm share/bonobo/html
-@dirrm share/bonobo
+@exec /bin/mkdir -p /usr/X11R6/share/gnome/bonobo/docs/audio_ulaw/C/images
 @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/ui
-@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
-@dirrm lib/bonobo/monikers
+@exec /bin/mkdir -p /usr/X11R6/share/bonobo/html/bonobo
+@dirrm share/bonobo/html/bonobo
+@dirrm share/bonobo/html
+@dirrm share/bonobo
 @dirrm lib/bonobo/plugin
+@dirrm lib/bonobo/monikers
 @dirrm lib/bonobo
+@dirrm include/gnome-1.0/bonobo
+@dirrm include/gnome-1.0