Use gnome-vfs instead of gnome-vfs2.

11 files changed, 33 insertions, 29 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 59c49378c3b..53c676cba5b 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2007/07/12 19:38:18 drochner Exp $
+# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:34 wiz Exp $
 #
 
 DISTNAME=		gnome-desktop-2.18.3
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -30,7 +31,7 @@ post-install:
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index e7ea96f4649..c66f2da6052 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2007/06/05 05:37:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2007/09/19 23:13:35 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 6aa2491a737..d97b20b357b 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.88 2007/07/12 19:41:57 drochner Exp $
+# $NetBSD: Makefile,v 1.89 2007/09/19 23:13:35 wiz Exp $
 #
 
 DISTNAME=		gnome-panel-2.18.3
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -30,7 +31,7 @@ GCONF2_SCHEMAS+=	workspace-switcher.schemas
 GCONF2_SCHEMAS+=	window-list.schemas
 GCONF2_ENTRIES=		panel-default-setup.entries
 
-BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.14.2
+BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.14.2
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.5.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.13.0
@@ -60,7 +61,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 55278277ea1..8eb94560fc3 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2007/06/05 05:37:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2007/09/19 23:13:35 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
@@ -27,7 +27,7 @@ BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 343b45bf608..57f36fa8333 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/07/15 21:44:41 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/19 23:13:36 wiz Exp $
 #
 
 DISTNAME=	gnome-screensaver-2.18.2
+PKGREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.18/}
 
@@ -70,7 +71,7 @@ post-install:
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index cbbb44719d0..1923783501e 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2007/06/05 05:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2007/09/19 23:13:36 wiz Exp $
 #
 
 DISTNAME=		gnome-applets-2.18.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-applets/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -79,7 +79,7 @@ BUILDLINK_API_DEPENDS.libglade2+=		libglade2>=2.4.0
 BUILDLINK_API_DEPENDS.gstreamer0.10+=		gstreamer0.10>=0.10.2
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.2
 BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.16.0
-BUILDLINK_API_DEPENDS.gnome-vfs2+=		gnome-vfs2>=2.16.0
+BUILDLINK_API_DEPENDS.gnome-vfs+=		gnome-vfs>=2.16.0
 BUILDLINK_API_DEPENDS.gnome-panel+=		gnome-panel>=2.13.4
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.6.0
 
@@ -100,7 +100,7 @@ PYTHON_PATCH_SCRIPTS+=	invest-applet/invest/invest-chart
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/libgtop2/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 562ad336b15..b4f880a2c56 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.80 2007/07/25 18:02:32 rillig Exp $
+# $NetBSD: Makefile,v 1.81 2007/09/19 23:13:36 wiz Exp $
 #
 
 DISTNAME=	control-center-2.18.1
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -73,7 +73,7 @@ BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index ebba02541cd..4cdd535f74a 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/06/05 05:37:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2007/09/19 23:13:37 wiz Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -25,7 +25,7 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../wm/metacity/buildlink3.mk"
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 12e13328797..60441a040eb 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.67 2007/07/06 18:44:10 drochner Exp $
+# $NetBSD: Makefile,v 1.68 2007/09/19 23:13:37 wiz Exp $
 #
 
 DISTNAME=		gnome-terminal-2.18.1
 PKGNAME=		${DISTNAME:S/-/2-/}
+PKGREVISION=		1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -28,7 +29,7 @@ BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gtk2-sharp/Makefile b/x11/gtk2-sharp/Makefile
index 56c12753576..17631c89928 100644
--- a/x11/gtk2-sharp/Makefile
+++ b/x11/gtk2-sharp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/06/05 05:37:40 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/19 23:13:37 wiz Exp $
 #
 
 DISTNAME=		gtk-sharp-2.8.2
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11
 MASTER_SITES=		http://go-mono.com/sources/gtk-sharp-2.8/
 
@@ -42,7 +42,7 @@ substpcprefix:
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 32c10bde83b..4dda517eacd 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2007/09/03 09:51:55 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2007/09/19 23:13:38 wiz Exp $
 #
 
 DISTNAME=	gnome-python-2.18.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -34,8 +34,8 @@ BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.11.1
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pyorbit+=	${PYPKGPREFIX}-ORBit>=2.0.1
 .include "../../net/py-ORBit/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.9.3
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.9.3
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.6.2
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"