Update to 2.3.99.7, take ownership. Okay'ed by sketch@

4 files changed, 154 insertions, 118 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index e9441c85b62..f44ef4a6cac 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,24 +1,27 @@
-# $NetBSD: Makefile,v 1.42 2009/10/24 15:08:58 zafer Exp $
+# $NetBSD: Makefile,v 1.43 2010/04/10 13:20:11 sekiya Exp $
 
-DISTNAME=	abcde_2.3.3.orig
-PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=	3
+DISTNAME=	abcde-2.3.99.7_p235
+PKGNAME=	abcde-2.3.99.7
+#PKGREVISION=	0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
 
-MAINTAINER=	sketch@NetBSD.org
-HOMEPAGE=	http://www.hispalinux.es/~data/abcde.php
+MAINTAINER=	sekiya@NetBSD.org
+#HOMEPAGE=	http://www.hispalinux.es/~data/abcde.php
 COMMENT=	Command-line utility to rip and encode an audio CD
 
 DEPENDS+=	cd-discid>=0.7:../../audio/cd-discid
 DEPENDS+=	id3-[0-9]*:../../audio/id3
 DEPENDS+=	id3v2-[0-9]*:../../audio/id3v2
 DEPENDS+=	cdparanoia>=3.0.9.7:../../audio/cdparanoia
-DEPENDS+=	wget>=1.7:../../net/wget
+DEPENDS+=	bash>=3.0:../../shells/bash
+DEPENDS+=	mkcue>=2.1:../../misc/mkcue
+DEPENDS+=	gsed>=4.2:../../textproc/gsed
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BUILD=	yes
+EXTRACT_SUFX=	.tar.bz2
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 EGDIR=		${PREFIX}/share/examples/abcde
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 82658125a1b..c4207f9233c 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.31 2009/09/15 10:46:10 drochner Exp $
+$NetBSD: distinfo,v 1.32 2010/04/10 13:20:11 sekiya Exp $
 
-SHA1 (abcde_2.3.3.orig.tar.gz) = 76486a0bcb4ac85d052e0d244da3abbeab3c5db0
-RMD160 (abcde_2.3.3.orig.tar.gz) = a96030891e263e765cd86151ec227b1d3babbcea
-Size (abcde_2.3.3.orig.tar.gz) = 73458 bytes
-SHA1 (patch-ab) = 9fe36ee69e628a4c460dd8ee30b4e9bca29d7081
-SHA1 (patch-ac) = 1098e695035b6aeac265cdb5fa9e32580282114d
+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 (patch-ab) = eacbb4582c8dc74c6415adbb0af387aacce81ccc
+SHA1 (patch-ac) = 5af15448067a6ee523195922b2529b99f552718b
diff --git a/audio/abcde/patches/patch-ab b/audio/abcde/patches/patch-ab
index 961ff80229a..1690894d1e8 100644
--- a/audio/abcde/patches/patch-ab
+++ b/audio/abcde/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.9 2005/10/04 20:58:43 sketch Exp $
+$NetBSD: patch-ab,v 1.10 2010/04/10 13:20:11 sekiya Exp $
 
---- abcde.conf.orig	2005-10-04 21:45:58.000000000 +0100
-+++ abcde.conf	2005-10-04 21:46:09.000000000 +0100
-@@ -184,7 +184,7 @@
- #ACTIONS=cddb,read,encode,tag,move,clean
- 
+--- abcde.conf.orig	2006-10-02 03:26:11.000000000 +0900
++++ abcde.conf	2010-04-10 10:03:49.000000000 +0900
+@@ -221,7 +221,7 @@
  # CD device you want to read from
+ # It can be defined as a singletrack flac file, but since it might change from
+ # file to file it makes little sense to define it here.
 -#CDROM=/dev/cdrom
 +#CDROM=/dev/rcd0d
  # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
index 57d5e580ef9..c3b8dc6f9bd 100644
--- a/audio/abcde/patches/patch-ac
+++ b/audio/abcde/patches/patch-ac
@@ -1,103 +1,136 @@
-$NetBSD: patch-ac,v 1.23 2009/09/15 10:46:10 drochner Exp $
+$NetBSD: patch-ac,v 1.24 2010/04/10 13:20:11 sekiya Exp $
 
---- abcde.orig	2005-08-26 00:43:27.000000000 +0200
-+++ abcde
-@@ -1302,14 +1302,20 @@ do_cleancue()
- 			# FIXME It doesn't preserve spaces! Why?
- 			# FIXME parse $track into PERFORMER and TITLE - abcde already has code for this?
- 			n=1
-+			newtrack=0
- 			echo "PERFORMER \"$DARTIST\"" >> "$CUEFILE_OUT"
- 			echo "TITLE \"$DALBUM\"" >> "$CUEFILE_OUT"
- 			cat "$CUEFILE_IN" | while read line
- 			do
--				if echo "$line" | grep -q "INDEX"
-+				if echo "$line" | grep -q "TRACK"
-+				then
-+					newtrack=1
-+				fi
-+				if echo "$line" | grep -q "INDEX" && [ $newtrack = 1 ]
- 				then
- 					eval track="\$TRACK$n"
- 					n=$(expr $n + 1)
-+					newtrack=0
- 					echo "TITLE \"$track\"" >> "$CUEFILE_OUT"
- 				fi
- 				echo "$line" >> "$CUEFILE_OUT"
-@@ -1559,7 +1565,11 @@ do_cddbread ()
- do_cddbedit ()
+--- abcde.orig	2010-04-10 10:14:30.000000000 +0900
++++ abcde	2010-04-10 18:40:03.000000000 +0900
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/pkg/bin/bash
+ # Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
+ # Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
+ # This code is hereby licensed for public consumption under either the
+@@ -415,10 +415,10 @@
  {
- 	if checkstatus cddb-edit >/dev/null; then
-+		# Strip out ^M
- 		CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
-+		CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
-+		tr -d '\r' < $CDDBDATA > $CDDBDATATMP
-+		mv $CDDBDATATMP $CDDBDATA
- 		VARIOUSARTISTS="$(checkstatus variousartists)"
- 		VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
- 		return 0
-@@ -1824,7 +1834,7 @@ do_cddbedit ()
- 	echo "variousartiststyle=$VARIOUSARTISTSTYLE" >> "$ABCDETEMPDIR/status"
+ 	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 @@
  
- 	if [ "$EDITCDDB" = "y" ] && [ "$UNINTENTIONALLY_ANGER_THE_FREEDB_PEOPLE" = "y" ]; then
--		if [ $CDDBDATAMD5SUM != "" ]  && [ $CDDBDATAMD5SUM != $($MD5SUM "$CDDBDATA" | cut -d " " -f 1) ]; then
-+		if [ "$CDDBDATAMD5SUM" != "" ]  && [ "$CDDBDATAMD5SUM" != "$($MD5SUM '$CDDBDATA' | cut -d' ' -f1)" ]; then
- 			# This works but does not have the necessary error checking
- 			# yet. If you are familiar with the CDDB spec
- 			# (see http://www.freedb.org/src/latest/DBFORMAT) 
-@@ -2114,7 +2124,7 @@ MD5SUM=md5sum
- DISTMP3=distmp3
- VORBISCOMMENT=vorbiscomment
- METAFLAC=metaflac
--NORMALIZE=normalize-audio
-+NORMALIZE=normalize
- CDSPEED=eject
- VORBISGAIN=vorbisgain
- MKCUE=mkcue
-@@ -2169,6 +2179,7 @@ if [ X$(uname) = "XFreeBSD" ] ; then
- 	HTTPGET=fetch
- 	NEEDCDROMID=y
- 	OSFLAVOUR=FBSD
-+	MD5SUM=md5
- elif [ X$(uname) = "XDarwin" ] ; then
- 	HTTPGET=curl
- 	OSFLAVOUR=OSX
-@@ -2178,6 +2189,9 @@ elif [ X$(uname) = "XDarwin" ] ; then
- elif [ X$(uname) = "XOpenBSD" ] ; then
- 	HTTPGET=wget
- 	MD5SUM=md5
-+elif [ X$(uname) = "XNetBSD" ] ; then
-+	HTTPGET=wget
-+	MD5SUM=md5
- else
- 	HTTPGET=wget
- fi
-@@ -2231,6 +2245,9 @@ if [ "$CDROM" = "" ] ; then
- 		CDROM=/dev/acd0c
- 	elif [ -e /dev/disk1 ]; then
- 		CDROM=/dev/disk1
-+	else
-+		RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
-+		CDROM=/dev/rcd0$RAWPART
- 	fi
- fi
+ 							#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:\]
+ }
  
-@@ -2427,7 +2444,7 @@ fi
- case "$CDROMREADERSYNTAX" in
- 	cdparanoia|debug)
- 		CDROMREADER="$CDPARANOIA"
--		CDROMREADEROPTS="$CDPARANOIAOPTS"
-+		CDROMREADEROPTS="$CDPARANOIAOPTS -g ${CDROM}"
- 		;;
- 	cdda2wav)
- 		CDROMREADER="$CDDA2WAV"
-@@ -2681,7 +2698,8 @@ for X in $CDROMREADER $CDDISCID ${NEEDTA
- do
- 	# Cut off the command-line options we just added in
- 	X=$(echo $X | cut -d' ' -f2)
--	if [ "$(which $X)" = "" ]; then
-+	Y="$(which $X | cut -d' ' -f1,2)"
-+	if [ "$Y" = "" -o "$Y" = "no $X" ]; then
- 		echo "abcde error: $X is not in your path." >&2
- 		exit 1
- 	elif [ ! -x $(which $X) ]; then
+ # 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,6 +3063,7 @@
+ 	HTTPGET=ftp
+ 	MD5SUM=md5
+ 	OSFLAVOUR=NBSD
++	SED=gsed
+ elif [ X$(uname) = "SunOS" ] ; then
+ 	HTTPGET=""
+ 	MD5SUM=md5