system/xprintidle: New maintainer, minor fixes.

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

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

4 files changed, 22 insertions, 35 deletions

diff --git a/system/xprintidle/README b/system/xprintidle/README
index 0c9ebe8e20..81e556cabe 100644
--- a/system/xprintidle/README
+++ b/system/xprintidle/README
@@ -1,3 +1,5 @@
+xprintidle (utility printing user's idle time in X)
+
 xprintidle is a simple utility to query the X server for the
 user's idle time in milliseconds and print it to the standard
 output.
diff --git a/system/xprintidle/slack-desc b/system/xprintidle/slack-desc
index 70cdb442eb..bf3ab26cfc 100644
--- a/system/xprintidle/slack-desc
+++ b/system/xprintidle/slack-desc
@@ -12,8 +12,8 @@ xprintidle: xprintidle is a simple utility to query the X server for the
 xprintidle: user's idle time in milliseconds and print it to the standard
 xprintidle: output.
 xprintidle:
+xprintidle: Homepage: https://github.com/g0hl1n/xprintidle
 xprintidle:
 xprintidle:
 xprintidle:
-xprintidle: https://github.com/g0hl1n/xprintidle
 xprintidle:
diff --git a/system/xprintidle/xprintidle.SlackBuild b/system/xprintidle/xprintidle.SlackBuild
index cf1ad0e6b1..cf6c166122 100644
--- a/system/xprintidle/xprintidle.SlackBuild
+++ b/system/xprintidle/xprintidle.SlackBuild
@@ -2,31 +2,21 @@
 
 # Slackware build script for xprintidle
 
-# Copyright 2022 Juan M. Lasca <juanmlasca@gmail.com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Originally written 2022 by Juan M. Lasca <email removed>
+# Modified and now maintained by B. Watson <urchlay@slackware.uk>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20240221 bkw: BUILD=2
+# - Take over maintenance
+# - Relicense as WTFPL
+# - Tweak README and slack-desc
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xprintidle
 VERSION=${VERSION:-0.2.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -70,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 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 {} +
 
 mkdir build
 cd build
@@ -93,14 +80,12 @@ cd build
   DESTDIR=$PKG $NINJA install
 cd ..
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man*/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-   AUTHORS COPYING README.md \
-   $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING README.md $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/xprintidle/xprintidle.info b/system/xprintidle/xprintidle.info
index 80a25db0db..b0f03a24d6 100644
--- a/system/xprintidle/xprintidle.info
+++ b/system/xprintidle/xprintidle.info
@@ -6,5 +6,5 @@ MD5SUM="a87dc804a6e84a58fb8057c2522da3f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Juan M. Lasca"
-EMAIL="juanmlasca@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"