desktop/wmweather: Updated for version 2.4.4

4 files changed, 33 insertions, 9 deletions

diff --git a/desktop/wmweather/doinst.sh b/desktop/wmweather/doinst.sh
new file mode 100644
index 0000000000..7ee2661a9b
--- /dev/null
+++ b/desktop/wmweather/doinst.sh
@@ -0,0 +1,15 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/X11/WindowMaker/wmweather.conf.new
+
diff --git a/desktop/wmweather/slack-desc b/desktop/wmweather/slack-desc
index e6d5c8f995..e44acbb080 100644
--- a/desktop/wmweather/slack-desc
+++ b/desktop/wmweather/slack-desc
@@ -15,5 +15,5 @@ wmweather: METAR station designations and current weather reports are designed
 wmweather: for use by the aviation community. Since most major cities have at
 wmweather: least one airport, there is usually one or more METAR stations in a
 wmweather: given city.
-wmweather: 
-wmweather: 
+wmweather:
+wmweather:
diff --git a/desktop/wmweather/wmweather.SlackBuild b/desktop/wmweather/wmweather.SlackBuild
index 013932ab9f..8bee6530f8 100644
--- a/desktop/wmweather/wmweather.SlackBuild
+++ b/desktop/wmweather/wmweather.SlackBuild
@@ -18,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -30,7 +33,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM\_$VERSION.orig.tar.gz
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -44,15 +47,20 @@ cd src
   CXXFLAGS="$SLKCFLAGS" \
   ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc/X11/WindowMaker \
     --localstatedir=/var \
     --mandir=/usr/man \
-    --disable-debug
+    --disable-debug \
+    --build=$ARCH-slackware-linux
 
   make
   make install DESTDIR=$PKG
 cd -
 
+mv $PKG/etc/X11/WindowMaker/wmweather.conf \
+  $PKG/etc/X11/WindowMaker/wmweather.conf.new
+
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
@@ -66,13 +74,12 @@ cd -
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES COPYING README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING README $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/wmweather/wmweather.info b/desktop/wmweather/wmweather.info
index 61b07de02e..9266e6206f 100644
--- a/desktop/wmweather/wmweather.info
+++ b/desktop/wmweather/wmweather.info
@@ -3,6 +3,8 @@ VERSION="2.4.4"
 HOMEPAGE="http://freshmeat.net/users/godisch/"
 DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/w/wmweather/wmweather_2.4.4.orig.tar.gz"
 MD5SUM="4aad93bb539c0743f71e28c87267df92"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Cezary M. Kruk"
 EMAIL="c.kruk@bigfoot.com"
 APPROVED="dsomero"