system/numlockx: New maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

3 files changed, 19 insertions, 24 deletions

diff --git a/system/numlockx/README b/system/numlockx/README
index 0a000248c86d3..9b21b7fdea439 100644
--- a/system/numlockx/README
+++ b/system/numlockx/README
@@ -1,3 +1,5 @@
+numlockx (start X with numlock turned on)
+
 This little thingy allows you to start X with NumLock turned on
 (which is a feature that a lot of people seem to miss and nobody
 really knew how to achieve this).  If you use KDE or slim, you
diff --git a/system/numlockx/numlockx.SlackBuild b/system/numlockx/numlockx.SlackBuild
index 0b01d9233308b..29f15c34464a7 100644
--- a/system/numlockx/numlockx.SlackBuild
+++ b/system/numlockx/numlockx.SlackBuild
@@ -2,20 +2,21 @@
 
 # Slackware build script for NumLockX
 
-# Written by Menno Duursma <druiloor@zonnet.nl>
+# Written by Menno Duursma <email removed>
+# Previously maintained Niels Horn <email removed>
+# Now maintained by B. Watson <urchlay@slackware.uk>
 
-# This program is free software. It comes without any warranty.
-# Granted WTFPLv2, as published by Sam Hocevar dec'04.
-# For details see http://sam.zoy.org/wtfpl/COPYING
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
-# Maintained as of version 1.2 by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/10/26
+# 20230419 bkw: BUILD=2
+# - new maintainer.
+# - remove useless INSTALL from doc dir.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=numlockx
 VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -27,9 +28,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
@@ -62,11 +60,8 @@ 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 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 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -75,22 +70,20 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --x-libraries="/usr/lib${LIBDIRSUFFIX}/X11" \
-  --x-includes="/usr/include/X11" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
 # help2man --no-info numlockx > numlockx.1
 mkdir -p $PKG/usr/man/man1
 gzip -9c $CWD/numlockx.1 > $PKG/usr/man/man1/numlockx.1.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog INSTALL LICENSE README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS ChangeLog LICENSE README TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cat $CWD/README.SLACKWARE > $PKGDOC/README.SLACKWARE
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/numlockx/slack-desc b/system/numlockx/slack-desc
index 3e6bdc42ac7e9..125af7e07e345 100644
--- a/system/numlockx/slack-desc
+++ b/system/numlockx/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-numlockx: numlockx (Start X with NumLock Turned On)
+numlockx: numlockx (start X with numlock turned on)
 numlockx:
 numlockx: This little thingy allows you to start X with NumLock turned on
 numlockx: (which is a feature that a lot of people seem to miss and nobody