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.

82 files changed, 165 insertions, 156 deletions

diff --git a/audio/albumplayer/Makefile b/audio/albumplayer/Makefile
index 5bbc67901cd..a3fadcb51d2 100644
--- a/audio/albumplayer/Makefile
+++ b/audio/albumplayer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/09/09 16:54:13 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:47 wiz Exp $
 #
 
 DISTNAME=	albumplayer_0.3.orig
 PKGNAME=	albumplayer-0.3
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://rvb.mytanet.de/debian/
 
@@ -11,7 +12,7 @@ HOMEPAGE=	http://rvb.mytanet.de/
 COMMENT=	FLAC album player
 LICENSE=	original-bsd
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/audio/amarok-kde3/Makefile b/audio/amarok-kde3/Makefile
index 1eb4ccfbb28..6cd34e412ab 100644
--- a/audio/amarok-kde3/Makefile
+++ b/audio/amarok-kde3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/02/16 09:02:57 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:47 wiz Exp $
 
 DISTNAME=		amarok-${VERSION}
 VERSION=		1.4.10
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 2f17b7c1457..20aecdb6f31 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2010/04/16 13:49:29 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2010/06/13 22:43:47 wiz Exp $
 #
 
 DISTNAME=	amarok-${VERS}
 VERS=		2.3.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio multimedia
 #MASTER_SITES=	http://download.kde.org/unstable/amarok/${VERS}/src/ \
 #		ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 29eb3ebb153..f782fe919d1 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:47 wiz Exp $
 #
 
 DISTNAME=	ario-1.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ario-player/1.3/}
 
diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile
index 79d99df2c84..e8bf2e45d84 100644
--- a/audio/audacious-plugins/Makefile
+++ b/audio/audacious-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:47 wiz Exp $
 #
 
 DISTNAME=		audacious-plugins-1.5.1
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		audio
 MASTER_SITES=		http://distfiles.atheme.org/
 EXTRACT_SUFX=		.tgz
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 9f878fe4115..82ff4e94cc6 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/08/29 13:15:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:47 wiz Exp $
 #
 
 DISTNAME=		audacious-1.5.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		http://distfiles.atheme.org/
 EXTRACT_SUFX=		.tbz2
diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk
index 6b6cdfbfd6d..18177d9aa4f 100644
--- a/audio/audacious/buildlink3.mk
+++ b/audio/audacious/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/08/26 19:56:59 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:43:47 wiz Exp $
 
 BUILDLINK_TREE+=	audacious
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	audacious
 AUDACIOUS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.audacious+=	audacious>=1.5.0
-BUILDLINK_ABI_DEPENDS.audacious?=	audacious>=1.5.1nb1
+BUILDLINK_ABI_DEPENDS.audacious?=	audacious>=1.5.1nb2
 BUILDLINK_PKGSRCDIR.audacious?=	../../audio/audacious
 BUILDLINK_DEPMETHOD.audacious?=	build
 
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index d686025083e..fbdbd6fe116 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.63 2010/01/18 09:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:43:47 wiz Exp $
 
 DISTNAME=		audacity-src-1.2.6
-PKGREVISION=		5
+PKGREVISION=		6
 PKGNAME=		${DISTNAME:S/-src-/-/}
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=audacity/}
diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile
index 38051a9c5dc..2954c658258 100644
--- a/audio/aumix-gtk/Makefile
+++ b/audio/aumix-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:08 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:47 wiz Exp $
 
 .include "../../audio/aumix/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/aumix/aumix-gtk/}
-PKGREVISION=	4
+PKGREVISION=	5
 
 COMMENT+=	(ncurses and GTK+ 2.0 interfaces)
 
diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index a40805e3bb9..55ce2b17709 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 16:04:50 kefren Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:43:48 wiz Exp $
 #
 
 DISTNAME=	flac-1.1.3
 PKGNAME=	bmp-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
 
diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile
index f93118e6cb6..2bf224189bc 100644
--- a/audio/bmp-mac/Makefile
+++ b/audio/bmp-mac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/08/26 19:57:08 sno Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:48 wiz Exp $
 #
 
 DISTNAME=	bmp-mac-0.1.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://bsd.cenkes.org/myports/
 
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index b05f7d16e40..2149d734d20 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:08 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:43:48 wiz Exp $
 #
 
 DISTNAME=		bmp-musepack-1.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		http://files.musepack.net/linux/plugins/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/bmp-pulse/Makefile b/audio/bmp-pulse/Makefile
index 6b2ffeb304b..cc18101e1ee 100644
--- a/audio/bmp-pulse/Makefile
+++ b/audio/bmp-pulse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/08/26 19:57:08 sno Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:48 wiz Exp $
 #
 
 DISTNAME=	xmms-pulse-0.9.4
 PKGNAME=	${DISTNAME:S/xmms/bmp/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/xmms-pulse/
 
diff --git a/audio/bmp-scrobbler/Makefile b/audio/bmp-scrobbler/Makefile
index fb7d57d7d2c..c9541f9ff37 100644
--- a/audio/bmp-scrobbler/Makefile
+++ b/audio/bmp-scrobbler/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:48 wiz Exp $
 
 DISTNAME=	xmms-scrobbler-0.4.0
 PKGNAME=	${DISTNAME:S/xmms/bmp/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://armish.linux-sevenler.org/downloads/pub/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index efeb69a2852..1d0e556c8f7 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.27 2009/08/26 20:20:32 sno Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:43:47 wiz Exp $
 #
 
 BMP_ENABLE_ENCODERS=	yes
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
-
-PKGREVISION=		6
+PKGREVISION=		7
 
 DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
index 369ec0d4ec2..41098428eab 100644
--- a/audio/bmp/buildlink3.mk
+++ b/audio/bmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/06/13 22:43:47 wiz Exp $
 
 BUILDLINK_TREE+=	bmp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	bmp
 BMP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
-BUILDLINK_ABI_DEPENDS.bmp?=	bmp>=0.9.7.1nb6
+BUILDLINK_ABI_DEPENDS.bmp?=	bmp>=0.9.7.1nb7
 BUILDLINK_PKGSRCDIR.bmp?=	../../audio/bmp
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index 3252bdba3c9..0cff7b81123 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2010/05/15 07:03:29 adam Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:43:48 wiz Exp $
 
 DISTNAME=	bmpx-0.40.14
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://files.backtrace.info/releases/0.40/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/bsl/Makefile b/audio/bsl/Makefile
index 680483cde8f..2290bde79a3 100644
--- a/audio/bsl/Makefile
+++ b/audio/bsl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/09/10 20:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:43:48 wiz Exp $
 #
 
 DISTNAME=	bsl-0.5.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buzztard/}
 
diff --git a/audio/buzztard/Makefile b/audio/buzztard/Makefile
index c5d2d424536..7d323eac814 100644
--- a/audio/buzztard/Makefile
+++ b/audio/buzztard/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/09/10 20:19:18 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/06/13 22:43:48 wiz Exp $
 #
 
 DISTNAME=	buzztard-0.5.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buzztard/}
 
diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile
index 837c1be6d04..be0cc835316 100644
--- a/audio/csound5/Makefile
+++ b/audio/csound5/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/02/10 19:17:32 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:43:48 wiz Exp $
 #
 
 DISTNAME=		Csound${CSOUND_VERSION}_src
 PKGNAME=		csound5-${CSOUND_VERSION}
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=csound/}
 WRKSRC=			${WRKDIR}/Csound${CSOUND_VERSION}
diff --git a/audio/easytag-current/Makefile b/audio/easytag-current/Makefile
index 7b04f6f336f..4ce1c1bc7fc 100644
--- a/audio/easytag-current/Makefile
+++ b/audio/easytag-current/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:09 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:49 wiz Exp $
 #
 
 DISTNAME=	easytag-2.1.6
+PKGREVISION=	3
 CATEGORIES=	audio
-PKGREVISION=	2
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 EXTRACT_SUFX=	.tar.bz2
 
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 4880534b28f..46affc29c1f 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2009/08/26 19:57:09 sno Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:43:48 wiz Exp $
 #
 
 DISTNAME=	easytag-2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index f4cab80fec4..6b02cc59a5a 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/02/10 19:17:32 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:43:49 wiz Exp $
 #
 
 DISTNAME=	exaile_0.2.14
 PKGNAME=	exaile-0.2.14
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://www.exaile.org/files/
 
diff --git a/audio/gbemol/Makefile b/audio/gbemol/Makefile
index 35bb0d96049..ba7b05f674b 100644
--- a/audio/gbemol/Makefile
+++ b/audio/gbemol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:49 wiz Exp $
 #
 
 DISTNAME=	gbemol-0.3.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gbemol/}
 
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 392760446fb..03ff67e219c 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:43:49 wiz Exp $
 #
 
 DISTNAME=	gimmix-0.5.7.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/gimmix/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 1d5c4fe196b..38de26184b1 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2010/02/01 01:10:28 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:43:49 wiz Exp $
 
 DISTNAME=	gkrellm-volume-2.1.13
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 653f7a6417c..21c78fef797 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2010/02/01 01:13:28 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/13 22:43:49 wiz Exp $
 #
 
 DISTNAME=	gkrellmms-2.1.20
 PKGNAME=	${DISTNAME:S/mms/m-xmms/}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index e49422c7b88..95655f59ea5 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2009/08/26 19:57:09 sno Exp $
+# $NetBSD: Makefile,v 1.13 2010/06/13 22:43:49 wiz Exp $
 #
 
 DISTNAME=	glurp-0.11.6
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glurp/}
 
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index 4dc11f6dc87..85282b579a9 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2009/08/26 19:57:09 sno Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:43:49 wiz Exp $
 
 DISTNAME=	mp3info-0.8.5a
 PKGNAME=	g${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/ \
 		${MASTER_SITE_SUNSITE:=apps/sound/mp3-utils/mp3info/}
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 2ebb1d8ce9f..eacf7aa14c5 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:43:49 wiz Exp $
 #
 
 DISTNAME=		gmpc-0.19.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		http://download.sarine.nl/Programs/gmpc/0.19.1/ \
 			${MASTER_SITE_SOURCEFORGE:=musicpd/}
diff --git a/audio/gmpc/buildlink3.mk b/audio/gmpc/buildlink3.mk
index b19cb3f7c75..b42e54fedf7 100644
--- a/audio/gmpc/buildlink3.mk
+++ b/audio/gmpc/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/10/20 20:26:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:43:49 wiz Exp $
 
 BUILDLINK_TREE+=	gmpc
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	gmpc
 GMPC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gmpc+=	gmpc>=0.19.1
+BUILDLINK_ABI_DEPENDS.gmpc?=	gmpc>=0.19.1nb2
 BUILDLINK_PKGSRCDIR.gmpc?=	../../audio/gmpc
 BUILDLINK_DEPMETHOD.gmpc?=	build
 
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 7e35273f12b..fd9f9e6b42a 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2009/12/03 16:26:47 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/06/13 22:43:50 wiz Exp $
 
 DISTNAME=		gqmpeg-0.91.1
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
 
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 1d349d260a5..ffbd6986bd9 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2010/06/13 22:43:49 wiz Exp $
 
 DISTNAME=		gqmpeg-0.20.0
-PKGREVISION=		13
+PKGREVISION=		14
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
 
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index 3522207344e..2e15a24f67d 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2009/08/26 19:57:10 sno Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:43:50 wiz Exp $
 #
 
 DISTNAME=	gtick-0.3.10
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.antcom.de/gtick/download/
 
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 31f532bbccf..a3c78487e1f 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2010/02/10 19:17:32 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2010/06/13 22:43:50 wiz Exp $
 #
 
 DISTNAME=	gtkpod-0.99.14
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 700906004cc..4d857edfee4 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/30 18:05:58 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:43:50 wiz Exp $
 
 DISTNAME=	hydrogen-0.8.0
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hydrogen/}
 
diff --git a/audio/jack-rack/Makefile b/audio/jack-rack/Makefile
index 0d9e6920bdb..6f85302097c 100644
--- a/audio/jack-rack/Makefile
+++ b/audio/jack-rack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:43:50 wiz Exp $
 #
 
 DISTNAME=	jack-rack-1.4.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jack-rack/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 93bb4c72618..d7842a74e6e 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:43:50 wiz Exp $
 #
 
 DISTNAME=		kid3-1.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		kde audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kid3/}
 
diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile
index 1a0b364b437..cea95d79b66 100644
--- a/audio/kmp/Makefile
+++ b/audio/kmp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:43:50 wiz Exp $
 
 DISTNAME=		kmp-0.01
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		audio
 MASTER_SITES=		http://mercury.chem.pitt.edu/~shank/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index c042d9f16d0..e5ecc5c0991 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/23 11:19:27 obache Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:43:50 wiz Exp $
 #
 
 DISTNAME=	libcanberra-0.22
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
diff --git a/audio/libcanberra/buildlink3.mk b/audio/libcanberra/buildlink3.mk
index 1cb30e082b3..4002b0fda95 100644
--- a/audio/libcanberra/buildlink3.mk
+++ b/audio/libcanberra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/12/15 21:30:52 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/06/13 22:43:50 wiz Exp $
 
 BUILDLINK_TREE+=	libcanberra
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libcanberra
 LIBCANBERRA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcanberra+=	libcanberra>=0.10
-BUILDLINK_ABI_DEPENDS.libcanberra?=	libcanberra>=0.22nb1
+BUILDLINK_ABI_DEPENDS.libcanberra?=	libcanberra>=0.22nb2
 BUILDLINK_PKGSRCDIR.libcanberra?=	../../audio/libcanberra
 
 #.include "../../multimedia/gstreamer0.10/buildlink3.mk"
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 44c88d5e3a3..1777e53d7d2 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/11/27 10:54:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/06/13 22:43:50 wiz Exp $
 
 DISTNAME=		libgpod-0.7.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
diff --git a/audio/libgpod/buildlink3.mk b/audio/libgpod/buildlink3.mk
index 6b5d4585e3b..8a7e6294f77 100644
--- a/audio/libgpod/buildlink3.mk
+++ b/audio/libgpod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/08/26 19:57:01 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/06/13 22:43:50 wiz Exp $
 
 BUILDLINK_TREE+=	libgpod
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libgpod
 LIBGPOD_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.3.2
-BUILDLINK_ABI_DEPENDS.libgpod?=	libgpod>=0.7.0nb1
+BUILDLINK_ABI_DEPENDS.libgpod?=	libgpod>=0.7.0nb2
 BUILDLINK_PKGSRCDIR.libgpod?=	../../audio/libgpod
 
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/audio/liblastfm/Makefile b/audio/liblastfm/Makefile
index b7c68b9ed3b..f7fd305ffd7 100644
--- a/audio/liblastfm/Makefile
+++ b/audio/liblastfm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2010/05/11 12:14:43 obache Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:43:50 wiz Exp $
 #
 
 DISTNAME=	liblastfm-0.3.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio net
 MASTER_SITES=	http://cdn.last.fm/src/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/liblastfm/buildlink3.mk b/audio/liblastfm/buildlink3.mk
index 3b75a958d0e..7c202bbafa0 100644
--- a/audio/liblastfm/buildlink3.mk
+++ b/audio/liblastfm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/02/15 15:51:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/06/13 22:43:51 wiz Exp $
 
 BUILDLINK_TREE+=	liblastfm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	liblastfm
 LIBLASTFM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.liblastfm+=	liblastfm>=0.3.0
-BUILDLINK_ABI_DEPENDS.liblastfm?=	liblastfm>=0.3.0nb1
+BUILDLINK_ABI_DEPENDS.liblastfm?=	liblastfm>=0.3.0nb3
 BUILDLINK_PKGSRCDIR.liblastfm?=	../../audio/liblastfm
 
 .include "../../audio/libsamplerate/buildlink3.mk"
diff --git a/audio/libvisual-bmp/Makefile b/audio/libvisual-bmp/Makefile
index f8a6698e142..e91f545a7b7 100644
--- a/audio/libvisual-bmp/Makefile
+++ b/audio/libvisual-bmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:57:10 sno Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:43:51 wiz Exp $
 #
 
 DISTNAME=		libvisual-bmp-0.2.0
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile
index 350713a0252..15ca02014b7 100644
--- a/audio/libvisual-plugins/Makefile
+++ b/audio/libvisual-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/08/26 19:57:10 sno Exp $
+# $NetBSD: Makefile,v 1.24 2010/06/13 22:43:51 wiz Exp $
 #
 
 DISTNAME=		libvisual-plugins-0.4.0
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		audio graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/libvisual0.2-plugins/Makefile b/audio/libvisual0.2-plugins/Makefile
index 3716eb1af75..b64356437fc 100644
--- a/audio/libvisual0.2-plugins/Makefile
+++ b/audio/libvisual0.2-plugins/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2010/02/01 00:52:10 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:51 wiz Exp $
 #
 
 DISTNAME=		libvisual-plugins-0.2.0
 PKGNAME=		libvisual0.2-plugins-0.2.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 032be84926c..de3e8d7ea6c 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:43:51 wiz Exp $
 
 DISTNAME=	liteamp-0.2.4.2
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	audio
 MASTER_SITES=	http://kldp.net/frs/download.php/1153/
 
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index ef56060b88e..a96e23cf0f0 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:58:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:43:51 wiz Exp $
 #
 
 DISTNAME=		lmms-0.2.0
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=lmms/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index 9d018da9b56..d7ddce7dab0 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2010/02/10 19:17:32 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:43:51 wiz Exp $
 
 DISTNAME=	madman-0.93
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=madman/}
 
diff --git a/audio/mp3diags/Makefile b/audio/mp3diags/Makefile
index c8e663a1712..1f067b6a14d 100644
--- a/audio/mp3diags/Makefile
+++ b/audio/mp3diags/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2010/05/15 08:51:30 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/06/13 22:43:51 wiz Exp $
 
 DISTNAME=	MP3Diags-1.0.05.050
 PKGNAME=	${DISTNAME:S/MP3D/mp3d/}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mp3diags/}
 
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 24bc9d31140..7fbdff49eae 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2010/02/01 01:25:29 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	MuSE-0.9
 PKGNAME=	${DISTNAME:S/MuSE/muse/}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
 		http://www.ljudmila.org/~jaromil/mirror/muse/releases/
diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile
index 15f3829d9a4..57e453b4d1a 100644
--- a/audio/padevchooser/Makefile
+++ b/audio/padevchooser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:11 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	padevchooser-0.9.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/padevchooser/
 
diff --git a/audio/paman/Makefile b/audio/paman/Makefile
index 83a38e35867..0998aa0b254 100644
--- a/audio/paman/Makefile
+++ b/audio/paman/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/08/26 19:57:11 sno Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	paman-0.9.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/paman/
 
diff --git a/audio/paprefs/Makefile b/audio/paprefs/Makefile
index 2c4748a23de..8bc7350920b 100644
--- a/audio/paprefs/Makefile
+++ b/audio/paprefs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:11 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	paprefs-0.9.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/paprefs/
 
diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile
index 16b4cb6e30f..2aec7f0fd9b 100644
--- a/audio/pavucontrol/Makefile
+++ b/audio/pavucontrol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/12/15 21:30:53 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	pavucontrol-0.9.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/pavucontrol/
 
diff --git a/audio/pavumeter/Makefile b/audio/pavumeter/Makefile
index 6468ccde5bd..8704b4eb57f 100644
--- a/audio/pavumeter/Makefile
+++ b/audio/pavumeter/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2009/12/15 21:30:53 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	pavumeter-0.9.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/pavumeter/
 
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 36a65d8650b..f6ea32ebe2c 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 11:37:21 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	pykaraoke-0.7.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pykaraoke/}
 EXTRACT_SUFX=	.zip
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index ecaea10992a..0f7e7e10758 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2009/08/26 19:57:12 sno Exp $
+# $NetBSD: Makefile,v 1.21 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	pymusique-0.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://www.pyronecrophilia.com/content/pymusique/
 
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 0f36660b4fa..9109d7a7219 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:43:52 wiz Exp $
 #
 
 DISTNAME=	qjackctl-0.3.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qjackctl/}
 
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 3acc0c3d144..73f51167285 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:52 wiz Exp $
 
 DISTNAME=	qsynth-0.2.4
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qsynth/}
 
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 1010f4fe20a..4b3ef48421b 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2010/05/20 21:15:54 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=	rhythmbox-0.12.8
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.12/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/sfxr/Makefile b/audio/sfxr/Makefile
index 1989002b86e..3dd4b5de0e1 100644
--- a/audio/sfxr/Makefile
+++ b/audio/sfxr/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/03 22:29:34 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=	sfxr-sdl-1.1
 PKGNAME=	${DISTNAME:S/-sdl//}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.drpetter.se/files/
 
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index b1e8b662a43..06f11eb1b04 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=		solfege-3.14.1
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=solfege/}
 
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 1a18ce3a615..c0054c9c7e5 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:57:12 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=	sonata-1.6.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/sonata/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 3c98cbee70b..eee5d32807e 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2010/05/18 20:03:04 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=		sound-juicer-2.28.2
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://www.burtonini.com/computing/ \
 			${MASTER_SITE_GNOME:=sources/sound-juicer/2.28/}
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 9a772817e42..69cf780893a 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2008/03/02 06:10:34 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=		SpiralLoops-2.0.0
 PKGNAME=		spiralloops-2.0.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://www.pawfal.org/Software/SpiralLoops/dload/
 
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 9478167ef7a..21864b4f979 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2008/03/02 06:10:34 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=		SpiralSynth-2.0.0
 PKGNAME=		spiralsynth-2.0.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		http://www.pawfal.org/Software/SpiralSynth/dload/
 
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 6f9c1918b3f..0a18ed98f7c 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2010/01/17 12:02:05 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=	streamtuner-0.99.99
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	audio www
 MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/
 
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
index 343c9ee1cc3..11825cbb8f8 100644
--- a/audio/streamtuner/buildlink3.mk
+++ b/audio/streamtuner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/17 12:02:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/06/13 22:43:53 wiz Exp $
 
 BUILDLINK_TREE+=	streamtuner
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	streamtuner
 STREAMTUNER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.streamtuner+=		streamtuner>=0.99
-BUILDLINK_ABI_DEPENDS.streamtuner?=	streamtuner>=0.99.99nb9
+BUILDLINK_ABI_DEPENDS.streamtuner?=	streamtuner>=0.99.99nb10
 BUILDLINK_PKGSRCDIR.streamtuner?=	../../audio/streamtuner
 
 .include "../../www/curl/buildlink3.mk"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 1af8bcf16fd..cdac5518b6c 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2009/08/26 19:57:12 sno Exp $
+# $NetBSD: Makefile,v 1.44 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=	sweep-0.9.3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sweep/}
 
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 7ac8737da31..49c7207c2b9 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2010/02/01 01:43:59 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:43:53 wiz Exp $
 #
 
 DISTNAME=	terminatorX-3.82
 PKGNAME=	${DISTNAME:S/X/x/}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://terminatorx.org/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index e23797e0d42..092ea6618e8 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2010/05/19 18:26:39 drochner Exp $
+# $NetBSD: Makefile,v 1.71 2010/06/13 22:43:54 wiz Exp $
 
 DISTNAME=	TiMidity++-2.13.2
 PKGNAME=	${DISTNAME:S/TiMidity++/timidity/}
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=     audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=timidity/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/tunapie/Makefile b/audio/tunapie/Makefile
index 6aeeec454fe..8195ece7a29 100644
--- a/audio/tunapie/Makefile
+++ b/audio/tunapie/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/02/10 19:17:33 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:54 wiz Exp $
 #
 
 DISTNAME=	tunapie-2.1.6
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tunapie/}
 
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index c409fca2045..a089062ff52 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2010/02/01 02:00:32 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:43:54 wiz Exp $
 
 DISTNAME=	WSoundPrefs-1.1.1
 PKGNAME=	wsoundprefs-1.1.1
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	audio wm windowmaker
 MASTER_SITES=	# ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 8c2c5613e09..1ab6dadc97d 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2010/02/01 02:01:59 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2010/06/13 22:43:54 wiz Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
 PKGNAME=	wsoundserver-0.4.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	audio wm windowmaker
 MASTER_SITES=	# ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 
diff --git a/audio/wsoundserver/buildlink3.mk b/audio/wsoundserver/buildlink3.mk
index 91dabd0f716..de59e86d410 100644
--- a/audio/wsoundserver/buildlink3.mk
+++ b/audio/wsoundserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:43:54 wiz Exp $
 
 BUILDLINK_TREE+=	wsoundserver
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	wsoundserver
 WSOUNDSERVER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb4
-BUILDLINK_ABI_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb11
+BUILDLINK_ABI_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb12
 BUILDLINK_PKGSRCDIR.wsoundserver?=	../../audio/wsoundserver
 
 .include "../../audio/libaudiofile/buildlink3.mk"
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index f683afc02b1..e1608a1bfd3 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.26 2009/09/16 01:15:33 reed Exp $
+# $NetBSD: Makefile,v 1.27 2010/06/13 22:43:54 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-mixer-${XFCE4_VERSION}
+PKGREVISION=	1
 CATEGORIES=	audio
 COMMENT=	Xfce mixer plugin
 
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index c3b5005b07a..bb4b398e846 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:04 sno Exp $
+# $NetBSD: Makefile,v 1.16 2010/06/13 22:43:54 wiz Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 XFCE4_VERSION=	0.5.1
 
 DISTNAME=	xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://goodies.xfce.org/releases/xfce4-xmms-plugin/
 COMMENT=	Xfce XMMS plugin
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index a2659199716..b3e272777e4 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2009/09/16 01:31:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:43:54 wiz Exp $
 
 BUILDLINK_TREE+=	xfce4-xmms-plugin
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	xfce4-xmms-plugin
 XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.5.1
-BUILDLINK_ABI_DEPENDS.xfce4-xmms-plugin?=	xfce4-xmms-plugin>=0.5.1nb1
+BUILDLINK_ABI_DEPENDS.xfce4-xmms-plugin?=	xfce4-xmms-plugin>=0.5.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?=	../../audio/xfce4-xmms-plugin
 
 .include "../../x11/xfce4-panel/buildlink3.mk"
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 3af8f7d1412..7b587f6d6e7 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:43:54 wiz Exp $
 #
 
 DISTNAME=	xsidplay-1.6.5.1a
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	audio x11
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz