desktop/xpenguins: Updated for version 3.2.1, new maintainer.

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

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

5 files changed, 61 insertions, 36 deletions

diff --git a/desktop/xpenguins/README b/desktop/xpenguins/README
index 4b002a9168..aad5128e88 100644
--- a/desktop/xpenguins/README
+++ b/desktop/xpenguins/README
@@ -1,4 +1,9 @@
+xpenguins (animated penguins for your desktop)
+
 Ever wanted cute little penguins walking along the tops of your windows?
 Ever wanted to send an army of cute little penguins to invade the screen
 of someone else on your network? Probably not, but why not try this
-program out anyway - it's free (licensed under the GNU GPL)
+program out anyway - it's free (licensed under the GNU GPL).
+
+If you'd rather have Bart Simpson, Sonic the Hedgehog, or something
+else besides just penguins, install xpenguins-xtrathemes.
diff --git a/desktop/xpenguins/doinst.sh b/desktop/xpenguins/doinst.sh
new file mode 100644
index 0000000000..3e5691a052
--- /dev/null
+++ b/desktop/xpenguins/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/desktop/xpenguins/slack-desc b/desktop/xpenguins/slack-desc
index be5314f6ef..48ae928aad 100644
--- a/desktop/xpenguins/slack-desc
+++ b/desktop/xpenguins/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
          |-----handy-ruler------------------------------------------------------|
-xpenguins: xpenguins (penguins for your desktop)
+xpenguins: xpenguins (animated penguins for your desktop)
 xpenguins:
 xpenguins: Ever wanted cute little penguins walking along the tops of your
 xpenguins: windows? Ever wanted to send an army of cute little penguins to
diff --git a/desktop/xpenguins/xpenguins.SlackBuild b/desktop/xpenguins/xpenguins.SlackBuild
index 16f3fac9e3..16c28e29dc 100644
--- a/desktop/xpenguins/xpenguins.SlackBuild
+++ b/desktop/xpenguins/xpenguins.SlackBuild
@@ -1,27 +1,38 @@
 #!/bin/bash
 
 # Slackware build script for xpenguins
-# Written by Steven Pledger <piratesmack@ymail.com>
+# Originally written by Steven Pledger
+# Updated and now maintained by B. Watson <yalhcru@gmail.com>
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220207 bkw:
+# - take over maintenance.
+# - update for v3.2.1.
+# - i486 => i586.
+# - new-style icons.
+# - add doinst.sh.
+# - misc cleanups/fixes.
+
+# The new 3.x version is actually a fork. The original (2.x) hadn't
+# been updated in 20+ years.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xpenguins
-VERSION=${VERSION:-2.2}
+VERSION=${VERSION:-3.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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
@@ -31,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -54,40 +65,40 @@ 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" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --mandir=/usr/man \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README  \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
+
+for px in 16 32 48 64 128; do
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  convert -resize $size $PKG/usr/share/pixmaps/$PRGNAM.xpm \
+          -background none -gravity center -extent $size \
+          $dir/$PRGNAM.png
+done
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING INSTALL NEWS README $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/desktop/xpenguins/xpenguins.info b/desktop/xpenguins/xpenguins.info
index b85a7f44b2..6b42aa6c9f 100644
--- a/desktop/xpenguins/xpenguins.info
+++ b/desktop/xpenguins/xpenguins.info
@@ -1,10 +1,10 @@
 PRGNAM="xpenguins"
-VERSION="2.2"
-HOMEPAGE="http://xpenguins.seul.org/"
-DOWNLOAD="http://xpenguins.seul.org/xpenguins-2.2.tar.gz"
-MD5SUM="2ccf555d55f9b0377017322b3b3d27a4"
+VERSION="3.2.1"
+HOMEPAGE="https://sourceforge.net/projects/xpenguins/"
+DOWNLOAD="https://downloads.sourceforge.net/project/xpenguins/xpenguins-3.2.1.tar.gz"
+MD5SUM="53ab11f007eda119b73862a8e9aeec78"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Steven Pledger"
-EMAIL="piratesmack@ymail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"