update to 2.24.0

This switches to the gnome-2.24 release branch.

4 files changed, 18 insertions, 14 deletions

diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 92d3b465a72..44af06d2b98 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2008/04/30 13:38:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.59 2008/10/16 12:32:29 drochner Exp $
 
-DISTNAME=		libbonobo-2.22.0
+DISTNAME=		libbonobo-2.24.0
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libbonobo/2.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -39,5 +39,7 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libbonobo/PLIST b/devel/libbonobo/PLIST
index acc9d287b61..560a364a88f 100644
--- a/devel/libbonobo/PLIST
+++ b/devel/libbonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2008/04/10 16:22:13 drochner Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/10/16 12:32:29 drochner Exp $
 bin/activation-client
 bin/bonobo-activation-run-query
 bin/bonobo-slay
@@ -222,6 +222,7 @@ share/locale/ku/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/li/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/lt/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/mai/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/mg/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo
@@ -245,9 +246,10 @@ share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sq/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sr/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/te/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/th/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 1517d3110eb..254f37b5e5c 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2008/04/10 16:22:13 drochner Exp $
+$NetBSD: distinfo,v 1.27 2008/10/16 12:32:29 drochner Exp $
 
-SHA1 (libbonobo-2.22.0.tar.bz2) = 517e8f1ca24cea4ce77cdb1d7485c61da3096be2
-RMD160 (libbonobo-2.22.0.tar.bz2) = ad22f56ec15e663010721eab5f346421dba39863
-Size (libbonobo-2.22.0.tar.bz2) = 1445318 bytes
-SHA1 (patch-aa) = 53de5576ab4191c79148fa7f6da16fb335944c6c
+SHA1 (libbonobo-2.24.0.tar.bz2) = bd5f9e1eda3107fed86baad8a3501fa8d12b9b51
+RMD160 (libbonobo-2.24.0.tar.bz2) = 244d93c8904e8ee04a76a5426849bedac0732950
+Size (libbonobo-2.24.0.tar.bz2) = 1455370 bytes
+SHA1 (patch-aa) = 1144bc79aef6990ba15c565a01438dd41d1a085a
 SHA1 (patch-ab) = 320fc0a2be131a0ab6b200643fb733f80899a005
 SHA1 (patch-ac) = f75c4e5c12e3ae912ffa10dd06a43f2c0ab71718
diff --git a/devel/libbonobo/patches/patch-aa b/devel/libbonobo/patches/patch-aa
index c9ee3c5dccc..79180b64633 100644
--- a/devel/libbonobo/patches/patch-aa
+++ b/devel/libbonobo/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2008/01/06 15:57:47 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2008/10/16 12:32:29 drochner Exp $
 
---- Makefile.in.orig	2007-12-22 21:45:16.000000000 +0100
+--- Makefile.in.orig	2008-09-22 16:34:07.000000000 +0200
 +++ Makefile.in
-@@ -263,7 +263,7 @@ psdir = @psdir@
+@@ -264,7 +264,7 @@ psdir = @psdir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
 -sysconfdir = @sysconfdir@
 +sysconfdir = @datadir@/examples
  target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@