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

Bump PKGREVISION.

43 files changed, 131 insertions, 119 deletions

diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index 19d97c435d3..cf09db2e22c 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/09/20 20:47:01 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:33 wiz Exp $
 #
 
 DISTNAME=	ArX-2.2.4
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel scm
 MASTER_SITES=	http://savannah.nongnu.org/download/arx/
 
diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile
index 53cf67e15ed..bd113671bc6 100644
--- a/devel/Gorm/Makefile
+++ b/devel/Gorm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2006/09/22 07:08:15 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:03:33 wiz Exp $
 
 DISTNAME=	gorm-1.1.0
 PKGNAME=	Gorm-1.1.0
+PKGREVISION=	1
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=dev-apps/}
 
diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile
index 7ad82d7e826..68fb4329ed9 100644
--- a/devel/ProjectCenter/Makefile
+++ b/devel/ProjectCenter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2006/09/22 07:08:15 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2007/09/21 13:03:33 wiz Exp $
 
 DISTNAME=	ProjectCenter-0.4.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=dev-apps/}
 
diff --git a/devel/Renaissance/Makefile b/devel/Renaissance/Makefile
index c5b1afab49b..4bd3663dd19 100644
--- a/devel/Renaissance/Makefile
+++ b/devel/Renaissance/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/09/22 07:08:15 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:33 wiz Exp $
 #
 
 DISTNAME=	Renaissance-0.8.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://www.gnustep.it/Renaissance/Download/
 
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 0103f3203cd..dcd052e8b3a 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2007/09/19 23:57:00 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2007/09/21 13:03:33 wiz Exp $
 
 DISTNAME=	anjuta-2.0.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=anjuta/}
 
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index 5b1ab2eb079..b9959f8c17c 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/04/10 18:15:01 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:33 wiz Exp $
 #
 
 DISTNAME=		at-spi-1.18.1
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/at-spi/1.18/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 20ff6ccabb3..6349fc3a1d0 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/09/18 19:23:01 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2007/09/21 13:03:34 wiz Exp $
 
 DISTNAME=		devhelp-0.16
+PKGREVISION=		1
 CATEGORIES=		devel x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/devhelp/0.16/}
 EXTRACT_SUFX=		.tar.bz2
@@ -18,14 +19,14 @@ USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	libdevhelp-1.0.pc.in
-GCONF2_SCHEMAS=		devhelp.schemas
+GCONF_SCHEMAS=		devhelp.schemas
 
 .include "options.mk"
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/devel/devhelp/buildlink3.mk b/devel/devhelp/buildlink3.mk
index f01088acc8c..c36d569ee2f 100644
--- a/devel/devhelp/buildlink3.mk
+++ b/devel/devhelp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/01/07 12:03:59 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:03:34 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DEVHELP_BUILDLINK3_MK:=	${DEVHELP_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.devhelp?=	../../devel/devhelp
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/devel/distccmon-gnome/Makefile b/devel/distccmon-gnome/Makefile
index bd3fb0d0369..9cf6e44348c 100644
--- a/devel/distccmon-gnome/Makefile
+++ b/devel/distccmon-gnome/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2007/09/19 23:18:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:34 wiz Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gnome-/}
 COMMENT=	Graphical monitor for distcc, the distributed C/C++ compiler
 
 .include "../../devel/distcc/Makefile.common"
-PKGREVISION=	9
+PKGREVISION=	10
 
 USE_TOOLS+=	pkg-config
 
diff --git a/devel/edcommon/Makefile b/devel/edcommon/Makefile
index 3ac227f926f..9cc29ac9a64 100644
--- a/devel/edcommon/Makefile
+++ b/devel/edcommon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/10/04 21:35:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:34 wiz Exp $
 #
 
 DISTNAME=	edcommon-32-s
 PKGNAME=	${DISTNAME:S/-s$//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel gnustep
 MASTER_SITES=	http://www.mulle-kybernetik.com/software/EDFrameworks/Downloads/
 
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 10f88caabb0..4ecd058d799 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2007/09/20 21:21:04 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2007/09/21 13:03:34 wiz Exp $
 
 DISTNAME=	eel-2.18.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eel/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,15 +23,15 @@ BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.6.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.9.1
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.9.4
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/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 "../../devel/pango/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/eel/buildlink3.mk b/devel/eel/buildlink3.mk
index 9a77872d5b7..99fb2af47c6 100644
--- a/devel/eel/buildlink3.mk
+++ b/devel/eel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2007/09/20 21:21:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:03:34 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EEL_BUILDLINK3_MK:=	${EEL_BUILDLINK3_MK}+
@@ -17,14 +17,14 @@ BUILDLINK_ABI_DEPENDS.eel?=	eel>=2.18.0.1nb1
 BUILDLINK_PKGSRCDIR.eel?=	../../devel/eel
 .endif	# EEL_BUILDLINK3_MK
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
 .include "../../devel/gettext-lib/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 "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index 0cd075b312c..3c5670df3f3 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2007/09/18 21:16:55 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2007/09/21 13:03:34 wiz Exp $
 #
 
 DISTNAME=	gail-1.20.0
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gail/1.20/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gail/buildlink3.mk b/devel/gail/buildlink3.mk
index 179c8df54ba..ef137ac794e 100644
--- a/devel/gail/buildlink3.mk
+++ b/devel/gail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:03:34 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GAIL_BUILDLINK3_MK:=	${GAIL_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.gail?=	../../devel/gail
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 8b930aef299..fa61b5503e0 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/04/10 11:41:01 adam Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:03:34 wiz Exp $
 
 DISTNAME=	gconfmm-2.18.0
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gconfmm/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,6 +17,6 @@ USE_TOOLS+=		gmake pkg-config
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/gconf/gconfmm-2.6.pc.in
 GNU_CONFIGURE=		yes
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gconfmm/buildlink3.mk b/devel/gconfmm/buildlink3.mk
index 70bcdce4ff4..e30757c6795 100644
--- a/devel/gconfmm/buildlink3.mk
+++ b/devel/gconfmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/29 14:09:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:03:35 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONFMM_BUILDLINK3_MK:=	${GCONFMM_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.gconfmm+=	gconfmm>=2.14.0nb1
 BUILDLINK_PKGSRCDIR.gconfmm?=	../../devel/gconfmm
 .endif	# GCONFMM_BUILDLINK3_MK
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gdl/Makefile b/devel/gdl/Makefile
index 5300ee8192d..d75fbd5fd3d 100644
--- a/devel/gdl/Makefile
+++ b/devel/gdl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2007/09/19 23:18:45 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:03:35 wiz Exp $
 #
 
 DISTNAME=	gdl-0.6.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdl/0.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,7 @@ USE_TOOLS+=	pkg-config perl intltool msgfmt
 PKGCONFIG_OVERRIDE+=	gdl-1.0.pc.in
 
 .include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/glade-gnome/Makefile b/devel/glade-gnome/Makefile
index 73f309a47a0..a0ef6116eef 100644
--- a/devel/glade-gnome/Makefile
+++ b/devel/glade-gnome/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:35 wiz Exp $
 
 .include "../../devel/glade/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/glade/glade-gnome/}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES+=	gnome
 
 COMMENT+=	and GNOME2
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 4be31c1b29a..3856f18ad66 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2007/07/05 10:49:43 adam Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:03:35 wiz Exp $
 
 DISTNAME=	glibmm-2.12.10
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/glibmm/2.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,5 +22,5 @@ GNU_CONFIGURE=		yes
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glibmm/buildlink3.mk b/devel/glibmm/buildlink3.mk
index 12246bf95ee..092bcd552f2 100644
--- a/devel/glibmm/buildlink3.mk
+++ b/devel/glibmm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2007/09/21 13:03:35 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLIBMM_BUILDLINK3_MK:=	${GLIBMM_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.glibmm?=	../../devel/glibmm
 .endif	# GLIBMM_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libsigc++2/buildlink3.mk"
+.include "../../devel/libsigc++/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 31b82bee831..8251fb5889f 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:35 wiz Exp $
 #
 
 DISTNAME=	gnome-build-0.1.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-build/0.1/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index 0dbe5c54d3d..bf29fcf17b4 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/09/22 07:08:15 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:03:35 wiz Exp $
 #
 
 DISTNAME=	gnustep-examples-1.0.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
diff --git a/devel/guile-gnome/Makefile b/devel/guile-gnome/Makefile
index c1780ed8f1a..fec287ba276 100644
--- a/devel/guile-gnome/Makefile
+++ b/devel/guile-gnome/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2007/09/19 23:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:35 wiz Exp $
 
 DISTNAME=	guile-gnome-platform-2.15.93
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/
 
@@ -22,10 +22,10 @@ INFO_FILES=		YES
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/g-wrap/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 8b5c57d876e..b8529b9675e 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2007/01/26 03:56:50 markd Exp $
+# $NetBSD: Makefile,v 1.66 2007/09/21 13:03:35 wiz Exp $
 
 DISTNAME=	kdbg-2.0.5
+PKGREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kdbg/}
 
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 1ecfb58f2e2..17faa7571d6 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2007/06/08 12:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2007/09/21 13:03:36 wiz Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 COMMENT=	Support applications and tools used by KDE developers
 
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 42912f0e21e..e107a9eab18 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2007/06/08 12:25:01 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2007/09/21 13:03:37 wiz Exp $
 
 DISTNAME=	kdevelop-3.4.1
 PKGNAME=	kdevelop-base-3.4.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel kde
 
 HOMEPAGE=	http://www.kdevelop.org/
diff --git a/devel/kdiff3/Makefile b/devel/kdiff3/Makefile
index 6e1ac2565e4..d38313174d9 100644
--- a/devel/kdiff3/Makefile
+++ b/devel/kdiff3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/05/18 13:45:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:37 wiz Exp $
 
 DISTNAME=		kdiff3-0.9.91
+PKGREVISION=		1
 CATEGORIES=		devel kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kdiff3/}
 
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index e0fa161858d..52bfca855fd 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/08/15 03:52:16 markd Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 13:03:37 wiz Exp $
 #
 
 DISTNAME=		kscope-1.5.0
+PKGREVISION=		1
 CATEGORIES=		devel kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kscope/}
 
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index a050836a030..b3c4abccc0c 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2007/09/19 23:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2007/09/21 13:03:37 wiz Exp $
 #
 
 DISTNAME=	libbonoboui-2.18.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libbonoboui/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -27,13 +27,13 @@ BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.16.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.13.7
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk
index 4bff5c8b655..f5e0701413c 100644
--- a/devel/libbonoboui/buildlink3.mk
+++ b/devel/libbonoboui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2007/09/19 23:13:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2007/09/21 13:03:37 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBBONOBOUI_BUILDLINK3_MK:=	${LIBBONOBOUI_BUILDLINK3_MK}+
@@ -17,12 +17,12 @@ BUILDLINK_ABI_DEPENDS.libbonoboui+=	libbonoboui>=2.18.0nb1
 BUILDLINK_PKGSRCDIR.libbonoboui?=	../../devel/libbonoboui
 .endif	# LIBBONOBOUI_BUILDLINK3_MK
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index 54836b1a623..4a25d501caf 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/21 13:03:37 wiz Exp $
 
 DISTNAME=	libextractor-0.5.18
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://gnunet.org/libextractor/download/
 
diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile
index 80700e84484..8be54334bbd 100644
--- a/devel/libgail-gnome/Makefile
+++ b/devel/libgail-gnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:03:37 wiz Exp $
 #
 
 DISTNAME=	libgail-gnome-1.18.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgail-gnome/1.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index ca0feb30a23..4be674d1893 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2007/07/07 17:17:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:38 wiz Exp $
 
 DISTNAME=	libglademm-2.6.4
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libglademm/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,7 +17,7 @@ USE_TOOLS+=		gmake pkg-config
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libglade/libglademm-2.4.pc.in
 GNU_CONFIGURE=		yes
 
-BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.6.1
-.include "../../devel/libglade2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.6.1
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libglademm/buildlink3.mk b/devel/libglademm/buildlink3.mk
index 883e6ac1a48..8ddef3acba3 100644
--- a/devel/libglademm/buildlink3.mk
+++ b/devel/libglademm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/09/24 16:48:27 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/09/21 13:03:38 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADEMM_BUILDLINK3_MK:=	${LIBGLADEMM_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.libglademm+=	libglademm>=2.6.2nb1
 BUILDLINK_PKGSRCDIR.libglademm?=	../../devel/libglademm
 .endif	# LIBGLADEMM_BUILDLINK3_MK
 
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../x11/gtkmm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index ebf45e073cd..d3cd6dc5a87 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2007/09/19 23:13:15 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2007/09/21 13:03:38 wiz Exp $
 #
 
 DISTNAME=	libgnome-2.18.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -36,23 +36,23 @@ CONF_FILES=	${EGDIR}/sound/events/gnome-2.soundlist \
 CONF_FILES+=	${EGDIR}/sound/events/gtk-events-2.soundlist \
 		${PKG_SYSCONFDIR}/sound/events/gtk-events-2.soundlist
 
-GCONF2_SCHEMAS=	desktop_gnome_accessibility_keyboard.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_accessibility_startup.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_applications_browser.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_applications_help_viewer.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_applications_terminal.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_applications_window_manager.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_background.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_file_views.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_interface.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_lockdown.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_peripherals_keyboard.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_peripherals_mouse.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_sound.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_thumbnailers.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_typing_break.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_applications_at_mobility.schemas
-GCONF2_SCHEMAS+=	desktop_gnome_applications_at_visual.schemas
+GCONF_SCHEMAS=	desktop_gnome_accessibility_keyboard.schemas
+GCONF_SCHEMAS+=	desktop_gnome_accessibility_startup.schemas
+GCONF_SCHEMAS+=	desktop_gnome_applications_browser.schemas
+GCONF_SCHEMAS+=	desktop_gnome_applications_help_viewer.schemas
+GCONF_SCHEMAS+=	desktop_gnome_applications_terminal.schemas
+GCONF_SCHEMAS+=	desktop_gnome_applications_window_manager.schemas
+GCONF_SCHEMAS+=	desktop_gnome_background.schemas
+GCONF_SCHEMAS+=	desktop_gnome_file_views.schemas
+GCONF_SCHEMAS+=	desktop_gnome_interface.schemas
+GCONF_SCHEMAS+=	desktop_gnome_lockdown.schemas
+GCONF_SCHEMAS+=	desktop_gnome_peripherals_keyboard.schemas
+GCONF_SCHEMAS+=	desktop_gnome_peripherals_mouse.schemas
+GCONF_SCHEMAS+=	desktop_gnome_sound.schemas
+GCONF_SCHEMAS+=	desktop_gnome_thumbnailers.schemas
+GCONF_SCHEMAS+=	desktop_gnome_typing_break.schemas
+GCONF_SCHEMAS+=	desktop_gnome_applications_at_mobility.schemas
+GCONF_SCHEMAS+=	desktop_gnome_applications_at_visual.schemas
 
 BUILDLINK_API_DEPENDS.audiofile+=	libaudiofile>=0.2.3
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.8.0
@@ -62,7 +62,7 @@ BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.13.0
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/devel/libgnomemm/Makefile b/devel/libgnomemm/Makefile
index b4bc223a08e..9ae1da2ca58 100644
--- a/devel/libgnomemm/Makefile
+++ b/devel/libgnomemm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:03:38 wiz Exp $
 
 DISTNAME=	libgnomemm-2.18.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomemm/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index 31a7c335c37..a34d86a4dfe 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:03:38 wiz Exp $
 #
 
 DISTNAME=	libgnomeui-2.18.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -41,10 +41,10 @@ post-configure:
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index 602739de0bc..7e57b9b5b0a 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/06/05 05:37:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2007/09/21 13:03:38 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEUI_BUILDLINK3_MK:=	${LIBGNOMEUI_BUILDLINK3_MK}+
@@ -18,10 +18,10 @@ BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 .endif	# LIBGNOMEUI_BUILDLINK3_MK
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/devel/libgnomeuimm/Makefile b/devel/libgnomeuimm/Makefile
index c15e09ab945..5776996d5a9 100644
--- a/devel/libgnomeuimm/Makefile
+++ b/devel/libgnomeuimm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/09/19 23:18:46 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:03:38 wiz Exp $
 
 DISTNAME=	libgnomeuimm-2.18.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeuimm/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index eecd556843a..ca9a7eeb972 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2007/09/19 23:13:17 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/21 13:03:38 wiz Exp $
 #
 
 DISTNAME=	libgsf-1.14.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,9 +24,9 @@ PKGCONFIG_OVERRIDE+=	libgsf-gnome-1.pc.in
 CONFIGURE_ARGS+=	--without-python
 
 # XXX workaround for missing substitution in configure
-MAKE_ENV+=	GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR}
+MAKE_ENV+=	GCONF_SCHEMAS_DIR=${GCONF_SCHEMAS_DIR}
 
-GCONF2_SCHEMAS=	gsf-office-thumbnailer.schemas
+GCONF_SCHEMAS=	gsf-office-thumbnailer.schemas
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -34,5 +34,5 @@ GCONF2_SCHEMAS=	gsf-office-thumbnailer.schemas
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libsexymm/Makefile b/devel/libsexymm/Makefile
index a8595ae3bf5..5d9d3860e90 100644
--- a/devel/libsexymm/Makefile
+++ b/devel/libsexymm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/07/28 15:25:02 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:38 wiz Exp $
 #
 
 DISTNAME=	libsexymm-0.1.9
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://releases.chipx86.com/libsexy/libsexymm/
 
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index f91286dd033..eb39f7daa46 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2007/07/17 21:47:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:39 wiz Exp $
 #
 
 DISTNAME=		monotone-viz-0.15
+PKGREVISION=		1
 CATEGORIES=		devel scm
 MASTER_SITES=		http://oandrieu.nerim.net/monotone-viz/
 
@@ -27,5 +28,5 @@ do-install:
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/lablgtk2/buildlink3.mk"
+.include "../../x11/lablgtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile
index fdf541ee554..a4fa9089584 100644
--- a/devel/rox-lib/Makefile
+++ b/devel/rox-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/04/17 13:46:21 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:39 wiz Exp $
 #
 
 DISTNAME=	rox-lib-2.0.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
 EXTRACT_SUFX=	.tgz