>Number:         19872
>Category:       pkg
>Synopsis:       audio/abcde ignores -d flag when in cdparanoia mode
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 16 02:45:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergey Svishchev
>Release:        1.6L
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:
Index: audio/abcde/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/abcde/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- audio/abcde/distinfo	2003/01/01 19:06:01	1.13
+++ audio/abcde/distinfo	2003/01/16 01:13:52
@@ -4,5 +4,5 @@
 Size (abcde_2.0.3.orig.tar.gz) = 35655 bytes
 SHA1 (patch-aa) = 262ab12dfe094f1fc50c5fa4ca19ab73a8b6541a
 SHA1 (patch-ab) = 524452b3930c25351deee7a508f98bcd0f51a872
-SHA1 (patch-ac) = 59eccd903d65fe3834d9d728d69dca3c238a7f9e
+SHA1 (patch-ac) = 374d915ac40a634201810d1d95bdc4eaa0d07156
 SHA1 (patch-ad) = b37aebe39a003da917d7b192e9169af4c2d17115
Index: audio/abcde/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/audio/abcde/patches/patch-ac,v
retrieving revision 1.10
diff -u -r1.10 patch-ac
--- audio/abcde/patches/patch-ac	2003/01/01 19:06:02	1.10
+++ audio/abcde/patches/patch-ac	2003/01/16 01:13:55
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.10 2003/01/01 19:06:02 kim Exp $
+$NetBSD$
 
---- abcde.orig	Mon Jan 28 00:44:02 2002
-+++ abcde	Wed Jan  1 13:50:59 2003
+--- abcde.orig	Mon Jan 28 08:44:02 2002
++++ abcde
 @@ -17,7 +17,8 @@
  echo "This is abcde v$VERSION."
  echo "Usage: abcde [options] [tracks]"
@@ -271,6 +271,15 @@
  			VARIOUSARTISTS=n
  			;;
  		esac
+@@ -864,7 +974,7 @@
+ 		echo "Grabbing track $UTRACKNUM..." >&2
+ 	fi
+ 	case "$CDROMREADERSYNTAX" in
+-		cdparanoia) nice $READNICE $CDROMREADER -d $CDROM $UTRACKNUM "$WAVDATA" >&2 ;;
++		cdparanoia) nice $READNICE $CDROMREADER -d $CDROM -g $CDROM $UTRACKNUM "$WAVDATA" >&2 ;;
+ 		cdda2wav) nice $READNICE $CDROMREADER -H -D $CDROM -t $UTRACKNUM "$WAVDATA" >&2 ;;
+ 		debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
+ 	esac
 @@ -899,6 +1009,7 @@
  READNICE=10
  VARIOUSARTISTS=n
@@ -295,7 +304,7 @@
  
  # Options for programs called from abcde
  LAMEOPTS=
-@@ -929,14 +1042,15 @@
+@@ -929,14 +1042,16 @@
  MP3ENCOPTS=
  VORBIZEOPTS=
  OGGENCOPTS=
@@ -304,6 +313,7 @@
  ID3V2OPTS=
 -CDPARANOIAOPTS=
  CDDA2WAVOPTS=
++CDPARANOIAOPTS=
  WGETOPTS=
  CDDBTOOLOPTS=
  EJECTOPTS=
@@ -312,7 +322,7 @@
  
  # Default to one process if -j isn't specified
  MAXPROCS=1
-@@ -948,7 +1062,7 @@
+@@ -948,7 +1063,7 @@
  # Custom filename munging:
  mungefilename ()
  {
@@ -321,7 +331,7 @@
  }
  
  # If CDDBAVAIL is set to n, no CDDB read is done
-@@ -964,17 +1078,13 @@
+@@ -964,17 +1079,12 @@
  	WAVOUTPUTDIR="$OUTPUTDIR"
  fi
  
@@ -334,7 +344,6 @@
 -fi
 +RAWPART=`sysctl -n kern.rawpartition | awk '{printf "%c",97+$0}'`
 +CDROM=/dev/rcd0$RAWPART
-+CDPARANOIAOPTS="-g ${CDROM}"
  
  # Load system defaults
 -if [ -r /etc/abcde.conf ]; then

>Release-Note:
>Audit-Trail:
>Unformatted: