4 files changed, 17 insertions, 17 deletions
diff --git a/audio/abcde/Makefile.diff b/audio/abcde/Makefile.diff
index 1867f96bad137..922e3c316018b 100644
--- a/audio/abcde/Makefile.diff
+++ b/audio/abcde/Makefile.diff
@@ -1,5 +1,5 @@
---- abcde-2.5.4.orig/Makefile	2012-10-07 13:35:53.429882065 -0400
-+++ abcde-2.5.4/Makefile	2012-10-07 13:39:37.271325434 -0400
+--- abcde-2.6/Makefile	2014-10-26 13:41:35.000000000 -0400
++++ abcde-2.6/Makefile.patched	2014-12-14 18:22:39.005098302 -0500
 @@ -3,7 +3,7 @@
  # Installation directories
  prefix = ${DESTDIR}/usr
diff --git a/audio/abcde/abcde.SlackBuild b/audio/abcde/abcde.SlackBuild
index c199ab8671586..f232bfc94f820 100644
--- a/audio/abcde/abcde.SlackBuild
+++ b/audio/abcde/abcde.SlackBuild
@@ -27,7 +27,7 @@
 # Modified by Glenn Becker
 
 PRGNAM=abcde
-VERSION=2.5.4
+VERSION=${VERSION:-2.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-tar xvf $CWD/$PRGNAM\_$VERSION.orig.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/audio/abcde/abcde.info b/audio/abcde/abcde.info
index da26c029a36ff..d06118b679bf4 100644
--- a/audio/abcde/abcde.info
+++ b/audio/abcde/abcde.info
@@ -1,8 +1,8 @@
 PRGNAM="abcde"
-VERSION="2.5.4"
-HOMEPAGE="http://freecode.com/projects/abcde"
-DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/a/abcde/abcde_2.5.4.orig.tar.gz"
-MD5SUM="d761c5a07854ce24748be9aa10100e74"
+VERSION="2.6"
+HOMEPAGE="http://abcde.einval.com"
+DOWNLOAD="http://abcde.einval.com/download/abcde-2.6.tar.gz"
+MD5SUM="6bbf4a5d5ea538dc69afb84da75e16f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cd-discid"
diff --git a/audio/abcde/cddb-tool.diff b/audio/abcde/cddb-tool.diff
index e3eeacce489f8..468fe00ebbae4 100644
--- a/audio/abcde/cddb-tool.diff
+++ b/audio/abcde/cddb-tool.diff
@@ -1,11 +1,11 @@
---- abcde-2.5.4.orig/cddb-tool	2012-06-20 09:44:13.000000000 -0400
-+++ abcde-2.5.4/cddb-tool	2012-12-08 14:59:08.865171479 -0500
-@@ -196,7 +196,7 @@
- 	ADDRESS="$2"
- 	DISCID=$(grep ^DISCID= "$FILE" | cut -f2 -d= | tr -d \[:cntrl:\])
- 	CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d= | tr -d \[:cntrl:\])
--	grep -v "^#CATEGORY=" "$FILE" | iconv -t utf-8 | mail -a "Content-Type: text/plain; charset=utf-8" -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
-+	grep -v "^#CATEGORY=" "$FILE" | iconv -t utf-8 | mailx -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
+--- abcde-2.6/cddb-tool	2014-10-26 14:21:14.000000000 -0400
++++ abcde-2.6/cddb-tool.patched	2014-12-14 18:08:31.324695765 -0500
+@@ -220,7 +220,7 @@
+ 		if [ "$UTF_LOCALE"x != ""x ] ; then
+ 			export LC_ALL=$UTF_LOCALE
+ 		fi
+-		grep -v "^#CATEGORY=" "$FILE" | iconv -t utf-8 | mail -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
++		grep -v "^#CATEGORY=" "$FILE" | iconv -t utf-8 | mailx -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
+ 	fi
  	;;
  
- query) # cddb-tool query serverurl proto user host discid...