Use gnome-vfs instead of gnome-vfs2.

15 files changed, 73 insertions, 69 deletions

diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 1a1cc28d204..eaff6b60bf8 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2007/07/12 19:30:36 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/19 23:13:28 wiz Exp $
 #
 
 DISTNAME=	gnome-menus-2.18.3
+PKGREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -39,10 +40,10 @@ 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-vfs2+=	gnome-vfs2>=2.10.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-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk
index e4e7d23baf3..cdaf040a9bb 100644
--- a/sysutils/gnome-menus/buildlink3.mk
+++ b/sysutils/gnome-menus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2007/06/05 05:37:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2007/09/19 23:13:28 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MENUS_BUILDLINK3_MK:=	${GNOME_MENUS_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.gnome-menus?=	../../sysutils/gnome-menus
 .endif	# GNOME_MENUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index f3a12e0b581..b4f86502c33 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/06/05 05:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/19 23:13:28 wiz Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.6
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
 
@@ -21,7 +21,7 @@ GCONF2_SCHEMAS=		gnome-pkgview.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs-monikers/Makefile b/sysutils/gnome-vfs-monikers/Makefile
index c9683fd0dd3..e66fb15c66a 100644
--- a/sysutils/gnome-vfs-monikers/Makefile
+++ b/sysutils/gnome-vfs-monikers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/06/05 05:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/19 23:13:28 wiz Exp $
 #
 
 DISTNAME=	gnome-vfs-monikers-2.15.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-vfs-monikers/2.15/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +15,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	intltool pkg-config gmake
 
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index c5d65df6d47..49c621c4b2d 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.44 2007/04/29 13:09:27 tnn Exp $
+# $NetBSD: Makefile.common,v 1.45 2007/09/19 23:13:28 wiz Exp $
 #
 
-GNOME_VFS2_VERSION=	2.18.1
+GNOME_VFS_VERSION=	2.18.1
 
-DISTNAME=		gnome-vfs-${GNOME_VFS2_VERSION}
-PKGNAME=		${DISTNAME:S/vfs/vfs2/}
+DISTNAME=		gnome-vfs-${GNOME_VFS_VERSION}
 CATEGORIES?=		sysutils
 CATEGORIES+=		gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/2.18/}
@@ -14,8 +13,8 @@ MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		GNOME Virtual File System (v2)
 
-DISTINFO_FILE=		${.CURDIR}/../../sysutils/gnome-vfs2/distinfo
-PATCHDIR=		${.CURDIR}/../../sysutils/gnome-vfs2/patches
+DISTINFO_FILE=		${.CURDIR}/../../sysutils/gnome-vfs/distinfo
+PATCHDIR=		${.CURDIR}/../../sysutils/gnome-vfs/patches
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
@@ -59,43 +58,45 @@ post-wrapper:
 
 #
 # The following stuff is to allow easy building of modules distributed within
-# gnome-vfs2 as independent packages.
+# gnome-vfs as independent packages.
 #
-# GNOME_VFS2_NAME - Name of the module beeing built.  Will be added to the
+# GNOME_VFS_NAME - Name of the module beeing built.  Will be added to the
 #                   package name, and also used as the library name.
-# GNOME_VFS2_FLAG - Base name of the flag passed to configure to enable the
+# GNOME_VFS_FLAG - Base name of the flag passed to configure to enable the
 #                   module.
 #
-.if defined(GNOME_VFS2_NAME) && !empty(GNOME_VFS2_NAME)
-GNOME_VFS2_FLAG?=	${GNOME_VFS2_NAME}
+.if defined(GNOME_VFS_NAME) && !empty(GNOME_VFS_NAME)
+GNOME_VFS_FLAG?=	${GNOME_VFS_NAME}
 
-PKGNAME:=		${PKGNAME:S/gnome-vfs2/gnome-vfs2-${GNOME_VFS2_NAME}/}
-CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-${GNOME_VFS2_FLAG}/--enable-${GNOME_VFS2_FLAG}/}
-COMMENT+=		- ${GNOME_VFS2_NAME} plugin
+PKGNAME:=		${PKGNAME:S/gnome-vfs/gnome-vfs-${GNOME_VFS_NAME}/}
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-${GNOME_VFS_FLAG}/--enable-${GNOME_VFS_FLAG}/}
+COMMENT+=		- ${GNOME_VFS_NAME} plugin
 
-BUILD_TARGET=		lib${GNOME_VFS2_NAME}.la
+CONFLICTS+=		gnome-vfs2-[0-9]*
+
+BUILD_TARGET=		lib${GNOME_VFS_NAME}.la
 BUILD_DIRS=		${WRKSRC}/modules
 
-# Fix paths to already installed libraries (by the gnome-vfs2 package).
+# Fix paths to already installed libraries (by the gnome-vfs package).
 SUBST_CLASSES+=		libs
 SUBST_MESSAGE.libs=	Fixing path to dependent libraries.
 SUBST_STAGE.libs=	pre-configure
 SUBST_FILES.libs=	modules/Makefile.in
-SUBST_SED.libs=		-e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs2}/lib/libgnomevfs-2.la|g'
+SUBST_SED.libs=		-e 's|../libgnomevfs/libgnomevfs-2.la|${BUILDLINK_PREFIX.gnome-vfs}/lib/libgnomevfs-2.la|g'
 
-BUILDLINK_API_DEPENDS.gnome-vfs2+=	gnome-vfs2>=${GNOME_VFS2_VERSION}
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=${GNOME_VFS_VERSION}
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules$$/ \
-				{ print "@comment in gnome-vfs2: " $$0; next; }
+				{ print "@comment in gnome-vfs: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/examples\/gnome-vfs-2.0$$/ { next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/examples\/gnome-vfs-2.0\/modules$$/ \
-				{ print "@comment in gnome-vfs2: " $$0; next; }
+				{ print "@comment in gnome-vfs: " $$0; next; }
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gnome-vfs-2.0/modules
 	cd ${WRKSRC}/modules && ${LIBTOOL} --mode=install \
-		${INSTALL_DATA} lib${GNOME_VFS2_NAME}.la \
+		${INSTALL_DATA} lib${GNOME_VFS_NAME}.la \
 			${PREFIX}/lib/gnome-vfs-2.0/modules
 	cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \
 			${PREFIX}/lib/gnome-vfs-2.0/modules
diff --git a/sysutils/gnome-vfs2/buildlink3.mk b/sysutils/gnome-vfs2/buildlink3.mk
index 071ec44b5fa..af7ad5481f2 100644
--- a/sysutils/gnome-vfs2/buildlink3.mk
+++ b/sysutils/gnome-vfs2/buildlink3.mk
@@ -1,24 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.28 2007/06/05 05:36:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2007/09/19 23:13:29 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_VFS2_BUILDLINK3_MK:=	${GNOME_VFS2_BUILDLINK3_MK}+
+GNOME_VFS_BUILDLINK3_MK:=	${GNOME_VFS_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-vfs2
+BUILDLINK_DEPENDS+=	gnome-vfs
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfs2}
-BUILDLINK_PACKAGES+=	gnome-vfs2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfs2
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfs}
+BUILDLINK_PACKAGES+=	gnome-vfs
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfs
 
-.if !empty(GNOME_VFS2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gnome-vfs2+=		gnome-vfs2>=2.8.0
-BUILDLINK_ABI_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.18.1nb2
-BUILDLINK_PKGSRCDIR.gnome-vfs2?=	../../sysutils/gnome-vfs2
+.if !empty(GNOME_VFS_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.8.0
+BUILDLINK_ABI_DEPENDS.gnome-vfs+=	gnome-vfs>=2.18.1nb2
+BUILDLINK_PKGSRCDIR.gnome-vfs?=		../../sysutils/gnome-vfs
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules/ \
-				{ print "@comment in gnome-vfs2: " $$0; next; }
-.endif	# GNOME_VFS2_BUILDLINK3_MK
+				{ print "@comment in gnome-vfs: " $$0; next; }
+.endif	# GNOME_VFS_BUILDLINK3_MK
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile
index de2a87e5aa1..1d79f3c1915 100644
--- a/sysutils/gnome-vfsmm/Makefile
+++ b/sysutils/gnome-vfsmm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/06/05 05:37:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/19 23:13:30 wiz Exp $
 
 DISTNAME=	gnome-vfsmm-2.18.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-vfsmm/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,5 +18,5 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgnomevfs/gnome-vfsmm-2.6.pc.in
 GNU_CONFIGURE=		yes
 
 .include "../../devel/glibmm/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfsmm/buildlink3.mk b/sysutils/gnome-vfsmm/buildlink3.mk
index 67229536764..03299c1bb19 100644
--- a/sysutils/gnome-vfsmm/buildlink3.mk
+++ b/sysutils/gnome-vfsmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/06/05 05:37:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/09/19 23:13:30 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_VFSMM_BUILDLINK3_MK:=	${GNOME_VFSMM_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.gnome-vfsmm?=	../../sysutils/gnome-vfsmm
 .endif	# GNOME_VFSMM_BUILDLINK3_MK
 
 .include "../../devel/glibmm/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index bcdce185e10..3eda4d2a5ab 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2007/06/05 05:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2007/09/19 23:13:30 wiz Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.15.92
 PKGNAME=	${DISTNAME:S/gnome/gnome2/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.15/}
 EXTRACT_SUFX=	.tar.bz2
@@ -36,7 +36,7 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/libgtop2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/gst-plugins0.10-gnomevfs/Makefile b/sysutils/gst-plugins0.10-gnomevfs/Makefile
index f9a363a4b2b..09c8074a135 100644
--- a/sysutils/gst-plugins0.10-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.10-gnomevfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/06/08 12:58:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/19 23:13:30 wiz Exp $
 #
 
 GST_PLUGINS0.10_NAME=	gnomevfs
@@ -6,6 +6,7 @@ GST_PLUGINS0.10_DIRS=	ext/gnomevfs
 GST_PLUGINS0.10_FLAGS=	gnome_vfs
 
 .include "../../multimedia/gst-plugins0.10-base/Makefile.common"
+PKGREVISION=		1
 
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gst-plugins0.8-gnomevfs/Makefile b/sysutils/gst-plugins0.8-gnomevfs/Makefile
index 628ad7d16cd..c0de6beee56 100644
--- a/sysutils/gst-plugins0.8-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.8-gnomevfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/06/05 05:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/19 23:13:30 wiz Exp $
 #
 
 GST_PLUGINS0.8_NAME=	gnomevfs
@@ -6,7 +6,7 @@ GST_PLUGINS0.8_DIR=	ext/gnomevfs
 GST_PLUGINS0.8_FLAG=	gnome_vfs
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		7
+PKGREVISION=		8
 
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 3462d9fe525..bb89b6a39c1 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2007/06/05 05:37:19 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/09/19 23:13:31 wiz Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.14.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -49,7 +49,7 @@ BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.13.4
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 9edb50e0a85..fdd22bdbd43 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.80 2007/07/13 17:25:52 drochner Exp $
+# $NetBSD: Makefile,v 1.81 2007/09/19 23:13:31 wiz Exp $
 #
 
 DISTNAME=		nautilus-2.18.3
+PKGREVISION=		1
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -24,7 +25,7 @@ GCONF2_SCHEMAS=		apps_nautilus_preferences.schemas
 BUILDLINK_API_DEPENDS.eel2+=	eel2>=2.15.91
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.27
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
-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.startup-notification+=	startup-notification>=0.8
 
@@ -46,7 +47,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/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/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index ccc0d92ec57..9d88eccf619 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2007/06/05 05:37:01 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2007/09/19 23:13:31 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
@@ -36,7 +36,7 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus\/extensions-1.0$$/ \
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg2/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/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/rox/Makefile b/sysutils/rox/Makefile
index 09ba49e2abd..206a800e711 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/06/05 05:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/19 23:13:31 wiz Exp $
 #
 
 DISTNAME=	rox-2.4.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
@@ -63,7 +63,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"