4 files changed, 41 insertions, 24 deletions
diff --git a/libraries/libdockapp/README b/libraries/libdockapp/README
index 2745ae0bac..33ede9d6c9 100644
--- a/libraries/libdockapp/README
+++ b/libraries/libdockapp/README
@@ -1,4 +1,4 @@
-libDockApp is a library for developing Window Maker dockapps.
+libdockapp (library for developing WindowMaker dockapps)
 
 libDockApp is a library that provides a framework for developing
 dockapps. It provides functions and structures to define and display
@@ -7,4 +7,4 @@ command-line options, create a dockable icon, handle events, etc.
 The goal of the library is to provide a simple, yet clean interface and
 standardize the ways in which dockapps are developed. A dockapp
 developed using libDockApp will automatically behave well under most
-window managers, and especially well under Window Maker.
+window managers, and especially well under WindowMaker.
diff --git a/libraries/libdockapp/libdockapp.SlackBuild b/libraries/libdockapp/libdockapp.SlackBuild
index e937f71dd2..14acf78dcc 100644
--- a/libraries/libdockapp/libdockapp.SlackBuild
+++ b/libraries/libdockapp/libdockapp.SlackBuild
@@ -1,13 +1,27 @@
 #!/bin/sh
 
-# Slackware build script for libDockApp
-# Written by Cezary M. Kruk (c.kruk@bigfoot.com)
-#
+# Slackware build script for libdockapp
+# Originally written by Cezary M. Kruk (email removed)
+
 # Modified by the SlackBuilds.org project.
 
+# Modified and now maintained by B. Watson <yalhcru@gmail.com>.
+# Original script had no license. Modified version released under
+# the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20180930 bkw:
+# - Take over maintenance, BUILD=2.
+# - Add doinst.sh with mkfontdir stuff. Specifically, the old version
+#   would install a broken /usr/share/fonts/misc/fonts.dir file that
+#   messed up X's ability to use the misc fonts.
+# - Install all the docs to /usr/doc/$PRGNAM-$VERSION, not /usr/share/doc.
+# - Don't install useless INSTALL doc.
+# - Minor script tweaks/cleanups.
+# - s/Window Maker/WindowMaker/ in README and slack-desc.
+
 PRGNAM=libdockapp
 VERSION=${VERSION:-0.7.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -42,15 +56,14 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf dockapps-b9baa8f
+rm -rf $PRGNAM-$VERSION
+mkdir $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd dockapps-b9baa8f
+cd dockapps-*
 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 {} \+
 
 autoreconf -fi
 CFLAGS="$SLKCFLAGS" \
@@ -60,24 +73,28 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION/examples \
   --disable-debug \
   --enable-static=no \
   --build=$ARCH-slackware-linux
 
-make XFONTDIR="\$(DESTDIR)/usr/share/fonts"
-make install DESTDIR=$PKG XFONTDIR="\$(DESTDIR)/usr/share/fonts"
+make XFONTDIR="/usr/share/fonts"
+make install-strip DESTDIR=$PKG XFONTDIR="\$(DESTDIR)/usr/share/fonts"
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# When 15.0 comes along, uncomment this line:
+# rm -f $PKG/usr/lib$LIBDIRSUFFIX/*.la
+
+# Stop installing broken fonts.dir. doinst.sh will generate a correct one.
+rm -rf $PKG/usr/share/fonts/misc/fonts.dir
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS BUGS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# doinst.sh came from Pat's font-misc-misc-1.1.2-noarch-1 package.
 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}
-
diff --git a/libraries/libdockapp/libdockapp.info b/libraries/libdockapp/libdockapp.info
index f76754b5b6..71868aad0e 100644
--- a/libraries/libdockapp/libdockapp.info
+++ b/libraries/libdockapp/libdockapp.info
@@ -6,5 +6,5 @@ MD5SUM="219e042f8200448eaa34bdf4fc4aa820"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Cezary M. Kruk"
-EMAIL="c.kruk@bigfoot.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/libdockapp/slack-desc b/libraries/libdockapp/slack-desc
index 2f373f534a..ff5e8b43ab 100644
--- a/libraries/libdockapp/slack-desc
+++ b/libraries/libdockapp/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
-libdockapp: libdockapp (library for developing Window Maker dockapps)
+libdockapp: libdockapp (library for developing WindowMaker dockapps)
 libdockapp:
 libdockapp: libDockApp is a library that provides a framework for developing
 libdockapp: dockapps. It provides functions and structures to define and display
@@ -15,5 +15,5 @@ libdockapp:
 libdockapp: The goal of the library is to provide a simple, yet clean interface
 libdockapp: and standardize the ways in which dockapps are developed. A dockapp
 libdockapp: developed using libDockApp will automatically behave well under most
-libdockapp: window managers, and especially well under Window Maker.
+libdockapp: window managers, and especially well under WindowMaker.
 libdockapp: