network/ganglia: Updated for version 3.1.1

3 files changed, 36 insertions, 16 deletions

diff --git a/network/ganglia/README b/network/ganglia/README
index 1e85dc3c59..8ddb0efe49 100644
--- a/network/ganglia/README
+++ b/network/ganglia/README
@@ -11,6 +11,6 @@ design targeted at federations of clusters.
    In order to build gmetad as part of this package, you'll need to have 
    RRDTool installed.  It is available from SlackBuilds.org.
 
-2. The Ganglia web frontend files will be stored under /var/gweb directory. 
-   You can set WWWPATH to the desired place for your web server.
-   Example:    WWWPATH=/var/www/ganglia ./ganglia.SlackBuild
\ No newline at end of file
+2. The Ganglia web frontend files will be stored under /var/www/htdocs/gweb
+   directory. You can set WWWPATH to the desired place for your web server.
+   Example:    WWWPATH=/var/www/ganglia ./ganglia.SlackBuild
diff --git a/network/ganglia/ganglia.SlackBuild b/network/ganglia/ganglia.SlackBuild
index c395255918..f953957ead 100644
--- a/network/ganglia/ganglia.SlackBuild
+++ b/network/ganglia/ganglia.SlackBuild
@@ -1,11 +1,29 @@
 #!/bin/sh
-
+#
 # Slackware build script for ganglia
-# Written by Cherife Li <cherife@dotimes.com>
-# Modified by Robby Workman <rworkman@slackbuilds.org>
+#
+# Copyright 2008 Cherife Li <cherife-#-dotimes.com>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ganglia
-VERSION=3.0.7
+VERSION=3.1.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -15,8 +33,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-WWWPATH=${WWWPATH:-/var/gweb}
-DOCUMENTATION="AUTHORS COPYING ChangeLog INSTALL NEWS ganglia.html README"
+WWWPATH=${WWWPATH:-/var/www/htdocs/gweb}
+DOCUMENTATION="AUTHORS COPYING ChangeLog INSTALL NEWS README*"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -48,7 +66,10 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
+  --localstatedir=/var \
+  --enable-static=no \
   --enable-gexeca \
+  --enable-status \
   $OPT
 
 make 
@@ -65,7 +86,7 @@ fi
 
 mkdir -p $PKG/$WWWPATH
 mv web/* $PKG/$WWWPATH
-( cd $PKG/$WWWPATH ; rm -f AUTHORS COPYING ChangeLog Makefile.am version.php.in )
+( cd $PKG/$WWWPATH ; rm -f AUTHORS COPYING Makefile.am conf.php.in version.php.in )
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -78,7 +99,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/man/man1
 cp -a mans/*.1 $PKG/usr/man/man1
-
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
diff --git a/network/ganglia/ganglia.info b/network/ganglia/ganglia.info
index c580ff0845..be9e856d9a 100644
--- a/network/ganglia/ganglia.info
+++ b/network/ganglia/ganglia.info
@@ -1,8 +1,8 @@
 PRGNAM="ganglia"
-VERSION="3.0.7"
+VERSION="3.1.1"
 HOMEPAGE="http://ganglia.info/"
-DOWNLOAD="http://downloads.sourceforge.net/ganglia/ganglia-3.0.7.tar.gz"
-MD5SUM="20c210ed33061737e2496fee9243b1f4"
+DOWNLOAD="http://downloads.sourceforge.net/ganglia/ganglia-3.1.1.tar.gz"
+MD5SUM="e6f4de42afecb4731a5de4606e3f1045"
 MAINTAINER="Cherife Li"
-EMAIL="cherife@dotimes.com"
-APPROVED="David Somero,rworkman"
+EMAIL="cherife-#-dotimes.com"
+APPROVED="dsomero"