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

Bump PKGREVISION.

19 files changed, 57 insertions, 54 deletions

diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 8782e76a18a..45ef0211304 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/02/22 19:01:23 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:05 wiz Exp $
 #
 
 DISTNAME=	DVDStyler-1.5b4
 PKGNAME=	dvdstyler-1.5beta4
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index e2c84ae9b19..29e1948b24a 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2007/09/19 23:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/09/21 13:04:05 wiz Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gmencoder/}
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 1f7b395cc2b..31338f86d32 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/06/17 10:18:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/09/21 13:04:06 wiz Exp $
 #
 
 DISTNAME=		gnash-0.8.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_GNU:=gnash/0.8.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index b7bf51e3965..c960e793e0e 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/21 13:04:06 wiz Exp $
 
 DISTNAME=		gnome-media-2.18.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.18/}
 EXTRACT_SUFX=		.tar.bz2
@@ -27,10 +27,10 @@ CONFIGURE_ENV+=		XGETTEXT=${TOOLS_PATH.xgettext:Q}
 CONFIGURE_ENV+=		CDROM_HOST="bsd"
 .endif
 
-GCONF2_SCHEMAS=		CDDB-Slave2.schemas
-GCONF2_SCHEMAS+=	gnome-audio-profiles.schemas
-GCONF2_SCHEMAS+=	gnome-sound-recorder.schemas
-GCONF2_SCHEMAS+=	gnome-volume-control.schemas
+GCONF_SCHEMAS=		CDDB-Slave2.schemas
+GCONF_SCHEMAS+=	gnome-audio-profiles.schemas
+GCONF_SCHEMAS+=	gnome-sound-recorder.schemas
+GCONF_SCHEMAS+=	gnome-volume-control.schemas
 
 BUILDLINK_API_DEPENDS.esound+=			esound>=0.2.23
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.3
@@ -40,12 +40,12 @@ BUILDLINK_API_DEPENDS.libgnome+=		libgnome>=2.13.7
 BUILDLINK_API_DEPENDS.libgnomeui+=		libgnomeui>=2.13.2
 
 .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/gail/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 "../../devel/libbonobo/buildlink3.mk"
diff --git a/multimedia/gnome-media/buildlink3.mk b/multimedia/gnome-media/buildlink3.mk
index 363e17cba9a..b047e3ad896 100644
--- a/multimedia/gnome-media/buildlink3.mk
+++ b/multimedia/gnome-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/19 23:41:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/09/21 13:04:06 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MEDIA_BUILDLINK3_MK:=	${GNOME_MEDIA_BUILDLINK3_MK}+
@@ -17,8 +17,8 @@ BUILDLINK_ABI_DEPENDS.gnome-media?=	gnome-media>=2.18.0nb1
 BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome-media
 .endif	# GNOME_MEDIA_BUILDLINK3_MK
 
-.include "../../devel/GConf2-ui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/GConf-ui/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/multimedia/gst-plugins0.10-good/Makefile b/multimedia/gst-plugins0.10-good/Makefile
index 3cea64393b9..43e5f39ff42 100644
--- a/multimedia/gst-plugins0.10-good/Makefile
+++ b/multimedia/gst-plugins0.10-good/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/07/06 19:13:13 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/21 13:04:06 wiz Exp $
 #
 
 .include "Makefile.common"
@@ -12,20 +12,20 @@ CONFIGURE_ARGS+=	--enable-gconf
 CONFIGURE_ARGS+=	--enable-gconftool
 CONFIGURE_ARGS+=	--enable-zlib
 
-# We depend on libxml anyway (indirectly through GConf2), so this
+# We depend on libxml anyway (indirectly through GConf), so this
 # doesn't hurt. Just make it explicite.
 CONFIGURE_ARGS+=	--enable-annodex
 .include "../../textproc/libxml2/buildlink3.mk"
 
-GCONF2_SCHEMAS=		gstreamer-0.10.schemas
+GCONF_SCHEMAS=		gstreamer-0.10.schemas
 
 # only useful if gstreamer was built with the "gstcheck" option
 TEST_TARGET=		check-torture
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gconf/gstreamer-0.10.schemas \
-		${GCONF2_SCHEMAS_DIR}
+		${GCONF_SCHEMAS_DIR}
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.8/Makefile b/multimedia/gst-plugins0.8/Makefile
index 9c53cd66c5e..d2c72f6c326 100644
--- a/multimedia/gst-plugins0.8/Makefile
+++ b/multimedia/gst-plugins0.8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/09/19 23:19:03 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:04:07 wiz Exp $
 #
 
 USE_LANGUAGES=		c c++
@@ -6,7 +6,7 @@ USE_LANGUAGES=		c c++
 .include "Makefile.common"
 
 COMMENT+=		base plugins
-PKGREVISION=		8
+PKGREVISION=		9
 
 USE_TOOLS+=		perl:run
 
@@ -24,12 +24,12 @@ CONFIGURE_ARGS+=	--enable-xshm
 CONFIGURE_ARGS+=	--enable-xvideo
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/gst-plugins-0.8
 
-GCONF2_SCHEMAS=		gstreamer-0.8.schemas
+GCONF_SCHEMAS=		gstreamer-0.8.schemas
 
 REPLACE_PERL+=		tools/gst-launch-ext-m.m
 REPLACE_PERL+=		tools/gst-visualise-m.m
 
-.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/GConf/schemas.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
diff --git a/multimedia/gst-plugins0.8/buildlink3.mk b/multimedia/gst-plugins0.8/buildlink3.mk
index af15d1a3c95..e75bb12ca51 100644
--- a/multimedia/gst-plugins0.8/buildlink3.mk
+++ b/multimedia/gst-plugins0.8/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2007/06/05 05:37:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:04:07 wiz Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_BUILDLINK3_MK:=	${GST_PLUGINS0.8_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.gst-plugins0.8?=	../../multimedia/gst-plugins0.8
 .endif	# GST_PLUGINS0.8_BUILDLINK3_MK
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../multimedia/gstreamer0.8/buildlink3.mk"
diff --git a/multimedia/gstreamer0.8/Makefile b/multimedia/gstreamer0.8/Makefile
index 177423fa4f1..bb49d43440d 100644
--- a/multimedia/gstreamer0.8/Makefile
+++ b/multimedia/gstreamer0.8/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/09/21 13:04:07 wiz Exp $
 #
 
 DISTNAME=		gstreamer-0.8.11
 PKGNAME=		${DISTNAME:S/gstreamer/gstreamer0.8/}
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gstreamer/0.8/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 393278a3a7e..8a103934049 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2007/05/22 10:50:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2007/09/21 13:04:07 wiz Exp $
 #
 
 DISTNAME=	kaffeine-0.8.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kaffeine/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 465db823ea4..90228f8ebd0 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2007/05/23 13:16:11 markd Exp $
+# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:07 wiz Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 129d98bdc49..dbf7ce48cc6 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2007/05/05 21:43:36 markd Exp $
+# $NetBSD: Makefile,v 1.42 2007/09/21 13:04:08 wiz Exp $
 #
 
 DISTNAME=	kmplayer-0.9.4a
+PKGREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index 5f2a0573c29..eb928ed42c6 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2007/08/19 06:27:10 veego Exp $
+# $NetBSD: Makefile,v 1.16 2007/09/21 13:04:08 wiz Exp $
 
 DISTNAME=	ogle_gui-0.9.2
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--enable-gtk2
 
 GCC_REQD+=		2.95.3
 
-.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
 .include "../../multimedia/ogle/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index adbd168ae41..812d21a1c6e 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/08 11:33:55 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:08 wiz Exp $
 #
 
 DISTNAME=		subtitleeditor-0.13.6
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		http://kitone.free.fr/subtitleeditor/files/
 
diff --git a/multimedia/swfdec-gtk2/Makefile b/multimedia/swfdec-gtk2/Makefile
index cb5afd00064..eae706ce6c7 100644
--- a/multimedia/swfdec-gtk2/Makefile
+++ b/multimedia/swfdec-gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/09/24 15:25:18 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/09/21 13:04:09 wiz Exp $
 #
 
-PKGREVISION=		9
+PKGREVISION=		10
 
 .include "../../multimedia/swfdec/Makefile.common"
 
diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile
index 2af63730ff2..0732d3060f3 100644
--- a/multimedia/swfdec/Makefile
+++ b/multimedia/swfdec/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2006/06/12 16:28:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/09/21 13:04:09 wiz Exp $
 #
 
-PKGREVISION=		7
+PKGREVISION=		8
 
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=	--disable-pixbuf-loader
 
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index 649b1a1c476..102339cd0ab 100644
--- a/multimedia/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:02 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/09/21 13:04:09 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWFDEC_BUILDLINK3_MK:=	${SWFDEC_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.swfdec?=	../../multimedia/swfdec
 .endif	# SWFDEC_BUILDLINK3_MK
 
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/libart2/buildlink3.mk"
+.include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index b26a22ddb5b..2d7699322dd 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2007/09/19 23:19:04 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:09 wiz Exp $
 #
 
 .include "Makefile.common"
 
 COMMENT+=	(using GStreamer)
-PKGREVISION=	1
+PKGREVISION=	2
 
 CONFLICTS+=	totem-xine-[0-9]*
 
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 3d94305fcd5..040b3ddb48d 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.34 2007/09/20 21:37:38 wiz Exp $
+# $NetBSD: Makefile.common,v 1.35 2007/09/21 13:04:09 wiz Exp $
 #
 
 DISTNAME=	totem-2.18.2
@@ -23,19 +23,19 @@ USE_LANGUAGES=		c c++
 
 PKGCONFIG_OVERRIDE=	totem-plparser.pc.in
 
-GCONF2_SCHEMAS=		totem.schemas
-GCONF2_SCHEMAS+=	totem-handlers.schemas
-GCONF2_SCHEMAS+=	totem-video-thumbnail.schemas
+GCONF_SCHEMAS=		totem.schemas
+GCONF_SCHEMAS+=	totem-handlers.schemas
+GCONF_SCHEMAS+=	totem-video-thumbnail.schemas
 
 BUILDLINK_API_DEPENDS.glib2+=			glib2>=2.8.0
 BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=		gnome-vfs>=2.8.2
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.6.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/libgnomeui/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"