network/znc: Updated for version 1.0.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 21 insertions, 30 deletions

diff --git a/network/znc/rc.znc b/network/znc/rc.znc
index 6fe3405415..a02dda4d6f 100644
--- a/network/znc/rc.znc
+++ b/network/znc/rc.znc
@@ -28,7 +28,7 @@ znc_start() {
 }
 
 znc_stop() {
-   killall znc 2>/dev/null
+   killall -SIGINT znc 2>/dev/null
    RETVAL=$?
    if (( "$RETVAL" != 0 )); then
       echo "ZNC does not appear to be running..."
diff --git a/network/znc/slack-desc b/network/znc/slack-desc
index b97a02cd4c..b556c6ffe4 100644
--- a/network/znc/slack-desc
+++ b/network/znc/slack-desc
@@ -1,9 +1,9 @@
 # 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 ':'.
+# 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 ':' except on otherwise blank lines.
 
    |-----handy-ruler------------------------------------------------------|
 znc: ZNC (an advanced IRC bouncer)
@@ -11,9 +11,9 @@ znc:
 znc: ZNC will remain connected to an IPv4 or IPv6 IRC server even while you 
 znc: are offline. You can reattach your client at a later time and catch up
 znc: with what happened while you were gone via the history buffer. You can
-znc: add additional users under one running process, useful for public shells
-znc: that limit background processes. ZNC also supports the dynamic loading
-znc: of C++ and Perl modules.
+znc: add additional users under one running process, which is useful for 
+znc: public shells that limit background processes. ZNC also supports the 
+znc: dynamic loading of C++ and Perl modules.
 znc:
 znc: Homepage: http://en.znc.in/wiki/ZNC
 znc:
diff --git a/network/znc/znc.SlackBuild b/network/znc/znc.SlackBuild
index 5262436e3d..06c636f13b 100644
--- a/network/znc/znc.SlackBuild
+++ b/network/znc/znc.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ZNC
 
-# Copyright 2007-2009  Sean Donner (sean.donner@gmail.com)
+# Copyright 2007-2013  Sean Donner (sean.donner@gmail.com)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=znc
-VERSION=0.202
+VERSION=${VERSION:-1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ZNC_USER=${ZNC_USER:-znc}
 WITH_SSL=${WITH_SSL:-yes}
 WITH_IPV6=${WITH_IPV6:-yes}
-WITH_CARES=${WITH_CARES:-no}
 WITH_PERL=${WITH_PERL:-no}
-WITH_SASL=${WITH_SASL:-yes}
+WITH_cyrus=${WITH_CYRUS:-yes}
 WITH_PYTHON=${WITH_PYTHON:-no}
 WITH_SWIG=${WITH_SWIG:-no}
 WITH_TCL=${WITH_TCL:-no}
@@ -94,22 +93,16 @@ else
   do_ipv6="--enable-ipv6"
 fi
 
-if [ "$WITH_CARES" != "yes" ]; then
-  do_cares="--disable-c-ares"
-else
-  do_cares="--enable-c-ares"
-fi
-
 if [ "$WITH_PERL" != "yes" ]; then
-  do_perl="--disable-c-ares"
+  do_perl="--disable-perl"
 else
   do_perl="--enable-perl"
 fi
 
-if [ "$WITH_SASL" != "yes" ]; then
-  do_sasl="--disable-sasl"
+if [ "$WITH_CYRUS" != "yes" ]; then
+  do_cyrus="--disable-cyrus"
 else
-  do_sasl="--enable-sasl"
+  do_cyrus="--enable-cyrus"
 fi
 
 if [ "$WITH_PYTHON" != "yes" ]; then
@@ -139,12 +132,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux \
-  --enable-extra \
   $do_openssl \
   $do_ipv6 \
-  $do_cares \
   $do_perl \
-  $do_sasl \
+  $do_cyrus \
   $do_python \
   $do_swig \
   $do_tcl
diff --git a/network/znc/znc.info b/network/znc/znc.info
index 8275ae751b..0662eb24db 100644
--- a/network/znc/znc.info
+++ b/network/znc/znc.info
@@ -1,8 +1,8 @@
 PRGNAM="znc"
-VERSION="0.202"
-HOMEPAGE="http://en.znc.in/wiki/ZNC"
-DOWNLOAD="http://znc.in/releases/old/znc-0.202.tar.gz"
-MD5SUM="3c6ff4620e139e3d9745cd53111bab20"
+VERSION="1.0"
+HOMEPAGE="http://wiki.znc.in/ZNC"
+DOWNLOAD="http://znc.in/releases/znc-1.0.tar.gz"
+MD5SUM="23807ca830c27392cccb6774f542df6e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""