4 files changed, 23 insertions, 16 deletions
diff --git a/multimedia/mythtv/README b/multimedia/mythtv/README
index a4868b8614914..4178d93473e04 100644
--- a/multimedia/mythtv/README
+++ b/multimedia/mythtv/README
@@ -4,13 +4,13 @@ and operating systems. MythTV is known to work on Linux and Mac OS X
 (PowerPC and Intel).
 
 You need to create a database before you can run mythtv:
-> mysql -u root -p  < /usr/share/mythtv/database/mc.sql
+	> mysql -u root -p  < /usr/share/mythtv/database/mc.sql
 
 Then run mythtv-setup to configure mythtv
-> mythtv-setup
+	> mythtv-setup
 
 Detailed instructions for mythtv can be found here:
- http://www.mythtv.org/wiki/index.php/User_Manual:Initial_Installation
+	http://www.mythtv.org/wiki/index.php/User_Manual:Initial_Installation
 
 Mythtv requires lame, and optionally can use xmltv (to create the program 
 listings if you live outside of North America) and lirc (for IR remote control)
diff --git a/multimedia/mythtv/doinst.sh b/multimedia/mythtv/doinst.sh
index af950863e64ad..5d5f5807dd2e9 100644
--- a/multimedia/mythtv/doinst.sh
+++ b/multimedia/mythtv/doinst.sh
@@ -24,6 +24,6 @@ echo
 echo "Extra configuration needed..."
 echo 
 echo "A mythtv mysql database needs to be setup and"
-echo "mythtv-setup has to be run; see the README"
+echo "mythtv-setup has to be run; see the README."
 echo
 
diff --git a/multimedia/mythtv/mythtv.SlackBuild b/multimedia/mythtv/mythtv.SlackBuild
index 884ce059a0429..a240d54dfc230 100644
--- a/multimedia/mythtv/mythtv.SlackBuild
+++ b/multimedia/mythtv/mythtv.SlackBuild
@@ -24,10 +24,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mythtv
-VERSION=0.20.2
+VERSION=0.21
 ARCH=${ARCH:-i686}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=${TMP}/package-${PRGNAM}
@@ -42,13 +43,17 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
-./configure --prefix=/usr \
+./configure \
+  --prefix=/usr \
   --compile-type=release \
   --disable-ccache \
   --disable-distcc \
-  --disable-freebox \
   --disable-dbox2  \
   --disable-hdhomerun \
   --arch=$ARCH \
@@ -57,19 +62,21 @@ chmod -R u+w,go+r-w,a-s .
   --enable-dvb \
   --dvb-path=/usr/include \
   --with-bindings=perl \
-  --enable-proc-opt \
   --enable-xvmc \
   --enable-opengl-vsync
 
 qmake $PRGNAM.pro
 make
-make INSTALL_ROOT="$PKG" install
+make \
+  INSTALLDIRS=vendor \
+  INSTALL_ROOT="$PKG" \
+  install
 
 # Copy some other needed stuff to /usr/share/mythtv
 cp -a database contrib $PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING FAQ keys.txt README UPGRADING docs/* configfiles \
+cp -a AUTHORS COPYING FAQ keys.txt README UPGRADING docs/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 ( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
@@ -83,7 +90,7 @@ install -D -m 0755 $CWD/rc.mythbackend.new $PKG/etc/rc.d/rc.mythbackend.new
 )
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
diff --git a/multimedia/mythtv/mythtv.info b/multimedia/mythtv/mythtv.info
index ce68acfd9fb45..c00af7d16dcde 100644
--- a/multimedia/mythtv/mythtv.info
+++ b/multimedia/mythtv/mythtv.info
@@ -1,8 +1,8 @@
 PRGNAM="mythtv"
-VERSION="0.20.2"
+VERSION="0.21"
 HOMEPAGE="http://www.mythtv.org/"
-DOWNLOAD="http://ftp.osuosl.org/pub/mythtv/mythtv-0.20.2.tar.bz2"
-MD5SUM="db7ab2049e716349e43edf8e67458218"
+DOWNLOAD="http://ftp.osuosl.org/pub/mythtv/mythtv-0.21.tar.bz2"
+MD5SUM="49fc135e1cde90cd935c1229467fa37e"
 MAINTAINER="David Somero"
-EMAIL="dsomero@hotmail.com "
+EMAIL="dsomero@hotmail.com"
 APPROVED="rworkman"