network/awstats: Updated for version 7.0.

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

4 files changed, 28 insertions, 21 deletions

diff --git a/network/awstats/awstats.SlackBuild b/network/awstats/awstats.SlackBuild
index abc0a20b5e..9403c14d53 100644
--- a/network/awstats/awstats.SlackBuild
+++ b/network/awstats/awstats.SlackBuild
@@ -3,13 +3,14 @@
 # Slackware Package Build Script for awstats
 # Home Page http://awstats.sourceforge.net/
 
-# Copyright (c) 2009-2010, Nishant Limbachia, Hoffman Estates, IL, USA (nishant@mnspace.net)
+# Copyright (c) 2009-2011, Nishant Limbachia, Hoffman Estates, IL, USA
+# <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is 
+# Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
-# 1. Redistributions of script must retain the above copyright notice, 
+# 1. Redistributions of script must retain the above copyright notice,
 #    this list of conditions and the following disclaimer.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -27,7 +28,7 @@
 # Modified by the SlackBuilds.org project.
 
 PRGNAM=awstats
-VERSION=6.95
+VERSION=${VERSION:-7.0}
 # hardcode ARCH
 ARCH=noarch
 BUILD=${BUILD:-1}
@@ -59,7 +60,7 @@ find . \
  -exec chmod 644 {} \;
 
 # Patch httpd_conf file supplied by awstats to correct paths
-sed s:@DOCROOT@:$DOCROOT: $CWD/patches/httpd-awstats.conf.patch | patch -p0 
+sed s:@DOCROOT@:$DOCROOT: $CWD/patches/httpd-awstats.conf.patch | patch -p0
 # Patch awstats_configure.pl file -- see patch header for details
 sed s:@DOCROOT@:$DOCROOT: $CWD/patches/awstats_configure.pl.patch | patch -p0
 
@@ -69,14 +70,14 @@ mkdir -m 0770 -p $PKG/var/lib/awstats
 
 cp -a README.TXT docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a tools wwwroot $PKG/$DOCROOT/awstats
-install -m 0644 wwwroot/cgi-bin/awstats.model.conf $PKG/etc/awstats
+install -m 0644 -D wwwroot/cgi-bin/awstats.model.conf $PKG/etc/awstats/awstats.model.conf.new
 cat tools/httpd_conf >> $PKG/etc/httpd/extra/httpd-awstats.conf.new
 
 # Create a symlink
 mkdir -p $PKG/usr/bin
 ln -sf ${DOCROOT}/awstats/wwwroot/cgi-bin/awstats.pl $PKG/usr/bin/awstats.pl
 
-# Change ownership and perms 
+# Change ownership and perms
 chown -R $AWUSER:$AWGROUP $PKG/$DOCROOT/$PRGNAM $PKG/var/lib/awstats
 
 mkdir -p $PKG/install
diff --git a/network/awstats/awstats.info b/network/awstats/awstats.info
index a29219e366..5311ba0b46 100644
--- a/network/awstats/awstats.info
+++ b/network/awstats/awstats.info
@@ -1,10 +1,10 @@
 PRGNAM="awstats"
-VERSION="6.95"
+VERSION="7.0"
 HOMEPAGE="http://awstats.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/awstats/awstats-6.95.tar.gz"
-MD5SUM="26a5b19fa9f395e9e7dafed37b795d7f"
+DOWNLOAD="http://downloads.sourceforge.net/awstats/awstats-7.0.tar.gz"
+MD5SUM="3e8e09b9ebe74513bb34290dbcd37b45"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/network/awstats/doinst.sh b/network/awstats/doinst.sh
index e8150466f6..2c3bb10e67 100644
--- a/network/awstats/doinst.sh
+++ b/network/awstats/doinst.sh
@@ -19,4 +19,5 @@ if [ -e etc/httpd/extra/httpd-awstats.conf.new ]; then
 fi
 
 config etc/httpd/extra/httpd-awstats.conf.new
+config etc/awstats/awstats.model.conf.new
 
diff --git a/network/awstats/patches/httpd-awstats.conf.patch b/network/awstats/patches/httpd-awstats.conf.patch
index da4edd5de2..8416e86420 100644
--- a/network/awstats/patches/httpd-awstats.conf.patch
+++ b/network/awstats/patches/httpd-awstats.conf.patch
@@ -1,16 +1,21 @@
-By Nishant Limbachia <nishant@mnspace.net>
-1. Fixup paths for SlackBuilds.org
-2. Tighten default access mode
-
---- tools/httpd_conf.orig	2009-01-27 10:41:54.000000000 -0600
-+++ tools/httpd_conf	2009-01-27 15:04:31.000000000 -0600
-@@ -1,23 +1,19 @@
- #
+--- tools/httpd_conf.orig	2010-10-23 19:51:54.680793559 -0500
++++ tools/httpd_conf	2010-10-23 20:05:01.614053640 -0500
+@@ -1,29 +1,23 @@
+-#
 -# Content of this file, with correct values, can be automatically added to
 -# your Apache server by using the AWStats configure.pl tool.
 -#
 -
--#
+-
+-# If using Windows and Perl ActiveStat, this is to enable Perl script as CGI.
+-#ScriptInterpreterSource registry
+-
++# Modified by Nishant Limbachia <nishant _AT_ mnspace _DOT_ net>
++# Modified on Oct 23, 2010
++# 1. Fixup paths for SlackBuilds.org
++# 2. Tighten default access mode
+ 
+ #
  # Directives to add to your Apache conf file to allow use of AWStats as a CGI.
 -# Note that path "/usr/local/awstats/" must reflect your AWStats install path.
  #
@@ -18,7 +23,7 @@ By Nishant Limbachia <nishant@mnspace.net>
 -Alias /awstatscss "/usr/local/awstats/wwwroot/css/"
 -Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/"
 -ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/"
-+
+-
 +Alias /awstatsclasses "@DOCROOT@/awstats/wwwroot/classes/"
 +Alias /awstatscss "@DOCROOT@/awstats/wwwroot/css/"
 +Alias /awstatsicons "@DOCROOT@/awstats/wwwroot/icon/"