diff options
author | Cezary M. Kruk <c.kruk@bigfoot.com> | 2010-05-13 00:23:20 +0200 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-13 00:23:20 +0200 |
commit | edb57c20c037628124332230523412f7006c832b (patch) | |
tree | e0e6ac5ca0642af38c1c2539a39d1ecec0409011 /desktop/wmSun | |
parent | 1f7242ec73477c841e1354e8cccdec39ce073dbe (diff) |
desktop/wmSun: Updated for version 1.03
Diffstat (limited to 'desktop/wmSun')
-rw-r--r-- | desktop/wmSun/slack-desc | 16 | ||||
-rw-r--r-- | desktop/wmSun/wmSun.SlackBuild | 31 | ||||
-rw-r--r-- | desktop/wmSun/wmSun.info | 10 |
3 files changed, 31 insertions, 26 deletions
diff --git a/desktop/wmSun/slack-desc b/desktop/wmSun/slack-desc index d7dca35893c5..25c70214714e 100644 --- a/desktop/wmSun/slack-desc +++ b/desktop/wmSun/slack-desc @@ -7,13 +7,13 @@ |-----handy-ruler------------------------------------------------------| wmSun: wmSun (Window Maker sunrise and sunset dockable application) -wmSun: +wmSun: wmSun: wmSun displays the current day's sunrise and sunset times. You must wmSun: enter your latitude and longitude correctly for it to work. -wmSun: -wmSun: -wmSun: -wmSun: -wmSun: -wmSun: -wmSun: +wmSun: +wmSun: +wmSun: +wmSun: +wmSun: +wmSun: +wmSun: diff --git a/desktop/wmSun/wmSun.SlackBuild b/desktop/wmSun/wmSun.SlackBuild index f3f289a2cede..d0037287fa05 100644 --- a/desktop/wmSun/wmSun.SlackBuild +++ b/desktop/wmSun/wmSun.SlackBuild @@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -30,7 +33,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -39,20 +42,21 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -cd wmSun - mkdir $PKG/usr - mkdir $PKG/bin - mkdir -p $PKG/man/man1 +# We have to "make clean" first, because guess what's in there already? +# wmSun: ELF 32-bit LSB executable, Intel 80386, version 1 (SYSV), +# dynamically linked (uses shared libs), not stripped +# Anyone want to guess how that ends on an x86_64 system? :-) - CFLAGS="$SLKCFLAGS" make - make install DESTDIR=$PKG +cd wmSun + mkdir -p $PKG/usr/{bin,man/man1} + make clean + make \ + CFLAGS="$SLKCFLAGS" \ + INCDIR="-I/usr/include/X11" \ + LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11" + make install DESTDIR=$PKG/usr cd - -# Executable and manual are already installed; -# we just move them to the correct location -mv $PKG/bin $PKG/usr -mv $PKG/man $PKG/usr - ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ xargs strip --strip-unneeded 2> /dev/null || true @@ -74,5 +78,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc 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/desktop/wmSun/wmSun.info b/desktop/wmSun/wmSun.info index cc3155aec399..951b4069fa23 100644 --- a/desktop/wmSun/wmSun.info +++ b/desktop/wmSun/wmSun.info @@ -1,8 +1,10 @@ PRGNAM="wmSun" VERSION="1.03" -HOMEPAGE="http://dockapps.org/file.php/id/16" -DOWNLOAD="http://dockapps.org/download.php/id/23/wmSun-1.03.tar.gz" -MD5SUM="34a2ea132f1a04e18be2d93abce40722" +HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmsun" +DOWNLOAD="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmSun-1.03.tar.gz" +MD5SUM="defc6747ebdb64b5d3afe91f916d3acc" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Cezary M. Kruk" EMAIL="c.kruk@bigfoot.com" -APPROVED="dsomero" +APPROVED="rworkman" |