desktop/wmweather+: New maintainer, minor fixes.

3 files changed, 29 insertions, 16 deletions

diff --git a/desktop/wmweather+/README b/desktop/wmweather+/README
index 9c5efe085c..6bbbada40a 100644
--- a/desktop/wmweather+/README
+++ b/desktop/wmweather+/README
@@ -1,6 +1,9 @@
-wmweather+ will download the National Weather Serivce METAR bulletins;  AVN, ETA, and MRF forecasts;
-and any weather map for display in a WindowMaker dockapp. Think wmweather with a smaller font,
-forecasts, a weather map, and a sky condition display.
+wmweather+ will download the National Weather Serivce METAR bulletins;
+AVN, ETA, and MRF forecasts; and any weather map for display in a
+WindowMaker dockapp. Think wmweather with a smaller font, forecasts,
+a weather map, and a sky condition display.
 
-Note: This requires a configuration setup in a home folder called ".wmweather+". See "example.conf"
-under /usr/doc and read the manpage on how to set it up.
+Note: This requires a config file, either /etc/wmweather+.conf or
+~/.wmweather+/conf, which is used to set your geographical location.
+See /usr/doc/wmweather+-2.15/example.conf and read "man wmweather+"
+for details.
diff --git a/desktop/wmweather+/wmweather+.SlackBuild b/desktop/wmweather+/wmweather+.SlackBuild
index 7cb7452522..fe352d0462 100644
--- a/desktop/wmweather+/wmweather+.SlackBuild
+++ b/desktop/wmweather+/wmweather+.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wmweather+
 #
-# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2015 Gethyn ThomasQuail <email removed>
 # All rights reserved.
 #
 # Based on:
@@ -25,14 +25,24 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20160816 bkw:
+# - take over maintenance
+# - BUILD=2
+# - re-word README, hopefully it's clearer now
+# - actually use SLKCFLAGS
+# - install binary stripped
+# - i486 => i586
+
 PRGNAM=wmweather+
 VERSION=${VERSION:-2.15}
-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
@@ -43,8 +53,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"
@@ -72,7 +82,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Let's compile!
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -82,10 +93,9 @@ find -L . \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
 
-# Compresses man page
-gzip -9 $PKG/usr/man/man1/wmweather+.1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog COPYING example.conf HINTS README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/wmweather+/wmweather+.info b/desktop/wmweather+/wmweather+.info
index cb46edd8d3..4cd3e0c355 100644
--- a/desktop/wmweather+/wmweather+.info
+++ b/desktop/wmweather+/wmweather+.info
@@ -6,5 +6,5 @@ MD5SUM="5eea25d708abe1da3549672b898bd0d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Gethyn ThomasQuail"
-EMAIL="gethyn@bloodbathsoftworks.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"