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

Bump PKGREVISION.

20 files changed, 50 insertions, 47 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 12d35d0e03f..852d5e5b275 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.60 2007/08/30 00:01:35 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/21 13:03:26 wiz Exp $
 
 DISTNAME=		amarok-${VERSION}
 VERSION=		1.4.7
+PKGREVISION=		1
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 9c26cb3ea32..b2fe806e851 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:03:26 wiz Exp $
 #
 
 BMP_ENABLE_ENCODERS=	yes
 
 .include "Makefile.common"
 
-PKGREVISION=		3
+PKGREVISION=		4
 
 DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 836b8c08721..65cee46b647 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2007/09/19 23:13:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.24 2007/09/21 13:03:26 wiz Exp $
 #
 
 DISTNAME=	bmp-0.9.7.1
@@ -52,7 +52,7 @@ PKG_SUPPORTED_OPTIONS=	gnome inet6 xmms-eq
 .if !empty(PKG_OPTIONS:Mgnome)
 CONFIGURE_ARGS+=	--enable-gconf
 CONFIGURE_ARGS+=	--enable-gnome-vfs
-.  include "../../devel/GConf2/buildlink3.mk"
+.  include "../../devel/GConf/buildlink3.mk"
 .  include "../../sysutils/gnome-vfs/buildlink3.mk"
 .endif
 
@@ -91,7 +91,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../converters/libiconv/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/pango/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index 00253f163f0..f75eee99f07 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:26 wiz Exp $
 #
 
 DISTNAME=	bmpx-0.40.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://files.beep-media-player.org/releases/0.40/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
index b365a535aae..d1ad1e7cb88 100644
--- a/audio/cdplayer/Makefile
+++ b/audio/cdplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:26 wiz Exp $
 #
 
 DISTNAME=	cdplayer-0.4.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 9ea70a3761b..78a1252ad6a 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2007/09/03 10:21:08 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2007/09/21 13:03:26 wiz Exp $
 #
 
 DISTNAME=	exaile_0.2.10
 PKGNAME=	exaile-0.2.10
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.exaile.org/files/
 
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 70020af0721..fe0666c697d 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/07/05 05:37:39 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:03:26 wiz Exp $
 #
 
 DISTNAME=	glurp-0.11.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glurp/}
 
@@ -15,6 +15,6 @@ USE_DIRS+=	xdg-1.1
 USE_TOOLS+=	intltool pkg-config
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index c002bed8a96..b8e49754738 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2007/09/19 23:13:12 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/09/21 13:03:26 wiz Exp $
 #
 
 DISTNAME=		gmpc-0.13.0
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		http://download.qballcow.nl/programs/gmpc-0.13/
 
@@ -19,7 +19,7 @@ USE_DIRS+=		xdg-1.1
 
 .include "../../audio/libmpd/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/gst-plugins0.8-artsd/Makefile b/audio/gst-plugins0.8-artsd/Makefile
index 07278cdb1f2..a17e3104cf1 100644
--- a/audio/gst-plugins0.8-artsd/Makefile
+++ b/audio/gst-plugins0.8-artsd/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:03:27 wiz Exp $
 #
 
 GST_PLUGINS0.8_NAME=	artsd
 GST_PLUGINS0.8_DIR=	ext/artsd
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		5
+PKGREVISION=		6
 
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/arts/buildlink3.mk"
diff --git a/audio/gst-plugins0.8-esound/Makefile b/audio/gst-plugins0.8-esound/Makefile
index 4568ec86115..f8f82111632 100644
--- a/audio/gst-plugins0.8-esound/Makefile
+++ b/audio/gst-plugins0.8-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:03:27 wiz Exp $
 #
 
 GST_PLUGINS0.8_NAME=	esound
@@ -6,7 +6,7 @@ GST_PLUGINS0.8_DIR=	ext/esd
 GST_PLUGINS0.8_FLAG=	esd
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		5
+PKGREVISION=		6
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-mad/Makefile b/audio/gst-plugins0.8-mad/Makefile
index 861a502d884..8e52c9cdde7 100644
--- a/audio/gst-plugins0.8-mad/Makefile
+++ b/audio/gst-plugins0.8-mad/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2006/04/17 14:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:03:27 wiz Exp $
 #
 
 GST_PLUGINS0.8_NAME=	mad
 GST_PLUGINS0.8_DIR=	ext/mad
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		5
+PKGREVISION=		6
 
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index c0ce3f30f54..d06ff380ce7 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2007/08/07 00:06:32 smb Exp $
+# $NetBSD: Makefile,v 1.18 2007/09/21 13:03:27 wiz Exp $
 #
 
 DISTNAME=	gtkpod-0.99.8
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkpod/}
-PKGREVISION=	1
 
 PATCHFILES=	gtkpod-0.99.8_libgpod-0.4.2.diff
 PATCH_SITES=	http://ftp.osuosl.org/pub/gentoo/distfiles/
@@ -42,7 +42,7 @@ BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.4.2
 .include "../../devel/atk/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/pango/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 21073fe3697..bc93fed2c33 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/02/22 19:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:03:27 wiz Exp $
 #
 
 DISTNAME=		kid3-0.8.1
+PKGREVISION=		1
 CATEGORIES=		kde audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kid3/}
 
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 1c30055be8f..dd1d29fe15a 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/09/19 23:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/09/21 13:03:27 wiz Exp $
 
 DISTNAME=	liteamp-0.2.4.2
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	http://kldp.net/frs/download.php/1153/
 
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index 0f17ba0ac31..59b0b50618b 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:06 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:03:27 wiz Exp $
 #
 
 DISTNAME=	pymusique-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.pyronecrophilia.com/content/pymusique/
 
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 499aa54ae04..a7218adf562 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2007/09/21 13:03:27 wiz Exp $
 #
 
 DISTNAME=	rhythmbox-0.9.8
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.9/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,17 +23,17 @@ CONFIGURE_ARGS+=	--without-hal
 CONFIGURE_ARGS+=	--without-ipod
 CONFIGURE_ARGS+=	--disable-python
 
-GCONF2_SCHEMAS=		rhythmbox.schemas
+GCONF_SCHEMAS=		rhythmbox.schemas
 
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.6.0
 BUILDLINK_API_DEPENDS.musicbrainz+=	musicbrainz>=2.1.0
 BUILDLINK_API_DEPENDS.totem+=		{totem,totem-xine}>=1.1.5
 
 .include "../../audio/musicbrainz/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/libgnomeui/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 2914595d769..bd837b2f8fb 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2007/08/30 15:46:20 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/09/21 13:03:28 wiz Exp $
 #
 
 DISTNAME=		solfege-3.8.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=solfege/}
 
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 08b493efbb4..b74b86c033d 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/09/20 21:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:03:28 wiz Exp $
 #
 
 DISTNAME=		sound-juicer-2.14.5
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		http://www.burtonini.com/computing/
 
@@ -19,11 +19,11 @@ CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
 MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
 CONFIGURE_ENV+=		GST_INSPECT="${LOCALBASE}/bin/gst-inspect-0.10"
 
-GCONF2_SCHEMAS+=	sound-juicer.schemas
+GCONF_SCHEMAS+=	sound-juicer.schemas
 
 BUILDLINK_API_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.3
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 33f6a20b926..2a640f9a9ef 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2006/11/19 11:50:23 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2007/09/21 13:03:28 wiz Exp $
 #
 
 DISTNAME=	streamtuner-0.99.99
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio www
 MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/
 
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index 430c2572851..638890e62fb 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:13:13 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:03:28 wiz Exp $
 #
 
 DISTNAME=		tunesbrowser-0.3.0
-PKGREVISION=		10
+PKGREVISION=		11
 CATEGORIES=		audio
 MASTER_SITES=		http://craz.net/programs/itunes/files/
 EXTRACT_SUFX=		.tar.bz2
@@ -23,7 +23,7 @@ BUILDLINK_API_DEPENDS.libopendaap+=	libopendaap>=0.4.0
 
 .include "../../multimedia/gst-plugins0.8/buildlink3.mk"
 .include "../../audio/libopendaap/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../multimedia/gstreamer0.8/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/gst-plugins0.8-gnomevfs/buildlink3.mk"