3 files changed, 41 insertions, 30 deletions
diff --git a/network/btpd/btpd.SlackBuild b/network/btpd/btpd.SlackBuild
index e04161b35a..e78c64e21d 100644
--- a/network/btpd/btpd.SlackBuild
+++ b/network/btpd/btpd.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for btpd
 
-# Copyright 2009 Nilton Moura a.k.a nmoura <moura.nilton@gmail.com>
+# Copyright 2008,2009,2010  Nilton Moura, Rio de Janeiro, RJ, Brasil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=btpd
-VERSION=${VERSION:-0.15}
+VERSION=${VERSION:-0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 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
@@ -44,18 +42,26 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar zxvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -64,25 +70,30 @@ find . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-  ./configure \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  || exit 1
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install 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
 
+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
+cp -a \
+  CHANGES COPYRIGHT README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-cd $TMP/$PRGNAM-$VERSION
-cp -a CHANGES COPYRIGHT README $PKG/usr/doc/$PRGNAM-$VERSION
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/btpd/btpd.info b/network/btpd/btpd.info
index fedaf95fa2..5caa8c8d9a 100644
--- a/network/btpd/btpd.info
+++ b/network/btpd/btpd.info
@@ -1,10 +1,10 @@
 PRGNAM="btpd"
-VERSION="0.15"
-HOMEPAGE="http://www.murmeldjur.se/btpd/"
-DOWNLOAD="http://www.murmeldjur.se/btpd/btpd-0.15.tar.gz"
-MD5SUM="b64e2e8b9936e99685bc1e7246655561"
+VERSION="0.16"
+HOMEPAGE="http://github.com/btpd/btpd"
+DOWNLOAD="http://github.com/downloads/btpd/btpd/btpd-0.16.tar.gz"
+MD5SUM="fe042aae8d7c515ecd855673d1c2b33e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="nmoura"
-EMAIL="moura.nilton@gmail.com"
+MAINTAINER="Nilton Moura"
+EMAIL="nmoura@nmoura.eti.br"
 APPROVED="dsomero"
diff --git a/network/btpd/slack-desc b/network/btpd/slack-desc
index d820f64600..b4e334cdaa 100644
--- a/network/btpd/slack-desc
+++ b/network/btpd/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-    |--------handy-ruler---------------------------------------------------|
-btpd: btpd (BitTorrent Protocol Daemon)
+    |-----handy-ruler------------------------------------------------------|
+btpd: btpd (The BitTorrent Protocol Daemon)
 btpd:
 btpd: Btpd is a utility for sharing files over the BitTorrent network
 btpd: protocol. It runs in daemon mode, thus needing no controlling
-btpd: terminal or gui. Instead, the daemon is controlled by the btcli
+btpd: terminal or gui. Instead, the daemon is controlled by btcli, its
 btpd: command line utility, or other programs capable of sending commands
-btpd: and queries on the btpd control socket.
-btpd: The goal is to provide a healthy alternative to the still prevailing
-btpd: ftp/http servers for file distribution sites and a good BitTorrent
-btpd: client for the casual user.
-btpd: Homepage: http://www.murmeldjur.se/btpd/
+btpd: and queries on the control socket.
+btpd:
+btpd: Homepage: http://github.com/btpd/btpd
+btpd:
+btpd: