update to 2.22.1

This switches to the gnome-2.22 release branch.

4 files changed, 12 insertions, 14 deletions

diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index c6b6472b734..f52aeccbee3 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2008/04/15 17:33:21 drochner Exp $
 #
 
-DISTNAME=	gnome-menus-2.20.3
-PKGREVISION=	1
+DISTNAME=	gnome-menus-2.22.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -40,10 +39,8 @@ SUBST_SED.paths=	-e 's|/usr/|${PREFIX}/|g'
 SUBST_SED.paths+=	-e 's|/etc/X11/applnk|${PREFIX}/share/kde/applnk/|g'
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.10.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-menus/PLIST b/sysutils/gnome-menus/PLIST
index d67848a2c33..d3bda64446b 100644
--- a/sysutils/gnome-menus/PLIST
+++ b/sysutils/gnome-menus/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2008/01/11 13:00:10 drochner Exp $
-bin/gnome-menu-spec-test
+@comment $NetBSD: PLIST,v 1.16 2008/04/15 17:33:21 drochner Exp $
 include/gnome-menus/gmenu-tree.h
 lib/libgnome-menu.la
 lib/pkgconfig/libgnome-menu.pc
@@ -53,6 +52,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo
 share/locale/fa/LC_MESSAGES/gnome-menus.mo
 share/locale/fi/LC_MESSAGES/gnome-menus.mo
 share/locale/fr/LC_MESSAGES/gnome-menus.mo
+share/locale/fur/LC_MESSAGES/gnome-menus.mo
 share/locale/ga/LC_MESSAGES/gnome-menus.mo
 share/locale/gl/LC_MESSAGES/gnome-menus.mo
 share/locale/gn/LC_MESSAGES/gnome-menus.mo
@@ -62,6 +62,7 @@ share/locale/hi/LC_MESSAGES/gnome-menus.mo
 share/locale/hu/LC_MESSAGES/gnome-menus.mo
 share/locale/hy/LC_MESSAGES/gnome-menus.mo
 share/locale/id/LC_MESSAGES/gnome-menus.mo
+share/locale/io/LC_MESSAGES/gnome-menus.mo
 share/locale/it/LC_MESSAGES/gnome-menus.mo
 share/locale/ja/LC_MESSAGES/gnome-menus.mo
 share/locale/ka/LC_MESSAGES/gnome-menus.mo
@@ -71,6 +72,7 @@ share/locale/ku/LC_MESSAGES/gnome-menus.mo
 share/locale/ky/LC_MESSAGES/gnome-menus.mo
 share/locale/lt/LC_MESSAGES/gnome-menus.mo
 share/locale/lv/LC_MESSAGES/gnome-menus.mo
+share/locale/mai/LC_MESSAGES/gnome-menus.mo
 share/locale/mg/LC_MESSAGES/gnome-menus.mo
 share/locale/mk/LC_MESSAGES/gnome-menus.mo
 share/locale/ml/LC_MESSAGES/gnome-menus.mo
diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk
index 09e87ac2909..894ebc03497 100644
--- a/sysutils/gnome-menus/buildlink3.mk
+++ b/sysutils/gnome-menus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2008/04/15 17:33:21 drochner Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MENUS_BUILDLINK3_MK:=	${GNOME_MENUS_BUILDLINK3_MK}+
@@ -18,6 +18,5 @@ BUILDLINK_PKGSRCDIR.gnome-menus?=	../../sysutils/gnome-menus
 .endif	# GNOME_MENUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome-menus/distinfo b/sysutils/gnome-menus/distinfo
index 04382504472..89511dd3260 100644
--- a/sysutils/gnome-menus/distinfo
+++ b/sysutils/gnome-menus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2008/01/11 13:00:10 drochner Exp $
+$NetBSD: distinfo,v 1.15 2008/04/15 17:33:21 drochner Exp $
 
-SHA1 (gnome-menus-2.20.3.tar.bz2) = 25c8161f1bb4ecd4a868cbf1b59edcfb06adaa51
-RMD160 (gnome-menus-2.20.3.tar.bz2) = eb1ff84b161d8354b1ee30364cefec91a43ff57d
-Size (gnome-menus-2.20.3.tar.bz2) = 446966 bytes
+SHA1 (gnome-menus-2.22.1.tar.bz2) = a943facc7d279145b683fe8b13aff0abe8c102c5
+RMD160 (gnome-menus-2.22.1.tar.bz2) = 7875afc047c8c8592133058c62e084e7708f90de
+Size (gnome-menus-2.22.1.tar.bz2) = 461978 bytes