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

Bump PKGREVISION.

20 files changed, 66 insertions, 63 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index 658782c4f37..188ea1b35b1 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2007/09/09 16:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:41 wiz Exp $
 
 DISTNAME=	asc-source-1.16.4.0
 PKGNAME=	${DISTNAME:S/-source//}
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=asc-hq/}
 EXTRACT_SUFX=	.tar.bz2
@@ -39,7 +40,7 @@ post-install:
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDLmm/buildlink3.mk"
-.include "../../devel/libsigc++/buildlink3.mk"
+.include "../../devel/libsigc++1/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../multimedia/smpeg/buildlink3.mk"
 .include "../../x11/paragui/buildlink3.mk"
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index c307675d472..1d2843c80fd 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:42 wiz Exp $
 #
 
 DISTNAME=		atomix-2.14.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atomix/2.14/}
 
diff --git a/games/boson/Makefile b/games/boson/Makefile
index 4d88b84a318..7dbc2b419a8 100644
--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2007/01/26 04:03:20 markd Exp $
+# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:42 wiz Exp $
 #
 
 DISTNAME=		boson-all-0.8
 PKGNAME=		${DISTNAME:S/-all//}
-PKGREVISION=		14
+PKGREVISION=		15
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=boson/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 6c43fa8c1a4..f923b94c4ec 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/05/23 20:25:40 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/09/21 13:03:42 wiz Exp $
 
 DISTNAME=	ccgo-0.3.6.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://ccdw.org/~cjj/prog/ccgo/src/
 
diff --git a/games/gamazons/Makefile b/games/gamazons/Makefile
index fac9c44546e..cabb0d8c6a0 100644
--- a/games/gamazons/Makefile
+++ b/games/gamazons/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/19 23:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:42 wiz Exp $
 #
 
 DISTNAME=	gamazons-0.83
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://www.yorgalily.org/gamazons/src/
 
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index bb6b071c284..55750b7b2c2 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/09/19 23:18:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:42 wiz Exp $
 
 DISTNAME=	gcompris-8.3.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gcompris/}
 
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 536569b3c13..5b77d445205 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:42 wiz Exp $
 
 DISTNAME=		gnome-games-2.18.2.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -36,23 +36,23 @@ CONF_FILES+=		${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile}
 
 FILES_SUBST+=		INSTALL=${INSTALL:Q}
 
-GCONF2_SCHEMAS=		aisleriot.schemas
-GCONF2_SCHEMAS+=	blackjack.schemas
-GCONF2_SCHEMAS+=	glchess.schemas
-GCONF2_SCHEMAS+=	glines.schemas
-GCONF2_SCHEMAS+=	gnect.schemas
-GCONF2_SCHEMAS+=	gnibbles.schemas
-GCONF2_SCHEMAS+=	gnobots2.schemas
-GCONF2_SCHEMAS+=	gnometris.schemas
-GCONF2_SCHEMAS+=	gnomine.schemas
-GCONF2_SCHEMAS+=	gnotski.schemas
-GCONF2_SCHEMAS+=	gnotravex.schemas
-GCONF2_SCHEMAS+=	gnotski.schemas
-GCONF2_SCHEMAS+=	gtali.schemas
-GCONF2_SCHEMAS+=	iagno.schemas
-GCONF2_SCHEMAS+=	libgnomegames.schemas
-GCONF2_SCHEMAS+=	mahjongg.schemas
-GCONF2_SCHEMAS+=	same-gnome.schemas
+GCONF_SCHEMAS=		aisleriot.schemas
+GCONF_SCHEMAS+=	blackjack.schemas
+GCONF_SCHEMAS+=	glchess.schemas
+GCONF_SCHEMAS+=	glines.schemas
+GCONF_SCHEMAS+=	gnect.schemas
+GCONF_SCHEMAS+=	gnibbles.schemas
+GCONF_SCHEMAS+=	gnobots2.schemas
+GCONF_SCHEMAS+=	gnometris.schemas
+GCONF_SCHEMAS+=	gnomine.schemas
+GCONF_SCHEMAS+=	gnotski.schemas
+GCONF_SCHEMAS+=	gnotravex.schemas
+GCONF_SCHEMAS+=	gnotski.schemas
+GCONF_SCHEMAS+=	gtali.schemas
+GCONF_SCHEMAS+=	iagno.schemas
+GCONF_SCHEMAS+=	libgnomegames.schemas
+GCONF_SCHEMAS+=	mahjongg.schemas
+GCONF_SCHEMAS+=	same-gnome.schemas
 
 PYTHON_PATCH_SCRIPTS+=	libgames-support/games-server.py
 PYTHON_PATCH_SCRIPTS+=	glchess/src/glchess
@@ -65,11 +65,11 @@ BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.10.0
 BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.12.6
 
 .include "../../audio/esound/buildlink3.mk"
-.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 "../../graphics/cairo/buildlink3.mk"
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index f54d031aea1..1ab2abe09a3 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2007/09/19 23:18:51 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2007/09/21 13:03:42 wiz Exp $
 #
 
 DISTNAME=		grhino-0.15.1
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rhino/}
 
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 49704a570b2..d8693c64645 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/09/19 23:18:51 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:42 wiz Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.11
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtetrinet/0.7/}
 
@@ -27,10 +27,10 @@ PKG_SUPPORTED_OPTIONS=	inet6
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
-GCONF2_SCHEMAS=		gtetrinet.schemas
+GCONF_SCHEMAS=		gtetrinet.schemas
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 968d452a408..ed5ee45c6a6 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2007/09/19 23:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:43 wiz Exp $
 #
 
 DISTNAME=		gturing-0.1.1
-PKGREVISION=		23
+PKGREVISION=		24
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gturing/0.1/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 495ac8bc05d..ee228a29f38 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2007/01/26 03:23:18 markd Exp $
+# $NetBSD: Makefile,v 1.45 2007/09/21 13:03:43 wiz Exp $
 
 DISTNAME=	kdegames-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	games
 COMMENT=	Games for the KDE integrated X11 desktop
 
diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile
index 0ad545213ac..4cec7bf0093 100644
--- a/games/kdetoys3/Makefile
+++ b/games/kdetoys3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2007/01/26 03:25:23 markd Exp $
+# $NetBSD: Makefile,v 1.38 2007/09/21 13:03:43 wiz Exp $
 
 DISTNAME=	kdetoys-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	games
 COMMENT=	Toys for the KDE integrated X11 desktop
 
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 48b1862bdb8..38d1d5fe2bd 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/02/22 19:26:30 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/09/21 13:03:43 wiz Exp $
 
 DISTNAME=	knights-0.6
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=knights/}
 
diff --git a/games/kye/Makefile b/games/kye/Makefile
index d5f98430b95..4fd0eaafd80 100644
--- a/games/kye/Makefile
+++ b/games/kye/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:03:44 wiz Exp $
 #
 
 DISTNAME=		kye-0.9.3
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		games
 MASTER_SITES=		http://games.moria.org.uk/kye/
 
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 67105ff1e32..bc5b2b4da4d 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2007/09/19 23:18:52 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:44 wiz Exp $
 #
 
 DISTNAME=	pioneers-0.9.55
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pio/}
 
diff --git a/games/pytraffic/Makefile b/games/pytraffic/Makefile
index f4f6512a80a..95f7fde5b1e 100644
--- a/games/pytraffic/Makefile
+++ b/games/pytraffic/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/03/31 16:26:55 obache Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:44 wiz Exp $
 #
 
 DISTNAME=		pytraffic-2.5.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=	http://alpha.uhasselt.be/Research/Algebra/Members/pytraffic/
 
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index cf72fe33f2b..1f893907e7d 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2007/09/19 23:18:53 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:45 wiz Exp $
 #
 
 DISTNAME=	sirius-0.8.0
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	games gnome
 MASTER_SITES=	http://sirius.bitvis.nu/files/
 
@@ -16,7 +16,7 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
diff --git a/games/six/Makefile b/games/six/Makefile
index 3613d3ba314..ba50e923745 100644
--- a/games/six/Makefile
+++ b/games/six/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/09/04 19:36:46 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/09/21 13:03:45 wiz Exp $
 #
 
 DISTNAME=	six-0.5.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://six.retes.hu/download/
 
diff --git a/games/teg/Makefile b/games/teg/Makefile
index aa42b48e724..2f943104688 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2007/09/19 23:18:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:45 wiz Exp $
 
 DISTNAME=		teg-0.11.1
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=teg/}
 
@@ -15,8 +15,8 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		intltool msgfmt pkg-config
 
-GCONF2_SCHEMAS+=	teg.schemas
+GCONF_SCHEMAS+=	teg.schemas
 
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/wormux/Makefile b/games/wormux/Makefile
index 592162c9d11..78a82a6a607 100644
--- a/games/wormux/Makefile
+++ b/games/wormux/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/09/20 21:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:45 wiz Exp $
 #
 
 DISTNAME=	wormux-0.7.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/wormux/