diff options
-rwxr-xr-x | electricsheep/build/electricsheep.SlackBuild | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/electricsheep/build/electricsheep.SlackBuild b/electricsheep/build/electricsheep.SlackBuild index 53d748dd..f9885ab6 100755 --- a/electricsheep/build/electricsheep.SlackBuild +++ b/electricsheep/build/electricsheep.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2008 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2008, 2009 Eric Hameleers, Eindhoven, Netherlands # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,6 +32,8 @@ # Changelog: # 2.6.8-1: 16/Dec/2008 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 2.6.8-2: 07/jan/2009 by Eric Hameleers <alien@slackware.com> +# * KDE4 support and cleaner install borrowed from archlinux. # # Run 'sh electricsheep.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -44,7 +46,7 @@ PRGNAM=electricsheep VERSION=${VERSION:-2.6.8} ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} DOCS="COPYING README" @@ -132,6 +134,10 @@ cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE} cd ${PRGNAM}-${VERSION} +# Do not install outside of $PKG: +sed -i -e \ + 's/$(INSTALL) -d $(pkgdatadir)/$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/' \ + Makefile.in chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -150,18 +156,20 @@ CFLAGS="$SLKCFLAGS" \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -# Install all the needed stuff to the package dir -# Use installwatch if available, to produce a logfile of the installation -# process that is more easily readable: -if $(which installwatch > /dev/null 2>&1); then - installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install -else - make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log -fi +install -d ${PKG}/usr/share/xscreensaver/config +make DESTDIR=$PKG SCREENSAVER_DATADIR=${PKG}/usr/share/xscreensaver/config \ + install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log # No static libraries: find $PKG/usr/lib${LIBDIRSUFFIX} -name "*.a" -exec rm -f {} \; +# We don't want these header files either: +rm -rf $PKG/usr/include/mpeg2dec + +# Add the KDE4 .desktop file: +install -D -m644 ${SRCDIR}/electricsheep.desktop \ + ${PKG}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop + # Add xscreensaver module: mkdir -p $PKG/usr/share/xscreensaver/config install -m644 electricsheep.xml \ @@ -178,7 +186,11 @@ gzip -9c electricsheep.man > $PKG/usr/man/man1/electricsheep.1.gz # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $SRCDIR/$(basename $0) | sed \ + -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \ + -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \ + -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \ + > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; @@ -189,9 +201,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ # Add a package description: mkdir -p $PKG/install cat $SRCDIR/slack-desc > $PKG/install/slack-desc -if [ -f $SRCDIR/doinst.sh ]; then - cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh -fi # Build the package: cd $PKG |