aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/wmweather+/README6
-rw-r--r--desktop/wmweather+/wmweather+.SlackBuild18
-rw-r--r--desktop/wmweather+/wmweather+.info6
3 files changed, 17 insertions, 13 deletions
diff --git a/desktop/wmweather+/README b/desktop/wmweather+/README
index 6bbbada40aaa..47996afcfff1 100644
--- a/desktop/wmweather+/README
+++ b/desktop/wmweather+/README
@@ -1,3 +1,5 @@
+wmweather+ (Weather Monitor DockApp)
+
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,
@@ -5,5 +7,5 @@ a weather map, and a sky condition display.
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.
+See /usr/doc/wmweather+-$VERSION/example.conf and read "man
+wmweather+" for details.
diff --git a/desktop/wmweather+/wmweather+.SlackBuild b/desktop/wmweather+/wmweather+.SlackBuild
index df90ced6a53e..2b9be99f6ee5 100644
--- a/desktop/wmweather+/wmweather+.SlackBuild
+++ b/desktop/wmweather+/wmweather+.SlackBuild
@@ -27,6 +27,7 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20201020 bkw: update for v2.18.
# 20170324 bkw: update for v2.17.
# 20170121 bkw:
@@ -42,10 +43,13 @@
# - i486 => i586
PRGNAM=wmweather+
-VERSION=${VERSION:-2.17}
+VERSION=${VERSION:-2.18}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# URL-escaped form of the name, in case something saved it as that.
+ALTNAM=wmweather%2B
+
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i586 ;;
@@ -79,19 +83,17 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
+ tar xvf $CWD/$ALTNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
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 {} \+
# Default viewer needs to be something that Slack actually has.
# Note that "xterm -e less" doesn't work: it doesn't read from the
# xterm's stdin.
-sed -i 's,xless,xmore,g' $PRGNAM.1.in $PRGNAM.c
+sed -i 's,xless,xmore,g' $PRGNAM.1 $PRGNAM.c
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/desktop/wmweather+/wmweather+.info b/desktop/wmweather+/wmweather+.info
index c7925f0c5461..70baf4b31a62 100644
--- a/desktop/wmweather+/wmweather+.info
+++ b/desktop/wmweather+/wmweather+.info
@@ -1,8 +1,8 @@
PRGNAM="wmweather+"
-VERSION="2.17"
+VERSION="2.18"
HOMEPAGE="https://sourceforge.net/projects/wmweatherplus/"
-DOWNLOAD="https://sourceforge.net/projects/wmweatherplus/files/wmweather%2B/wmweather%2B-2.17.tar.gz"
-MD5SUM="89da7675017b1ca8c456e5736ff03249"
+DOWNLOAD="https://sourceforge.net/projects/wmweatherplus/files/wmweather%2B/wmweather%2B-2.18.tar.gz"
+MD5SUM="6c825888cd56dce74d1c3c6c959f1f61"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""