From 4869bae56b9e4cc60391f824bf32edfdd8ed6aa2 Mon Sep 17 00:00:00 2001
From: gblach <gblach@FreeBSD.org>
Date: Sun, 9 Dec 2012 15:14:47 +0000
Subject: - Adopt port - Update to 2.5.4

Approved by:	crees (mentor)
---
 audio/abcde/Makefile               |  9 +++++----
 audio/abcde/distinfo               |  4 ++--
 audio/abcde/files/patch-abcde.conf | 19 ++++++++++++++-----
 3 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'audio')

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 9212444595ee..13857e45d14f 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -2,19 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	abcde
-PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTVERSION=	2.5.4
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Front-end shell script to encode CDs in flac/mp3/ogg/speex format
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	cd-discid:${PORTSDIR}/audio/cd-discid \
 		cdparanoia:${PORTSDIR}/audio/cdparanoia \
-		id3v2:${PORTSDIR}/audio/id3v2 \
+		eyeD3:${PORTSDIR}/audio/py-eyed3 \
 		lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		bash:${PORTSDIR}/shells/bash
@@ -75,6 +74,8 @@ post-patch:
 	${REINPLACE_CMD} -e 's#/etc/#${PREFIX}/etc/#g' \
 		-e 's#/bin/bash#${LOCALBASE}/bin/bash#g' \
 		${WRKSRC}/abcde
+	${REINPLACE_CMD} -e 's#/bin/bash#${LOCALBASE}/bin/bash#g' \
+		${WRKSRC}/cddb-tool
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/abcde ${PREFIX}/bin
diff --git a/audio/abcde/distinfo b/audio/abcde/distinfo
index 69f01541e69a..d99088c68077 100644
--- a/audio/abcde/distinfo
+++ b/audio/abcde/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcde-2.4.2.tar.gz) = 38b7545aba15bfddd9f6fc67ffa68bfa4a3e966fe1e10f8434246c0bae9b0655
-SIZE (abcde-2.4.2.tar.gz) = 99032
+SHA256 (abcde-2.5.4.tar.gz) = 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591
+SIZE (abcde-2.5.4.tar.gz) = 104229
diff --git a/audio/abcde/files/patch-abcde.conf b/audio/abcde/files/patch-abcde.conf
index b0a0124b7f2a..6e708ce1d943 100644
--- a/audio/abcde/files/patch-abcde.conf
+++ b/audio/abcde/files/patch-abcde.conf
@@ -1,6 +1,15 @@
---- ./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 @@
+--- abcde.conf.orig	2012-04-19 22:57:19.000000000 +0200
++++ abcde.conf	2012-11-29 21:11:17.000000000 +0100
+@@ -136,7 +136,7 @@
+ #CDDAFS=cp
+ #CDDISCID=cd-discid
+ #CDDBTOOL=cddb-tool
+-#EJECT=eject
++EJECT=cdcontrol eject
+ #MD5SUM=md5sum
+ #DISTMP3=distmp3
+ #VORBISCOMMENT=vorbiscomment
+@@ -170,7 +170,8 @@
  
  # Ogg:
  #VORBIZEOPTS=
@@ -10,7 +19,7 @@
  
  # FLAC:
  #FLACOPTS="-f"
-@@ -236,7 +237,7 @@
+@@ -238,7 +239,7 @@
  
  # OUTPUTTYPE can be either "ogg", "mp3", "flac" or "spx", or a combination
  # of them separated with ",": "ogg,mp3".
@@ -19,7 +28,7 @@
  
  # Output filename format - change this to reflect your inner desire to
  # organize things differently than everyone else :)
-@@ -249,9 +250,11 @@
+@@ -251,9 +252,11 @@
  # to the files. Remove it from your user defined string if you are getting
  # files like ".ogg.ogg".
  #OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
-- 
cgit