14 files changed, 72 insertions, 40 deletions
diff --git a/games/oblige-legacy4/README b/games/oblige-legacy4/README
index fddaaf73b3..d10148e57b 100644
--- a/games/oblige-legacy4/README
+++ b/games/oblige-legacy4/README
@@ -1,9 +1,11 @@
-OBLIGE v4 is a random level generator for various classic games, including
-DOOM, DOOM II, Heretic, Hexen, and Quake. The goal is to produce high
-quality levels which are fun to play.
+oblige-legacy4 (random level generator for classic FPS games)
+
+OBLIGE v4 is a random level generator for various classic games,
+including DOOM, DOOM II, Heretic, Hexen, and Quake. The goal is to
+produce high quality levels which are fun to play.
 
 This is an older version of oblige, with support for Heretic, Hexen,
-and Quake. If you want the latest version (6.x), install oblige. It can
+and Quake. If you want the latest version (7.x), install oblige. It can
 coexist with this version, but lacks support for Heretic and Quake. 6.x
 also uses a different alrogithm for level generation.
 
diff --git a/games/oblige-legacy4/doinst.sh b/games/oblige-legacy4/doinst.sh
index 4e8ba7071d..3e5691a052 100644
--- a/games/oblige-legacy4/doinst.sh
+++ b/games/oblige-legacy4/doinst.sh
@@ -2,3 +2,8 @@ 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/games/oblige-legacy4/icons/128.png b/games/oblige-legacy4/icons/128.png
new file mode 100644
index 0000000000..a6ee73f133
--- /dev/null
+++ b/games/oblige-legacy4/icons/128.png
diff --git a/games/oblige-legacy4/icons/16.png b/games/oblige-legacy4/icons/16.png
new file mode 100644
index 0000000000..2616f57ed2
--- /dev/null
+++ b/games/oblige-legacy4/icons/16.png
diff --git a/games/oblige-legacy4/icons/32.png b/games/oblige-legacy4/icons/32.png
new file mode 100644
index 0000000000..b2efe3c78e
--- /dev/null
+++ b/games/oblige-legacy4/icons/32.png
diff --git a/games/oblige-legacy4/icons/48.png b/games/oblige-legacy4/icons/48.png
new file mode 100644
index 0000000000..de8ce27a71
--- /dev/null
+++ b/games/oblige-legacy4/icons/48.png
diff --git a/games/oblige-legacy4/icons/64.png b/games/oblige-legacy4/icons/64.png
new file mode 100644
index 0000000000..cd6c9874ce
--- /dev/null
+++ b/games/oblige-legacy4/icons/64.png
diff --git a/games/oblige-legacy4/oblige-legacy4.6 b/games/oblige-legacy4/oblige-legacy4.6
index 1d1042b645..d82dc7a554 100644
--- a/games/oblige-legacy4/oblige-legacy4.6
+++ b/games/oblige-legacy4/oblige-legacy4.6
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.42)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -133,20 +133,20 @@
 .\" ========================================================================
 .\"
 .IX Title "OBLIGE-LEGACY4 6"
-.TH OBLIGE-LEGACY4 6 "2014-09-25" "4.28b" "SlackBuilds.org"
+.TH OBLIGE-LEGACY4 6 "2021-10-20" "4.28b" "SlackBuilds.org"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
-oblige\-legacy4 \- random level generator for Doom, Doom II, Heretic, Hexen, and Quake
+oblige\-legacy4 \- random level generator for Doom and related games
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 \&\fBoblige\-legacy4\fR [\-options]
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-\&\fBoblige\-legacy4\fR creates a patch \s-1WAD\s0 file for use with Doom or Doom
-\&\s-1II,\s0 containing one or more randomly-generated levels. The generated \s-1WAD\s0
+\&\fBoblige\-legacy4\fR creates a patch \s-1WAD\s0 file for use with Doom, Doom \s-1II,\s0 Heretic, Hexen, or Quake,
+containing one or more randomly-generated levels. The generated \s-1WAD\s0
 files are ready to play (no separate node-building pass is needed).
 .PP
 Normally, \fBoblige\-legacy4\fR is controlled by its \s-1GUI,\s0 but it can be used
@@ -185,7 +185,7 @@ The \fBoblige\-legacy4\fR home page: \fIhttp://oblige\-legacy4.sourceforge.net\f
 .SH "LICENSE"
 .IX Header "LICENSE"
 This program is free software, under the terms of the \s-1GNU\s0 General Public
-License, and comes with \s-1ABSOLUTELY NO WARRANTY. \s0 See the documentation
+License, and comes with \s-1ABSOLUTELY NO WARRANTY.\s0  See the documentation
 for more details, or visit http://www.gnu.org/licenses/gpl\-2.0.txt
 .SH "AUTHOR"
 .IX Header "AUTHOR"
diff --git a/games/oblige-legacy4/oblige-legacy4.SlackBuild b/games/oblige-legacy4/oblige-legacy4.SlackBuild
index c0f08d31dd..80bf4403e7 100644
--- a/games/oblige-legacy4/oblige-legacy4.SlackBuild
+++ b/games/oblige-legacy4/oblige-legacy4.SlackBuild
@@ -1,11 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for oblige-legacy4
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230107 bkw: BUILD=4, remove INSTALL.txt from doc dir.
+
+# 20211020 bkw: BUILD=3
+# - make the icon transparent
+# - new-style icons (also transparent)
+# - update man page, README, slack-desc slightly
+
 # 20170621 bkw: fix build on -current.
 
 # 20140916 bkw: bump BUILD to 2.
@@ -21,10 +28,13 @@
 # Rider for the bug report). Also get rid of +x permissions on the data files
 # in /usr/share.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=oblige-legacy4
 VERSION=${VERSION:-4.28b}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -34,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -66,11 +80,8 @@ rm -rf ${SRCNAM}-${VERSION}-source
 unzip $CWD/$OLDNAM-$SRCVER-source.zip
 cd ${SRCNAM}-${VERSION}-source
 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 {} \+
 
 # Makefile.unixy originally came from the oblige author, I've hacked
 # it up to make it work with oblige 4.x and SBo's fltk13.
@@ -92,20 +103,34 @@ make INSTALL_PREFIX=/usr OPTIMISE="$SLKCFLAGS"
 make install INSTALL_PREFIX=$PKG/usr
 
 mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/applications
-cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
+# 128.png was created by extracting oblige.ico, then using the gimp
+# to turn the white background into transparency. The rest were scaled
+# down from that, with convert -resize.
+for i in $CWD/icons/*.png; do
+  px=$( basename $i | cut -d. -f1 )
+  size=${px}x${px}
+  dir=$PKG/usr/share/icons/hicolor/$size/apps
+  mkdir -p $dir
+  cat $i > $dir/$PRGNAM.png
+done
+
+ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
 # man page written for this build
 mkdir -p $PKG/usr/man/man6
 gzip -9c < $CWD/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp *.txt doc/*.txt $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
+rm -f INSTALL.txt
+cp *.txt doc/*.txt $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:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/games/oblige-legacy4/oblige-legacy4.desktop b/games/oblige-legacy4/oblige-legacy4.desktop
index d1fca99d6c..71a7fe8a6f 100644
--- a/games/oblige-legacy4/oblige-legacy4.desktop
+++ b/games/oblige-legacy4/oblige-legacy4.desktop
@@ -3,6 +3,6 @@ Type=Application
 Name=Oblige (Legacy Version)
 GenericName=Doom/Heretic/Quake Level Generator
 Icon=oblige-legacy4
-Exec=oblige-legacy4 %f
+Exec=/usr/games/oblige-legacy4 %f
 Terminal=false
 Categories=Game;ActionGame;Utility;
diff --git a/games/oblige-legacy4/oblige-legacy4.info b/games/oblige-legacy4/oblige-legacy4.info
index dd803ecd4d..3dae4ee75b 100644
--- a/games/oblige-legacy4/oblige-legacy4.info
+++ b/games/oblige-legacy4/oblige-legacy4.info
@@ -1,10 +1,10 @@
 PRGNAM="oblige-legacy4"
 VERSION="4.28b"
-HOMEPAGE="http://oblige.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/oblige/Oblige/4.28/oblige-428b-source.zip"
+HOMEPAGE="https://oblige.sourceforge.net/"
+DOWNLOAD="https://downloads.sourceforge.net/project/oblige/Oblige/4.28/oblige-428b-source.zip"
 MD5SUM="ae89031dcff12958bb866505c266c49f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/games/oblige-legacy4/oblige-legacy4.png b/games/oblige-legacy4/oblige-legacy4.png
deleted file mode 100644
index 7d6b6a0f66..0000000000
--- a/games/oblige-legacy4/oblige-legacy4.png
+++ /dev/null
diff --git a/games/oblige-legacy4/oblige-legacy4.pod b/games/oblige-legacy4/oblige-legacy4.pod
index d9a1a0e903..3f6ef6cc91 100644
--- a/games/oblige-legacy4/oblige-legacy4.pod
+++ b/games/oblige-legacy4/oblige-legacy4.pod
@@ -3,7 +3,7 @@
 
 =head1 NAME
 
-oblige-legacy4 - random level generator for Doom, Doom II, Heretic, Hexen, and Quake
+oblige-legacy4 - random level generator for Doom and related games
 
 =head1 SYNOPSIS
 
@@ -11,8 +11,8 @@ B<oblige-legacy4> [-options]
 
 =head1 DESCRIPTION
 
-B<oblige-legacy4> creates a patch WAD file for use with Doom or Doom
-II, containing one or more randomly-generated levels. The generated WAD
+B<oblige-legacy4> creates a patch WAD file for use with Doom, Doom II, Heretic, Hexen, or Quake,
+containing one or more randomly-generated levels. The generated WAD
 files are ready to play (no separate node-building pass is needed).
 
 Normally, B<oblige-legacy4> is controlled by its GUI, but it can be used
diff --git a/games/oblige-legacy4/slack-desc b/games/oblige-legacy4/slack-desc
index 7b383c187a..5377ae03f4 100644
--- a/games/oblige-legacy4/slack-desc
+++ b/games/oblige-legacy4/slack-desc
@@ -8,12 +8,12 @@
               |-----handy-ruler------------------------------------------------------|
 oblige-legacy4: oblige-legacy4 (random level generator for classic FPS games)
 oblige-legacy4:
-oblige-legacy4: OBLIGE is a random level generator for various classic games,
-oblige-legacy4: including DOOM, DOOM II, Heretic, and Quake. The goal is to produce
-oblige-legacy4: high quality levels which are fun to play.
-oblige-legacy4:
-oblige-legacy4: This is an older version with support for Heretic and Quake.
+oblige-legacy4: OBLIGE is a random level generator for various classic
+oblige-legacy4: games, including DOOM, DOOM II, Hexen, Heretic, and
+oblige-legacy4: Quake. The goal is to produce high quality levels
+oblige-legacy4: which are fun to play.
 oblige-legacy4:
+oblige-legacy4: This is an older version with support for Hexen, Heretic, and Quake.
 oblige-legacy4:
 oblige-legacy4:
 oblige-legacy4: