diff options
| author | wiz <wiz> | 2003-07-12 15:25:53 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2003-07-12 15:25:53 +0000 |
| commit | 9beb58be78b58ffaa26790decfd03af5f5c2f675 (patch) | |
| tree | 2f0907c32ddb35ab94eec41b6fdd0f2bca2d3dab /audio | |
| parent | ea1ac498e54a0da7a542606e2b8beb37ce4f1c8d (diff) | |
| download | pkgsrc-9beb58be78b58ffaa26790decfd03af5f5c2f675.tar.gz | |
abcde ignored -d flag when in cdparanoia mode.
From Sergey Svishchev in PR 19872.
Bump PKGREVISION.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/abcde/Makefile | 4 | ||||
| -rw-r--r-- | audio/abcde/distinfo | 4 | ||||
| -rw-r--r-- | audio/abcde/patches/patch-ac | 22 |
3 files changed, 19 insertions, 11 deletions
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile index 74bfccd36e9..8108464fe80 100644 --- a/audio/abcde/Makefile +++ b/audio/abcde/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2003/06/30 19:24:04 rafal Exp $ +# $NetBSD: Makefile,v 1.15 2003/07/12 15:25:53 wiz Exp $ DISTNAME= abcde-2.1.4 -PKGREVISION= 2 +PKGREVISION= 3 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 50f351fd602..e18a1d3e132 100644 --- a/audio/abcde/distinfo +++ b/audio/abcde/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.17 2003/06/30 19:21:29 rafal Exp $ +$NetBSD: distinfo,v 1.18 2003/07/12 15:25:53 wiz 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) = ec1deedcc83453ecaf8e648052076fe6f91d3ecf +SHA1 (patch-ac) = 50fdf70637493358d83d6ad8f25e9650de1d8bdc SHA1 (patch-ad) = d6aecd0279087d190fb2c467526dbc35496659e9 SHA1 (patch-ae) = c184b8df4b2ed69ff0d695fbef15c9f1f32158ca diff --git a/audio/abcde/patches/patch-ac b/audio/abcde/patches/patch-ac index dfa7ae137e0..811a1f8a1ad 100644 --- a/audio/abcde/patches/patch-ac +++ b/audio/abcde/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.12 2003/06/10 12:59:47 wiz Exp $ +$NetBSD: patch-ac,v 1.13 2003/07/12 15:25:55 wiz Exp $ ---- abcde.orig 2003-05-25 12:37:53.000000000 +0200 -+++ abcde 2003-05-25 12:40:44.000000000 +0200 -@@ -1233,8 +1233,8 @@ +--- abcde.orig Sun May 18 23:01:13 2003 ++++ abcde +@@ -1233,8 +1233,8 @@ if [ -z "$WAVOUTPUTDIR" ]; then fi # Load system defaults @@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.12 2003/06/10 12:59:47 wiz Exp $ fi # Load user preference defaults if [ -r $HOME/.abcde.conf ]; then -@@ -1260,8 +1260,9 @@ +@@ -1260,8 +1260,8 @@ else elif [ -e /dev/acd0c ]; then CDROM=/dev/acd0c else @@ -21,7 +21,15 @@ $NetBSD: patch-ac,v 1.12 2003/06/10 12:59:47 wiz Exp $ - exit 1 + RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'` + CDROM=/dev/rcd0$RAWPART -+ CDPARANOIAOPTS="-g ${CDROM}" fi fi - + +@@ -1308,7 +1308,7 @@ done + case "$CDROMREADERSYNTAX" in + cdparanoia|debug) + CDROMREADER="$CDPARANOIA" +- CDROMREADEROPTS="$CDPARANOIAOPTS" ++ CDROMREADEROPTS="$CDPARANOIAOPTS -g ${CDROM}" + ;; + cdda2wav) + CDROMREADER="$CDDA2WAV" |