Changes 1.0.22:

* Bugs fixed
+ toolbar leak fix backport (Michael Meeks)

Changes 1.0.21:
* Bugs fixed
+ several leak fixes (Jeff Steadfast)
+ build fixes (David, Michael)
+ fix property_bag_add return value (David)
+ avoid moniker qI exception crash (Larry)

Changes 1.0.20:
* Bugs fixed
+ uninit. return in Control (Michael)
+ moniker_std LIBADD (Michael)
+ -module flag (Dan Winship)
+ paranoid preconditions (Michael)
+ UIEngine efficiency fixes (Michael)
+ cleaned up automake bits (Enrico Scholz)
+ object-io fix (Hans Petter Jansson)
+ kill misc. GNUisms (Michael)
+ make test-any cleaner (Michael)
+ exception portability fixes (Jacob Berkman)
+ factory macro exit fix (Frederic Crozat)

Changes 1.0.19:
* Bugs fixed (Me)
+ sensitivity update bug
+ set_prop ownership bug
+ double free segv in text-plain

4 files changed, 88 insertions, 23 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 00063fca01e..cdaf3c9b3c7 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,25 +1,24 @@
-# $NetBSD: Makefile,v 1.47 2004/11/20 22:10:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.48 2005/01/20 11:48:17 adam Exp $
 
-DISTNAME=		bonobo-1.0.18
-PKGREVISION=		9
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/bonobo/1.0/}
+DISTNAME=	bonobo-1.0.22
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/bonobo/1.0/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		Architecture for creating reusable software components
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://www.gnome.org/
+COMMENT=	Architecture for creating reusable software components
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 BUILDLINK_DEPENDS.libxml=	libxml>1.8.15
 
-USE_BUILDLINK3=		YES
-USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
-USE_LIBTOOL=		YES
+USE_BUILDLINK3=		yes
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_X11BASE=		yes
 USE_GNU_TOOLS+=		make
-
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=		X11BASE="${X11BASE}"
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
diff --git a/devel/bonobo/PLIST b/devel/bonobo/PLIST
index 7080746d692..9bc5a0abf1b 100644
--- a/devel/bonobo/PLIST
+++ b/devel/bonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/11/09 09:13:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/01/20 11:48:17 adam Exp $
 bin/bonobo-application-x-mines
 bin/bonobo-audio-ulaw
 bin/bonobo-echo
@@ -98,12 +98,78 @@ lib/libbonobo.la
 lib/libbonobox.la
 lib/libefs.la
 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-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-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.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-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-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-util.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-controls.html
+share/bonobo/html/bonobo/bonobo-core.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-ui.html
+share/bonobo/html/bonobo/bonobo-view.html
+share/bonobo/html/bonobo/book1.html
 share/gnome/bonobo/docs/audio_ulaw/C/index.html
 share/gnome/ui/gshell-ui.xml
 share/idl/Bonobo.idl
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 8074b83be79..4fba59e4335 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2002/12/26 17:19:25 jlam Exp $
+$NetBSD: distinfo,v 1.15 2005/01/20 11:48:17 adam Exp $
 
-SHA1 (bonobo-1.0.18.tar.gz) = e6f6790e0c0eb29a295163f643569e36896d27a0
-Size (bonobo-1.0.18.tar.gz) = 1279988 bytes
-SHA1 (patch-aa) = abb08c79e9971e755f4fef72bce46a88e9299397
+SHA1 (bonobo-1.0.22.tar.bz2) = 3ec89cc469adf482459e15f37a4008a0d0340c1a
+Size (bonobo-1.0.22.tar.bz2) = 1186349 bytes
+SHA1 (patch-aa) = 03a65d084f79d310d95a1c122c4e2b1e90acc682
diff --git a/devel/bonobo/patches/patch-aa b/devel/bonobo/patches/patch-aa
index 300cfd54ef8..8f7d0ae2143 100644
--- a/devel/bonobo/patches/patch-aa
+++ b/devel/bonobo/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2000/07/16 19:50:13 rh Exp $
+$NetBSD: patch-aa,v 1.4 2005/01/20 11:48:17 adam Exp $
 
---- doc/api/Makefile.in.orig	Sat Jul 15 16:23:34 2000
-+++ doc/api/Makefile.in	Sat Jul 15 16:23:52 2000
-@@ -326,8 +326,6 @@
+--- doc/api/Makefile.in.orig	2002-12-01 02:33:12.000000000 +0000
++++ doc/api/Makefile.in
+@@ -465,8 +465,6 @@ install-data-local:
  	    echo '-- Installing '$$i ; \
  	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
  	  done; \