diff options
| author | agc <agc> | 2003-09-15 11:17:27 +0000 |
|---|---|---|
| committer | agc <agc> | 2003-09-15 11:17:27 +0000 |
| commit | a173686b9d6f8e3000de295263ae985b270c406d (patch) | |
| tree | d6b07e797fce0e866bff308c4492a486ad9a3732 /audio/abcde/patches | |
| parent | b665c1074f333142457e0ec7b7dee33279f511da (diff) | |
| download | pkgsrc-a173686b9d6f8e3000de295263ae985b270c406d.tar.gz | |
Incorporate James Wetterau's patch from PR 20763 to warn if there is no
encoder in the path.
Unify patch-ac and patch-ae which both patch the same file.
Bump pkgrevision to nb4
Diffstat (limited to 'audio/abcde/patches')
| -rw-r--r-- | audio/abcde/patches/patch-ac | 21 | ||||
| -rw-r--r-- | audio/abcde/patches/patch-ae | 13 |
2 files changed, 20 insertions, 14 deletions
diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac index 811a1f8a1ad..41d8a56a66a 100644 --- a/audio/abcde/patches/patch-ac +++ b/audio/abcde/patches/patch-ac @@ -1,7 +1,16 @@ -$NetBSD: patch-ac,v 1.13 2003/07/12 15:25:55 wiz Exp $ +$NetBSD: patch-ac,v 1.14 2003/09/15 11:17:28 agc Exp $ --- abcde.orig Sun May 18 23:01:13 2003 +++ abcde +@@ -337,7 +337,7 @@ + do + TRACKFILES="$TRACKFILES track$UTRACKNUM.wav" + done +- nice $ENCNICE $ENCODER $ENCODEROPTS --nogap $TRACKFILES ++ nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS --nogap $TRACKFILES + RETURN=$? + if [ "$RETURN" != "0" ]; then + echo "batch-encode: $ENCODER returned code $RETURN" >> errors @@ -1233,8 +1233,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then fi @@ -33,3 +42,13 @@ $NetBSD: patch-ac,v 1.13 2003/07/12 15:25:55 wiz Exp $ ;; cdda2wav) CDROMREADER="$CDDA2WAV" +@@ -1427,7 +1427,8 @@ + 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 diff --git a/audio/abcde/patches/patch-ae b/audio/abcde/patches/patch-ae deleted file mode 100644 index f3bfe8c67a9..00000000000 --- a/audio/abcde/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2003/06/30 19:20:37 rafal Exp $ - ---- abcde.orig 2003-06-30 15:06:18.000000000 -0400 -+++ abcde 2003-06-30 15:07:32.000000000 -0400 -@@ -337,7 +337,7 @@ - do - TRACKFILES="$TRACKFILES track$UTRACKNUM.wav" - done -- nice $ENCNICE $ENCODER $ENCODEROPTS --nogap $TRACKFILES -+ nice $ENCNICE $MP3ENCODER $MP3ENCODEROPTS --nogap $TRACKFILES - RETURN=$? - if [ "$RETURN" != "0" ]; then - echo "batch-encode: $ENCODER returned code $RETURN" >> errors |