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

Bump PKGREVISION.

6 files changed, 22 insertions, 19 deletions

diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index 403dc4b4070..efded143c5f 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/09/20 21:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:25 wiz Exp $
 #
 
 DISTNAME=	compiz-0.4.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	wm x11
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/app/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,8 +17,8 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
-GCONF2_SCHEMAS+=	gwd.schemas
-GCONF2_SCHEMAS+=	compiz.schemas
+GCONF_SCHEMAS+=	gwd.schemas
+GCONF_SCHEMAS+=	compiz.schemas
 PKGCONFIG_OVERRIDE+=	compiz.pc.in
 PKGCONFIG_OVERRIDE+=	libdecoration/libdecoration.pc.in
 
@@ -56,7 +56,7 @@ PLIST_SUBST+=		KDE="@comment "
 # some plugins do it.
 .include "../../mk/pthread.buildlink3.mk"
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index a5b94483df4..18e4ebb799c 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/10/14 05:02:21 obache Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:04:25 wiz Exp $
 #
 
 DISTNAME=		e16menuedit2-0.0.3
+PKGREVISION=		1
 CATEGORIES=		wm x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
@@ -24,7 +25,7 @@ pre-configure:
 	aclocal; autoheader; automake -a --foreign -i; autoconf
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/gnome-compiz-manager/Makefile b/wm/gnome-compiz-manager/Makefile
index 87d4c7fd111..beb2bb04a48 100644
--- a/wm/gnome-compiz-manager/Makefile
+++ b/wm/gnome-compiz-manager/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/09/20 21:37:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/09/21 13:04:25 wiz Exp $
 #
 
 DISTNAME=	gnome-compiz-manager-0.10.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	wm
 MASTER_SITES=	http://download.gna.org/gcm/gnome-compiz-manager/
 
@@ -15,12 +15,12 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config intltool gmake msgfmt
 USE_DIRS+=	xdg-1.1
 
-GCONF2_SCHEMAS+=	gnome-compiz-preferences.schemas
+GCONF_SCHEMAS+=	gnome-compiz-preferences.schemas
 PKGCONFIG_OVERRIDE+=	gnome-compiz-manager.pc.in
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index bd64a540e40..aedab3bac1b 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2007/07/13 17:27:07 drochner Exp $
+# $NetBSD: Makefile,v 1.72 2007/09/21 13:04:26 wiz Exp $
 #
 
 DISTNAME=	metacity-2.18.5
+PKGREVISION=	1
 CATEGORIES=	wm x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.18/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +19,7 @@ USE_LIBTOOL=		YES
 
 PKGCONFIG_OVERRIDE=	src/libmetacity-private.pc.in
 
-GCONF2_SCHEMAS=		metacity.schemas
+GCONF_SCHEMAS=		metacity.schemas
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -34,7 +35,7 @@ BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.7
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk
index c7785d75f2c..9f23f3ea8fc 100644
--- a/wm/metacity/buildlink3.mk
+++ b/wm/metacity/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/09/21 13:04:26 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 METACITY_BUILDLINK3_MK:=	${METACITY_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.metacity?=	../../wm/metacity
 .endif	# METACITY_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile
index 362037169bf..24bd3968b40 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2007/06/14 09:33:15 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:26 wiz Exp $
 
 DISTNAME=		obconf-2.0.1
+PKGREVISION=		1
 CATEGORIES=		wm
 MASTER_SITES=		http://icculus.org/openbox/obconf/
 # PR pkg/36489
@@ -16,7 +17,7 @@ GNU_CONFIGURE=		YES
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/buildlink3.mk"
 BUILDLINK_API_DEPENDS.openbox+=	openbox>=3.4.2
 .include "../../wm/openbox/buildlink3.mk"