3 files changed, 7 insertions, 22 deletions
diff --git a/network/tntnet/doinst.sh b/network/tntnet/doinst.sh
index 6a3d11314c..8a616bc76c 100644
--- a/network/tntnet/doinst.sh
+++ b/network/tntnet/doinst.sh
@@ -11,17 +11,4 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-preserve_perms() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  if [ -e $OLD ]; then
-    cp -a $OLD ${NEW}.incoming
-    cat $NEW > ${NEW}.incoming
-    mv ${NEW}.incoming $NEW
-  fi
-  config $NEW
-}
-
-config etc/tntnet/mime.conf.new
-config etc/tntnet/tntnet.conf.new
-preserve_perms etc/rc.d/rc.tntnet.new
+config etc/tntnet/tntnet.xml.new
diff --git a/network/tntnet/tntnet.SlackBuild b/network/tntnet/tntnet.SlackBuild
index 1aab164252..bffd222889 100644
--- a/network/tntnet/tntnet.SlackBuild
+++ b/network/tntnet/tntnet.SlackBuild
@@ -24,8 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=tntnet
-VERSION=${VERSION:-2.2.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -97,8 +97,6 @@ make install DESTDIR=$PKG
 
 mv $PKG/etc/$PRGNAM/$PRGNAM.xml{,.new}
 sed -i "s|www-data|apache|" $PKG/etc/$PRGNAM/$PRGNAM.xml.new
-install -m 0755 -D $PKG/etc/init.d/$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
-rm -fr $PKG/etc/init.d
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -108,7 +106,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
+  AUTHORS ChangeLog COPYING INSTALL README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/tntnet/tntnet.info b/network/tntnet/tntnet.info
index d320231b69..6b2651354e 100644
--- a/network/tntnet/tntnet.info
+++ b/network/tntnet/tntnet.info
@@ -1,8 +1,8 @@
 PRGNAM="tntnet"
-VERSION="2.2.1"
+VERSION="3.0"
 HOMEPAGE="http://www.tntnet.org/"
-DOWNLOAD="http://www.tntnet.org/download/tntnet-2.2.1.tar.gz"
-MD5SUM="febe799675c1b8b2f7259bad30cf6f23"
+DOWNLOAD="http://www.tntnet.org/download/tntnet-3.0.tar.gz"
+MD5SUM="7119835c4cf978ab321e48ca10bbe421"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="cxxtools"