2 files changed, 17 insertions, 25 deletions
diff --git a/multimedia/ripit/README_SBo.txt b/multimedia/ripit/README_SBo.txt
index 64d316166c138..e4af16942fe74 100644
--- a/multimedia/ripit/README_SBo.txt
+++ b/multimedia/ripit/README_SBo.txt
@@ -1,25 +1,21 @@
 
-The TL;DR version: install lame if you want to rip to mp3.
+The TL;DR version: you probably don't need any of the optional deps.
 
 If you're still reading: ripit's optional dependencies are runtime deps,
 so you can install them after installing ripit and they will be detected.
 
-If you don't install anything extra, you'll be able to rip with cdparanoia
-or cdda2wav, and encode to flac, ogg, or wavpack. You'll also be unable
-to submit updated CDDB entries (most people don't need to do this anyway).
+If you don't install anything extra, you'll be able to rip with
+cdparanoia or cdda2wav, and encode to mp3, flac, ogg, wavpack, or any
+format supported by ffmpeg (try "ffmpeg -encoders|grep ^.A"). You'll
+be UNable to submit updated CDDB entries (most people don't need to do
+this anyway).
 
 Here's the list of optional deps available from SBo:
 
-lame - Normally required for encoding to mp3 (-c 0 option, which is the
-       default), though ffmpeg can be used instead.
-
 faac - Required for encoding to mp4/aac (-c 3 option).
 
-ffmpeg - Can encode to any format supported by ffmpeg (-c 7 option, plus
-        --ffmpegopt and --ffmpegsuffix options).
-
-musepack-tools or mppenc -
-  Required for encoding to MusePack (mpc) format (-c 5 option).
+musepack-tools or mppenc - Required for encoding to MusePack
+                           (mpc) format (-c 5 option).
 
 libwwwperl - Required for submitting updated CDDB entries to freedb.org.
              If this package is missing, ripit will warn that LWP::Simple
diff --git a/multimedia/ripit/ripit.SlackBuild b/multimedia/ripit/ripit.SlackBuild
index 026f9f50cfb4e..9ab2b78a9de25 100644
--- a/multimedia/ripit/ripit.SlackBuild
+++ b/multimedia/ripit/ripit.SlackBuild
@@ -4,7 +4,7 @@
 # Formerly maintained by Ryan P.C. McQuen <email removed>
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
-# Copyright 2011 Grigorios Bouzakis <grbzks@xsmail.com>
+# Copyright 2011 Grigorios Bouzakis <email removed>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -39,9 +39,7 @@ BUILD=${BUILD:-2}
 
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
+
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -62,18 +60,16 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-make INSTALL=/bin/install prefix=$PKG/usr mandir=$PKG/usr/man/man1 etcdir=$PKG/etc/ripit install
+make INSTALL=/bin/install \
+     prefix=$PKG/usr \
+     mandir=$PKG/usr/man/man1 \
+     etcdir=$PKG/etc/ripit install
 
 mv $PKG/etc/ripit/config $PKG/etc/ripit/config.new
-
-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
+gzip -9 $PKG/usr/man/man1/*.*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION