6 files changed, 124 insertions, 16 deletions
diff --git a/games/xcowsay/README b/games/xcowsay/README
index af365bd7b423f..26b743f4faad1 100644
--- a/games/xcowsay/README
+++ b/games/xcowsay/README
@@ -14,3 +14,6 @@ xcowsay includes all these amazing features:
  * Should work with any window manager.
  * Supports UTF-8 characters properly.
  * Use alternative non-cow images if you like.
+
+Note: Please don't ask for this to be updated for version 1.5. I know
+it exists. See README_1.5.txt for an explanation.
diff --git a/games/xcowsay/README_1.5.txt b/games/xcowsay/README_1.5.txt
new file mode 100644
index 0000000000000..4e71bd4fd590b
--- /dev/null
+++ b/games/xcowsay/README_1.5.txt
@@ -0,0 +1,16 @@
+For now, the xcowsay SlackBuild remains one version behind the latest
+release. This is because the latest (1.5) release doesn't work for
+everybody.
+
+Starting with version 1.5, xcowsay requires a compositing window manager
+that supports alpha channels. This build is for version 1.4, the last
+one which works correctly with traditional window managers such as
+WindowMaker or FVWM. Version 1.4 also works fine in environments where
+1.5 would work. If you *really* want version 1.5, download its source
+to the SlackBuild's directory and build it with a command like:
+
+# VERSION=1.5 BUILD=1 TAG=_custom ./xcowsay.SlackBuild
+
+Hopefully, some future version of xcowsay will make the compositing
+support optional (and maybe even autodetected), so this script can be
+updated to track new xcowsay releases again.
diff --git a/games/xcowsay/man/xcowdream.6 b/games/xcowsay/man/xcowdream.6
new file mode 100644
index 0000000000000..9dd44f2ecd976
--- /dev/null
+++ b/games/xcowsay/man/xcowdream.6
@@ -0,0 +1,25 @@
+.\" man page for xcowdream
+.TH "xcowdream" 6
+.SH NAME
+xcowdream \- Display a cute cow and speech bubble.
+.SH SYNOPSIS
+.B xcowdream
+.RI [\| image\-file \|]
+.RB [ "-h" ]
+.RB [ "-t"
+.RI \| time \|]
+.RI [ "other \fBxcowsay(6)\fP options ..." ]
+
+.SH DESCRIPTION
+\fBxcowdream\fP is a convenient shortcut for \fBxcowsay \-\-dream\fP.
+.P 
+Please see \fBxcowsay (6)\fP for details.
+
+.SH OPTIONS
+Same as \fBxcowsay (6)\fP.
+
+.SH "SEE ALSO"
+.BR xcowsay (6)
+
+.SH BUGS
+There are no bugs.
diff --git a/games/xcowsay/man/xcowfortune.6 b/games/xcowsay/man/xcowfortune.6
new file mode 100644
index 0000000000000..5f65ee7b496ac
--- /dev/null
+++ b/games/xcowsay/man/xcowfortune.6
@@ -0,0 +1,30 @@
+.\" man page for xcowfortune
+.TH "xcowfortune" 6
+.SH NAME
+xcowfortune \- Display a cute cow and a fortune quote in a speech bubble.
+.SH SYNOPSIS
+.B xcowfortune
+.RB [ "-h" ]
+.RB [ "-t"
+.RI \| time \|]
+.RB [ "-r"
+.RI \| speed \|]
+.RB [ "-d" ]
+.RB [ "-f"
+.RI \| font \|]
+.RI [\| text \|]...
+
+.SH DESCRIPTION
+\fBxcowfortune\fP is a convenient shortcut for piping the output of \fBfortune
+(6)\fP to \fBxcowsay (6)\fP.
+.P 
+Please see \fBxcowsay (6)\fP for details.
+
+.SH OPTIONS
+Same as \fBxcowsay (6)\fP.
+
+.SH "SEE ALSO"
+.BR xcowsay (6)
+
+.SH BUGS
+There are no bugs.
diff --git a/games/xcowsay/man/xcowthink.6 b/games/xcowsay/man/xcowthink.6
new file mode 100644
index 0000000000000..b4e6418f9725b
--- /dev/null
+++ b/games/xcowsay/man/xcowthink.6
@@ -0,0 +1,29 @@
+.\" man page for xcowthink
+.TH "xcowthink" 6
+.SH NAME
+xcowthink \- Display a cute cow and speech bubble.
+.SH SYNOPSIS
+.B xcowthink
+.RB [ "-h" ]
+.RB [ "-t"
+.RI \| time \|]
+.RB [ "-r"
+.RI \| speed \|]
+.RB [ "-d" ]
+.RB [ "-f"
+.RI \| font \|]
+.RI [\| text \|]...
+
+.SH DESCRIPTION
+\fBxcowthink\fP is a convenient shortcut for \fBxcowsay \-\-think\fP.
+.P 
+Please see \fBxcowsay (6)\fP for details.
+
+.SH OPTIONS
+Same as \fBxcowsay (6)\fP.
+
+.SH "SEE ALSO"
+.BR xcowsay (6)
+
+.SH BUGS
+There are no bugs.
diff --git a/games/xcowsay/xcowsay.SlackBuild b/games/xcowsay/xcowsay.SlackBuild
index be198ce62698e..0605052be1543 100644
--- a/games/xcowsay/xcowsay.SlackBuild
+++ b/games/xcowsay/xcowsay.SlackBuild
@@ -6,9 +6,18 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200221 bkw:
+# - BUILD=2
+# - Add man pages for xcow(dream|fortune|think)
+# - Move executables to /usr/games
+# - Was going to update to v1.5. See README_1.5.txt for why I didn't.
+#   You're not going to convince me to upgrade to a version I can't use,
+#   so don't try. Maybe 1.6 or later will support non-compositing WMs
+#   at some point.
+
 PRGNAM=xcowsay
 VERSION=${VERSION:-1.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -47,16 +56,14 @@ 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 \
   --enable-dbus \
+  --bindir=/usr/games \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -66,20 +73,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-strip 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
+# Man pages for wrapper scripts borrowed from Debian. xcowdream.6 was
+# modified to make more sense.
+for i in $CWD/man/*.6; do
+  cat $i > $PKG/usr/man/man6/$( basename $i )
+done
 
-( 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
-)
+gzip -9 $PKG/usr/man/man6/*.6
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install