Fix paths for GConf, libglade, libart, libsigc++, lablgtk moves.

Bump PKGREVISION.

28 files changed, 77 insertions, 72 deletions

diff --git a/sysutils/bacula-gnome-console/Makefile b/sysutils/bacula-gnome-console/Makefile
index a30e8aad29d..3ffef4fa520 100644
--- a/sysutils/bacula-gnome-console/Makefile
+++ b/sysutils/bacula-gnome-console/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/09/19 23:19:07 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:04:17 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/-/-gnomeconsole-/}
-PKGREVISION=		2
+PKGREVISION=		3
 COMMENT=		Gnome console for Bacula - The Network Backup Solution
 CATEGORIES+=		gnome
 
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index aedf345ae1f..e3a6fcba0fa 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2006/09/09 02:46:08 obache Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:04:17 wiz Exp $
 #
 
 DISTNAME=	burn-0.4.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 4b2fea3ba5b..581c87e2b8f 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/01/26 04:34:53 markd Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:04:17 wiz Exp $
 #
 
 DISTNAME=	filelight-1.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.methylblue.com/filelight/packages/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 52472a5093b..04cbc9c95a9 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2007/09/19 23:19:07 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/21 13:04:17 wiz Exp $
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
 PKGNAME=	gcdmaster-${CDRDAO_VER}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	Gnome UI frontend to cdrdao
 
 DEPENDS+=	cdrdao-${CDRDAO_VER}{,nb*}:../../sysutils/cdrdao
@@ -17,7 +17,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/applications share/pixmaps
 USE_TOOLS+=		pkg-config
 INSTALL_DIRS=		xdao
 
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../devel/libgnomeuimm/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index eaff6b60bf8..1665fa6cd5a 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/09/19 23:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/21 13:04:18 wiz Exp $
 #
 
 DISTNAME=	gnome-menus-2.18.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index b4f86502c33..2545f3a11ad 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2007/09/19 23:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:04:18 wiz Exp $
 #
 
 DISTNAME=	gnome-pkgview-1.0.6
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.greatnorthern.demon.co.uk/packages/gnome-pkgview/
 
@@ -15,9 +15,9 @@ GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 
-GCONF2_SCHEMAS=		gnome-pkgview.schemas
+GCONF_SCHEMAS=		gnome-pkgview.schemas
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 35984d1e66b..7a21ee88a08 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/20 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:18 wiz Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.15.92
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-system-monitor/2.15/}
 EXTRACT_SUFX=	.tar.bz2
@@ -20,7 +20,7 @@ USE_TOOLS+=		autoconf gmake intltool msgfmt pkg-config
 CONFLICTS+=		gnome2-system-monitor-[0-9]*
 
 LIBS+=			-lutil
-GCONF2_SCHEMAS+=	gnome-system-monitor.schemas
+GCONF_SCHEMAS+=	gnome-system-monitor.schemas
 
 pre-configure:
 	cd ${WRKSRC} && ${PREFIX}/bin/libtoolize
@@ -30,7 +30,7 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.1
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 
 # TODO: Add libgksu support.
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
diff --git a/sysutils/gnome-vfs-monikers/Makefile b/sysutils/gnome-vfs-monikers/Makefile
index e66fb15c66a..973f891d568 100644
--- a/sysutils/gnome-vfs-monikers/Makefile
+++ b/sysutils/gnome-vfs-monikers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/09/19 23:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:18 wiz Exp $
 #
 
 DISTNAME=	gnome-vfs-monikers-2.15.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-vfs-monikers/2.15/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 223bb95fa04..224277d47c6 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.62 2007/09/19 22:22:34 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:18 wiz Exp $
 
-PKGREVISION=		2
+PKGREVISION=		3
 PKGCONFIG_OVERRIDE=	gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnome-vfs-module-2.0.pc.in
 
@@ -9,11 +9,11 @@ OWN_DIRS=		${PKG_SYSCONFDIR}/modules
 EGFILES+=		modules/default-modules.conf
 EGFILES+=		modules/ssl-modules.conf
 
-GCONF2_SCHEMAS=		desktop_default_applications.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_url_handlers.schemas
-GCONF2_SCHEMAS+=	system_dns_sd.schemas
-GCONF2_SCHEMAS+=	system_http_proxy.schemas
-GCONF2_SCHEMAS+=	system_smb.schemas
+GCONF_SCHEMAS=		desktop_default_applications.schemas
+GCONF_SCHEMAS+=	desktop_gnome_url_handlers.schemas
+GCONF_SCHEMAS+=	system_dns_sd.schemas
+GCONF_SCHEMAS+=	system_http_proxy.schemas
+GCONF_SCHEMAS+=	system_smb.schemas
 
 LDFLAGS.Darwin+=	-lresolv
 
@@ -25,7 +25,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFIGURE_ARGS+=	--enable-fam
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/Makefile.common b/sysutils/gnome-vfs/Makefile.common
index 28068ecfa6a..84518b1b7bb 100644
--- a/sysutils/gnome-vfs/Makefile.common
+++ b/sysutils/gnome-vfs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2007/09/20 22:51:00 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2007/09/21 13:04:18 wiz Exp $
 #
 
 GNOME_VFS_VERSION=	2.18.1
@@ -102,7 +102,7 @@ do-install:
 			${PREFIX}/lib/gnome-vfs-2.0/modules
 .endif
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
index ae4d1414f89..7763a021e53 100644
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ b/sysutils/gnome-vfs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2007/09/19 22:22:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2007/09/21 13:04:18 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_VFS_BUILDLINK3_MK:=	${GNOME_VFS_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/gnome-vfs-2.0\/modules/ \
 				{ print "@comment in gnome-vfs: " $$0; next; }
 .endif	# GNOME_VFS_BUILDLINK3_MK
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile
index 1d79f3c1915..12fae280400 100644
--- a/sysutils/gnome-vfsmm/Makefile
+++ b/sysutils/gnome-vfsmm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2007/09/19 23:13:30 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:04:18 wiz Exp $
 
 DISTNAME=	gnome-vfsmm-2.18.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-vfsmm/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/gst-plugins0.10-gnomevfs/Makefile b/sysutils/gst-plugins0.10-gnomevfs/Makefile
index 09c8074a135..095cc65758f 100644
--- a/sysutils/gst-plugins0.10-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.10-gnomevfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/09/19 23:13:30 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/21 13:04:18 wiz Exp $
 #
 
 GST_PLUGINS0.10_NAME=	gnomevfs
@@ -6,7 +6,7 @@ GST_PLUGINS0.10_DIRS=	ext/gnomevfs
 GST_PLUGINS0.10_FLAGS=	gnome_vfs
 
 .include "../../multimedia/gst-plugins0.10-base/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 .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 c0de6beee56..4d202e1477d 100644
--- a/sysutils/gst-plugins0.8-gnomevfs/Makefile
+++ b/sysutils/gst-plugins0.8-gnomevfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/09/19 23:13:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:19 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=		8
+PKGREVISION=		9
 
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile
index 6e40512808f..ecb2073a2e5 100644
--- a/sysutils/gworkspace/Makefile
+++ b/sysutils/gworkspace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2006/09/22 07:08:16 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:04:19 wiz Exp $
 #
 
 DISTNAME=	gworkspace-0.7.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	http://www.gnustep.it/enrico/gworkspace/	\
 		http://www.imago.ro/gworkspace/
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index ff6cf4820e9..63798d5e24f 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/07/25 02:33:03 markd Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:19 wiz Exp $
 #
 
 DISTNAME=		k3b-1.0.3
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index f10afc4b0b2..705f2dbeffe 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/02/22 19:27:11 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:04:19 wiz Exp $
 
 DISTNAME=	kdirstat-2.4.4
+PKGREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://kdirstat.sourceforge.net/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile
index f7db1d3433a..11f244c8971 100644
--- a/sysutils/krusader/Makefile
+++ b/sysutils/krusader/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/08/15 03:20:59 markd Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:19 wiz Exp $
 #
 
 DISTNAME=	krusader-1.80.0
+PKGREVISION=	1
 CATEGORIES=	kde sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=krusader/}
 
diff --git a/sysutils/libgtop/Makefile b/sysutils/libgtop/Makefile
index c81c2cf7a5b..f7416028808 100644
--- a/sysutils/libgtop/Makefile
+++ b/sysutils/libgtop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/09/20 21:12:04 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:19 wiz Exp $
 
 DISTNAME=		libgtop-2.14.2
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.14/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 5831e23216a..f7ba079830d 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:21 wiz Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.14.3
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/nautilus-cd-burner/2.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--disable-hal
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS}
 INSTALL_MAKE_FLAGS+=	modulesconfdir=${PREFIX}/share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules
-INSTALL_MAKE_FLAGS+=	schemadir=${GCONF2_SCHEMAS_DIR}
+INSTALL_MAKE_FLAGS+=	schemadir=${GCONF_SCHEMAS_DIR}
 
 CPPFLAGS+=		-D__unix__
 
@@ -36,16 +36,16 @@ EGDIR=			${PREFIX}/share/examples/nautilus-cd-burner/gnome-vfs-2.0/modules
 CONF_FILES=		${EGDIR}/mapping-modules.conf \
 			${PKG_SYSCONFDIR}/mapping-modules.conf
 
-GCONF2_SCHEMAS=		ncb.schemas
+GCONF_SCHEMAS=		ncb.schemas
 
 BUILDLINK_API_DEPENDS.eel+=	eel>=2.13.3
 BUILDLINK_API_DEPENDS.nautilus+=	nautilus>=2.13.4
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/eel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index eab8e3fa5c3..e616f5ce8b5 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2007/09/21 13:04:20 wiz Exp $
 #
 
 DISTNAME=		nautilus-2.18.3
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/nautilus/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE=	libnautilus-extension/libnautilus-extension.pc.in
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
-GCONF2_SCHEMAS=		apps_nautilus_preferences.schemas
+GCONF_SCHEMAS=		apps_nautilus_preferences.schemas
 
 BUILDLINK_API_DEPENDS.eel+=	eel>=2.15.91
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.27
@@ -33,7 +33,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/eel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -43,7 +43,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk
index af6bc076acb..a5a87ad2216 100644
--- a/sysutils/nautilus/buildlink3.mk
+++ b/sysutils/nautilus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2007/09/20 21:37:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2007/09/21 13:04:20 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 NAUTILUS_BUILDLINK3_MK:=	${NAUTILUS_BUILDLINK3_MK}+
@@ -23,7 +23,7 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus\/extensions-1.0$$/ \
 .endif	# NAUTILUS_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/eel/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
@@ -32,7 +32,7 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/nautilus\/extensions-1.0$$/ \
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index daaa2372e23..ded0d1c5656 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/03/23 17:07:37 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:04:21 wiz Exp $
 #
 
 DISTNAME=	notification-daemon-0.3.7
@@ -13,7 +13,7 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake intltool pkg-config msgfmt
 
-GCONF2_SCHEMAS=	notification-daemon.schemas
+GCONF_SCHEMAS=	notification-daemon.schemas
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--with-dbus-sys=${PKG_SYSCONFDIR.dbus}/system.d
 CONFIGURE_ARGS+=	--with-dbus-sys=${PKG_SYSCONFDIR}/dbus-1/system.d
 .endif
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
diff --git a/sysutils/py-gnome-menus/Makefile b/sysutils/py-gnome-menus/Makefile
index 196cd63cc94..eab8b3ee995 100644
--- a/sysutils/py-gnome-menus/Makefile
+++ b/sysutils/py-gnome-menus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2007/09/19 23:19:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:04:21 wiz Exp $
 #
 
 DISTNAME=	gnome-menus-2.18.3
 PKGNAME=	${PYPKGPREFIX}-gnome-menus-2.18.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/py-notify/Makefile b/sysutils/py-notify/Makefile
index 5c9f49f9b66..2d6a08da942 100644
--- a/sysutils/py-notify/Makefile
+++ b/sysutils/py-notify/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/01/15 21:16:37 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:21 wiz Exp $
 #
 
 DISTNAME=	notify-python-0.1.1
 PKGNAME=	${PYPKGPREFIX}-notify-0.1.1
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES= \
  http://www.galago-project.org/files/releases/source/notify-python/
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index 206a800e711..86409faed4a 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/09/19 23:13:31 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:04:21 wiz Exp $
 #
 
 DISTNAME=	rox-2.4.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/xfce4-thunar/Makefile b/sysutils/xfce4-thunar/Makefile
index 442ddf3bc06..13d602e1200 100644
--- a/sysutils/xfce4-thunar/Makefile
+++ b/sysutils/xfce4-thunar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/04/17 17:45:07 martti Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:22 wiz Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,6 +6,7 @@ XFCE4_VERSION=	0.8.0
 
 DISTNAME=	Thunar-${XFCE4_VERSION}
 PKGNAME=	xfce4-thunar-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	sysutils
 COMMENT=	Xfce file manager
 
@@ -16,7 +17,7 @@ USE_DIRS+=	xdg-1.2
 PKGCONFIG_OVERRIDE+=	thunar-vfs/thunar-vfs-1.pc.in
 PKGCONFIG_OVERRIDE+=	thunarx/thunarx-1.pc.in
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/sysutils/xfce4-thunar/buildlink3.mk b/sysutils/xfce4-thunar/buildlink3.mk
index 30adff44174..c2c42853137 100644
--- a/sysutils/xfce4-thunar/buildlink3.mk
+++ b/sysutils/xfce4-thunar/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/04/12 09:46:28 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:04:22 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_THUNAR_BUILDLINK3_MK:=	${XFCE4_THUNAR_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@ BUILDLINK_API_DEPENDS.xfce4-thunar+=	xfce4-thunar>=0.8.0
 BUILDLINK_PKGSRCDIR.xfce4-thunar?=	../../sysutils/xfce4-thunar
 .endif	# XFCE4_THUNAR_BUILDLINK3_MK
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"