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

Bump PKGREVISION.

13 files changed, 45 insertions, 45 deletions

diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 037efae5fba..913e6d4b593 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2007/09/19 23:18:47 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/21 13:03:39 wiz Exp $
 
 .include "../../editors/abiword/Makefile.common"
 
 PKGNAME=	abiword-plugins-${ABIWORD_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	Plugins enhancing Abiword's capabilities
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abiword-plugins
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 2cf7cda1720..f1eafbd735a 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.110 2007/09/19 23:18:47 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2007/09/21 13:03:39 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
-PKGREVISION=	3
+PKGREVISION=	4
 
 COMMENT=	Open Source cross-platform word processor
 
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index de678bf9322..87f6b9710e3 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2007/09/19 23:18:47 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2007/09/21 13:03:39 wiz Exp $
 #
 
 DISTNAME=	conglomerate-0.9.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
@@ -23,13 +23,13 @@ CONFIGURE_ARGS+=	--enable-printing
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-GCONF2_SCHEMAS=		conglomerate.schemas
+GCONF_SCHEMAS=		conglomerate.schemas
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index c12c0209c28..5a35abe19a1 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2007/09/19 23:13:18 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2007/09/21 13:03:39 wiz Exp $
 
 DISTNAME=	dasher-4.4.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/dasher/4.4/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,13 +24,13 @@ GNU_CONFIGURE=		yes
 LIBS+=			-lcompat
 .endif
 
-GCONF2_SCHEMAS+=	dasher.schemas
+GCONF_SCHEMAS+=	dasher.schemas
 
 post-build:
 	(cd ${WRKSRC}/Data && ../Src/Gtk2/generate-schema >dasher.schemas)
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${GCONF2_SCHEMAS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/Data/dasher.schemas ${GCONF_SCHEMAS_DIR}
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
@@ -39,12 +39,12 @@ BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.8.0
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/at-spi/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .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 "../../devel/libwnck/buildlink3.mk"
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index a49109c66b4..d53378b0e03 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2007/09/19 23:18:48 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2007/09/21 13:03:40 wiz Exp $
 #
 
 DISTNAME=		gconf-editor-2.18.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -17,16 +17,16 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
-CONFIGURE_ARGS+=	--with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE:Q}
-CONFIGURE_ARGS+=	--with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g}
+CONFIGURE_ARGS+=	--with-gconf-defaults-source=${GCONF_CONFIG_SOURCE:Q}
+CONFIGURE_ARGS+=	--with-gconf-mandatory-source=${GCONF_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g}
 
-GCONF2_SCHEMAS=		gconf-editor.schemas
+GCONF_SCHEMAS=		gconf-editor.schemas
 
-BUILDLINK_API_DEPENDS.GConf2+=	GConf2>=2.14.0
+BUILDLINK_API_DEPENDS.GConf+=	GConf>=2.14.0
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 9566e2c26f8..aabbcf517b5 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:18 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:40 wiz Exp $
 #
 
 DISTNAME=		gedit-2.18.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		editors gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gedit/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		YES
 
 PKGCONFIG_OVERRIDE+=	data/gedit.pc.in
 
-GCONF2_SCHEMAS=		gedit.schemas
+GCONF_SCHEMAS=		gedit.schemas
 
 CONFIGURE_ARGS+=	--enable-schemas-install
 # XXX option?
@@ -30,16 +30,16 @@ CONFIGURE_ARGS+=	--enable-schemas-install
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.12.0
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.gtksourceview+=	gtksourceview>=1.8.0
-BUILDLINK_API_DEPENDS.libglade2+=	libglade2>=2.6.0
+BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.6.0
 BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.12.1
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.16.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.16.0
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/editors/gedit/buildlink3.mk b/editors/gedit/buildlink3.mk
index fa29be46f96..98dae80bc0a 100644
--- a/editors/gedit/buildlink3.mk
+++ b/editors/gedit/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/06/05 05:37:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/09/21 13:03:40 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GEDIT_BUILDLINK3_MK:=	${GEDIT_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_ABI_DEPENDS.gedit?=	gedit>=2.18.1nb1
 BUILDLINK_PKGSRCDIR.gedit?=	../../editors/gedit
 .endif	# GEDIT_BUILDLINK3_MK
 
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../x11/gtksourceview/buildlink3.mk"
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 10d2cde0ab2..150384cdb8e 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2007/09/19 23:13:18 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/21 13:03:40 wiz Exp $
 
 DISTNAME=	gtranslator-1.1.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtranslator/1.1/}
 
diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index 56b9df4bfe9..9e793d78fdc 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/01/26 04:03:19 markd Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:40 wiz Exp $
 #
 
 DISTNAME=		kdissert-1.0.5
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		editors
 MASTER_SITES=		http://freehackers.org/~tnagy/kdissert/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 78379633c98..0d2fe10c99b 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2007/01/26 04:03:19 markd Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/21 13:03:40 wiz Exp $
 
 DISTNAME=		kile-1.9.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		editors kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kile/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index af6c144e079..d31a8b6141f 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/09/20 21:21:37 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:03:40 wiz Exp $
 #
 
 DISTNAME=	mlview-0.7.0
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mlview/0.7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,13 +17,13 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
-GCONF2_SCHEMAS=		mlview.schemas
+GCONF_SCHEMAS=		mlview.schemas
 
-.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 "../../devel/zlib/buildlink3.mk"
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index 9fb8dcd59ea..a2814f6c959 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:18:48 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:40 wiz Exp $
 #
 
 DISTNAME=		tea-16.0.5
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=tea-editor/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index 09889e9340e..d0fc973993e 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2007/02/03 01:45:01 markd Exp $
+# $NetBSD: Makefile,v 1.46 2007/09/21 13:03:41 wiz Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	editors kde
 MASTER_SITES=	ftp://ftp.rutgers.edu/pub/kde/stable/apps/KDE3.x/utils/ \
 		ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/utils/ \