X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Fnagios-plugins%2FMakefile;h=68490810ebe35bf48bd3f0396cef25bdcf974da8;hb=b46ed8aada9a31207d6e35e145ce17d62ece0fee;hp=35abb2590931a6011161fd0a8da94886bf35d46a;hpb=745470f585516224a5cb7ff34791a483b8cfb42b;p=packages.git

diff --git a/net/nagios-plugins/Makefile b/net/nagios-plugins/Makefile
index 35abb2590..68490810e 100644
--- a/net/nagios-plugins/Makefile
+++ b/net/nagios-plugins/Makefile
@@ -1,23 +1,22 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nagios-plugins
-PKG_VERSION:=1.4.9
-PKG_RELEASE:=1
+PKG_VERSION:=1.4.14
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/nagiosplug
-PKG_MD5SUM:=6e617e95cadeedd92870cdbd2f13726c
-PKG_CAT:=zcat
+PKG_MD5SUM:=a1835a48a777863ed2583de3c82446a9
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=libtool no-autoreconf
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,33 +25,24 @@ comma:= ,
 define Package/nagios-plugins
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=uclibcxx
+  SUBMENU:=Monitoring
+  DEPENDS:=+uclibcxx +libpq
   TITLE:=plugins for Nagios checks
   URL:=http://nagiosplug.sourceforge.net/
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--without-mysql \
-		--with-openssl="$(STAGING_DIR)/usr" \
-		--with-ping-command="/bin/ping -c %d %s" \
-		--with-ps-command="/bin/ps -Aopid" \
-		--with-ps-cols="6" \
-		--with-ps-format="%d %s %d %s %s %n" \
-		--with-ps-varlist="&procuid$(comma)&procpid$(comma)&procvsz$(comma)procstat$(comma)procprog$(comma)&pos" \
-		--with-uptime-command="/usr/bin/uptime" \
-		--with-ssh-command="/usr/bin/ssh" \
-		--with-nslookup-command="/usr/bin/nslookup" \
-		, \
-	)
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default,\
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install \
-	)
-endef
+CONFIGURE_ARGS += \
+	--without-mysql \
+	--with-openssl="$(STAGING_DIR)/usr" \
+	--with-ping-command="/bin/ping -w %d -c %d %s" \
+	--with-ping6-command="/bin/ping6 -w %d -c %d %s" \
+	--with-ps-command="/bin/ps -Aopid" \
+	--with-ps-cols="6" \
+	--with-ps-format="%d %s %d %s %s %n" \
+	--with-ps-varlist="&procuid$(comma)&procpid$(comma)&procvsz$(comma)procstat$(comma)procprog$(comma)&pos" \
+	--with-uptime-command="/usr/bin/uptime" \
+	--with-ssh-command="/usr/bin/ssh" \
+	--with-nslookup-command="/usr/bin/nslookup"
 
 define Package/nagios-plugins/install
 	$(INSTALL_DIR) $(1)/usr/libexec/nagios