From e4d9989991c52b3bc6251eaa873edac913d338d3 Mon Sep 17 00:00:00 2001 From: rh Date: Tue, 26 Mar 2002 20:16:18 +0000 Subject: Bump PKGREVISION to 1: Prevent check_disk from reporting that procfs and kernfs are 100% full. Beautify configure output to DTRT on NetBSD (not a functional change). From PR pkg/16062 submitted by Murray Armfield with some modifications by yours truly. --- net/netsaint-plugins/Makefile | 8 +++++++- net/netsaint-plugins/distinfo | 2 +- net/netsaint-plugins/patches/patch-aa | 11 ++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) (limited to 'net') diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile index e5ed4402494..29c7572e714 100644 --- a/net/netsaint-plugins/Makefile +++ b/net/netsaint-plugins/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2002/03/25 12:58:46 rh Exp $ +# $NetBSD: Makefile,v 1.8 2002/03/26 20:16:18 rh Exp $ # DISTNAME= netsaint-plugins-1.2.9-4 PKGNAME= netsaint-plugins-1.2.9.4 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://prdownloads.sourceforge.net/netsaintplug/ @@ -20,6 +21,11 @@ DEPENDS+= {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/ssh USE_SSL= YES .include "../../net/netsaint-base/Makefile.common" +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +CONFIGURE_ARGS+= --with-df-command="/bin/df -Pkt nokernfs,procfs" +.endif pre-configure: cd ${WRKSRC}; \ diff --git a/net/netsaint-plugins/distinfo b/net/netsaint-plugins/distinfo index de3fb52a504..2c05fa5b076 100644 --- a/net/netsaint-plugins/distinfo +++ b/net/netsaint-plugins/distinfo @@ -1,4 +1,4 @@ SHA1 (netsaint-plugins-1.2.9-4.tar.gz) = d4d6a52c0f5ca8470cd9b9ee52d427b2ecf940e6 Size (netsaint-plugins-1.2.9-4.tar.gz) = 352023 bytes -SHA1 (patch-aa) = aae3fd6668a75dbc19e5c2545c5030116f19ab01 +SHA1 (patch-aa) = 2004b0e08799e42a30974d593314f90014bdebc8 diff --git a/net/netsaint-plugins/patches/patch-aa b/net/netsaint-plugins/patches/patch-aa index 5e8c0ce23f9..d306f8438bf 100644 --- a/net/netsaint-plugins/patches/patch-aa +++ b/net/netsaint-plugins/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2002/03/25 12:58:47 rh Exp $ +$NetBSD: patch-aa,v 1.3 2002/03/26 20:16:19 rh Exp $ --- configure.in.orig Fri Apr 27 00:00:26 2001 +++ configure.in @@ -11,6 +11,15 @@ $NetBSD: patch-aa,v 1.2 2002/03/25 12:58:47 rh Exp $ LDAPLIBS="-lldap -llber"\ LDAPINCLUDE="-I/usr/include/ldap" AC_SUBST(LDAPLIBS) +@@ -395,7 +395,7 @@ + AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") + AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'") + AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s") +- echo " ps syntax... $PATH_TO_PS -Ao 'state command vsz rss'" ++ echo " ps syntax... $PATH_TO_PS -waxco 'state command vsz rss uid user ppid'" + dnl BSD-like mode in RH 6.1 + elif [ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null] + then @@ -621,7 +621,7 @@ fi -- cgit v1.2.3