summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2015-01-04 12:03:07 +0000
committerwiz <wiz@pkgsrc.org>2015-01-04 12:03:07 +0000
commitfc3cbc5c67b50e84f45b39c1238fe52b15ec9f4d (patch)
treec9dd21eae83965b9482ade67b4e3e3ec393eabea /audio
parent8cff925ca072a6ab5bef4216656a4525c6380323 (diff)
downloadpkgsrc-fc3cbc5c67b50e84f45b39c1238fe52b15ec9f4d.tar.gz
Update to 2.6:
abcde 2.6 * Fix finding $CDROM on OS X. Thanks to niederstrasser for the patch. Closes issue 71. * USEID3 and USEID3V2 variables are unused now, so remove them. Thanks to vskytta for the patch. Closes issue 73. * Clean up movement to eyeD3, remove id3v2 remnants. Thanks to vskytta for the patch. Closes issue 74. * Fix infinite loop if cddb fails. Thanks to Dominic Hargreaves for the patch. Closes: #687038 in Debian * Switch from Musepack SV7 to SV8. Thanks to Andrew Strong for the patch. * Allow aac encoding with neroAacEnc. Thanks to atheren for the patch. Closes issue 8. * Allow opus encoding with opusenc. Thanks to Tomasz Golinski for the patch. Closes issue 70. * Fix typo: s/CUEWAVEFILE/CUEWAVFILE/ so that abcde.mkcue should now produce working cue files. Closes issue 78. * Remove no-op -q option. Closes issue 106. Thanks to vskytta for the patch. * Fix issue 112: perl encoding pragma deprecation. Thanks to Alex Corrie for the patch. * Fix option parsing for multiple output formats. Thanks to matthias.andree@gmx.de for the patch. Closes issue 115. * Fix eyeD3 tagging for cddb entries without year. Thanks to vskytta for the patch. Closes issue 107 * Add mention of CD-TEXT support in the man page. Closes issue 102. * Make Y/N prompting more consistent. Closes issue 95 * Remove the no-op -B option. Closes: #426531 in Debian * Document the need to escape parentheses in tag comments. Closes: #256941 in Debian. * Concatenate option steps on -t/-T option. Thanks to Charles Steinkuehler for the patch. Closes: #391294 in Debian * Try to use bsd-mailx where possible to force UTF-8 for cddb-tool mail submissions. If not possible, attempt to force UTF-8 via the environment and fall back to mail instead. Closes: #756289 in Debian, issue 111. -- Steve McIntyre <93sam@debian.org> Sun, 26 Oct 2014 13:17:24 -0700 abcde 2.5.4 * Update GPL/FSF headers to match current versions. Thanks to vskytta for the patch. (Closes issue 69). * Fix the command line for ID3SYNTAX=eyed3. Thanks to neil.gm.richards for the patch. Closes issue 50. * Switch to eyed3 by default for MP3 tagging, as it looks to do UTF-8 tagging better. Closes issue 22 (hopefully) -- Steve McIntyre <93sam@debian.org> Tue, 18 Sep 2012 12:42:11 +0100 abcde 2.5.3 * Sort options alphabetically (Closes issue 58). Thanks to vskytta for the patch. * Add Recommends: mailx in the Debian packaging for Debian/Ubuntu users. Closes: #607147 * Fix encoding call for m4a. (Closes issue 31). Closes: #449045 * Fix do_musicbrainz() for the case where there are no matches. * When using Musicbrainz, checksum and only output unique matches for an album. Closes: #669143 * Add Recommends: atomicparsley in the Debian packaging for Debian/Ubuntu users. LP: #535527 * Remove documentation of the old "-R" option for recursive searching of local CDDB data, it's now enabled always. (Closes issue 57). * Fix use of awk (sub instead of substr) when generating CRLF line endings. (Closes issue 59). * Make sure that ABCDETEMPDIR is quoted so we can deal with spaces in file and directory names. Closes issue 64. Thanks to richard.security.consultant for the patch, adapted slightly. * Tweak do_cdtext() so it works on OS X too. Closes issue 65. Thanks to richard.security.consultant for the patch. * Change cddb-tool to use bash to make sure that echo -n works. Closes issue 67. * Fixes for lots of spelling mistakes from vskytta. Closes issue 68. * For safety across different systems, avoid using "sed -i". Closes issue 66. -- Steve McIntyre <93sam@debian.org> Sat, 16 Jun 2012 15:12:11 +0100 abcde 2.5.2 [ Steve McIntyre ] * Re-fix speex tagging. (Closes issue 19). Thanks to vskytta for pointing out the problem - patch not applied properly in 2.5.1 * Quickly re-release as 2.5.2 -- Steve McIntyre <93sam@debian.org> Sun, 29 Apr 2012 17:17:14 +0100 abcde 2.5.1 [ Steve McIntyre ] * Several patches for improved Musicbrainz support from Martin Michlmayr: + add musicbrainz support for FLAC files with embedded cue files. Closes: #669139 + Don't submit to CDDB server when using musicbrainz Closes: #669140 + Don't tag CDDB string with musicbrainz id Closes: #669141 * Fix speex tagging. (Closes issue 19). Thanks to vskytta for the patch. * Fix aac tagging. (Closes issue 7). Thanks to Andrew Strong for forwarding the patch. * Add ATOMICPARSLEY=AtomicParsley (Closes issue 37). * On OS X, switch from disktool to diskutil. (Closes issue 43). * Updates for CD device detection: + Look for /dev/sr0, in case /dev/cdrom doesn't exist. (Closes issue 52). + Add suggested diskutil code to auto-detect the CD on OS X. (Closes issue 45). * Check that we have $CDDBTOOL before we start. (Closes issue 27). * Change the meaning of EXTRAVERBOSE; previously, it was a y/n option to make things more verbose. Add extra levels of verbosity (0, 1, 2 so far) and a new vvecho() function for callers to use. * With EXTRAVERBOSE==2 or more, make run_command() print out each command as it's run. (Closes issue 39). * If we don't find any CDDB or Musicbrainz information for the CD, try to extract CD-Text information to populate the cddbinfo template. (Closes issue 41). * Try to give more helpful error messages when we can't parse the command line, and exit rather than carry on. (Closes issue 51). [ Colin Tuckley ] * replace deprecated egrep with grep -E (Closes issue 24). Thanks to vskytta for the patch. * remove -o 0 options from make install (Closes issue 17). Thanks to vskytta for the patch. * clean up indentation on older changelog entries * remove tarball target from Makefile since dir structure has changed now that we use subversion. * improve presentation of options/defaults when asking a question (closes issue 9) -- Steve McIntyre <93sam@debian.org> Wed, 25 Apr 2012 12:35:00 +0100 abcde 2.5.0 * Bumped to 2.5.0 * Add support for Musicbrainz using a perl helper script. Closes: #665970 * Tweak man page. Thanks to Mats Erik Andersson for the patch. Closes: #627237 * Make the -q option work again. Thanks to A Mennucc for the patch. Closes: #562522 -- Steve McIntyre <93sam@debian.org> Fri, 13 Apr 2012 22:29:45 +0100 abcde 2.4.2 * Bumped to 2.4.2 * Fix Cue file always references "dummy.wav" bug patch from Chris Chiappa (Closes: #459928). * Whitespace cleanup, replace single perl instance with sed (Charles Steinkuehler) * Fix leadin/leadout computation for cue files broken bug Patch from Martin Michlmayr (Closes: #582175). -- Colin Tuckley <colint@debian.org> Sat, 29 May 2010 09:43:01 +0100 abcde 2.4.1 * Bumped to 2.4.1 * In manpage note a 2nd use for LOWDISK (or '-l' switch) it's faster and better on scratchy disks (Closes: #426343). * Add configurable options for replaygain tools. * Fix syntax error in tagged speex command (Closes: #554406) Ubuntu patch by Michael Helmling. * Fix mp3 tagging fails for single author albums (Closes: #554030) -- Colin Tuckley <colint@debian.org> Sun, 14 Feb 2010 13:09:47 +0000 abcde 2.4.0 * Bumped to 2.4 * Corrected REDIR redirection, this time with ifs instead of variable substitution, which did not work (Closes: #527191). * Added TPE2 for Various artists definition (Closes: #521669). * Incorporate syntax error fix patch from Andrew Ruder. * Fix formatting for track number tagging. * Replace dependency on cdda2wav with icedax since the former has been superseded. -- Colin Tuckley <colint@debian.org> Fri, 16 Oct 2009 19:33:33 +0100 abcde 2.3.99.8 * Remove svn Revision tag from version. * Correct homepage URL in README (Closes: #526165). * Fix typos (Closes: #435605, #435606). * Fix misspelling of comma in script and manpage (Closes: #435603). * Fix Writable temp directories not owned/writeable (Closes: #143552). * Fix broken range code, patch from Charles Steinkuehler (Closes: #389981). * Remove unneeded escapes in cddb-tool URLs. Add support for freedb2 (Closes: #391110). another patch from Charles Steinkuehler. * Fix Endless loop possible when mp3gain asks clipping question bug (Closes: #411579). * Update Vcs-Svn: tag in debian/control. * Add a recommends for vorbis-tools (Closes: #392843). * Update standards version to 3.8.2 (no changes required). * Fix debian/preinst not to ignore errors. -- Colin Tuckley <colint@debian.org> Sun, 02 Aug 2009 13:32:30 +0100
Diffstat (limited to 'audio')
-rw-r--r--audio/abcde/MESSAGE5
-rw-r--r--audio/abcde/Makefile40
-rw-r--r--audio/abcde/PLIST3
-rw-r--r--audio/abcde/distinfo9
-rw-r--r--audio/abcde/patches/patch-ac136
5 files changed, 24 insertions, 169 deletions
diff --git a/audio/abcde/MESSAGE b/audio/abcde/MESSAGE
index 23084dfb640..e94e0f57c7d 100644
--- a/audio/abcde/MESSAGE
+++ b/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
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index d1dd9051dbc..4929f7c7433 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,31 +1,30 @@
-# $NetBSD: Makefile,v 1.52 2012/09/23 05:36:22 obache Exp $
+# $NetBSD: Makefile,v 1.53 2015/01/04 12:03:07 wiz Exp $
-DISTNAME= abcde-2.3.99.7_p235
-PKGNAME= abcde-2.3.99.7
-PKGREVISION= 2
+DISTNAME= abcde-2.6
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 +43,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 +56,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"
diff --git a/audio/abcde/PLIST b/audio/abcde/PLIST
index 9e99cf831e7..3d4c7564443 100644
--- a/audio/abcde/PLIST
+++ b/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
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 5a93c3fdb52..755f57b457d 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.36 2011/05/11 10:28:08 hans Exp $
+$NetBSD: distinfo,v 1.37 2015/01/04 12:03:07 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
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac
deleted file mode 100644
index 7ba26e75705..00000000000
--- a/audio/abcde/patches/patch-ac
+++ /dev/null
@@ -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