3 files changed, 24 insertions, 24 deletions
diff --git a/desktop/wmCalClock/slack-desc b/desktop/wmCalClock/slack-desc
index a6f327f8de..e0c85868bf 100644
--- a/desktop/wmCalClock/slack-desc
+++ b/desktop/wmCalClock/slack-desc
@@ -7,13 +7,13 @@
 
           |-----handy-ruler------------------------------------------------------|
 wmCalClock: wmCalClock (Window Maker date and time dockable application)
-wmCalClock: 
+wmCalClock:
 wmCalClock: wmCalClock is a simple calendar clock that uses anti-aliased
 wmCalClock: characters and drop shadows. Doesn't do much except tell the time...
-wmCalClock: 
-wmCalClock: 
-wmCalClock: 
-wmCalClock: 
-wmCalClock: 
-wmCalClock: 
-wmCalClock: 
+wmCalClock:
+wmCalClock:
+wmCalClock:
+wmCalClock:
+wmCalClock:
+wmCalClock:
+wmCalClock:
diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild
index 8262bd90f0..d1a912347a 100644
--- a/desktop/wmCalClock/wmCalClock.SlackBuild
+++ b/desktop/wmCalClock/wmCalClock.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
@@ -41,18 +44,14 @@ find . \
 
 
 cd Src
-  CFLAGS="$SLKCFLAGS" make
-  mkdir $PKG/usr
-  mkdir $PKG/bin
-  mkdir -p $PKG/man/man1
-  make install DESTDIR=$PKG
+  make \
+    CFLAGS="$SLKCFLAGS" \
+    INCDIR="-I/usr/include/X11" \
+    LIBDIR="-L/usr/lib${LIBDIRSUFFIX}/X11"
+  mkdir -p $PKG/usr/{bin,man/man1}
+  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 +73,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/wmCalClock/wmCalClock.info b/desktop/wmCalClock/wmCalClock.info
index 3c38b3cfad..eb0000019c 100644
--- a/desktop/wmCalClock/wmCalClock.info
+++ b/desktop/wmCalClock/wmCalClock.info
@@ -1,8 +1,10 @@
 PRGNAM="wmCalClock"
 VERSION="1.25"
-HOMEPAGE="http://dockapps.org/file.php/id/9"
-DOWNLOAD="http://dockapps.org/download.php/id/16/wmCalClock-1.25.tar.gz"
-MD5SUM="70c47ec1d8f8ec7e3ed7eb2d3105d371"
+HOMEPAGE="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/time.html#wmcalclock"
+DOWNLOAD="http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz"
+MD5SUM="a401ded0e1fee4bcc4623076159bca41"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Cezary M. Kruk"
 EMAIL="c.kruk@bigfoot.com"
-APPROVED="dsomero"
+APPROVED="rworkman"