aboutsummaryrefslogtreecommitdiff
path: root/net/analyzer
diff options
context:
space:
mode:
authorrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2008-09-03 03:50:43 +0000
committerrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2008-09-03 03:50:43 +0000
commitdda36349496e0987f0ccf4f23929f7870ba11813 (patch)
tree1b469ee961c93e7f3565a52a6c50a0caba9afa9c /net/analyzer
parentb1c576dfbc932afc7c1ecc09348df2dcc5ac3fc7 (diff)
downloadslackbuilds-dda36349496e0987f0ccf4f23929f7870ba11813.tar.gz
slackbuilds-dda36349496e0987f0ccf4f23929f7870ba11813.tar.bz2
merging with changes made since 21th May
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1903 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'net/analyzer')
-rwxr-xr-xnet/analyzer/nagios-plugins/nagios-plugins.SlackBuild5
-rwxr-xr-xnet/analyzer/nagios/nagios.SlackBuild19
2 files changed, 17 insertions, 7 deletions
diff --git a/net/analyzer/nagios-plugins/nagios-plugins.SlackBuild b/net/analyzer/nagios-plugins/nagios-plugins.SlackBuild
index ccb7da5a..7ec8a42f 100755
--- a/net/analyzer/nagios-plugins/nagios-plugins.SlackBuild
+++ b/net/analyzer/nagios-plugins/nagios-plugins.SlackBuild
@@ -15,7 +15,8 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
#
-# SlackBuild for Nagios Plugins (http://nagiosplugins.org/)
+# SlackBuild for Nagios Plugins
+# http://nagiosplugins.org/
#
# Author: Luis ( luis at riseup d0t net )
#
@@ -32,7 +33,7 @@ CWD="$(pwd)"
SRC_NAME="nagios-plugins"
PKG_NAME="nagios-plugins"
ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.4.11}
+SRC_VERSION=${VERSION:=1.4.12}
PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
diff --git a/net/analyzer/nagios/nagios.SlackBuild b/net/analyzer/nagios/nagios.SlackBuild
index 6a6f00e0..46b9c5a4 100755
--- a/net/analyzer/nagios/nagios.SlackBuild
+++ b/net/analyzer/nagios/nagios.SlackBuild
@@ -15,7 +15,8 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
#
-# SlackBuild for Nagios (http://www.nagios.org/)
+# SlackBuild for Nagios
+# http://www.nagios.org/
#
# Author: Luis ( luis at riseup d0t net )
#
@@ -32,7 +33,7 @@ CWD="$(pwd)"
SRC_NAME="nagios"
PKG_NAME="nagios"
ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.11}
+SRC_VERSION=${VERSION:=3.0.3}
PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1ls}
SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -103,9 +104,17 @@ make install-commandmode DESTDIR="$PKG" || exit $ERROR_INSTALL
make install-config DESTDIR="$PKG" || exit $ERROR_INSTALL
mv "$PKG/etc/rc.d/init.d/nagios" "$PKG/etc/rc.d/rc.nagios.new"
rmdir "$PKG/etc/rc.d/init.d"
-for file in $(ls -1 "$PKG/$PREFIX"/etc/*); do
- mv "$file" "$file".new
-done
+( cd "$PKG/$PREFIX"/etc
+ for file in $(ls -1); do
+ if [ -f "$file" ]; then
+ mv "$file" "$file".new
+ fi
+ done
+ cd objects
+ for file in $(ls -1); do
+ mv "$file" "$file".new
+ done
+)
# Strip binaries
( cd "$PKG"