X-Original-To: alpine-devel@lists.alpinelinux.org
Delivered-To: alpine-devel@lists.alpinelinux.org
Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182])
	by lists.alpinelinux.org (Postfix) with ESMTP id 98B0B1EB587
	for <alpine-devel@lists.alpinelinux.org>; Wed, 25 Aug 2010 03:11:16 +0000 (UTC)
Received: by gxk24 with SMTP id 24so24320gxk.13
        for <alpine-devel@lists.alpinelinux.org>; Tue, 24 Aug 2010 20:11:15 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:received:received:from:to:cc:subject:date
         :message-id:x-mailer;
        bh=25vA3ZiwQigDLEMt9Ta/vnMBLvR+jVCd05uQHHiAjXQ=;
        b=tAX9STRXb/qoZBTd9DH/PB5zLGdvF48RM+yjfT32MSEo7WpBBFLYFM6AfgMXu5LFcM
         DJToT/OsI/XvulIh25wliIhidm+ssLrYNQiCvLzQa8y2k7KJHMZe8wT37z92sFk6/B2D
         uc8TO7GlyY8yX5Ot/VmBmmGNY8i6BBjjWVvs0=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=from:to:cc:subject:date:message-id:x-mailer;
        b=NnN0opfDkMlOkdnaelkeHGVHfzZJ6TOhpWSHKrTDeHJcOpMfdO4U8uHwJdr6WrM2To
         Fm1SIpyP/pjJNwZfAmKC5MGvUAsHu8PuWwbU6vk/h/WKo02dMWEnSa2OndMZAadll8rq
         UOiFWUd3ZIOsU5IzlCxP/Gweynn73trrPLAGc=
Received: by 10.150.98.8 with SMTP id v8mr4234103ybb.236.1282705875402;
        Tue, 24 Aug 2010 20:11:15 -0700 (PDT)
Received: from localhost.localdomain (209.250.132.162.tor.pathcom.com [209.250.132.162])
        by mx.google.com with ESMTPS id r3sm773640ibk.19.2010.08.24.20.11.13
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Tue, 24 Aug 2010 20:11:14 -0700 (PDT)
From: Jeff Bilyk <jbilyk@gmail.com>
To: alpine-devel@lists.alpinelinux.org
Cc: Jeff Bilyk <jbilyk@gmail.com>
Subject: [alpine-devel] [PATCH] Fixing dependencies and removing patch
Date: Tue, 24 Aug 2010 21:11:02 +0000
Message-Id: <1282684262-6603-1-git-send-email-jbilyk@gmail.com>
X-Mailer: git-send-email 1.7.2.1
X-Mailinglist: alpine-devel
Precedence: list
List-Id: Alpine Development <alpine-devel.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-devel+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-devel@lists.alpinelinux.org>
List-Help: <mailto:alpine-devel+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-devel+subscribe@lists.alpinelinux.org?subject=subscribe>

Fixed build and run dependencies.  Removed patch since it's not needed.
---
 testing/nagios-plugins/APKBUILD |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/testing/nagios-plugins/APKBUILD b/testing/nagios-plugins/APKBUILD
index e2da9de..f3cb4b4 100644
--- a/testing/nagios-plugins/APKBUILD
+++ b/testing/nagios-plugins/APKBUILD
@@ -1,26 +1,16 @@
-# Maintainer: Jeff Bilyk <jbilyk at gmail>
+# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=nagios-plugins
 pkgver=1.4.15
-pkgrel=0
+pkgrel=1
 pkgdesc="Plugins for Nagios to check services on hosts"
 url="http://nagiosplugins.org"
 license="GPL-2"
-depends="nagios freeradius-client"
-makedepends="uclibc-dev net-snmp-tools openssl-dev fping openldap-dev openssh libpq"
-source="http://downloads.sourceforge.net/nagiosplug/$pkgname-$pkgver.tar.gz
-001-busybox-tweaks.patch"
+depends="nagios fping net-snmp-tools bind-tools"
+makedepends="net-snmp-tools openssl-dev openldap-dev mysql-dev postgresql-dev libpq"
+source="http://downloads.sourceforge.net/nagiosplug/$pkgname-$pkgver.tar.gz"
 pkgusers="nagios"
 pkggroups="nagios"
 
-prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-	for i in "$srcdir"/*.patch; do
-		[ -f "$i" ] || continue
-		msg "Applying $i"
-		patch -p1 -i "$i" || return 1
-	done
-}
-
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
@@ -29,7 +19,12 @@ build() {
 		--infodir=/usr/share/info \
 		--bindir=/usr/sbin \
 		--libexecdir=/usr/lib/nagios/plugins \
-		--localstatedir=/var/nagios
+		--localstatedir=/var/nagios \
+		--with-ps-command="/bin/ps" \
+		--with-ps-format="%d %s %s %s" \
+		--with-ps-varlist="&procpid,&procuid,&procpcpu,procprog" \
+		--with-ps-cols=4 \
+		--with-ping-command="/bin/ping -c %d %s"
 	make all || return 1
 }
 
@@ -38,5 +33,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="56abd6ade8aa860b38c4ca4a6ac5ab0d  nagios-plugins-1.4.15.tar.gz
-4bb975da57d5e9077968a39a5ab258df  001-busybox-tweaks.patch"
+md5sums="56abd6ade8aa860b38c4ca4a6ac5ab0d  nagios-plugins-1.4.15.tar.gz"
-- 
1.7.2.1



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---