system/linuxconsoletools: Document gpm conflict.

Signed-off-by: B. Watson <yalhcru@gmail.com>

3 files changed, 42 insertions, 24 deletions

diff --git a/system/linuxconsoletools/README b/system/linuxconsoletools/README
index 10fa7c0aa7..aaac1d084e 100644
--- a/system/linuxconsoletools/README
+++ b/system/linuxconsoletools/README
@@ -1,12 +1,27 @@
-The Linux Console Project evolves from the command-line tools (jscal, jstest,
-and jsattach) which were included in Version 1 of the Linux Joystick Driver.
+linuxconsoletools (test and config utilities for the input subsystem)
 
-The original set of tools has been expanded and now includes utilities to test
-and configure joysticks, connect legacy devices to the kernel's input subsystem
-(providing support for serial mice, touchscreens etc.), and test the input event
-layer.
+The Linux Console Project evolves from the command-line tools (jscal,
+jstest, and jsattach) which were included in Version 1 of the Linux
+Joystick Driver.
 
-* this replaces the "joystick" build that was previously available
-* included in this build is a simple udev rule to automatically restore the
+The original set of tools has been expanded and now includes utilities
+to test and configure joysticks, connect legacy devices to the kernel's
+input subsystem (providing support for serial mice, touchscreens etc.),
+and test the input event layer.
+
+Notes:
+
+- This replaces the "joystick" build that was previously available.
+
+- Included in this build is a simple udev rule to automatically restore the
   joystick configuration(s); see the package README in the documentation
-  directory for more specific rules
+  directory for more specific rules.
+
+- By default, this build includes a newer version of /usr/bin/inputattach,
+  which overwrites the one from Slackware's gpm package. The new
+  inputattach should behave identically to the old one, except that it
+  supports many more devices, and is capable of running as a daemon. It
+  also has a man page, which the old one didn't have. If you have problems
+  with the new inputattach, reinstall gpm and then rebuild this package
+  with GPM_COMPAT=yes set in the environment. With this option, the new
+  inputattach will be installed as /usr/bin/inputattach-lct.
diff --git a/system/linuxconsoletools/linuxconsoletools.SlackBuild b/system/linuxconsoletools/linuxconsoletools.SlackBuild
index 280fd139b6..129224725c 100644
--- a/system/linuxconsoletools/linuxconsoletools.SlackBuild
+++ b/system/linuxconsoletools/linuxconsoletools.SlackBuild
@@ -22,18 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20140315 bkw: took over maintenance, updated for 1.4.7, replaced patch
-# with a bit of sed.
-
-# 20150505 bkw: update for v1.4.8
-
-# 20160726 bkw: update for v1.5.1
-
+# 20181030 bkw: add GPM_COMPAT=yes option, minor cleanups, BUILD=2
 # 20161015 bkw: update for v1.6.0
+# 20160726 bkw: update for v1.5.1
+# 20150505 bkw: update for v1.4.8
+# 20140315 bkw: took over maintenance, updated for 1.4.7,
+#               replaced patch with a bit of sed.
 
 PRGNAM=linuxconsoletools
 VERSION=${VERSION:-1.6.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -72,11 +70,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 # install manpages in /usr/man instead of /usr/share/man
 sed -i 's,share/man,man,g' docs/Makefile
@@ -86,6 +81,14 @@ make CFLAGS="$SLKCFLAGS" LDFLAGS="-Wl,-s" PREFIX=/usr
 make install DESTDIR=$PKG PREFIX=/usr
 gzip -9 $PKG/usr/man/man?/*.?
 
+# keep inputattach from overwriting Slackware's inputattach, if desired.
+# default is to overwrite, because the new inputattach supports many more
+# devices than the old one, and is just a newer version of the same thing.
+if [ "${GPM_COMPAT:-no}" = "yes" ]; then
+  mv $PKG/usr/bin/inputattach $PKG/usr/bin/inputattach-lct
+  mv $PKG/usr/man/man1/inputattach.1.gz $PKG/usr/man/man1/inputattach-lct.1.gz
+fi
+
 mkdir -p $PKG/lib/udev/rules.d/
 install -m 0644 $CWD/90-joystick.rules $PKG/lib/udev/rules.d/90-joystick.rules
 
diff --git a/system/linuxconsoletools/slack-desc b/system/linuxconsoletools/slack-desc
index b86490d2a5..29cb1ca244 100644
--- a/system/linuxconsoletools/slack-desc
+++ b/system/linuxconsoletools/slack-desc
@@ -6,9 +6,9 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                  |-----handy-ruler------------------------------------------------------|
-linuxconsoletools: linuxconsoletools (test/configuration utilities for joysticks)
+linuxconsoletools: linuxconsoletools (test and config utilities for the input subsystem)
 linuxconsoletools:
-linuxconsoletools: The Linux Console tools include utilities to test and configure
+linuxconsoletools: The Linux Console Tools include utilities to test and configure
 linuxconsoletools: joysticks, connect legacy devices to the kernel's input subsystem
 linuxconsoletools: (providing support for serial mice, touchscreens etc.), and test the
 linuxconsoletools: input event layer.