update to 2.22.2

This switches to the gnome-2.22 release branch.

5 files changed, 12 insertions, 30 deletions

diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 69d9d469c5f..85f5683c989 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.87 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2008/04/15 17:48:16 drochner Exp $
 #
 
-DISTNAME=		nautilus-2.20.0
-PKGREVISION=		2
+DISTNAME=		nautilus-2.22.2
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
@@ -25,7 +24,6 @@ GCONF_SCHEMAS=		apps_nautilus_preferences.schemas
 BUILDLINK_API_DEPENDS.eel+=	eel>=2.15.91
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.27
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.14.2
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 
@@ -47,7 +45,6 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
index f258011a102..97b11929a33 100644
--- a/sysutils/nautilus/PLIST
+++ b/sysutils/nautilus/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.21 2007/11/05 19:10:29 drochner Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/04/15 17:48:16 drochner Exp $
 bin/nautilus
+bin/nautilus-autorun-software
 bin/nautilus-connect-server
 bin/nautilus-file-management-properties
 include/nautilus/libnautilus-extension/nautilus-column-provider.h
@@ -16,6 +17,7 @@ include/nautilus/libnautilus-extension/nautilus-property-page.h
 lib/bonobo/servers/Nautilus_shell.server
 lib/libnautilus-extension.la
 lib/pkgconfig/libnautilus-extension.pc
+share/applications/nautilus-autorun-software.desktop
 share/applications/nautilus-computer.desktop
 share/applications/nautilus-file-management-properties.desktop
 share/applications/nautilus-folder-handler.desktop
@@ -81,6 +83,7 @@ share/locale/mi/LC_MESSAGES/nautilus.mo
 share/locale/mk/LC_MESSAGES/nautilus.mo
 share/locale/ml/LC_MESSAGES/nautilus.mo
 share/locale/mn/LC_MESSAGES/nautilus.mo
+share/locale/mr/LC_MESSAGES/nautilus.mo
 share/locale/ms/LC_MESSAGES/nautilus.mo
 share/locale/nb/LC_MESSAGES/nautilus.mo
 share/locale/ne/LC_MESSAGES/nautilus.mo
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index b7aebe77048..15db0859e91 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2008/04/15 17:48:16 drochner Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
@@ -36,7 +36,6 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus\/extensions-1.0$$/ \
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
index 43910fe4c5c..cecbd4e22a7 100644
--- a/sysutils/nautilus/distinfo
+++ b/sysutils/nautilus/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.33 2007/11/12 20:52:52 drochner Exp $
+$NetBSD: distinfo,v 1.34 2008/04/15 17:48:16 drochner Exp $
 
-SHA1 (nautilus-2.20.0.tar.bz2) = f6a75a854728ef308e2721424a9638d228661b1d
-RMD160 (nautilus-2.20.0.tar.bz2) = 9eeb18c886795ebbdd6dfc61ccddaee8eab81808
-Size (nautilus-2.20.0.tar.bz2) = 4916284 bytes
+SHA1 (nautilus-2.22.2.tar.bz2) = fe20dfbfbd21e06dcb4fbb471cdb957c2d96f5cf
+RMD160 (nautilus-2.22.2.tar.bz2) = 26787ee2e62e49acf5a03d4792e16a00034dd751
+Size (nautilus-2.22.2.tar.bz2) = 5032921 bytes
 SHA1 (patch-af) = 7b6d50ff805ed971ebe96d1d91a563a19220ebc7
-SHA1 (patch-ai) = 3d460b4688f70628320ace3054718fa248c5602c
 SHA1 (patch-aj) = d905ae52f35bd4fa11a9c10a0c7423aa5e04f8b9
 SHA1 (patch-ak) = e1548234ee9c96b0727710498e8f29a41a6df759
diff --git a/sysutils/nautilus/patches/patch-ai b/sysutils/nautilus/patches/patch-ai
deleted file mode 100644
index cb5cc010824..00000000000
--- a/sysutils/nautilus/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2006/01/06 16:53:49 wiz Exp $
-
---- libnautilus-private/nautilus-program-choosing.c.orig	2005-10-27 09:25:52.000000000 +0200
-+++ libnautilus-private/nautilus-program-choosing.c
-@@ -61,6 +61,11 @@
- #include <gdk/gdkx.h>
- #endif
- 
-+#if defined(__APPLE__)
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#endif
-+
- extern char **environ;
- 
- /* Cut and paste from gdkspawn-x11.c */