From d18f668186bc3fb63bcbfffe67f90087a2178e1e Mon Sep 17 00:00:00 2001
From: David Somero <dsomero@hotmail.com>
Date: Wed, 12 May 2010 17:46:20 +0200
Subject: system/webmin: Updated for version 1.480

---
 system/webmin/README            |  6 ------
 system/webmin/doinst.sh         |  3 +--
 system/webmin/webmin.SlackBuild | 14 ++++++--------
 system/webmin/webmin.info       |  6 +++---
 4 files changed, 10 insertions(+), 19 deletions(-)

(limited to 'system/webmin')

diff --git a/system/webmin/README b/system/webmin/README
index 636b2762d5..3de44c54f5 100644
--- a/system/webmin/README
+++ b/system/webmin/README
@@ -20,9 +20,3 @@ script and make sure rc.webmin has executable permissions set:
 	fi
 After the webmin service is started, point your web browser to 
 http://localhost:10000 and login as root to use webmin.
-
-Note that if you upgrade from a older version of this SlackBuild
-you __MUST__ use the new /etc/rc.d/rc.webmin file.
-Also, if you are upgrading, you need to backup your /etc/webmin directory.
-All of the config files will be deleted by this upgrade - however, that 
-problem is solved in future upgrades, so it won't be an issue again.
diff --git a/system/webmin/doinst.sh b/system/webmin/doinst.sh
index 765079d88b..64789063c8 100644
--- a/system/webmin/doinst.sh
+++ b/system/webmin/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
@@ -22,3 +20,4 @@ fi
 
 # Signal the startup script to do some post install configuration  
 touch etc/webmin/FIRSTRUN
+
diff --git a/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild
index 687b7565dd..29f893d2e9 100644
--- a/system/webmin/webmin.SlackBuild
+++ b/system/webmin/webmin.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Webmin http://www.webmin.com
 
-# Copyright 2006-2008  David Somero (dsomero@hotmail.com)
+# Copyright 2006-2009  David Somero (dsomero@hotmail.com)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=webmin
-VERSION=1.420
+VERSION=1.480
 ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -58,12 +58,10 @@ rm -f mount/{freebsd,openbsd,macos}-mounts*
 
 ( find . -name '*.cgi' ; find . -name '*.pl' ) | perl perlpath.pl /usr/bin/perl -
 
-install -d -m 0755 $PKG/usr/libexec/webmin
-install -d -m 0755 $PKG/var
-install -d -m 0755 $PKG/etc/rc.d/
-install -d -m 0755 $PKG/etc/webmin/
-install -d -m 0755 $PKG/var/log/webmin/
-install -m 0644 $CWD/rc.webmin $PKG/etc/rc.d/rc.webmin
+mkdir -p $PKG/usr/libexec/webmin $PKG/var/log/webmin $PKG/etc/{rc.d,webmin}
+
+install -m 0755 $CWD/rc.webmin $PKG/etc/rc.d/rc.webmin
+
 cp -rp * $PKG/usr/libexec/webmin
 echo "slackware" > $PKG/usr/libexec/webmin/install-type
 echo "/usr/libexec/webmin" > $PKG/usr/libexec/webmin/install-dir
diff --git a/system/webmin/webmin.info b/system/webmin/webmin.info
index 2132effe20..f096c25e4c 100644
--- a/system/webmin/webmin.info
+++ b/system/webmin/webmin.info
@@ -1,8 +1,8 @@
 PRGNAM="webmin"
-VERSION="1.420"
+VERSION="1.480"
 HOMEPAGE="http://www.webmin.com/"
-DOWNLOAD="http://downloads.sourceforge.net/webadmin/webmin-1.420.tar.gz"
-MD5SUM="0b650023ad06dc88523f0e564d86fd3b"
+DOWNLOAD="http://downloads.sourceforge.net/webadmin/webmin-1.480.tar.gz"
+MD5SUM="10c417b7b44a00b3297617cbb541780e"
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
 APPROVED="rworkman"
-- 
cgit v1.2.3-65-gdbad