network/radvd: Updated for version 1.15.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Signed-off-by: Leigh Wedding <<leigh8904@gmail.com>

4 files changed, 14 insertions, 15 deletions

diff --git a/network/radvd/README b/network/radvd/README
index 97c970088c..1ce69921cb 100644
--- a/network/radvd/README
+++ b/network/radvd/README
@@ -4,7 +4,7 @@ by RFC 2461, to a local Ethernet LAN periodically and when requested by a
 node sending a Router Solicitation message.  These messages are required 
 for IPv6 stateless autoconfiguration.
 
-Radvd is dependant upon IPv6 support in the Linux Kernel; this comes enabled 
+Radvd is dependent upon IPv6 support in the Linux kernel; this comes enabled 
 by default with Slackware 14's generic and huge kernels.  To enable IPv6 
 support manually, you must set the following entry in your custom kernel's 
 .config file and recompile: CONFIG_IPV6=m
diff --git a/network/radvd/radvd.SlackBuild b/network/radvd/radvd.SlackBuild
index 0a70d3c9a8..7699ef3eb6 100644
--- a/network/radvd/radvd.SlackBuild
+++ b/network/radvd/radvd.SlackBuild
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=radvd
-VERSION=1.9.3
-BUILD=${BUILD:-2}
+VERSION=1.15
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -73,6 +73,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --with-configfile=/etc/radvd.conf \
   --with-pidfile=/var/run/radvd/radvd.pid \
@@ -88,17 +90,14 @@ make install DESTDIR=$PKG
   	xargs strip --strip-debug 2> /dev/null || true
 )
 
-mv $PKG/usr/share/man $PKG/usr/man
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/etc/rc.d
 install -D -m 0644 $CWD/rc.radvd.new  $PKG/etc/rc.d/rc.radvd.new
 mv $TMP/$PRGNAM-$VERSION/radvd.conf.example $PKG/etc/radvd.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES COPYRIGHT INTRO.html README TODO VERSION \
+cp -a CHANGES-1 COPYRIGHT INTRO.html README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/radvd/radvd.info b/network/radvd/radvd.info
index fe7f8b5258..57a24b1cd4 100644
--- a/network/radvd/radvd.info
+++ b/network/radvd/radvd.info
@@ -1,8 +1,8 @@
 PRGNAM="radvd"
-VERSION="1.9.3"
+VERSION="1.15"
 HOMEPAGE="http://www.litech.org/radvd"
-DOWNLOAD="http://www.litech.org/radvd/dist/radvd-1.9.3.tar.gz"
-MD5SUM="14a3c69187690b53d52def647a6e1557"
+DOWNLOAD="http://www.litech.org/radvd/dist/radvd-1.15.tar.xz"
+MD5SUM="d1aded1d13e0c53d5be65193c4378974"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libdaemon"
diff --git a/network/radvd/rc.radvd.new b/network/radvd/rc.radvd.new
index a68c057eab..a40ef8c4ca 100644
--- a/network/radvd/rc.radvd.new
+++ b/network/radvd/rc.radvd.new
@@ -5,13 +5,13 @@
 # Start/stop/restart the radvd daemon.
 
 if ! [ -f /proc/net/if_inet6 ]; then
-   echo "IPv6 support not found, exiting"
+   echo "IPv6 support not found; exiting..."
    exit 1
 fi
 
 radvd_start() {
    if [ -x /usr/sbin/radvd ]; then
-      echo "Starting radvd..."
+      echo "Starting radvd: /usr/sbin/radvd -u daemon"
       echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
       mkdir -p /var/run/radvd
       chown daemon:daemon /var/run/radvd
@@ -20,7 +20,7 @@ radvd_start() {
 }
 
 radvd_stop() {
-   /bin/kill $(cat /var/run/radvd/radvd.pid)
+   /bin/kill $(cat /var/run/radvd/radvd.pid 2>/dev/null) 2>/dev/null
 }
 
 radvd_restart() {