From 2a4443e7ba9ca01abc09651a792a2657d10d4172 Mon Sep 17 00:00:00 2001
From: flz <flz@FreeBSD.org>
Date: Wed, 23 Nov 2005 12:02:47 +0000
Subject: - Rename and update actual patch to fix -o output bug.

PR:		ports/89421
Submitted by:	maintainer
---
 audio/abcde/Makefile               |  1 +
 audio/abcde/files/patch-aa         | 24 ------------------------
 audio/abcde/files/patch-abcde      | 30 ++++++++++++++++++++++++++++++
 audio/abcde/files/patch-abcde.conf | 24 ++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 24 deletions(-)
 delete mode 100644 audio/abcde/files/patch-aa
 create mode 100644 audio/abcde/files/patch-abcde
 create mode 100644 audio/abcde/files/patch-abcde.conf

(limited to 'audio/abcde')

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 949eaa40de7a..23e512adffed 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	abcde
 PORTVERSION=	2.3.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.hispalinux.es/~data/files/ \
 		http://www.soulwax.net/freebsd/
diff --git a/audio/abcde/files/patch-aa b/audio/abcde/files/patch-aa
deleted file mode 100644
index 99f4eadb8ec1..000000000000
--- a/audio/abcde/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- abcde.conf.orig	Wed Aug 20 02:43:58 2003
-+++ abcde.conf	Wed Aug 20 02:57:42 2003
-@@ -92,7 +92,7 @@
- 
- # Ogg:
- #VORBIZEOPTS=
--#OGGENCOPTS=
-+OGGENCOPTS="-q 5"
- 
- # FLAC:
- #FLACOPTS=
-@@ -154,10 +154,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}'
- 
- # 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.
diff --git a/audio/abcde/files/patch-abcde b/audio/abcde/files/patch-abcde
new file mode 100644
index 000000000000..d551e86794cd
--- /dev/null
+++ b/audio/abcde/files/patch-abcde
@@ -0,0 +1,30 @@
+--- abcde.old	Tue Nov 22 13:12:14 2005
++++ abcde	Tue Nov 22 13:12:51 2005
+@@ -2453,17 +2453,18 @@
+ 
+ # Allow -o OUTPUT(1):OPTIONS(1),...,OUTPUT(N):OPTIONS(N) mode of operation
+ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then
+-	for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+-		case "$OUTPUT" in
+-			vorbis:*|ogg:*)	OGGENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+-			mp3:*)	MP3ENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+-			flac:*)	FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+-			spx:*)	SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
+-			mpc:*)	MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
++	for OUTPUT in $(echo $OUTPUTTYPE | tr \  \| | tr , \ ); do
++		TOUTPUT=$(echo $OUTPUT | tr \| \ )
++		case "$TOUTPUT" in
++			vorbis:*|ogg:*)	OGGENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
++			mp3:*)	MP3ENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
++			flac:*)	FLACENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
++			spx:*)	SPEEXENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
++			mpc:*)	MPPENCODEROPTSCLI="$( echo $TOUTPUT | cut -d: -f2- )" ;;
+ 		esac
+ 	done
+-	for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+-		TEMPOUTPUT=$( echo "$OUTPUT" | cut -d: -f1 )
++	for OUTPUT in $(echo $OUTPUTTYPE | tr \  \| | tr , \ ); do
++		TEMPOUTPUT=$( echo "$OUTPUT" | tr \| \ | cut -d: -f1 )
+ 		TEMPOUTPUTTYPE="${TEMPOUTPUTTYPE:+$TEMPOUTPUTTYPE,}$TEMPOUTPUT"
+ 	done
+ 	OUTPUTTYPE="$TEMPOUTPUTTYPE"
diff --git a/audio/abcde/files/patch-abcde.conf b/audio/abcde/files/patch-abcde.conf
new file mode 100644
index 000000000000..99f4eadb8ec1
--- /dev/null
+++ b/audio/abcde/files/patch-abcde.conf
@@ -0,0 +1,24 @@
+--- abcde.conf.orig	Wed Aug 20 02:43:58 2003
++++ abcde.conf	Wed Aug 20 02:57:42 2003
+@@ -92,7 +92,7 @@
+ 
+ # Ogg:
+ #VORBIZEOPTS=
+-#OGGENCOPTS=
++OGGENCOPTS="-q 5"
+ 
+ # FLAC:
+ #FLACOPTS=
+@@ -154,10 +154,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}'
+ 
+ # 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.
-- 
cgit