From 11b615ceb8f1450005d117a564a29e4f40e750b2 Mon Sep 17 00:00:00 2001
From: Ryan P.C. McQuen
Date: Tue, 27 May 2014 08:04:32 +0700
Subject: desktop/wbar: Updated for version 2.3.4 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/wbar/wbar.SlackBuild | 20 +++++++++++---------
 desktop/wbar/wbar.info       | 10 +++++-----
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'desktop')

diff --git a/desktop/wbar/wbar.SlackBuild b/desktop/wbar/wbar.SlackBuild
index 640f20661a..057de52f0f 100644
--- a/desktop/wbar/wbar.SlackBuild
+++ b/desktop/wbar/wbar.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for wbar
 
 # Copyright 2010-2012  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2014  Ryan P.C. McQuen, WA, ryan.q@linux.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=wbar
-VERSION=${VERSION:-20120503svn_r51}
+VERSION=${VERSION:-2.3.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,21 +61,21 @@ 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.tgz
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
 # Use absolute path for pidof (from Salix)
 sed -i 's|pidof|/sbin/pidof|g' src/config/Run.cc
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh \
+./configure \
   --prefix=/usr \
   --exec-prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -89,10 +90,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 # Replace the heavily Debian-oriented default config file
 rm $PKG/etc/wbar.d/wbar.cfg
@@ -104,7 +106,7 @@ mkdir -p $PKG/usr/share/pixmaps/wbar/slack
 install -D -m 0644 icons/* $PKG/usr/share/pixmaps/wbar/slack
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/wbar/wbar.info b/desktop/wbar/wbar.info
index 3aeaf421f2..a234adfbd1 100644
--- a/desktop/wbar/wbar.info
+++ b/desktop/wbar/wbar.info
@@ -1,12 +1,12 @@
 PRGNAM="wbar"
-VERSION="20120503svn_r51"
+VERSION="2.3.4"
 HOMEPAGE="http://code.google.com/p/wbar/"
-DOWNLOAD="http://downloads.sourceforge.net/sbosrc/wbar-20120503svn_r51.tar.gz \
+DOWNLOAD="http://wbar.googlecode.com/files/wbar-2.3.4.tgz \
           http://download.salixos.org/i486/13.37/source/xap/wbar/icons.tar.gz"
-MD5SUM="151bad29de208942a03462010802619e \
+MD5SUM="c1ac6b74138937a280904d1bac88115d \
         358ea5ad109751ad64e78d440d0e4dca"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
-MAINTAINER="Binh Nguyen"
-EMAIL="binhvng@gmail.com"
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"
-- 
cgit v1.2.3