Import of pkgsrc-2015Q1

audio/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.500 2014/03/13 07:16:23 jnemeth Exp $
+# $NetBSD: Makefile,v 1.519 2015/02/19 00:21:55 wiz Exp $
 #
 
 COMMENT=	Audio tools
@@ -84,9 +84,11 @@ SUBDIR+=	emixer
 SUBDIR+=	esound
 SUBDIR+=	espeak
 SUBDIR+=	exaile
+SUBDIR+=	eyeD3
 SUBDIR+=	ezstream
 SUBDIR+=	faac
 SUBDIR+=	faad2
+SUBDIR+=	fdk-aac
 SUBDIR+=	festival
 SUBDIR+=	festival-doc
 SUBDIR+=	festlex-cmu
@@ -169,6 +171,7 @@ SUBDIR+=	gst-plugins0.10-musepack
 SUBDIR+=	gst-plugins0.10-oss
 SUBDIR+=	gst-plugins0.10-pulse
 SUBDIR+=	gst-plugins0.10-sid
+SUBDIR+=	gst-plugins0.10-soundtouch
 SUBDIR+=	gst-plugins0.10-spc
 SUBDIR+=	gst-plugins0.10-speex
 SUBDIR+=	gst-plugins0.10-twolame
@@ -230,10 +233,13 @@ SUBDIR+=	libaudiofile
 SUBDIR+=	libcanberra
 SUBDIR+=	libcdaudio
 SUBDIR+=	libcddb
+SUBDIR+=	libcuefile
 SUBDIR+=	libdca
 SUBDIR+=	libdiscid
+SUBDIR+=	libebur128
 SUBDIR+=	libfishsound
 SUBDIR+=	libgpod
+SUBDIR+=	libgroove
 SUBDIR+=	libid3tag
 SUBDIR+=	libifp
 SUBDIR+=	liblastfm
@@ -244,14 +250,15 @@ SUBDIR+=	libmp3splt
 SUBDIR+=	libmpcdec
 SUBDIR+=	libmpd
 SUBDIR+=	libmpdclient
-SUBDIR+=	libmpg123
 SUBDIR+=	libmtag
 SUBDIR+=	libmusepack
 SUBDIR+=	libmusicbrainz
 SUBDIR+=	libmusicbrainz5
 SUBDIR+=	libofa
+SUBDIR+=	libopenmpt
 SUBDIR+=	libopenspc
 SUBDIR+=	libopus
+SUBDIR+=	libreplaygain
 SUBDIR+=	libsamplerate
 SUBDIR+=	libshout
 SUBDIR+=	libsidplay
@@ -323,6 +330,7 @@ SUBDIR+=	mserv-irman
 SUBDIR+=	mstream
 SUBDIR+=	mt-daapd
 SUBDIR+=	muse
+SUBDIR+=	musepack
 SUBDIR+=	musicbrainz
 SUBDIR+=	musicpd
 SUBDIR+=	mutagen-tools
@@ -337,6 +345,7 @@ SUBDIR+=	oggasm
 SUBDIR+=	openal
 SUBDIR+=	opencore-amr
 SUBDIR+=	opus-tools
+SUBDIR+=	opusfile
 SUBDIR+=	p5-Audio-CD
 SUBDIR+=	p5-Audio-Scan
 SUBDIR+=	p5-Audio-Wav
@@ -347,6 +356,7 @@ SUBDIR+=	p5-MP3-Info
 SUBDIR+=	p5-MP3-Tag
 SUBDIR+=	p5-MPEG-Audio-Frame
 SUBDIR+=	p5-MusicBrainz-Client
+SUBDIR+=	p5-MusicBrainz-DiscID
 SUBDIR+=	p5-MusicBrainz-Queries
 SUBDIR+=	paman
 SUBDIR+=	paprefs
@@ -354,6 +364,8 @@ SUBDIR+=	pavucontrol
 SUBDIR+=	pavumeter
 SUBDIR+=	pd
 SUBDIR+=	picard
+SUBDIR+=	playitslowly
+SUBDIR+=	pocketsphinx
 SUBDIR+=	portaudio
 SUBDIR+=	portaudio-devel
 SUBDIR+=	pulseaudio
@@ -397,6 +409,7 @@ SUBDIR+=	rtunes
 SUBDIR+=	ruby-mp3info
 SUBDIR+=	ruby-taglib
 SUBDIR+=	sfxr
+SUBDIR+=	shine
 SUBDIR+=	shntool
 SUBDIR+=	shorten
 SUBDIR+=	sidplay
@@ -406,15 +419,21 @@ SUBDIR+=	solfege
 SUBDIR+=	sonata
 SUBDIR+=	sound-juicer
 SUBDIR+=	sound-theme-freedesktop
+SUBDIR+=	soundtouch
 SUBDIR+=	sox
+SUBDIR+=	spectro-edit
 SUBDIR+=	speex
+SUBDIR+=	speexdsp
+SUBDIR+=	spek
+SUBDIR+=	sphinx3
+SUBDIR+=	sphinxbase
+SUBDIR+=	sphinxtrain
 SUBDIR+=	spiralloops
 SUBDIR+=	spiralsynth
 SUBDIR+=	splay
 SUBDIR+=	sptk
 SUBDIR+=	squeezeboxserver
 SUBDIR+=	streamripper
-SUBDIR+=	streamripper-current
 SUBDIR+=	streamtuner
 SUBDIR+=	sweep
 SUBDIR+=	taglib

audio/SDL2_mixer/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2014/02/02 15:39:01 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2015/02/09 08:43:13 snj Exp $
 
 DISTNAME=	SDL2_mixer-2.0.0
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_mixer/release/
 

audio/SDL2_mixer/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/02/02 15:39:01 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/02/09 08:43:13 snj Exp $
 
 BUILDLINK_TREE+=	SDL2_mixer
 
@@ -6,6 +6,7 @@ BUILDLINK_TREE+=	SDL2_mixer
 SDL2_MIXER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.SDL2_mixer+=	SDL2_mixer>=2.0.0
+BUILDLINK_ABI_DEPENDS.SDL2_mixer?=	SDL2_mixer>=2.0.0nb1
 BUILDLINK_PKGSRCDIR.SDL2_mixer?=	../../devel/SDL2_mixer
 
 .include "../../devel/SDL2/buildlink3.mk"

audio/SDL2_mixer/distinfo

@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1 2014/02/02 15:39:01 rodent Exp $
+$NetBSD: distinfo,v 1.2 2014/04/19 14:52:13 joerg Exp $
 
 SHA1 (SDL2_mixer-2.0.0.tar.gz) = 9ed975587f09a1776ba9776dcc74a58e695aba6e
 RMD160 (SDL2_mixer-2.0.0.tar.gz) = a49884a68351f77fefe76c2fcf8ee317e6d971e2
 Size (SDL2_mixer-2.0.0.tar.gz) = 10119589 bytes
+SHA1 (patch-dynamic__modplug.h) = 1405a6329fa21a4c6b216902eaacbfcedead5150
+SHA1 (patch-music__modplug.h) = 852bfbc8f34c395b4313a7112941f79290040b78

audio/SDL2_mixer/patches/patch-dynamic__modplug.h

@@ -0,0 +1,13 @@
+$NetBSD: patch-dynamic__modplug.h,v 1.1 2014/04/19 14:52:13 joerg Exp $
+
+--- dynamic_modplug.h.orig	2014-04-19 11:23:56.000000000 +0000
++++ dynamic_modplug.h
+@@ -21,7 +21,7 @@
+ 
+ #ifdef MODPLUG_MUSIC
+ 
+-#include "modplug.h"
++#include "libmodplug/modplug.h"
+ 
+ typedef struct {
+     int loaded;

audio/SDL2_mixer/patches/patch-music__modplug.h

@@ -0,0 +1,13 @@
+$NetBSD: patch-music__modplug.h,v 1.1 2014/04/19 14:52:13 joerg Exp $
+
+--- music_modplug.h.orig	2014-04-19 11:23:23.000000000 +0000
++++ music_modplug.h
+@@ -21,7 +21,7 @@
+ 
+ #ifdef MODPLUG_MUSIC
+ 
+-#include "modplug.h"
++#include "libmodplug/modplug.h"
+ #include "SDL_rwops.h"
+ #include "SDL_audio.h"
+ #include "SDL_mixer.h"

audio/SDL_mixer/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2012/10/08 23:09:06 adam Exp $
+# $NetBSD: Makefile,v 1.49 2014/10/09 14:05:55 wiz Exp $
 
 DISTNAME=	SDL_mixer-1.2.12
 PKGREVISION=	5
@@ -12,8 +12,6 @@ LICENSE=	zlib
 
 CONFLICTS=		SDL-mixer-[0-9]*
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes

audio/abcde/MESSAGE

@@ -1,13 +1,16 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/12/16 05:14:28 lukem Exp $
+$NetBSD: MESSAGE,v 1.3 2015/01/04 12:03:07 wiz Exp $
 
 You need to install at least one encoder to use with abcde.  It has support
 for the following encoders in pkgsrc:
 
     audio/bladeenc
+    audio/faac
     audio/flac
     audio/gogo
     audio/lame
+    audio/musepack
+    audio/speex
     audio/vorbis-tools
 
 Preferences can be set in ~/.abcde.conf for each user, and for all users in

audio/abcde/Makefile

@@ -1,31 +1,31 @@
-# $NetBSD: Makefile,v 1.52 2012/09/23 05:36:22 obache Exp $
+# $NetBSD: Makefile,v 1.54 2015/01/08 10:27:24 wiz Exp $
 
-DISTNAME=	abcde-2.3.99.7_p235
-PKGNAME=	abcde-2.3.99.7
-PKGREVISION=	2
+DISTNAME=	abcde-2.6
+PKGREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
+MASTER_SITES=	http://abcde.einval.com/download/
 
 MAINTAINER=	sekiya@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/abcde/
+HOMEPAGE=	http://abcde.einval.com/
 COMMENT=	Command-line utility to rip and encode an audio CD
 
-.include "../../mk/bsd.prefs.mk"
-
 DEPENDS+=	cd-discid>=0.7:../../audio/cd-discid
+DEPENDS+=	eyeD3-[0-9]*:../../audio/eyeD3
 DEPENDS+=	id3-[0-9]*:../../audio/id3
-DEPENDS+=	id3v2-[0-9]*:../../audio/id3v2
-.if ${OPSYS} != "SunOS"
 DEPENDS+=	cdparanoia>=3.0.9.7:../../audio/cdparanoia
-.endif
 DEPENDS+=	mkcue>=2.1:../../misc/mkcue
 
 NO_BUILD=	yes
-EXTRACT_SUFX=	.tar.bz2
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-USE_TOOLS+=	bash:run gsed:run
+USE_TOOLS+=	bash:run ftp:run gsed:run
 REPLACE_BASH=	abcde cddb-tool
+REPLACE_PERL+=	abcde-musicbrainz-tool
+
+# even with all these installed, abcde-musicbrainz-tool does not work
+#USE_TOOLS=	perl:run
+#DEPENDS+=	p5-MusicBrainz-DiscID-[0-9]*:../../audio/p5-MusicBrainz-DiscID
+#DEPENDS+=	p5-WebService-MusicBrainz-[0-9]*:../../net/p5-WebService-MusicBrainz
 
 EGDIR=		${PREFIX}/share/examples/abcde
 
@@ -44,11 +44,12 @@ SUBST_CLASSES+=		gsed
 SUBST_STAGE.gsed=	pre-configure
 SUBST_MESSAGE.gsed=	Adjusting gsed path
 SUBST_FILES.gsed=	abcde
-SUBST_SED.gsed=		-e "s,@TOOLS_GSED@,${TOOLS_PATH.gsed},g"
+SUBST_SED.gsed=		-e "s, sed , ${TOOLS_PATH.gsed} ,g"
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${DESTDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${DESTDIR}${PREFIX}/bin
+#	${INSTALL_SCRIPT} ${WRKSRC}/abcde-musicbrainz-tool ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/abcde.conf ${DESTDIR}${EGDIR}
 	${INSTALL_MAN} ${WRKSRC}/abcde.1 \
@@ -56,16 +57,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.if ${OPSYS} == "SunOS"
-USE_TOOLS+=	ftp:run
-
-SUBST_CLASSES+=		abcde-cdparanoia
-SUBST_STAGE.abcde-cdparanoia=	pre-configure
-SUBST_MESSAGE.abcde-cdparanoia=	Adjusting cd-paranoia command name
-SUBST_FILES.abcde-cdparanoia=	abcde abcde.conf
-SUBST_SED.abcde-cdparanoia=	-e "/CDPARANOIA=cdparanoia/s/cdparanoia/cd-paranoia/"
-
-.include "../../misc/libcdio/buildlink3.mk"
-.endif
-
 .include "../../mk/bsd.pkg.mk"

audio/abcde/PLIST

@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:32:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/01/04 12:03:07 wiz Exp $
 bin/abcde
+@comment bin/abcde-musicbrainz-tool
 bin/cddb-tool
 man/man1/abcde.1
 man/man1/cddb-tool.1

audio/abcde/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.36 2011/05/11 10:28:08 hans Exp $
+$NetBSD: distinfo,v 1.38 2015/01/08 10:27:24 wiz Exp $
 
-SHA1 (abcde-2.3.99.7_p235.tar.bz2) = 51db5e7da9b3eda0844904ad2b9138fa97eeb254
-RMD160 (abcde-2.3.99.7_p235.tar.bz2) = bbb7116a8a06ffae6e0027e5a7524e023bfd71cf
-Size (abcde-2.3.99.7_p235.tar.bz2) = 171342 bytes
+SHA1 (abcde-2.6.tar.gz) = a1545fb63673e247c8378e9925505e23ace806dc
+RMD160 (abcde-2.6.tar.gz) = 958f163b33efeda99b16f5ae6bfe35831e9eb652
+Size (abcde-2.6.tar.gz) = 105609 bytes
 SHA1 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc
-SHA1 (patch-ac) = c10192d56b3e73a0dc6fc7b1b192ff50cf0555ca
+SHA1 (patch-abcde) = 90454d1fd7a83fce184afa71ce87675b0fdec241

audio/abcde/patches/patch-abcde

@@ -0,0 +1,15 @@
+$NetBSD: patch-abcde,v 1.1 2015/01/08 10:27:24 wiz Exp $
+
+Default to cdda2wav since icedax is not in pkgsrc.
+
+--- abcde.orig	2014-10-26 20:16:54.000000000 +0000
++++ abcde
+@@ -3274,7 +3274,7 @@ AACTAG=faac
+ ATOMICPARSLEY=AtomicParsley
+ 
+ CDPARANOIA=cdparanoia
+-CDDA2WAV=icedax
++CDDA2WAV=cdda2wav
+ DAGRAB=dagrab
+ CDDAFS=cp
+ PIRD=pird

audio/abcde/patches/patch-ac

@@ -1,136 +0,0 @@
-$NetBSD: patch-ac,v 1.28 2011/05/11 10:28:08 hans Exp $
-
---- abcde.orig	2010-04-10 10:14:30.000000000 +0900
-+++ abcde	2010-04-10 18:40:03.000000000 +0900
-@@ -415,10 +415,10 @@
- {
- 	case $1 in
- 	TRACKNAME1)
--		TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
-+		TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')"
- 		;;
- 	TRACKNAME)
--		TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')"
-+		TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | ${SED} 's/\ \+$//')"
- 		;;
- 	esac
- }
-@@ -575,32 +575,32 @@
- 	if [ "$VARIOUSARTISTS" = "y" ] && [ ! "$ONETRACK" = "y" ]; then
- 		case "$VARIOUSARTISTSTYLE" in
- 		forward)
--			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
-+			DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's- / -~-g')"
- 			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- 			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- 			;;
- 		forward-dash)
--			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
-+			DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's, - ,~,g')"
- 			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- 			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- 			;;
- 		reverse)
--			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's- / -~-g')"
-+			DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's- / -~-g')"
- 			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- 			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- 			;;
- 		reverse-dash)
--			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's, - ,~,g')"
-+			DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's, - ,~,g')"
- 			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- 			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- 			;;
- 		colon)
--			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's-: -~-g')"
-+			DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's-: -~-g')"
- 			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- 			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- 			;;
- 		trailing-paren)
--			DTITLEARTIST="$(echo "$TRACKNAME" | sed 's,^\(.*\) (\(.*\)),\1~\2,')"
-+			DTITLEARTIST="$(echo "$TRACKNAME" | ${SED} 's,^\(.*\) (\(.*\)),\1~\2,')"
- 			TRACKARTIST="$(echo "$DTITLEARTIST" | cut -f2 -d~)"
- 			TRACKNAME="$(echo "$DTITLEARTIST" | cut -f1 -d~)"
- 			;;
-@@ -1519,7 +1519,7 @@
- 		if [ "$DOSPLAYLIST" = "y" ]; then
- 			awk '{substr("\r",""); printf "%s\r\n", $0}' "$OUTPUTDIR/$PLAYLISTFILE" > "$ABCDETEMPDIR/PLAYLISTFILE.tmp"
- #			mv -f "$ABCDETEMPDIR/PLAYLISTFILE.tmp" "$OUTPUTDIR/$PLAYLISTFILE"
--			cat "$ABCDETEMPDIR/PLAYLISTFILE.tmp" | sed 's/\//\\/' > "$OUTPUTDIR/$PLAYLISTFILE"
-+			cat "$ABCDETEMPDIR/PLAYLISTFILE.tmp" | ${SED} 's/\//\\/' > "$OUTPUTDIR/$PLAYLISTFILE"
- 		fi
- 		echo "playlistcomplete" >> "$ABCDETEMPDIR/status"
- 	done
-@@ -1703,7 +1703,7 @@
- 
- 							#TRACKS=$(echo $CUESHEET | egrep "TRACK \+[[:digit:]]\+ \+AUDIO" |wc -l)
- 							#TRACKS=0
--							OFFSETTIMES=( $(echo "$CUESHEET" | sed -n -e's/\ *INDEX 01\ \+//p' ) )
-+							OFFSETTIMES=( $(echo "$CUESHEET" | ${SED} -n -e's/\ *INDEX 01\ \+//p' ) )
- 							TRACKS=${#OFFSETTIMES[@]}
- 							unset OFFSETS
- 							#echo "processing offsetimes ${OFFSETTIMES[@]}"
-@@ -1737,7 +1737,7 @@
- #				CDPARANOIAAUDIOTRACKS="$TRACKS"
- #
- #				LEADOUT="$(echo "$CDPARANOIAOUTPUT" | egrep -o '^TOTAL[[:space:]]+([[:digit:]]+)' | get_last)"
--#				OFFSETS="$(echo "$CDPARANOIAOUTPUT" | sed -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')" 
-+#				OFFSETS="$(echo "$CDPARANOIAOUTPUT" | ${SED} -n -e's/^ .* \([0-9]\+\) \[.*/\1/p')" 
- #				makeids
- #				;;
- 			*)
-@@ -1831,7 +1831,7 @@
- 		TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
- 		# User-supplied track queue.
- 		# Weed out non-numbers, whitespace, then sort and weed out duplicates
--		TRACKQUEUE=$(echo $TRACKQUEUE | sed 's-[^0-9 ]--g' | tr ' ' '\n' | grep -v ^$ | sort -n | uniq | tr '\n' ' ' | sed 's- $--g')
-+		TRACKQUEUE=$(echo $TRACKQUEUE | ${SED} 's-[^0-9 ]--g' | tr ' ' '\n' | grep -v ^$ | sort -n | uniq | tr '\n' ' ' | ${SED} 's- $--g')
- 		# Once cleaned, obtain the highest value in the trackqueue for number padding
- 		for LASTTRACK in $TRACKQUEUE; do :; done
- 		if [ ! "$PADTRACKS" = "y" ] ; then
-@@ -2760,7 +2760,7 @@
- 		cddafs)
- 			# Find the track's mounted path
- 			REALTRACKNUM=$(expr $UTRACKNUM + 0)
--			FILEPATH=$(mount | grep "$CDROM on" | sed 's/^[^ ]* on \(.*\) (.*/\1/')
-+			FILEPATH=$(mount | grep "$CDROM on" | ${SED} 's/^[^ ]* on \(.*\) (.*/\1/')
- 			FILEPATH=$(find "$FILEPATH" | grep "/$REALTRACKNUM ");
- 			# If the file exists, copy it
- 			if [ -e "$FILEPATH" ] ; then
-@@ -2841,8 +2841,8 @@
- # Custom filename munging:
- mungefilename ()
- {
--	#echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
--	echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
-+	#echo "$@" | ${SED} s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]
-+	echo "$@" | ${SED} s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
- }
- 
- # Custom genre munging:
-@@ -3037,6 +3037,9 @@
- DEFAULT_QUALITY_HI="oggenc:-q 7,lame:--preset standard,speex:--quality 9,m4a:"
- DEFAULT_QUALITY_XHI="oggenc:-q 10,lame:--preset extreme,speex:--quality 10,m4a:"
- 
-+# We need GNU sed
-+SED=sed
-+
- # Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for
- # Linux/OpenBSD. ftp is user for NetBSD.
- # Let's use these checkings to determine the OS flavour, which will be used
-@@ -3060,10 +3063,12 @@
- 	HTTPGET=ftp
- 	MD5SUM=md5
- 	OSFLAVOUR=NBSD
-+	SED=@TOOLS_GSED@
- elif [ X$(uname) = "SunOS" ] ; then
--	HTTPGET=""
-+	HTTPGET=ftp
- 	MD5SUM=md5
- 	OSFLAVOUR=SunOS
-+	SED=@TOOLS_GSED@
- else
- 	HTTPGET=wget
- fi

audio/abcmidi/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/03/03 10:19:10 shattered Exp $
+# $NetBSD: Makefile,v 1.17 2015/01/23 00:02:48 mef Exp $
 #
 
 DISTNAME=	abcMIDI-${ABCMIDIVER}
@@ -13,7 +13,7 @@ HOMEPAGE=	http://abc.sourceforge.net/abcMIDI/
 COMMENT=	Music utilities for abc
 LICENSE=	gnu-gpl-v2
 
-ABCMIDIVER=	2012-12-01
+ABCMIDIVER=	2014-12-25
 
 INSTALLATION_DIRS=	share/doc/${PKGBASE}/programming \
 			share/examples/${PKGBASE}

audio/abcmidi/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/02/17 13:54:12 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/01/23 00:02:48 mef Exp $
 bin/abc2abc
 bin/abc2midi
 bin/abcmatch
@@ -8,6 +8,7 @@ bin/midicopy
 bin/yaps
 man/man1/abc2abc.1
 man/man1/abc2midi.1
+man/man1/abcmatch.1
 man/man1/mftext.1
 man/man1/midi2abc.1
 man/man1/midicopy.1

audio/abcmidi/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2013/03/03 10:19:10 shattered Exp $
+$NetBSD: distinfo,v 1.13 2015/01/23 00:02:48 mef Exp $
 
-SHA1 (abcMIDI-2012-12-01.zip) = 08f5a766a6e4b071507baf1c5c2e1c6e84d07da3
-RMD160 (abcMIDI-2012-12-01.zip) = 58b59697075ecdebc084c788806ff40a85414a26
-Size (abcMIDI-2012-12-01.zip) = 485165 bytes
+SHA1 (abcMIDI-2014-12-25.zip) = a8d9509b32131015f38e0a31432b6c8990607888
+RMD160 (abcMIDI-2014-12-25.zip) = 1d223bf35ddc07302b11d31773a30e375c16cbb1
+Size (abcMIDI-2014-12-25.zip) = 515102 bytes
 SHA1 (patch-Makefile.in) = 46cff6cde3c32b0e54e200f2eabc148422d68f26
 SHA1 (patch-ab) = 27df5bb0d637336d7c244c5c9ac9c115bfd9ed24
 SHA1 (patch-ac) = 54e42d69173162ce991564c592e5be1fcc8cc0fa

audio/akode-plugins-pulseaudio/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2013/11/25 12:00:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/02/21 23:35:38 ryoon Exp $
 #
 
 PKGNAME=		akode-plugins-pulseaudio-${AKODE_VERSION}
-PKGREVISION=		9
+PKGREVISION=		13
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Pulseaudio output plugin for akode framework

audio/akode-plugins-sun/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/09/11 23:59:22 asau Exp $
+# $NetBSD: Makefile,v 1.8 2015/01/01 08:15:51 dholland Exp $
 #
 
 PKGNAME=		akode-plugins-sun-${AKODE_VERSION}
@@ -8,7 +8,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Sun audio output plugin for akode framework
 LICENSE=		gnu-lgpl-v2
 
-ONLY_FOR_PLATFORM+=	NetBSD-*-* OpenBSD-*-* SunOS-*-*
+# no support for the sun audio interface
+NOT_FOR_PLATFORM+=	DragonFly-*-* FreeBSD-*-* Linux-*-*
 
 .include "../../audio/akode/Makefile.common"
 

audio/alacconvert/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/11/14 19:43:21 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2014/12/09 13:19:44 joerg Exp $
 
 SHA1 (libalac-r3.tar.bz2) = d633e538a1d1395614346ef32292f8c16b48b2b2
 RMD160 (libalac-r3.tar.bz2) = b55bd6d8eaf5d1d8ef5bea441cfd206c95ae68ee
 Size (libalac-r3.tar.bz2) = 65558 bytes
-SHA1 (patch-makefile) = 7ccc64459e36b961b18323cb428ff48be99c1008
+SHA1 (patch-makefile) = f9cd2ed79e03ddfc34fac86c9f847dfbbb10b8b8

audio/alacconvert/patches/patch-makefile

@@ -1,4 +1,4 @@
-$NetBSD: patch-makefile,v 1.1.1.1 2011/11/14 19:43:21 ryoon Exp $
+$NetBSD: patch-makefile,v 1.2 2014/12/09 13:19:44 joerg Exp $
 
 * Dynamically linked to libalac
 * Add install target
@@ -23,7 +23,7 @@ $NetBSD: patch-makefile,v 1.1.1.1 2011/11/14 19:43:21 ryoon Exp $
  alacconvert:	$(OBJS)
 -	(cd $(CODECDIR); $(MAKE))
 -	$(CC) $(LFLAGS) $(OBJS) -o alacconvert
-+	$(CC)  -Wl,-R ${PREFIX}/lib $(LFLAGS) $(OBJS) -o alacconvert
++	$(CC)  -Wl,-R${PREFIX}/lib $(LFLAGS) $(OBJS) -o alacconvert
  
  main.o : main.cpp
  	$(CC) -I $(INCLUDES) $(CFLAGS) main.cpp

audio/albumplayer/Makefile

@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.31 2013/10/10 14:41:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2014/12/30 15:04:14 mef Exp $
 #
 
 DISTNAME=	albumplayer-0.3.1
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	audio
 MASTER_SITES=	http://rvb.mytanet.de/
 
-MAINTAINER=	pkgstc-users@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rvb.mytanet.de/album-player.shtml
 COMMENT=	FLAC album player
 LICENSE=	original-bsd

audio/alsa-lib/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/09/11 23:59:23 asau Exp $
+# $NetBSD: Makefile,v 1.15 2014/09/10 15:59:34 jperkin Exp $
 #
 
-DISTNAME=	alsa-lib-1.0.22
-PKG_REVISION=	2
+DISTNAME=	alsa-lib-1.0.27.2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/
 EXTRACT_SUFX=	.tar.bz2
@@ -25,8 +24,12 @@ CPPFLAGS.SunOS+=	-std=c99 -D_POSIX_C_SOURCE=200112L
 CPPFLAGS.SunOS+=	-D__EXTENSIONS__ -DBSD_COMP -DMAP_FILE=0
 CPPFLAGS.SunOS+=	-Du_int8_t=uint8_t -Du_int16_t=uint16_t
 CPPFLAGS.SunOS+=	-Du_int32_t=uint32_t -Du_int64_t=uint64_t
+CPPFLAGS.SunOS+=	-D__u32=uint32_t -D__u64=uint64_t
 CPPFLAGS.SunOS+=	-Dbswap_64=BSWAP_64 -Dbswap_32=BSWAP_32 -Dbswap_16=BSWAP_16
 
+CPPFLAGS.NetBSD+=	-D__u32=uint32_t -D__u64=uint64_t
+CPPFLAGS.FreeBSD+=	-D__u32=uint32_t -D__u64=uint64_t
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=	--without-versioned

audio/alsa-lib/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/08/31 14:25:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/06/09 12:21:07 ryoon Exp $
 bin/aserver
 include/alsa/alisp.h
 include/alsa/asoundef.h
@@ -29,10 +29,12 @@ include/alsa/seqmid.h
 include/alsa/sound/asound_fm.h
 include/alsa/sound/emu10k1.h
 include/alsa/sound/hdsp.h
+include/alsa/sound/hdspm.h
 include/alsa/sound/sb16_csp.h
 include/alsa/sound/sscape_ioctl.h
 include/alsa/sound/type_compat.h
 include/alsa/timer.h
+include/alsa/use-case.h
 include/alsa/version.h
 include/sys/asoundlib.h
 lib/alsa-lib/smixer/smixer-ac97.la
@@ -42,6 +44,7 @@ lib/libasound.la
 lib/pkgconfig/alsa.pc
 share/aclocal/alsa.m4
 share/alsa/alsa.conf
+share/alsa/alsa.conf.d/README
 share/alsa/cards/AACI.conf
 share/alsa/cards/ATIIXP-MODEM.conf
 share/alsa/cards/ATIIXP-SPDMA.conf
@@ -65,7 +68,10 @@ share/alsa/cards/EMU10K1X.conf
 share/alsa/cards/ENS1370.conf
 share/alsa/cards/ENS1371.conf
 share/alsa/cards/ES1968.conf
+share/alsa/cards/Echo_Echo3G.conf
 share/alsa/cards/FM801.conf
+share/alsa/cards/FWSpeakers.conf
+share/alsa/cards/FireWave.conf
 share/alsa/cards/GUS.conf
 share/alsa/cards/HDA-Intel.conf
 share/alsa/cards/ICE1712.conf
@@ -115,3 +121,27 @@ share/alsa/pcm/surround51.conf
 share/alsa/pcm/surround71.conf
 share/alsa/smixer.conf
 share/alsa/sndo-mixer.alisp
+share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf
+share/alsa/ucm/DAISY-I2S/HiFi.conf
+share/alsa/ucm/PandaBoard/FMAnalog
+share/alsa/ucm/PandaBoard/PandaBoard.conf
+share/alsa/ucm/PandaBoard/hifi
+share/alsa/ucm/PandaBoard/hifiLP
+share/alsa/ucm/PandaBoard/record
+share/alsa/ucm/PandaBoard/voice
+share/alsa/ucm/PandaBoard/voiceCall
+share/alsa/ucm/PandaBoardES/FMAnalog
+share/alsa/ucm/PandaBoardES/PandaBoardES.conf
+share/alsa/ucm/PandaBoardES/hifi
+share/alsa/ucm/PandaBoardES/hifiLP
+share/alsa/ucm/PandaBoardES/record
+share/alsa/ucm/PandaBoardES/voice
+share/alsa/ucm/PandaBoardES/voiceCall
+share/alsa/ucm/SDP4430/FMAnalog
+share/alsa/ucm/SDP4430/SDP4430.conf
+share/alsa/ucm/SDP4430/hifi
+share/alsa/ucm/SDP4430/hifiLP
+share/alsa/ucm/SDP4430/record
+share/alsa/ucm/SDP4430/voice
+share/alsa/ucm/SDP4430/voiceCall
+share/alsa/ucm/tegraalc5632/tegraalc5632.conf

audio/alsa-lib/distinfo

@@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.13 2014/03/25 23:06:07 asau Exp $
+$NetBSD: distinfo,v 1.17 2015/01/10 10:14:20 rumko Exp $
 
-SHA1 (alsa-lib-1.0.22.tar.bz2) = d3b6c740c23b8d113a8d02da2a9fd61f5d1a8a44
-RMD160 (alsa-lib-1.0.22.tar.bz2) = 4dbc3f9550f8ba01535ad3cfd8f0a8140f897e81
-Size (alsa-lib-1.0.22.tar.bz2) = 808534 bytes
+SHA1 (alsa-lib-1.0.27.2.tar.bz2) = 9cd50f4b5f07d5e7213dd1277b8673e677804cf8
+RMD160 (alsa-lib-1.0.27.2.tar.bz2) = 6794e626affe9b6b6ec5fb64ff31384526b160c2
+Size (alsa-lib-1.0.27.2.tar.bz2) = 906844 bytes
 SHA1 (patch-aa) = 5a8e9571ac6fb1f1f6cbd18d3859468a7b64076f
-SHA1 (patch-ab) = b0a6494760d18079e532ae9b205a73c255000f9a
+SHA1 (patch-ab) = 4853bdbdd559c4fa6a9d00dca3e880022d7fc6ba
 SHA1 (patch-ac) = 47f5cad6c436b08161acd726090ec20a9cb50fc8
-SHA1 (patch-ad) = f0ee874e74966e6196996ecfe0637bef47fe1581
-SHA1 (patch-ae) = 498d9e28e5b65d9ae72220752eda22f7866c68c6
+SHA1 (patch-ad) = 10beb6cca7cf7c554a13337e8cded23e02bca2c8
+SHA1 (patch-ae) = f1eced4561ded4e685f5e690393c7b93e4c42837
 SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
 SHA1 (patch-ag) = bea09d714bf75735f5be6d370f7242c34b73cb95
-SHA1 (patch-ah) = 5b2c0dd3ca8582fef3e00ce256047d3bd345b61e
+SHA1 (patch-ah) = 3d2aa98ba2791c2beb152d7e3a454b8d6bb527d3
 SHA1 (patch-ai) = 9eb6c61d013f187267c40fdd4f1f466704507619
 SHA1 (patch-aj) = 82a5b4cf2501c94d4cc5e3275078d84ded1e7a79
 SHA1 (patch-ak) = 39a782c8882a86226f18137d33c70a3736c48cc6
 SHA1 (patch-al) = 76de42304d5ba90bf5e8def57f523c1ee910d9df
-SHA1 (patch-am) = 6bad62786ede14c5910d9c1c9fc99b4807976c9d
+SHA1 (patch-am) = 7b5cf015ec0612c1c4a9a864d42d84bba7a78e47
 SHA1 (patch-an) = c7253acaaf2aeb96310d14c9e03853bc4cd4d0cd
 SHA1 (patch-ao) = 25ac431685e033b165a9abdcd44246772c1f99b5
 SHA1 (patch-ap) = deaa53fcf3fc23c7683388b5e37b3d6593776121
-SHA1 (patch-aq) = 17faa322f2272b3c926a0c3610079e9686707248
+SHA1 (patch-aq) = 6a6cf97a17997a9ffc5d269ad2231fc0451bd532
 SHA1 (patch-ar) = 8823c573ac4f6ce038b1067f71a8de91e73bea20
 SHA1 (patch-as) = 946a179a675d6c5e03e0f7734ac97b0592806912
 SHA1 (patch-at) = 831c8b94e079a33057effcbee7113dfc3ca5533e
@@ -41,9 +41,12 @@ SHA1 (patch-bi) = b5038db277068034281787c0072201beae8df8ff
 SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
 SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
 SHA1 (patch-include_iatomic.h) = 30099667b490c0e960a7e8883da52c39f4396b9d
-SHA1 (patch-include_pcm.h) = 1c458cd7d078356f4a970b0b3592aad139ac0918
+SHA1 (patch-include_pcm.h) = 9558c5f5c80276632d27e0278cd33ee77d8281a5
+SHA1 (patch-include_sound_asound.h) = 456b8545668294d38a83e98818d76bd2f717df75
 SHA1 (patch-src_compat_hsearch__r.c) = 017bf104203233e85e9f3083f43150de6f341ad5
+SHA1 (patch-src_conf.c) = 43e35f6a133cf297d3309bc8c4846beb295e5242
 SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
 SHA1 (patch-src_pcm_pcm__mmap.c) = 8ce33dae5215ee441196414e0c1ba02e4757e32d
 SHA1 (patch-src_seq_seq__midi__event.c) = 2a5de492d6ca19a0f0c564e8f5a065e5fc57ea5c
 SHA1 (patch-src_shmarea.c) = e6da001119f4e164b606e19a4c12df9aa05caa6a
+SHA1 (patch-src_ucm_parser.c) = 3c376ae30f11d749ea5e41da89a72269710a3b10

audio/alsa-lib/patches/patch-ab

@@ -1,23 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-ab,v 1.6 2014/06/09 12:21:07 ryoon Exp $
 
---- configure.orig	2008-10-29 08:46:35.000000000 -0400
-+++ configure	2008-12-19 00:09:49.000000000 -0500
-@@ -20983,6 +20983,14 @@
- echo "${ECHO_T}no" >&6; }
- fi
- 
-+case $host_os in
-+  netbsd*|freebsd*|dragonfly*)
-+    HAVE_LIBDL=yes
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBDL 1
-+_ACEOF
-+    ;;
-+esac
- 
- if test "$HAVE_LIBDL"="yes"; then
-   BUILD_MODULES_TRUE=
-@@ -22342,6 +22350,11 @@
+--- configure.orig	2013-07-08 12:32:46.000000000 +0000
++++ configure
+@@ -13322,6 +13322,11 @@ test "x$prefix" = xNONE && prefix=$ac_de
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
  DEFS=-DHAVE_CONFIG_H
@@ -29,3 +14,18 @@ $NetBSD: patch-ab,v 1.5 2014/03/25 23:06:07 asau Exp $
  
  ac_libobjs=
  ac_ltlibobjs=
+@@ -15815,6 +15820,14 @@ if test -n "$ac_unrecognized_opts" && te
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+ 
++case $host_os in
++  netbsd*|freebsd*|dragonfly*)
++    HAVE_LIBDL=yes
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LIBDL 1
++_ACEOF
++    ;;
++esac
+ 
+ echo "Creating asoundlib.h..."
+ cp "$srcdir"/include/asoundlib-head.h include/asoundlib.h

audio/alsa-lib/patches/patch-ad

@@ -1,19 +1,22 @@
-$NetBSD: patch-ad,v 1.4 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-ad,v 1.5 2015/01/10 10:14:20 rumko Exp $
 
---- include/global.h.orig	2008-10-29 08:42:10.000000000 -0400
+--- include/global.h.orig	2013-07-08 12:31:36.000000000 +0000
 +++ include/global.h
-@@ -31,6 +31,10 @@
+@@ -30,6 +30,13 @@
+ 
  /* for timeval and timespec */
  #include <time.h>
- 
++#if defined(__FreeBSD__)
++#include <sys/timespec.h>
++#endif
++
 +#ifdef __sun
 +#include <alloca.h>
 +#endif
-+
+ 
  #ifdef __cplusplus
  extern "C" {
- #endif
-@@ -133,7 +137,7 @@ int snd_shm_area_destroy(struct snd_shm_
+@@ -133,7 +140,7 @@ int snd_shm_area_destroy(struct snd_shm_
  
  int snd_user_file(const char *file, char **result);
  

audio/alsa-lib/patches/patch-ae

@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-ae,v 1.5 2014/06/09 12:21:07 ryoon Exp $
 
---- include/local.h.orig	2008-10-29 08:42:10.000000000 -0400
+--- include/local.h.orig	2013-07-08 12:31:36.000000000 +0000
 +++ include/local.h
-@@ -28,7 +28,20 @@
+@@ -28,11 +28,26 @@
  #include <string.h>
  #include <fcntl.h>
  #include <assert.h>
@@ -23,7 +23,13 @@ $NetBSD: patch-ae,v 1.4 2014/03/25 23:06:07 asau Exp $
  #include <stdarg.h>
  #include <sys/poll.h>
  #include <errno.h>
-@@ -182,7 +195,9 @@ extern snd_lib_error_handler_t snd_err_m
++#if defined(__linux__)
+ #include <linux/ioctl.h>
++#endif
+ 
+ #include "config.h"
+ #ifdef SUPPORT_RESMGR
+@@ -228,7 +245,9 @@ extern snd_lib_error_handler_t snd_err_m
  
  /*
   */

audio/alsa-lib/patches/patch-ah

@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-ah,v 1.3 2014/06/09 12:21:07 ryoon Exp $
 
---- src/pcm/pcm.c.orig	2009-12-16 15:18:51.000000000 +0000
+--- src/pcm/pcm.c.orig	2013-07-08 12:31:36.000000000 +0000
 +++ src/pcm/pcm.c
 @@ -630,7 +630,7 @@ playback devices.
  
@@ -10,8 +10,8 @@ $NetBSD: patch-ah,v 1.2 2014/03/25 23:06:07 asau Exp $
 +#include <stdlib.h>
  #include <stdarg.h>
  #include <signal.h>
- #include <sys/poll.h>
-@@ -639,6 +639,10 @@ playback devices.
+ #include <ctype.h>
+@@ -640,6 +640,10 @@ playback devices.
  #include <limits.h>
  #include "pcm_local.h"
  

audio/alsa-lib/patches/patch-am

@@ -1,9 +1,9 @@
-$NetBSD: patch-am,v 1.4 2014/03/25 23:06:07 asau Exp $
+$NetBSD: patch-am,v 1.5 2014/06/09 12:21:07 ryoon Exp $
 
---- src/pcm/pcm_dmix_generic.c.orig	2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm_dmix_generic.c.orig	2013-07-08 12:31:36.000000000 +0000
 +++ src/pcm/pcm_dmix_generic.c
 @@ -125,7 +125,9 @@ static void mix_select_callbacks(snd_pcm
- 	 (1ULL << SND_PCM_FORMAT_S24_3LE) | \
+ 	 (1ULL << SND_PCM_FORMAT_S24_LE) | (1ULL << SND_PCM_FORMAT_S24_3LE) | \
  	 (1ULL << SND_PCM_FORMAT_U8))
  
 +#if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(__sun)

audio/alsa-lib/patches/patch-aq

@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.2 2012/02/15 19:43:51 hans Exp $
+$NetBSD: patch-aq,v 1.3 2014/06/09 12:21:07 ryoon Exp $
 
---- src/pcm/pcm_hw.c.orig	2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm_hw.c.orig	2013-07-08 12:31:36.000000000 +0000
 +++ src/pcm/pcm_hw.c
 @@ -41,6 +41,10 @@
  #include "../control/control_local.h"
@@ -13,7 +13,7 @@ $NetBSD: patch-aq,v 1.2 2012/02/15 19:43:51 hans Exp $
  //#define DEBUG_RW		/* use to debug readi/writei/readn/writen */
  //#define DEBUG_MMAP		/* debug mmap_commit */
  
-@@ -219,10 +223,11 @@ static int snd_pcm_hw_nonblock(snd_pcm_t
+@@ -220,10 +224,11 @@ static int snd_pcm_hw_nonblock(snd_pcm_t
  
  static int snd_pcm_hw_async(snd_pcm_t *pcm, int sig, pid_t pid)
  {
@@ -25,9 +25,9 @@ $NetBSD: patch-aq,v 1.2 2012/02/15 19:43:51 hans Exp $
 +	long flags;
  	if ((flags = fcntl(fd, F_GETFL)) < 0) {
  		err = -errno;
- 		SYSMSG("F_GETFL failed");
-@@ -237,13 +242,16 @@ static int snd_pcm_hw_async(snd_pcm_t *p
- 		SYSMSG("F_SETFL for O_ASYNC failed");
+ 		SYSMSG("F_GETFL failed (%i)", err);
+@@ -238,13 +243,16 @@ static int snd_pcm_hw_async(snd_pcm_t *p
+ 		SYSMSG("F_SETFL for O_ASYNC failed (%i)", err);
  		return err;
  	}
 +#endif
@@ -36,14 +36,14 @@ $NetBSD: patch-aq,v 1.2 2012/02/15 19:43:51 hans Exp $
 +#ifndef __sun
  	if (fcntl(fd, F_SETSIG, (long)sig) < 0) {
  		err = -errno;
- 		SYSMSG("F_SETSIG failed");
+ 		SYSMSG("F_SETSIG failed (%i)", err);
  		return err;
  	}
 +#endif
  	if (fcntl(fd, F_SETOWN, (long)pid) < 0) {
  		err = -errno;
- 		SYSMSG("F_SETOWN failed");
-@@ -1141,8 +1149,10 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp,
+ 		SYSMSG("F_SETOWN failed (%i)", err);
+@@ -1407,8 +1415,10 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp,
  	mode = 0;
  	if (fmode & O_NONBLOCK)
  		mode |= SND_PCM_NONBLOCK;
@@ -54,7 +54,7 @@ $NetBSD: patch-aq,v 1.2 2012/02/15 19:43:51 hans Exp $
  
  	if (ioctl(fd, SNDRV_PCM_IOCTL_PVERSION, &ver) < 0) {
  		ret = -errno;
-@@ -1281,8 +1291,10 @@ int snd_pcm_hw_open(snd_pcm_t **pcmp, co
+@@ -1547,8 +1557,10 @@ int snd_pcm_hw_open(snd_pcm_t **pcmp, co
  	fmode = O_RDWR;
  	if (mode & SND_PCM_NONBLOCK)
  		fmode |= O_NONBLOCK;

audio/alsa-lib/patches/patch-include_pcm.h

@@ -1,10 +1,10 @@
-$NetBSD: patch-include_pcm.h,v 1.3 2012/03/08 04:04:19 sbd Exp $
+$NetBSD: patch-include_pcm.h,v 1.4 2014/06/09 12:21:07 ryoon Exp $
 
---- include/pcm.h.orig	2009-12-16 15:18:51.000000000 +0000
+--- include/pcm.h.orig	2013-07-08 12:31:36.000000000 +0000
 +++ include/pcm.h
-@@ -456,7 +456,9 @@ int snd_pcm_wait(snd_pcm_t *pcm, int tim
- int snd_pcm_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2);
- int snd_pcm_unlink(snd_pcm_t *pcm);
+@@ -579,7 +579,9 @@ int snd_pcm_chmap_print(const snd_pcm_ch
+ unsigned int snd_pcm_chmap_from_string(const char *str);
+ snd_pcm_chmap_t *snd_pcm_chmap_parse_string(const char *str);
  
 +/*
  //int snd_pcm_mixer_element(snd_pcm_t *pcm, snd_mixer_t *mixer, snd_mixer_elem_t **elem);
@@ -12,7 +12,7 @@ $NetBSD: patch-include_pcm.h,v 1.3 2012/03/08 04:04:19 sbd Exp $
  
  /*
   * application helpers - these functions are implemented on top
-@@ -920,10 +922,17 @@ int snd_pcm_format_width(snd_pcm_format_
+@@ -1048,10 +1050,17 @@ int snd_pcm_format_width(snd_pcm_format_
  int snd_pcm_format_physical_width(snd_pcm_format_t format);		/* in bits */
  snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
  ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);

audio/alsa-lib/patches/patch-include_sound_asound.h

@@ -0,0 +1,20 @@
+$NetBSD: patch-include_sound_asound.h,v 1.1 2014/06/09 12:21:07 ryoon Exp $
+
+--- include/sound/asound.h.orig	2013-07-08 12:31:36.000000000 +0000
++++ include/sound/asound.h
+@@ -23,8 +23,14 @@
+ #ifndef _UAPI__SOUND_ASOUND_H
+ #define _UAPI__SOUND_ASOUND_H
+ 
++#if defined(__linux__)
+ #include <linux/types.h>
+-
++#else
++#include <sys/ioctl.h>
++#define __bitwise
++typedef uint32_t __u32;
++typedef int __kernel_pid_t;
++#endif
+ 
+ /*
+  *  protocol version

audio/alsa-lib/patches/patch-src_conf.c

@@ -0,0 +1,73 @@
+$NetBSD: patch-src_conf.c,v 1.3 2014/06/26 20:23:14 asau Exp $
+
+* NetBSD has no PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+* SunOS has no versionsort or dirent d_type
+
+--- src/conf.c.orig	2013-07-08 12:31:36.000000000 +0000
++++ src/conf.c
+@@ -426,9 +426,12 @@ beginning:</P>
+ 
+ #ifndef DOC_HIDDEN
+ 
+-#ifdef HAVE_LIBPTHREAD
++#if defined(HAVE_LIBPTHREAD) && defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+ static pthread_mutex_t snd_config_update_mutex =
+ 				PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++#else
++pthread_mutexattr_t attr;
++pthread_mutex_t _mutex;
+ #endif
+ 
+ struct _snd_config {
+@@ -474,12 +477,22 @@ typedef struct {
+ 
+ static inline void snd_config_lock(void)
+ {
++#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+ 	pthread_mutex_lock(&snd_config_update_mutex);
++#else
++	pthread_mutexattr_init(&attr);
++	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
++	pthread_mutex_init(&_mutex, &attr);
++#endif
+ }
+ 
+ static inline void snd_config_unlock(void)
+ {
++#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+ 	pthread_mutex_unlock(&snd_config_update_mutex);
++#else
++	pthread_mutexattr_destroy(&attr);
++#endif
+ }
+ 
+ #else
+@@ -3376,11 +3389,19 @@ static int snd_config_hooks(snd_config_t
+ 
+ static int config_filename_filter(const struct dirent *dirent)
+ {
++#ifdef __sun
++	struct stat s;
++#endif
+ 	size_t flen;
+ 
+ 	if (dirent == NULL)
+ 		return 0;
++#ifdef __sun
++	stat(dirent->d_name, &s);
++	if (s.st_mode & S_IFDIR)
++#else
+ 	if (dirent->d_type == DT_DIR)
++#endif
+ 		return 0;
+ 
+ 	flen = strlen(dirent->d_name);
+@@ -3506,7 +3527,7 @@ int snd_config_hook_load(snd_config_t *r
+ 			int n;
+ 
+ #ifndef DOC_HIDDEN
+-#ifdef _GNU_SOURCE
++#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
+ #define SORTFUNC	versionsort
+ #else
+ #define SORTFUNC	alphasort

audio/alsa-lib/patches/patch-src_ucm_parser.c

@@ -0,0 +1,35 @@
+$NetBSD: patch-src_ucm_parser.c,v 1.3 2014/06/26 20:23:14 asau Exp $
+
+* NetBSD has no versionsort
+* FreeBSD doesn't have it either
+* SunOS has no versionsort or dirent d_type
+
+--- src/ucm/parser.c.orig	2013-07-08 12:31:36.000000000 +0000
++++ src/ucm/parser.c
+@@ -1224,9 +1224,17 @@ int uc_mgr_import_master_config(snd_use_
+ 
+ static int filename_filter(const struct dirent *dirent)
+ {
++#ifdef __sun
++	struct stat s;
++#endif
+ 	if (dirent == NULL)
+ 		return 0;
++#ifdef __sun
++	stat(dirent->d_name, &s);
++	if (s.st_mode & S_IFDIR) {
++#else
+ 	if (dirent->d_type == DT_DIR) {
++#endif
+ 		if (dirent->d_name[0] == '.') {
+ 			if (dirent->d_name[1] == '\0')
+ 				return 0;
+@@ -1254,7 +1262,7 @@ int uc_mgr_scan_master_configs(const cha
+ 		"%s", env ? env : ALSA_USE_CASE_DIR);
+ 	filename[MAX_FILE-1] = '\0';
+ 
+-#ifdef _GNU_SOURCE
++#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
+ #define SORTFUNC	versionsort
+ #else
+ #define SORTFUNC	alphasort

audio/alsa-plugins-oss/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2012/09/11 23:59:23 asau Exp $
+# $NetBSD: Makefile,v 1.8 2014/06/09 12:42:58 ryoon Exp $
 #
 
-DISTNAME=	alsa-plugins-1.0.22
+DISTNAME=	alsa-plugins-1.0.27
 PKGNAME=	${DISTNAME:S/plugins/plugins-oss/}
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/plugins/

audio/alsa-plugins-oss/distinfo

@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/02/16 18:26:24 wiz Exp $
+$NetBSD: distinfo,v 1.5 2014/06/09 12:42:58 ryoon Exp $
 
-SHA1 (alsa-plugins-1.0.22.tar.bz2) = e9bc0cba71a4b66f39d7af5f3638a5667fc76ff2
-RMD160 (alsa-plugins-1.0.22.tar.bz2) = d7540360fc06f531344f735339bd17cad98e140d
-Size (alsa-plugins-1.0.22.tar.bz2) = 326266 bytes
-SHA1 (patch-aa) = 77774e607905f3930ffec503c04d6dd1f70d9946
+SHA1 (alsa-plugins-1.0.27.tar.bz2) = a04da303d3f70005f6ce472bbab6ecac1072a558
+RMD160 (alsa-plugins-1.0.27.tar.bz2) = c13182f309370f4ed1ca46d894dcd43d61191611
+Size (alsa-plugins-1.0.27.tar.bz2) = 363593 bytes
+SHA1 (patch-aa) = ac2169b0a069bcf6ed60ca7ccd199ccd1988357f
 SHA1 (patch-ab) = 9cf0bda9f1928f46d0d5eac9464b790710ea2fda
 SHA1 (patch-ac) = 13da103ce3daad29d3c715f8f7d58dcd7bb9a72c

audio/alsa-plugins-oss/patches/patch-aa

@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2009/07/07 14:45:41 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2014/06/09 12:42:58 ryoon Exp $
 
---- configure.orig	2008-10-29 08:47:45.000000000 -0400
+--- configure.orig	2013-04-11 12:54:26.000000000 +0000
 +++ configure
-@@ -20252,7 +20252,7 @@ if test "${ac_cv_lib_asound_snd_pcm_iopl
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11718,7 +11718,7 @@ if ${ac_cv_lib_asound_snd_pcm_ioplug_cre
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lasound -ldl $LIBS"
 +LIBS="-lasound $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 

audio/alsa-plugins-pulse/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2013/11/25 12:00:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2015/02/21 23:35:38 ryoon Exp $
 #
 
-DISTNAME=	alsa-plugins-1.0.22
+DISTNAME=	alsa-plugins-1.0.27
 PKGNAME=	${DISTNAME:S/plugins/plugins-pulse/}
-PKGREVISION=	8
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/plugins/
 EXTRACT_SUFX=	.tar.bz2

audio/alsa-plugins-pulse/PLIST

@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/19 04:04:04 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/06/09 12:42:58 ryoon Exp $
 lib/alsa-lib/libasound_module_conf_pulse.la
 lib/alsa-lib/libasound_module_ctl_pulse.la
 lib/alsa-lib/libasound_module_pcm_pulse.la
+share/alsa/alsa.conf.d/50-pulseaudio.conf
+share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example

audio/alsa-plugins-pulse/distinfo

@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2010/02/16 18:30:12 wiz Exp $
+$NetBSD: distinfo,v 1.6 2014/06/09 12:42:58 ryoon Exp $
 
-SHA1 (alsa-plugins-1.0.22.tar.bz2) = e9bc0cba71a4b66f39d7af5f3638a5667fc76ff2
-RMD160 (alsa-plugins-1.0.22.tar.bz2) = d7540360fc06f531344f735339bd17cad98e140d
-Size (alsa-plugins-1.0.22.tar.bz2) = 326266 bytes
-SHA1 (patch-aa) = 77774e607905f3930ffec503c04d6dd1f70d9946
+SHA1 (alsa-plugins-1.0.27.tar.bz2) = a04da303d3f70005f6ce472bbab6ecac1072a558
+RMD160 (alsa-plugins-1.0.27.tar.bz2) = c13182f309370f4ed1ca46d894dcd43d61191611
+Size (alsa-plugins-1.0.27.tar.bz2) = 363593 bytes
+SHA1 (patch-aa) = ac2169b0a069bcf6ed60ca7ccd199ccd1988357f
 SHA1 (patch-ab) = fdcb834dbac03fc52ab482e722452243a6c859e9

audio/alsa-plugins-pulse/patches/patch-aa

@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2009/07/07 14:59:00 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2014/06/09 12:42:58 ryoon Exp $
 
---- configure.orig	2008-10-29 08:47:45.000000000 -0400
+--- configure.orig	2013-04-11 12:54:26.000000000 +0000
 +++ configure
-@@ -20252,7 +20252,7 @@ if test "${ac_cv_lib_asound_snd_pcm_iopl
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11718,7 +11718,7 @@ if ${ac_cv_lib_asound_snd_pcm_ioplug_cre
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lasound -ldl $LIBS"
 +LIBS="-lasound $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 

audio/alsa-utils/Makefile

@@ -1,21 +1,26 @@
-# $NetBSD: Makefile,v 1.10 2012/09/11 23:59:23 asau Exp $
+# $NetBSD: Makefile,v 1.14 2014/09/24 11:10:38 jperkin Exp $
 #
 
-DISTNAME=	alsa-utils-1.0.22
+DISTNAME=	alsa-utils-1.0.27.2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/utils/
+MASTER_SITES+=	ftp://gd.tuwien.ac.at/opsys/linux/alsa/utils/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	ftp://ftp.alsa-project.org/pub/utils/
-COMMENT=	Advanced Linux Sound Architecture (ALSA) utilities
+HOMEPAGE=	http://www.alsa-project.org/
+COMMENT=	Advanced Linux Sound Architecture (ALSA) CLI utilities
 
 GNU_CONFIGURE=		yes
-USE_TOOLS=		pkg-config gmake bash:run
+USE_TOOLS+=		pkg-config gmake gsed bash:run
 USE_PKGLOCALEDIR=	yes
 USE_NCURSES=		yes
 LDFLAGS.DragonFly=	-lm
 LDFLAGS.SunOS+=		-lm -lsocket -lnsl
+CPPFLAGS.NetBSD+=	-D__u32=uint32_t -D__u64=uint64_t
+CPPFLAGS.NetBSD+=	-Dbswap_16=bswap16 -Dbswap_32=bswap32
+
+CFLAGS+=		-g
 
 REPLACE_BASH=		alsaconf/alsaconf.in
 

audio/alsa-utils/PLIST

@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/06/09 12:34:26 ryoon Exp $
 bin/aconnect
+bin/alsaloop
 bin/alsamixer
+bin/alsaucm
 bin/amidi
 bin/amixer
 bin/aplay
@@ -14,6 +16,7 @@ bin/speaker-test
 man/fr/man8/alsaconf.8
 man/man1/aconnect.1
 man/man1/alsactl.1
+man/man1/alsaloop.1
 man/man1/alsamixer.1
 man/man1/amidi.1
 man/man1/amixer.1
@@ -30,6 +33,7 @@ man/man8/alsaconf.8
 sbin/alsaconf
 sbin/alsactl
 share/alsa/init/00main
+share/alsa/init/ca0106
 share/alsa/init/default
 share/alsa/init/hda
 share/alsa/init/help

audio/alsa-utils/distinfo

@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.5 2012/02/15 19:46:30 hans Exp $
+$NetBSD: distinfo,v 1.8 2014/09/24 11:10:38 jperkin Exp $
 
-SHA1 (alsa-utils-1.0.22.tar.bz2) = 3587dc19d9a60ab9bb2bfe2d23491230eae99fe1
-RMD160 (alsa-utils-1.0.22.tar.bz2) = f9f9c3cc81e9c0d97fd62c3f91424a8f117ca6c3
-Size (alsa-utils-1.0.22.tar.bz2) = 1075216 bytes
-SHA1 (patch-aa) = d44e1fb7a27a8002425c90ce00e5f5970e1a1265
-SHA1 (patch-ab) = b87bac423c243e7c0dabf1e99cd16ae10f637c31
-SHA1 (patch-ac) = 5f13043e6f7864bb88b13f0123ce8114995db8be
-SHA1 (patch-ad) = 1bbc726d59c2aa6b3361a6687c4770e6ffe86660
+SHA1 (alsa-utils-1.0.27.2.tar.bz2) = dfec4691dde6b2cee292bbd10f0f368158713e8f
+RMD160 (alsa-utils-1.0.27.2.tar.bz2) = 05432f3f795a43a42d43e7589235060eb83298f6
+Size (alsa-utils-1.0.27.2.tar.bz2) = 1143802 bytes
+SHA1 (patch-aa) = 78087e7a7fe860e002d592b0c7b83e98b10ea2c3
+SHA1 (patch-ab) = 6bbdb3c16e49b6fba05120c243292c9ef51ebca4
+SHA1 (patch-ac) = 19f9570bedfb00068aad244033eb6e6436a6546d
+SHA1 (patch-ad) = 4da5adfbd3fcc0611c6394bf00f2b684e735dbd2
+SHA1 (patch-alsaloop_alsaloop.c) = 469b00a0ffa7ab3bca752bd61e458026100628fe
+SHA1 (patch-alsaloop_pcmjob.c) = ae340dde8532d3a1253d4ff38782f17fbf2d381e
+SHA1 (patch-alsamixer_volume__mapping.c) = a543c74ba4f3f3b3cc7768623fbca760b06a7872

audio/alsa-utils/patches/patch-aa

@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2010/02/16 18:28:01 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2014/06/09 12:34:26 ryoon Exp $
 
---- configure.orig	2008-10-29 08:48:06.000000000 -0400
+--- configure.orig	2013-07-10 07:29:37.000000000 +0000
 +++ configure
-@@ -6430,7 +6430,7 @@ if test "$alsa_prefix" != "" ; then
+@@ -7112,7 +7112,7 @@ if test "$alsa_prefix" != "" ; then
  	LDFLAGS="$LDFLAGS $ALSA_LIBS"
  fi
  
 -ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
 +ALSA_LIBS="$(pkg-config --libs alsa)"
  LIBS="$ALSA_LIBS $LIBS"
- { echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5
- echo "${ECHO_T}$ALSA_LIBS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5
+ $as_echo "$ALSA_LIBS" >&6; }

audio/alsa-utils/patches/patch-ab

@@ -1,21 +1,21 @@
-$NetBSD: patch-ab,v 1.3 2012/02/15 19:46:31 hans Exp $
+$NetBSD: patch-ab,v 1.5 2014/09/24 11:10:38 jperkin Exp $
 
---- aplay/aplay.c.orig	2008-12-18 22:21:06.000000000 -0500
+--- aplay/aplay.c.orig	2013-07-09 15:28:37.000000000 +0000
 +++ aplay/aplay.c
-@@ -45,7 +45,11 @@
- #include <sys/uio.h>
+@@ -48,7 +48,11 @@
  #include <sys/time.h>
- #include <sys/signal.h>
-+#if defined(__NetBSD__) || defined(__DragonFly__)
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#if defined(__linux__)
+ #include <endian.h>
++#elif !defined(__sun)
 +#include <sys/endian.h>
-+#else
- #include <asm/byteorder.h>
 +#endif
  #include "aconfig.h"
  #include "gettext.h"
  #include "formats.h"
-@@ -55,6 +59,22 @@
- #define LLONG_MAX    9223372036854775807LL
+@@ -70,6 +74,22 @@
+ #define be32toh(x) __be32_to_cpu(x)
  #endif
  
 +#if defined(__NetBSD__) || defined(__DragonFly__)

audio/alsa-utils/patches/patch-ac

@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2012/02/15 19:46:31 hans Exp $
+$NetBSD: patch-ac,v 1.4 2014/09/24 11:10:38 jperkin Exp $
 
---- aplay/formats.h.orig	2008-12-18 22:21:49.000000000 -0500
+--- aplay/formats.h.orig	2013-07-09 15:28:37.000000000 +0000
 +++ aplay/formats.h
 @@ -1,8 +1,20 @@
  #ifndef FORMATS_H

audio/alsa-utils/patches/patch-ad

@@ -1,15 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2012/02/15 19:46:31 hans Exp $
+$NetBSD: patch-ad,v 1.6 2014/06/09 12:34:26 ryoon Exp $
 
---- speaker-test/speaker-test.c.orig	2009-12-16 15:18:52.000000000 +0000
+--- speaker-test/speaker-test.c.orig	2013-07-09 15:28:37.000000000 +0000
 +++ speaker-test/speaker-test.c
-@@ -44,7 +44,18 @@
+@@ -44,7 +44,16 @@
  #include <getopt.h>
  #include <inttypes.h>
  #include <ctype.h>
 +#if defined(__NetBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
-+#define bswap_16 bswap16
-+#define bswap_32 bswap32
 +#define ESTRPIPE EPIPE
 +#elif defined(__sun)
 +#include <sys/byteorder.h>
@@ -18,6 +16,6 @@ $NetBSD: patch-ad,v 1.5 2012/02/15 19:46:31 hans Exp $
 +#else
  #include <byteswap.h>
 +#endif
+ #include <signal.h>
  
  #define ALSA_PCM_NEW_HW_PARAMS_API
- #define ALSA_PCM_NEW_SW_PARAMS_API

audio/alsa-utils/patches/patch-alsaloop_alsaloop.c

@@ -0,0 +1,32 @@
+$NetBSD: patch-alsaloop_alsaloop.c,v 1.2 2014/06/11 14:45:09 ryoon Exp $
+
+--- alsaloop/alsaloop.c.orig	2013-07-09 15:28:37.000000000 +0000
++++ alsaloop/alsaloop.c
+@@ -24,6 +24,16 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sched.h>
++/* For ERESTART */
++#if defined(__NetBSD__)
++#include <sys/param.h>
++/* NetBSD 6 does not have _KMEMUSER. And _KERNEL breaks build of alsa-utils. */
++#if __NetBSD_Version__ < 699000000
++#define ERESTART	-3
++#else
++#define _KMEMUSER	1
++#endif
++#endif
+ #include <errno.h>
+ #include <getopt.h>
+ #include <alsa/asoundlib.h>
+@@ -34,6 +44,10 @@
+ #include <sys/signal.h>
+ #include "alsaloop.h"
+ 
++#if !defined(ESTRPIPE)
++#define ESTRPIPE	EPIPE
++#endif
++
+ struct loopback_thread {
+ 	int threaded;
+ 	pthread_t thread;

audio/alsa-utils/patches/patch-alsaloop_pcmjob.c

@@ -0,0 +1,38 @@
+$NetBSD: patch-alsaloop_pcmjob.c,v 1.1 2014/06/09 12:34:26 ryoon Exp $
+
+--- alsaloop/pcmjob.c.orig	2013-07-09 15:28:37.000000000 +0000
++++ alsaloop/pcmjob.c
+@@ -25,6 +25,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sched.h>
++/* For ERESTART */
++#if defined(__NetBSD__)
++#define _KMEMUSER	1
++#endif
+ #include <errno.h>
+ #include <getopt.h>
+ #include <alsa/asoundlib.h>
+@@ -34,6 +38,10 @@
+ #include <pthread.h>
+ #include "alsaloop.h"
+ 
++#if !defined(ESTRPIPE)
++#define ESTRPIPE	EPIPE
++#endif
++
+ #define XRUN_PROFILE_UNKNOWN (-10000000)
+ 
+ static int set_rate_shift(struct loopback_handle *lhandle, double pitch);
+@@ -63,7 +71,11 @@ static const char *src_types[] = {
+ #endif
+ 
+ static pthread_mutex_t pcm_open_mutex =
++#if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+                                 PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++#else
++				PTHREAD_MUTEX_INITIALIZER;
++#endif
+ 
+ static inline void pcm_open_lock(void)
+ {

audio/alsa-utils/patches/patch-alsamixer_volume__mapping.c

@@ -0,0 +1,19 @@
+$NetBSD: patch-alsamixer_volume__mapping.c,v 1.2 2014/09/24 11:10:38 jperkin Exp $
+
+* NetBSD and SunOS have no exp10()
+
+--- alsamixer/volume_mapping.c.orig	2013-07-09 15:28:37.000000000 +0000
++++ alsamixer/volume_mapping.c
+@@ -37,10 +37,10 @@
+ #include <stdbool.h>
+ #include "volume_mapping.h"
+ 
+-#ifdef __UCLIBC__
++#if defined(__UCLIBC__) || defined(__NetBSD__) || defined(__sun)
+ /* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
+ #define exp10(x) (exp((x) * log(10)))
+-#endif /* __UCLIBC__ */
++#endif /* __UCLIBC__ || __NetBSD__ || __sun */
+ 
+ #define MAX_LINEAR_DB_SCALE	24
+ 

audio/amaroc/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2014/01/25 10:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2014/05/17 16:10:41 wiz Exp $
 #
 
 DISTNAME=		amaroc-0.3
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amaroc/}
 EXTRACT_SUFX=		.tar.bz2

audio/amarok-kde3/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2014/02/12 23:17:32 tron Exp $
+# $NetBSD: Makefile,v 1.60 2015/02/19 22:22:36 joerg Exp $
 
 DISTNAME=		amarok-${VERSION}
 VERSION=		1.4.10
-PKGREVISION=		46
+PKGREVISION=		56
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,6 +12,9 @@ HOMEPAGE=		http://amarok.kde.org/
 COMMENT=		KDE3 audio player
 LICENSE=		gnu-gpl-v2
 
+# Race conditions involving uic output
+MAKE_JOBS_SAFE=		no
+
 USE_TOOLS+=		gmake pkg-config msgfmt unzip:run
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes

audio/amarok-kde3/distinfo

@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2012/07/03 18:21:47 joerg Exp $
+$NetBSD: distinfo,v 1.5 2015/02/19 22:22:36 joerg Exp $
 
 SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd
 RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62
 Size (amarok-1.4.10.tar.bz2) = 12812583 bytes
 SHA1 (patch-aa) = 53316f334f45a8a4780ae71061d528374a75cb5a
-SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf
+SHA1 (patch-ab) = 67be999b647669bd7f80506f31a820c32c3c45df
 SHA1 (patch-ac) = ea6900aafc3cd99069ac59929ae14296662d095f
 SHA1 (patch-ad) = eea8105897ce4cd9d4a086430ec0588125b3517b
 SHA1 (patch-ae) = ceeccf0eaa9091bd2422354abdf98c34f8a9802b

audio/amarok-kde3/patches/patch-ab

@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/02/16 08:59:13 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2015/02/19 22:22:36 joerg Exp $
 
---- configure.orig	2007-06-17 19:52:02.000000000 +0000
+--- configure.orig	2008-08-13 21:22:07.000000000 +0000
 +++ configure
-@@ -37060,7 +37060,7 @@ if test "${ac_cv_lib_tunepimp_tr_GetPUID
+@@ -37268,7 +37268,7 @@ if test "${ac_cv_lib_tunepimp_tr_GetPUID
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +11,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/02/16 08:59:13 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37579,7 +37579,7 @@ if test "${ac_cv_lib_konqsidebarplugin__
+@@ -37781,13 +37781,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     { echo "$as_me:$LINENO: checking for _init in -lkonqsidebarplugin" >&5
+-echo $ECHO_N "checking for _init in -lkonqsidebarplugin... $ECHO_C" >&6; }
++     { echo "$as_me:$LINENO: checking for _ZN17KonqSidebarPluginD0Ev in -lkonqsidebarplugin" >&5
++echo $ECHO_N "checking for _ZN17KonqSidebarPluginD0Ev in -lkonqsidebarplugin... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_konqsidebarplugin__init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -20,3 +28,17 @@ $NetBSD: patch-ab,v 1.1.1.1 2010/02/16 08:59:13 wiz Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
+@@ -37801,11 +37801,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char _init ();
++char _ZN17KonqSidebarPluginD0Ev();
+ int
+ main ()
+ {
+-return _init ();
++return _ZN17KonqSidebarPluginD0Ev ();
+   ;
+   return 0;
+ }

audio/amarok/Makefile

@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.141 2014/02/12 23:17:32 tron Exp $
-#
+# $NetBSD: Makefile,v 1.151 2014/11/30 02:00:16 markd Exp $
 
 DISTNAME=	amarok-${VERS}
 VERS=		2.8.0
-PKGREVISION=	3
+PKGREVISION=	12
 CATEGORIES=	audio multimedia
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/
 EXTRACT_SUFX=	.tar.bz2
@@ -24,6 +23,8 @@ CMAKE_ARGS+=	-DMYSQL_EMBEDDED_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-server}/li
 CMAKE_ARGS+=	-DMYSQL_EMBEDDED_FOUND:BOOL=TRUE
 CMAKE_ARGS+=	-DHAVE_MYSQL_OPT_EMBEDDED_CONNECTION:BOOL=TRUE
 CMAKE_ARGS+=	-DMYSQL_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-client}/lib/mysql/libmysqlclient.so
+CMAKE_ARGS+=	-DWITH_NepomukCore:BOOL=OFF
+CMAKE_ARGS+=	-DWITH_Soprano:BOOL=OFF
 CMAKE_ARGS+=	-DKDE4_BUILD_TESTS:BOOL=OFF
 
 REPLACE_PERL+=	src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
@@ -61,8 +62,8 @@ BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.6nb1
 .include "../../devel/qtscriptgenerator/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../meta-pkgs/kde4/kde4.mk"
-.include "../../misc/nepomuk-core/buildlink3.mk"
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+#.include "../../misc/nepomuk-core/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
 .include "../../multimedia/libkcompactdisc/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

audio/amarok/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2014/02/01 02:22:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.45 2014/11/14 09:10:37 markd Exp $
 bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
@@ -11,7 +11,6 @@ lib/kde4/amarok_collection-ipodcollection.so
 lib/kde4/amarok_collection-mtpcollection.so
 lib/kde4/amarok_collection-mysqlecollection.so
 lib/kde4/amarok_collection-mysqlservercollection.so
-lib/kde4/amarok_collection-nepomukcollection.so
 lib/kde4/amarok_collection-playdarcollection.so
 lib/kde4/amarok_collection-umscollection.so
 lib/kde4/amarok_collection-upnpcollection.so
@@ -56,7 +55,7 @@ lib/libamaroklib.so.1
 lib/libamaroklib.so.1.0.0
 lib/libamarokocsclient.so
 lib/libamarokocsclient.so.4
-lib/libamarokocsclient.so.4.11.5
+lib/libamarokocsclient.so.4.14.3
 lib/libamarokpud.so
 lib/libamarokpud.so.1
 lib/libamarokpud.so.1.0.0
@@ -1026,7 +1025,6 @@ share/kde4/services/amarok_collection-ipodcollection.desktop
 share/kde4/services/amarok_collection-mtpcollection.desktop
 share/kde4/services/amarok_collection-mysqlecollection.desktop
 share/kde4/services/amarok_collection-mysqlservercollection.desktop
-share/kde4/services/amarok_collection-nepomukcollection.desktop
 share/kde4/services/amarok_collection-playdarcollection.desktop
 share/kde4/services/amarok_collection-umscollection.desktop
 share/kde4/services/amarok_collection-upnpcollection.desktop

audio/amp/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/09/11 23:59:24 asau Exp $
+# $NetBSD: Makefile,v 1.24 2014/10/09 14:05:55 wiz Exp $
 #
 
 DISTNAME=	amp-0.7.6
@@ -15,8 +15,6 @@ NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 
 NOT_FOR_PLATFORM=	Interix-*-*
 
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 GNU_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1

audio/ampache/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/03/16 07:21:18 obache Exp $
+# $NetBSD: Makefile,v 1.11 2014/04/19 01:14:41 asau Exp $
 #
 
 DISTNAME=	ampache-3.5.3
@@ -47,7 +47,7 @@ post-extract:
 do-install:
 	${CHMOD} -x ${WRKSRC}/docs/[A-Z]*
 	${INSTALL_DATA} ${WRKSRC}/ampache.conf ${DESTDIR}${EGDIR}/ampache.conf
-	set -e; cd ${WRKSRC} && pax -rw -pe . ${DESTDIR}${INSTDIR}
+	set -e; cd ${WRKSRC} && pax -rw -pp . ${DESTDIR}${INSTDIR}
 	${RM} -f ${DESTDIR}${INSTDIR}/ampache.conf
 	${FIND} ${DESTDIR}${INSTDIR} -name '*.orig' | ${XARGS} ${RM} -f
 

audio/ario/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2014/02/12 23:17:32 tron Exp $
+# $NetBSD: Makefile,v 1.47 2014/10/07 16:47:17 adam Exp $
 #
 
 DISTNAME=	ario-1.5.1
-PKGREVISION=	28
+PKGREVISION=	31
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ario-player/1.5.1/}
 

audio/arts/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2013/05/31 12:39:35 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2014/05/29 23:35:14 wiz Exp $
 
 DISTNAME=	arts-1.5.10
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	audio
 HOMEPAGE=	http://multimedia.kde.org/
 COMMENT=	Analog Real-Time Synthesizer

audio/asunder/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2014/02/04 11:36:44 obache Exp $
+# $NetBSD: Makefile,v 1.3 2014/10/20 12:14:13 mef Exp $
 
-DISTNAME=	asunder-2.4
+DISTNAME=	asunder-2.5
 CATEGORIES=	audio
 MASTER_SITES=	http://littlesvr.ca/asunder/releases/
 EXTRACT_SUFX=	.tar.bz2

audio/asunder/distinfo

@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.1 2014/02/04 11:36:44 obache Exp $
+$NetBSD: distinfo,v 1.2 2014/10/20 12:14:13 mef Exp $
 
-SHA1 (asunder-2.4.tar.bz2) = f6b23e08891d753fe859573e805c3045d89357d3
-RMD160 (asunder-2.4.tar.bz2) = 515dcc9e2ac79611780516923072aa73c59aa1cf
-Size (asunder-2.4.tar.bz2) = 223890 bytes
-SHA1 (patch-src_main.c) = 6da17bc7775788c297ef1ae5921afc423dac8f54
-SHA1 (patch-src_wrappers.c) = 7422ef3af92eb1d809f3beea66c983982008f647
+SHA1 (asunder-2.5.tar.bz2) = 54dc8bd2e7ae0374336f932a2024307aa05e53c3
+RMD160 (asunder-2.5.tar.bz2) = 707749b025e10db8d78a7cb3af56d10b0ed5a573
+Size (asunder-2.5.tar.bz2) = 226657 bytes

audio/asunder/patches/patch-src_main.c

@@ -1,116 +0,0 @@
-$NetBSD: patch-src_main.c,v 1.1 2014/02/04 11:36:44 obache Exp $
-
-insert NetBSD specific cd code
-
---- src/main.c.orig	2013-12-27 00:51:30.000000000 +0000
-+++ src/main.c
-@@ -28,7 +28,7 @@ Foundation; version 2 of the licence.
- #include <stdbool.h>
- #include <signal.h>
- 
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-     #include <sys/cdio.h>
- #elif defined(__linux__)
-     #include <linux/cdrom.h>
-@@ -192,7 +192,7 @@ bool check_disc(char * cdrom)
-     bool ret = false;
-     int status;
-     
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-     struct ioc_read_subchannel cdsc;
-     struct cd_sub_channel_info data;
- #endif
-@@ -229,7 +229,7 @@ bool check_disc(char * cdrom)
-     static bool alreadyKnowGood = false; /* check when program just started */
-     static bool alreadyCleared = true; /* no need to clear when program just started */
-     
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-     bzero(&cdsc, sizeof(cdsc));
-     cdsc.data = &data;
-     cdsc.data_len = sizeof(data);
-@@ -356,7 +356,7 @@ void eject_disc(char * cdrom)
-     //~ {
-         //~ ioctl(fd, CDROMCLOSETRAY, CDSL_CURRENT);
-     //~ } else {
--#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
-             ioctl(fd, CDIOCALLOW);
-             ioctl(fd, CDIOCEJECT);
- #elif defined(__linux__)
-@@ -479,6 +479,12 @@ cddb_disc_t * read_disc(char * cdrom)
-     struct ioc_read_toc_single_entry te;
-     struct ioc_read_subchannel cdsc;
-     struct cd_sub_channel_info data;
-+#elif defined(__NetBSD__)
-+    struct ioc_toc_header th;
-+    struct ioc_read_toc_entry te;
-+    struct cd_toc_entry toc ;
-+    struct ioc_read_subchannel cdsc;
-+    struct cd_sub_channel_info data;
- #elif defined(__linux__)
-     struct cdrom_tochdr th;
-     struct cdrom_tocentry te;
-@@ -549,6 +555,60 @@ cddb_disc_t * read_disc(char * cdrom)
-             }
-         }
-     }
-+#elif defined(__NetBSD__)
-+    // read disc status info
-+    bzero(&cdsc,sizeof(cdsc));
-+    cdsc.data = &data;
-+    cdsc.data_len = sizeof(data);
-+    cdsc.data_format = CD_CURRENT_POSITION;
-+    cdsc.address_format = CD_MSF_FORMAT;
-+    status = ioctl(fd, CDIOCREADSUBCHANNEL, (char *)&cdsc);
-+    if (status >= 0)
-+    {
-+        // see if we can read the disc's table of contents (TOC).
-+        if (ioctl(fd, CDIOREADTOCHEADER, &th) == 0)
-+        {
-+            debugLog("starting track: %d\n", th.starting_track);
-+            debugLog("ending track: %d\n", th.ending_track);
-+            
-+            disc = cddb_disc_new();
-+            if (disc == NULL)
-+                fatalError("cddb_disc_new() failed. Out of memory?");
-+            
-+            te.address_format = CD_LBA_FORMAT;
-+            te.data = &toc ;
-+            te.data_len=sizeof(struct cd_toc_entry) ;
-+            for (i=th.starting_track; i<=th.ending_track; i++)
-+            {
-+                te.starting_track = i;
-+                if ((ioctl(fd, CDIOREADTOCENTRIES, &te)) == 0)
-+                {
-+                    if (te.data->control & 0x04)
-+                    {
-+                        // track is a DATA track. make sure its "rip" box is not checked by default
-+                        track_format[i] = FALSE;
-+                    } else {
-+                        track_format[i] = TRUE;
-+                    }
-+
-+                    track = cddb_track_new();
-+                    if (track == NULL)
-+                        fatalError("cddb_track_new() failed. Out of memory?");
-+                    
-+                    cddb_track_set_frame_offset(track, te.data->addr.lba+SECONDS_TO_FRAMES(2));
-+                    snprintf(trackname, 9, "Track %d", i);
-+                    cddb_track_set_title(track, trackname);
-+                    cddb_track_set_artist(track, "Unknown Artist");
-+                    cddb_disc_add_track(disc, track);
-+                }
-+            }
-+            te.starting_track = 0xAA;
-+            if (ioctl(fd, CDIOREADTOCENTRIES, &te) == 0)
-+             {
-+                cddb_disc_set_length(disc, (te.data->addr.lba+SECONDS_TO_FRAMES(2))/SECONDS_TO_FRAMES(1));
-+            }
-+        }
-+    }
- #elif defined(__linux__)
-     // read disc status info
-     status = ioctl(fd, CDROM_DISC_STATUS, CDSL_CURRENT);

audio/asunder/patches/patch-src_wrappers.c

@@ -1,17 +0,0 @@
-$NetBSD: patch-src_wrappers.c,v 1.1 2014/02/04 11:36:44 obache Exp $
-
-skip missing WIFCONTINUED
-
---- src/wrappers.c.orig	2013-12-18 16:17:29.000000000 +0000
-+++ src/wrappers.c
-@@ -135,8 +135,10 @@ void sigchld(int signum)
-         debugLog("killed by signal %d\n", WTERMSIG(status));
-     else if (WIFSTOPPED(status))
-         debugLog("stopped by signal %d\n", WSTOPSIG(status));
-+#if defined(WIFCONTINUED)
-     else if (WIFCONTINUED(status))
-         debugLog("continued\n");
-+#endif
- 
-     if (status != 0)
-     {

audio/aubio/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/01/25 10:45:16 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/05/09 07:36:53 wiz Exp $
 
 DISTNAME=	aubio-0.3.2
 PKGREVISION=	2
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+=	aubio.pc.in
 # Python related variables:
 PY_PATCHPLIST=			yes
 REPLACE_PYTHON=	python/aubiocut python/aubiopitch
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.3.2
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.3.2
 
 .include "options.mk"
 

audio/audacious-plugins/Makefile

@@ -1,20 +1,27 @@
-# $NetBSD: Makefile,v 1.52 2014/02/12 23:17:32 tron Exp $
-#
+# $NetBSD: Makefile,v 1.61 2015/02/21 23:35:38 ryoon Exp $
 
-DISTNAME=		audacious-plugins-1.5.1
-PKGREVISION=		41
-CATEGORIES=		audio
-MASTER_SITES=		http://distfiles.atheme.org/
-EXTRACT_SUFX=		.tgz
+DISTNAME=	audacious-plugins-3.5.2
+PKGREVISION=	2
+CATEGORIES=	audio
+MASTER_SITES=	http://distfiles.audacious-media-player.org/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		jfranz@bsdprojects.net
-HOMEPAGE=		http://audacious-media-player.org/
-COMMENT=		Plugins for Audacious media player
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://audacious-media-player.org/
+COMMENT=	Plugins for Audacious media player
+LICENSE=	2-clause-bsd
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake intltool pkg-config msgfmt
-USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake intltool pkg-config msgfmt
+GNU_CONFIGURE=		yes
+#CONFIGURE_ARGS+=	--disable-aac
+CONFIGURE_ARGS+=	--disable-amidiplug
+CONFIGURE_ARGS+=	--disable-evdevplug
+#CONFIGURE_ARGS+=	--disable-coreaudio
+CONFIGURE_ARGS+=	--disable-gnomeshortcuts
+CONFIGURE_ARGS+=	--disable-modplug
+CONFIGURE_ARGS+=	--disable-projectm
+CONFIGURE_ARGS+=	--with-ffmpeg=none
 
 .include "../../mk/compiler.mk"
 .if empty(PKGSRC_COMPILER:Mclang)
@@ -39,10 +46,6 @@ LDFLAGS+=		${LIBOSSAUDIO}
 # do not use pkgsrc' flac if it is installed
 CFLAGS+=	-I. -I../flacng -Ilibflacng
 
-CONFIGURE_ARGS+=	--disable-amidiplug --disable-evdevplug \
-			--disable-coreaudio --disable-projectm \
-			--disable-gnomeshortcuts
-
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
@@ -74,23 +77,23 @@ PLIST.oss=	yes
 .endif
 
 .include "../../audio/audacious/buildlink3.mk"
+.include "../../audio/faad2/buildlink3.mk"
+.include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libmpcdec/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/mpg123/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/wavpack/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../devel/libbinio/buildlink3.mk"
-.include "../../devel/libmtp/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/libbinio/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../misc/libcdio/buildlink3.mk"
+.include "../../misc/libcdio-paranoia/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../net/libmms/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
-.include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

audio/audacious-plugins/PLIST

@@ -1,104 +1,218 @@
-@comment $NetBSD: PLIST,v 1.8 2011/04/21 15:03:52 hans Exp $
+@comment $NetBSD: PLIST,v 1.12 2014/11/21 22:14:33 joerg Exp $
+lib/audacious/Container/asx.so
+lib/audacious/Container/asx3.so
+lib/audacious/Container/audpl.so
 lib/audacious/Container/m3u.so
 lib/audacious/Container/pls.so
 lib/audacious/Container/xspf.so
-lib/audacious/Effect/audiocompress.so
+lib/audacious/Effect/compressor.so
+lib/audacious/Effect/crossfade.so
 lib/audacious/Effect/crystalizer.so
 lib/audacious/Effect/echo.so
 lib/audacious/Effect/ladspa.so
-lib/audacious/Effect/sndstretch.so
+lib/audacious/Effect/mixer.so
+lib/audacious/Effect/resample.so
+lib/audacious/Effect/speed-pitch.so
 lib/audacious/Effect/stereo.so
 lib/audacious/Effect/voice_removal.so
 lib/audacious/General/alarm.so
+lib/audacious/General/albumart.so
 lib/audacious/General/aosd.so
+lib/audacious/General/cd-menu-items.so
+lib/audacious/General/delete-files.so
+lib/audacious/General/gtkui.so
 lib/audacious/General/hotkey.so
-lib/audacious/General/mtp_up.so
+lib/audacious/General/lyricwiki.so
 lib/audacious/General/scrobbler.so
+lib/audacious/General/search-tool.so
+lib/audacious/General/skins.so
 lib/audacious/General/song_change.so
 lib/audacious/General/statusicon.so
+lib/audacious/Input/aac-raw.so
 lib/audacious/Input/aac.so
 lib/audacious/Input/adplug.so
-lib/audacious/Input/alac.so
 lib/audacious/Input/cdaudio-ng.so
 lib/audacious/Input/console.so
-lib/audacious/Input/cuesheet.so
-lib/audacious/Input/demac.so
 lib/audacious/Input/flacng.so
-${PLIST.midi}lib/audacious/Input/timidity.so
 lib/audacious/Input/madplug.so
 lib/audacious/Input/metronom.so
-lib/audacious/Input/modplug.so
-lib/audacious/Input/musepack.so
-lib/audacious/Input/sexypsf.so
-${PLIST.sid}lib/audacious/Input/sid.so
+lib/audacious/Input/psf2.so
 lib/audacious/Input/sndfile.so
 lib/audacious/Input/tonegen.so
-lib/audacious/Input/tta.so
 lib/audacious/Input/vorbis.so
 lib/audacious/Input/vtx.so
 lib/audacious/Input/wavpack.so
-lib/audacious/Input/wma.so
-${PLIST.esd}lib/audacious/Output/ESD.so
-${PLIST.oss}lib/audacious/Output/OSS.so
 ${PLIST.oss4}lib/audacious/Output/OSS4.so
+lib/audacious/Input/xsf.so
 lib/audacious/Output/filewriter.so
-${PLIST.jack}lib/audacious/Output/libjackout.so
+${PLIST.jack}lib/audacious/Output/jackout.so
 ${PLIST.pulse}lib/audacious/Output/pulse_audio.so
-lib/audacious/Output/null.so
-${PLIST.sun}lib/audacious/Output/sun.so
-lib/audacious/Transport/lastfm.so
+lib/audacious/Output/sdlout.so
+lib/audacious/Transport/gio.so
 lib/audacious/Transport/mms.so
 lib/audacious/Transport/neon.so
-lib/audacious/Transport/stdio.so
 lib/audacious/Visualization/blur_scope.so
-lib/audacious/Visualization/paranormal.so
-lib/audacious/Visualization/rocklight.so
-lib/audacious/Visualization/rootvis.so
-lib/audacious/Visualization/spectrum.so
-share/audacious/images/audioscrobbler.png
-share/audacious/images/audioscrobbler_badge.png
-share/audacious/paranormal/Presets/aerdan_-_bloody_vortex.pnv
-share/audacious/paranormal/Presets/aerdan_-_cloudscape.pnv
-share/audacious/paranormal/Presets/aerdan_-_cloudscape2.pnv
-share/audacious/paranormal/Presets/aerdan_-_dancing_snow.pnv
-share/audacious/paranormal/Presets/aerdan_-_portal_to_hell.pnv
-share/audacious/paranormal/Presets/aerdan_-_telestatic.pnv
-share/audacious/paranormal/Presets/nazca_-_smoke_on_the_water.pnv
-share/audacious/paranormal/Presets/nenolod_-_3d_wave.pnv
-share/audacious/paranormal/Presets/nenolod_-_aquamarine_dream.pnv
-share/audacious/paranormal/Presets/nenolod_-_beatscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_branchscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_bumblebees.pnv
-share/audacious/paranormal/Presets/nenolod_-_cubism.pnv
-share/audacious/paranormal/Presets/nenolod_-_flying_into_pastels.pnv
-share/audacious/paranormal/Presets/nenolod_-_interlaced.pnv
-share/audacious/paranormal/Presets/nenolod_-_kaliedoscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_phosphor_flame.pnv
-share/audacious/paranormal/Presets/nenolod_-_psuedo_starfield.pnv
-share/audacious/paranormal/Presets/nenolod_-_purple_flower.pnv
-share/audacious/paranormal/Presets/nenolod_-_quakingscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_quasar.pnv
-share/audacious/paranormal/Presets/nenolod_-_retroscope.pnv
-share/audacious/paranormal/Presets/nenolod_-_rush.pnv
-share/audacious/paranormal/Presets/nenolod_-_scopefun.pnv
-share/audacious/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv
-share/audacious/paranormal/Presets/nenolod_-_smoke.pnv
-share/audacious/paranormal/Presets/nenolod_-_swarm.pnv
-share/audacious/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv
-share/audacious/paranormal/Presets/nenolod_-_transform_fun.pnv
-share/audacious/paranormal/Presets/nenolod_-_trapped.pnv
-share/audacious/paranormal/Presets/nenolod_-_tunnel_vision.pnv
-share/audacious/paranormal/Presets/nenolod_-_value_replace_fun.pnv
-share/audacious/paranormal/Presets/nenolod_-_worms.pnv
-share/audacious/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
+lib/audacious/Visualization/cairo-spectrum.so
+lib/audacious/Visualization/gl-spectrum.so
+share/audacious/Skins/Classic/balance.png
+share/audacious/Skins/Classic/cbuttons.png
+share/audacious/Skins/Classic/eq_ex.png
+share/audacious/Skins/Classic/eqmain.png
+share/audacious/Skins/Classic/main.png
+share/audacious/Skins/Classic/monoster.png
+share/audacious/Skins/Classic/nums_ex.png
+share/audacious/Skins/Classic/playpaus.png
+share/audacious/Skins/Classic/pledit.png
+share/audacious/Skins/Classic/pledit.txt
+share/audacious/Skins/Classic/posbar.png
+share/audacious/Skins/Classic/shufrep.png
+share/audacious/Skins/Classic/skin-classic.hints
+share/audacious/Skins/Classic/skin.hints
+share/audacious/Skins/Classic/text.png
+share/audacious/Skins/Classic/titlebar.png
+share/audacious/Skins/Classic/viscolor.txt
+share/audacious/Skins/Classic/volume.png
+share/audacious/Skins/Classic1.3/balance.png
+share/audacious/Skins/Classic1.3/cbuttons.png
+share/audacious/Skins/Classic1.3/eq_ex.png
+share/audacious/Skins/Classic1.3/eqmain.png
+share/audacious/Skins/Classic1.3/main.png
+share/audacious/Skins/Classic1.3/monoster.png
+share/audacious/Skins/Classic1.3/nums_ex.png
+share/audacious/Skins/Classic1.3/playpaus.png
+share/audacious/Skins/Classic1.3/pledit.png
+share/audacious/Skins/Classic1.3/pledit.txt
+share/audacious/Skins/Classic1.3/posbar.png
+share/audacious/Skins/Classic1.3/shufrep.png
+share/audacious/Skins/Classic1.3/skin-classic.hints
+share/audacious/Skins/Classic1.3/skin.hints
+share/audacious/Skins/Classic1.3/text.png
+share/audacious/Skins/Classic1.3/titlebar.png
+share/audacious/Skins/Classic1.3/viscolor.txt
+share/audacious/Skins/Classic1.3/volume.png
+share/audacious/Skins/Default/cbuttons.png
+share/audacious/Skins/Default/eq_ex.png
+share/audacious/Skins/Default/eqmain.png
+share/audacious/Skins/Default/main.png
+share/audacious/Skins/Default/monoster.png
+share/audacious/Skins/Default/nums_ex.png
+share/audacious/Skins/Default/playpaus.png
+share/audacious/Skins/Default/pledit.png
+share/audacious/Skins/Default/pledit.txt
+share/audacious/Skins/Default/posbar.png
+share/audacious/Skins/Default/shufrep.png
+share/audacious/Skins/Default/skin.hints
+share/audacious/Skins/Default/text.png
+share/audacious/Skins/Default/titlebar.png
+share/audacious/Skins/Default/viscolor.txt
+share/audacious/Skins/Default/volume.png
+share/audacious/Skins/Ivory/balance.png
+share/audacious/Skins/Ivory/cbuttons.png
+share/audacious/Skins/Ivory/eq_ex.png
+share/audacious/Skins/Ivory/eqmain.png
+share/audacious/Skins/Ivory/main.png
+share/audacious/Skins/Ivory/monoster.png
+share/audacious/Skins/Ivory/nums_ex.png
+share/audacious/Skins/Ivory/playpaus.png
+share/audacious/Skins/Ivory/pledit.png
+share/audacious/Skins/Ivory/pledit.txt
+share/audacious/Skins/Ivory/posbar.png
+share/audacious/Skins/Ivory/shufrep.png
+share/audacious/Skins/Ivory/skin.hints
+share/audacious/Skins/Ivory/text.png
+share/audacious/Skins/Ivory/titlebar.png
+share/audacious/Skins/Ivory/viscolor.txt
+share/audacious/Skins/Ivory/volume.png
+share/audacious/Skins/Osmosis/balance.png
+share/audacious/Skins/Osmosis/cbuttons.png
+share/audacious/Skins/Osmosis/eq_ex.png
+share/audacious/Skins/Osmosis/eqmain.png
+share/audacious/Skins/Osmosis/main.png
+share/audacious/Skins/Osmosis/monoster.png
+share/audacious/Skins/Osmosis/nums_ex.png
+share/audacious/Skins/Osmosis/playpaus.png
+share/audacious/Skins/Osmosis/pledit.png
+share/audacious/Skins/Osmosis/pledit.txt
+share/audacious/Skins/Osmosis/posbar.png
+share/audacious/Skins/Osmosis/shufrep.png
+share/audacious/Skins/Osmosis/skin.hints
+share/audacious/Skins/Osmosis/text.png
+share/audacious/Skins/Osmosis/titlebar.png
+share/audacious/Skins/Osmosis/viscolor.txt
+share/audacious/Skins/Osmosis/volume.png
+share/audacious/Skins/Refugee/cbuttons.png
+share/audacious/Skins/Refugee/eq_ex.png
+share/audacious/Skins/Refugee/eqmain.png
+share/audacious/Skins/Refugee/main.png
+share/audacious/Skins/Refugee/monoster.png
+share/audacious/Skins/Refugee/nums_ex.png
+share/audacious/Skins/Refugee/playpaus.png
+share/audacious/Skins/Refugee/pledit.png
+share/audacious/Skins/Refugee/pledit.txt
+share/audacious/Skins/Refugee/posbar.png
+share/audacious/Skins/Refugee/shufrep.png
+share/audacious/Skins/Refugee/skin.hints
+share/audacious/Skins/Refugee/text.png
+share/audacious/Skins/Refugee/titlebar.png
+share/audacious/Skins/Refugee/viscolor.txt
+share/audacious/Skins/Refugee/volume.png
+share/audacious/Skins/TinyPlayer/balance.png
+share/audacious/Skins/TinyPlayer/cbuttons.png
+share/audacious/Skins/TinyPlayer/eq_ex.png
+share/audacious/Skins/TinyPlayer/eqmain.png
+share/audacious/Skins/TinyPlayer/main.png
+share/audacious/Skins/TinyPlayer/monoster.png
+share/audacious/Skins/TinyPlayer/nums_ex.png
+share/audacious/Skins/TinyPlayer/playpaus.png
+share/audacious/Skins/TinyPlayer/pledit.png
+share/audacious/Skins/TinyPlayer/pledit.txt
+share/audacious/Skins/TinyPlayer/posbar.png
+share/audacious/Skins/TinyPlayer/shufrep.png
+share/audacious/Skins/TinyPlayer/skin.hints
+share/audacious/Skins/TinyPlayer/text.png
+share/audacious/Skins/TinyPlayer/titlebar.png
+share/audacious/Skins/TinyPlayer/viscolor.txt
+share/audacious/Skins/TinyPlayer/volume.png
+share/locale/be/LC_MESSAGES/audacious-plugins.mo
+share/locale/bg/LC_MESSAGES/audacious-plugins.mo
 share/locale/ca/LC_MESSAGES/audacious-plugins.mo
+share/locale/cmn/LC_MESSAGES/audacious-plugins.mo
 share/locale/cs/LC_MESSAGES/audacious-plugins.mo
-share/locale/cy/LC_MESSAGES/audacious-plugins.mo
+share/locale/da/LC_MESSAGES/audacious-plugins.mo
 share/locale/de/LC_MESSAGES/audacious-plugins.mo
+share/locale/el/LC_MESSAGES/audacious-plugins.mo
+share/locale/en_GB/LC_MESSAGES/audacious-plugins.mo
+share/locale/es/LC_MESSAGES/audacious-plugins.mo
+share/locale/es_AR/LC_MESSAGES/audacious-plugins.mo
+share/locale/es_MX/LC_MESSAGES/audacious-plugins.mo
 share/locale/et/LC_MESSAGES/audacious-plugins.mo
+share/locale/eu/LC_MESSAGES/audacious-plugins.mo
+share/locale/fa_IR/LC_MESSAGES/audacious-plugins.mo
+share/locale/fi/LC_MESSAGES/audacious-plugins.mo
 share/locale/fr/LC_MESSAGES/audacious-plugins.mo
+share/locale/gl/LC_MESSAGES/audacious-plugins.mo
+share/locale/hu/LC_MESSAGES/audacious-plugins.mo
+share/locale/id_ID/LC_MESSAGES/audacious-plugins.mo
+share/locale/it/LC_MESSAGES/audacious-plugins.mo
 share/locale/ja/LC_MESSAGES/audacious-plugins.mo
-share/locale/ro/LC_MESSAGES/audacious-plugins.mo
+share/locale/ko/LC_MESSAGES/audacious-plugins.mo
+share/locale/ky/LC_MESSAGES/audacious-plugins.mo
+share/locale/lt/LC_MESSAGES/audacious-plugins.mo
+share/locale/lv/LC_MESSAGES/audacious-plugins.mo
+share/locale/ml_IN/LC_MESSAGES/audacious-plugins.mo
+share/locale/ms/LC_MESSAGES/audacious-plugins.mo
+share/locale/nl/LC_MESSAGES/audacious-plugins.mo
+share/locale/pl/LC_MESSAGES/audacious-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/audacious-plugins.mo
+share/locale/pt_PT/LC_MESSAGES/audacious-plugins.mo
 share/locale/ru/LC_MESSAGES/audacious-plugins.mo
+share/locale/si/LC_MESSAGES/audacious-plugins.mo
 share/locale/sk/LC_MESSAGES/audacious-plugins.mo
+share/locale/sr/LC_MESSAGES/audacious-plugins.mo
+share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo
+share/locale/sv/LC_MESSAGES/audacious-plugins.mo
+share/locale/ta/LC_MESSAGES/audacious-plugins.mo
 share/locale/tr/LC_MESSAGES/audacious-plugins.mo
+share/locale/uk/LC_MESSAGES/audacious-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/audacious-plugins.mo

audio/audacious-plugins/distinfo

@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2008/11/10 12:06:06 wiz Exp $
+$NetBSD: distinfo,v 1.4 2014/10/28 02:20:26 mef Exp $
 
-SHA1 (audacious-plugins-1.5.1.tgz) = 630c936027c66649795cac7327cf6ab3590d3e49
-RMD160 (audacious-plugins-1.5.1.tgz) = 4b9fc29ccf61d1a503f10f060cbdee8b148f28b8
-Size (audacious-plugins-1.5.1.tgz) = 2944448 bytes
-SHA1 (patch-aa) = 40620dde9c06925bf5cb9a0370eeaa55ec3b1f4f
+SHA1 (audacious-plugins-3.5.2.tar.bz2) = 470a9c009a92627fb824118762b156eb4604099f
+RMD160 (audacious-plugins-3.5.2.tar.bz2) = 2cf98e4fbf0e778672d509cd486274a8f7e4f10d
+Size (audacious-plugins-3.5.2.tar.bz2) = 1734588 bytes

audio/audacious-plugins/options.mk

@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.6 2012/06/12 15:45:54 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2014/10/28 02:20:26 mef Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.audacious-plugins
 PKG_SUPPORTED_OPTIONS=	arts esound inet6 jack midi pulseaudio sid
-PKG_SUGGESTED_OPTIONS+=	inet6 pulseaudio
+PKG_SUGGESTED_OPTIONS+=	inet6 pulseaudio jack arts
 
 .include "../../mk/bsd.options.mk"
 

audio/audacious-plugins/patches/patch-aa

@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/10/20 09:32:19 wiz Exp $
-
---- src/mtp_up/mtp.c.orig	2008-03-13 22:22:36.000000000 +0000
-+++ src/mtp_up/mtp.c
-@@ -199,7 +199,7 @@ gint upload_file(Tuple *from_tuple)
- #if DEBUG
-     g_print("Uploading track '%s'\n",filename);
- #endif
--    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL, parent_id);
-+    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL);
-     LIBMTP_destroy_track_t(gentrack);
-     if (ret == 0) 
-         g_print("Track upload finished!\n");

audio/audacious/Makefile

@@ -1,53 +1,38 @@
-# $NetBSD: Makefile,v 1.36 2014/01/09 15:23:32 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.40 2014/10/20 13:14:12 mef Exp $
 
-DISTNAME=		audacious-1.5.1
-PKGREVISION=		22
-CATEGORIES=		audio
-MASTER_SITES=		http://distfiles.atheme.org/
-EXTRACT_SUFX=		.tbz2
+DISTNAME=	audacious-3.5.2
+CATEGORIES=	audio
+MASTER_SITES=	http://distfiles.audacious-media-player.org/
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		jfranz@bsdprojects.net
-HOMEPAGE=		http://audacious-media-player.org/
-COMMENT=		Media player based on BMP and XMMS
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://audacious-media-player.org/
+COMMENT=	Media player based on BMP and XMMS
+LICENSE=	2-clause-bsd
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake intltool msgfmt pkg-config
-USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
-
-CONFIGURE_ARGS+=	--enable-chardet --enable-nls
-
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
+GNU_CONFIGURE=		yes
+# requires libguess which is not available any more
+CONFIGURE_ARGS+=	--disable-chardet
 PKGCONFIG_OVERRIDE+=	audacious.pc.in
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.audacious
-PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUGGESTED_OPTIONS=	inet6
+BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
+.include "../../mk/bsd.prefs.mk"
+# XXX does not solve linking problem completely
+.if ${OPSYS} == "Darwin"
+LDFLAGS+=	-flat_namespace -undefined suppress
 .endif
 
-# for backtrace
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
-LIBS+=  -lexecinfo
-.endif
-
-LIBS.SunOS+=		-lm -lX11 -lICE -lgmodule-2.0
-LDFLAGS.DragonFly=	-lm -lX11 -lICE -lgmodule-2.0
-
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libmcs/buildlink3.mk"
-.include "../../devel/libmowgli/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

audio/audacious/PLIST

@@ -1,318 +1,114 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/10/09 15:02:42 adam Exp $
 bin/audacious
 bin/audtool
-include/audacious/audconfig.h
-include/audacious/audctrl.h
-include/audacious/auddrct.h
-include/audacious/configdb.h
-include/audacious/custom_uri.h
-include/audacious/dbus-service.h
-include/audacious/dbus.h
-include/audacious/discovery.h
-include/audacious/eventqueue.h
-include/audacious/flow.h
-include/audacious/hook.h
+include/audacious/api-alias-begin.h
+include/audacious/api-alias-end.h
+include/audacious/api-define-begin.h
+include/audacious/api-define-end.h
+include/audacious/api.h
+include/audacious/audtag.h
+include/audacious/debug.h
+include/audacious/drct-api.h
+include/audacious/drct.h
 include/audacious/i18n.h
-include/audacious/id3tag.h
+include/audacious/input-api.h
 include/audacious/input.h
-include/audacious/main.h
-include/audacious/mime.h
-include/audacious/output.h
-include/audacious/playback.h
+include/audacious/misc-api.h
+include/audacious/misc.h
+include/audacious/playlist-api.h
 include/audacious/playlist.h
-include/audacious/playlist_container.h
 include/audacious/plugin.h
-include/audacious/rcfile.h
-include/audacious/strings.h
-include/audacious/tuple.h
-include/audacious/tuple_compiler.h
-include/audacious/tuple_formatter.h
-include/audacious/ui_fileinfopopup.h
-include/audacious/ui_plugin_menu.h
-include/audacious/ui_preferences.h
-include/audacious/util.h
-include/audacious/vfs.h
-include/audacious/vfs_buffer.h
-include/audacious/vfs_buffered_file.h
-include/libSAD/common.h
-include/libSAD/dither.h
-include/libSAD/libSAD.h
-lib/libaudclient.so
-lib/libaudclient.so.1
-lib/libaudclient.so.1.0.0
-lib/libaudid3tag.so
-lib/libaudid3tag.so.1
-lib/libaudid3tag.so.1.0.0
+include/audacious/plugins-api.h
+include/audacious/plugins.h
+include/audacious/preferences.h
+include/audacious/types.h
+include/libaudcore/audio.h
+include/libaudcore/audstrings.h
+include/libaudcore/core.h
+include/libaudcore/hook.h
+include/libaudcore/index.h
+include/libaudcore/inifile.h
+include/libaudcore/multihash.h
+include/libaudcore/tinylock.h
+include/libaudcore/tuple.h
+include/libaudcore/vfs.h
+include/libaudcore/vfs_async.h
+include/libaudgui/libaudgui-gtk.h
+include/libaudgui/libaudgui.h
+include/libaudgui/list.h
+include/libaudgui/menu.h
+lib/libaudcore.so
+lib/libaudcore.so.2
+lib/libaudcore.so.2.0.0
+lib/libaudgui.so
+lib/libaudgui.so.2
+lib/libaudgui.so.2.0.0
+lib/libaudtag.so
+lib/libaudtag.so.1
+lib/libaudtag.so.1.0.0
 lib/pkgconfig/audacious.pc
-lib/pkgconfig/audclient.pc
 man/man1/audacious.1
 man/man1/audtool.1
 share/applications/audacious.desktop
-share/audacious/Skins/Classic/balance.png
-share/audacious/Skins/Classic/cbuttons.png
-share/audacious/Skins/Classic/eq_ex.png
-share/audacious/Skins/Classic/eqmain.png
-share/audacious/Skins/Classic/main.png
-share/audacious/Skins/Classic/monoster.png
-share/audacious/Skins/Classic/nums_ex.png
-share/audacious/Skins/Classic/playpaus.png
-share/audacious/Skins/Classic/pledit.png
-share/audacious/Skins/Classic/pledit.txt
-share/audacious/Skins/Classic/posbar.png
-share/audacious/Skins/Classic/shufrep.png
-share/audacious/Skins/Classic/skin-classic.hints
-share/audacious/Skins/Classic/skin.hints
-share/audacious/Skins/Classic/text.png
-share/audacious/Skins/Classic/titlebar.png
-share/audacious/Skins/Classic/viscolor.txt
-share/audacious/Skins/Classic/volume.png
-share/audacious/Skins/Classic1.3/balance.png
-share/audacious/Skins/Classic1.3/cbuttons.png
-share/audacious/Skins/Classic1.3/eq_ex.png
-share/audacious/Skins/Classic1.3/eqmain.png
-share/audacious/Skins/Classic1.3/main.png
-share/audacious/Skins/Classic1.3/monoster.png
-share/audacious/Skins/Classic1.3/nums_ex.png
-share/audacious/Skins/Classic1.3/playpaus.png
-share/audacious/Skins/Classic1.3/pledit.png
-share/audacious/Skins/Classic1.3/pledit.txt
-share/audacious/Skins/Classic1.3/posbar.png
-share/audacious/Skins/Classic1.3/shufrep.png
-share/audacious/Skins/Classic1.3/skin-classic.hints
-share/audacious/Skins/Classic1.3/skin.hints
-share/audacious/Skins/Classic1.3/text.png
-share/audacious/Skins/Classic1.3/titlebar.png
-share/audacious/Skins/Classic1.3/viscolor.txt
-share/audacious/Skins/Classic1.3/volume.png
-share/audacious/Skins/Default/cbuttons.png
-share/audacious/Skins/Default/eq_ex.png
-share/audacious/Skins/Default/eqmain.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-down.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-insens.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-left.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-right.png
-share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-up.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-insensitive.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-normal.png
-share/audacious/Skins/Default/gtk-2.0/Buttons/button-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check1.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check2.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check3.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check4.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check5.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/check6.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option1.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option2.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option3.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option4.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option5.png
-share/audacious/Skins/Default/gtk-2.0/Check-Radio/option6.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png
-share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame.png
-share/audacious/Skins/Default/gtk-2.0/Handles/handle-h.png
-share/audacious/Skins/Default/gtk-2.0/Handles/handle-v.png
-share/audacious/Skins/Default/gtk-2.0/Lines/line-h.png
-share/audacious/Skins/Default/gtk-2.0/Lines/line-v.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png
-share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menu.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png
-share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png
-share/audacious/Skins/Default/gtk-2.0/Others/null.png
-share/audacious/Skins/Default/gtk-2.0/Others/ruler.png
-share/audacious/Skins/Default/gtk-2.0/Panel/panel-bg.png
-share/audacious/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Range/slider-vert.png
-share/audacious/Skins/Default/gtk-2.0/Range/trough-horizontal.png
-share/audacious/Skins/Default/gtk-2.0/Range/trough-vertical.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
-share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-in.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-out.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/text-.png
-share/audacious/Skins/Default/gtk-2.0/Shadows/text-entry.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-disable.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-down.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-disable.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png
-share/audacious/Skins/Default/gtk-2.0/Spin/spin-up.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-top.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-top.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-current.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/notebook.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top-active.png
-share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top.png
-share/audacious/Skins/Default/gtk-2.0/Toolbar/toolbar.png
-share/audacious/Skins/Default/gtk-2.0/gtkrc
-share/audacious/Skins/Default/gtk-2.0/panel.rc
-share/audacious/Skins/Default/main.png
-share/audacious/Skins/Default/monoster.png
-share/audacious/Skins/Default/nums_ex.png
-share/audacious/Skins/Default/playpaus.png
-share/audacious/Skins/Default/pledit.png
-share/audacious/Skins/Default/pledit.txt
-share/audacious/Skins/Default/posbar.png
-share/audacious/Skins/Default/shufrep.png
-share/audacious/Skins/Default/skin.hints
-share/audacious/Skins/Default/text.png
-share/audacious/Skins/Default/titlebar.png
-share/audacious/Skins/Default/viscolor.txt
-share/audacious/Skins/Default/volume.png
-share/audacious/Skins/Ivory/balance.png
-share/audacious/Skins/Ivory/cbuttons.png
-share/audacious/Skins/Ivory/eq_ex.png
-share/audacious/Skins/Ivory/eqmain.png
-share/audacious/Skins/Ivory/main.png
-share/audacious/Skins/Ivory/monoster.png
-share/audacious/Skins/Ivory/nums_ex.png
-share/audacious/Skins/Ivory/playpaus.png
-share/audacious/Skins/Ivory/pledit.png
-share/audacious/Skins/Ivory/pledit.txt
-share/audacious/Skins/Ivory/posbar.png
-share/audacious/Skins/Ivory/shufrep.png
-share/audacious/Skins/Ivory/skin.hints
-share/audacious/Skins/Ivory/text.png
-share/audacious/Skins/Ivory/titlebar.png
-share/audacious/Skins/Ivory/viscolor.txt
-share/audacious/Skins/Ivory/volume.png
-share/audacious/Skins/Osmosis/balance.png
-share/audacious/Skins/Osmosis/cbuttons.png
-share/audacious/Skins/Osmosis/eq_ex.png
-share/audacious/Skins/Osmosis/eqmain.png
-share/audacious/Skins/Osmosis/main.png
-share/audacious/Skins/Osmosis/monoster.png
-share/audacious/Skins/Osmosis/nums_ex.png
-share/audacious/Skins/Osmosis/playpaus.png
-share/audacious/Skins/Osmosis/pledit.png
-share/audacious/Skins/Osmosis/pledit.txt
-share/audacious/Skins/Osmosis/posbar.png
-share/audacious/Skins/Osmosis/shufrep.png
-share/audacious/Skins/Osmosis/skin.hints
-share/audacious/Skins/Osmosis/text.png
-share/audacious/Skins/Osmosis/titlebar.png
-share/audacious/Skins/Osmosis/viscolor.txt
-share/audacious/Skins/Osmosis/volume.png
-share/audacious/Skins/Refugee/cbuttons.png
-share/audacious/Skins/Refugee/eq_ex.png
-share/audacious/Skins/Refugee/eqmain.png
-share/audacious/Skins/Refugee/main.png
-share/audacious/Skins/Refugee/monoster.png
-share/audacious/Skins/Refugee/nums_ex.png
-share/audacious/Skins/Refugee/playpaus.png
-share/audacious/Skins/Refugee/pledit.png
-share/audacious/Skins/Refugee/pledit.txt
-share/audacious/Skins/Refugee/posbar.png
-share/audacious/Skins/Refugee/shufrep.png
-share/audacious/Skins/Refugee/skin.hints
-share/audacious/Skins/Refugee/text.png
-share/audacious/Skins/Refugee/titlebar.png
-share/audacious/Skins/Refugee/viscolor.txt
-share/audacious/Skins/Refugee/volume.png
-share/audacious/Skins/TinyPlayer/balance.png
-share/audacious/Skins/TinyPlayer/cbuttons.png
-share/audacious/Skins/TinyPlayer/eq_ex.png
-share/audacious/Skins/TinyPlayer/eqmain.png
-share/audacious/Skins/TinyPlayer/main.png
-share/audacious/Skins/TinyPlayer/monoster.png
-share/audacious/Skins/TinyPlayer/nums_ex.png
-share/audacious/Skins/TinyPlayer/playpaus.png
-share/audacious/Skins/TinyPlayer/pledit.png
-share/audacious/Skins/TinyPlayer/pledit.txt
-share/audacious/Skins/TinyPlayer/posbar.png
-share/audacious/Skins/TinyPlayer/shufrep.png
-share/audacious/Skins/TinyPlayer/skin.hints
-share/audacious/Skins/TinyPlayer/text.png
-share/audacious/Skins/TinyPlayer/titlebar.png
-share/audacious/Skins/TinyPlayer/viscolor.txt
-share/audacious/Skins/TinyPlayer/volume.png
+share/audacious/AUTHORS
+share/audacious/COPYING
 share/audacious/images/about-logo.png
+share/audacious/images/album.png
 share/audacious/images/appearance.png
-share/audacious/images/audacious_eq.xpm
-share/audacious/images/audacious_player.xpm
-share/audacious/images/audacious_playlist.xpm
 share/audacious/images/audio.png
 share/audacious/images/connectivity.png
-share/audacious/images/menu_playlist.png
-share/audacious/images/menu_plugin.png
-share/audacious/images/menu_queue_toggle.png
-share/audacious/images/menu_randomize_playlist.png
-share/audacious/images/mouse.png
-share/audacious/images/playback.png
+share/audacious/images/info.png
 share/audacious/images/playlist.png
 share/audacious/images/plugins.png
-share/audacious/images/replay_gain.png
-share/audacious/ui/carbon-menubar.ui
-share/audacious/ui/equalizer.ui
-share/audacious/ui/mainwin.ui
-share/audacious/ui/playlist.ui
+share/icons/hicolor/48x48/apps/audacious.png
+share/icons/hicolor/scalable/apps/audacious.svg
+share/locale/ast/LC_MESSAGES/audacious.mo
+share/locale/be/LC_MESSAGES/audacious.mo
 share/locale/bg/LC_MESSAGES/audacious.mo
-share/locale/br/LC_MESSAGES/audacious.mo
 share/locale/ca/LC_MESSAGES/audacious.mo
+share/locale/cmn/LC_MESSAGES/audacious.mo
 share/locale/cs/LC_MESSAGES/audacious.mo
-share/locale/cy/LC_MESSAGES/audacious.mo
+share/locale/da/LC_MESSAGES/audacious.mo
 share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
+share/locale/en_GB/LC_MESSAGES/audacious.mo
+share/locale/eo/LC_MESSAGES/audacious.mo
 share/locale/es/LC_MESSAGES/audacious.mo
+share/locale/es_AR/LC_MESSAGES/audacious.mo
+share/locale/es_MX/LC_MESSAGES/audacious.mo
 share/locale/et/LC_MESSAGES/audacious.mo
+share/locale/eu/LC_MESSAGES/audacious.mo
+share/locale/fa_IR/LC_MESSAGES/audacious.mo
 share/locale/fi/LC_MESSAGES/audacious.mo
 share/locale/fr/LC_MESSAGES/audacious.mo
-share/locale/hi/LC_MESSAGES/audacious.mo
-share/locale/hr/LC_MESSAGES/audacious.mo
+share/locale/gl/LC_MESSAGES/audacious.mo
+share/locale/he/LC_MESSAGES/audacious.mo
 share/locale/hu/LC_MESSAGES/audacious.mo
+share/locale/id_ID/LC_MESSAGES/audacious.mo
 share/locale/it/LC_MESSAGES/audacious.mo
 share/locale/ja/LC_MESSAGES/audacious.mo
-share/locale/ka/LC_MESSAGES/audacious.mo
 share/locale/ko/LC_MESSAGES/audacious.mo
+share/locale/ky/LC_MESSAGES/audacious.mo
 share/locale/lt/LC_MESSAGES/audacious.mo
-share/locale/mk/LC_MESSAGES/audacious.mo
+share/locale/lv/LC_MESSAGES/audacious.mo
+share/locale/ml_IN/LC_MESSAGES/audacious.mo
+share/locale/ms/LC_MESSAGES/audacious.mo
 share/locale/nl/LC_MESSAGES/audacious.mo
 share/locale/pl/LC_MESSAGES/audacious.mo
 share/locale/pt_BR/LC_MESSAGES/audacious.mo
+share/locale/pt_PT/LC_MESSAGES/audacious.mo
 share/locale/ro/LC_MESSAGES/audacious.mo
 share/locale/ru/LC_MESSAGES/audacious.mo
+share/locale/si/LC_MESSAGES/audacious.mo
 share/locale/sk/LC_MESSAGES/audacious.mo
+share/locale/sq/LC_MESSAGES/audacious.mo
 share/locale/sr/LC_MESSAGES/audacious.mo
-share/locale/sr@Latn/LC_MESSAGES/audacious.mo
+share/locale/sr@latin/LC_MESSAGES/audacious.mo
+share/locale/sr_RS/LC_MESSAGES/audacious.mo
 share/locale/sv/LC_MESSAGES/audacious.mo
+share/locale/ta/LC_MESSAGES/audacious.mo
 share/locale/tr/LC_MESSAGES/audacious.mo
 share/locale/uk/LC_MESSAGES/audacious.mo
+share/locale/vi/LC_MESSAGES/audacious.mo
 share/locale/zh_CN/LC_MESSAGES/audacious.mo
 share/locale/zh_TW/LC_MESSAGES/audacious.mo
-share/pixmaps/audacious.png

audio/audacious/buildlink3.mk

@@ -1,25 +1,22 @@
-# $NetBSD: buildlink3.mk,v 1.27 2013/10/10 14:41:46 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2014/10/09 15:02:42 adam Exp $
 
 BUILDLINK_TREE+=	audacious
 
 .if !defined(AUDACIOUS_BUILDLINK3_MK)
 AUDACIOUS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.audacious+=	audacious>=1.5.0
-BUILDLINK_ABI_DEPENDS.audacious+=	audacious>=1.5.1nb22
+BUILDLINK_API_DEPENDS.audacious+=	audacious>=3.5.1
+BUILDLINK_ABI_DEPENDS.audacious+=	audacious>=3.5.1
 BUILDLINK_PKGSRCDIR.audacious?=	../../audio/audacious
 
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libmcs/buildlink3.mk"
-.include "../../devel/libmowgli/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .endif # AUDACIOUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-audacious

audio/audacious/distinfo

@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/05/06 19:12:22 dholland Exp $
+$NetBSD: distinfo,v 1.7 2014/10/20 13:14:12 mef Exp $
 
-SHA1 (audacious-1.5.1.tbz2) = 571ed77333c4d85dab901770f6640501930a748c
-RMD160 (audacious-1.5.1.tbz2) = 1748b7075cef3fd0d41fb74c44109e294433d03b
-Size (audacious-1.5.1.tbz2) = 1374028 bytes
-SHA1 (patch-aa) = a95588e0f2c27f1f520cb687421f5d33e01e5155
-SHA1 (patch-src_audacious_i18n_h) = a0524ed265fb1298cf741f5c3af2f9893bde3bfe
-SHA1 (patch-src_audacious_ui__skinned__window_c) = 1aa195373ee7a2542a8d4e2b71b611a533c00483
+SHA1 (audacious-3.5.2.tar.bz2) = 1c92ddb079ec1b0109cd4bc65a1329db5eb8cb1b
+RMD160 (audacious-3.5.2.tar.bz2) = dd41e56544d9563b47401a670d96a34d7be920b6
+Size (audacious-3.5.2.tar.bz2) = 448436 bytes

audio/audacious/patches/patch-aa

@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2011/04/21 20:01:03 hans Exp $
-
---- configure.orig	2008-05-24 00:00:38.000000000 +0200
-+++ configure	2011-04-21 21:10:43.769673417 +0200
-@@ -2291,15 +2291,15 @@ echo "${ECHO_T}Mac OS X" >&6; }
- echo "${ECHO_T}Solaris" >&6; }
- 			LIB_CPPFLAGS='-DPIC'
- 			LIB_CFLAGS='-fPIC'
--			LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}.${LIB_MAJOR}.${LIB_MINOR}'
-+			LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}.${LIB_MAJOR}'
- 			LIB_PREFIX='lib'
- 			LIB_SUFFIX='.so'
- 			PLUGIN_CPPFLAGS='-DPIC'
- 			PLUGIN_CFLAGS='-fPIC'
- 			PLUGIN_LDFLAGS='-shared -fPIC'
- 			PLUGIN_SUFFIX='.so'
--			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
--			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
-+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
-+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
- 			CLEAN_LIB=''
- 			;;
- 		*-*-cygwin | *-*-mingw32)

audio/audacious/patches/patch-src_audacious_i18n_h

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_audacious_i18n_h,v 1.1 2012/05/06 19:12:22 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/audacious/i18n.h~	2008-05-23 22:00:34.000000000 +0000
-+++ src/audacious/i18n.h
-@@ -20,7 +20,7 @@
- #ifndef AUDACIOUS_I18N_H
- #define AUDACIOUS_I18N_H
- 
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <libintl.h>
- 
- #define _(String) dgettext (PACKAGE, String)

audio/audacious/patches/patch-src_audacious_ui__skinned__window_c

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_audacious_ui__skinned__window_c,v 1.1 2012/05/06 19:12:22 dholland Exp $
-
-Fix build with latest glib2.
-
---- src/audacious/ui_skinned_window.c~	2008-05-23 22:00:34.000000000 +0000
-+++ src/audacious/ui_skinned_window.c
-@@ -23,7 +23,7 @@
- 
- #include <gtk/gtkmain.h>
- #include <glib-object.h>
--#include <glib/gmacros.h>
-+#include <glib.h>
- #include <gtk/gtkmarshal.h>
- #include <gtk/gtkwindow.h>
- #include <string.h>

audio/audacity/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2013/10/10 14:41:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.88 2014/05/05 00:47:35 ryoon Exp $
 
 DISTNAME=		audacity-src-1.2.6
-PKGREVISION=		25
+PKGREVISION=		26
 PKGNAME=		${DISTNAME:S/-src-/-/}
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=audacity/}

audio/aumix-gtk/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2013/10/14 13:02:39 roy Exp $
+# $NetBSD: Makefile,v 1.27 2014/05/05 00:47:35 ryoon Exp $
 
 .include "../../audio/aumix/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/aumix/aumix-gtk/}
-PKGREVISION=	9
+PKGREVISION=	10
 
 COMMENT+=	(curses and GTK+ 2.0 interfaces)
 

audio/bml/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/09/11 23:59:26 asau Exp $
+# $NetBSD: Makefile,v 1.9 2015/01/23 00:16:03 mef Exp $
 #
 
-DISTNAME=	bml-0.5.0
+DISTNAME=	bml-0.8.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buzztard/}
 
@@ -13,7 +13,7 @@ LICENSE=	gnu-lgpl-v2.1
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=	c99 c++
 
 PKGCONFIG_OVERRIDE+=	libbml.pc.in
 

audio/bml/PLIST

@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/10 20:16:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/10/20 08:58:26 mef Exp $
 include/libbml/BuzzMachineLoader.h
 include/libbml/bml.h
+lib/bml/libbuzzmachineloader.la
 lib/libbml.la
-lib/libbuzzmachineloader.la
 lib/pkgconfig/libbml.pc

audio/bml/distinfo

@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/10 20:16:44 wiz Exp $
+$NetBSD: distinfo,v 1.3 2015/01/23 00:16:03 mef Exp $
 
-SHA1 (bml-0.5.0.tar.gz) = 3a0e4381904a56c2ce60035344c5387cda15f9a0
-RMD160 (bml-0.5.0.tar.gz) = edfe5cdd3a20a6e705dc846537fdf69d96f0aa2a
-Size (bml-0.5.0.tar.gz) = 767631 bytes
+SHA1 (bml-0.8.0.tar.gz) = 026d36389ae4fc6c619ba42449f75353a052006b
+RMD160 (bml-0.8.0.tar.gz) = e26abfbe62f00db520133c5161888f51680a47b2
+Size (bml-0.8.0.tar.gz) = 805695 bytes

audio/bmp-crossfade/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2014/01/27 06:56:42 obache Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/05 00:47:35 ryoon Exp $
 #
 
 PKGNAME=		bmp-crossfade-0.3.11
 DISTNAME=		xmms-crossfade-0.3.11
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		audio
 MASTER_SITES=		http://www.eisenlohr.org/xmms-crossfade/
 

audio/bmp-flac/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2013/10/10 14:41:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2014/05/05 00:47:35 ryoon Exp $
 #
 
 DISTNAME=	flac-1.1.3
 PKGNAME=	bmp-${DISTNAME}
-PKGREVISION=	18
+PKGREVISION=	19
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
 

audio/bmp-mac/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2013/10/10 14:41:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2014/05/05 00:47:35 ryoon Exp $
 #
 
 DISTNAME=	bmp-mac-0.1.1
-PKGREVISION=	19
+PKGREVISION=	20
 CATEGORIES=	audio
 MASTER_SITES=	http://distfiles.aydogan.net/audio/
 

audio/bmp-musepack/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2013/10/17 07:56:40 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/05/05 00:47:35 ryoon Exp $
 #
 
 DISTNAME=		bmp-musepack-1.2
-PKGREVISION=		20
+PKGREVISION=		21
 CATEGORIES=		audio
 MASTER_SITES=		http://files.musepack.net/linux/plugins/
 EXTRACT_SUFX=		.tar.bz2

audio/bmp-pulse/Makefile

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2013/11/25 12:00:46 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2015/02/21 23:35:38 ryoon Exp $
 #
 
 DISTNAME=	xmms-pulse-0.9.4
 PKGNAME=	${DISTNAME:S/xmms/bmp/}
-PKGREVISION=	23
+PKGREVISION=	28
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/xmms-pulse/
 

audio/bmp-scrobbler/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2014/02/12 23:17:32 tron Exp $
+# $NetBSD: Makefile,v 1.27 2014/05/05 00:47:35 ryoon Exp $
 
 DISTNAME=	xmms-scrobbler-0.4.0
 PKGNAME=	${DISTNAME:S/xmms/bmp/}
-PKGREVISION=	24
+PKGREVISION=	25
 CATEGORIES=	audio
 MASTER_SITES=	http://armish.linux-sevenler.org/downloads/pub/
 EXTRACT_SUFX=	.tar.bz2

audio/bmp/Makefile

@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.60 2014/02/12 23:17:32 tron Exp $
+# $NetBSD: Makefile,v 1.62 2014/06/09 14:18:05 ryoon Exp $
 #
 
 BMP_ENABLE_ENCODERS=	yes
 
 .include "Makefile.common"
-PKGREVISION=		33
+PKGREVISION=		35
 
 USE_TOOLS+=		unzip:run
 

audio/bmp/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2013/10/10 14:41:49 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2014/05/05 00:47:35 ryoon Exp $
 
 BUILDLINK_TREE+=	bmp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	bmp
 BMP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.bmp+=	bmp>=0.9.7rc2nb3
-BUILDLINK_ABI_DEPENDS.bmp+=	bmp>=0.9.7.1nb32
+BUILDLINK_ABI_DEPENDS.bmp+=	bmp>=0.9.7.1nb34
 BUILDLINK_PKGSRCDIR.bmp?=	../../audio/bmp
 
 .include "../../devel/gettext-lib/buildlink3.mk"

audio/bmpx/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2014/01/01 11:52:09 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2014/11/07 19:39:26 adam Exp $
 
 DISTNAME=	bmpx-0.40.14
-PKGREVISION=	41
+PKGREVISION=	46
 CATEGORIES=	audio
 MASTER_SITES=	http://files.backtrace.info/releases/0.40/
 EXTRACT_SUFX=	.tar.bz2

audio/bmpx/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2013/03/31 08:18:58 sbd Exp $
+$NetBSD: distinfo,v 1.20 2014/04/19 14:46:06 joerg Exp $
 
 SHA1 (bmpx-0.40.14.tar.bz2) = 3284843c45cab302f414663a5cb31eb4373d07c7
 RMD160 (bmpx-0.40.14.tar.bz2) = 12a9939d53b58a43ee9deefa43188ac6b33dae72
@@ -26,6 +26,7 @@ SHA1 (patch-src_jamendodata-libxml2-sax_cc) = 888416fd225b58f593095f3fbef1580c50
 SHA1 (patch-src_lastfm.cc) = 8ece9937f2ef162398fdd310f5c4c04d3940e4aa
 SHA1 (patch-src_library_hh) = 3c7a220003b6a2accd0675ec223b89c1b843dc73
 SHA1 (patch-src_logger_hh) = 7ec25dc4d7b51d60e5390aef7b54d34efb66927e
+SHA1 (patch-src_parser_xpath.cc) = 9232423867197e066e78c4ec1614e2c583c8dcff
 SHA1 (patch-src_playbacksource_cc) = 5dd3d47b8a0306c344bace766f60d23b9bcdc6d0
 SHA1 (patch-src_playbacksource_hh) = a79da6855f3d581aea66c5713f76a45ca014b50e
 SHA1 (patch-src_sanity_h) = 82acd300b2c0ad7eaf7f9a63bb0df19d4e71dd2c

audio/bmpx/patches/patch-src_parser_xpath.cc

@@ -0,0 +1,12 @@
+$NetBSD: patch-src_parser_xpath.cc,v 1.1 2014/04/19 14:46:06 joerg Exp $
+
+--- src/parser/xpath.cc.orig	2014-04-19 11:54:39.000000000 +0000
++++ src/parser/xpath.cc
+@@ -11,6 +11,7 @@
+ #include "xpath.hh"
+ #include <algorithm> // for lexicographical_compare
+ #include <cassert>
++#include <ostream>
+ 
+ // implementation  -----------------------------------------------------------//
+ 

audio/bsl/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2014/02/12 23:17:32 tron Exp $
+# $NetBSD: Makefile,v 1.29 2014/05/05 00:47:35 ryoon Exp $
 #
 
 DISTNAME=	bsl-0.5.0
-PKGREVISION=	24
+PKGREVISION=	25
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buzztard/}
 

audio/buzztard/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2014/02/12 23:17:33 tron Exp $
+# $NetBSD: Makefile,v 1.34 2015/02/19 22:23:16 joerg Exp $
 #
 
 DISTNAME=	buzztard-0.5.0
-PKGREVISION=	28
+PKGREVISION=	30
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=buzztard/}
 

audio/buzztard/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/10 20:16:44 wiz Exp $
+$NetBSD: distinfo,v 1.2 2015/02/19 22:23:16 joerg Exp $
 
 SHA1 (buzztard-0.5.0.tar.gz) = cc85a0ca01c336ba6ca592ca4f26985a08a8f7e0
 RMD160 (buzztard-0.5.0.tar.gz) = e1b43637f2850b03061f0dce93d1240e40529f90
@@ -6,3 +6,6 @@ Size (buzztard-0.5.0.tar.gz) = 2247279 bytes
 SHA1 (patch-aa) = 7dafa7d47fa578f3ccbcb02f0ee02c0af20aab69
 SHA1 (patch-ac) = 5acdc7173dd17a3fa60cc5d03821ea4cf2b35fc9
 SHA1 (patch-ad) = 7e31fd612d6ed3ced50027753dd39bf2e3db2891
+SHA1 (patch-src_lib_core_processor-machine.c) = 389b475ee77eeef96ed35aab8384afd9d50b2377
+SHA1 (patch-src_lib_core_sink-machine.c) = 070c195918ef10f2ad1b02e4c314a18c5c8c2c16
+SHA1 (patch-src_lib_core_source-machine.c) = b8a27aeef7f11bbb1863c175ed808492465c246e

audio/buzztard/patches/patch-src_lib_core_processor-machine.c

@@ -0,0 +1,26 @@
+$NetBSD: patch-src_lib_core_processor-machine.c,v 1.1 2015/02/19 22:23:16 joerg Exp $
+
+--- src/lib/core/processor-machine.c.orig	2009-03-23 18:43:53.000000000 +0000
++++ src/lib/core/processor-machine.c
+@@ -97,6 +97,12 @@ static xmlNodePtr bt_processor_machine_p
+   return(node);
+ }
+ 
++static void bt_processor_machine_persistence_load_helper(BtPersistenceInterface *parent_iface, BtPersistence *result, xmlNodePtr node, const BtPersistenceLocation * const location, ...) {
++  va_list ap;
++  va_start(ap, location);
++  parent_iface->load(BT_TYPE_MACHINE,result,node,location,NULL, ap);
++}
++
+ static BtPersistence *bt_processor_machine_persistence_load(const GType type, const BtPersistence * const persistence, xmlNodePtr node, const BtPersistenceLocation * const location, GError **err, va_list var_args) {
+   BtProcessorMachine *self;
+   BtPersistence *result;
+@@ -147,7 +153,7 @@ static BtPersistence *bt_processor_machi
+   
+   // load parent class stuff
+   parent_iface=g_type_interface_peek_parent(BT_PERSISTENCE_GET_INTERFACE(result));
+-  parent_iface->load(BT_TYPE_MACHINE,result,node,location,NULL,NULL);
++  bt_processor_machine_persistence_load_helper(parent_iface, result, node, location);
+ 
+   return(result);
+ }

audio/buzztard/patches/patch-src_lib_core_sink-machine.c

@@ -0,0 +1,26 @@
+$NetBSD: patch-src_lib_core_sink-machine.c,v 1.1 2015/02/19 22:23:16 joerg Exp $
+
+--- src/lib/core/sink-machine.c.orig	2015-02-19 20:43:52.000000000 +0000
++++ src/lib/core/sink-machine.c
+@@ -123,6 +123,12 @@ static xmlNodePtr bt_sink_machine_persis
+   return(node);
+ }
+ 
++static void bt_sink_machine_persistence_load_helper(BtPersistenceInterface *parent_iface, BtPersistence *result, xmlNodePtr node, const BtPersistenceLocation * const location, ...) {
++  va_list ap;
++  va_start(ap, location);
++  parent_iface->load(BT_TYPE_MACHINE,result,node,location,NULL, ap);
++}
++
+ static BtPersistence *bt_sink_machine_persistence_load(const GType type, const BtPersistence * const persistence, xmlNodePtr node, const BtPersistenceLocation * const location, GError **err, va_list var_args) {
+   BtSinkMachine *self;
+   BtPersistence *result;
+@@ -164,7 +170,7 @@ static BtPersistence *bt_sink_machine_pe
+   
+   // load parent class stuff
+   parent_iface=g_type_interface_peek_parent(BT_PERSISTENCE_GET_INTERFACE(result));
+-  parent_iface->load(BT_TYPE_MACHINE,result,node,location,NULL,NULL);
++  bt_sink_machine_persistence_load_helper(parent_iface, result, node, location);
+ 
+   return(result);
+ }

audio/buzztard/patches/patch-src_lib_core_source-machine.c

@@ -0,0 +1,26 @@
+$NetBSD: patch-src_lib_core_source-machine.c,v 1.1 2015/02/19 22:23:16 joerg Exp $
+
+--- src/lib/core/source-machine.c.orig	2015-02-19 20:47:08.000000000 +0000
++++ src/lib/core/source-machine.c
+@@ -91,6 +91,12 @@ static xmlNodePtr bt_source_machine_pers
+   return(node);
+ }
+ 
++static void bt_source_machine_persistence_load_helper(BtPersistenceInterface *parent_iface, BtPersistence *result, xmlNodePtr node, const BtPersistenceLocation * const location, ...) {
++  va_list ap;
++  va_start(ap, location);
++  parent_iface->load(BT_TYPE_MACHINE,result,node,location,NULL, ap);
++}
++
+ static BtPersistence *bt_source_machine_persistence_load(const GType type, const BtPersistence * const persistence, xmlNodePtr node, const BtPersistenceLocation * const location, GError **err, va_list var_args) {
+   BtSourceMachine *self;
+   BtPersistence *result;
+@@ -133,7 +139,7 @@ static BtPersistence *bt_source_machine_
+   
+   // load parent class stuff
+   parent_iface=g_type_interface_peek_parent(BT_PERSISTENCE_GET_INTERFACE(result));
+-  parent_iface->load(BT_TYPE_MACHINE,result,node,location,NULL,NULL);
++  bt_source_machine_persistence_load_helper(parent_iface, result, node, location);
+ 
+   return(result);
+ }