desktop/wmdl: New maintainer, add man page.

4 files changed, 229 insertions, 9 deletions

diff --git a/desktop/wmdl/wmdl.1 b/desktop/wmdl/wmdl.1
new file mode 100644
index 0000000000..1c716dc97a
--- /dev/null
+++ b/desktop/wmdl/wmdl.1
@@ -0,0 +1,112 @@
+.\" Man page generated from reStructuredText.
+.
+.TH WMDL 1 "2017-02-10" "1.4.1" "SlackBuilds.org"
+.SH NAME
+wmdl \- CPU load meter, using id Software's Doom faces
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.\" RST source for wmdl(1) man page. Convert with:
+.
+.\" rst2man.py wmdl.rst > wmdl.1
+.
+.\" rst2man.py comes from the SBo development/docutils package.
+.
+.SH SYNOPSIS
+.sp
+wmdl [\-v] [\-h] [\-s yes/no] [\-w withdrawn/iconic/normal] [\-m cpu/load/uptime] [\-f scale_factor] [\-u milliseconds] [\-d display] [\-g geometry] [\-i initial_set_of_images]
+.SH DESCRIPTION
+.sp
+A simple CPU load meter, using id Software\(aqs Doom faces (more
+bloody = higher system load) or Tux the penguin (more angry = higher
+system load).
+.sp
+wmdl is a WindowMaker dockapp, but can be used with other window managers
+by running in normal window mode (see \-w option below).
+.SH OPTIONS
+.\" notice the **-opt** *param* stuff? rst's option recognition
+.
+.\" can't handle non-GNU-style options like -option (it thinks the
+.
+.\" option is -o, and the ption is the parameter). So we have to help
+.
+.\" it out a little.
+.
+.INDENT 0.0
+.TP
+.B \-h
+Print usage info and exit.
+.TP
+.B \-v
+Verbose.
+.TP
+.BI \-g \ geometry
+Window geometry, default 64x64+10+10
+.TP
+.BI \-d \ dpy
+Display. Default is to read the DISPLAY environment variable.
+.UNINDENT
+.INDENT 0.0
+.TP
+.B \-w withdrawn/iconic/normal
+Window mode: Iconic, Normal, or Withdrawn. Default: withdrawn.
+.TP
+.B \-s yes/no
+Shaped window: yes or no. "yes" requires X11 Shape extension.
+.TP
+.B \-m cpu/load/command [command index]
+Use load, cpu, or external command. See /usr/doc/wmdl\-1.4.1/README for command examples.
+Default: load.
+.UNINDENT
+.INDENT 0.0
+.TP
+.BI \-f \ scale_factor
+Scale: floating point number = 100% bloody. Default: 1.0 for \(aq\-m cpu\(aq,
+2.0 for \(aq\-m load\(aq.
+.TP
+.BI \-u \ milliseconds
+Update period in milliseconds. Default: 999
+.TP
+.BI \-i \ face_set
+0 = Doom faces (default), 1 = Tux faces.
+.UNINDENT
+.SH COPYRIGHT
+.sp
+See the file /usr/doc/wmdl\-1.4.1/README for license information.
+.SH AUTHORS
+.sp
+wmdl was written by Ben Cohen, with contributions from Guilhem Valentin,
+Chris Conn, and Kevin Pulo. Doom face images are copyrighted by id
+Software.
+.sp
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+.SH SEE ALSO
+.sp
+See the file /usr/doc/wmdl\-1.4.1/README for complete documentation.
+.\" Generated by docutils manpage writer.
+.
diff --git a/desktop/wmdl/wmdl.SlackBuild b/desktop/wmdl/wmdl.SlackBuild
index 9271bdd619..bee823c14f 100644
--- a/desktop/wmdl/wmdl.SlackBuild
+++ b/desktop/wmdl/wmdl.SlackBuild
@@ -2,16 +2,26 @@
 
 # Slackware build script for wmdl
 
-# Written by Pablo Santamaria (pablosantamaria@gmail.com)
+# Originally written by Pablo Santamaria (email removed)
+
+# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# had no license, modified version released under the WTFPL. See
+# http://www.wtfpl.net/txt/copying/ for details.
+
+# 20170210 bkw:
+# - Take over maintenance
+# - i486 => i586
+# - add man page
+# - BUILD=2
 
 PRGNAM=wmdl
 VERSION=${VERSION:-1.4.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +32,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"
@@ -53,8 +63,11 @@ find -L . \
 
 make CFLAGS="$SLKCFLAGS"
 mkdir -p $PKG/usr/bin
-cp -a wmdl $PKG/usr/bin
-strip --strip-unneeded $PKG/usr/bin/wmdl
+install -m0755 -s $PRGNAM $PKG/usr/bin
+
+# man page written for this SlackBuild, based on -h output and README.
+mkdir -p $PKG/usr/man/man1
+gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/wmdl/wmdl.info b/desktop/wmdl/wmdl.info
index 4537fa982c..db079d7285 100644
--- a/desktop/wmdl/wmdl.info
+++ b/desktop/wmdl/wmdl.info
@@ -6,5 +6,5 @@ MD5SUM="9711d13cb738d1e2da16fa42a7292586"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Pablo Santamaria"
-EMAIL="pablosantamaria@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/desktop/wmdl/wmdl.rst b/desktop/wmdl/wmdl.rst
new file mode 100644
index 0000000000..2b6ee4ac17
--- /dev/null
+++ b/desktop/wmdl/wmdl.rst
@@ -0,0 +1,95 @@
+.. RST source for wmdl(1) man page. Convert with:
+..   rst2man.py wmdl.rst > wmdl.1
+.. rst2man.py comes from the SBo development/docutils package.
+
+.. |version| replace:: 1.4.1
+.. |date| date::
+
+====
+wmdl
+====
+
+----------------------------------------------
+CPU load meter, using id Software's Doom faces
+----------------------------------------------
+
+:Manual section: 1
+:Manual group: SlackBuilds.org
+:Date: |date|
+:Version: |version|
+
+SYNOPSIS
+========
+
+wmdl [-v] [-h] [-s yes/no] [-w withdrawn/iconic/normal] [-m cpu/load/uptime] [-f scale_factor] [-u milliseconds] [-d display] [-g geometry] [-i initial_set_of_images]
+
+
+DESCRIPTION
+===========
+
+A simple CPU load meter, using id Software's Doom faces (more
+bloody = higher system load) or Tux the penguin (more angry = higher
+system load).
+
+wmdl is a WindowMaker dockapp, but can be used with other window managers
+by running in normal window mode (see -w option below).
+
+OPTIONS
+=======
+
+.. notice the **-opt** *param* stuff? rst's option recognition
+.. can't handle non-GNU-style options like -option (it thinks the
+.. option is -o, and the ption is the parameter). So we have to help
+.. it out a little.
+
+-h
+   Print usage info and exit.
+
+-v
+   Verbose.
+
+-g geometry
+   Window geometry, default 64x64+10+10
+
+-d dpy
+   Display. Default is to read the DISPLAY environment variable.
+
+-w withdrawn/iconic/normal
+   Window mode: Iconic, Normal, or Withdrawn. Default: withdrawn.
+
+-s yes/no
+   Shaped window: yes or no. "yes" requires X11 Shape extension.
+
+-m cpu/load/command [command index]
+   Use load, cpu, or external command. See /usr/doc/wmdl-|version|/README for command examples.
+   Default: load.
+
+-f scale_factor
+   Scale: floating point number = 100% bloody. Default: 1.0 for '-m cpu',
+   2.0 for '-m load'.
+
+-u milliseconds
+   Update period in milliseconds. Default: 999
+
+-i face_set
+   0 = Doom faces (default), 1 = Tux faces.
+
+COPYRIGHT
+=========
+
+See the file /usr/doc/wmdl-|version|/README for license information.
+
+AUTHORS
+=======
+
+wmdl was written by Ben Cohen, with contributions from Guilhem Valentin,
+Chris Conn, and Kevin Pulo. Doom face images are copyrighted by id
+Software.
+
+This man page written for the SlackBuilds.org project
+by B. Watson, and is licensed under the WTFPL.
+
+SEE ALSO
+========
+
+See the file /usr/doc/wmdl-|version|/README for complete documentation.