aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCezary M. Kruk <c.kruk@bigfoot.com>2010-05-13 00:23:19 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-13 00:23:19 +0200
commit1f7242ec73477c841e1354e8cccdec39ce073dbe (patch)
tree2fa3b67576ba6f8d26adad2bab47dddb586fc818
parent8dd5bf1dd3b57f1c74be0826c4db74d8bb98cf2b (diff)
desktop/wmMoonClock: Updated for version 1.27
-rw-r--r--desktop/wmMoonClock/README5
-rw-r--r--desktop/wmMoonClock/slack-desc18
-rw-r--r--desktop/wmMoonClock/wmMoonClock.SlackBuild27
-rw-r--r--desktop/wmMoonClock/wmMoonClock.info10
4 files changed, 29 insertions, 31 deletions
diff --git a/desktop/wmMoonClock/README b/desktop/wmMoonClock/README
index 130a74c897306..6cba56e9e75c9 100644
--- a/desktop/wmMoonClock/README
+++ b/desktop/wmMoonClock/README
@@ -1,5 +1,4 @@
wmMoonClock is Window Maker moon phase dockable application
-wmMoonClock displays the current phase of the moon.
-Clicking on the icon brings up different displays
-there are 5 in all.
+wmMoonClock displays the current phase of the moon. Clicking on
+the icon brings up different displays - there are five in all.
diff --git a/desktop/wmMoonClock/slack-desc b/desktop/wmMoonClock/slack-desc
index 329313080f126..d5378d4c58a0b 100644
--- a/desktop/wmMoonClock/slack-desc
+++ b/desktop/wmMoonClock/slack-desc
@@ -7,13 +7,13 @@
|-----handy-ruler------------------------------------------------------|
wmMoonClock: wmMoonClock (Window Maker moon phase dockable application)
-wmMoonClock:
-wmMoonClock: wmMoonClock displays the current phase of the moon. Clicking on the
+wmMoonClock:
+wmMoonClock: wmMoonClock displays the current phase of the moon. Clicking on the
wmMoonClock: icon brings up different displays -- there are 5 in all.
-wmMoonClock:
-wmMoonClock:
-wmMoonClock:
-wmMoonClock:
-wmMoonClock:
-wmMoonClock:
-wmMoonClock:
+wmMoonClock:
+wmMoonClock:
+wmMoonClock:
+wmMoonClock:
+wmMoonClock:
+wmMoonClock:
+wmMoonClock:
diff --git a/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild
index d5a7eab6bd364..e7b64ec6fa643 100644
--- a/desktop/wmMoonClock/wmMoonClock.SlackBuild
+++ b/desktop/wmMoonClock/wmMoonClock.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 . \
@@ -40,18 +43,14 @@ find . \
-exec chmod 644 {} \;
cd Src
- mkdir $PKG/usr
- mkdir $PKG/bin
- mkdir -p $PKG/man/man1
- CFLAGS="$SLKCFLAGS" make
- make install DESTDIR=$PKG
+ mkdir -p $PKG/usr/{bin,man/man1}
+ 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
@@ -65,13 +64,11 @@ mv $PKG/man $PKG/usr
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUGS COPYING \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS COPYING $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
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/wmMoonClock/wmMoonClock.info b/desktop/wmMoonClock/wmMoonClock.info
index 59284f8d667ea..9420c5b4f837d 100644
--- a/desktop/wmMoonClock/wmMoonClock.info
+++ b/desktop/wmMoonClock/wmMoonClock.info
@@ -1,8 +1,10 @@
PRGNAM="wmMoonClock"
VERSION="1.27"
-HOMEPAGE="http://dockapps.org/file.php/id/14"
-DOWNLOAD="http://dockapps.org/download.php/id/21/wmMoonClock-1.27.tar.gz"
-MD5SUM="b3aa5553641deb4bcaa290f93caccb3d"
+HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmmoonclock"
+DOWNLOAD="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmMoonClock-1.27.tar.gz"
+MD5SUM="c85bc974e70c867d556805505d3be48c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="Cezary M. Kruk"
EMAIL="c.kruk@bigfoot.com"
-APPROVED="dsomero"
+APPROVED="rworkman"