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

Bump PKGREVISION.

14 files changed, 47 insertions, 45 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 895e0053b17..d6cc044268f 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:32 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:04:26 wiz Exp $
 
 DISTNAME=	bluefish-1.0.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://bluefish.mrball.net/stable/source/               \
 		ftp://ftp.ratisbona.com/pub/bluefish/stable/source/     \
diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile
index 3bb2c7df7ad..e2e3952c14e 100644
--- a/www/browser-bookmarks-menu/Makefile
+++ b/www/browser-bookmarks-menu/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/05/08 13:09:39 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:26 wiz Exp $
 #
 
 DISTNAME=	browser-bookmarks-menu-0.6
+PKGREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=browserbookapp/}
 
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 7ca484dff8c..1c934d18d2d 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2007/09/19 23:13:33 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/09/21 13:04:26 wiz Exp $
 #
 
 DISTNAME=	drivel-2.0.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=drivel/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,16 +18,16 @@ USE_PKGLOCALEDIR=	YES
 
 CPPFLAGS.NetBSD+=	-D_NETBSD_SOURCE
 
-GCONF2_SCHEMAS=		drivel.schemas
+GCONF_SCHEMAS=		drivel.schemas
 
 BUILDLINK_API_DEPENDS.curl+=	curl>=7.14.0nb1
 
 .include "../../databases/shared-mime-info/mimedb.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/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 0f0fb6ffd5d..97d714dd74b 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/09/19 23:19:10 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:04:27 wiz Exp $
 #
 
 DISTNAME=	epiphany-extensions-2.18.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,16 +21,16 @@ USE_LANGUAGES=		c c++
 CONFIGURE_ARGS+=	--enable-compile-warnings=no
 CONFIGURE_ARGS+=	--with-extensions=all
 
-GCONF2_SCHEMAS=		smart-bookmarks.schemas
+GCONF_SCHEMAS=		smart-bookmarks.schemas
 
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.8.0
 
-.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/pcre/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 6d3982a5ef5..4269b59bce5 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2007/09/19 23:13:33 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:04:26 wiz Exp $
 #
 
 DISTNAME=	epiphany-2.18.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,10 +22,10 @@ PKGCONFIG_OVERRIDE=	data/epiphany-2.16.pc
 
 .include "options.mk"
 
-GCONF2_SCHEMAS=		epiphany.schemas
-GCONF2_SCHEMAS+=	epiphany-fonts.schemas
-GCONF2_SCHEMAS+=	epiphany-lockdown.schemas
-GCONF2_SCHEMAS+=	epiphany-pango.schemas
+GCONF_SCHEMAS=		epiphany.schemas
+GCONF_SCHEMAS+=	epiphany-fonts.schemas
+GCONF_SCHEMAS+=	epiphany-lockdown.schemas
+GCONF_SCHEMAS+=	epiphany-pango.schemas
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.12.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.10.0
@@ -34,11 +34,11 @@ BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
 BUILDLINK_API_DEPENDS.libxml2+=		libxml2>=2.6.12
 
-.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/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
index 14bacafcd89..3e01b23b43e 100644
--- a/www/epiphany/buildlink3.mk
+++ b/www/epiphany/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.24 2007/09/19 23:13:34 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2007/09/21 13:04:27 wiz Exp $
 #
 # This Makefile fragment is included by packages that use epiphany.
 #
@@ -21,9 +21,9 @@ BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/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 "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index f5d1de5b0f3..e07906f4c58 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.110 2007/09/19 23:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2007/09/21 13:04:27 wiz Exp $
 #
 
 DISTNAME=		galeon-2.0.3
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=galeon/}
 EXTRACT_SUFX=		.tar.bz2
@@ -22,13 +22,13 @@ GNU_CONFIGURE=		yes
 
 .include "options.mk"
 
-GCONF2_SCHEMAS=		galeon.schemas
+GCONF_SCHEMAS=		galeon.schemas
 
 EGDIR=			${PREFIX}/share/examples/galeon
 CONF_FILES=		${EGDIR}/sound/events/galeon.soundlist \
 			${PKG_SYSCONFDIR}/sound/events/galeon.soundlist
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/www/gtkhtml314/Makefile b/www/gtkhtml314/Makefile
index 8d625f2ac44..e0d5c6b7e73 100644
--- a/www/gtkhtml314/Makefile
+++ b/www/gtkhtml314/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:04:27 wiz Exp $
 #
 
 DISTNAME=	gtkhtml-3.14.3
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml314/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
 .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 "../../devel/pango/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/www/gtkhtml314/buildlink3.mk b/www/gtkhtml314/buildlink3.mk
index 28e7be7fe6d..11df9e3b5ce 100644
--- a/www/gtkhtml314/buildlink3.mk
+++ b/www/gtkhtml314/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2007/06/05 05:37:12 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2007/09/21 13:04:27 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML314_BUILDLINK3_MK:=	${GTKHTML314_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.gtkhtml314?=	../../www/gtkhtml314
 # '-lgailutil' in the .la file...  I'm not sure about putting the dependency
 # here.
 .include "../../devel/gail/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index c21f078f9e6..7c4766cabe8 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:27 wiz Exp $
 #
 
 DISTNAME=	gtkhtml-3.12.3
 PKGNAME=	${DISTNAME:S/gtkhtml/gtkhtml38/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtkhtml/3.12/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
 .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 "../../devel/pango/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
diff --git a/www/gtkhtml38/buildlink3.mk b/www/gtkhtml38/buildlink3.mk
index 7a7467ebb44..384a8cea2b8 100644
--- a/www/gtkhtml38/buildlink3.mk
+++ b/www/gtkhtml38/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2007/06/05 05:37:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:28 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GTKHTML38_BUILDLINK3_MK:=	${GTKHTML38_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.gtkhtml38?=	../../www/gtkhtml38
 # '-lgailutil' in the .la file...  I'm not sure about putting the dependency
 # here.
 .include "../../devel/gail/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
 
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index c20ed543b68..f0c6df99b3c 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/02/22 19:27:20 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:28 wiz Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	www
 COMMENT=	HTML editor and tools suitable for experienced web developers
 
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index b5a9fe54c7b..30e901ba35d 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2007/09/19 23:13:34 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2007/09/21 13:04:28 wiz Exp $
 #
 
 DISTNAME=	libgtkhtml-2.6.3
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	www devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgtkhtml/2.6/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index f25d4e2751b..5dc50fb2163 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2007/09/19 23:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2007/09/21 13:04:28 wiz Exp $
 
 DISTNAME=		liferea-1.2.23
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
@@ -17,9 +17,9 @@ USE_PKGLOCALEDIR=	yes
 
 SHLIBTOOL_OVERRIDE=	# empty
 
-GCONF2_SCHEMAS=		liferea.schemas
+GCONF_SCHEMAS=		liferea.schemas
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"