Attachment #31183 for bug #52076

View | Details | Raw Unified | Return to bug 52076
Collapse All | Expand All




#

PORTNAME=	abcde
PORTVERSION=	2.1.4
PORTREVISION=	4
CATEGORIES=	audio
MASTER_SITES=	http://www.hispalinux.es/~data/files/
DISTNAME= 	abcde_${PORTVERSION}.orig

MAINTAINER=	mchopra@engmail.uwaterloo.ca
COMMENT=	Front-end sh script to encode CDs in ogg or mp3 format

RUN_DEPENDS=    cd-discid:${PORTSDIR}/audio/cd-discid \
		cdparanoia:${PORTSDIR}/audio/cdparanoia \
		id3v2:${PORTSDIR}/audio/id3v2 \
		lame:${PORTSDIR}/audio/lame \
		normalize:${PORTSDIR}/audio/normalize \
		oggenc:${PORTSDIR}/audio/vorbis-tools

NO_BUILD=	yes

.if defined(WITH_CDDA2WAV)
RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
.else
CDDA2WAV_MSG=	"Define WITH_CDDA2WAV to enable cdda2wav support."
.endif

.if defined(WITH_DAGRAB)
RUN_DEPENDS+=   dagrab:${PORTSDIR}/audio/dagrab
.else
DAGRAB_MSG=     "Define WITH_DAGRAB to enable dagrab support."
.endif

.if defined(WITH_EJECT)

EJECT_MSG=     "Define WITH_EJECT to enable auto-eject support."
.endif

.if defined(WITH_FLAC)
RUN_DEPENDS+=	flac:${PORTSDIR}/audio/flac
.else
FLAC_MSG=     "Define WITH_FLAC to enable flac support."
.endif

pre-fetch:
.if defined(CDDA2WAV_MSG)
	@${ECHO_MSG} ${CDDA2WAV_MSG}
	@${ECHO_MSG} ""
.endif
.if defined(DAGRAB_MSG)
	@${ECHO_MSG} ${DAGRAB_MSG}
	@${ECHO_MSG} ""
.endif
.if defined(EJECT_MSG)
	@${ECHO_MSG} ${EJECT_MSG}
	@${ECHO_MSG} ""
.endif
.if defined(EJECT_MSG)
	@${ECHO_MSG} ${FLAC_MSG}
	@${ECHO_MSG} ""
.endif


do-install:
	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin

	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/man/man1
	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/man/man1


post-install:
	@${ECHO_MSG} ""
	@${ECHO_MSG} "Please copy ${PREFIX}/etc/abcde.conf to ~/.abcde.conf"
	@${ECHO_MSG} "and edit as necessary. Sane defaults have been set."
	@${ECHO_MSG} "
	@${ECHO_MSG} "NOTE: As of version 2.1.4, you will need to start with"
	@${ECHO_MSG} "a fresh copy of the supplied abcde.conf file. Since all"
	@${ECHO_MSG} "FreeBSD-specific patches have now entered the vendor"
	@${ECHO_MSG} "code, little or no editing should be necessary."
	@${ECHO_MSG} ""

.include <bsd.port.mk>

Line 1 Link Here

(-)abcde/distinfo (-1 / +1 lines)
1	MD5 (abcde_2.0.3.orig.tar.gz) = e430e3d2fb87729d6452d495eabd7a7a	1	MD5 (abcde_2.1.4.orig.tar.gz) = aef4170cb8e8e41d0434bdd30b61e502




--- abcde.conf.orig	Sun May 11 12:58:34 2003
+++ abcde.conf	Sun May 11 13:22:44 2003
@@ -87,7 +87,7 @@
 #MP3ENCOPTS=
 # Ogg:
 #VORBIZEOPTS=
-#OGGENCOPTS=
+OGGENCOPTS="-q 5"
 # FLAC:
 #FLACOPTS=
 					# and compensate by making a template
@@ -574,7 +574,7 @@
 			fi
 			# List out disc title/author and contents
 			echo ---- "$(cut '-d ' -f4- "$ABCDETEMPDIR/cddbquery")" ---- >> "$ABCDETEMPDIR/cddbchoices"
-			for TRACK in $(seq 1 $TRACKS)
+			for TRACK in $(jot $TRACKS)
 			do
 				echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
 			done
@@ -590,7 +590,7 @@
 			$CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.1"
 			# List out disc title/author and contents of template
 			echo ---- Unknown Artist / Unknown Album ---- >> "$ABCDETEMPDIR/cddbchoices"
-			for TRACK in $(seq 1 $TRACKS)
+			for TRACK in $(jot $TRACKS)
 			do
 				echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
 			done
@@ -620,7 +620,7 @@
 				fi
 				# List out disc title/author and contents
 				echo \#$X: ---- "$DISCINFO" ---- >> "$ABCDETEMPDIR/cddbchoices"
-				for TRACK in $(seq 1 $TRACKS)
+				for TRACK in $(jot $TRACKS)
 				do
 					echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.$X" | cut -f2- -d= | tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
 				done
@@ -866,7 +866,8 @@
 	case "$CDROMREADERSYNTAX" in
 		cdparanoia) nice $READNICE $CDROMREADER -d $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 ;;
+		dagrab) nice $READNICE $CDROMREADER -d $CDROM -f $WAVDATA -v $UTRACKNUM >&2 ;;
+        debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
 	esac
 	RETURN=$?
 	if [ "$RETURN" != "0" ]; then
@@ -913,7 +914,8 @@
 ID3V2=id3v2
 CDPARANOIA=cdparanoia
 CDDA2WAV=cdda2wav
-WGET=wget
+DAGRAB=dagrab
+FETCH=fetch
 CDDISCID=cd-discid
 CDDBTOOL=cddb-tool
 EJECT=eject
@@ -933,7 +935,8 @@
 ID3V2OPTS=
 CDPARANOIAOPTS=
 CDDA2WAVOPTS=
-WGETOPTS=
+DAGRABOPTS=
+FETCHOPTS=
 CDDBTOOLOPTS=
 EJECTOPTS=
 DISTMP3OPTS=
@@ -1010,7 +1013,7 @@
 	if [ "$RSTART" = "$REND" ]; then 
 		NEWTRACKS="$RSTART"
 	else
-		NEWTRACKS=$(seq -s ' ' $RSTART $REND)
+		NEWTRACKS=$(jot -s ' ' $(($REND - $RSTART + 1)) $RSTART $REND``)
 	fi
 	TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
 
@@ -145,10 +145,10 @@
 # Since multiple-output was integrated we always append the file type
 # to the files. Remove it from your user defined string if you are getting
 # files like ".ogg.ogg".
-#OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
+        CDROMREADEROPTS="$DAGRABOPTS"
 esac
 
 # Like OUTPUTFORMAT but for Various Artists discs.
-#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}'
+VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
 
 # Define how many encoders to run at once. This makes for huge speedups
 # on SMP systems. Defaults to 1. Equivalent to -j.
-	${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT} seq
+for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $ENCODER $FETCH \
+	${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT} jot
 do
 	# Cut off the command-line options we just added in
 	X=$(echo $X | cut -d' ' -f2)
@@ -1184,14 +1190,20 @@
 # We are now finished with the cdrom - it can be safely ejected. Note that
 # abcde will not have completed yet.
 if [ "$EJECTCD" = "y" ]; then
-	$EJECT $EJECTOPTS $CDROM
+	# FreeBSD eject uses the EJECT environment variable to name the CDROM
+        # but in this script EJECT is in the envionment and names the program
+        eject=$EJECT
+	unset EJECT
+	# The FreeBSD eject needs "adc0" not "/dev/adc0c"
+	cd="$(echo $CDROM | sed -e 's=.*/==;s=[a-h]$==;')"
+	$eject $EJECTOPTS $cd
 fi
 ) | (
 # Do the encoding, including parallelization of remote encoding
 # Figure out where each track is going to be encoded
 ENCODELOCATIONS="$(echo $REMOTEHOSTS | tr , ' ')"
 if [ "$MAXPROCS" != "0" ]; then
-	for NUM in $(seq 1 "$MAXPROCS")
+	for NUM in $(jot "$MAXPROCS")
 	do
 		ENCODELOCATIONS="$ENCODELOCATIONS %local$NUM%"
 	done




--- abcde.conf.orig	Sun Jan 20 21:35:31 2002
+++ abcde.conf	Thu Jan  9 23:45:53 2003
@@ -51,7 +51,7 @@
 #ID3V2=id3v2
 #CDPARANOIA=cdparanoia
 #CDDA2WAV=cdda2wav
-#WGET=wget
+#FETCH=fetch
 #CDDISCID=cd-discid
 #CDDBTOOL=cddb-tool
 #EJECT=eject
@@ -71,7 +71,8 @@
 #ID3V2OPTS=
 #CDPARANOIAOPTS=
 #CDDA2WAVOPTS=
-#WGETOPTS=
+#DAGRABOPTS=
+#FETCHOPTS=
 #CDDBTOOLOPTS=
 #EJECTOPTS=
 #DISTMP3OPTS=
@@ -96,7 +97,7 @@
 #NOCDDBQUERY=n
 
 # CD device you want to read from
-#CDROM=/dev/cdrom
+CDROM=/dev/acd0c
 
 # If you'd like to make a default location that overrides the current
 # directory for putting mp3's, uncomment this.
@@ -115,10 +116,10 @@
 # OUTPUTTYPE, ALBUMFILE, ARTISTFILE, TRACKFILE, and TRACKNUM.
 # Make sure to single-quote this variable. abcde will automatically create
 # the directory portion of this filename.
-#OUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}.${OUTPUTTYPE}'
+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}.${OUTPUTTYPE}'
 
 # Like OUTPUTFORMAT but for Various Artists discs.
-#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}.${OUTPUTTYPE}'
+VAOUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}.${OUTPUTTYPE}'
 
 # Define how many encoders to run at once. This makes for huge speedups
 # on SMP systems. Defaults to 1. Equivalent to -j.




--- cddb-tool.orig	Mon Jan 21 03:29:23 2002
+++ cddb-tool	Thu Oct 31 19:41:23 2002
@@ -30,9 +30,9 @@
 LOOKUP_ERR=13      # problem connecting to cddb server
 EMPTY_QUERY_RESPONSE=14	# query response = "", (probably no net connection)
 
-# assume a reasonable default if $WGET is undefined
-if [ "$WGET" = "" ]; then
-	WGET=wget
+# assume a reasonable default if $FETCH is undefined
+if [ "$FETCH" = "" ]; then
+	FETCH=fetch
 fi
 
 usage() {
@@ -74,8 +74,8 @@
   read server user host disc-id genre
 	CDDB file is dumped to stdout. File will contain an extra
 	#CATEGORY= line, which leaves it a valid CDDB file but which will
-	be recognized by parse and send commands. Uses wget, so if you
-	need to use a proxy then just configure wget to do so. user and
+	be recognized by parse and send commands. Uses fetch, so if you
+	need to use a proxy then just configure fetch to do so. user and
 	host will be used for identifying ourselves to the CDDB server.
   help  
 	Display this.
@@ -119,7 +119,7 @@
 	echo '#'
 	echo '# Track frame offsets:'
 	NUMTRACKS=$2
-	for x in $(seq 3 $(expr $NUMTRACKS + 2))
+	for x in $(jot $NUMTRACKS 3 $(expr $NUMTRACKS + 2))
 	do
 		printf "#\t$(echo "$DISCID" | cut -f$x -d' ')\n"
 	done
@@ -135,13 +135,13 @@
 	echo DISCID="$DISCNUM"
 	echo "DTITLE=Unknown Artist / Unknown Album"
 	# TTITLE0 -- TTITLEn
-	for x in $(seq 1 $NUMTRACKS)
+	for x in $(jot $NUMTRACKS)
 	do
 		echo "TTITLE$(expr $x - 1)=Track $x"
 	done
 	echo "EXTD="
 	# EXTT0 -- EXTTn
-	for x in $(seq 1 $NUMTRACKS)
+	for x in $(jot $NUMTRACKS)
 	do
 		echo "EXTT$(expr $x - 1)="
 	done
@@ -164,7 +164,7 @@
 	shift 3
 	TRACKINFO="$@"
 	TRACKINFOPLUS=$(echo $TRACKINFO | tr ' ' '+')
-	RESULTS=$($WGET -q -O - "$SERVER?cmd=cddb+query+$TRACKINFOPLUS\&hello=$HELLOINFO\&proto=3") || exit $LOOKUP_ERR
+	RESULTS=$($FETCH -q -o - "$SERVER?cmd=cddb+query+$TRACKINFOPLUS\&hello=$HELLOINFO\&proto=3") || exit $LOOKUP_ERR
 	echo $RESULTS | tr '\r' '\n' | tr -s '\n' | sed 's/^ //g'
 	;;
 
@@ -175,7 +175,7 @@
 	CATEGORY="$4"
 	DISCID="$5"
 	HELLOINFO="$USER+$HOST+$NAME+$VERSION"
-	$WGET -q -O - $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID\&hello=$HELLOINFO\&proto=3" 2>/dev/null
+	$FETCH -q -o - $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID\&hello=$HELLOINFO\&proto=3" 2>/dev/null
 	;;
 
 	help) help ;;





Rippers supported: cdparanoia, cdda2wav, dagrab
Encoders supported: oggenc, vorbize, lame, gogo, bladeenc,
                    mp3enc, xingmp3enc, l3enc, flac
ID3 taggers supported: id3, id3v2
Other: vorbiscomment, distmp3, normalize

Many other useful features are supported.

WWW: http://www.hispalinux.es/~data/abcde.php

- Munish Chopra
<mchopra@engmail.uwaterloo.ca>

Return to bug 52076

Lines 6-16 Link Here

(-)abcde/Makefile (-10 / +25 lines)
6	#	6	#
7		7
8	PORTNAME= abcde	8	PORTNAME= abcde
9	PORTVERSION= 2.0.3	9	PORTVERSION= 2.1.4
10	PORTREVISION= 4
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= http://frantica.lly.org/~rcw/abcde/	11	MASTER_SITES= http://www.hispalinux.es/~data/files/
13	DISTNAME= abcde_2.0.3.orig	12	DISTNAME= abcde_${PORTVERSION}.orig
14		13
15	MAINTAINER= mchopra@engmail.uwaterloo.ca	14	MAINTAINER= mchopra@engmail.uwaterloo.ca
16	COMMENT= Front-end sh script to encode CDs in ogg or mp3 format	15	COMMENT= Front-end sh script to encode CDs in ogg or mp3 format
Lines 18-23 Link Here
18	RUN_DEPENDS= cd-discid:${PORTSDIR}/audio/cd-discid \	17	RUN_DEPENDS= cd-discid:${PORTSDIR}/audio/cd-discid \
19	cdparanoia:${PORTSDIR}/audio/cdparanoia \	18	cdparanoia:${PORTSDIR}/audio/cdparanoia \
20	id3v2:${PORTSDIR}/audio/id3v2 \	19	id3v2:${PORTSDIR}/audio/id3v2 \
		20	lame:${PORTSDIR}/audio/lame \
		21	normalize:${PORTSDIR}/audio/normalize \
21	oggenc:${PORTSDIR}/audio/vorbis-tools	22	oggenc:${PORTSDIR}/audio/vorbis-tools
22		23
23	NO_BUILD= yes	24	NO_BUILD= yes
Lines 27-39 Link Here
27	.if defined(WITH_CDDA2WAV)	28	.if defined(WITH_CDDA2WAV)
28	RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools	29	RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools
29	.else	30	.else
30	CDDA2WAV_MSG= "Define WITH_CDDA2WAV to enable support for cdda2wav."	31	CDDA2WAV_MSG= "Define WITH_CDDA2WAV to enable cdda2wav support."
31	.endif	32	.endif
32		33
33	.if defined(WITH_DAGRAB)	34	.if defined(WITH_DAGRAB)
34	RUN_DEPENDS+= dagrab:${PORTSDIR}/audio/dagrab	35	RUN_DEPENDS+= dagrab:${PORTSDIR}/audio/dagrab
35	.else	36	.else
36	DAGRAB_MSG= "Define WITH_DAGRAB to enable support for dagrab."	37	DAGRAB_MSG= "Define WITH_DAGRAB to enable dagrab support."
37	.endif	38	.endif
38		39
39	.if defined(WITH_EJECT)	40	.if defined(WITH_EJECT)
Lines 42-63 Link Here
42	EJECT_MSG= "Define WITH_EJECT to enable auto-eject support."	43	EJECT_MSG= "Define WITH_EJECT to enable auto-eject support."
43	.endif	44	.endif
44		45
		46	.if defined(WITH_FLAC)
		47	RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac
		48	.else
		49	FLAC_MSG= "Define WITH_FLAC to enable flac support."
		50	.endif
45		51
46	pre-fetch:	52	pre-fetch:
		53	.if defined(CDDA2WAV_MSG)
		54	@${ECHO_MSG} ${CDDA2WAV_MSG}
		55	@${ECHO_MSG} ""
		56	.endif
47	.if defined(DAGRAB_MSG)	57	.if defined(DAGRAB_MSG)
48	@${ECHO_MSG} ${DAGRAB_MSG}	58	@${ECHO_MSG} ${DAGRAB_MSG}
49	@${ECHO_MSG} ""	59	@${ECHO_MSG} ""
50	.endif	60	.endif
51	.if defined(CDDA2WAV_MSG)	61	.if defined(EJECT_MSG)
52	@${ECHO_MSG} ${CDDA2WAV_MSG}	62	@${ECHO_MSG} ${EJECT_MSG}
53	@${ECHO_MSG} ""	63	@${ECHO_MSG} ""
54	.endif	64	.endif
55	.if defined(EJECT_MSG)	65	.if defined(EJECT_MSG)
56	@${ECHO_MSG} ${EJECT_MSG}	66	@${ECHO_MSG} ${FLAC_MSG}
57	@${ECHO_MSG} ""	67	@${ECHO_MSG} ""
58	.endif	68	.endif
59		69
60
61	do-install:	70	do-install:
62	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin	71	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
63	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin	72	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
Lines 65-74 Link Here
65	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/man/man1	74	${INSTALL_MAN} ${WRKSRC}/abcde.1 ${PREFIX}/man/man1
66	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/man/man1	75	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 ${PREFIX}/man/man1
67		76
		77
68	post-install:	78	post-install:
69	@${ECHO_MSG} ""	79	@${ECHO_MSG} ""
70	@${ECHO_MSG} "Please copy ${PREFIX}/etc/abcde.conf to ~/.abcde.conf"	80	@${ECHO_MSG} "Please copy ${PREFIX}/etc/abcde.conf to ~/.abcde.conf"
71	@${ECHO_MSG} "and edit as necessary. Sane defaults have been set."	81	@${ECHO_MSG} "and edit as necessary. Sane defaults have been set."
		82	@${ECHO_MSG} "
		83	@${ECHO_MSG} "NOTE: As of version 2.1.4, you will need to start with"
		84	@${ECHO_MSG} "a fresh copy of the supplied abcde.conf file. Since all"
		85	@${ECHO_MSG} "FreeBSD-specific patches have now entered the vendor"
		86	@${ECHO_MSG} "code, little or no editing should be necessary."
72	@${ECHO_MSG} ""	87	@${ECHO_MSG} ""
73		88
74	.include <bsd.port.mk>	89	.include <bsd.port.mk>

Lines 1-121 Link Here

(-)abcde/files/patch-aa (-118 / +21 lines)
1	--- abcde.orig Mon Jan 28 00:44:02 2002	1	--- abcde.conf.orig Sun May 11 12:58:34 2003
2	+++ abcde Tue Feb 11 23:08:44 2003	2	+++ abcde.conf Sun May 11 13:22:44 2003
3	@@ -534,7 +534,7 @@	3	@@ -87,7 +87,7 @@
4	;;	4	#MP3ENCOPTS=
5	12\|13\|14)	5	# Ogg:
6	# no match found in database,	6	#VORBIZEOPTS=
7	- # wget error, or user requested not to use CDDB	7	-#OGGENCOPTS=
8	+ # fetch error, or user requested not to use CDDB	8	+OGGENCOPTS="-q 5"
9	# Make up an error code (503) that abcde	9	# FLAC:
10	# will recognize in do_cddbread	10	#FLACOPTS=
11	# and compensate by making a template
12	@@ -574,7 +574,7 @@
13	fi
14	# List out disc title/author and contents
15	echo ---- "$(cut '-d ' -f4- "$ABCDETEMPDIR/cddbquery")" ---- >> "$ABCDETEMPDIR/cddbchoices"
16	- for TRACK in $(seq 1 $TRACKS)
17	+ for TRACK in $(jot $TRACKS)
18	do
19	echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" \| cut -f2- -d= \| tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
20	done
21	@@ -590,7 +590,7 @@
22	$CDDBTOOL template $(cat "$ABCDETEMPDIR/discid") > "$ABCDETEMPDIR/cddbread.1"
23	# List out disc title/author and contents of template
24	echo ---- Unknown Artist / Unknown Album ---- >> "$ABCDETEMPDIR/cddbchoices"
25	- for TRACK in $(seq 1 $TRACKS)
26	+ for TRACK in $(jot $TRACKS)
27	do
28	echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.1" \| cut -f2- -d= \| tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
29	done
30	@@ -620,7 +620,7 @@
31	fi
32	# List out disc title/author and contents
33	echo \#$X: ---- "$DISCINFO" ---- >> "$ABCDETEMPDIR/cddbchoices"
34	- for TRACK in $(seq 1 $TRACKS)
35	+ for TRACK in $(jot $TRACKS)
36	do
37	echo $TRACK: "$(grep ^TTITLE$(expr $TRACK - 1)= "$ABCDETEMPDIR/cddbread.$X" \| cut -f2- -d= \| tr -d \\r\\n)" >> "$ABCDETEMPDIR/cddbchoices"
38	done
39	@@ -866,7 +866,8 @@
40	case "$CDROMREADERSYNTAX" in
41	cdparanoia) nice $READNICE $CDROMREADER -d $CDROM $UTRACKNUM "$WAVDATA" >&2 ;;
42	cdda2wav) nice $READNICE $CDROMREADER -H -D $CDROM -t $UTRACKNUM "$WAVDATA" >&2 ;;
43	- debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
44	+ dagrab) nice $READNICE $CDROMREADER -d $CDROM -f $WAVDATA -v $UTRACKNUM >&2 ;;
45	+ debug) nice $READNICE $CDROMREADER -d $CDROM -w $UTRACKNUM-[:1] "$WAVDATA" >&2 ;;
46	esac
47	RETURN=$?
48	if [ "$RETURN" != "0" ]; then
49	@@ -913,7 +914,8 @@
50	ID3V2=id3v2
51	CDPARANOIA=cdparanoia
52	CDDA2WAV=cdda2wav
53	-WGET=wget
54	+DAGRAB=dagrab
55	+FETCH=fetch
56	CDDISCID=cd-discid
57	CDDBTOOL=cddb-tool
58	EJECT=eject
59	@@ -933,7 +935,8 @@
60	ID3V2OPTS=
61	CDPARANOIAOPTS=
62	CDDA2WAVOPTS=
63	-WGETOPTS=
64	+DAGRABOPTS=
65	+FETCHOPTS=
66	CDDBTOOLOPTS=
67	EJECTOPTS=
68	DISTMP3OPTS=
69	@@ -1010,7 +1013,7 @@
70	if [ "$RSTART" = "$REND" ]; then
71	NEWTRACKS="$RSTART"
72	else
73	- NEWTRACKS=$(seq -s ' ' $RSTART $REND)
74	+ NEWTRACKS=$(jot -s ' ' $(($REND - $RSTART + 1)) $RSTART $REND``)
75	fi
76	TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS")
77		11
78	@@ -1027,6 +1030,9 @@	12	@@ -145,10 +145,10 @@
79	CDROMREADER="$CDDA2WAV"	13	# Since multiple-output was integrated we always append the file type
80	CDROMREADEROPTS="$CDDA2WAVOPTS"	14	# to the files. Remove it from your user defined string if you are getting
81	;;	15	# files like ".ogg.ogg".
82	+ dagrab)	16	-#OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
83	+ CDROMREADER="$DAGRAB"	17	+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
84	+ CDROMREADEROPTS="$DAGRABOPTS"
85	esac
86		18
87	# If nothing has been specified, use oggenc for oggs and lame for mp3s	19	# Like OUTPUTFORMAT but for Various Artists discs.
88	@@ -1100,8 +1106,8 @@	20	-#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}'
89	if [ "$OUTPUTTYPE" = "ogg" ]; then NEEDCOMMENTER=y; fi	21	+VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
90		22
91	# Make sure a buncha things exist	23	# Define how many encoders to run at once. This makes for huge speedups
92	-for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $ENCODER $WGET \	24	# on SMP systems. Defaults to 1. Equivalent to -j.
93	- ${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT} seq
94	+for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $ENCODER $FETCH \
95	+ ${NEEDDISTMP3+$DISTMP3} ${NEEDCOMMENTER+$VORBISCOMMENT} jot
96	do
97	# Cut off the command-line options we just added in
98	X=$(echo $X \| cut -d' ' -f2)
99	@@ -1184,14 +1190,20 @@
100	# We are now finished with the cdrom - it can be safely ejected. Note that
101	# abcde will not have completed yet.
102	if [ "$EJECTCD" = "y" ]; then
103	- $EJECT $EJECTOPTS $CDROM
104	+ # FreeBSD eject uses the EJECT environment variable to name the CDROM
105	+ # but in this script EJECT is in the envionment and names the program
106	+ eject=$EJECT
107	+ unset EJECT
108	+ # The FreeBSD eject needs "adc0" not "/dev/adc0c"
109	+ cd="$(echo $CDROM \| sed -e 's=.*/==;s=[a-h]$==;')"
110	+ $eject $EJECTOPTS $cd
111	fi
112	) \| (
113	# Do the encoding, including parallelization of remote encoding
114	# Figure out where each track is going to be encoded
115	ENCODELOCATIONS="$(echo $REMOTEHOSTS \| tr , ' ')"
116	if [ "$MAXPROCS" != "0" ]; then
117	- for NUM in $(seq 1 "$MAXPROCS")
118	+ for NUM in $(jot "$MAXPROCS")
119	do
120	ENCODELOCATIONS="$ENCODELOCATIONS %local$NUM%"
121	done

Lines 1-43 Link Here

(-)abcde/files/patch-ab (-43 lines)
1	--- abcde.conf.orig Sun Jan 20 21:35:31 2002
2	+++ abcde.conf Thu Jan 9 23:45:53 2003
3	@@ -51,7 +51,7 @@
4	#ID3V2=id3v2
5	#CDPARANOIA=cdparanoia
6	#CDDA2WAV=cdda2wav
7	-#WGET=wget
8	+#FETCH=fetch
9	#CDDISCID=cd-discid
10	#CDDBTOOL=cddb-tool
11	#EJECT=eject
12	@@ -71,7 +71,8 @@
13	#ID3V2OPTS=
14	#CDPARANOIAOPTS=
15	#CDDA2WAVOPTS=
16	-#WGETOPTS=
17	+#DAGRABOPTS=
18	+#FETCHOPTS=
19	#CDDBTOOLOPTS=
20	#EJECTOPTS=
21	#DISTMP3OPTS=
22	@@ -96,7 +97,7 @@
23	#NOCDDBQUERY=n
24
25	# CD device you want to read from
26	-#CDROM=/dev/cdrom
27	+CDROM=/dev/acd0c
28
29	# If you'd like to make a default location that overrides the current
30	# directory for putting mp3's, uncomment this.
31	@@ -115,10 +116,10 @@
32	# OUTPUTTYPE, ALBUMFILE, ARTISTFILE, TRACKFILE, and TRACKNUM.
33	# Make sure to single-quote this variable. abcde will automatically create
34	# the directory portion of this filename.
35	-#OUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}.${OUTPUTTYPE}'
36	+OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}.${OUTPUTTYPE}'
37
38	# Like OUTPUTFORMAT but for Various Artists discs.
39	-#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}.${OUTPUTTYPE}'
40	+VAOUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}.${OUTPUTTYPE}'
41
42	# Define how many encoders to run at once. This makes for huge speedups
43	# on SMP systems. Defaults to 1. Equivalent to -j.

Lines 1-69 Link Here

(-)abcde/files/patch-cddb-tool (-69 lines)
1	--- cddb-tool.orig Mon Jan 21 03:29:23 2002
2	+++ cddb-tool Thu Oct 31 19:41:23 2002
3	@@ -30,9 +30,9 @@
4	LOOKUP_ERR=13 # problem connecting to cddb server
5	EMPTY_QUERY_RESPONSE=14 # query response = "", (probably no net connection)
6
7	-# assume a reasonable default if $WGET is undefined
8	-if [ "$WGET" = "" ]; then
9	- WGET=wget
10	+# assume a reasonable default if $FETCH is undefined
11	+if [ "$FETCH" = "" ]; then
12	+ FETCH=fetch
13	fi
14
15	usage() {
16	@@ -74,8 +74,8 @@
17	read server user host disc-id genre
18	CDDB file is dumped to stdout. File will contain an extra
19	#CATEGORY= line, which leaves it a valid CDDB file but which will
20	- be recognized by parse and send commands. Uses wget, so if you
21	- need to use a proxy then just configure wget to do so. user and
22	+ be recognized by parse and send commands. Uses fetch, so if you
23	+ need to use a proxy then just configure fetch to do so. user and
24	host will be used for identifying ourselves to the CDDB server.
25	help
26	Display this.
27	@@ -119,7 +119,7 @@
28	echo '#'
29	echo '# Track frame offsets:'
30	NUMTRACKS=$2
31	- for x in $(seq 3 $(expr $NUMTRACKS + 2))
32	+ for x in $(jot $NUMTRACKS 3 $(expr $NUMTRACKS + 2))
33	do
34	printf "#\t$(echo "$DISCID" \| cut -f$x -d' ')\n"
35	done
36	@@ -135,13 +135,13 @@
37	echo DISCID="$DISCNUM"
38	echo "DTITLE=Unknown Artist / Unknown Album"
39	# TTITLE0 -- TTITLEn
40	- for x in $(seq 1 $NUMTRACKS)
41	+ for x in $(jot $NUMTRACKS)
42	do
43	echo "TTITLE$(expr $x - 1)=Track $x"
44	done
45	echo "EXTD="
46	# EXTT0 -- EXTTn
47	- for x in $(seq 1 $NUMTRACKS)
48	+ for x in $(jot $NUMTRACKS)
49	do
50	echo "EXTT$(expr $x - 1)="
51	done
52	@@ -164,7 +164,7 @@
53	shift 3
54	TRACKINFO="$@"
55	TRACKINFOPLUS=$(echo $TRACKINFO \| tr ' ' '+')
56	- RESULTS=$($WGET -q -O - "$SERVER?cmd=cddb+query+$TRACKINFOPLUS\&hello=$HELLOINFO\&proto=3") \|\| exit $LOOKUP_ERR
57	+ RESULTS=$($FETCH -q -o - "$SERVER?cmd=cddb+query+$TRACKINFOPLUS\&hello=$HELLOINFO\&proto=3") \|\| exit $LOOKUP_ERR
58	echo $RESULTS \| tr '\r' '\n' \| tr -s '\n' \| sed 's/^ //g'
59	;;
60
61	@@ -175,7 +175,7 @@
62	CATEGORY="$4"
63	DISCID="$5"
64	HELLOINFO="$USER+$HOST+$NAME+$VERSION"
65	- $WGET -q -O - $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID\&hello=$HELLOINFO\&proto=3" 2>/dev/null
66	+ $FETCH -q -o - $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID\&hello=$HELLOINFO\&proto=3" 2>/dev/null
67	;;
68
69	help) help ;;

Lines 3-15 Link Here

(-)abcde/pkg-descr (-3 / +3 lines)
3		3
4	Rippers supported: cdparanoia, cdda2wav, dagrab	4	Rippers supported: cdparanoia, cdda2wav, dagrab
5	Encoders supported: oggenc, vorbize, lame, gogo, bladeenc,	5	Encoders supported: oggenc, vorbize, lame, gogo, bladeenc,
6	mp3enc, xingmp3enc, l3enc	6	mp3enc, xingmp3enc, l3enc, flac
7	ID3 taggers supported: id3, id3v2	7	ID3 taggers supported: id3, id3v2
8	Other: vorbiscomment, distmp3	8	Other: vorbiscomment, distmp3, normalize
9		9
10	Many other useful features are supported.	10	Many other useful features are supported.
11		11
12	WWW: http://lly.org/~rcw/abcde/page	12	WWW: http://www.hispalinux.es/~data/abcde.php
13		13
14	- Munish Chopra	14	- Munish Chopra
15	<mchopra@engmail.uwaterloo.ca>	15	<mchopra@engmail.uwaterloo.ca>