multimedia/abcde: Updated for version 2.3.3

4 files changed, 18 insertions, 11 deletions

diff --git a/multimedia/abcde/README b/multimedia/abcde/README
index ca806d5af1..77ae4f39bf 100644
--- a/multimedia/abcde/README
+++ b/multimedia/abcde/README
@@ -11,4 +11,3 @@ There are many more features that abcde supports that you can add on, such as
 mkcue and encoding in other various formats, see the man page for more info.
 Try running abcde as root (sudo or whatever) if abcde/cd-discid thinks your
 favorite audio cd is a data cd.
-
diff --git a/multimedia/abcde/abcde.SlackBuild b/multimedia/abcde/abcde.SlackBuild
index ec408f732c..dee9c05230 100644
--- a/multimedia/abcde/abcde.SlackBuild
+++ b/multimedia/abcde/abcde.SlackBuild
@@ -27,14 +27,12 @@
 set -e
 
 PRGNAM=abcde
-CWD=`pwd`
 VERSION=2.3.3
-PATCH=2.3.3-1
-PKG_VERSION=2.3.3
 ARCH=${ARCH:-i486}
-TMP=${TMP:-/tmp/SBo}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -55,7 +53,7 @@ chmod -R u+w,go+r-w,a-s .
 # script is run as root, but I'm guessing that I'm not the only person who
 # likes to test a script as normal user before running it as root, and the
 # ownership setting in the Makefile will break installs as a normal user.
-# --robw810
+# --rworkman
 patch -p1 < $CWD/Makefile.diff 
 
 make
@@ -71,7 +69,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ( 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
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
 mkdir -p $PKG/install
@@ -79,4 +77,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKG_VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/multimedia/abcde/abcde.info b/multimedia/abcde/abcde.info
index 8418877129..b20b3fd7c9 100644
--- a/multimedia/abcde/abcde.info
+++ b/multimedia/abcde/abcde.info
@@ -1,8 +1,8 @@
 PRGNAM="abcde"
-VERSION="2.3.3_1"
+VERSION="2.3.3"
 HOMEPAGE="http://www.hispalinux.es/~data/abcde.php"
 DOWNLOAD="http://www.hispalinux.es/~data/files/abcde_2.3.3.orig.tar.gz"
 MD5SUM="94877d1e410ae420630b1048e82907d3"
 MAINTAINER="Jim Capozzoli"
 EMAIL="saltmiser@gmail.com"
-APPROVED="robw810,BP{k}"
+APPROVED="rworkman,BP{k}"
diff --git a/multimedia/abcde/slack-desc b/multimedia/abcde/slack-desc
index 15b8341bd0..60034d01a0 100644
--- a/multimedia/abcde/slack-desc
+++ b/multimedia/abcde/slack-desc
@@ -1,4 +1,12 @@
-abcde: Front-end shell script to encode CD's in flac/mp3/ogg/speex format
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
+abcde: abcde (shell script to encode CD's)
 abcde:
 abcde: abcde is a frontend command-line utility (actually, a shell script)
 abcde: that grabs tracks off a CD, encodes them to Ogg/Vorbis, MP3, FLAC,
@@ -7,3 +15,5 @@ abcde: go.
 abcde:
 abcde:
 abcde:
+abcde:
+abcde: