5 files changed, 78 insertions, 72 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 9af1d0bb35c5..614d8ad0ec5d 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -6,27 +6,41 @@
 #
 
 PORTNAME=	abcde
-PORTVERSION=	2.3.3
-PORTREVISION=	4
+PORTVERSION=	2.4.2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.hispalinux.es/~data/files/
-DISTNAME=	abcde_${PORTVERSION}.orig
+MASTER_SITES=	GOOGLE_CODE
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Front-end shell script to encode CDs in flac/mp3/ogg/speex format
 
 RUN_DEPENDS=	cd-discid:${PORTSDIR}/audio/cd-discid \
 		cdparanoia:${PORTSDIR}/audio/cdparanoia \
 		id3v2:${PORTSDIR}/audio/id3v2 \
 		lame:${PORTSDIR}/audio/lame \
-		oggenc:${PORTSDIR}/audio/vorbis-tools
+		oggenc:${PORTSDIR}/audio/vorbis-tools \
+		bash:${PORTSDIR}/shells/bash
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAN1=		abcde.1 cddb-tool.1
 
 PLIST_FILES=	bin/abcde bin/cddb-tool etc/abcde.conf
 
+OPTIONS=	CDDA2WAV "support cdda2wav to rip CD" Off \
+		DAGRAB	"support dagrab to rip IDE CD" Off \
+		EJECT	"enable auto-eject support" Off \
+		GOGO	"support gogo MP3 encoder" Off \
+		BLADEENC	"support BladeEnc MP3 encoder" Off \
+		FLAC	"support FLAC format" Off \
+		AAC	"support AAC format" Off \
+		MPP	"support Musepack format" Off \
+		NORMALIZE "enable normalize support" Off \
+		REPLAYGAIN "support (vorbis|mp3)gain" Off \
+		SPEEX	"enable Speex support" Off
+
+LICENSE=	GPLv2
+
+.include <bsd.port.options.mk>
+
 .if defined(WITH_CDDA2WAV)
 USE_CDRTOOLS=	yes
 .endif
@@ -51,21 +65,32 @@ RUN_DEPENDS+=	normalize:${PORTSDIR}/audio/normalize
 RUN_DEPENDS+=	speexenc:${PORTSDIR}/audio/speex
 .endif
 
-pre-everything::
-	@${ECHO}
-	@${ECHO} "You can build ${PORTNAME} with the following options:"
-	@${ECHO} "WITH_CDDA2WAV         enable cdda2wav support"
-	@${ECHO} "WITH_DAGRAB           enable dagrab support"
-	@${ECHO} "WITH_EJECT            enable auto-eject support"
-	@${ECHO} "WITH_FLAC             enable FLAC support"
-	@${ECHO} "WITH_NORMALIZE        enable normalize support"
-	@${ECHO} "WITH_SPEEX            enable Speex support"
-	@${ECHO}
+.if defined(WITH_GOGO)
+RUN_DEPENDS+=	gogo:${PORTSDIR}/audio/gogo
+.endif
+
+.if defined(WITH_BLADEENC)
+RUN_DEPENDS+=	bladeenc:${PORTSDIR}/audio/bladeenc
+.endif
+
+.if defined(WITH_AAC)
+RUN_DEPENDS+=	faac:${PORTSDIR}/audio/faac
+.endif
+
+.if defined(WITH_MPP)
+RUN_DEPENDS+=	mppenc:${PORTSDIR}/audio/musepack
+.endif
+
+.if defined(WITH_REPLAYGAIN)
+RUN_DEPENDS+=	mp3gain:${PORTSDIR}/audio/mp3gain \
+		vorbisgain:${PORTSDIR}/audio/vorbisgain
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
+	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
 		${WRKSRC}/abcde.1
-	@${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
+	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
+		-e 's#/bin/bash#${LOCALBASE}/bin/bash#g' \
 		${WRKSRC}/abcde
 
 do-install:
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 3e04d70d6407..69f01541e69a 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,3 +1,2 @@
-MD5 (abcde_2.3.3.orig.tar.gz) = 94877d1e410ae420630b1048e82907d3
-SHA256 (abcde_2.3.3.orig.tar.gz) = 943107e21ce1bcbdb2ea652201db9b371b3d0fa1eaa532e510bde48462c9dc4d
-SIZE (abcde_2.3.3.orig.tar.gz) = 73458
+SHA256 (abcde-2.4.2.tar.gz) = 38b7545aba15bfddd9f6fc67ffa68bfa4a3e966fe1e10f8434246c0bae9b0655
+SIZE (abcde-2.4.2.tar.gz) = 99032
diff --git a/audio/abcde/files/patch-abcde b/audio/abcde/files/patch-abcde
index c937419838ed..ffd9165d5963 100644
--- a/audio/abcde/files/patch-abcde
+++ b/audio/abcde/files/patch-abcde
@@ -1,38 +1,13 @@
---- abcde.old	Tue Nov 22 13:12:14 2005
-+++ abcde	Tue Nov 22 13:12:51 2005
-@@ -2169,6 +2169,7 @@
- 	HTTPGET=fetch
- 	NEEDCDROMID=y
- 	OSFLAVOUR=FBSD
-+	MD5SUM=md5
- elif [ X$(uname) = "XDarwin" ] ; then
- 	HTTPGET=curl
- 	OSFLAVOUR=OSX
-@@ -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- )" ;;
+--- ./abcde.orig	2010-05-29 11:02:44.000000000 +0200
++++ ./abcde	2011-03-11 07:56:10.638294344 +0100
+@@ -3569,8 +3569,8 @@
+ 			m4a:*)  AACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;;
  		esac
  	done
--	for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ); do
+-	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 )
++	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
index 99f4eadb8ec1..b0a0124b7f2a 100644
--- a/audio/abcde/files/patch-abcde.conf
+++ b/audio/abcde/files/patch-abcde.conf
@@ -1,24 +1,33 @@
---- abcde.conf.orig	Wed Aug 20 02:43:58 2003
-+++ abcde.conf	Wed Aug 20 02:57:42 2003
-@@ -92,7 +92,7 @@
+--- ./abcde.conf.orig	2010-05-29 11:02:44.000000000 +0200
++++ ./abcde.conf	2011-03-11 07:54:42.676575769 +0100
+@@ -168,7 +168,8 @@
  
  # Ogg:
  #VORBIZEOPTS=
 -#OGGENCOPTS=
++#OFFENCOPTS=
 +OGGENCOPTS="-q 5"
  
  # FLAC:
- #FLACOPTS=
-@@ -154,10 +154,10 @@
- # Since multiple-output was integrated we always append the file type
+ #FLACOPTS="-f"
+@@ -236,7 +237,7 @@
+ 
+ # OUTPUTTYPE can be either "ogg", "mp3", "flac" or "spx", or a combination
+ # of them separated with ",": "ogg,mp3".
+-#OUTPUTTYPE=ogg
++OUTPUTTYPE=ogg
+ 
+ # Output filename format - change this to reflect your inner desire to
+ # organize things differently than everyone else :)
+@@ -249,9 +250,11 @@
  # 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}/${TRACKNUM}.${TRACKFILE}'
 +OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ARTISTFILE}-${TRACKNUM}-${TRACKFILE}'
  
  # Like OUTPUTFORMAT but for Various Artists discs.
--#VAOUTPUTFORMAT='${ARTISTFILE}/${TRACKFILE}'
+ #VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${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.
+ # Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips.
+ #ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT
diff --git a/audio/abcde/pkg-descr b/audio/abcde/pkg-descr
index 29ebb4407029..dc0e9c389e2c 100644
--- a/audio/abcde/pkg-descr
+++ b/audio/abcde/pkg-descr
@@ -1,12 +1,10 @@
-abcde (A Better CD Encoder) is a frontend sh script to rip tracks from
-a CD, encode them in ogg vorbis or mp3 format, and tag them. 
+abcde is a command line (CLI) CD encoder. It will read your CD, contact a CDDB
+provider, download the track information, rip your CD and store all the encoded
+tracks in the tree layout you define.
 
-Rippers supported: cdparanoia, cdda2wav, dagrab
-Encoders supported: bladeenc, gogo, flac, l3enc, lame, mp3enc,
-                    oggenc, speex, vorbize, xingmp3enc
-ID3 taggers supported: id3, id3v2
-Other: vorbiscomment, distmp3, normalize
+It supports multiple encoders for several formats, such as FLAC, Ogg/Vorbis,
+MP3,... and will use one single rip to create as many output formats as you want
 
 Many other useful features are supported.
 
-WWW: http://www.hispalinux.es/~data/abcde.php
+WWW: http://code.google.com/p/abcde/