1 files changed, 38 insertions, 28 deletions
diff --git a/multimedia/tvtime/tvtime.SlackBuild b/multimedia/tvtime/tvtime.SlackBuild
index f58c3c41f2769..6d1f37dfd76d9 100644
--- a/multimedia/tvtime/tvtime.SlackBuild
+++ b/multimedia/tvtime/tvtime.SlackBuild
@@ -1,38 +1,43 @@
 #!/bin/sh
 
 # Slackware build script for tvtime
-# Written by Kyle Guinn
+# Written by Kyle Guinn <elyk03@gmail.com>
 
-# Modified by the SlackBuilds.org project
-
-VERSION=1.0.1
+PRGNAM=tvtime
+VERSION=1.0.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-tvtime
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # The INSTALL file recommends avoiding the use of the "-march" flag.
 # If you need it, change the appropriate lines below.
-if [ "$ARCH" = "i486" ]; then
-  #SLKCFLAGS="-march=i486 -mtune=i686"
-  SLKCFLAGS=""
-elif [ "$ARCH" = "i686" ]; then
-  #SLKCFLAGS="-march=i686 -mtune=i686"
-  SLKCFLAGS=""
-fi
+#if [ "$ARCH" = "i486" ]; then
+  #SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+#elif [ "$ARCH" = "i686" ]; then
+  #SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+#fi
+
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf tvtime-$VERSION
-tar -xzvf $CWD/tvtime-$VERSION.tar.gz || exit 1
-cd tvtime-$VERSION || exit 1
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Apply some bugfix patches from Pardus
+# http://paketler.pardus.org.tr/2007/source/tvtime.html
+for foo in $CWD/patches/* ; do
+  patch -p1 < $foo ; 
+done
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -40,27 +45,32 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --with-x \
-  || exit 1
+  --enable-static=no
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
-# Fix icon path in .desktop file so that it will show in KDE
-sed -i 's%Icon=tvtime.png%Icon=/usr/share/pixmaps/tvtime.png%g' \
-  $PKG/usr/share/applications/net-tvtime.desktop || exit 1
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
 
 ( cd $PKG/usr/man
   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/usr/doc/tvtime-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README docs/html \
-  $PKG/usr/doc/tvtime-$VERSION
-cat $CWD/tvtime.SlackBuild > $PKG/usr/doc/tvtime-$VERSION/tvtime.SlackBuild
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+# Let's not clobber the config file
+mv $PKG/etc/tvtime/tvtime.xml $PKG/etc/tvtime/tvtime.xml.new
 
 mkdir -p $PKG/install
 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/tvtime-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz