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

Bump PKGREVISION.

28 files changed, 90 insertions, 81 deletions

diff --git a/misc/Addresses/Makefile b/misc/Addresses/Makefile
index b9c020fa4c3..f39b50e79ca 100644
--- a/misc/Addresses/Makefile
+++ b/misc/Addresses/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/09/22 07:08:16 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2007/09/21 13:04:00 wiz Exp $
 #
 
 DISTNAME=		Addresses-0.4.6
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		misc gnustep
 MASTER_SITES=		http://giesler.biz/bjoern/downloads/
 
diff --git a/misc/basket/Makefile b/misc/basket/Makefile
index f39b6495ab9..961cda69823 100644
--- a/misc/basket/Makefile
+++ b/misc/basket/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/10 21:04:27 seb Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:00 wiz Exp $
 
 DISTNAME=		basket-1.0.2
+PKGREVISION=		1
 CATEGORIES=		misc
 MASTER_SITES=		http://basket.kde.org/downloads/
 
diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile
index 854e63b01b0..cb7e94fb2a1 100644
--- a/misc/celestia/Makefile
+++ b/misc/celestia/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/09/19 23:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:04:00 wiz Exp $
 
 DISTNAME=	celestia-1.4.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	misc x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=celestia/}
 
diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index aee5b924d62..41525e17201 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2007/09/19 23:19:01 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/09/21 13:04:00 wiz Exp $
 #
 
 DISTNAME=	deskbar-applet-2.18.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/deskbar-applet/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,7 +19,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 PKGCONFIG_OVERRIDE=	data/deskbar-applet.pc
 
-GCONF2_SCHEMAS=		deskbar-applet.schemas
+GCONF_SCHEMAS=		deskbar-applet.schemas
 
 PYTHON_ACCEPTED_VERSIONS=	24
 PYTHON_PATCH_SCRIPTS=		deskbar/deskbar-applet.py
@@ -27,7 +27,7 @@ PY_PATCHPLIST=			yes
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/py-gobject/buildlink3.mk"
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 09164d8208f..5b05b94aa85 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.82 2007/09/20 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2007/09/21 13:04:00 wiz Exp $
 #
 
 DISTNAME=		gnome-utils-2.18.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		misc gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-utils/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -22,11 +22,11 @@ PKGCONFIG_OVERRIDE+=	gnome-dictionary/libgdict/gdict-1.0-uninstalled.pc.in
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 
-GCONF2_SCHEMAS+=	baobab.schemas
-GCONF2_SCHEMAS+=	gnome-dictionary.schemas
-GCONF2_SCHEMAS+=	gnome-screenshot.schemas
-GCONF2_SCHEMAS+=	gnome-search-tool.schemas
-GCONF2_SCHEMAS+=	logview.schemas
+GCONF_SCHEMAS+=	baobab.schemas
+GCONF_SCHEMAS+=	gnome-dictionary.schemas
+GCONF_SCHEMAS+=	gnome-screenshot.schemas
+GCONF_SCHEMAS+=	gnome-search-tool.schemas
+GCONF_SCHEMAS+=	logview.schemas
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.9.1
 BUILDLINK_API_DEPENDS.gnome-panel+=	gnome-panel>=2.13.4
@@ -38,11 +38,11 @@ BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.13.7
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/GConf2-ui/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/GConf-ui/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"
diff --git a/misc/goffice/Makefile b/misc/goffice/Makefile
index 744dfbf833e..40fa6d06ab1 100644
--- a/misc/goffice/Makefile
+++ b/misc/goffice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:00 wiz Exp $
 #
 
 DISTNAME=		goffice-0.4.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.4/}
 
@@ -18,19 +18,19 @@ USE_DIRS+=		xdg-1.4
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.1
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libart2+=	libart2>=2.3.11
-.include "../../graphics/libart2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libart+=	libart>=2.3.11
+.include "../../graphics/libart/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/misc/goffice/buildlink3.mk b/misc/goffice/buildlink3.mk
index fde54115757..2e1a6119a95 100644
--- a/misc/goffice/buildlink3.mk
+++ b/misc/goffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2007/06/05 05:37:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2007/09/21 13:04:00 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GOFFICE_BUILDLINK3_MK:=	${GOFFICE_BUILDLINK3_MK}+
@@ -22,16 +22,16 @@ PRINT_PLIST_AWK+=       /^@dirrm lib\/goffice\/0.4.0\/plugins$$/ \
 				  next; }
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/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/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/goffice0.2/Makefile b/misc/goffice0.2/Makefile
index fb3b63a1b5b..1017a4ebe32 100644
--- a/misc/goffice0.2/Makefile
+++ b/misc/goffice0.2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:01 wiz Exp $
 #
 
 DISTNAME=		goffice-0.2.2
 PKGNAME=		goffice0.2-0.2.2
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.2/}
 
@@ -20,16 +20,16 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.3
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/misc/goffice0.2/buildlink3.mk b/misc/goffice0.2/buildlink3.mk
index 9efa65e5432..42489c6bb7f 100644
--- a/misc/goffice0.2/buildlink3.mk
+++ b/misc/goffice0.2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/06/05 05:37:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/09/21 13:04:01 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GOFFICE02_BUILDLINK3_MK:=	${GOFFICE02_BUILDLINK3_MK}+
@@ -17,15 +17,15 @@ BUILDLINK_ABI_DEPENDS.goffice02?=	goffice0.2>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.goffice02?=	../../misc/goffice0.2
 .endif	# GOFFICE02_BUILDLINK3_MK
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/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/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/goffice0.5/Makefile b/misc/goffice0.5/Makefile
index 02367657a14..777d3652a36 100644
--- a/misc/goffice0.5/Makefile
+++ b/misc/goffice0.5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:01 wiz Exp $
 #
 
 DISTNAME=		goffice-0.5.0
 PKGNAME=		goffice0.5-0.5.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/goffice/0.5/}
 
@@ -21,19 +21,19 @@ USE_DIRS+=		xdg-1.4
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pango+=	pango>=1.8.1
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libart2+=	libart2>=2.3.11
-.include "../../graphics/libart2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libart+=	libart>=2.3.11
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/goffice0.5/buildlink3.mk b/misc/goffice0.5/buildlink3.mk
index d4070c89fee..cabff6993c4 100644
--- a/misc/goffice0.5/buildlink3.mk
+++ b/misc/goffice0.5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/05 16:06:25 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:04:01 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GOFFICE0.5_BUILDLINK3_MK:=	${GOFFICE0.5_BUILDLINK3_MK}+
@@ -17,16 +17,16 @@ BUILDLINK_PKGSRCDIR.goffice0.5?=	../../misc/goffice0.5
 .endif	# GOFFICE0.5_BUILDLINK3_MK
 
 #.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/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/libgnomeui/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 8fef9f7fd9b..0140061e8ce 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2007/09/21 13:04:01 wiz Exp $
 #
 
 DISTNAME=		gok-1.2.5
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gok/1.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	gok-1.0.pc.in
 
-GCONF2_SCHEMAS=		gok.schemas
+GCONF_SCHEMAS=		gok.schemas
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
@@ -28,10 +28,10 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/at-spi/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/misc/kchm/Makefile b/misc/kchm/Makefile
index 763be69b89c..f9396fa1648 100644
--- a/misc/kchm/Makefile
+++ b/misc/kchm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/01/26 04:25:46 markd Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:01 wiz Exp $
 #
 
 DISTNAME=	kchm-0.6.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	kde misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kchmnew/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/misc/kchmviewer/Makefile b/misc/kchmviewer/Makefile
index a21c728b550..3dd0cf9c1a3 100644
--- a/misc/kchmviewer/Makefile
+++ b/misc/kchmviewer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/16 17:08:39 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:01 wiz Exp $
 #
 
 DISTNAME=		kchmviewer-3.1
+PKGREVISION=		1
 CATEGORIES=		misc x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kchmviewer/}
 
diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile
index 4632e4f24b3..843d2e7d747 100644
--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/09/19 23:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:04:01 wiz Exp $
 
 DISTNAME=	kdeaccessibility-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc
 COMMENT=	Accessibility support for the KDE integrated X11 desktop
 
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 3c83851bae0..ca21d8bd036 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2007/05/23 13:33:15 markd Exp $
+# $NetBSD: Makefile,v 1.54 2007/09/21 13:04:01 wiz Exp $
 
 DISTNAME=	kdeaddons-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Add ons for the KDE integrated X11 desktop
 
diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile
index dd96e11a341..c37fc20c04a 100644
--- a/misc/kdeadmin3/Makefile
+++ b/misc/kdeadmin3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2007/02/05 20:14:50 markd Exp $
+# $NetBSD: Makefile,v 1.39 2007/09/21 13:04:02 wiz Exp $
 
 DISTNAME=	kdeadmin-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	System administration tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile
index 2080d2db953..e1629464a3a 100644
--- a/misc/kdeartwork3/Makefile
+++ b/misc/kdeartwork3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2007/01/26 03:10:05 markd Exp $
+# $NetBSD: Makefile,v 1.43 2007/09/21 13:04:02 wiz Exp $
 
 DISTNAME=	kdeartwork-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Artwork for the KDE integrated X11 desktop
 
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 0b04caf0c8f..e92eb5c2c99 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2007/01/26 03:12:58 markd Exp $
+# $NetBSD: Makefile,v 1.45 2007/09/21 13:04:02 wiz Exp $
 
 DISTNAME=	kdeedu-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index bd06189bfed..fc6a2fc8195 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2007/06/13 13:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.77 2007/09/21 13:04:02 wiz Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Personal Information Management tools for the KDE desktop
 
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index aedc1b0a653..580ddd07a0c 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2007/06/06 11:10:33 markd Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/21 13:04:02 wiz Exp $
 
 DISTNAME=	kdeutils-${_KDE_VERSION}
+PKGREVISION=	1
 COMMENT=	Utilities for the KDE integrated X11 desktop
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
diff --git a/misc/kmemaid/Makefile b/misc/kmemaid/Makefile
index 76654ddc409..11560ee3284 100644
--- a/misc/kmemaid/Makefile
+++ b/misc/kmemaid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/01/26 04:25:46 markd Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:02 wiz Exp $
 #
 
 DISTNAME=		kmemaid-0.4.7.0
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=memaid/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 93370cc2565..210c79284ff 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2007/09/19 23:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2007/09/21 13:04:02 wiz Exp $
 
 DISTNAME=	koffice-1.6.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.3/src/}
 EXTRACT_SUFX=	.tar.bz2
@@ -61,7 +61,7 @@ post-install:
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../print/poppler-qt/buildlink3.mk"
diff --git a/misc/koffice/buildlink3.mk b/misc/koffice/buildlink3.mk
index 79665640aa3..12643210691 100644
--- a/misc/koffice/buildlink3.mk
+++ b/misc/koffice/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/06/05 05:37:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:03 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KOFFICE_BUILDLINK3_MK:=	${KOFFICE_BUILDLINK3_MK}+
@@ -23,7 +23,7 @@ BUILDLINK_PKGSRCDIR.koffice?=	../../misc/koffice
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 6e33cf85a8d..aa5b953d858 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:04:03 wiz Exp $
 #
 
 OO_VER=			2.2.1
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_OPENOFFICE:=stable/${OO_VER}/}
 DIST_SUBDIR=		${DISTNAME}
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index c585bec40b7..029f1f3de79 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/08/05 19:07:54 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:04:03 wiz Exp $
 #
 
 DISTNAME=	orca-2.18.1
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/orca/2.18/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/misc/taskjuggler/Makefile b/misc/taskjuggler/Makefile
index 7439dbc5808..0bb6494534b 100644
--- a/misc/taskjuggler/Makefile
+++ b/misc/taskjuggler/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/04/01 09:32:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/09/21 13:04:03 wiz Exp $
 #
 
 DISTNAME=	taskjuggler-2.3.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.taskjuggler.org/download/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index c3c02cbb8c3..130cacdf8dd 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/09/19 23:13:24 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:04:03 wiz Exp $
 #
 
 DISTNAME=		yelp-2.18.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -23,7 +23,7 @@ GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 
-GCONF2_SCHEMAS=		yelp.schemas
+GCONF_SCHEMAS=		yelp.schemas
 
 .include "options.mk"
 
@@ -37,10 +37,10 @@ BUILDLINK_DEPMETHOD.gnome-doc-utils+=	full
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../archivers/bzip2/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/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"