From da10f6b527888f064a8dbce75146922b3468dda7 Mon Sep 17 00:00:00 2001
From: Binh Nguyen <binhnguyen@fastmail.fm>
Date: Fri, 24 Aug 2012 21:44:09 +0700
Subject: desktop/wbar: Updated for version 20120503svn_r51.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 desktop/wbar/doinst.sh       |  2 +-
 desktop/wbar/wbar.SlackBuild | 13 +++++++------
 desktop/wbar/wbar.info       |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'desktop/wbar')

diff --git a/desktop/wbar/doinst.sh b/desktop/wbar/doinst.sh
index 653892d729..47bc1b3542 100644
--- a/desktop/wbar/doinst.sh
+++ b/desktop/wbar/doinst.sh
@@ -11,4 +11,4 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config etc/default/wbar/wbar.cfg.new
+config etc/wbar.d/wbar.cfg.new
diff --git a/desktop/wbar/wbar.SlackBuild b/desktop/wbar/wbar.SlackBuild
index 191294a6fb..a832db4cb2 100644
--- a/desktop/wbar/wbar.SlackBuild
+++ b/desktop/wbar/wbar.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wbar
 
-# Copyright 2010-2011  Binh Nguyen <binhnguyen@fastmail.fm>
+# Copyright 2010-2012  Binh Nguyen <binhnguyen@fastmail.fm>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wbar
-VERSION=${VERSION:-2.2.2}
+VERSION=${VERSION:-20120503svn_r51}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tbz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -74,7 +74,7 @@ sed -i 's|pidof|/sbin/pidof|g' src/config/Run.cc
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
   --prefix=/usr \
   --exec-prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -95,8 +95,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 # Replace the heavily Debian-oriented default config file
-rm $PKG/etc/default/wbar/wbar.cfg
-cat $CWD/wbar.cfg > $PKG/etc/default/wbar/wbar.cfg.new
+rm $PKG/etc/wbar.d/wbar.cfg
+cat $CWD/wbar.cfg > $PKG/etc/wbar.d/wbar.cfg.new
+
 # And supply an icon set for that config (from Salix)
 tar xvf $CWD/icons.tar.gz
 mkdir -p $PKG/usr/share/pixmaps/wbar/slack
diff --git a/desktop/wbar/wbar.info b/desktop/wbar/wbar.info
index f59733d2f5..de7dbfb3fc 100644
--- a/desktop/wbar/wbar.info
+++ b/desktop/wbar/wbar.info
@@ -1,9 +1,9 @@
 PRGNAM="wbar"
-VERSION="2.2.2"
+VERSION="20120503svn_r51"
 HOMEPAGE="http://code.google.com/p/wbar/"
-DOWNLOAD="http://wbar.googlecode.com/files/wbar-2.2.2.tbz2 \
+DOWNLOAD="http://downloads.sourceforge.net/sbosrc/wbar-20120503svn_r51.tar.gz \
           http://download.salixos.org/i486/13.37/source/xap/wbar/icons.tar.gz"
-MD5SUM="7ee752ad4f3268ccbc24ca72e463d847 \
+MD5SUM="151bad29de208942a03462010802619e \
         358ea5ad109751ad64e78d440d0e4dca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-- 
cgit v1.2.3-80-g2a13