update to 2.20.0

This switches to the new gnome-2.20 branch.

4 files changed, 27 insertions, 14 deletions

diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 322c7659575..7ed92e99198 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/09/21 13:04:43 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/11/03 17:28:00 drochner Exp $
 #
 
-DISTNAME=	libgnomekbd-2.18.2
-PKGREVISION=	2
+DISTNAME=	libgnomekbd-2.20.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.18/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.20/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/libgnomekbd/PLIST b/x11/libgnomekbd/PLIST
index 3d17b350a15..1a2330b4ecf 100644
--- a/x11/libgnomekbd/PLIST
+++ b/x11/libgnomekbd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2007/09/25 10:54:25 hira Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/11/03 17:28:00 drochner Exp $
 bin/gkbd-indicator-plugins-capplet
 include/libgnomekbd/gkbd-config-registry-client.h
 include/libgnomekbd/gkbd-config-registry.h
@@ -20,28 +20,42 @@ share/libgnomekbd/glade/gkbd-indicator-plugins.glade
 share/locale/ar/LC_MESSAGES/libgnomekbd.mo
 share/locale/be@latin/LC_MESSAGES/libgnomekbd.mo
 share/locale/bg/LC_MESSAGES/libgnomekbd.mo
+share/locale/bn_IN/LC_MESSAGES/libgnomekbd.mo
 share/locale/ca/LC_MESSAGES/libgnomekbd.mo
 share/locale/da/LC_MESSAGES/libgnomekbd.mo
+share/locale/de/LC_MESSAGES/libgnomekbd.mo
 share/locale/dz/LC_MESSAGES/libgnomekbd.mo
 share/locale/el/LC_MESSAGES/libgnomekbd.mo
 share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
 share/locale/es/LC_MESSAGES/libgnomekbd.mo
+share/locale/et/LC_MESSAGES/libgnomekbd.mo
+share/locale/fi/LC_MESSAGES/libgnomekbd.mo
 share/locale/fr/LC_MESSAGES/libgnomekbd.mo
 share/locale/gl/LC_MESSAGES/libgnomekbd.mo
 share/locale/gu/LC_MESSAGES/libgnomekbd.mo
 share/locale/hu/LC_MESSAGES/libgnomekbd.mo
 share/locale/it/LC_MESSAGES/libgnomekbd.mo
 share/locale/ja/LC_MESSAGES/libgnomekbd.mo
+share/locale/ka/LC_MESSAGES/libgnomekbd.mo
 share/locale/ko/LC_MESSAGES/libgnomekbd.mo
 share/locale/lt/LC_MESSAGES/libgnomekbd.mo
 share/locale/mk/LC_MESSAGES/libgnomekbd.mo
 share/locale/nb/LC_MESSAGES/libgnomekbd.mo
+share/locale/nl/LC_MESSAGES/libgnomekbd.mo
+share/locale/oc/LC_MESSAGES/libgnomekbd.mo
+share/locale/or/LC_MESSAGES/libgnomekbd.mo
 share/locale/pa/LC_MESSAGES/libgnomekbd.mo
+share/locale/pl/LC_MESSAGES/libgnomekbd.mo
 share/locale/pt/LC_MESSAGES/libgnomekbd.mo
 share/locale/pt_BR/LC_MESSAGES/libgnomekbd.mo
 share/locale/ru/LC_MESSAGES/libgnomekbd.mo
+share/locale/si/LC_MESSAGES/libgnomekbd.mo
 share/locale/sv/LC_MESSAGES/libgnomekbd.mo
+share/locale/ta/LC_MESSAGES/libgnomekbd.mo
+share/locale/th/LC_MESSAGES/libgnomekbd.mo
 share/locale/uk/LC_MESSAGES/libgnomekbd.mo
+share/locale/vi/LC_MESSAGES/libgnomekbd.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomekbd.mo
 @dirrm share/libgnomekbd/glade
 @dirrm share/libgnomekbd
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 359ab01a137..a3c6b92ff44 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2007/06/15 17:55:09 drochner Exp $
+$NetBSD: distinfo,v 1.3 2007/11/03 17:28:00 drochner Exp $
 
-SHA1 (libgnomekbd-2.18.2.tar.bz2) = 7328ad1967b45e4964f75df6d394df22f831a2ea
-RMD160 (libgnomekbd-2.18.2.tar.bz2) = 328dcb2e10c5c19ad3ad71dfbbb0dc9e73db1262
-Size (libgnomekbd-2.18.2.tar.bz2) = 359702 bytes
-SHA1 (patch-aa) = b5f570537bcd0ab545cb4d7808ee00dd0c4fd7d3
+SHA1 (libgnomekbd-2.20.0.tar.bz2) = f48867cf237e9d0bc8508f5e5966b7307c902759
+RMD160 (libgnomekbd-2.20.0.tar.bz2) = 594ce4e66300fcd468d25f9d65624d8789f46de1
+Size (libgnomekbd-2.20.0.tar.bz2) = 392206 bytes
+SHA1 (patch-aa) = f8b99c1ae11fc3a563fdddf3613b111605fe3130
diff --git a/x11/libgnomekbd/patches/patch-aa b/x11/libgnomekbd/patches/patch-aa
index 55204aca716..7e2f09c09f1 100644
--- a/x11/libgnomekbd/patches/patch-aa
+++ b/x11/libgnomekbd/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/04/10 19:20:37 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2007/11/03 17:28:00 drochner Exp $
 
---- libgnomekbd/Makefile.in.orig	2007-04-05 13:05:59.000000000 +0200
+--- libgnomekbd/Makefile.in.orig	2007-09-17 12:34:59.000000000 +0200
 +++ libgnomekbd/Makefile.in
-@@ -296,7 +296,7 @@ libgnomekbd_la_LDFLAGS = $(common_LDFLAG
+@@ -308,7 +308,7 @@ common_LDFLAGS = -version-info @VERSION_
+ libgnomekbd_la_LDFLAGS = $(common_LDFLAGS)
  libgnomekbdui_la_LDFLAGS = $(common_LDFLAGS) \
                             $(GTK_LIBS) \
-                            $(LIBGNOME_LIBS) \
 -                           -lgnomekbd
 +                           libgnomekbd.la