diff options
| author | agc <agc@pkgsrc.org> | 2003-09-15 11:17:27 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2003-09-15 11:17:27 +0000 |
| commit | b9f8d53918ab9814a52cfb6eb9c469bf8080af0f (patch) | |
| tree | d6b07e797fce0e866bff308c4492a486ad9a3732 /audio | |
| parent | 09bdda86a4a56731e44d335806bcee6aaf6eedfa (diff) | |
| download | pkgsrc-b9f8d53918ab9814a52cfb6eb9c469bf8080af0f.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')
| -rw-r--r-- | audio/abcde/Makefile | 4 | ||||
| -rw-r--r-- | audio/abcde/distinfo | 5 | ||||
| -rw-r--r-- | audio/abcde/patches/patch-ac | 21 | ||||
| -rw-r--r-- | audio/abcde/patches/patch-ae | 13 |
4 files changed, 24 insertions, 19 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index a77e0350b05..80c264defbb 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2003/07/17 21:21:53 grant Exp $ +# $NetBSD: Makefile,v 1.17 2003/09/15 11:17:27 agc Exp $ DISTNAME= abcde-2.1.4 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= audio MASTER_SITES= http://www.hispalinux.es/~data/files/ DISTFILES= ${DISTNAME:S/-/_/}.orig.tar.gz diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo index e18a1d3e132..3e70c170826 100644 --- a/audio/abcde/distinfo +++ b/audio/abcde/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.18 2003/07/12 15:25:53 wiz Exp $ +$NetBSD: distinfo,v 1.19 2003/09/15 11:17:27 agc Exp $ SHA1 (abcde_2.1.4.orig.tar.gz) = 0d00d1ab462f38c449b575b17828bdc20c35ca65 Size (abcde_2.1.4.orig.tar.gz) = 42945 bytes SHA1 (patch-ab) = 524452b3930c25351deee7a508f98bcd0f51a872 -SHA1 (patch-ac) = 50fdf70637493358d83d6ad8f25e9650de1d8bdc +SHA1 (patch-ac) = a752b7f3e54c7bb2ed38b08c45c564428fedffba SHA1 (patch-ad) = d6aecd0279087d190fb2c467526dbc35496659e9 -SHA1 (patch-ae) = c184b8df4b2ed69ff0d695fbef15c9f1f32158ca 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 |