update to 2.20.1.1

This switches to the new gnome-2.20 branch.

10 files changed, 44 insertions, 32 deletions

diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index d3cd6dc5a87..a9fadd48e43 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.67 2007/09/21 13:03:38 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2007/10/31 20:05:48 drochner Exp $
 #
 
-DISTNAME=	libgnome-2.18.0
-PKGREVISION=	3
+DISTNAME=	libgnome-2.20.1.1
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/devel/libgnome/PLIST b/devel/libgnome/PLIST
index 5e9efe8dda6..887de2422e5 100644
--- a/devel/libgnome/PLIST
+++ b/devel/libgnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2007/09/25 10:54:11 hira Exp $
+@comment $NetBSD: PLIST,v 1.22 2007/10/31 20:05:48 drochner Exp $
 bin/gnome-open
 include/libgnome-2.0/libgnome/gnome-config.h
 include/libgnome-2.0/libgnome/gnome-exec.h
@@ -39,6 +39,7 @@ share/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
 share/gconf/schemas/desktop_gnome_sound.schemas
 share/gconf/schemas/desktop_gnome_thumbnailers.schemas
 share/gconf/schemas/desktop_gnome_typing_break.schemas
+share/gnome-background-properties/gnome-default.xml
 share/gtk-doc/html/libgnome/ch01.html
 share/gtk-doc/html/libgnome/ch02.html
 share/gtk-doc/html/libgnome/ch03.html
@@ -80,6 +81,7 @@ share/gtk-doc/html/libgnome/style.css
 share/gtk-doc/html/libgnome/up.png
 share/locale/am/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
+share/locale/as/LC_MESSAGES/libgnome-2.0.mo
 share/locale/az/LC_MESSAGES/libgnome-2.0.mo
 share/locale/be/LC_MESSAGES/libgnome-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnome-2.0.mo
@@ -118,6 +120,7 @@ share/locale/ko/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ku/LC_MESSAGES/libgnome-2.0.mo
 share/locale/lt/LC_MESSAGES/libgnome-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnome-2.0.mo
+share/locale/mg/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnome-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnome-2.0.mo
@@ -126,6 +129,7 @@ share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnome-2.0.mo
 share/locale/or/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
@@ -153,6 +157,7 @@ share/locale/yi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
+share/pixmaps/backgrounds/gnome/background-default.jpg
 @dirrm share/gtk-doc/html/libgnome
 @comment in GConf: @dirrm share/gconf/schemas
 @dirrm share/examples/libgnome/sound/events
diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo
index b6ea1387fd4..8aad1c5bdb9 100644
--- a/devel/libgnome/distinfo
+++ b/devel/libgnome/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2007/04/10 18:20:56 drochner Exp $
+$NetBSD: distinfo,v 1.31 2007/10/31 20:05:48 drochner Exp $
 
-SHA1 (libgnome-2.18.0.tar.bz2) = cd5e5fa18ee848aebbf9b323b4663c0d62979c98
-RMD160 (libgnome-2.18.0.tar.bz2) = bffb7058dab94836750b1e085ccbcfae9a212abc
-Size (libgnome-2.18.0.tar.bz2) = 1082802 bytes
+SHA1 (libgnome-2.20.1.1.tar.bz2) = 59c1e8d8f8b50e290eb513eeadd729f271c20d2b
+RMD160 (libgnome-2.20.1.1.tar.bz2) = 616032d4af3c283e37728caeb705424dffbbac19
+Size (libgnome-2.20.1.1.tar.bz2) = 1370144 bytes
 SHA1 (patch-af) = 783e295d1714b7c121538ed7459ffbcf3ff3713a
 SHA1 (patch-ag) = cf65f35eb15371c46e603e804ff4b0b9ef820b5f
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index a34d86a4dfe..c8f1b1c0908 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.72 2007/09/21 13:03:38 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2007/10/31 20:06:34 drochner Exp $
 #
 
-DISTNAME=	libgnomeui-2.18.1
-PKGREVISION=	3
+DISTNAME=	libgnomeui-2.20.1.1
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/devel/libgnomeui/PLIST b/devel/libgnomeui/PLIST
index 7d5530a1d8e..8ecbf49163b 100644
--- a/devel/libgnomeui/PLIST
+++ b/devel/libgnomeui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/10/07 07:39:53 hira Exp $
+@comment $NetBSD: PLIST,v 1.24 2007/10/31 20:06:34 drochner Exp $
 include/libgnomeui-2.0/gnome.h
 include/libgnomeui-2.0/libgnomeui/gnome-about.h
 include/libgnomeui-2.0/libgnomeui/gnome-app-helper.h
@@ -54,7 +54,6 @@ lib/gtk-2.0/2.10.0/filesystems/libgnome-vfs.la
 lib/libglade/2.0/libgnome.la
 lib/libgnomeui-2.la
 lib/pkgconfig/libgnomeui-2.0.pc
-libexec/gnome_segv2
 share/gtk-doc/html/libgnomeui/GnomeAbout.html
 share/gtk-doc/html/libgnomeui/GnomeApp.html
 share/gtk-doc/html/libgnomeui/GnomeAppBar.html
@@ -195,6 +194,7 @@ share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hr/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/hy/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/id/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
@@ -218,6 +218,7 @@ share/locale/ne/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/nso/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/or/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
@@ -226,6 +227,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/rw/LC_MESSAGES/libgnomeui-2.0.mo
+share/locale/si/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo
diff --git a/devel/libgnomeui/distinfo b/devel/libgnomeui/distinfo
index 813b7647a68..704b8ec833b 100644
--- a/devel/libgnomeui/distinfo
+++ b/devel/libgnomeui/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.25 2007/04/10 18:34:11 drochner Exp $
+$NetBSD: distinfo,v 1.26 2007/10/31 20:06:35 drochner Exp $
 
-SHA1 (libgnomeui-2.18.1.tar.bz2) = 20f57e5a73f3d5570d331182dba45ff8943ef659
-RMD160 (libgnomeui-2.18.1.tar.bz2) = e1394f2fa4ba92554b48f5d3a3fd767b60b0c6cd
-Size (libgnomeui-2.18.1.tar.bz2) = 1462027 bytes
-SHA1 (patch-aa) = 49bbfe6367ab002b0e29c0bbd808aab377ff456e
+SHA1 (libgnomeui-2.20.1.1.tar.bz2) = e1704b328de6f6f7130147062b3262b3df77484a
+RMD160 (libgnomeui-2.20.1.1.tar.bz2) = 90caad97c85250435299923c90ffa730dbdfd288
+Size (libgnomeui-2.20.1.1.tar.bz2) = 1445994 bytes
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 7c04f0d3bae..9494da24a4c 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2007/09/21 13:03:51 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2007/10/31 20:07:50 drochner Exp $
 #
 
-DISTNAME=		libgnomecanvas-2.14.0
-PKGREVISION=		3
+DISTNAME=		libgnomecanvas-2.20.1.1
 CATEGORIES=		graphics gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.14/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -15,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		gmake msgfmt pkg-config intltool
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	libgnomecanvas/libgnomecanvas-2.0.pc.in
@@ -23,6 +22,7 @@ PKGCONFIG_OVERRIDE=	libgnomecanvas/libgnomecanvas-2.0.pc.in
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgnomecanvas/PLIST b/graphics/libgnomecanvas/PLIST
index f994618d3d0..88f0cd19812 100644
--- a/graphics/libgnomecanvas/PLIST
+++ b/graphics/libgnomecanvas/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/10/07 07:39:53 hira Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/10/31 20:07:51 drochner Exp $
 include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-bpath.h
 include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h
 include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-line.h
@@ -40,6 +40,7 @@ share/gtk-doc/html/libgnomecanvas/left.png
 share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
 share/gtk-doc/html/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
 share/gtk-doc/html/libgnomecanvas/libgnomecanvas.devhelp
+share/gtk-doc/html/libgnomecanvas/libgnomecanvas.devhelp2
 share/gtk-doc/html/libgnomecanvas/right.png
 share/gtk-doc/html/libgnomecanvas/style.css
 share/gtk-doc/html/libgnomecanvas/up.png
@@ -50,12 +51,14 @@ share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/bn/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/bs/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/dz/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/en_CA/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -77,12 +80,14 @@ share/locale/id/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/is/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/ka/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ku/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/lt/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/mg/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/mn/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -91,7 +96,8 @@ share/locale/nb/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
-share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/oc/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/or/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pa/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -107,6 +113,7 @@ share/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/th/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/tt/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index 76ba80835f4..3ec41768c0e 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:03:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/10/31 20:07:51 drochner Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMECANVAS_BUILDLINK3_MK:=	${LIBGNOMECANVAS_BUILDLINK3_MK}+
@@ -19,6 +19,7 @@ BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/gail/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index e5775349563..ce30c41dd64 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2006/03/30 21:08:46 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2007/10/31 20:07:51 drochner Exp $
 
-SHA1 (libgnomecanvas-2.14.0.tar.bz2) = 9a3fe0cfaa6361f67b3b5ba86324bf8edb8724a0
-RMD160 (libgnomecanvas-2.14.0.tar.bz2) = 5d511f65c8860032e2b88bf11bd997920ba6ba7b
-Size (libgnomecanvas-2.14.0.tar.bz2) = 612330 bytes
+SHA1 (libgnomecanvas-2.20.1.1.tar.bz2) = 302a4762b658244828ad1c9f291ffb972b8274c9
+RMD160 (libgnomecanvas-2.20.1.1.tar.bz2) = fe5333c31f385313b2e90deb9710275d61bbc15b
+Size (libgnomecanvas-2.20.1.1.tar.bz2) = 583565 bytes