system/xautomation: Minor fixes.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 66 insertions, 23 deletions

diff --git a/system/xautomation/030_xmousepos-add-xautomation-manpage.patch b/system/xautomation/030_xmousepos-add-xautomation-manpage.patch
new file mode 100644
index 0000000000..06617f21b4
--- /dev/null
+++ b/system/xautomation/030_xmousepos-add-xautomation-manpage.patch
@@ -0,0 +1,33 @@
+Description: xmousepos added to the xautomation manpage.
+Author: Francisco Vilmar Cardoso Ruviaro <francisco.ruviaro@riseup.net>
+Last-Update: 2020-06-05
+
+--- xautomation-1.09.orig/xautomation.7
++++ xautomation-1.09/xautomation.7
+@@ -9,7 +9,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH XAUTOMATION 7 "August 08, 2005"
++.TH XAUTOMATION 7 "June 05, 2020"
+ .\" Please adjust this date whenever revising the manpage.
+ .\"
+ .\" Some roff macros, for reference:
+@@ -51,6 +51,9 @@ Converts an image file from 24-bit RGB t
+ .B visgrep
+ Visual grep, greps for images in another image.
+ .TP
++.B xmousepos
++Gets and prints the current mouse position.
++.TP
+ .B xte
+ Generates fake input using the XTest extension.
+ 
+@@ -63,6 +66,7 @@ For more information, please see the ind
+ .BR png2pat (1),
+ .BR rgb2pat (1),
+ .BR visgrep (1),
++.BR xmousepos (1),
+ .BR xte (1).
+ 
+ .SH AUTHOR
diff --git a/system/xautomation/README b/system/xautomation/README
index dd2e6f9417..f7d72e974d 100644
--- a/system/xautomation/README
+++ b/system/xautomation/README
@@ -1,6 +1,7 @@
-xautomation contains tools to control the X server from the command line.
+xautomation (control the X server from the command line)
 
-The tools will be useful for scripting, and for doing "visual scraping"
-to find things on the screen. These programs allow scripted mouse movement,
-clicking, button up/down, key up/down, etc., and use the XTest extension.
-The visgrep program finds images inside of images and reports their coordinates.
+The tools will be useful for scripting, and for doing "visual
+scraping" to find things on the screen. These programs allow scripted
+mouse movement, clicking, button up/down, key up/down, etc., and
+use the XTest extension. The visgrep program finds images inside of
+images and reports their coordinates.
diff --git a/system/xautomation/slack-desc b/system/xautomation/slack-desc
index 7ca5772751..dd44fff293 100644
--- a/system/xautomation/slack-desc
+++ b/system/xautomation/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-xautomation: xautomation (Tools to control the X server from the command line)
+xautomation: xautomation (control the X server from the command line)
 xautomation:
 xautomation: Control X from the command line for scripts, and do
 xautomation: "visual scraping" to find things on the screen. The control
diff --git a/system/xautomation/xautomation.SlackBuild b/system/xautomation/xautomation.SlackBuild
index cd97394508..c6a399473f 100644
--- a/system/xautomation/xautomation.SlackBuild
+++ b/system/xautomation/xautomation.SlackBuild
@@ -2,14 +2,23 @@
 
 # Slackware build script for xautomation.
 
-# Written by V'yacheslav Stetskevych
-# Modified by B. Watson
+# Originally written by V'yacheslav Stetskevych.  Modified by
+# B. Watson. Original version had no license. Modified version
+# released under the WTFPL. See http://www.wtfpl.net/txt/copying/
+# for details.
+
+# 20210809 bkw: BUILD=2
+# - make README validate (no >=72 char lines)
+# - fix typos and grammar in man pages
+# - don't install useless INSTALL in doc dir
+# - *do* install ChangeLog in doc dir
+# - use https URLs in .info file
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xautomation
 VERSION=${VERSION:-1.09}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -21,9 +30,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -56,15 +62,19 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 {} \+
+
+sed -i '/set of/s,\(command line\)s,\1,' $PRGNAM.7
+sed -i 's,^\\&\. *,&\n,' visgrep.1
+sed -i 's,occured,occured,' visgrep.1
+sed -i 's,charactes,characters,' xte.1
+
+# patch comes from Debian
+patch -p1 < $CWD/030_xmousepos-add-xautomation-manpage.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-lX11" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -80,11 +90,10 @@ make
 # regular make install is OK, strip them afterwards.
 make install DESTDIR=$PKG
 strip $PKG/usr/bin/*
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/xautomation/xautomation.info b/system/xautomation/xautomation.info
index e7805ba27c..88a98889a4 100644
--- a/system/xautomation/xautomation.info
+++ b/system/xautomation/xautomation.info
@@ -1,7 +1,7 @@
 PRGNAM="xautomation"
 VERSION="1.09"
-HOMEPAGE="http://hoopajoo.net/projects/xautomation.html"
-DOWNLOAD="http://hoopajoo.net/static/projects/xautomation-1.09.tar.gz"
+HOMEPAGE="https://hoopajoo.net/projects/xautomation.html"
+DOWNLOAD="https://hoopajoo.net/static/projects/xautomation-1.09.tar.gz"
 MD5SUM="16b973fdb525feed876471225bba30ed"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""