desktop/wmtime: New maintainer, add multiple language support.

6 files changed, 111 insertions, 17 deletions

diff --git a/desktop/wmtime/README b/desktop/wmtime/README
index bfab621523d0..3b755ef8b6c0 100644
--- a/desktop/wmtime/README
+++ b/desktop/wmtime/README
@@ -2,3 +2,17 @@ wmtime (time dockapp for WindowMaker)
 
 WMTime, guess what, displays the time and date and gives you
 some nice additional features too...
+
+wmtime supports several languages for displaying the days of the week and
+month names. By default, "us" (aka English) is used. This can be changed
+by setting LANGUAGE in the script's environment. Supported languages are:
+
+de
+es
+fr
+nl
+slovene
+us
+
+To change the language after package installation, you can adjust the
+symlink at /usr/share/wmtime/language.
diff --git a/desktop/wmtime/de.lang b/desktop/wmtime/de.lang
new file mode 100644
index 000000000000..01902dafa6f4
--- /dev/null
+++ b/desktop/wmtime/de.lang
@@ -0,0 +1,19 @@
+SO
+MO
+DI
+MI
+DO
+FR
+SA
+JAN
+FEB
+MAR
+APR
+MAI
+JUN
+JUL
+AUG
+SEP
+OKT
+NOV
+DEZ
diff --git a/desktop/wmtime/es.lang b/desktop/wmtime/es.lang
new file mode 100644
index 000000000000..9a52bfb38bb3
--- /dev/null
+++ b/desktop/wmtime/es.lang
@@ -0,0 +1,19 @@
+DO
+LU
+MA
+MI
+JU
+VI
+SA
+ENE
+FEB
+MAR
+ABR
+MAY
+JUN
+JUL
+AGO
+SEP
+OCT
+NOV
+DIC
diff --git a/desktop/wmtime/fr.lang b/desktop/wmtime/fr.lang
new file mode 100644
index 000000000000..12d9444fbc25
--- /dev/null
+++ b/desktop/wmtime/fr.lang
@@ -0,0 +1,19 @@
+DI
+LU
+MA
+ME
+JE
+VE
+SA
+JAN
+FEV
+MAR
+AVR
+MAI
+JUN
+JUL
+AOU
+SEP
+OCT
+NOV
+DEC
diff --git a/desktop/wmtime/wmtime.SlackBuild b/desktop/wmtime/wmtime.SlackBuild
index 46ac0295341c..4ba166cf0fa4 100644
--- a/desktop/wmtime/wmtime.SlackBuild
+++ b/desktop/wmtime/wmtime.SlackBuild
@@ -2,16 +2,26 @@
 
 # Slackware build script for wmtime
 
-# 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, BUILD=2
+# - i486 => i586
+# - Make the language stuff work, support LANGUAGE variable
+# - Add Spanish, French, German language support.
 
 PRGNAM=wmtime
 VERSION=${VERSION:-1.0b2}
-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"
@@ -51,18 +61,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-cd $PRGNAM
-sed -i "s/cc -c/cc -c -fgnu89-inline $SLKCFLAGS/" Makefile
-make
-mkdir -p $PKG/usr/bin
-  cp -a wmtime $PKG/usr/bin
-  strip --strip-unneeded $PKG/usr/bin/wmtime
-cd ..
+# make the language stuff actually work
+sed -i \
+  "s,fopen(\"language\",fopen(\"/usr/share/$PRGNAM/language\"," \
+  $PRGNAM/$PRGNAM.c
+
+# much as I like the Beatles, we can't have 8 weekday names here:
+sed -i '8d' languages/slovene.lang
+
+sed -i "s/cc -c/cc -c -fgnu89-inline $SLKCFLAGS/" $PRGNAM/Makefile
+make -C $PRGNAM
+mkdir -p $PKG/usr/bin $PKG/usr/share/$PRGNAM/languages
+install -m0755 -s $PRGNAM/$PRGNAM $PKG/usr/bin
+install -m0644 languages/* $CWD/*.lang $PKG/usr/share/$PRGNAM/languages
+
+LANGUAGE="${LANGUAGE:-us}"
+if [ -e $PKG/usr/share/$PRGNAM/languages/$LANGUAGE.lang ]; then
+  ln -s languages/$LANGUAGE.lang $PKG/usr/share/$PRGNAM/language
+else
+  echo "Invalid LANGUAGE '$LANGUAGE'. Supported values are:" 2>&1
+  ls $PKG/usr/share/$PRGNAM/languages/*.lang | sed 's,.*/\([^/]*\)\.lang,\1,g'
+  exit 1
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  BUGS CHANGES COPYING HINTS INSTALL README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUGS CHANGES COPYING HINTS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/wmtime/wmtime.info b/desktop/wmtime/wmtime.info
index 510233aa5d90..5a3ebb45808d 100644
--- a/desktop/wmtime/wmtime.info
+++ b/desktop/wmtime/wmtime.info
@@ -6,5 +6,5 @@ MD5SUM="04c03e001aa702cf653b6b6c3f58bf87"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Pablo Santamaria"
-EMAIL="pablosantamaria@gmail.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"