Recursive revision bump / recommended bump for gettext ABI change.

269 files changed, 550 insertions, 465 deletions

diff --git a/audio/SDL-arts/Makefile b/audio/SDL-arts/Makefile
index 9985fc05c79..3e620aaafd9 100644
--- a/audio/SDL-arts/Makefile
+++ b/audio/SDL-arts/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:05 joerg Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-arts/}
-PKGREVISION=	2
+PKGREVISION=	3
 
 CATEGORIES+=	audio kde
 
diff --git a/audio/SDL-esound/Makefile b/audio/SDL-esound/Makefile
index 6b793f2cf17..d57233baa4e 100644
--- a/audio/SDL-esound/Makefile
+++ b/audio/SDL-esound/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/12/11 09:40:37 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:05 joerg Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-esound/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 CATEGORIES+=	audio gnome
 
diff --git a/audio/SDL-nas/Makefile b/audio/SDL-nas/Makefile
index a0497bd1c01..749798019b8 100644
--- a/audio/SDL-nas/Makefile
+++ b/audio/SDL-nas/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/12/11 09:40:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:05 joerg Exp $
 
 .include "../../devel/SDL/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/SDL/SDL-nas/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 CATEGORIES+=	audio
 
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
index 527088401ca..ba543f7ccd0 100644
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2005/12/11 09:40:37 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:05 joerg Exp $
 
 DISTNAME=	SDL_mixer-1.2.6
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 
diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk
index bf5345dd606..b088073022f 100644
--- a/audio/SDL_mixer/buildlink3.mk
+++ b/audio/SDL_mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/12/11 09:40:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:08:05 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_MIXER_BUILDLINK3_MK:=	${SDL_MIXER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_mixer
 
 .if !empty(SDL_MIXER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.5nb2
-BUILDLINK_RECOMMENDED.SDL_mixer+=	SDL_mixer>=1.2.6nb3
+BUILDLINK_RECOMMENDED.SDL_mixer+=	SDL_mixer>=1.2.6nb4
 BUILDLINK_PKGSRCDIR.SDL_mixer?=	../../audio/SDL_mixer
 BUILDLINK_INCDIRS.SDL_mixer?=	include/SDL
 .endif	# SDL_MIXER_BUILDLINK3_MK
diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile
index 6a802781e15..f4117e171d9 100644
--- a/audio/SDL_sound/Makefile
+++ b/audio/SDL_sound/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:37 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:05 joerg Exp $
 #
 
 DISTNAME=		SDL_sound-1.0.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://icculus.org/SDL_sound/downloads/
 
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
index ed74eed6ae8..3db4ff7d74d 100644
--- a/audio/SDL_sound/buildlink3.mk
+++ b/audio/SDL_sound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/12/11 09:40:37 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:05 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SDL_SOUND_BUILDLINK3_MK:=	${SDL_SOUND_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	SDL_sound
 
 .if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.SDL_sound+=	SDL_sound>=1.0.1
-BUILDLINK_RECOMMENDED.SDL_sound+=	SDL_sound>=1.0.1nb3
+BUILDLINK_RECOMMENDED.SDL_sound+=	SDL_sound>=1.0.1nb4
 BUILDLINK_PKGSRCDIR.SDL_sound?=	../../audio/SDL_sound
 .endif	# SDL_SOUND_BUILDLINK3_MK
 
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 279131e36ad..54d4e29424f 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2005/10/04 20:58:43 sketch Exp $
+# $NetBSD: Makefile,v 1.37 2006/02/05 23:08:05 joerg Exp $
 
 DISTNAME=	abcde_2.3.3.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.hispalinux.es/~data/files/
 
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 6a029de5132..2048fbb8d19 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:05 joerg Exp $
 
 DISTNAME=		amarok-1.3.8
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amarok/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 90e690829be..b201891dea8 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2006/01/31 22:17:35 markd Exp $
+# $NetBSD: Makefile,v 1.53 2006/02/05 23:08:05 joerg Exp $
 
 DISTNAME=	arts-1.5.1
+PKGREVISION=	1
 CATEGORIES=	audio
 HOMEPAGE=	http://www.kde.org/areas/multimedia/
 COMMENT=	Analog Real-Time Synthesizer
diff --git a/audio/arts/buildlink3.mk b/audio/arts/buildlink3.mk
index a58b21be7a6..52255e04ac6 100644
--- a/audio/arts/buildlink3.mk
+++ b/audio/arts/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/02/05 23:08:05 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 ARTS_BUILDLINK3_MK:=	${ARTS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	arts
 
 .if !empty(ARTS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.arts+=	arts>=1.1.4nb1
-BUILDLINK_RECOMMENDED.arts+=	arts>=1.5.0nb1
+BUILDLINK_RECOMMENDED.arts+=	arts>=1.5.1nb1
 BUILDLINK_PKGSRCDIR.arts?=	../../audio/arts
 
 PRINT_PLIST_AWK+=	/^@dirrm include\/arts$$/ \
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 786d8918149..fcfdfcee181 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2006/02/05 23:08:05 joerg Exp $
 
 DISTNAME=	audacity-src-1.2.4b
 PKGNAME=	audacity-1.2.4b
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audacity/}
 
diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile
index b9133add52d..2a0360b5261 100644
--- a/audio/aumix-gtk/Makefile
+++ b/audio/aumix-gtk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:05 joerg Exp $
 
 .include "../../audio/aumix/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/aumix/aumix-gtk/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT+=	(ncurses and GTK+ 2.0 interfaces)
 
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index c09bd433749..476370f7755 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/10/22 18:30:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:05 joerg Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	6
+PKGREVISION=	7
 
 COMMENT+=	(ncurses interface only)
 
diff --git a/audio/bmp-esound/Makefile b/audio/bmp-esound/Makefile
index 6cadeec2aba..67f17ebc526 100644
--- a/audio/bmp-esound/Makefile
+++ b/audio/bmp-esound/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:05 joerg Exp $
 #
 
 .include "../../audio/bmp/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/bmp/bmp-esound/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES+=		gnome
 
 COMMENT=		BMP plugin to output sound through the esound daemon
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index 2039418e82b..40e2562a71e 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=		bmp-musepack-1.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		http://www.saunalahti.fi/grimmel/musepack.net/linux/plugins/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 3176ab21c98..4fc2272f88a 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:05 joerg Exp $
 #
 
 BMP_ENABLE_ENCODERS=	yes
 
 .include "Makefile.common"
 
-PKGREVISION=		3
+PKGREVISION=		4
 
 DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
diff --git a/audio/bmp/buildlink3.mk b/audio/bmp/buildlink3.mk
index 31b435fb359..9a0fc803103 100644
--- a/audio/bmp/buildlink3.mk
+++ b/audio/bmp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:05 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 BMP_BUILDLINK3_MK:=	${BMP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	bmp
 
 .if !empty(BMP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
-BUILDLINK_RECOMMENDED.bmp?=	bmp>=0.9.7nb3
+BUILDLINK_RECOMMENDED.bmp?=	bmp>=0.9.7nb4
 BUILDLINK_PKGSRCDIR.bmp?=	../../audio/bmp
 
 PRINT_PLIST_AWK+=	/^@dirrm lib\/bmp\/Input$$/ \
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 48b4022795b..3ab8c109d95 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/16 09:40:59 rh Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=	cddb.bundle-0.2
 PKGNAME=	${DISTNAME:S/./-/}
+PKGREVISION=	1
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 
diff --git a/audio/cddb-bundle/buildlink3.mk b/audio/cddb-bundle/buildlink3.mk
index 45dfb150399..86e2d15d39e 100644
--- a/audio/cddb-bundle/buildlink3.mk
+++ b/audio/cddb-bundle/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/05/16 09:40:59 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:06 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDDB_BUNDLE_BUILDLINK3_MK:=	${CDDB_BUNDLE_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	cddb-bundle
 
 .if !empty(CDDB_BUNDLE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.cddb-bundle+=	cddb-bundle>=0.2
+BUILDLINK_RECOMMENDED.cddb-bundle?=	cddb-bundle>=0.2nb1
 BUILDLINK_PKGSRCDIR.cddb-bundle?=	../../audio/cddb-bundle
 .endif	# CDDB_BUNDLE_BUILDLINK3_MK
 
diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index cf89017ba40..06273572bbd 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2005/12/29 22:50:53 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=	cdparanoia-III-alpha9.8
 PKGNAME=	cdparanoia-3.0.9.8
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.xiph.org/paranoia/download/
 EXTRACT_SUFX=	.src.tgz
diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk
index 08ebb0e3308..2a929569d03 100644
--- a/audio/cdparanoia/buildlink3.mk
+++ b/audio/cdparanoia/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:06 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDPARANOIA_BUILDLINK3_MK:=	${CDPARANOIA_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	cdparanoia
 
 .if !empty(CDPARANOIA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.cdparanoia+=		cdparanoia>=3.0
-BUILDLINK_RECOMMENDED.cdparanoia+=	cdparanoia>=3.0.9.8nb1
+BUILDLINK_RECOMMENDED.cdparanoia+=	cdparanoia>=3.0.9.8nb4
 BUILDLINK_PKGSRCDIR.cdparanoia?=	../../audio/cdparanoia
 .endif	# CDPARANOIA_BUILDLINK3_MK
 
diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
index 7015bf51817..732d3705c25 100644
--- a/audio/cdplayer/Makefile
+++ b/audio/cdplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=	cdplayer-0.4.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 
diff --git a/audio/cdplayer/buildlink3.mk b/audio/cdplayer/buildlink3.mk
index 93a83232051..f8bdb1f660f 100644
--- a/audio/cdplayer/buildlink3.mk
+++ b/audio/cdplayer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:06 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CDPLAYER_BUILDLINK3_MK:=	${CDPLAYER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	cdplayer
 
 .if !empty(CDPLAYER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.cdplayer+=	cdplayer>=0.4.2
-BUILDLINK_RECOMMENDED.cdplayer?=	cdplayer>=0.4.2nb2
+BUILDLINK_RECOMMENDED.cdplayer?=	cdplayer>=0.4.2nb3
 BUILDLINK_PKGSRCDIR.cdplayer?=	../../audio/cdplayer
 .endif	# CDPLAYER_BUILDLINK3_MK
 
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 5ee3bea9116..bb3c2caa7a7 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:47 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=	cmp3-2.0pre6
 PKGNAME=	cmp3-2.0.p6
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cmp3/}
 
diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile
index a075af051ad..771d31bf540 100644
--- a/audio/cplay/Makefile
+++ b/audio/cplay/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/12/29 06:21:30 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=		cplay-1.49
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/audio/csound4/Makefile b/audio/csound4/Makefile
index 67a92464677..3bbae4871cb 100644
--- a/audio/csound4/Makefile
+++ b/audio/csound4/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:37 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=		csound-4.23f13gbs.0
 PKGNAME=		csound4-4.23.13.0
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=csound/}
 
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index f84600c0760..bc800e48b03 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/01/24 15:18:38 tonio Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=		daapd-0.2.4a
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${HOMEPAGE}
 EXTRACT_SUFX=		.tgz
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index d01407b102a..8dee7b641a1 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:47 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=		dap-2.1.2
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		# http://www.cee.hw.ac.uk/~richardk/downloads/
 EXTRACT_SUFX=		.tgz
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index b0307cec414..7fb19f54f6c 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/12/29 06:21:30 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=	darkice-0.14
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=darkice/}
 
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index a951925a500..3754512caa1 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2005/06/01 18:02:37 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=	easytag-1.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index c6d1224fdee..89bc100fa06 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2005/12/08 10:06:32 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/02/05 23:08:06 joerg Exp $
 #
 
 DISTNAME=	faad2-2.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
 
diff --git a/audio/faad2/buildlink3.mk b/audio/faad2/buildlink3.mk
index 26c28462ce8..2203fa0fbbd 100644
--- a/audio/faad2/buildlink3.mk
+++ b/audio/faad2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/10/09 03:23:11 ben Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:06 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FAAD2_BUILDLINK3_MK:=	${FAAD2_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	faad2
 
 .if !empty(FAAD2_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.faad2+=	faad2>=2.0nb3
+BUILDLINK_RECOMMENDED.faad2?=	faad2>=2.0nb5
 BUILDLINK_PKGSRCDIR.faad2?=	../../audio/faad2
 BUILDLINK_INCDIRS.faad2?=	include/faad2
 .endif	# FAAD2_BUILDLINK3_MK
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 5cf25583f9a..1af5cb889df 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2005/12/05 20:49:47 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=	festival-1.95-beta
 PKGNAME=	festival-1.95beta
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://festvox.org/packed/festival/1.95/ \
 		ftp://cslu.cse.ogi.edu/pub/tts/
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index fc358098290..88f96edb1bc 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/07/19 10:22:32 grant Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=	festlex_CMU
 PKGNAME=	festlex-cmu-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index 793c9e5d148..78b80b05e38 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/07/19 10:22:32 grant Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=	festlex_OALD
 PKGNAME=	festlex-oald-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index bcfb5727e5f..b13441ede0e 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/07/19 10:22:32 grant Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=	OGIlexicon-2.0
 PKGNAME=	festlex-ogi-2.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index dacd8427309..130eb705d20 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/07/19 10:22:32 grant Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=	festlex_POSLEX
 PKGNAME=	festlex-poslex-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index 9e16d5811ed..faf6b095143 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/07/19 10:22:32 grant Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:06 joerg Exp $
 
 DISTNAME=	OGIspanish-2.0.1
 PKGNAME=	festogi-spanish-2.0.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index e95f4ac3e4a..903470a9002 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/07/19 10:22:32 grant Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	voice_abc_di-2.0
 PKGNAME=	festvox-abc-2.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index dd11343a6e7..69b1db4c063 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:48 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	voice_aec_di-2.0
 PKGNAME=	festvox-aec-2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index f6bd18cdf9b..64ee6e23b00 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_don
 PKGNAME=	festvox-don-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index e0de191c71c..6622f13d8e3 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_ellpc11k
 PKGNAME=	festvox-el11-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index 4613520ecf8..bc7d4c1cf83 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -13,8 +14,8 @@ COMMENT=	MBROLA based British English male voice for festival
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 DEPENDS+=	festlex-oald>=1.4.0:../../audio/festlex-oald
-DEPENDS+=	mbrola-301h:../../audio/mbrola
-DEPENDS+=	mbrolavox-en1-980910:../../audio/mbrolavox-en1
+DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
+DEPENDS+=	mbrolavox-en1-980910nb1:../../audio/mbrolavox-en1
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index 83a3d7a4a88..b70acc67e48 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	voice_hvs_di-2.0
 PKGNAME=	festvox-hvs-2.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 479e2de00d3..c4b43fa8a11 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	voice_jph_di-2.0
 PKGNAME=	festvox-jph-2.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 2b1e9320823..13b5bf28948 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index 8c7ed2b88fc..ee57fb5489d 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index c1784931a80..913970a83f7 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index 7de40d0deb2..ad5156cc9c6 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index 8d3c2f207b7..64d7467c1e5 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	voice_mwm_di-2.0
 PKGNAME=	festvox-mwm-2.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 154617e992c..be5e9d73c6a 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	voice_ogirab_di-2.0
 PKGNAME=	festvox-ogirab-2.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index 8c6d98b5345..0774b8bbd3e 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_rablpc16k
 PKGNAME=	festvox-rab16-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 5c1967f0934..67b82b96058 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index b576b54c0d3..384af1011cd 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	voice_tll_di-2.0
 PKGNAME=	festvox-tll-2.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://cslu.cse.ogi.edu/pub/tts/
 
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index f5a8ff6ff6c..ae0be867513 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -13,8 +14,8 @@ COMMENT=	MBROLA based American English female voice for festival
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+=	mbrola-301h:../../audio/mbrola
-DEPENDS+=	mbrolavox-us1-980512:../../audio/mbrolavox-us1
+DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
+DEPENDS+=	mbrolavox-us1-980512nb1:../../audio/mbrolavox-us1
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index 15647f3c59a..37f1e019312 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -13,8 +14,8 @@ COMMENT=	MBROLA based Americal English male voice for festival
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+=	mbrola-301h:../../audio/mbrola
-DEPENDS+=	mbrolavox-us2-980812:../../audio/mbrolavox-us2
+DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
+DEPENDS+=	mbrolavox-us2-980812nb1:../../audio/mbrolavox-us2
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index e76d03c7222..a89bb1e2376 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:07 joerg Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.cstr.ed.ac.uk/pub/festival/1.4.1/ \
 		http://www.speech.cs.cmu.edu/festival/cstr/festival/1.4.1/
@@ -13,8 +14,8 @@ COMMENT=	MBROLA based American English male voice for festival
 DEPENDS+=	festival>=1.4.0:../../audio/festival
 DEPENDS+=	festlex-poslex>=1.4.0:../../audio/festlex-poslex
 DEPENDS+=	festlex-cmu>=1.4.0:../../audio/festlex-cmu
-DEPENDS+=	mbrola-301h:../../audio/mbrola
-DEPENDS+=	mbrolavox-us3-990208:../../audio/mbrolavox-us3
+DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
+DEPENDS+=	mbrolavox-us3-990208nb1:../../audio/mbrolavox-us3
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index d64a52c6e9a..f1966582c79 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/02/05 23:08:08 joerg Exp $
 
 DISTNAME=	flac-1.1.2
+PKGREVISION=	1
 CATEGORIES=	audio archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
 
diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk
index f2d69c2d14d..8ab51408864 100644
--- a/audio/flac/buildlink3.mk
+++ b/audio/flac/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:08 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLAC_BUILDLINK3_MK:=	${FLAC_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	flac
 
 .if !empty(FLAC_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.flac+=	flac>=1.1.0nb1
-BUILDLINK_RECOMMENDED.flac+=	flac>=1.1.1nb1
+BUILDLINK_RECOMMENDED.flac+=	flac>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.flac?=	../../audio/flac
 .endif	# FLAC_BUILDLINK3_MK
 
diff --git a/audio/flac123/Makefile b/audio/flac123/Makefile
index c4ace7b9200..2a9941501e1 100644
--- a/audio/flac123/Makefile
+++ b/audio/flac123/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/10/08 12:35:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=	flac123-0.0.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac-tools/}
 
diff --git a/audio/flac2mp3/Makefile b/audio/flac2mp3/Makefile
index bf4b4a95e82..629068cde63 100644
--- a/audio/flac2mp3/Makefile
+++ b/audio/flac2mp3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/01/21 18:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:08 joerg Exp $
 
 DISTNAME=	flac2mp3
 PKGNAME=	flac2mp3-20041223
+PKGREVISION=	1
 CATEGORIES=	audio converters
 MASTER_SITES=	http://www.gurulabs.com/files/
 EXTRACT_SUFX=	.pl
diff --git a/audio/flite/Makefile b/audio/flite/Makefile
index c3808c71ed2..c5bcbfb74f6 100644
--- a/audio/flite/Makefile
+++ b/audio/flite/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/16 14:18:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=	flite-1.3-release
 PKGNAME=	${DISTNAME:S/-release//}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
 
diff --git a/audio/freezetag/Makefile b/audio/freezetag/Makefile
index 6c96a2d94f4..88806ad08b8 100644
--- a/audio/freezetag/Makefile
+++ b/audio/freezetag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:02:37 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=	freezetag-0.9.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://katz.linuxpower.org/freezetag/current/
 
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index c2f5c7f355f..91e499114be 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:08 joerg Exp $
 
 DISTNAME=	gkrellm-volume-2.1.13
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 9450992e21e..e36776f2126 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=	gkrellmms-2.1.20
 PKGNAME=	${DISTNAME:S/mms/m-xmms/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/gkrellm1-volume/Makefile b/audio/gkrellm1-volume/Makefile
index d29afdae7fb..7c43a74039d 100644
--- a/audio/gkrellm1-volume/Makefile
+++ b/audio/gkrellm1-volume/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/01/20 16:15:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:08 joerg Exp $
 
 DISTNAME=	volume-0.8
 PKGNAME=	gkrellm-${DISTNAME}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/gkrellm1-xmms/Makefile b/audio/gkrellm1-xmms/Makefile
index 7666cc44b5f..02a227f8810 100644
--- a/audio/gkrellm1-xmms/Makefile
+++ b/audio/gkrellm1-xmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:08 joerg Exp $
 
 DISTNAME=	gkrellmms-0.5.6
 PKGNAME=	gkrellm-xmms-0.5.6
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index 8bf708b21e4..c32973614e6 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/02/03 00:58:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=	glurp-0.11.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glurp/}
 
diff --git a/audio/gmp3info/Makefile b/audio/gmp3info/Makefile
index db22add7afa..ec666f87121 100644
--- a/audio/gmp3info/Makefile
+++ b/audio/gmp3info/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2005/06/01 18:02:38 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:08 joerg Exp $
 
 DISTNAME=	mp3info-0.8.4
 PKGNAME=	g${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 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 00c6eea25b4..eef219da5b0 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=		gmpc-0.12.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		http://download.qballcow.nl/programs/gmpc/
 
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 87f61bd7bba..7dc8bc3e280 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:38 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=	gnome-audio-2.0.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-audio/2.0/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index d68c1a40d0d..2c634f613ef 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=	gnome-speech-0.3.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-speech/0.3/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/gnome-speech/buildlink3.mk b/audio/gnome-speech/buildlink3.mk
index 62de014159c..a79794127cb 100644
--- a/audio/gnome-speech/buildlink3.mk
+++ b/audio/gnome-speech/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:08 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_SPEECH_BUILDLINK3_MK:=	${GNOME_SPEECH_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gnome-speech
 
 .if !empty(GNOME_SPEECH_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gnome-speech+=	gnome-speech>=0.3.2
-BUILDLINK_RECOMMENDED.gnome-speech+=	gnome-speech>=0.3.9nb1
+BUILDLINK_RECOMMENDED.gnome-speech+=	gnome-speech>=0.3.9nb2
 BUILDLINK_PKGSRCDIR.gnome-speech?=	../../audio/gnome-speech
 .endif	# GNOME_SPEECH_BUILDLINK3_MK
 
diff --git a/audio/gnome-vfs2-cdda/Makefile b/audio/gnome-vfs2-cdda/Makefile
index 25fe93c9e63..c45150d01e7 100644
--- a/audio/gnome-vfs2-cdda/Makefile
+++ b/audio/gnome-vfs2-cdda/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/01/24 07:31:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:08 joerg Exp $
 #
 
 GNOME_VFS2_NAME=	cdda
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index 49031c4144b..629f51cea10 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:08 joerg Exp $
 #
 
 DISTNAME=		gogo239b
 PKGNAME=		gogo-2.39.1
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://homepage1.nifty.com/herumi/soft/gogo2/src/
 EXTRACT_SUFX=		.tgz
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 94587298708..2a0ee0de302 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:09 joerg Exp $
 
 DISTNAME=		gqmpeg-0.91.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
 
diff --git a/audio/gqmpeg-skins/Makefile b/audio/gqmpeg-skins/Makefile
index cefc0e7ebf5..6872ec9944c 100644
--- a/audio/gqmpeg-skins/Makefile
+++ b/audio/gqmpeg-skins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:09 joerg Exp $
 
 DISTNAME=	gqmpeg-skins-20030712
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://gqmpeg.sourceforge.net/skins/
 DISTFILES+=	\
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index dcbe97278be..afe8107fa84 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2005/12/29 06:21:31 jlam Exp $
+# $NetBSD: Makefile,v 1.88 2006/02/05 23:08:09 joerg Exp $
 
 DISTNAME=		gqmpeg-0.20.0
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gqmpeg/}
 
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index 5a564605601..03f47348aa6 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/12/19 23:06:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:09 joerg Exp $
 #
 
 DISTNAME=	gramofile-1.6
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.opensourcepartners.nl/~costar/gramofile/
 
diff --git a/audio/gst-plugins0.10-oss/Makefile b/audio/gst-plugins0.10-oss/Makefile
index 8f7262bee7c..4b60744cf0a 100644
--- a/audio/gst-plugins0.10-oss/Makefile
+++ b/audio/gst-plugins0.10-oss/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/01/18 15:50:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.10_NAME=	oss
 GST_PLUGINS0.10_DIRS=	sys/oss
+PKGREVISION=		1
 
 .include "../../multimedia/gst-plugins0.10-good/Makefile.common"
 
diff --git a/audio/gst-plugins0.8-artsd/Makefile b/audio/gst-plugins0.8-artsd/Makefile
index 68c5f50a128..bc877ffff89 100644
--- a/audio/gst-plugins0.8-artsd/Makefile
+++ b/audio/gst-plugins0.8-artsd/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	artsd
 GST_PLUGINS0.8_DIR=	ext/artsd
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/arts/buildlink3.mk"
diff --git a/audio/gst-plugins0.8-artsd/buildlink3.mk b/audio/gst-plugins0.8-artsd/buildlink3.mk
index f91822d2ab3..26e9b7f71d5 100644
--- a/audio/gst-plugins0.8-artsd/buildlink3.mk
+++ b/audio/gst-plugins0.8-artsd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:=	${GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gst-plugins0.8-artsd
 
 .if !empty(GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gst-plugins0.8-artsd+=	gst-plugins0.8-artsd>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-artsd?=	gst-plugins0.8-artsd>=0.8.11
+BUILDLINK_RECOMMENDED.gst-plugins0.8-artsd?=	gst-plugins0.8-artsd>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-artsd?=	../../audio/gst-plugins0.8-artsd
 .endif	# GST_PLUGINS0.8_ARTSD_BUILDLINK3_MK
 
diff --git a/audio/gst-plugins0.8-cdparanoia/Makefile b/audio/gst-plugins0.8-cdparanoia/Makefile
index 0498d5194e5..60e72a6b15a 100644
--- a/audio/gst-plugins0.8-cdparanoia/Makefile
+++ b/audio/gst-plugins0.8-cdparanoia/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	cdparanoia
 GST_PLUGINS0.8_DIR=	ext/cdparanoia
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia
 
diff --git a/audio/gst-plugins0.8-esound/Makefile b/audio/gst-plugins0.8-esound/Makefile
index b21c1eaa23d..41694628a52 100644
--- a/audio/gst-plugins0.8-esound/Makefile
+++ b/audio/gst-plugins0.8-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	esound
@@ -6,7 +6,7 @@ GST_PLUGINS0.8_DIR=	ext/esd
 GST_PLUGINS0.8_FLAG=	esd
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-esound/buildlink3.mk b/audio/gst-plugins0.8-esound/buildlink3.mk
index 5086fc1aa5b..e4e08cd65e5 100644
--- a/audio/gst-plugins0.8-esound/buildlink3.mk
+++ b/audio/gst-plugins0.8-esound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:=	${GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gst-plugins0.8-esound
 
 .if !empty(GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gst-plugins0.8-esound+=	gst-plugins0.8-esound>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-esound?=	gst-plugins0.8-esound>=0.8.11
+BUILDLINK_RECOMMENDED.gst-plugins0.8-esound?=	gst-plugins0.8-esound>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-esound?=	../../audio/gst-plugins0.8-esound
 .endif	# GST_PLUGINS0.8_ESOUND_BUILDLINK3_MK
 
diff --git a/audio/gst-plugins0.8-faad/Makefile b/audio/gst-plugins0.8-faad/Makefile
index 31b27420380..3f007d94c46 100644
--- a/audio/gst-plugins0.8-faad/Makefile
+++ b/audio/gst-plugins0.8-faad/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	faad
 GST_PLUGINS0.8_DIR=	ext/faad
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../audio/faad2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-flac/Makefile b/audio/gst-plugins0.8-flac/Makefile
index 3133e0127e2..1ebfaaac5f3 100644
--- a/audio/gst-plugins0.8-flac/Makefile
+++ b/audio/gst-plugins0.8-flac/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	flac
 GST_PLUGINS0.8_DIR=	ext/flac
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-lame/Makefile b/audio/gst-plugins0.8-lame/Makefile
index f9b038b9383..c52ab0784f6 100644
--- a/audio/gst-plugins0.8-lame/Makefile
+++ b/audio/gst-plugins0.8-lame/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	lame
 GST_PLUGINS0.8_DIR=	ext/lame
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gst-plugins0.8-mad/Makefile b/audio/gst-plugins0.8-mad/Makefile
index 39a5bda4b97..384d0118152 100644
--- a/audio/gst-plugins0.8-mad/Makefile
+++ b/audio/gst-plugins0.8-mad/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	mad
 GST_PLUGINS0.8_DIR=	ext/mad
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/gst-plugins0.8-mad/buildlink3.mk b/audio/gst-plugins0.8-mad/buildlink3.mk
index b79d7621e4f..4c4199eceb3 100644
--- a/audio/gst-plugins0.8-mad/buildlink3.mk
+++ b/audio/gst-plugins0.8-mad/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:09 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GST_PLUGINS0.8_MAD_BUILDLINK3_MK:=	${GST_PLUGINS0.8_MAD_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	gst-plugins0.8-mad
 
 .if !empty(GST_PLUGINS0.8_MAD_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gst-plugins0.8-mad+=	gst-plugins0.8-mad>=0.8.11
-BUILDLINK_RECOMMENDED.gst-plugins0.8-mad?=	gst-plugins0.8-mad>=0.8.11
+BUILDLINK_RECOMMENDED.gst-plugins0.8-mad?=	gst-plugins0.8-mad>=0.8.11nb2
 BUILDLINK_PKGSRCDIR.gst-plugins0.8-mad?=	../../audio/gst-plugins0.8-mad
 .endif	# GST_PLUGINS0.8_MAD_BUILDLINK3_MK
 
diff --git a/audio/gst-plugins0.8-oss/Makefile b/audio/gst-plugins0.8-oss/Makefile
index c8ef4affb2f..47aeb897c91 100644
--- a/audio/gst-plugins0.8-oss/Makefile
+++ b/audio/gst-plugins0.8-oss/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	oss
 GST_PLUGINS0.8_DIR=	sys/oss
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 SUBST_CLASSES+=		devoss
 SUBST_MESSAGE.devoss=	"Fixing path to OSS audio device."
diff --git a/audio/gst-plugins0.8-vorbis/Makefile b/audio/gst-plugins0.8-vorbis/Makefile
index cd808b267c5..d1b4c41fdde 100644
--- a/audio/gst-plugins0.8-vorbis/Makefile
+++ b/audio/gst-plugins0.8-vorbis/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 GST_PLUGINS0.8_NAME=	vorbis
 GST_PLUGINS0.8_DIR=	ext/vorbis
 
 .include "../../multimedia/gst-plugins0.8/Makefile.common"
-PKGREVISION=		1
+PKGREVISION=		2
 
 DEPENDS+=		gst-plugins0.8-ogg>=0.8.0:../../multimedia/gst-plugins0.8-ogg
 
diff --git a/audio/gtick/Makefile b/audio/gtick/Makefile
index e3be6defd99..6f2d2dc98d1 100644
--- a/audio/gtick/Makefile
+++ b/audio/gtick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:09 joerg Exp $
 #
 
 DISTNAME=	gtick-0.3.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.antcom.de/gtick/download/
 
diff --git a/audio/gtkmserv/Makefile b/audio/gtkmserv/Makefile
index 14937a587b9..f541186c7e0 100644
--- a/audio/gtkmserv/Makefile
+++ b/audio/gtkmserv/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:09 joerg Exp $
 #
 
 DISTNAME=	gtkmserv-0.5.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://projects.ubertechnique.com/downloads/
 
diff --git a/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index 7bc1bbdf3e8..722bcdcd7b5 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/01/31 22:58:45 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:09 joerg Exp $
 #
 
 DISTNAME=	gtkpod-0.94.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 
diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile
index 58b811f9a35..234133689f6 100644
--- a/audio/guspatches/Makefile
+++ b/audio/guspatches/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:48 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:09 joerg Exp $
 #
 
 DISTNAME=	dgguspat
 PKGNAME=	guspatches-1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.zip
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index d7d40d61a2f..93830991772 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:09 joerg Exp $
 
 DISTNAME=	hydrogen-0.8.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hydrogen/}
 
diff --git a/audio/icecast/Makefile b/audio/icecast/Makefile
index 44cfbf505cb..db2c68221ce 100644
--- a/audio/icecast/Makefile
+++ b/audio/icecast/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2005/12/29 06:21:31 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2006/02/05 23:08:10 joerg Exp $
 #
 
 DISTNAME=		icecast-2.3.0
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES= 		http://svn.xiph.org/releases/icecast/
 
diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile
index 85d1cc287ff..fa5c7832f02 100644
--- a/audio/icecast1/Makefile
+++ b/audio/icecast1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/12/29 06:21:31 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:10 joerg Exp $
 #
 
 DISTNAME=	icecast-1.3.12
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icecast.org/releases/
 
diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile
index 745a33e12a5..4304e76da67 100644
--- a/audio/ices-mp3/Makefile
+++ b/audio/ices-mp3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:02 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:10 joerg Exp $
 #
 
 DISTNAME=		ices-${ICES_VERSION}
 PKGNAME=		ices-mp3-${ICES_VERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 ICES_VERSION=		0.4
 CATEGORIES=		audio
 MASTER_SITES=		http://svn.xiph.org/releases/ices/
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index 7671c2878a6..36a4a45e4fb 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2005/10/16 15:17:55 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:10 joerg Exp $
 #
 
 DISTNAME=	id3ed-1.10.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.dakotacom.net/~donut/programs/id3ed/
 
diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
index db1de70f074..d31c720501d 100644
--- a/audio/id3v2/Makefile
+++ b/audio/id3v2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/01/20 16:15:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:10 joerg Exp $
 
 DISTNAME=	id3v2-0.1.11
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=id3v2/}
 
diff --git a/audio/kmp/Makefile b/audio/kmp/Makefile
index 847c1b9fc37..1d9ef583e31 100644
--- a/audio/kmp/Makefile
+++ b/audio/kmp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:10 joerg Exp $
 
 DISTNAME=		kmp-0.01
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		http://mercury.chem.pitt.edu/~shank/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/ladspa/Makefile b/audio/ladspa/Makefile
index 94b6b30c6b3..20841a3367d 100644
--- a/audio/ladspa/Makefile
+++ b/audio/ladspa/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:10 joerg Exp $
 #
 
 DISTNAME=	ladspa_sdk_1.12
 PKGNAME=	${DISTNAME:S/_sdk_/-/}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ladspa.org/download/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/ladspa/buildlink3.mk b/audio/ladspa/buildlink3.mk
index 51b0a966771..b562f545e2e 100644
--- a/audio/ladspa/buildlink3.mk
+++ b/audio/ladspa/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/01/12 14:03:00 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:10 joerg Exp $
 #
 # This Makefile fragment is included by packages that use ladspa.
 #
@@ -15,6 +15,7 @@ BUILDLINK_DEPENDS+=	ladspa
 .if !empty(LADSPA_BUILDLINK3_MK:M+)
 BUILDLINK_PACKAGES+=			ladspa
 BUILDLINK_DEPENDS.ladspa+=		ladspa>=1.12
+BUILDLINK_RECOMMENDED.ladspa?=		ladspa>=1.12nb1
 BUILDLINK_PKGSRCDIR.ladspa?=		../../audio/ladspa
 
 .endif # LADSPA_BUILDLINK3_MK
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 7e125558b62..ac4c5404630 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2005/12/05 20:49:48 rillig Exp $
+# $NetBSD: Makefile,v 1.53 2006/02/05 23:08:10 joerg Exp $
 #
 
 DISTNAME=	lame-${VERS}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/} \
 		http://hive.me.gu.edu.au/not_lame/
diff --git a/audio/lame/buildlink3.mk b/audio/lame/buildlink3.mk
index 00866e607fe..6bb25ee0294 100644
--- a/audio/lame/buildlink3.mk
+++ b/audio/lame/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:06 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:10 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LAME_BUILDLINK3_MK:=	${LAME_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	lame
 
 .if !empty(LAME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.lame+=	lame>=3.93.1nb2
-BUILDLINK_RECOMMENDED.lame+=	lame>=3.96.1nb1
+BUILDLINK_RECOMMENDED.lame+=	lame>=3.96.1nb4
 BUILDLINK_PKGSRCDIR.lame?=	../../audio/lame
 .endif	# LAME_BUILDLINK3_MK
 
diff --git a/audio/libao-arts/Makefile b/audio/libao-arts/Makefile
index 5b08b67b1bd..27a7e7c403c 100644
--- a/audio/libao-arts/Makefile
+++ b/audio/libao-arts/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:10 joerg Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/libao/libao-arts/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT+=	(arts plugin)
 
diff --git a/audio/libao-esound/Makefile b/audio/libao-esound/Makefile
index 08627553b3f..d94e8d076b8 100644
--- a/audio/libao-esound/Makefile
+++ b/audio/libao-esound/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/10/23 19:05:34 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:10 joerg Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/libao/libao-esound/}
+PKGREVISION=	1
 
 COMMENT+=	(esound plugin)
 
diff --git a/audio/libao-macosx/Makefile b/audio/libao-macosx/Makefile
index 53c4b3f0ed7..db4fdb2219c 100644
--- a/audio/libao-macosx/Makefile
+++ b/audio/libao-macosx/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/10/23 19:05:34 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:10 joerg Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/libao/libao-macosx/}
+PKGREVISION=	1
 
 COMMENT+=	(MacOS X plugin)
 
diff --git a/audio/libao-oss/Makefile b/audio/libao-oss/Makefile
index 37376eb25d3..0ac39e3c946 100644
--- a/audio/libao-oss/Makefile
+++ b/audio/libao-oss/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2005/10/23 19:05:34 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:10 joerg Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/libao/libao-oss/}
+PKGREVISION=	1
 
 COMMENT+=	(OSS plugin)
 
diff --git a/audio/libao-sun/Makefile b/audio/libao-sun/Makefile
index ddb77b52aaf..53a49387377 100644
--- a/audio/libao-sun/Makefile
+++ b/audio/libao-sun/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/10/23 19:05:34 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:10 joerg Exp $
 
 .include "../../audio/libao/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/libao/libao-sun/}
+PKGREVISION=	1
 
 COMMENT+=	(Sun audio plugin)
 
diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 744c1e681bf..e35e47f5747 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2005/06/06 01:52:39 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:10 joerg Exp $
 
-PKGREVISION=		2
+PKGREVISION=		3
 
 PKG_INSTALLATION_TYPES=	overwrite
 
diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk
index a50f99c8133..1d55079e6da 100644
--- a/audio/libao/buildlink3.mk
+++ b/audio/libao/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/10/08 12:30:38 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:10 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBAO_BUILDLINK3_MK:=	${LIBAO_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libao
 
 .if !empty(LIBAO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libao+=	libao>=0.8.4
-BUILDLINK_RECOMMENDED.libao+=	libao>=0.8.4nb1
+BUILDLINK_RECOMMENDED.libao+=	libao>=0.8.6nb3
 BUILDLINK_PKGSRCDIR.libao?=	../../audio/libao
 
 .  if !defined(_LIBAO_BUILDING_PLUGIN)
diff --git a/audio/libhydrogen/Makefile b/audio/libhydrogen/Makefile
index 2fe8ca519a5..cf01073e674 100644
--- a/audio/libhydrogen/Makefile
+++ b/audio/libhydrogen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/10/31 15:42:43 tv Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:10 joerg Exp $
 
 DISTNAME=	libhydrogen-0.8.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hydrogen/}
 
diff --git a/audio/libhydrogen/buildlink3.mk b/audio/libhydrogen/buildlink3.mk
index 24b265bee17..0b96d245882 100644
--- a/audio/libhydrogen/buildlink3.mk
+++ b/audio/libhydrogen/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:10 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBHYDROGEN_BUILDLINK3_MK:=	${LIBHYDROGEN_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libhydrogen
 
 .if !empty(LIBHYDROGEN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libhydrogen+=		libhydrogen>=0.8.0
-BUILDLINK_RECOMMENDED.libhydrogen+=	libhydrogen>=0.8.0nb1
+BUILDLINK_RECOMMENDED.libhydrogen+=	libhydrogen>=0.8.0nb2
 BUILDLINK_PKGSRCDIR.libhydrogen?=	../../audio/libhydrogen
 .endif	# LIBHYDROGEN_BUILDLINK3_MK
 
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 5dd900c716c..ea3481217ea 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2005/05/31 21:58:36 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2006/02/05 23:08:10 joerg Exp $
 
 DISTNAME=		libmikmod-3.1.11
 PKGNAME=		libmikmod-3.1.11.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		http://mikmod.raphnet.net/files/
 
diff --git a/audio/libmikmod/buildlink3.mk b/audio/libmikmod/buildlink3.mk
index f65d49910ab..80899b09961 100644
--- a/audio/libmikmod/buildlink3.mk
+++ b/audio/libmikmod/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/06/04 09:31:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/02/05 23:08:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMIKMOD_BUILDLINK3_MK:=	${LIBMIKMOD_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	libmikmod
 
 .if !empty(LIBMIKMOD_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libmikmod+=	libmikmod>=3.1.9
-BUILDLINK_RECOMMENDED.libmikmod+=	libmikmod>=3.1.11.1nb1
+BUILDLINK_RECOMMENDED.libmikmod+=	libmikmod>=3.1.11.1nb2
 BUILDLINK_PKGSRCDIR.libmikmod?=	../../audio/libmikmod
 .endif	# LIBMIKMOD_BUILDLINK3_MK
 
diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile
index aac67d15242..50385ed246d 100644
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=	libsamplerate-0.1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/SRC/
 
diff --git a/audio/libsamplerate/buildlink3.mk b/audio/libsamplerate/buildlink3.mk
index d90a5cea80f..a2e703d6ae4 100644
--- a/audio/libsamplerate/buildlink3.mk
+++ b/audio/libsamplerate/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSAMPLERATE_BUILDLINK3_MK:=	${LIBSAMPLERATE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libsamplerate
 
 .if !empty(LIBSAMPLERATE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libsamplerate+=	libsamplerate>=0.0.13nb1
-BUILDLINK_RECOMMENDED.libsamplerate+=	libsamplerate>=0.1.2nb1
+BUILDLINK_RECOMMENDED.libsamplerate+=	libsamplerate>=0.1.2nb2
 BUILDLINK_PKGSRCDIR.libsamplerate?=	../../audio/libsamplerate
 .endif	# LIBSAMPLERATE_BUILDLINK3_MK
 
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 41fdb537f56..c7d6c198358 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=	libsidplay-1.36.59
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk
index f0bbd8fa8b6..b503f92a015 100644
--- a/audio/libsidplay/buildlink3.mk
+++ b/audio/libsidplay/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSIDPLAY_BUILDLINK3_MK:=	${LIBSIDPLAY_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libsidplay
 
 .if !empty(LIBSIDPLAY_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libsidplay+=		libsidplay>=1.36.38
-BUILDLINK_RECOMMENDED.libsidplay+=	libsidplay>=1.36.59nb1
+BUILDLINK_RECOMMENDED.libsidplay+=	libsidplay>=1.36.59nb2
 BUILDLINK_PKGSRCDIR.libsidplay?=	../../audio/libsidplay
 .endif	# LIBSIDPLAY_BUILDLINK3_MK
 
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 644f44be3bd..93c066ef804 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2006/01/21 23:04:08 adam Exp $
+# $NetBSD: Makefile,v 1.34 2006/02/05 23:08:11 joerg Exp $
 
 DISTNAME=	libsndfile-1.0.13
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
diff --git a/audio/libsndfile/buildlink3.mk b/audio/libsndfile/buildlink3.mk
index 82aa26aecf9..c3dfb1fe4f2 100644
--- a/audio/libsndfile/buildlink3.mk
+++ b/audio/libsndfile/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/01/21 23:04:08 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/02/05 23:08:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBSNDFILE_BUILDLINK3_MK:=	${LIBSNDFILE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	libsndfile
 
 .if !empty(LIBSNDFILE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libsndfile+=		libsndfile>=1.0.0
-BUILDLINK_RECOMMENDED.libsndfile+=	libsndfile>=1.0.10nb1
+BUILDLINK_RECOMMENDED.libsndfile+=	libsndfile>=1.0.13nb1
 BUILDLINK_PKGSRCDIR.libsndfile?=	../../audio/libsndfile
 .endif	# LIBSNDFILE_BUILDLINK3_MK
 
diff --git a/audio/libvisual-bmp/Makefile b/audio/libvisual-bmp/Makefile
index 9330daeb3b1..df125a9fb00 100644
--- a/audio/libvisual-bmp/Makefile
+++ b/audio/libvisual-bmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=		libvisual-bmp-0.2.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile
index 2ab78df7693..b40495f0c50 100644
--- a/audio/libvisual-plugins/Makefile
+++ b/audio/libvisual-plugins/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/09/11 12:30:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=		libvisual-plugins-0.2.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/libvisual-xmms/Makefile b/audio/libvisual-xmms/Makefile
index 968ff4a077c..cf9d26d92d4 100644
--- a/audio/libvisual-xmms/Makefile
+++ b/audio/libvisual-xmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2005/12/11 09:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=		libvisual-xmms-0.2.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile
index d22e07881ed..d136104ddb6 100644
--- a/audio/libvisual/Makefile
+++ b/audio/libvisual/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:11 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=		libvisual-0.2.0
+PKGREVISION=		1
 CATEGORIES=		audio graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libvisual/}
 
diff --git a/audio/libvisual/buildlink3.mk b/audio/libvisual/buildlink3.mk
index 2ccdc7985f1..017e398f094 100644
--- a/audio/libvisual/buildlink3.mk
+++ b/audio/libvisual/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/02/20 15:06:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:11 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBVISUAL_BUILDLINK3_MK:=	${LIBVISUAL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	libvisual
 
 .if !empty(LIBVISUAL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.libvisual+=	libvisual>=0.2.0
+BUILDLINK_RECOMMENDED.libvisual?=	libvisual>=0.2.0nb1
 BUILDLINK_PKGSRCDIR.libvisual?=	../../audio/libvisual
 .endif	# LIBVISUAL_BUILDLINK3_MK
 
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index fa9290c0a91..6dc7c709c44 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/01/24 07:31:54 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:11 joerg Exp $
 
 DISTNAME=	liteamp-0.2.4.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://kldp.net/frs/download.php/1153/
 
diff --git a/audio/liveice/Makefile b/audio/liveice/Makefile
index 2cf21dd9d57..2b8a6f791ac 100644
--- a/audio/liveice/Makefile
+++ b/audio/liveice/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=	liveice
 PKGNAME=	liveice-0.20001121
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://star.arm.ac.uk/~spm/software/
 
diff --git a/audio/mad/Makefile b/audio/mad/Makefile
index 4e194cdecb9..817972f498e 100644
--- a/audio/mad/Makefile
+++ b/audio/mad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=	mad-0.15.0b
+PKGREVISION=	1
 CATEGORIES=	audio meta-pkgs
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/audio/mad123/Makefile b/audio/mad123/Makefile
index df793ffeea2..374ee7d4cc7 100644
--- a/audio/mad123/Makefile
+++ b/audio/mad123/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2005/11/14 02:48:01 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=	mad123-0.8.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mctavish.co.uk/mad123/
 
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index d8be7c4a76a..dc67e325222 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:11 joerg Exp $
 
 DISTNAME=	madman-0.93
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=madman/}
 
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 89528f3b8b4..484aa7392a4 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/12/05 20:49:48 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:11 joerg Exp $
 #
 
 DISTNAME=	madplay-0.15.2b
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mad/} \
 		ftp://ftp.mars.org/pub/mpeg/
diff --git a/audio/mbrola/Makefile b/audio/mbrola/Makefile
index 485adcc15b3..2f090cd8d01 100644
--- a/audio/mbrola/Makefile
+++ b/audio/mbrola/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:11 joerg Exp $
 
 DISTNAME=		mbr301h
 PKGNAME=		mbrola-301h
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://www.festvox.org/mbrola/bin/netbsd/
 EXTRACT_SUFX=		.zip
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index a36b69dac6d..2ae0fa380fc 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:11 joerg Exp $
 
 DISTNAME=	en1-980910
 PKGNAME=	mbrolavox-en1-980910
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/en1/ \
 		http://www.festvox.org/mbrola/dba/en1/
@@ -11,7 +12,7 @@ MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.festvox.org/mbrola/
 COMMENT=	British English male voice for MBROLA
 
-DEPENDS+=	mbrola-301h:../../audio/mbrola
+DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index aa0d83aa5c1..ff37e6e5d73 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:11 joerg Exp $
 
 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us1/ \
 		http://www.festvox.org/mbrola/dba/us1/
@@ -11,7 +12,7 @@ MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.festvox.org/mbrola/
 COMMENT=	American English female voice for MBROLA
 
-DEPENDS+=	mbrola-301h:../../audio/mbrola
+DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index 512997d63d9..6020df287d7 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/07/29 00:55:13 grant Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:11 joerg Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us2/ \
 		http://www.festvox.org/mbrola/dba/us2/
@@ -11,7 +12,7 @@ MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.festvox.org/mbrola/
 COMMENT=	American English male voice for MBROLA
 
-DEPENDS+=	mbrola-301h:../../audio/mbrola
+DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index 922c842d2c1..d6efd48f0ef 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://tcts.fpms.ac.be/pub/mbrola/VOICES/us3/ \
 		http://www.festvox.org/mbrola/dba/us3/
@@ -11,7 +12,7 @@ MAINTAINER=	proff@iq.org
 HOMEPAGE=	http://www.festvox.org/mbrola/
 COMMENT=	American English male voice for MBROLA
 
-DEPENDS+=	mbrola-301h:../../audio/mbrola
+DEPENDS+=	mbrola-301hnb1:../../audio/mbrola
 
 LICENSE=	no-commercial-use
 
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index 3b18ba22199..e308c18771c 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	mikmod-3.2.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://mikmod.raphnet.net/files/
 
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 52fd65e1d17..ba08748e2ca 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/10/31 15:48:32 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:12 joerg Exp $
 #
 
 DISTNAME=	Mixer.app-1.8.0
 PKGNAME=	mixer.app-1.8.0
+PKGREVISION=	1
 CATEGORIES=	audio
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://www.fukt.bth.se/~per/mixer/
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index c9b0e97ae26..e2b797737ab 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/01/08 20:14:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=		moc-2.3.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ftp.daper.net/pub/soft/moc/stable/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index 997bc773c09..b4671485512 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:31 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	moss-0.1.13
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://kldp.net/frs/download.php/1580/
 
diff --git a/audio/mp32ogg/Makefile b/audio/mp32ogg/Makefile
index dd147e580fa..b15118b5c64 100644
--- a/audio/mp32ogg/Makefile
+++ b/audio/mp32ogg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	mp32ogg-0.11
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	# empty
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index fe505dccc70..e02b2e22fd8 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	mp3blaster-3.2.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.stack.nl/~brama/mp3blaster/src/
 
diff --git a/audio/mp3to/Makefile b/audio/mp3to/Makefile
index 0e3878855f3..c44b0cb90e6 100644
--- a/audio/mp3to/Makefile
+++ b/audio/mp3to/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/07/19 10:22:34 grant Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	mp3to
 PKGNAME=	${DISTNAME}-1.0.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.gz
diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile
index 13e2606cdb9..12dbf963cdb 100644
--- a/audio/mpg123-nas/Makefile
+++ b/audio/mpg123-nas/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/01/09 22:00:25 tron Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:12 joerg Exp $
 
 PKGNAME=	mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
-PKGREVISION=	8
+PKGREVISION=	9
 COMMENT=	Command-line player for mpeg layer 1, 2 and 3 audio with NAS output
 
 MAINTAINER=	tech-pkg@NetBSD.org
diff --git a/audio/mpg321/Makefile b/audio/mpg321/Makefile
index 0ed3d6ce832..0e9951fd851 100644
--- a/audio/mpg321/Makefile
+++ b/audio/mpg321/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/10/08 12:35:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	mpg321-0.2.10
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpg321/}
 
diff --git a/audio/mstream/Makefile b/audio/mstream/Makefile
index 4b399009838..ebadaf587f7 100644
--- a/audio/mstream/Makefile
+++ b/audio/mstream/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:12 joerg Exp $
 #
 
 DISTNAME=	mstream-1.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.gw.com/pub/people/kim/
 
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 15f59aec536..d3b7c059d48 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:12 joerg Exp $
 #
 
 DISTNAME=	MuSE-0.9
 PKGNAME=	${DISTNAME:S/MuSE/muse/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
 		http://www.ljudmila.org/~jaromil/muse/releases/ \
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 293303e0b4a..d1d0c9d62e4 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2006/01/16 13:43:26 rxg Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	musicbox-1.01p2
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://freebsd.csie.nctu.edu.tw/Upload/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
index 8885476c40a..c2ecd6c0b55 100644
--- a/audio/musicbrainz/Makefile
+++ b/audio/musicbrainz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	libmusicbrainz-2.1.2
 PKGNAME=	${DISTNAME:S/lib//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk
index 5b9097413a6..090753e67d9 100644
--- a/audio/musicbrainz/buildlink3.mk
+++ b/audio/musicbrainz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:12 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MUSICBRAINZ_BUILDLINK3_MK:=	${MUSICBRAINZ_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	musicbrainz
 
 .if !empty(MUSICBRAINZ_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.musicbrainz+=		musicbrainz>=2.0.2
-BUILDLINK_RECOMMENDED.musicbrainz+=	musicbrainz>=2.1.2nb1
+BUILDLINK_RECOMMENDED.musicbrainz+=	musicbrainz>=2.1.2nb2
 BUILDLINK_PKGSRCDIR.musicbrainz?=	../../audio/musicbrainz
 .endif	# MUSICBRAINZ_BUILDLINK3_MK
 
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 0cc994af498..4e11d210848 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2006/01/04 17:46:15 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=		mpd-0.11.5
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		audio
 MASTER_SITES=		http://mercury.chem.pitt.edu/~shank/
 
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 29cd4d7e314..a7658a039d3 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2005/12/29 06:21:31 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=	nas-1.7b.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://nas.codebrilliance.com/nas/ \
 		ftp://ftp.uni-duisburg.de/Sound/NAS/
diff --git a/audio/nas/buildlink3.mk b/audio/nas/buildlink3.mk
index ca60c6efd9f..fc9fea4fbf3 100644
--- a/audio/nas/buildlink3.mk
+++ b/audio/nas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:12 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 NAS_BUILDLINK3_MK:=	${NAS_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	nas
 
 .if !empty(NAS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.nas+=		nas>=1.4.2
+BUILDLINK_RECOMMENDED.nas?=	nas>=1.7bnb2
 BUILDLINK_PKGSRCDIR.nas?=	../../audio/nas
 .endif	# NAS_BUILDLINK3_MK
 
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 9b9ccb09d48..a30bbfc8291 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=		ncmpc-0.11.1
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://hem.bredband.net/kaw/ncmpc/files/ \
 			http://mercury.chem.pitt.edu/~shank/
diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index 8e7160b42e9..f4f430b7f41 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:12 joerg Exp $
 #
 
 DISTNAME=	normalize-0.7.6
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://www1.cs.columbia.edu/~cvaill/normalize/
 
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
index 8d364af7741..ae36f0ae0f0 100644
--- a/audio/nosefart/Makefile
+++ b/audio/nosefart/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/10/31 16:09:18 tv Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:12 joerg Exp $
 
 DISTNAME=		nosefart-2.3-mls
 PKGNAME=		${DISTNAME:S/-mls//}
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nosefart/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile
index 5dfaf8ae541..818a0cdf48f 100644
--- a/audio/oggasm/Makefile
+++ b/audio/oggasm/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=	oggasm_1.4.0
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://oggasm.sourceforge.net/
 
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 96477ea4e25..77e83405f44 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:13 joerg Exp $
 
 DISTNAME=	openal-20040816
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://math.smsu.edu/~erik/files/fbsd/ \
 		http://www.smluc.org/~erik/ \
diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk
index 42205b46185..e9b3d548df2 100644
--- a/audio/openal/buildlink3.mk
+++ b/audio/openal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/11 17:43:31 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/02/05 23:08:13 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENAL_BUILDLINK3_MK:=	${OPENAL_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	openal
 
 .if !empty(OPENAL_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.openal+=	openal>=20030125nb1
+BUILDLINK_RECOMMENDED.openal?=	openal>=20040816nb1
 BUILDLINK_PKGSRCDIR.openal?=	../../audio/openal
 .endif	# OPENAL_BUILDLINK3_MK
 
diff --git a/audio/p5-MusicBrainz-Client/Makefile b/audio/p5-MusicBrainz-Client/Makefile
index dd6c9ef4e1c..0798ff31318 100644
--- a/audio/p5-MusicBrainz-Client/Makefile
+++ b/audio/p5-MusicBrainz-Client/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=	MusicBrainz-Client-0.09
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MusicBrainz/}
 
diff --git a/audio/p5-MusicBrainz-Queries/Makefile b/audio/p5-MusicBrainz-Queries/Makefile
index 660a497e3d2..5fa1ad8a754 100644
--- a/audio/p5-MusicBrainz-Queries/Makefile
+++ b/audio/p5-MusicBrainz-Queries/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=	MusicBrainz-Queries-0.07
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=MusicBrainz/}
 
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index b3cda5521f4..c0f0e402117 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/01/20 23:41:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:13 joerg Exp $
 
 DISTNAME=	portaudio_v18_1
 PKGNAME=	portaudio-18.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.portaudio.com/archives/
 EXTRACT_SUFX=	.zip
diff --git a/audio/portaudio/buildlink3.mk b/audio/portaudio/buildlink3.mk
index 5a4c248c6ea..b5a56e881f5 100644
--- a/audio/portaudio/buildlink3.mk
+++ b/audio/portaudio/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/04/22 20:02:46 ben Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:13 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PORTAUDIO_BUILDLINK3_MK:=	${PORTAUDIO_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	portaudio
 
 .if !empty(PORTAUDIO_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.portaudio+=	portaudio>=18.1
+BUILDLINK_RECOMMENDED.portaudio?=	portaudio>=18.1nb2
 BUILDLINK_PKGSRCDIR.portaudio?=	../../audio/portaudio
 .endif	# PORTAUDIO_BUILDLINK3_MK
 
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index d35eef9c391..683eaf7efdf 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2005/10/08 12:35:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=		pyao-0.81
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio python
 MASTER_SITES=		http://vorbis.com/files/1.0.1/unix/py/
 
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
index 52847f0169a..036caaa40ac 100644
--- a/audio/py-cddb/Makefile
+++ b/audio/py-cddb/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=	CDDB-1.4
 PKGNAME=	${PYPKGPREFIX}-cddb-1.4
+PKGREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cddb-py/}
 
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index 2fd651cc87a..0a400659c1f 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=		pymad-0.5.1
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		audio python
 MASTER_SITES=		http://spacepants.org/src/pymad/download/
 
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index c053bf493af..8ccb7acc78f 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=	pymusique-0.5
 PKGNAME=        ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://fuware.nanocrew.net/pymusique/
 
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index 1eeba3f4d54..2b37a7d7206 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2005/07/27 16:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=		pyogg-1.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		audio python
 MASTER_SITES=		http://vorbis.com/files/1.0.1/unix/py/
 
diff --git a/audio/py-ogg/buildlink3.mk b/audio/py-ogg/buildlink3.mk
index 1ba7f50cc44..d7611bb11e5 100644
--- a/audio/py-ogg/buildlink3.mk
+++ b/audio/py-ogg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/02/05 23:08:13 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PY_OGG_BUILDLINK3_MK:=	${PY_OGG_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_PACKAGES+=	pyogg
 
 .if !empty(PY_OGG_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.pyogg+=	${PYPKGPREFIX}-ogg>=1.3
+BUILDLINK_RECOMMENDED.pyogg?=	${PYPKGPREFIX}-ogg>=1.3nb2
 BUILDLINK_PKGSRCDIR.pyogg?=	../../audio/py-ogg
 .endif	# PY_OGG_BUILDLINK3_MK
 
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 96b350ee029..2cb9f5da623 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2005/07/27 16:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=		pyvorbis-1.3
 PKGNAME=                ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		audio python
 MASTER_SITES=		http://vorbis.com/files/1.0.1/unix/py/
 
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index 4f218bc3bbe..86285443b82 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:13 joerg Exp $
 
 DISTNAME=	pyxmms-2.02
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio python
 MASTER_SITES=	http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/
 
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index ae9c0ba5c4d..bec51116b8c 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:13 joerg Exp $
 
 DISTNAME=	qsynth-0.2.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qsynth/}
 
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index c8a7dd79e9c..436a133d23a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=	rhythmbox-0.8.8
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/rhythmbox/0.8/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
index 5f6e7b77bcd..3c9c54a11b2 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=	rio500-0.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rio500/}
 
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 9e1acea9eae..c31e43989bd 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2006/02/04 16:23:50 ghen Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:13 joerg Exp $
 
 DISTNAME=	rosegarden-2.1pl4
 PKGNAME=	rosegarden-2.1.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cannam.demon.co.uk/rosegarden/distribution/
 
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index 0e449cee5c8..219df5fc8da 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/10/11 21:30:39 reed Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:13 joerg Exp $
 
 DISTNAME=	rsynth-2.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/synthesis/ \
 		ftp://svr-ftp.eng.cam.ac.uk/pub/comp.speech/dictionaries/cmudict/
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index b07b97d1f09..523182d699f 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/10/31 16:15:06 tv Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:13 joerg Exp $
 #
 
 DISTNAME=	sidplay-base-1.0.9
 PKGNAME=	sidplay-1.0.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index 1c7fb2e814c..7e1bec9f5c4 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=		snd-7.18
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=snd/}
 
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 8a6c36dfab1..556cb64eba5 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=		solfege-3.0.6
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=solfege/}
 
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 09ce01925c9..c9cd5277af0 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=		SpiralLoops-2.0.0
 PKGNAME=		spiralloops-2.0.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		http://www.pawfal.org/Software/SpiralLoops/dload/
 
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 8ad6a01e5c1..96b43df1157 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:49 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=		SpiralSynth-2.0.0
 PKGNAME=		spiralsynth-2.0.0
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://www.pawfal.org/Software/SpiralSynth/dload/
 
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 64c25f1599f..47df96fe997 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=	streamtuner-0.99.99
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio www
 MASTER_SITES=	http://savannah.nongnu.org/download/streamtuner/
 
diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk
index 9012afafc95..238abebbc8e 100644
--- a/audio/streamtuner/buildlink3.mk
+++ b/audio/streamtuner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 STREAMTUNER_BUILDLINK3_MK:=	${STREAMTUNER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	streamtuner
 
 .if !empty(STREAMTUNER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.streamtuner+=		streamtuner>=0.99
-BUILDLINK_RECOMMENDED.streamtuner?=	streamtuner>=0.99.99nb1
+BUILDLINK_RECOMMENDED.streamtuner?=	streamtuner>=0.99.99nb2
 BUILDLINK_PKGSRCDIR.streamtuner?=	../../audio/streamtuner
 .endif	# STREAMTUNER_BUILDLINK3_MK
 
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 539806cc37d..1088d6b3f6a 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2006/01/20 16:15:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=	sweep-0.8.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sweep/}
 
diff --git a/audio/sweep/buildlink3.mk b/audio/sweep/buildlink3.mk
index a4eb0c1594e..0a2858fc371 100644
--- a/audio/sweep/buildlink3.mk
+++ b/audio/sweep/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 SWEEP_BUILDLINK3_MK:=	${SWEEP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	sweep
 
 .if !empty(SWEEP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.sweep+=	sweep>=0.8.2nb6
-BUILDLINK_RECOMMENDED.sweep+=	sweep>=0.8.3nb2
+BUILDLINK_RECOMMENDED.sweep+=	sweep>=0.8.3nb3
 BUILDLINK_PKGSRCDIR.sweep?=	../../audio/sweep
 .endif	# SWEEP_BUILDLINK3_MK
 
diff --git a/audio/tcd/Makefile b/audio/tcd/Makefile
index 947409eea7c..8800bc90b65 100644
--- a/audio/tcd/Makefile
+++ b/audio/tcd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/12/11 09:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=		tcd-2.2.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		http://savannah.gnu.org/download/tcd/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/tcl-snack/Makefile b/audio/tcl-snack/Makefile
index 235563f7808..7eea754e5c7 100644
--- a/audio/tcl-snack/Makefile
+++ b/audio/tcl-snack/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:14 joerg Exp $
 
 DISTNAME=	snack2.2.8
 PKGNAME=	tcl-snack-2.2.8
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.kth.se/~kare/
 
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 40c22a51c7d..01e479e182b 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=	terminatorX-3.82
 PKGNAME=	${DISTNAME:S/X/x/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://terminatorx.cx/dist/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index f3560118e84..b9bf7a99095 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.55 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2006/02/05 23:08:14 joerg Exp $
 
 DISTNAME=	TiMidity++-2.13.2
 PKGNAME=	${DISTNAME:S/TiMidity++/timidity/}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=     audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=timidity/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index 68f6938d451..56788a92272 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:50 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=	toolame-02l
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=toolame/}
 EXTRACT_SUFX=	.tgz
diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index 81dd07a67f6..29461302e57 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:50 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:14 joerg Exp $
 
 DISTNAME=	vorbis-tools-1.0
 PKGNAME=	tremor-tools-1.0.0.8
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/
 
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index 30b5de29748..e653c03e848 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:50 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:14 joerg Exp $
 
 DISTNAME=	tremor_snapshot_030406
 PKGNAME=	tremor-1.0.2
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	devel audio
 MASTER_SITES=	http://www.xiph.org/ogg/vorbis/download/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/tremor/buildlink3.mk b/audio/tremor/buildlink3.mk
index 0af3adffae2..8d1e2ba40e8 100644
--- a/audio/tremor/buildlink3.mk
+++ b/audio/tremor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/02/05 23:08:14 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TREMOR_BUILDLINK3_MK:=	${TREMOR_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	tremor
 
 .if !empty(TREMOR_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tremor+=	tremor>=1.0.2
-BUILDLINK_RECOMMENDED.tremor+=	tremor>=1.0.2nb4
+BUILDLINK_RECOMMENDED.tremor+=	tremor>=1.0.2nb5
 BUILDLINK_PKGSRCDIR.tremor?=	../../audio/tremor
 .endif	# TREMOR_BUILDLINK3_MK
 
diff --git a/audio/trm/Makefile b/audio/trm/Makefile
index b32071779e0..8076e2c4646 100644
--- a/audio/trm/Makefile
+++ b/audio/trm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=	trm-0.2.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
diff --git a/audio/tunepimp/Makefile b/audio/tunepimp/Makefile
index 4fe39c6802c..ce180b6214b 100644
--- a/audio/tunepimp/Makefile
+++ b/audio/tunepimp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:14 joerg Exp $
 
 DISTNAME=	libtunepimp-0.3.0
 PKGNAME=	${DISTNAME:S/lib//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/
 
diff --git a/audio/tunepimp/buildlink3.mk b/audio/tunepimp/buildlink3.mk
index 50de2bafff5..6222b8896ba 100644
--- a/audio/tunepimp/buildlink3.mk
+++ b/audio/tunepimp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:14 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TUNEPIMP_BUILDLINK3_MK:=	${TUNEPIMP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	tunepimp
 
 .if !empty(TUNEPIMP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.tunepimp+=	tunepimp>=0.3.0
-BUILDLINK_RECOMMENDED.tunepimp+=	tunepimp>=0.3.0nb3
+BUILDLINK_RECOMMENDED.tunepimp+=	tunepimp>=0.3.0nb4
 BUILDLINK_PKGSRCDIR.tunepimp?=	../../audio/tunepimp
 .endif	# TUNEPIMP_BUILDLINK3_MK
 
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index fde3cc66691..72a9a7140fc 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/01/24 07:31:55 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:14 joerg Exp $
 #
 
 DISTNAME=		tunesbrowser-0.3.0
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://craz.net/programs/itunes/files/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index d7eb23ad8cb..e1f791a3c24 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2005/12/05 20:49:50 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2006/02/05 23:08:14 joerg Exp $
 
 DISTNAME=	vorbis-tools-1.1.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 
diff --git a/audio/vorbisgain/Makefile b/audio/vorbisgain/Makefile
index 57c177cc6d4..b3a7bebf414 100644
--- a/audio/vorbisgain/Makefile
+++ b/audio/vorbisgain/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/22 13:48:43 rpaulo Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:14 joerg Exp $
 
 DISTNAME=	vorbisgain-0.37
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://sjeng.org/ftp/vorbis/
 
diff --git a/audio/wavesurfer/Makefile b/audio/wavesurfer/Makefile
index de51ae3e47b..04e24687052 100644
--- a/audio/wavesurfer/Makefile
+++ b/audio/wavesurfer/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/11/15 12:55:14 hira Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:15 joerg Exp $
 
 DISTNAME=	wavesurfer-1.7.4
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.speech.kth.se/wavesurfer/
 
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index 25f5ac935cf..3992ebd44a4 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/10/31 16:37:24 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:15 joerg Exp $
 #
 
 DISTNAME=	wmmixer-1.0-beta1
 PKGNAME=	wmmixer-1.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Vista/2471/files/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index dc85d485363..99f946bcbfc 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:15 joerg Exp $
 
 DISTNAME=	wmmp3-0.12
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES= 	http://www.dotfiles.com/software/wmmp3/
 
diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
index c60bac6aa4d..52b62271ecc 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/10/31 16:38:40 tv Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:15 joerg Exp $
 #
 
 DISTNAME=	wmsmixer-0.5.1
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.hibernaculum.net/download/
 
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index 984b68e2265..f828e126f19 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:15 joerg Exp $
 
 DISTNAME=	wmusic-1.5.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio windowmaker
 MASTER_SITES=	http://home.jtan.com/~john/wmusic/
 
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 72464465415..bbfed0eb90a 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/02/05 23:08:15 joerg Exp $
 
 DISTNAME=	WSoundPrefs-1.1.1
 PKGNAME=	wsoundprefs-1.1.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio wm windowmaker
 MASTER_SITES=	ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
 
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index cfe0fc49c3a..cc59d5fcb04 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2006/02/05 23:08:15 joerg Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
 PKGNAME=	wsoundserver-0.4.0
-PKGREVISION=	6
+PKGREVISION=	7
 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 4bd87ed51d2..7402cf77227 100644
--- a/audio/wsoundserver/buildlink3.mk
+++ b/audio/wsoundserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:15 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WSOUNDSERVER_BUILDLINK3_MK:=	${WSOUNDSERVER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	wsoundserver
 
 .if !empty(WSOUNDSERVER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.wsoundserver+=	wsoundserver>=0.4.0nb4
-BUILDLINK_RECOMMENDED.wsoundserver+=	wsoundserver>=0.4.0nb6
+BUILDLINK_RECOMMENDED.wsoundserver+=	wsoundserver>=0.4.0nb7
 BUILDLINK_PKGSRCDIR.wsoundserver?=	../../audio/wsoundserver
 .endif	# WSOUNDSERVER_BUILDLINK3_MK
 
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 5021557c956..2c35e4a8c3d 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2006/01/16 13:44:53 rxg Exp $
+# $NetBSD: Makefile,v 1.24 2006/02/05 23:08:15 joerg Exp $
 
 DISTNAME=	xamp-0.8-10
 PKGNAME=	xamp-0.8.10
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://andrej.co.ru/~andrej/programs/xamp/ \
 		http://andrej.co.ru/~andrej/programs/xamp/backs/
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index c115697ea77..84ac19ad7d0 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:15 joerg Exp $
 #
 
 DISTNAME=	xanalyser-1.24
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.suse.com/pub/people/arvin/private/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/xcdplayer/Makefile b/audio/xcdplayer/Makefile
index e2357430d0d..24e519fc8ef 100644
--- a/audio/xcdplayer/Makefile
+++ b/audio/xcdplayer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/10/31 16:44:19 tv Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:16 joerg Exp $
 
 DISTNAME=       xcdplayer-2.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.cdrom.com/pub/X11/R5contrib/
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 7c8240361fc..f0e50e156f8 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:16 joerg Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-mixer-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 COMMENT=	Xfce mixer plugin
 
diff --git a/audio/xfce4-mixer/buildlink3.mk b/audio/xfce4-mixer/buildlink3.mk
index 99d3b06c544..f19b81b517e 100644
--- a/audio/xfce4-mixer/buildlink3.mk
+++ b/audio/xfce4-mixer/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/02/05 23:08:16 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_MIXER_BUILDLINK3_MK:=	${XFCE4_MIXER_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-mixer
 
 .if !empty(XFCE4_MIXER_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-mixer+=	xfce4-mixer>=4.2.3
-BUILDLINK_RECOMMENDED.xfce4-mixer?=	xfce4-mixer>=4.2.3nb1
+BUILDLINK_RECOMMENDED.xfce4-mixer?=	xfce4-mixer>=4.2.3nb2
 BUILDLINK_PKGSRCDIR.xfce4-mixer?=	../../audio/xfce4-mixer
 .endif	# XFCE4_MIXER_BUILDLINK3_MK
 
diff --git a/audio/xfce4-xmms-plugin/Makefile b/audio/xfce4-xmms-plugin/Makefile
index 27bae0fe8af..0aafbc526f2 100644
--- a/audio/xfce4-xmms-plugin/Makefile
+++ b/audio/xfce4-xmms-plugin/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:16 joerg Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 XFCE4_VERSION=	0.3.1
 
 DISTNAME=	xfce4-xmms-plugin-${XFCE4_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 COMMENT=	Xfce XMMS plugin
diff --git a/audio/xfce4-xmms-plugin/buildlink3.mk b/audio/xfce4-xmms-plugin/buildlink3.mk
index 29c9c096dd7..957928e0eab 100644
--- a/audio/xfce4-xmms-plugin/buildlink3.mk
+++ b/audio/xfce4-xmms-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/02/05 23:08:16 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:=	${XFCE4_XMMS_PLUGIN_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	xfce4-xmms-plugin
 
 .if !empty(XFCE4_XMMS_PLUGIN_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xfce4-xmms-plugin+=	xfce4-xmms-plugin>=0.3.1
-BUILDLINK_RECOMMENDED.xfce4-xmms-plugin?=	xfce4-xmms-plugin>=0.3.1nb1
+BUILDLINK_RECOMMENDED.xfce4-xmms-plugin?=	xfce4-xmms-plugin>=0.3.1nb2
 BUILDLINK_PKGSRCDIR.xfce4-xmms-plugin?=	../../audio/xfce4-xmms-plugin
 .endif	# XFCE4_XMMS_PLUGIN_BUILDLINK3_MK
 
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 8b2fa9b18aa..fa6a2ffdf51 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2005/12/29 06:21:31 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=	xhippo-3.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	audio x11
 MASTER_SITES=	${MASTER_SITE_GNU:=xhippo/}
 
diff --git a/audio/xine-arts/Makefile b/audio/xine-arts/Makefile
index b4b6fb1472d..48c1bc4113b 100644
--- a/audio/xine-arts/Makefile
+++ b/audio/xine-arts/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:17 joerg Exp $
 #
 
 .include "../../multimedia/xine-lib/Makefile.common"
 
 PKGNAME=	${XINE_PKGNAME:S/lib/arts/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 COMMENT=	The aRts audio output plugin for xine-lib
 
diff --git a/audio/xine-esound/Makefile b/audio/xine-esound/Makefile
index 1e7e29b40b7..8a878780341 100644
--- a/audio/xine-esound/Makefile
+++ b/audio/xine-esound/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2006/01/05 15:18:27 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:17 joerg Exp $
 #
 
 .include "../../multimedia/xine-lib/Makefile.common"
 
 PKGNAME=	${XINE_PKGNAME:S/lib/esound/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 COMMENT=	The esound audio output plugin for xine-lib
 
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index b90ce17b540..74ea150327f 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2005/12/29 06:21:32 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2006/02/05 23:08:17 joerg Exp $
 
 DISTNAME=	xmcd-3.0.2
-PKGREVISION=    6
+PKGREVISION=    7
 CATEGORIES=	audio
 MASTER_SITES=	http://www.ibiblio.org/tkan/download/xmcd/src/
 
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index 5048f1d3b78..57edd0ab9f5 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/11/06 23:58:05 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:17 joerg Exp $
 
 DISTNAME=		xmix-2.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
 
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 5e9c87d5c5c..e150623d424 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:17 joerg Exp $
 
 DISTNAME=       xmmix-1.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=   http://www.ibiblio.org/tkan/download/xmmix/1.2.2/src/
 
diff --git a/audio/xmms-alarm/Makefile b/audio/xmms-alarm/Makefile
index 2673fbde619..80f225dab4b 100644
--- a/audio/xmms-alarm/Makefile
+++ b/audio/xmms-alarm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/07/27 16:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=		xmms-alarm-0.3.6
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://www.snika.uklinux.net/xmms-alarm/
 
diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile
index 5be111c1dae..6f892b964f8 100644
--- a/audio/xmms-arts/Makefile
+++ b/audio/xmms-arts/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=	arts_output-0.7.1
 PKGNAME=	xmms-arts-0.7.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio kde
 MASTER_SITES=	http://havardk.xmms.org/plugins/arts_output/
 
diff --git a/audio/xmms-bezier/Makefile b/audio/xmms-bezier/Makefile
index c112c3df10e..e3fc1e595e6 100644
--- a/audio/xmms-bezier/Makefile
+++ b/audio/xmms-bezier/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=	bezier-0.0.3
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://yossman.net/~kuroyi/
 
diff --git a/audio/xmms-blursk/Makefile b/audio/xmms-blursk/Makefile
index d9abbe92231..b7f57c234d9 100644
--- a/audio/xmms-blursk/Makefile
+++ b/audio/xmms-blursk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2005/12/07 15:05:36 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:17 joerg Exp $
 
 DISTNAME=	Blursk-1.3
 PKGNAME=	xmms-blursk-1.3
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://www.cs.pdx.edu/~kirkenda/blursk/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} blursk-presets
diff --git a/audio/xmms-bump-scope/Makefile b/audio/xmms-bump-scope/Makefile
index 45d3936d562..7d625295a84 100644
--- a/audio/xmms-bump-scope/Makefile
+++ b/audio/xmms-bump-scope/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2005/09/26 12:48:03 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=	bump_scope-0.0.3
 PKGNAME=	xmms-bump-scope-0.0.3
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://staff.xmms.org/zinx/xmms/
 
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 4085db71596..0cd43599642 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=		xmms-crossfade-0.2.9
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		audio
 MASTER_SITES=		http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
 			ftp://ftp.falsehope.com/pub/xmms-crossfade/
diff --git a/audio/xmms-dflowers/Makefile b/audio/xmms-dflowers/Makefile
index 9958a2500fc..179a759b18b 100644
--- a/audio/xmms-dflowers/Makefile
+++ b/audio/xmms-dflowers/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2005/10/16 15:32:40 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=	dflowers-1.2
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.shell.linux.se/bm/f/
 
diff --git a/audio/xmms-dscope/Makefile b/audio/xmms-dscope/Makefile
index 5bda7683dcc..434a3587a73 100644
--- a/audio/xmms-dscope/Makefile
+++ b/audio/xmms-dscope/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=	dscope-1.2
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://hem.passagen.se/joakime/
 
diff --git a/audio/xmms-dspectogram/Makefile b/audio/xmms-dspectogram/Makefile
index 45e9eab8da0..f9dc6e3ab98 100644
--- a/audio/xmms-dspectogram/Makefile
+++ b/audio/xmms-dspectogram/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=	dspectogram-1.2
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://hem.passagen.se/joakime/
 
diff --git a/audio/xmms-dspectral/Makefile b/audio/xmms-dspectral/Makefile
index 0917c7b8b10..abdaad96e94 100644
--- a/audio/xmms-dspectral/Makefile
+++ b/audio/xmms-dspectral/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:17 joerg Exp $
 #
 
 DISTNAME=	dspectral-1.2
 PKGNAME=	xmms-dspectral-1.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://hem.passagen.se/joakime/
 
diff --git a/audio/xmms-esound/Makefile b/audio/xmms-esound/Makefile
index 13b125ce296..749dddbc5a8 100644
--- a/audio/xmms-esound/Makefile
+++ b/audio/xmms-esound/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:50 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:17 joerg Exp $
 #
 
 .include "../../audio/xmms/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/xmms/xmms-esound/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES+=	gnome
 
 COMMENT=	XMMS plugin to output sound through the esound daemon
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 8cc1923b88f..d13ecb35c06 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:18 joerg Exp $
 
 DISTNAME=		faad2-2.0
 PKGNAME=		xmms-faad-2.0
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=faac/}
 
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 8ce801fc991..0134d8e0aca 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/08/21 08:48:51 grant Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	flac-1.1.2
 PKGNAME=	xmms-flac-1.1.2
+PKGREVISION=	1
 CATEGORIES=	audio archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
 
diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile
index a7cd7063015..b5998e42665 100644
--- a/audio/xmms-fmradio/Makefile
+++ b/audio/xmms-fmradio/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:50 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=		xmms-FMRadio-1.4
 PKGNAME=		xmms-fmradio-1.4
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		http://silicone.free.fr/xmms-FMRadio/
 EXTRACT_SUFX=		.tgz
diff --git a/audio/xmms-funtimedancer/Makefile b/audio/xmms-funtimedancer/Makefile
index 7e7b780a242..c69a551197c 100644
--- a/audio/xmms-funtimedancer/Makefile
+++ b/audio/xmms-funtimedancer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/12/11 09:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	FunTimeDancer-0.1
 PKGNAME=	xmms-funtimedancer-0.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ftd/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} FunTimeDancer-packs-1.0.tar.gz
diff --git a/audio/xmms-gdancer/Makefile b/audio/xmms-gdancer/Makefile
index 8b092498f53..5e2d926c66e 100644
--- a/audio/xmms-gdancer/Makefile
+++ b/audio/xmms-gdancer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	gdancer-0.4.3
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://figz.com/gdancer/files/
 
diff --git a/audio/xmms-infinity/Makefile b/audio/xmms-infinity/Makefile
index d3618fe0757..9130f97f802 100644
--- a/audio/xmms-infinity/Makefile
+++ b/audio/xmms-infinity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	infinity-0.2
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://julien.carme.free.fr/
 
diff --git a/audio/xmms-iris/Makefile b/audio/xmms-iris/Makefile
index c10c390f699..4ade7ef2dbb 100644
--- a/audio/xmms-iris/Makefile
+++ b/audio/xmms-iris/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/12/07 15:05:01 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	iris-0.11
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://cdelfosse.free.fr/xmms-iris/
 
diff --git a/audio/xmms-jakdaw/Makefile b/audio/xmms-jakdaw/Makefile
index d240c2e22f9..16bb5d0dce8 100644
--- a/audio/xmms-jakdaw/Makefile
+++ b/audio/xmms-jakdaw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:18 joerg Exp $
 
 DISTNAME=	jakdaw-0.0.4
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio xmms
 MASTER_SITES=	http://www.jakdaw.ucam.org/xmms/
 
diff --git a/audio/xmms-jess/Makefile b/audio/xmms-jess/Makefile
index 68ca1b420f4..0f602e4a67e 100644
--- a/audio/xmms-jess/Makefile
+++ b/audio/xmms-jess/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2005/12/11 09:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	JESS-2.9.1
 PKGNAME=	xmms-jess-2.9.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://arquier.free.fr/
 
diff --git a/audio/xmms-liveice/Makefile b/audio/xmms-liveice/Makefile
index c5f084ba11b..432844c719e 100644
--- a/audio/xmms-liveice/Makefile
+++ b/audio/xmms-liveice/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	liveice-xmms
 PKGNAME=	xmms-liveice-1.0.0
-PKGREVISION=	         2
+PKGREVISION=	         3
 CATEGORIES=	audio
 MASTER_SITES=	http://star.arm.ac.uk/~spm/software/
 
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index eddf1e11148..036590934a6 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:50 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=		xmms-mad-0.5.5
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xmms-mad/}
 
diff --git a/audio/xmms-madspin/Makefile b/audio/xmms-madspin/Makefile
index 8296f993755..b7d5b217812 100644
--- a/audio/xmms-madspin/Makefile
+++ b/audio/xmms-madspin/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	madspin-0.05
 PKGNAME=	xmms-${DISTNAME}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://www.students.uiuc.edu/~birck/
 
diff --git a/audio/xmms-meta-csound/Makefile b/audio/xmms-meta-csound/Makefile
index b67295392aa..60a16fad7c2 100644
--- a/audio/xmms-meta-csound/Makefile
+++ b/audio/xmms-meta-csound/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=		xmms-meta-csound-0.3
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/audio/xmms-meta-input/Makefile b/audio/xmms-meta-input/Makefile
index 9cb6ef36f51..cf229d48c77 100644
--- a/audio/xmms-meta-input/Makefile
+++ b/audio/xmms-meta-input/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=		xmms-meta-input-0.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		audio
 MASTER_SITES=		http://www.corbac.com/Data/Sources/
 
diff --git a/audio/xmms-meta-input/buildlink3.mk b/audio/xmms-meta-input/buildlink3.mk
index 310b563f532..b85f385a4ac 100644
--- a/audio/xmms-meta-input/buildlink3.mk
+++ b/audio/xmms-meta-input/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/02/05 23:08:18 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XMMS_META_INPUT_BUILDLINK3_MK:=	${XMMS_META_INPUT_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xmms-meta-input
 
 .if !empty(XMMS_META_INPUT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xmms-meta-input+=	xmms-meta-input>=0.4
+BUILDLINK_RECOMMENDED.xmms-meta-input?=	xmms-meta-input>=0.4nb2
 BUILDLINK_PKGSRCDIR.xmms-meta-input?=	../../audio/xmms-meta-input
 .endif	# XMMS_META_INPUT_BUILDLINK3_MK
 
diff --git a/audio/xmms-meta-timidity/Makefile b/audio/xmms-meta-timidity/Makefile
index 190a092dd1d..c30d5dc512d 100644
--- a/audio/xmms-meta-timidity/Makefile
+++ b/audio/xmms-meta-timidity/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=		xmms-meta-timidity-0.2
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index bf62e132874..787de496744 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=		modplugxmms-2.05
 PKGNAME=		xmms-modplug-2.05
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=modplug-xmms/}
 
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 5bd3315eee7..ee5d29dea7f 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2006/01/20 16:15:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=		xmms-musepack-1.1
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		http://musepack.imosnet.de/linux/plugins/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index c9fe077b9a8..d2bf7751479 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	neato
 PKGNAME=	xmms-neato-20010818
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.rpi.edu/~mullr/xmms/
 
diff --git a/audio/xmms-nebulus/Makefile b/audio/xmms-nebulus/Makefile
index 87c32742171..aff4dcb14db 100644
--- a/audio/xmms-nebulus/Makefile
+++ b/audio/xmms-nebulus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2005/12/11 09:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/05 23:08:18 joerg Exp $
 #
 
 DISTNAME=	xmms-nebulus-0.6.0
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://nebulus.tuxfamily.org/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/xmms-paranormal/Makefile b/audio/xmms-paranormal/Makefile
index 8511cb78666..21b43dd04fc 100644
--- a/audio/xmms-paranormal/Makefile
+++ b/audio/xmms-paranormal/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2005/12/11 09:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=	paranormal-0.2.0
 PKGNAME=	xmms-paranormal-0.2.0
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=/paranormal/}
 
diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index cee5c74e38b..ea63f22cc59 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=	xmms-sid-0.7.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.tnsp.org/xs-files/
 
diff --git a/audio/xmms-synaesthesia/Makefile b/audio/xmms-synaesthesia/Makefile
index 2194c7b2043..2b895d5d5ae 100644
--- a/audio/xmms-synaesthesia/Makefile
+++ b/audio/xmms-synaesthesia/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:40 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=	synaesthesia-xmms-0.0.3-rc3
 PKGNAME=	xmms-synaesthesia-0.0.3rc3
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio xmms
 MASTER_SITES=	http://staff.xmms.org/zinx/xmms/
 
diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile
index df1336d5bc5..06c712d0200 100644
--- a/audio/xmms-tv-scope/Makefile
+++ b/audio/xmms-tv-scope/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:38 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=	tv_scope-0.0.2
 PKGNAME=	xmms-tv-scope-0.0.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	xmms audio
 MASTER_SITES=	http://staff.xmms.org/zinx/xmms/
 
diff --git a/audio/xmms-vismsa/Makefile b/audio/xmms-vismsa/Makefile
index 60ee0bfef49..26b8c0d13f4 100644
--- a/audio/xmms-vismsa/Makefile
+++ b/audio/xmms-vismsa/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:40 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=	vismsa-xmms-plugin-0.2
 PKGNAME=	xmms-vismsa-0.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://a.godau.org/
 
diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
index f0b87041e3a..91022755a8e 100644
--- a/audio/xmms-wma/Makefile
+++ b/audio/xmms-wma/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:40 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=	xmms-wma-1.0.4
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 52b59c211bd..27d56b892a9 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2005/03/24 10:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2006/02/05 23:08:17 joerg Exp $
 #
 
-PKGREVISION=		5
+PKGREVISION=		6
 
 .include "Makefile.common"
 
diff --git a/audio/xmms/buildlink3.mk b/audio/xmms/buildlink3.mk
index 1f0579c5961..1a9206765db 100644
--- a/audio/xmms/buildlink3.mk
+++ b/audio/xmms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/03/24 10:21:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:08:17 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XMMS_BUILDLINK3_MK:=	${XMMS_BUILDLINK3_MK}+
@@ -12,6 +12,7 @@ BUILDLINK_PACKAGES+=	xmms
 
 .if !empty(XMMS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.xmms+=	xmms>=1.2.7nb10
+BUILDLINK_RECOMMENDED.xmms?=	xmms>=1.2.10nb6
 BUILDLINK_PKGSRCDIR.xmms?=	../../audio/xmms
 .endif	# XMMS_BUILDLINK3_MK
 
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
index 50a15eb428c..4a9bb330f2c 100644
--- a/audio/xmmsctrl/Makefile
+++ b/audio/xmmsctrl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/07/27 16:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=		xmmsctrl-1.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=		audio
 MASTER_SITES=		http://www.docs.uu.se/~adavid/utils/
 
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index c0a78280ef7..abf0ae1c669 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2006/01/16 13:46:05 rxg Exp $
+# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:19 joerg Exp $
 
 DISTNAME=	xmp-2.0.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xmp/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index 3fe22e3350f..381595427d1 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2005/12/12 21:36:54 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/02/05 23:08:19 joerg Exp $
 
 DISTNAME=	xmradio-1.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	http://core.de/~coto/radio/
 
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 17b043d812e..9faa8229b1e 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2006/01/24 07:31:56 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=	xsidplay-1.6.5.1a
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio x11
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index c0ffd059d1b..a2d3455d3c5 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:19 joerg Exp $
 #
 
 DISTNAME=		xwave2
 PKGNAME=		xwave-2.0
+PKGREVISION=		1
 CATEGORIES=		audio x11
 MASTER_SITES=		# empty