system/synaptics: Updated for version 0.14.6

4 files changed, 22 insertions, 24 deletions

diff --git a/system/synaptics/README b/system/synaptics/README
index 69218bfe8ae45..2a7fb21f30fab 100644
--- a/system/synaptics/README
+++ b/system/synaptics/README
@@ -17,6 +17,5 @@ Features:
   Multifinger taps (Not all hardware implements this feature.) 
   Run-time configuration using shared memory.
 
-This driver requires manual configuration of X.org/XFree86.  Review the INSTALL
-file in /usr/doc/synaptics-<version>
-
+This driver requires manual configuration of X.org/XFree86.  
+Review the INSTALL file in /usr/doc/synaptics-0.14.6 for details.
diff --git a/system/synaptics/slack-desc b/system/synaptics/slack-desc
index 535116f03bf05..e6e6fc4a1ad79 100644
--- a/system/synaptics/slack-desc
+++ b/system/synaptics/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
 synaptics: synaptics (Synaptics touchpad driver for X.org/XFree86)
 synaptics:
 synaptics: This is a driver for the Synaptics TouchPad for XOrg/XFree86 4.x. 
@@ -7,3 +15,5 @@ synaptics: more advanced features of the touchpad becomes available.
 synaptics:
 synaptics:
 synaptics:
+synaptics:
+synaptics:
diff --git a/system/synaptics/synaptics.SlackBuild b/system/synaptics/synaptics.SlackBuild
index 621bc7a069909..dd5a436aa316a 100644
--- a/system/synaptics/synaptics.SlackBuild
+++ b/system/synaptics/synaptics.SlackBuild
@@ -2,18 +2,12 @@
 
 ## Written by hollywoodb (hollywoodb@fastmail.fm)
 
-# Verify script is being run by root user.
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit
-fi
-
 NAME=synaptics
 VERSION=0.14.6
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$NAME
 OUTPUT=${OUTPUT:-/tmp}
@@ -32,6 +26,9 @@ cd $NAME-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Make the Makefile recognize $SLKCFLAGS
+sed -i "s/^CDEBUGFLAGS =.*/CDEBUGFLAGS = $SLKCFLAGS/" Makefile || exit 1
+
 make || exit 1
 
 # Install and strip binaries
@@ -39,15 +36,8 @@ install -D -m 0755 synclient $PKG/usr/bin/synclient
 install -D -m 0755 syndaemon $PKG/usr/bin/syndaemon
 strip --strip-unneeded $PKG/usr/bin/*
 
-# Figure out where to install the driver (needs work, but it's fine for now)
-if [ -d /usr/X11R6/lib/modules ]; then
-    DRIVER_DIR=/usr/X11R6/lib/modules
-else
-    echo "Couldn't determine directory to install Synaptics driver."
-    echo "Please contact SlackBuild author."
-    exit 1
-fi
-install -D -m 444 synaptics_drv.o $PKG/$DRIVER_DIR/input/synaptics_drv.o
+# Install the shared object file
+install -D -m 0755 synaptics_drv.so $PKG/usr/X11/lib/modules/input/synaptics_drv.so
 
 # Install and compress man pages
 mkdir -p $PKG/usr/man/man{1,5}
@@ -56,9 +46,8 @@ cat manpages/syndaemon.1 | gzip -9c > $PKG/usr/man/man1/syndaemon.1.gz
 cat manpages/synaptics.5 | gzip -9c > $PKG/usr/man/man5/synaptics.5.gz
 
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
-cp -a \
-  COMPATIBILITY FILES INSTALL* LICENSE NEWS README* TODO trouble-shooting.txt \
-    $PKG/usr/doc/$NAME-$VERSION
+cp -a COMPATIBILITY FILES INSTALL* LICENSE NEWS README* TODO \
+  trouble-shooting.txt $PKG/usr/doc/$NAME-$VERSION
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/synaptics/synaptics.info b/system/synaptics/synaptics.info
index d8f6d827166f7..470439b23396e 100644
--- a/system/synaptics/synaptics.info
+++ b/system/synaptics/synaptics.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://web.telia.com/~u89404340/touchpad/files/synaptics-0.14.6.tar.bz
 MD5SUM="1102cd575045640a064ab6f9b1e391af"
 MAINTAINER="hollywoodb"
 EMAIL="hollywoodb@fastmail.fm"
-APPROVED="robw810"
+APPROVED="rworkman"