5 files changed, 24 insertions, 45 deletions
diff --git a/network/leafnode/README b/network/leafnode/README
index e35e2cd537..28336f521d 100644
--- a/network/leafnode/README
+++ b/network/leafnode/README
@@ -1,44 +1,21 @@
 Leafnode 2 is an NNTP proxy server intended for small sites, where 
 there are few users and little disk space, but where a large number of 
 groups is desired. It can also be used to give a regular newsreader 
-off-line functionality. The leafnode program itself is the server while 
-the programs fetchnews and texpire transport the news and expire old 
-articles respectively.
+off-line functionality. 
 
-There is a little work to do to install this program effectively, all
+There is some work to do to install this program effectively, all
 of which is clearly set out in the README file contained in the source.
-It is strongly advised for you to read it thoroughly before installing 
-leafnode.  Below is a quick sketch of the requirements for Leafnode setup:
+It is strongly advised that you read this file thoroughly before 
+installing Leafnode 2. In summary you need to:
 
-After the installation, you need to:
-1. Ensure $NNTPSERVER or /etc/nntpserver point to localhost.
+1. Ensure $NNTPSERVER or /etc/nntpserver points to 'localhost'.
 2. Set /etc/inetd.conf so leafnode is executed for incoming NNTP connections.
-	nntp  stream  tcp  nowait  news  /usr/sbin/tcpd  /usr/sbin/leafnode
-3. Set /etc/hosts.deny and /etc/hosts.allow to protect the server. See the 
-   README 
-	/etc/hosts.deny: leafnode: ALL
-	/etc/hosts.allow: leafnode: 127.0.0.1
-4. Create /etc/leafnode/config and adjust settings as required. A sample
-   file - /etc/leafnode/config.example - is already there.
+3. Set /etc/hosts.deny and /etc/hosts.allow to protect the server.
+4. Create /etc/leafnode/config and adjust settings as required. 
 5. Set cronjobs for fetchnews and texpire. 
-6. Fetch the newsgroup list from your server. 
-	/usr/sbin/fetchnews -vv
-	/usr/sbin/texpire -vv
-   ** texpire will make sure the leafnode news spool is in working order. 
-7. Set your newsreader to use the localhost leafnode.
+6. Fetch the newsgroup list from the upstream server.
+7. Set your newsreader to use 'localhost'.
 
-All of this is carefully written up in the README file of the source code and I
-stress again the importance of reading that file thorougly. You may also want 
-to read the following guides:
-
-The below guide is specifically aimed at slackware users and details concise
-and quickl instructions on how to get a good leafnode install up and working:
+You may also want  to read the following guide:
 
 * http://www.andrews-corner.org/leafnode.html 
-
-While the guide below is not specifically written for Slackware, it offers 
-many good tips and many ideas for scripts to make working with 
-leafnode easier.
-
-* http://homepage.ntlworld.com/garryknight/linux/leafnode.html
-
diff --git a/network/leafnode/doinst.sh b/network/leafnode/doinst.sh
index a768dc8c1d..f9a8bdcaa4 100644
--- a/network/leafnode/doinst.sh
+++ b/network/leafnode/doinst.sh
@@ -1,4 +1,3 @@
-
 if [ ! -e etc/leafnode/local.groups ]; then
   touch etc/leafnode/local.groups
 fi
diff --git a/network/leafnode/leafnode.SlackBuild b/network/leafnode/leafnode.SlackBuild
index fab008351a..846ec1da72 100644
--- a/network/leafnode/leafnode.SlackBuild
+++ b/network/leafnode/leafnode.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware 12 build script for Leafnode 2
+# Slackware build script for Leafnode 2
 
 # Copyright 2008-2009  Andrew Strong  (http://www.andrews-corner.org)
 # All rights reserved.
@@ -22,12 +22,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Build script modified by the SlackBuilds.org project
-
 PRGNAM=leafnode		
-VERSION=2.0.0.alpha20070602a		
+VERSION=2.0.0.alpha20081110a
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -39,6 +37,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -64,7 +64,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc/leafnode \
   --mandir=/usr/man \
   --localstatedir=/var \
-  --enable-runas-user=news
+  --enable-runas-user=news \
+  --enable-spooldir=/var/spool/news \
+  --build=$ARCH-slackware-linux
 
 make   
 make install DESTDIR=$PKG 
@@ -94,3 +96,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+
diff --git a/network/leafnode/leafnode.info b/network/leafnode/leafnode.info
index c87fcc6e6c..0db8271c2d 100644
--- a/network/leafnode/leafnode.info
+++ b/network/leafnode/leafnode.info
@@ -1,8 +1,8 @@
 PRGNAM="leafnode"
-VERSION="2.0.0.alpha20070602a"
+VERSION="2.0.0.alpha20081110a"
 HOMEPAGE="http://www-dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/"
-DOWNLOAD="http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20070602a.tar.bz2"
-MD5SUM="83d9b7785479620843523d6c80fcc01e"
+DOWNLOAD="http://slackbuilds.org/sources/leafnode-2.0.0.alpha20081110a.tar.bz2"
+MD5SUM="c5505869b2baa89923e14d0a392012f0"
 MAINTAINER="Andrew Strong"
 EMAIL="andrew.david.45@gmail.com"
-APPROVED="Michiel,rworkman"
+APPROVED="rworkman"
diff --git a/network/leafnode/slack-desc b/network/leafnode/slack-desc
index b96566d252..2fbf43bba1 100644
--- a/network/leafnode/slack-desc
+++ b/network/leafnode/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler-----------------------------------------------------|
-leafnode: Leafnode-2 (a store-and-forward NNTP proxy server)
+leafnode: Leafnode-2: an NNTP proxy server
 leafnode:
 leafnode: Leafnode-2 is an NNTP proxy server intended for small sites, where 
 leafnode: there are few users and little disk space, but where a large number