Update to 2.4.1, based on work done by xtraeme@ and Min Sik Kim.

Change log lists changes for the development branch (2.3); since then,
there have been several bugfixes.

libbonoboui 2.3.6

	* bugs fixed
		+ F1 help menu shortcut (Yuedong Du)
		+ vicious K/B focus fixage (Federico)
		+ dock grip fix (Padraig O'Briain)
		+ doc. fix (Michael)

libbonoboui 2.3.3

	* bugs fixed
		+ multi-head issues (Morten Welinder, Michael)
		+ nasty focus hacks binned (Michael)
		+ UI preferences fixes (Anders Carlsson)
		+ toolbar layout fix (Gustavo Giraldez)
		+ UI re-enterancy fix (Radek Doulik)
		+ Tooltip fixes (Dave Camp)
		+ build fixage (Hidetoshi Tajima, Masahiro Sakai,
		  Malcolm Tredinnick, Padraig O'Briain, Alex Duggan)
	* featurelets
		+ new sample container (Sergey Oudaltsov)
		+ nicer toolbar rendering (Rodney Dawes)
		+ cygwin port (Masahiro Sakai)
		+ toolbar widget direction (Jody Goldberg)
		+ working canvas components (Bob Gibbs)
		+ more documentation (Gustavo Carneiro)
	* translations
		+ kn, id, mn, yi (Christian Rose)
		+ ro (Marius Andreiana)
		+ fa (Roozbeh Pournader)
		+ ml (Guntupalli Karunakar)
		+ sr (Danilo Šegan)
		+ cy (Telsa Gwynne et. al)

4 files changed, 20 insertions, 14 deletions

diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 77a01272f09..aa2d49b6de9 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/12/13 00:45:22 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/14 19:49:24 jmmv Exp $
 #
 
-DISTNAME=	libbonoboui-2.2.4
-PKGREVISION=	3
+DISTNAME=	libbonoboui-2.4.1
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libbonoboui/2.2/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libbonoboui/2.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -32,6 +31,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libgnome/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../graphics/libart2/buildlink2.mk"
 .include "../../graphics/libgnomecanvas/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
diff --git a/devel/libbonoboui/PLIST b/devel/libbonoboui/PLIST
index 287fa21a53c..627f0814bdd 100644
--- a/devel/libbonoboui/PLIST
+++ b/devel/libbonoboui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/07/30 21:29:11 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/12/14 19:49:24 jmmv Exp $
 bin/test-moniker
 include/libbonoboui-2.0/bonobo.h
 include/libbonoboui-2.0/bonobo/bonobo-canvas-component.h
@@ -35,6 +35,7 @@ include/libbonoboui-2.0/bonobo/bonobo-zoomable.h
 include/libbonoboui-2.0/libbonoboui.h
 lib/bonobo-2.0/samples/bonobo-sample-controls-2
 lib/bonobo/servers/Bonobo_Sample_Controls.server
+lib/bonobo/servers/CanvDemo.server
 lib/libbonoboui-2.a
 lib/libbonoboui-2.la
 lib/libbonoboui-2.so
@@ -78,12 +79,14 @@ share/doc/html/libbonoboui/libbonoboui-faq.html
 share/doc/html/libbonoboui/libbonoboui.devhelp
 share/doc/html/libbonoboui/right.png
 share/doc/html/libbonoboui/up.png
+share/gnome-2.0/ui/Bonobo_Sample_Container-ui.xml
 share/gnome-2.0/ui/Bonobo_Sample_Hello.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/bn/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/cy/LC_MESSAGES/libbonoboui-2.0.mo
@@ -98,14 +101,19 @@ ${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/id/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/li/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/ne/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
@@ -116,6 +124,7 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libbonoboui-2.0.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libbonoboui-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libbonoboui-2.0.mo
@@ -128,10 +137,9 @@ ${PKGLOCALEDIR}/locale/yi/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
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
-@comment in gnome2-dirs: @dirrm share/gnome-2.0
 @dirrm share/doc/html/libbonoboui
 @comment in libglade2: @dirrm lib/libglade/2.0
-@comment in bonobo-activation: @dirrm lib/bonobo/servers
+@comment in libbonobo: @dirrm lib/bonobo/servers
 @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 69bab0aba1d..88b26857844 100644
--- a/devel/libbonoboui/buildlink2.mk
+++ b/devel/libbonoboui/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/12/13 00:45:22 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/12/14 19:49:24 jmmv Exp $
 
 .if !defined(LIBBONOBOUI_BUILDLINK2_MK)
 LIBBONOBOUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libbonoboui
-BUILDLINK_DEPENDS.libbonoboui?=	libbonoboui>=2.2.4nb3
+BUILDLINK_DEPENDS.libbonoboui?=	libbonoboui>=2.4.1
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libbonoboui=libbonoboui
@@ -13,9 +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"
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/libglade2/buildlink2.mk"
diff --git a/devel/libbonoboui/distinfo b/devel/libbonoboui/distinfo
index 016aa490c35..d0358fc65c5 100644
--- a/devel/libbonoboui/distinfo
+++ b/devel/libbonoboui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/08/05 23:48:30 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2003/12/14 19:49:24 jmmv Exp $
 
-SHA1 (libbonoboui-2.2.4.tar.bz2) = eaa1baf853fd8b5b16a6db7ab86a73b0da745bac
-Size (libbonoboui-2.2.4.tar.bz2) = 755007 bytes
+SHA1 (libbonoboui-2.4.1.tar.bz2) = 0cb6d763d59298af6252b89a4bdc749ba2debd44
+Size (libbonoboui-2.4.1.tar.bz2) = 883338 bytes