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

Bump PKGREVISION.

10 files changed, 28 insertions, 25 deletions

diff --git a/databases/gourmet/Makefile b/databases/gourmet/Makefile
index ec954cc1516..31a79569eb0 100644
--- a/databases/gourmet/Makefile
+++ b/databases/gourmet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/04/17 13:46:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:30 wiz Exp $
 #
 
 DISTNAME=		gourmet-0.8.5.14
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=grecipe-manager/}
 
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index a71a5a8fa52..8ee67dbffd4 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2007/09/19 23:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:03:30 wiz Exp $
 #
 
 DISTNAME=		gramps-1.0.11
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 69df1502253..248c608f5a0 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/09/19 23:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/09/21 13:03:31 wiz Exp $
 #
 
 DISTNAME=		gramps-2.2.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gramps/}
 
@@ -22,7 +22,7 @@ CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
 PYTHON_VERSIONS_ACCEPTED=	24
 
 MESSAGE_SUBST+=		PYPKGPREFIX=${PYPKGPREFIX}
-GCONF2_SCHEMAS+=	gramps.schemas
+GCONF_SCHEMAS+=	gramps.schemas
 
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
@@ -33,7 +33,7 @@ GCONF2_SCHEMAS+=	gramps.schemas
 .include "../../x11/py-gnome2/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile
index 77d7f8a3bca..160c8974d5b 100644
--- a/databases/kmysqladmin/Makefile
+++ b/databases/kmysqladmin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2007/02/22 19:26:18 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/21 13:03:32 wiz Exp $
 
 DISTNAME=	kmysqladmin-0.7.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	databases kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/kmysqladmin/
 
diff --git a/databases/krecipes/Makefile b/databases/krecipes/Makefile
index b3396b5a3a6..40882dfa627 100644
--- a/databases/krecipes/Makefile
+++ b/databases/krecipes/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/02/08 20:17:53 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:32 wiz Exp $
 #
 
 DISTNAME=		krecipes-1.0-beta1
+PKGREVISION=		1
 CATEGORIES=		databases kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=krecipes/}
 
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 3dec2897c4c..26de8d00df4 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2007/08/04 11:23:32 obache Exp $
+# $NetBSD: Makefile,v 1.64 2007/09/21 13:03:32 wiz Exp $
 #
 
 DISTNAME=		libgnomedb-3.0.0
+PKGREVISION=		1
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomedb/3.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -19,14 +20,14 @@ GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	libgnomedb-3.0.pc.in libgnomedb-extra-3.0.pc.in \
 			libgnomedb-graph-3.0.pc.in
 
-GCONF2_SCHEMAS=		libgnomedb-3.0.schemas
+GCONF_SCHEMAS=		libgnomedb-3.0.schemas
 
 BUILDLINK_API_DEPENDS.libgda+=	libgda>=3.0.0
 .include "../../databases/libgda/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/GConf/schemas.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/databases/libgnomedb/buildlink3.mk b/databases/libgnomedb/buildlink3.mk
index 7a8d8b09cef..85ae9b918a9 100644
--- a/databases/libgnomedb/buildlink3.mk
+++ b/databases/libgnomedb/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2007/08/04 11:23:32 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2007/09/21 13:03:32 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEDB_BUILDLINK3_MK:=	${LIBGNOMEDB_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libgnomedb?=	../../databases/libgnomedb
 
 .include "../../databases/libgda/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtksourceview/buildlink3.mk"
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index b443dbc51b2..de5000f2a17 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2007/09/19 23:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/21 13:03:32 wiz Exp $
 #
 
 DISTNAME=		mergeant-0.66
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.66/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,9 +20,9 @@ USE_LIBTOOL=		YES
 
 .include "../../databases/libgda/buildlink3.mk"
 .include "../../databases/libgnomedb/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 4b412831cac..41f882ee130 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2007/05/30 07:32:33 martti Exp $
+# $NetBSD: Makefile,v 1.58 2007/09/21 13:03:33 wiz Exp $
 
 DISTNAME=	rrdtool-1.2.23
+PKGREVISION=	1
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -33,7 +34,7 @@ SUBST_SED.prefix=	-e '1s,^\#! \$${prefix},\#! ${PREFIX},'
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/rrdtool/buildlink3.mk b/databases/rrdtool/buildlink3.mk
index 4e59351c0b6..e79824022fd 100644
--- a/databases/rrdtool/buildlink3.mk
+++ b/databases/rrdtool/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/05/30 07:27:46 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:03:33 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 RRDTOOL_BUILDLINK3_MK:=	${RRDTOOL_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.rrdtool?=	../../databases/rrdtool
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}