Update to 2.2.0. Changes since 2.0.3.3:

* bonobo/bonobo-ui-toolbar.c (accumulate_item_size): split from
  (update_sizes): here and account for the popup's item's size itself if items
  moved there.
* bonobo/bonobo-ui-toolbar.c (show_popup_window): fix #76310, popup going off
  the side of the screen unhelpfully.
* configure.in: Added Amharic (am) and Dutch (nl) to ALL_LINGUAS
* configure.in: add a check for people with stale / non-parallel installable
  gdk-pixbuf's - it seems there are a number of such people.
* Fix Makefile.am's for libtool's non-understanding of -pthread.
* bonobo/bonobo-ui-util.c (bonobo_help_display_cb): re-hash so we can still
  allow components to register their own custom prefix intead of using the
  main program's always.
* bonobo/bonobo-ui-util.c (bonobo_help_display_cb): fix search datadir to use
  existing GnomeProgram if available.

4 files changed, 17 insertions, 11 deletions

diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 449673a6892..bae4bacad97 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/01/04 11:08:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/02/14 20:13:21 jmmv Exp $
 #
 
-DISTNAME=	libbonoboui-2.0.3.3
+DISTNAME=	libbonoboui-2.2.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libbonoboui/2.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libbonoboui/2.2/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@netbsd.org
diff --git a/devel/libbonoboui/PLIST b/devel/libbonoboui/PLIST
index 0f1e69b1f2d..24ab58d1b70 100644
--- a/devel/libbonoboui/PLIST
+++ b/devel/libbonoboui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/05 10:35:09 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/02/14 20:13:21 jmmv Exp $
 bin/test-moniker
 include/libbonoboui-2.0/bonobo.h
 include/libbonoboui-2.0/bonobo/bonobo-canvas-component.h
@@ -52,11 +52,13 @@ ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
@@ -64,6 +66,7 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo
@@ -80,8 +83,10 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo
-@unexec ${RMDIR} -p share/gnome-2.0/ui 2>/dev/null || ${TRUE}
+@dirrm share/gnome-2.0/ui
+@dirrm share/gnome-2.0
+@comment in libglade2: @dirrm lib/libglade/2.0
 @comment in bonobo-activation: @dirrm lib/bonobo/servers
-@comment in libbonobo: @dirrm lib/bonobo-2.0/sample
+@comment in libbonobo: @dirrm lib/bonobo-2.0/samples
 @dirrm include/libbonoboui-2.0/bonobo
 @dirrm include/libbonoboui-2.0
diff --git a/devel/libbonoboui/buildlink2.mk b/devel/libbonoboui/buildlink2.mk
index a118cca9655..0e436ad23f0 100644
--- a/devel/libbonoboui/buildlink2.mk
+++ b/devel/libbonoboui/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:09:56 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:13:21 jmmv Exp $
 
 .if !defined(LIBBONOBOUI_BUILDLINK2_MK)
 LIBBONOBOUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libbonoboui
-BUILDLINK_DEPENDS.libbonoboui?=	libbonoboui>=2.0.3.2nb1
+BUILDLINK_DEPENDS.libbonoboui?=	libbonoboui>=2.2.0
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libbonoboui=libbonoboui
@@ -13,6 +13,7 @@ BUILDLINK_FILES.libbonoboui+=	include/libbonoboui-2.0/bonobo/*
 BUILDLINK_FILES.libbonoboui+=	include/libbonoboui-2.0/*
 BUILDLINK_FILES.libbonoboui+=	lib/libbonoboui-2.*
 BUILDLINK_FILES.libbonoboui+=	lib/libglade/2.0/libbonobo.*
+BUILDLINK_FILES.libbonoboui+=	lib/pkgconfig/libbonoboui-2.0.pc
 
 .include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../devel/GConf2/buildlink2.mk"
diff --git a/devel/libbonoboui/distinfo b/devel/libbonoboui/distinfo
index 78a8e3851b2..f0afd209271 100644
--- a/devel/libbonoboui/distinfo
+++ b/devel/libbonoboui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/01/04 11:08:08 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/02/14 20:13:22 jmmv Exp $
 
-SHA1 (libbonoboui-2.0.3.3.tar.bz2) = c5a30a8b10279fbdc3f479c3d82d247afcd952a5
-Size (libbonoboui-2.0.3.3.tar.bz2) = 503322 bytes
+SHA1 (libbonoboui-2.2.0.tar.bz2) = 0774b90dd86b8528ba7793022a93137823e8379d
+Size (libbonoboui-2.2.0.tar.bz2) = 510400 bytes