desktop/wmclock: Updated for version 1.0.14.

4 files changed, 17 insertions, 18 deletions

diff --git a/desktop/wmclock/README b/desktop/wmclock/README
index fc33f80b8e957..8fe9495c5030d 100644
--- a/desktop/wmclock/README
+++ b/desktop/wmclock/README
@@ -8,9 +8,9 @@ can run a user-specified program on a mouse click.
 wmclock can display the month and weekday abbreviations in any of these
 languages:
 
-breton czech danish dutch english french french2 german hungarian indonesian 
-italian norwegian portuguese russian slovene spanish swedish ukrainian
-polish croatian
+breton croatian czech danish dutch english french french2 german
+hungarian indonesian italian norwegian polish portuguese russian
+slovene spanish swedish ukrainian
 
 To set the default language, set LANGUAGE to one of the above in the
 environment before running wmclock.SlackBuild, e.g.
diff --git a/desktop/wmclock/slack-desc b/desktop/wmclock/slack-desc
index 16537799e21b1..fbe9048e55d1e 100644
--- a/desktop/wmclock/slack-desc
+++ b/desktop/wmclock/slack-desc
@@ -12,8 +12,8 @@ wmclock: wmclock is an applet which displays the date and time in a dockable
 wmclock: tile in the same style as the clock from the NEXTSTEP(tm) operating
 wmclock: system. wmclock is specially designed for the Window Maker window
 wmclock: manager, by Alfredo Kojima, and features multiple language support,
-wmclock: twenty-four-hour and twelve-hour (am/pm) time display, and, optionally,
+wmclock: twenty-four-hour and twelve-hour (am/pm) time display, and optionally
 wmclock: can run a user-specified program on a mouse click.
 wmclock:
-wmclock:
+wmclock: This package's default language is: @LANGUAGE@
 wmclock:
diff --git a/desktop/wmclock/wmclock.SlackBuild b/desktop/wmclock/wmclock.SlackBuild
index 95a8274d51db7..bbfa620218438 100644
--- a/desktop/wmclock/wmclock.SlackBuild
+++ b/desktop/wmclock/wmclock.SlackBuild
@@ -6,8 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20151110 bkw:
+# - finally got around to upgrading to 1.0.14.
+# - added default language in slack-desc.
+
 PRGNAM=wmclock
-VERSION=${VERSION:-1.0.13}
+VERSION=${VERSION:-1.0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,18 +61,13 @@ find -L . \
 # Default is english. It's still possible to display in other
 # languages using the -monthxpm and -weekdayxpm options.
 
-# Language choices:
-# breton czech danish dutch english french french2 german hungarian indonesian
-# italian norwegian portuguese russian slovene spanish swedish ukrainian
-
 LANGUAGE=${LANGUAGE:-english}
 ./configure --lang $LANGUAGE
 
-make CDEBUGFLAGS="$SLKCFLAGS"
+make CDEBUGFLAGS="$SLKCFLAGS" PREFIX=/usr
 mkdir -p $PKG/usr/bin
-strip --strip-unneeded $PRGNAM
-install -m0755 -o root -g root $PRGNAM $PKG/usr/bin
-make install.share DESTDIR=$PKG
+install -s -m0755 -o root -g root $PRGNAM $PKG/usr/bin
+make install.share DESTDIR=$PKG PREFIX=/usr
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz
@@ -78,7 +77,7 @@ cp README COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@LANGUAGE@,$LANGUAGE," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmclock/wmclock.info b/desktop/wmclock/wmclock.info
index 5ae0584212980..fad3ff31d4711 100644
--- a/desktop/wmclock/wmclock.info
+++ b/desktop/wmclock/wmclock.info
@@ -1,8 +1,8 @@
 PRGNAM="wmclock"
-VERSION="1.0.13"
+VERSION="1.0.14"
 HOMEPAGE="http://www.bluestop.org/wmclock/"
-DOWNLOAD="http://www.bluestop.org/wmclock/wmclock-1.0.13.tar.gz"
-MD5SUM="e0ce24c2fe700351b1e917dd63dff7f0"
+DOWNLOAD="http://www.bluestop.org/wmclock/wmclock-1.0.14.tar.gz"
+MD5SUM="15a83f45e2baabec26b22a2153aa2417"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""