1 files changed, 12 insertions, 14 deletions
diff --git a/audio/abcde/abcde.SlackBuild b/audio/abcde/abcde.SlackBuild
index 495e3a8613..e287d81c6b 100644
--- a/audio/abcde/abcde.SlackBuild
+++ b/audio/abcde/abcde.SlackBuild
@@ -24,10 +24,11 @@
 
 # Modified by the SlackBuilds.org project
 # Modified by Andrew Strong
+# Modified by Glenn Becker
 
 PRGNAM=abcde
-VERSION=2.3.99.6
-BUILD=${BUILD:-2}
+VERSION=2.5.4
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -66,15 +67,14 @@ chmod -R u+w,go+r-w,a-s .
 # --rworkman
 patch -p1 < $CWD/Makefile.diff 
 
-# An amalgamated patch from Ubuntu and Fedora which allows automatic tagging 
-# of both m4a/aac and speex files, broken in this version of abcde. Normally 
-# this should be submitted upstream rather than placed in a SlackBuild script
-# but unfortunately there is no upstream at the moment :-).
-# For what its worth I have also submitted to the final resting place of abcde:
-#      http://code.google.com/p/abcde/issues/detail?id=7
-patch -p1 < $CWD/aac_speex_tagging.diff
+# fix to mailx call: the command was using the -a option which, in Slackware's
+# mailx, means something different than what was intended here (intent here is
+# to set content type to UTF-8. In Slackware the -a is unnecessary. Thanks to 
+# Andreas Vogele for this patch. --gbecker
+patch -p1 < $CWD/cddb-tool.diff
+
+# Removed aac/speex patch as this was fixed upstream - G Becker 10.7.12
 
-make
 make install DESTDIR=$PKG
 
 # Let's not overwrite the config file if it already exists
@@ -85,10 +85,8 @@ cp -a COPYING FAQ README TODO changelog examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
-( cd $PKG/usr/man || exit
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc