update to 2.22.0

This switches to the gnome-2.22 release branch.

4 files changed, 14 insertions, 14 deletions

diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index b78058555ef..c30df6f4c31 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.69 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2008/04/10 16:40:49 drochner Exp $
 #
 
-DISTNAME=	libgnome-2.20.1.1
-PKGREVISION=	1
+DISTNAME=	libgnome-2.22.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -39,7 +38,6 @@ CONF_FILES+=	${EGDIR}/sound/events/gtk-events-2.soundlist \
 GCONF_SCHEMAS=	desktop_gnome_accessibility_keyboard.schemas
 GCONF_SCHEMAS+=	desktop_gnome_accessibility_startup.schemas
 GCONF_SCHEMAS+=	desktop_gnome_applications_browser.schemas
-GCONF_SCHEMAS+=	desktop_gnome_applications_help_viewer.schemas
 GCONF_SCHEMAS+=	desktop_gnome_applications_terminal.schemas
 GCONF_SCHEMAS+=	desktop_gnome_applications_window_manager.schemas
 GCONF_SCHEMAS+=	desktop_gnome_background.schemas
@@ -53,6 +51,7 @@ GCONF_SCHEMAS+=	desktop_gnome_thumbnailers.schemas
 GCONF_SCHEMAS+=	desktop_gnome_typing_break.schemas
 GCONF_SCHEMAS+=	desktop_gnome_applications_at_mobility.schemas
 GCONF_SCHEMAS+=	desktop_gnome_applications_at_visual.schemas
+GCONF_SCHEMAS+=	desktop_gnome_applications_office.schemas
 
 BUILDLINK_API_DEPENDS.audiofile+=	libaudiofile>=0.2.3
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.8.0
@@ -69,5 +68,4 @@ BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.13.0
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnome/PLIST b/devel/libgnome/PLIST
index 887de2422e5..8a2ec09c68a 100644
--- a/devel/libgnome/PLIST
+++ b/devel/libgnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2007/10/31 20:05:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2008/04/10 16:40:49 drochner Exp $
 bin/gnome-open
 include/libgnome-2.0/libgnome/gnome-config.h
 include/libgnome-2.0/libgnome/gnome-exec.h
@@ -27,7 +27,7 @@ share/gconf/schemas/desktop_gnome_accessibility_startup.schemas
 share/gconf/schemas/desktop_gnome_applications_at_mobility.schemas
 share/gconf/schemas/desktop_gnome_applications_at_visual.schemas
 share/gconf/schemas/desktop_gnome_applications_browser.schemas
-share/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
+share/gconf/schemas/desktop_gnome_applications_office.schemas
 share/gconf/schemas/desktop_gnome_applications_terminal.schemas
 share/gconf/schemas/desktop_gnome_applications_window_manager.schemas
 share/gconf/schemas/desktop_gnome_background.schemas
@@ -104,6 +104,7 @@ share/locale/eu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
+share/locale/fur/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ga/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gu/LC_MESSAGES/libgnome-2.0.mo
@@ -124,6 +125,7 @@ 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
+share/locale/mr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nb/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ne/LC_MESSAGES/libgnome-2.0.mo
@@ -138,6 +140,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ro/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnome-2.0.mo
 share/locale/rw/LC_MESSAGES/libgnome-2.0.mo
+share/locale/si/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/sq/LC_MESSAGES/libgnome-2.0.mo
diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk
index 043e8a022c5..106884f2fa9 100644
--- a/devel/libgnome/buildlink3.mk
+++ b/devel/libgnome/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2008/04/10 16:40:49 drochner Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOME_BUILDLINK3_MK:=	${LIBGNOME_BUILDLINK3_MK}+
@@ -26,6 +26,5 @@ BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo
index 8aad1c5bdb9..09c70c33268 100644
--- a/devel/libgnome/distinfo
+++ b/devel/libgnome/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.31 2007/10/31 20:05:48 drochner Exp $
+$NetBSD: distinfo,v 1.32 2008/04/10 16:40:49 drochner Exp $
 
-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 (libgnome-2.22.0.tar.bz2) = 2d263acdd313d37d1018356c74e9d1cc7a9c2e0d
+RMD160 (libgnome-2.22.0.tar.bz2) = 50b0c0fc21e14c45245b95138b40e1ea40084547
+Size (libgnome-2.22.0.tar.bz2) = 1407548 bytes
 SHA1 (patch-af) = 783e295d1714b7c121538ed7459ffbcf3ff3713a
 SHA1 (patch-ag) = cf65f35eb15371c46e603e804ff4b0b9ef820b5f