Attachment 31183 Details for Bug 52076 – file.diff

[patch] file.diff

file.diff (text/plain), 13.09 KB, created by Munish on 2003-05-11 19:20:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Munish

Created: 2003-05-11 19:20:16 UTC

Size: 13.09 KB

patch

obsolete

>diff -ruN /usr/ports/audio/abcde/Makefile abcde/Makefile
>--- /usr/ports/audio/abcde/Makefile	Mon Mar 31 11:38:42 2003
>+++ abcde/Makefile	Sun May 11 14:03:24 2003
>@@ -6,11 +6,10 @@
> #
> 
> PORTNAME=	abcde
>-PORTVERSION=	2.0.3
>-PORTREVISION=	4
>+PORTVERSION=	2.1.4
> CATEGORIES=	audio
>-MASTER_SITES=	http://frantica.lly.org/~rcw/abcde/
>-DISTNAME= 	abcde_2.0.3.orig
>+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
>@@ -18,6 +17,8 @@
> 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
>@@ -27,13 +28,13 @@
> .if defined(WITH_CDDA2WAV)
> RUN_DEPENDS+=	cdda2wav:${PORTSDIR}/sysutils/cdrtools
> .else
>-CDDA2WAV_MSG=	"Define WITH_CDDA2WAV to enable support for cdda2wav."
>+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 support for dagrab."
>+DAGRAB_MSG=     "Define WITH_DAGRAB to enable dagrab support."
> .endif
> 
> .if defined(WITH_EJECT)
>@@ -42,22 +43,30 @@
> 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(CDDA2WAV_MSG)
>-	@${ECHO_MSG} ${CDDA2WAV_MSG}
>+.if defined(EJECT_MSG)
>+	@${ECHO_MSG} ${EJECT_MSG}
> 	@${ECHO_MSG} ""
> .endif
> .if defined(EJECT_MSG)
>-	@${ECHO_MSG} ${EJECT_MSG}
>+	@${ECHO_MSG} ${FLAC_MSG}
> 	@${ECHO_MSG} ""
> .endif
> 
>-
> do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
> 	${INSTALL_SCRIPT} ${WRKSRC}/cddb-tool ${PREFIX}/bin
>@@ -65,10 +74,16 @@
> 	${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>
>diff -ruN /usr/ports/audio/abcde/distinfo abcde/distinfo
>--- /usr/ports/audio/abcde/distinfo	Tue Aug  6 16:58:38 2002
>+++ abcde/distinfo	Sun May 11 12:56:31 2003
>@@ -1 +1 @@
>-MD5 (abcde_2.0.3.orig.tar.gz) = e430e3d2fb87729d6452d495eabd7a7a
>+MD5 (abcde_2.1.4.orig.tar.gz) = aef4170cb8e8e41d0434bdd30b61e502
>diff -ruN /usr/ports/audio/abcde/files/patch-aa abcde/files/patch-aa
>--- /usr/ports/audio/abcde/files/patch-aa	Mon Mar 31 11:38:42 2003
>+++ abcde/files/patch-aa	Sun May 11 13:24:01 2003
>@@ -1,121 +1,24 @@
>---- abcde.orig	Mon Jan 28 00:44:02 2002
>-+++ abcde	Tue Feb 11 23:08:44 2003
>-@@ -534,7 +534,7 @@
>- 				;;
>- 				12|13|14)
>- 					# no match found in database,
>--					# wget error, or user requested not to use CDDB
>-+					# fetch error, or user requested not to use CDDB
>- 					# Make up an error code (503) that abcde
>- 					# will recognize in do_cddbread
>- 					# 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")
>+--- 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=
>  
>-@@ -1027,6 +1030,9 @@
>- 		CDROMREADER="$CDDA2WAV"
>- 		CDROMREADEROPTS="$CDDA2WAVOPTS"
>- 		;;
>-+    dagrab)
>-+        CDROMREADER="$DAGRAB"
>-+        CDROMREADEROPTS="$DAGRABOPTS"
>- esac
>+@@ -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}'
>  
>- # If nothing has been specified, use oggenc for oggs and lame for mp3s
>-@@ -1100,8 +1106,8 @@
>- if [ "$OUTPUTTYPE" = "ogg" ]; then NEEDCOMMENTER=y; fi
>+ # Like OUTPUTFORMAT but for Various Artists discs.
>+-#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}'
>++VAOUTPUTFORMAT='${ARTISTFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
>  
>- # Make sure a buncha things exist
>--for X in $CDROMREADER $CDDISCID ${NEEDTAGGER+$TAGGER} $ENCODER $WGET \
>--	${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
>+ # Define how many encoders to run at once. This makes for huge speedups
>+ # on SMP systems. Defaults to 1. Equivalent to -j.
>diff -ruN /usr/ports/audio/abcde/files/patch-ab abcde/files/patch-ab
>--- /usr/ports/audio/abcde/files/patch-ab	Sat Jan 11 18:44:11 2003
>+++ abcde/files/patch-ab	Wed Dec 31 19:00:00 1969
>@@ -1,43 +0,0 @@
>---- 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.
>diff -ruN /usr/ports/audio/abcde/files/patch-cddb-tool abcde/files/patch-cddb-tool
>--- /usr/ports/audio/abcde/files/patch-cddb-tool	Thu Oct 31 19:29:53 2002
>+++ abcde/files/patch-cddb-tool	Wed Dec 31 19:00:00 1969
>@@ -1,69 +0,0 @@
>---- 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 ;;
>diff -ruN /usr/ports/audio/abcde/pkg-descr abcde/pkg-descr
>--- /usr/ports/audio/abcde/pkg-descr	Sat Jan 11 19:01:45 2003
>+++ abcde/pkg-descr	Sat May  3 21:21:41 2003
>@@ -3,13 +3,13 @@
> 
> Rippers supported: cdparanoia, cdda2wav, dagrab
> Encoders supported: oggenc, vorbize, lame, gogo, bladeenc,
>-                    mp3enc, xingmp3enc, l3enc
>+                    mp3enc, xingmp3enc, l3enc, flac
> ID3 taggers supported: id3, id3v2
>-Other: vorbiscomment, distmp3
>+Other: vorbiscomment, distmp3, normalize
> 
> Many other useful features are supported.
> 
>-WWW: http://lly.org/~rcw/abcde/page
>+WWW: http://www.hispalinux.es/~data/abcde.php
> 
> - Munish Chopra
> <mchopra@engmail.uwaterloo.ca>

Actions: View | Diff

Attachments on bug 52076: 31183