4 files changed, 47 insertions, 22 deletions
diff --git a/network/bitlbee/bitlbee.SlackBuild b/network/bitlbee/bitlbee.SlackBuild
index d80b7f6f07325..5f3eebb3d24d7 100644
--- a/network/bitlbee/bitlbee.SlackBuild
+++ b/network/bitlbee/bitlbee.SlackBuild
@@ -1,16 +1,35 @@
 #!/bin/sh
  
 # SlackBuild Script for bitlbee
-# Written by Michiel van Wessem (BP{k}) <michiel@slackbuilds.org>
 
-set -e
+# Written by Michiel van Wessem (BP{k}) <michiel@slackbuilds.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bitlbee
-VERSION=1.0.3
+VERSION=1.0.4
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -25,11 +44,13 @@ elif [ "$ARCH" = "i686" ]; then
     SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $TMP/$PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -50,34 +71,29 @@ CXXFLAGS="$SLKCFLAGS" \
   --ssl=openssl 
 
 if [ -e Makefile.settings ]; then
-    sed -e "s/CPU=i686/CPU=$ARCH/g" Makefile.settings > Makefile.settings.temp
-    mv Makefile.settings.temp Makefile.settings
-else
-    echo "No Makefile.settings found .. exiting"
-    exit 1
+    sed -i "s#CPU=i686#CPU=$ARCH#" Makefile.settings 
 fi
 
 make all
 make install install-etc install-doc DESTDIR=$PKG
 
 ( cd $PKG
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( 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/$PRGNAM-$VERSION $PKG/var/lib/$PRGNAM
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-
 # Rewrite the documentation to replace /usr/local/ with /usr 
 # and /etc/init.d/inetd wih /etc/rc.d/rc.inetd
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec sed -e -i 's#/usr/local/#/usr/#' {} \;
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec sed -i 's#/usr/local/#/usr/#' {} \;
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec sed -i 's#/etc/init.d/inetd#/etc/rc.d/rc.inetd#' {} \;
 
 mv $PKG/etc/$PRGNAM/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new
diff --git a/network/bitlbee/bitlbee.info b/network/bitlbee/bitlbee.info
index f198b4dc5a746..5f837e7cf5d32 100644
--- a/network/bitlbee/bitlbee.info
+++ b/network/bitlbee/bitlbee.info
@@ -1,8 +1,8 @@
 PRGNAM="bitlbee"
-VERSION="1.0.3"
+VERSION="1.0.4"
 HOMEPAGE="http://www.bitlbee.org"
-DOWNLOAD="http://get.bitlbee.org/src/bitlbee-1.0.3.tar.gz"
-MD5SUM="e46682d54cbd6265dd4436b3b6838d63"
+DOWNLOAD="http://get.bitlbee.org/src/bitlbee-1.0.4.tar.gz"
+MD5SUM="b92e301930e2322a86b73b1f6c857674  "
 MAINTAINER="Michiel van Wessem"
-EMAIL="michiel.van.wessem@gmail.com"
-APPROVED="robw810"
+EMAIL="michiel@slackbuilds.org"
+APPROVED="rworkman"
diff --git a/network/bitlbee/doinst.sh b/network/bitlbee/doinst.sh
index 8ce9469eb1f7c..973c0c3b877cb 100644
--- a/network/bitlbee/doinst.sh
+++ b/network/bitlbee/doinst.sh
@@ -11,5 +11,6 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-config /etc/bitlbee/bitlbee.conf.new
-config /etc/bitlbee/motd.txt.new
-\ No newline at end of file
+
+config etc/bitlbee/bitlbee.conf.new
+config etc/bitlbee/motd.txt.new
diff --git a/network/bitlbee/slack-desc b/network/bitlbee/slack-desc
index 613c53b0f7a62..995afc3cc3101 100644
--- a/network/bitlbee/slack-desc
+++ b/network/bitlbee/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------------------------------------------------------|
 bitlbee: bitlbee (an IRC instant messaging gateway)
 bitlbee:
 bitlbee: BitlBee is an IRC instant messaging gateway licensed under