network/weechat: Updated for version 0.2.5

4 files changed, 32 insertions, 29 deletions

diff --git a/network/weechat/README b/network/weechat/README
index 3460142677..e9ea22d4e4 100644
--- a/network/weechat/README
+++ b/network/weechat/README
@@ -16,4 +16,3 @@ WeeChat supports lua scripting as well, but it hasn't been working in recent
     versions... even though lua may be installed the ./configure script
     will fail to detect it properly.  This is due to changes in recent
     versions of Lua and has not yet been fixed as of WeeChat 0.2.1
-
diff --git a/network/weechat/slack-desc b/network/weechat/slack-desc
index e4dc7f5528..2c3e1db836 100644
--- a/network/weechat/slack-desc
+++ b/network/weechat/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
 weechat: weechat (a light & fast curses-based IRC client)
 weechat:
 weechat: WeeChat is a fast & light multilingual curses-based multiplatform
@@ -5,3 +13,7 @@ weechat: IRC client written from scratch and released under the GPL.
 weechat:
 weechat:
 weechat:
+weechat:
+weechat:
+weechat:
+weechat:
diff --git a/network/weechat/weechat.SlackBuild b/network/weechat/weechat.SlackBuild
index a8049c830d..e500cf8d53 100644
--- a/network/weechat/weechat.SlackBuild
+++ b/network/weechat/weechat.SlackBuild
@@ -1,21 +1,14 @@
 #!/bin/sh
 
 ## Written by hollywoodb (hollywoodb@fastmail.fm)
-
 # Modified by the SlackBuilds.org project
 
-# Verify script is being run by root user.
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit
-fi
-
 NAME=weechat
-VERSION=0.2.1
+VERSION=0.2.5
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$NAME
 OUTPUT=${OUTPUT:-/tmp}
@@ -30,7 +23,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $TMP/package-$NAME
-tar -jxvf $CWD/$NAME-$VERSION.tar.bz2 || exit 1
+tar -xjvf $CWD/$NAME-$VERSION.tar.bz2 || exit 1
 cd $NAME-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -38,18 +31,18 @@ chmod -R u+w,go+r-w,a-s .
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-    --prefix=/usr \
-    --exec-prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --mandir=/usr/man \
-    --docdir=/usr/doc \
-    --htmldir=/usr/doc \
-    --dvidir=/usr/doc \
-    --pdfdir=/usr/doc \
-    --psdir=/usr/doc \
-    --with-debug=0 \
-    || exit 1
+  --prefix=/usr \
+  --exec-prefix=/usr \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc \
+  --htmldir=/usr/doc \
+  --dvidir=/usr/doc \
+  --pdfdir=/usr/doc \
+  --psdir=/usr/doc \
+  --with-debug=0 \
+  || exit 1
 
 make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -65,7 +58,7 @@ make install DESTDIR=$PKG || exit 1
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
@@ -78,7 +71,6 @@ cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.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 -p $OUTPUT/$NAME-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/network/weechat/weechat.info b/network/weechat/weechat.info
index c6ac9dbd33..ba679663ea 100644
--- a/network/weechat/weechat.info
+++ b/network/weechat/weechat.info
@@ -1,8 +1,8 @@
 PRGNAM="weechat"
-VERSION="0.2.1"
+VERSION="0.2.5"
 HOMEPAGE="http://weechat.flashtux.org"
-DOWNLOAD="http://weechat.flashtux.org/download/weechat-0.2.1.tar.bz2"
-MD5SUM="ab6b465b0107f5ee013bc54e386a1500"
+DOWNLOAD="http://weechat.flashtux.org/download/weechat-0.2.5.tar.bz2"
+MD5SUM="42f96620c3b2fd3dca9768d9ce16dd06"
 MAINTAINER="hollywoodb"
 EMAIL="hollywoodb@fastmail.fm"
-APPROVED="robw810"
+APPROVED="BP{k}"