3 files changed, 26 insertions, 12 deletions
diff --git a/network/bitlbee/README b/network/bitlbee/README
index 3d853f7276..83c4387f6f 100644
--- a/network/bitlbee/README
+++ b/network/bitlbee/README
@@ -20,3 +20,8 @@ first, and then:
 
 if you want to use libevent for events, instead of the default glib, install 
 libevent and run the script like this:  EVENTS=libevent ./bitlbee.SlackBuild
+
+OTR (Off the record) is not compiled by default. If you want bitlbee to 
+compile with OTR capabilities, you'll need to install libotr from Slackware
+and run the script as follows: OTR=yes ./bitlbee.SlackBuild
+
diff --git a/network/bitlbee/bitlbee.SlackBuild b/network/bitlbee/bitlbee.SlackBuild
index 61e6f28f78..48d23d4b41 100644
--- a/network/bitlbee/bitlbee.SlackBuild
+++ b/network/bitlbee/bitlbee.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bitlbee
-VERSION=${VERSION:-1.2.8}
+VERSION=${VERSION:-3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -33,7 +33,6 @@ if [ -z "$ARCH" ]; then
     case "$( uname -m )" in
         i?86) ARCH=i486 ;;
         arm*) ARCH=arm ;;
-        # Unless $ARCH is already set, use uname -m for all other archs:
         *) ARCH=$( uname -m ) ;;
     esac
 fi
@@ -59,6 +58,13 @@ fi
 
 set -e
 
+OTR=${OTR:-no}
+if [ "$OTR" = "yes" ]; then
+  USEOTR=1
+else
+  USEOTR=0
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -80,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --config=/var/lib/$PRGNAM \
   --etcdir=/etc/$PRGNAM \
+  --datadir=/usr/doc/$PRGNAM-$VERSION \
   --mandir=/usr/man \
   --msn=1 \
   --jabber=1 \
@@ -88,9 +95,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --twitter=1 \
   --ipv6=1 \
   --plugins=1 \
+  --debug=0 \
   --events=${EVENTS:-glib} \
   --ssl=${CRYPT:-gnutls} \
-  --debug=0 \
+  --otr=${USEOTR} \
   --build=$ARCH-slackware-linux \
 
 if [ -e Makefile.settings ]; then
@@ -98,7 +106,7 @@ if [ -e Makefile.settings ]; then
 fi
 
 make all
-make install install-etc install-doc DESTDIR=$PKG
+make install install-etc install-doc install-plugins DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
     | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -107,10 +115,11 @@ 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/var/lib/$PRGNAM
-cp -a COPYING doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/INSTALL \
-doc/README doc/bitlbee.xinetd doc/user-guide/user-guide.html \
-doc/user-guide/user-guide.txt doc/user-guide/help.txt \
-$PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/INSTALL \
+  doc/README doc/bitlbee.schema doc/bitlbee.xinetd doc/comic_3.0.png \
+  doc/example_plugin.c doc/user-guide/user-guide.txt \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Rewrite the documentation to replace /usr/local/ with /usr 
diff --git a/network/bitlbee/bitlbee.info b/network/bitlbee/bitlbee.info
index cbeab82589..00918e36b4 100644
--- a/network/bitlbee/bitlbee.info
+++ b/network/bitlbee/bitlbee.info
@@ -1,10 +1,10 @@
 PRGNAM="bitlbee"
-VERSION="1.2.8"
+VERSION="3.0"
 HOMEPAGE="http://www.bitlbee.org"
-DOWNLOAD="http://get.bitlbee.org/src/bitlbee-1.2.8.tar.gz"
-MD5SUM="e1fbbd9d96ec7c2377b1b286689c1b83"
+DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.0.tar.gz"
+MD5SUM="455fc8070d758c2bb3442ef4c709ad69"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"