Bump PKGREVISION for libpng shlib name change.

Also add some patches to remove use of deprecated symbols and fix other problems when looking for or compiling against libpng-1.4.x.
author: wiz <wiz> 2010-06-13 22:43:46 +0000
committer: wiz <wiz> 2010-06-13 22:43:46 +0000
commit: c3512e82cfd1ef757581484eb740c7cd398411b9 (patch)
tree: 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /multimedia
parent: e9a8c2a53822e7578f98d3ebcd4e60f3d153b02a (diff)
download: pkgsrc-c3512e82cfd1ef757581484eb740c7cd398411b9.tar.gz
70 files changed, 174 insertions, 116 deletions
diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
index 556eb138bcb..d3739835940 100644
--- a/multimedia/alevt/Makefile
+++ b/multimedia/alevt/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2009/07/22 09:01:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:45:03 wiz Exp $
 
 DISTNAME=	alevt-1.6.1
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.goron.de/~froese/alevt/
 
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index b935c5a6c41..7881d4e0edc 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2009/08/26 19:58:04 sno Exp $
+# $NetBSD: Makefile,v 1.58 2010/06/13 22:45:03 wiz Exp $
 #
 
 DISTNAME=	avidemux_2.4.4
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/avidemux/
 
diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index d6b2a0c7e51..d8e0bbd10f0 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/03/11 04:07:58 obache Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:03 wiz Exp $
 #
 
 DISTNAME=	clutter-gst-1.0.0
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.clutter-project.org/sources/clutter-gst/1.0/
 
diff --git a/multimedia/clutter-gst/buildlink3.mk b/multimedia/clutter-gst/buildlink3.mk
index 21f5f4b8a7d..32f2ac308f4 100644
--- a/multimedia/clutter-gst/buildlink3.mk
+++ b/multimedia/clutter-gst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/03/11 04:07:58 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:03 wiz Exp $
 #
 
 BUILDLINK_TREE+=	clutter-gst
@@ -7,6 +7,7 @@ BUILDLINK_TREE+=	clutter-gst
 CLUTTER_GST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.clutter-gst+=	clutter-gst>=1.0.0
+BUILDLINK_ABI_DEPENDS.clutter-gst?=	clutter-gst>=1.0.0nb1
 BUILDLINK_PKGSRCDIR.clutter-gst?=	../../multimedia/clutter-gst
 
 .include "../../graphics/clutter/buildlink3.mk"
diff --git a/multimedia/clutter08-gst/Makefile b/multimedia/clutter08-gst/Makefile
index 7d352695fe5..93d6ee6c066 100644
--- a/multimedia/clutter08-gst/Makefile
+++ b/multimedia/clutter08-gst/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/10/26 08:35:18 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:03 wiz Exp $
 #
 
 DISTNAME=	clutter-gst-0.8.0
 PKGNAME=	${DISTNAME:S/clutter/clutter08/}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.clutter-project.org/sources/clutter-gst/0.8/
 
diff --git a/multimedia/clutter08-gst/buildlink3.mk b/multimedia/clutter08-gst/buildlink3.mk
index f7216ac7fe4..b9e9c15fe29 100644
--- a/multimedia/clutter08-gst/buildlink3.mk
+++ b/multimedia/clutter08-gst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/26 08:35:18 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:45:03 wiz Exp $
 #
 
 BUILDLINK_TREE+=	clutter08-gst
@@ -7,6 +7,7 @@ BUILDLINK_TREE+=	clutter08-gst
 CLUTTER08_GST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.clutter08-gst+=	clutter08-gst>=0.8.0
+BUILDLINK_ABI_DEPENDS.clutter08-gst?=	clutter08-gst>=0.8.0nb1
 BUILDLINK_PKGSRCDIR.clutter08-gst?=	../../multimedia/clutter08-gst
 
 .include "../../graphics/clutter08/buildlink3.mk"
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index ba50e461484..b06791d5593 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/05/08 16:11:06 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:03 wiz Exp $
 
 DISTNAME=		dvdauthor-0.6.18
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dvdauthor/}
 
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index eb84972812e..8e6161059b5 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/05/07 18:02:53 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:03 wiz Exp $
 #
 
 DISTNAME=	DVDStyler-1.8.0.2
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dvdstyler/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/dvdview/Makefile b/multimedia/dvdview/Makefile
index 956d7fdec01..9e443401085 100644
--- a/multimedia/dvdview/Makefile
+++ b/multimedia/dvdview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/02/11 19:55:00 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:03 wiz Exp $
 
 DISTNAME=	dvdview-1.2.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	multimedia
 MASTER_SITES=	http://rachmaninoff.informatik.uni-mannheim.de/dvdview/data/
 
diff --git a/multimedia/farsight2/Makefile b/multimedia/farsight2/Makefile
index 0fbc31a2517..e44b801329e 100644
--- a/multimedia/farsight2/Makefile
+++ b/multimedia/farsight2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/05 21:51:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:04 wiz Exp $
 #
 
 DISTNAME=	farsight2-0.0.17
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	chat multimedia
 MASTER_SITES=	http://farsight.freedesktop.org/releases/farsight2/
 
diff --git a/multimedia/farsight2/buildlink3.mk b/multimedia/farsight2/buildlink3.mk
index 78190b4b89c..16ef85b66cd 100644
--- a/multimedia/farsight2/buildlink3.mk
+++ b/multimedia/farsight2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/20 14:04:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:45:04 wiz Exp $
 
 BUILDLINK_TREE+=	farsight2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	farsight2
 FARSIGHT2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.farsight2+=	farsight2>=0.0.14
-BUILDLINK_ABI_DEPENDS.farsight2?=	farsight2>=0.0.17nb1
+BUILDLINK_ABI_DEPENDS.farsight2?=	farsight2>=0.0.17nb4
 BUILDLINK_PKGSRCDIR.farsight2?=	../../multimedia/farsight2
 
 # unsure which are needed exactly
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 822c5ae3749..4a375f772ed 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:04 wiz Exp $
 #
 
 DISTNAME=	ffmpegthumbnailer-1.5.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://ffmpegthumbnailer.googlecode.com/files/
 
diff --git a/multimedia/fuppes/Makefile b/multimedia/fuppes/Makefile
index 806b8baec6c..bec42d1fbda 100644
--- a/multimedia/fuppes/Makefile
+++ b/multimedia/fuppes/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:16 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:45:04 wiz Exp $
 #
 
 DISTNAME=	fuppes-0.640
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fuppes/}
 
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 09307ffbb9a..cecf1f01d98 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:04 wiz Exp $
 
 DISTNAME=	fxtv-1.03
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	multimedia
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 13adf663430..6197aaf4e86 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:45:04 wiz Exp $
 #
 
 DISTNAME=	gmencoder-0.1.0
-PKGREVISION=	26
+PKGREVISION=	27
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gmencoder/}
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 2eb144726f4..fe3fd46593d 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2010/01/24 13:26:11 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2010/06/13 22:45:04 wiz Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -9,7 +9,7 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 
 SKIN_SITES=	http://www1.mplayerhq.hu/MPlayer/skins/		\
 		http://www2.mplayerhq.hu/MPlayer/skins/		\
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 18abb636305..704f723f60c 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:45:04 wiz Exp $
 #
 
 DISTNAME=		gnash-${VER}
 VER=			0.8.3
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_GNU:=gnash/${VER}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/gnome-media/Makefile b/multimedia/gnome-media/Makefile
index 1bf9a0c2257..56dddc22672 100644
--- a/multimedia/gnome-media/Makefile
+++ b/multimedia/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/04/11 09:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:04 wiz Exp $
 
 DISTNAME=		gnome-media-2.28.5
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/gnome-media/buildlink3.mk b/multimedia/gnome-media/buildlink3.mk
index 98d3e61e5bd..2b0a107b02c 100644
--- a/multimedia/gnome-media/buildlink3.mk
+++ b/multimedia/gnome-media/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/10/22 17:48:39 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:45:04 wiz Exp $
 
 BUILDLINK_TREE+=	gnome-media
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-media
 GNOME_MEDIA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnome-media+=		gnome-media>=2.12.0nb1
-BUILDLINK_ABI_DEPENDS.gnome-media?=	gnome-media>=2.26.0nb2
+BUILDLINK_ABI_DEPENDS.gnome-media?=	gnome-media>=2.28.5nb2
 BUILDLINK_PKGSRCDIR.gnome-media?=	../../multimedia/gnome-media
 
 .include "../../devel/GConf-ui/buildlink3.mk"
diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile
index 6970a54bdba..7a05235d553 100644
--- a/multimedia/goggles/Makefile
+++ b/multimedia/goggles/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/02/11 20:17:18 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:04 wiz Exp $
 #
 
 DISTNAME=		goggles-0.9.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		multimedia
 MASTER_SITES=		http://www.fifthplanet.net/files/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index 0df03f55023..e9cd4fa1c38 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:58:05 sno Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:45:04 wiz Exp $
 #
 
 DISTNAME=		gopchop-1.1.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gopchop/} \
 			http://outflux.net/unix/software/GOPchop/download/
diff --git a/multimedia/gpac/Makefile b/multimedia/gpac/Makefile
index 4b65be43e8b..f7a99d5fad6 100644
--- a/multimedia/gpac/Makefile
+++ b/multimedia/gpac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:05 wiz Exp $
 #
 
 DISTNAME=	gpac-0.4.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gpac/}
 
diff --git a/multimedia/gpac/distinfo b/multimedia/gpac/distinfo
index 7f890504d60..cd375cf8a96 100644
--- a/multimedia/gpac/distinfo
+++ b/multimedia/gpac/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/23 14:54:23 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2010/06/13 22:45:05 wiz Exp $
 
 SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8
 RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f
@@ -6,3 +6,4 @@ Size (gpac-0.4.5.tar.gz) = 4269054 bytes
 SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9
 SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4
 SHA1 (patch-ac) = 25f8b92a308b6a70fb160980fe86e7d3e3f3f0ac
+SHA1 (patch-ad) = 5d50a3477f3a4459825f19c848454f6cdfb8a1fd
diff --git a/multimedia/gpac/patches/patch-ad b/multimedia/gpac/patches/patch-ad
new file mode 100644
index 00000000000..deaf3f15223
--- /dev/null
+++ b/multimedia/gpac/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2010/06/13 22:45:05 wiz Exp $
+
+--- src/media_tools/img.c.orig	2008-12-01 17:39:36.000000000 +0000
++++ src/media_tools/img.c
+@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
+ 	/* Allocate/initialize the image information data.  REQUIRED */
+ 	info_ptr = png_create_info_struct(png_ptr);
+ 	if (info_ptr == NULL) {
+-		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++		png_destroy_write_struct(&png_ptr,  NULL);
+ 		return GF_IO_ERR;
+ 	}
+ 	
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index bfc1631e74c..8788bd579d9 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2010/02/14 13:22:37 zafer Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:45:05 wiz Exp $
 
 DISTNAME=	gxine-0.5.905
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 059f399462a..03a05aa4625 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/01/08 17:33:24 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:05 wiz Exp $
 #
 
 DISTNAME=	HandBrake-0.9.3
 PKGNAME=	${DISTNAME:S/HandBrake/handbrake/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.m0k.org/handbrake/releases/ \
 		http://download.m0k.org/handbrake/contrib/
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index b6482034f96..d22b120961e 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:05 wiz Exp $
 #
 
 DISTNAME=	kaffeine-0.8.3
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kaffeine/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 661cbfc836f..9438d852c69 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.75 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2010/06/13 22:45:05 wiz Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index aaf0abc20f0..57286abd5be 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2010/06/13 22:45:05 wiz Exp $
 
 BUILDLINK_TREE+=	kdemultimedia
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdemultimedia
 KDEMULTIMEDIA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdemultimedia+=	kdemultimedia>=3.5.0nb2
-BUILDLINK_ABI_DEPENDS.kdemultimedia?=	kdemultimedia>=3.5.10nb6
+BUILDLINK_ABI_DEPENDS.kdemultimedia?=	kdemultimedia>=3.5.10nb7
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
 
 .include "../../audio/arts/buildlink3.mk"
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 50407fb1ed1..4c4e89d1c9f 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:04 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:45:05 wiz Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kmplayer-kde3/Makefile b/multimedia/kmplayer-kde3/Makefile
index 66b4b399981..e57677597b1 100644
--- a/multimedia/kmplayer-kde3/Makefile
+++ b/multimedia/kmplayer-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/04/10 04:04:21 markd Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:05 wiz Exp $
 #
 
 DISTNAME=	kmplayer-0.10.0c
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 0b601719f3f..9165210e82a 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2010/04/10 04:09:21 markd Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:45:05 wiz Exp $
 #
 
 DISTNAME=	kmplayer-0.11.2a
+PKGREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,11 +11,12 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://kmplayer.kde.org/
 COMMENT=	KDE frontend to mplayer
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
+BUILD_DEPENDS+=		automoc4>=0.9.87:../../devel/automoc4
 DEPENDS+=		mplayer>=1.0rc3:../../multimedia/mplayer
 DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_CMAKE=		yes
 USE_TOOLS+=		msgfmt perl pkg-config
 USE_LANGUAGES=		c c++
diff --git a/multimedia/ming/Makefile b/multimedia/ming/Makefile
index b226eb93ee6..ed66c1aa062 100644
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/04/09 01:33:43 obache Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:05 wiz Exp $
 #
 
 .include "Makefile.common"
 
+PKGREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	obache@NetBSD.org
diff --git a/multimedia/ming/buildlink3.mk b/multimedia/ming/buildlink3.mk
index 15e06182899..b9a11f520ad 100644
--- a/multimedia/ming/buildlink3.mk
+++ b/multimedia/ming/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2010/04/09 01:33:43 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2010/06/13 22:45:05 wiz Exp $
 
 BUILDLINK_TREE+=	ming
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	ming
 MING_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ming+=	ming>=0.4.3
+BUILDLINK_ABI_DEPENDS.ming?=	ming>=0.4.3nb1
 BUILDLINK_PKGSRCDIR.ming?=	../../multimedia/ming
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 49c5e6c1fa7..80e232eba21 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:05 wiz Exp $
 
 DISTNAME=	mjpegtools-1.9.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 5b02866bb17..ba0e6ecea17 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2010/05/15 07:32:30 adam Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:06 wiz Exp $
 
 DISTNAME=	mkvtoolnix-2.9.8
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/mplayer-plugin/Makefile b/multimedia/mplayer-plugin/Makefile
index 787e8a61ac6..41855c45021 100644
--- a/multimedia/mplayer-plugin/Makefile
+++ b/multimedia/mplayer-plugin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:06 wiz Exp $
 #
 
 DISTNAME=		mplayerplug-in-3.55
 PKGNAME=		mplayer-plugin-3.55
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
 
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index 619edbe88ec..3c1cccd5290 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:58:07 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:45:06 wiz Exp $
 
 DISTNAME=	ogle_gui-0.9.2
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index beda4218f32..666e9b79e5f 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/04/10 00:18:13 markd Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:06 wiz Exp $
 
 DISTNAME=	phonon-4.4.0
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_KDE:=phonon/4.4.0/}
 EXTRACT_SUFX=	.tgz
diff --git a/multimedia/phonon/buildlink3.mk b/multimedia/phonon/buildlink3.mk
index 13bb7fc9020..50735532b2f 100644
--- a/multimedia/phonon/buildlink3.mk
+++ b/multimedia/phonon/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:45:06 wiz Exp $
 
 BUILDLINK_TREE+=	phonon
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	phonon
 PHONON_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.phonon+=	phonon>=4.1.83
-BUILDLINK_ABI_DEPENDS.phonon?=	phonon>=4.3.1nb2
+BUILDLINK_ABI_DEPENDS.phonon?=	phonon>=4.4.0nb1
 BUILDLINK_PKGSRCDIR.phonon?=	../../multimedia/phonon
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/multimedia/php-ming/Makefile b/multimedia/php-ming/Makefile
index 43a950a4c03..5e6a7224dca 100644
--- a/multimedia/php-ming/Makefile
+++ b/multimedia/php-ming/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/04/29 04:55:25 obache Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:06 wiz Exp $
 
 MODNAME=		ming
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES+=		multimedia
 
 MAINTAINER=		obache@NetBSD.org
diff --git a/multimedia/pspvc/Makefile b/multimedia/pspvc/Makefile
index 80c505fadf8..07bf0657b6e 100644
--- a/multimedia/pspvc/Makefile
+++ b/multimedia/pspvc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:58:07 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:06 wiz Exp $
 #
 
 DISTNAME=	pspvc-install-0.3
 PSPVCVER=	pspvc-0.3
 PKGNAME=	${PSPVCVER}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pspvc/}
 
diff --git a/multimedia/py-clutter-gst/Makefile b/multimedia/py-clutter-gst/Makefile
index d86a523d2a5..5befaf3ce59 100644
--- a/multimedia/py-clutter-gst/Makefile
+++ b/multimedia/py-clutter-gst/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/11 06:26:59 obache Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:06 wiz Exp $
 #
 
 DISTNAME=	pyclutter-gst-1.0.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.clutter-project.org/sources/pyclutter-gst/1.0/
 
diff --git a/multimedia/py-ming/Makefile b/multimedia/py-ming/Makefile
index 9202715d4bf..e726540a38e 100644
--- a/multimedia/py-ming/Makefile
+++ b/multimedia/py-ming/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2010/04/09 01:35:47 obache Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:06 wiz Exp $
 #
 
 .include "../../multimedia/ming/Makefile.common"
 
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		multimedia
 
 MAINTAINER=		obache@NetBSD.org
diff --git a/multimedia/ruby-clutter-gst/Makefile b/multimedia/ruby-clutter-gst/Makefile
index ea9fa211879..16c6d537062 100644
--- a/multimedia/ruby-clutter-gst/Makefile
+++ b/multimedia/ruby-clutter-gst/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/12/17 11:17:14 obache Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:06 wiz Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-clutter-gst-${VERSION}
 COMMENT=		Ruby binding for Clutter GStreamer library
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		multimedia
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/multimedia/ruby-ming/Makefile b/multimedia/ruby-ming/Makefile
index 4a1d6ddc249..99d4e57b8d6 100644
--- a/multimedia/ruby-ming/Makefile
+++ b/multimedia/ruby-ming/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/04/09 01:36:34 obache Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:06 wiz Exp $
 
 DISTNAME=	ming-ruby-${VER}
 PKGNAME=	${RUBY_PKGPREFIX}-ming-${VER}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://rubyforge.org/frs/download.php/44137/
 
diff --git a/multimedia/subtitleeditor/Makefile b/multimedia/subtitleeditor/Makefile
index 08c226880e7..7708c9fc708 100644
--- a/multimedia/subtitleeditor/Makefile
+++ b/multimedia/subtitleeditor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/12/16 15:37:52 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:06 wiz Exp $
 #
 
 DISTNAME=		subtitleeditor-0.30.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.gna.org/subtitleeditor/0.30/
 
diff --git a/multimedia/swfdec-gnome/Makefile b/multimedia/swfdec-gnome/Makefile
index da11df69b17..5cce6cbd95a 100644
--- a/multimedia/swfdec-gnome/Makefile
+++ b/multimedia/swfdec-gnome/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/11/15 21:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:07 wiz Exp $
 #
 
 DISTNAME=	swfdec-gnome-2.28.0
+PKGREVISION=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/swfdec-gnome/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/swfdec-mozilla/Makefile b/multimedia/swfdec-mozilla/Makefile
index 5577a60e27d..3260a5466b3 100644
--- a/multimedia/swfdec-mozilla/Makefile
+++ b/multimedia/swfdec-mozilla/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:58:07 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:07 wiz Exp $
 #
 
 DISTNAME=	swfdec-mozilla-0.8.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/
 
diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile
index 63899b7563a..ba95d7fe240 100644
--- a/multimedia/swfdec/Makefile
+++ b/multimedia/swfdec/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2010/01/20 19:09:00 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:06 wiz Exp $
 #
 
 DISTNAME=		swfdec-0.8.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		multimedia
 MASTER_SITES=		http://swfdec.freedesktop.org/download/swfdec/0.8/
 
diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk
index a1a26515472..cdbd33a0b21 100644
--- a/multimedia/swfdec/buildlink3.mk
+++ b/multimedia/swfdec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/01/20 19:09:00 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:45:06 wiz Exp $
 
 BUILDLINK_TREE+=	swfdec
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	swfdec
 SWFDEC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.swfdec+=	swfdec>=0.8.2
-BUILDLINK_ABI_DEPENDS.swfdec?=	swfdec>=0.8.4nb2
+BUILDLINK_ABI_DEPENDS.swfdec?=	swfdec>=0.8.4nb3
 BUILDLINK_PKGSRCDIR.swfdec?=	../../multimedia/swfdec
 
 pkgbase := swfdec
diff --git a/multimedia/totem-browser-plugin/Makefile b/multimedia/totem-browser-plugin/Makefile
index 06b39967f70..b91a34f3f84 100644
--- a/multimedia/totem-browser-plugin/Makefile
+++ b/multimedia/totem-browser-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/03/27 12:45:34 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:07 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -8,7 +8,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=	gst-plugins0.10-soup-[0-9]*:../../net/gst-plugins0.10-soup
 
 PKGNAME=	${DISTNAME:S/totem/totem-browser-plugin/}
-PKGREVISION=	3
+PKGREVISION=	4
 
 # override Makefile.common
 PLIST_SRC=      ${.CURDIR}/PLIST
diff --git a/multimedia/totem-nautilus/Makefile b/multimedia/totem-nautilus/Makefile
index 1a5b56c168a..2acdad2d31a 100644
--- a/multimedia/totem-nautilus/Makefile
+++ b/multimedia/totem-nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/02/10 19:17:43 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:07 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../multimedia/totem/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/totem/totem-nautilus/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 # override Makefile.common
 PLIST_SRC=      ${.CURDIR}/PLIST
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 23e2700d642..8386271a2fa 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/05/23 11:19:26 obache Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:07 wiz Exp $
 #
 
 DISTNAME=	totem-pl-parser-2.28.3
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem-pl-parser/2.28/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/totem-pl-parser/buildlink3.mk b/multimedia/totem-pl-parser/buildlink3.mk
index 262653117fe..d3102db74eb 100644
--- a/multimedia/totem-pl-parser/buildlink3.mk
+++ b/multimedia/totem-pl-parser/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/03/20 12:43:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/06/13 22:45:07 wiz Exp $
 
 BUILDLINK_TREE+=	totem-pl-parser
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	totem-pl-parser
 TOTEM_PL_PARSER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.totem-pl-parser+=	totem-pl-parser>=2.22.1
-BUILDLINK_ABI_DEPENDS.totem-pl-parser?=	totem-pl-parser>=2.28.2nb1
+BUILDLINK_ABI_DEPENDS.totem-pl-parser?=	totem-pl-parser>=2.28.3nb1
 BUILDLINK_PKGSRCDIR.totem-pl-parser?=	../../multimedia/totem-pl-parser
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index a6d31655636..14c5604b9bd 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.40 2010/05/14 16:45:17 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2010/06/13 22:45:07 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
+PKGREVISION=	1
 
 DEPENDS+=	gst-plugins0.10-soup-[0-9]*:../../net/gst-plugins0.10-soup
 
diff --git a/multimedia/totem/buildlink3.mk b/multimedia/totem/buildlink3.mk
index 23be089b053..7efe2f7cf30 100644
--- a/multimedia/totem/buildlink3.mk
+++ b/multimedia/totem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/10/21 18:56:15 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:07 wiz Exp $
 
 BUILDLINK_TREE+=	totem
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	totem
 TOTEM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.totem+=	{totem,totem-xine}>=1.4.0
-BUILDLINK_ABI_DEPENDS.totem+=	totem>=2.26.3nb1
+BUILDLINK_ABI_DEPENDS.totem+=	totem>=2.28.6nb1
 BUILDLINK_PKGSRCDIR.totem?=	../../multimedia/totem
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 27d0ffdfc1c..ce04750251f 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2010/06/03 19:33:33 gls Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:07 wiz Exp $
 
 DISTNAME=	transcode-1.1.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/tcforge/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/tvtime/Makefile b/multimedia/tvtime/Makefile
index 6378d04ab5c..829368c06b7 100644
--- a/multimedia/tvtime/Makefile
+++ b/multimedia/tvtime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/09/17 23:00:05 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:07 wiz Exp $
 
 DISTNAME=	tvtime-1.0.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tvtime/}
 
diff --git a/multimedia/vlc/buildlink3.mk b/multimedia/vlc/buildlink3.mk
index f656ccb8803..ac5902d5187 100644
--- a/multimedia/vlc/buildlink3.mk
+++ b/multimedia/vlc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2010/06/13 22:45:07 wiz Exp $
 
 BUILDLINK_TREE+=	vlc
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	vlc
 VLC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.vlc?=	vlc>=1.0.0
-BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=1.0.4nb1
+BUILDLINK_ABI_DEPENDS.vlc?=	vlc>=1.0.6
 BUILDLINK_PKGSRCDIR.vlc?=	../../multimedia/vlc
 
 pkgbase:= vlc
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 217464deb4c..8f5b7f5aac1 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.35 2010/05/04 18:30:10 drochner Exp $
+$NetBSD: distinfo,v 1.36 2010/06/13 22:45:07 wiz Exp $
 
 SHA1 (vlc-1.0.6.tar.bz2) = 834346a84a71d915440b7741e04b6e02de451786
 RMD160 (vlc-1.0.6.tar.bz2) = 2185eb418748f2aadfce5e61b7a9de66a62ef2d1
 Size (vlc-1.0.6.tar.bz2) = 22149704 bytes
 SHA1 (patch-aa) = 76ef868076df4e423acfe5ca65999fbd26167bfe
+SHA1 (patch-ab) = c7d5cde0f0e4a678360adfb43d027d25bdc147e1
 SHA1 (patch-configure) = 508d9fc4ee8bc8526fb5cdf1b161c573216036c4
 SHA1 (patch-v4l2) = 1f91206f8e2f78514056386977a6c2230a710211
diff --git a/multimedia/vlc/patches/patch-ab b/multimedia/vlc/patches/patch-ab
new file mode 100644
index 00000000000..4397e7585ad
--- /dev/null
+++ b/multimedia/vlc/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.5 2010/06/13 22:45:07 wiz Exp $
+
+--- modules/codec/png.c.orig	2010-03-07 18:38:01.000000000 +0000
++++ modules/codec/png.c
+@@ -155,7 +155,7 @@ static picture_t *DecodeBlock( decoder_t
+     p_info = png_create_info_struct( p_png );
+     if( p_info == NULL )
+     {
+-        png_destroy_read_struct( &p_png, png_infopp_NULL, png_infopp_NULL );
++        png_destroy_read_struct( &p_png, NULL, NULL );
+         block_Release( p_block ); *pp_block = NULL;
+         return NULL;
+     }
+@@ -163,7 +163,7 @@ static picture_t *DecodeBlock( decoder_t
+     p_end_info = png_create_info_struct( p_png );
+     if( p_end_info == NULL )
+     {
+-        png_destroy_read_struct( &p_png, &p_info, png_infopp_NULL );
++        png_destroy_read_struct( &p_png, &p_info, NULL );
+         block_Release( p_block ); *pp_block = NULL;
+         return NULL;
+     }
diff --git a/multimedia/vlc08/Makefile b/multimedia/vlc08/Makefile
index 00a325a6517..a1bcec02957 100644
--- a/multimedia/vlc08/Makefile
+++ b/multimedia/vlc08/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2009/10/31 14:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:07 wiz Exp $
 #
 
 DISTNAME=		vlc-${VLC_VER}
 PKGNAME=		vlc08-${VLC_VER}
 VLC_VER=		0.8.6i
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		multimedia
 MASTER_SITES=		http://download.videolan.org/pub/videolan/vlc/${VLC_VER}/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/vlc08/buildlink3.mk b/multimedia/vlc08/buildlink3.mk
index af0bdeb5ce0..c3afa3ffd63 100644
--- a/multimedia/vlc08/buildlink3.mk
+++ b/multimedia/vlc08/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2009/10/31 14:46:51 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:07 wiz Exp $
 
 BUILDLINK_TREE+=	vlc08
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	vlc08
 VLC08_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.vlc08+=	vlc08>=0.8.6d
-BUILDLINK_ABI_DEPENDS.vlc08?=	vlc08>=0.8.6inb7
+BUILDLINK_ABI_DEPENDS.vlc08?=	vlc08>=0.8.6inb8
 BUILDLINK_PKGSRCDIR.vlc08?=	../../multimedia/vlc08
 
 pkgbase:= vlc08
diff --git a/multimedia/xfce4-mpc-plugin/Makefile b/multimedia/xfce4-mpc-plugin/Makefile
index 71ab3365db1..dfc6329642a 100644
--- a/multimedia/xfce4-mpc-plugin/Makefile
+++ b/multimedia/xfce4-mpc-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:07 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=	0.3.2
 
 DISTNAME=	xfce4-mpc-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-mpc-plugin/
 EXTRACT_SUFX=	.tar.gz
diff --git a/multimedia/xfce4-mpc-plugin/buildlink3.mk b/multimedia/xfce4-mpc-plugin/buildlink3.mk
index 9e2c664ab70..25634d95d54 100644
--- a/multimedia/xfce4-mpc-plugin/buildlink3.mk
+++ b/multimedia/xfce4-mpc-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:07 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-mpc-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-mpc-plugin
 XFCE4_MPC_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-mpc-plugin+=	xfce4-mpc-plugin>=0.3.2
-BUILDLINK_ABI_DEPENDS.xfce4-mpc-plugin?=	xfce4-mpc-plugin>=0.3.2nb1
+BUILDLINK_ABI_DEPENDS.xfce4-mpc-plugin?=	xfce4-mpc-plugin>=0.3.2nb2
 BUILDLINK_PKGSRCDIR.xfce4-mpc-plugin?=	../../multimedia/xfce4-mpc-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile
index 9921fb709d3..5996744f345 100644
--- a/multimedia/xfmedia/Makefile
+++ b/multimedia/xfmedia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2010/02/11 20:20:38 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:08 wiz Exp $
 #
 
 DISTNAME=		xfmedia-0.9.2
 #PKGREVISION=		1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		multimedia
 MASTER_SITES=		http://spuriousinterrupt.org/projects/xfmedia/files/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index f03aef2452d..dab7a67fcb7 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.78 2010/04/19 15:31:19 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:45:08 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=		Multimedia player library
 
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index a39f767c7eb..88cbc186a35 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/05/07 17:46:24 drochner Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:08 wiz Exp $
 #
 
 DISTNAME=		xine-ui-0.99.6
+PKGREVISION=		1
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile
index 9350e4c7fc4..f297eeba05a 100644
--- a/multimedia/xvid4conf/Makefile
+++ b/multimedia/xvid4conf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:58:08 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:08 wiz Exp $
 
 DISTNAME=	xvid4conf-1.12
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	#
author	wiz <wiz>	2010-06-13 22:43:46 +0000
committer	wiz <wiz>	2010-06-13 22:43:46 +0000
commit	c3512e82cfd1ef757581484eb740c7cd398411b9 (patch)
tree	4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /multimedia
parent	e9a8c2a53822e7578f98d3ebcd4e60f3d153b02a (diff)
download	pkgsrc-c3512e82cfd1ef757581484eb740c7cd398411b9.tar.gz