4 files changed, 27 insertions, 37 deletions
diff --git a/audio/streamripper/README b/audio/streamripper/README
index aec3d2df31..e1b2d13df2 100644
--- a/audio/streamripper/README
+++ b/audio/streamripper/README
@@ -1,11 +1,5 @@
-Streamripper records SHOUTcast and Icecast compatible streams.
-It uses meta data within a SHOUTcast stream to determine the
-beginning and end of each song, and stores the songs on your
-hard disk as individual mp3 files. In addition, Streamripper
-includes a relay server for listening to the station while
-you are recording.
-
-tre (also available at http://www.slackbuilds.org/) is
-required to build this package. However, Streamripper will
-use an included tre library if you add --with-included-tre
-to the ./configure section of the SlackBuild.
+Streamripper records SHOUTcast and Icecast compatible streams. It uses
+meta data within a SHOUTcast stream to determine the beginning and end
+of each song, and stores the songs on your hard disk as individual mp3
+files. In addition, Streamripper includes a relay server for listening
+to the station while you are recording.
diff --git a/audio/streamripper/slack-desc b/audio/streamripper/slack-desc
index bc9b1d0231..09927313e5 100644
--- a/audio/streamripper/slack-desc
+++ b/audio/streamripper/slack-desc
@@ -1,19 +1,19 @@
 # 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 ':'.
+# 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------------------------------------------------------|
 streamripper: Streamripper (Rip SHOUTcast Radio Streams to MP3 Files)
 streamripper:
-streamripper: Streamripper records SHOUTcast and Icecast compatible streams.
-streamripper: It uses meta data within a SHOUTcast stream to determine the
-streamripper: beginning and end of each song, and stores the songs on your
-streamripper: hard disk as individual mp3 files. In addition, Streamripper
-streamripper: includes a relay server for listening to the station while
-streamripper: you are recording.
+streamripper: Streamripper records SHOUTcast and Icecast compatible streams. It uses
+streamripper: meta data within a SHOUTcast stream to determine the beginning and end
+streamripper: of each song, and stores the songs on your hard disk as individual mp3
+streamripper: files. In addition, Streamripper includes a relay server for listening
+streamripper: to the station while you are recording.
 streamripper:
 streamripper: Homepage: http://streamripper.sourceforge.net/
 streamripper:
+streamripper:
diff --git a/audio/streamripper/streamripper.SlackBuild b/audio/streamripper/streamripper.SlackBuild
index 0a76f4d31e..d29f65d91c 100644
--- a/audio/streamripper/streamripper.SlackBuild
+++ b/audio/streamripper/streamripper.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Streamripper
 
-# Copyright 2007-2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
+# Copyright 2007-2009  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=streamripper
-VERSION=1.62.3
+VERSION=${VERSION:-1.64.6}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,21 +33,20 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="CHANGES COPYING INSTALL README THANKS"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
 cd $PRGNAM-$VERSION || exit 1
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -61,12 +60,9 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --program-prefix="" \
-  --program-suffix="" \
+  --build=$ARCH-slackware-linux \
   || exit 1
 
-#  --with-included-tre \     # Use the TRE library included with Streamripper
-
 make || exit 1
 make install-strip DESTDIR=$PKG || exit 1
 
@@ -76,9 +72,9 @@ make install-strip DESTDIR=$PKG || exit 1
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING INSTALL README THANKS \
+  $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 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/audio/streamripper/streamripper.info b/audio/streamripper/streamripper.info
index f5d1907bfe..a22c0a9188 100644
--- a/audio/streamripper/streamripper.info
+++ b/audio/streamripper/streamripper.info
@@ -1,8 +1,8 @@
 PRGNAM="streamripper"
-VERSION="1.62.3"
+VERSION="1.64.6"
 HOMEPAGE="http://streamripper.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/streamripper/streamripper-1.62.3.tar.gz"
-MD5SUM="127eb52355d0d10183ee22c44b5a9039"
+DOWNLOAD="http://downloads.sourceforge.net/streamripper/streamripper-1.64.6.tar.gz"
+MD5SUM="a37a1a8b8f9228522196a122a1c2dd32"
 MAINTAINER="Frank Caraballo"
 EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="David Somero"
+APPROVED="dsomero"