accessibility/unclutter: Updated for version 8

3 files changed, 18 insertions, 14 deletions

diff --git a/accessibility/unclutter/slack-desc b/accessibility/unclutter/slack-desc
index 02f5d332ac..dc2b341cfa 100644
--- a/accessibility/unclutter/slack-desc
+++ b/accessibility/unclutter/slack-desc
@@ -5,16 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-         |-----handy-ruler----------------------------------------------------|
+         |-----handy-ruler------------------------------------------------------|
 unclutter: unclutter (x11 tool for removing mouse clutter from the screen)
 unclutter: 
-unclutter: unclutter is a program which runs permanently in the background of
-unclutter: an X11 session.  It checks the X11 pointer (cursor) position every
-unclutter: few seconds, and when it finds it has not moved (and no buttons are
-unclutter: pressed on the mouse, and the cursor is not in the root window) it
-unclutter: creates a small sub-window as a child of the window the cursor is
-unclutter: in.  The new window installs a cursor of size 1x1 but a mask of all
-unclutter: 0, i.e. an invisible cursor.  This allows you to see all the text 
-unclutter: in an xterm or xedit, for example.
-unclutter: 
-
+unclutter: unclutter is a program which runs permanently in the background of an
+unclutter: X11 session.  It checks the X11 pointer (cursor) position every few
+unclutter: seconds, and when it has not moved (and no buttons are pressed on the
+unclutter: mouse, and the cursor is not in the root window), it creates a small
+unclutter: sub-window as a child of the window the cursor is in.  The new window
+unclutter: installs a cursor of size 1x1 but a mask of all 0, i.e. an invisible
+unclutter: cursor.  This allows you to see all of the text in e.g. an xterm.
+unclutter:
+unclutter:
diff --git a/accessibility/unclutter/unclutter.SlackBuild b/accessibility/unclutter/unclutter.SlackBuild
index 140839b708..00e4e8b4f3 100644
--- a/accessibility/unclutter/unclutter.SlackBuild
+++ b/accessibility/unclutter/unclutter.SlackBuild
@@ -17,10 +17,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
@@ -28,7 +31,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM
 chown -R root:root .
@@ -39,7 +42,7 @@ find . \
  -exec chmod 644 {} \;
 
 xmkmf -a
-make
+make CDEBUGFLAGS="$SLKCFLAGS -fno-strength-reduce -fno-strict-aliasing"
 
 # manual install since "make install" fails to install the man page
 strip $PRGNAM
@@ -56,4 +59,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/accessibility/unclutter/unclutter.info b/accessibility/unclutter/unclutter.info
index 89c523cb2a..9553a5daf4 100644
--- a/accessibility/unclutter/unclutter.info
+++ b/accessibility/unclutter/unclutter.info
@@ -3,6 +3,8 @@ VERSION="8"
 HOMEPAGE="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.README"
 DOWNLOAD="http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz"
 MD5SUM="1fe32cab8dd765263679618f8704117f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
 APPROVED="rworkman"