From b5b66cc0a8d4c0502978f1a05ea067aaaf5a877a Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Thu, 13 May 2010 00:35:13 +0200 Subject: multimedia/tvtime: Updated for version 1.0.2 --- multimedia/tvtime/doinst.sh | 6 ++++ multimedia/tvtime/tvtime.SlackBuild | 70 ++++++++++++++++++++++++++----------- multimedia/tvtime/tvtime.info | 6 ++-- 3 files changed, 60 insertions(+), 22 deletions(-) (limited to 'multimedia') diff --git a/multimedia/tvtime/doinst.sh b/multimedia/tvtime/doinst.sh index 47b73a296f..a5d8125f18 100644 --- a/multimedia/tvtime/doinst.sh +++ b/multimedia/tvtime/doinst.sh @@ -15,5 +15,11 @@ if [ -x usr/bin/update-desktop-database ]; then usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 fi +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + config etc/tvtime/tvtime.xml.new diff --git a/multimedia/tvtime/tvtime.SlackBuild b/multimedia/tvtime/tvtime.SlackBuild index 6d1f37dfd7..7d71cdd65d 100644 --- a/multimedia/tvtime/tvtime.SlackBuild +++ b/multimedia/tvtime/tvtime.SlackBuild @@ -1,25 +1,50 @@ #!/bin/sh -# Slackware build script for tvtime -# Written by Kyle Guinn +# Slackware build script for tvtime. + +# Copyright 2009-2010 Marco Bonetti +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tvtime VERSION=1.0.2 ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} 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="-O2 -march=i486 -mtune=i686" -#elif [ "$ARCH" = "i686" ]; then - #SLKCFLAGS="-O2 -march=i686 -mtune=i686" -#fi +# The INSTALL file recommends avoiding the use of the "-march" flag, +# and -fPIC on x86_64 results in failure +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="64" +fi set -e @@ -27,7 +52,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -42,17 +67,21 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --with-x \ - --enable-static=no + --enable-static=no \ + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG ( 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 + 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 || true ) ( cd $PKG/usr/man @@ -60,17 +89,18 @@ make install DESTDIR=$PKG for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done ) -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README docs/html \ - $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/usr/doc/$PRGNAM-$VERSION +cp -a \ + ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README docs/html \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + 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/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/multimedia/tvtime/tvtime.info b/multimedia/tvtime/tvtime.info index 9c6b0e8642..8edb503fd2 100644 --- a/multimedia/tvtime/tvtime.info +++ b/multimedia/tvtime/tvtime.info @@ -3,6 +3,8 @@ VERSION="1.0.2" HOMEPAGE="http://tvtime.sourceforge.net/" DOWNLOAD="http://downloads.sourceforge.net/tvtime/tvtime-1.0.2.tar.gz" MD5SUM="4b3d03afe61be239b08b5e522cd8afed" -MAINTAINER="Kyle Guinn" -EMAIL="elyk03@gmail.com" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Marco Bonetti" +EMAIL="sid77@slackware.it" APPROVED="rworkman" -- cgit v1.2.3