multimedia/cd-discid: Updated for version 0.9

4 files changed, 18 insertions, 11 deletions

diff --git a/multimedia/cd-discid/README b/multimedia/cd-discid/README
index 53d8936972c56..ef121eed57aa5 100644
--- a/multimedia/cd-discid/README
+++ b/multimedia/cd-discid/README
@@ -2,6 +2,5 @@ cd-discid is a backend utility to get CDDB discid information from
 a CD-ROM disc.  It was originally designed for abcde (AKA cdgrab),
 but can be used for any purpose requiring CDDB data.
 
-Try running it as root (using sudo or whatever) if it thinks you're trying to
-make it read a data cd.
-
+Try running it as root (using sudo or whatever) if it thinks you're 
+trying to make it read a data cd.
diff --git a/multimedia/cd-discid/cd-discid.SlackBuild b/multimedia/cd-discid/cd-discid.SlackBuild
index 5b6f0e896feb3..c93c1edb3316f 100644
--- a/multimedia/cd-discid/cd-discid.SlackBuild
+++ b/multimedia/cd-discid/cd-discid.SlackBuild
@@ -1,7 +1,6 @@
 #!/bin/bash
 # Slackware build script for cd-discid
 
-#
 # Copyright 2007 Jim Capozzoli <saltmiser@gmail.com>  
 # All rights reserved.
 #
@@ -28,9 +27,7 @@ set -e
 
 PRGNAM=cd-discid
 VERSION=0.9
-PATCH=0.9-1
-CWD=`pwd`
-PKG_VERSION=0.9
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
@@ -59,7 +56,7 @@ chmod -R u+w,go+r-w,a-s .
 # variable to 'make install' but the ownership setting can't be omitted any
 # other way.  This isn't a huge issue, but I'm probably not the only one who
 # likes to test scripts as a normal user before running them as root, and the
-# ownership setting has to be removed for that to work.  --robw810
+# ownership setting has to be removed for that to work.  --rworkman
 patch -p1 < $CWD/Makefile.diff
 
 CFLAGS="$SLKCFLAGS" make || exit
@@ -77,4 +74,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/cd-discid/cd-discid.info b/multimedia/cd-discid/cd-discid.info
index 269492c12e8b2..cd025a1f492da 100644
--- a/multimedia/cd-discid/cd-discid.info
+++ b/multimedia/cd-discid/cd-discid.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://www.hispalinux.es/~data/files/cd-discid/cd-discid_0.9.orig.tar.
 MD5SUM="64677b8b63d1db0db015043f5455171a  "
 MAINTAINER="Jim Capozzoli"
 EMAIL="saltmiser@gmail.com"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/multimedia/cd-discid/slack-desc b/multimedia/cd-discid/slack-desc
index f746bdb623ab1..254b1351cd6d6 100644
--- a/multimedia/cd-discid/slack-desc
+++ b/multimedia/cd-discid/slack-desc
@@ -1,4 +1,12 @@
-cd-discid: Backend utility to retrieve CDDB discid information 
+# 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------------------------------------------------------|
+cd-discid: cd-discid (Backend utility to retrieve CDDB discid information)
 cd-discid: 
 cd-discid: cd-discid is a backend utility to get CDDB discid information from
 cd-discid: a CD-ROM disc.  It was originally designed for abcde (AKA cdgrab),
@@ -6,3 +14,6 @@ cd-discid: but can be used for any purpose requiring CDDB data.
 cd-discid: 
 cd-discid: 
 cd-discid: 
+cd-discid: 
+cd-discid: 
+cd-discid: