diff options
author | rh <rh@pkgsrc.org> | 2002-04-14 10:00:48 +0000 |
---|---|---|
committer | rh <rh@pkgsrc.org> | 2002-04-14 10:00:48 +0000 |
commit | de21ea9c1458c1876008293579836b1b163d21be (patch) | |
tree | 93cf07860e596d7cbe3113cd749bac73d03c0ade /net | |
parent | 2842fc1305d5ebbf004c6847fd69f37bed29560b (diff) | |
download | pkgsrc-de21ea9c1458c1876008293579836b1b163d21be.tar.gz |
Bump to nb2 fixing some configure script bugs. Also convert dependencies
on automake and autoconf into simple BUILD_DEPENDS. Fix provided by
Greg A. Woods <woods@planix.com> in PR 16238, thanks!
Diffstat (limited to 'net')
-rw-r--r-- | net/netsaint-plugins/Makefile | 11 | ||||
-rw-r--r-- | net/netsaint-plugins/distinfo | 2 | ||||
-rw-r--r-- | net/netsaint-plugins/patches/patch-aa | 33 |
3 files changed, 38 insertions, 8 deletions
diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile index 29c7572e714..4441d5f4d04 100644 --- a/net/netsaint-plugins/Makefile +++ b/net/netsaint-plugins/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2002/03/26 20:16:18 rh Exp $ +# $NetBSD: Makefile,v 1.9 2002/04/14 10:00:48 rh Exp $ # DISTNAME= netsaint-plugins-1.2.9-4 PKGNAME= netsaint-plugins-1.2.9.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= http://prdownloads.sourceforge.net/netsaintplug/ @@ -11,8 +11,9 @@ MAINTAINER= murray@river-styx.org HOMEPAGE= http://netsaintplug.sourceforge.net/ COMMENT= NetSaint plugins -DEPENDS+= autoconf>=2.13:../../devel/autoconf -DEPENDS+= automake>=1.4.5:../../devel/automake +BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf +BUILD_DEPENDS+= automake>=1.4.5:../../devel/automake + DEPENDS+= netsaint-base-[0-9]*:../../net/netsaint-base .if !exists(/usr/bin/ssh) DEPENDS+= {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/ssh @@ -24,7 +25,7 @@ USE_SSL= YES .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -CONFIGURE_ARGS+= --with-df-command="/bin/df -Pkt nokernfs,procfs" +CONFIGURE_ARGS+= --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc" .endif pre-configure: diff --git a/net/netsaint-plugins/distinfo b/net/netsaint-plugins/distinfo index 2c05fa5b076..3c376ff3b6c 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) = 2004b0e08799e42a30974d593314f90014bdebc8 +SHA1 (patch-aa) = 209680a6ffc320d1da82135027b9a5bd5d905690 diff --git a/net/netsaint-plugins/patches/patch-aa b/net/netsaint-plugins/patches/patch-aa index d306f8438bf..949b8e625a7 100644 --- a/net/netsaint-plugins/patches/patch-aa +++ b/net/netsaint-plugins/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.3 2002/03/26 20:16:19 rh Exp $ +$NetBSD: patch-aa,v 1.4 2002/04/14 10:00:49 rh Exp $ --- configure.in.orig Fri Apr 27 00:00:26 2001 -+++ configure.in ++++ configure.in Sun Apr 7 17:27:29 2002 @@ -144,7 +144,7 @@ dnl Check for LDAP libraries _SAVEDLIBS="$LIBS" @@ -11,6 +11,26 @@ $NetBSD: patch-aa,v 1.3 2002/03/26 20:16:19 rh Exp $ LDAPLIBS="-lldap -llber"\ LDAPINCLUDE="-I/usr/include/ldap" AC_SUBST(LDAPLIBS) +@@ -260,6 +260,9 @@ + AC_TYPE_SIZE_T + AC_TYPE_SIGNAL + ++dnl Checks for library functions. ++AC_CHECK_FUNCS(select socket strdup strstr strtod strtol strtoul) ++ + dnl EXTRA_LIBRARIES="libgetopt.a libsnprintf.a" + dnl noinst_LIBRARIES="libgetopt.a libsnprintf.a" + dnl libgetopt_a_SOURCES="getopt.c getopt1.c" +@@ -283,9 +286,6 @@ + + AC_CHECK_FUNC(vsnprintf,,LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a") + +-dnl Checks for library functions. +-AC_CHECK_FUNCS(select socket strdup strstr strtod strtol strtoul) +- + AC_MSG_CHECKING(for type of socket size) + AC_TRY_COMPILE([#include <stdlib.h> + #include <sys/types.h> @@ -395,7 +395,7 @@ AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxco 'rss command'") @@ -20,6 +40,15 @@ $NetBSD: patch-aa,v 1.3 2002/03/26 20:16:19 rh Exp $ 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 +@@ -596,7 +596,7 @@ + if test -n "$ac_cv_path_PATH_TO_NSLOOKUP" + then + AC_MSG_CHECKING("nslookup syntax") +- if [nslookup -sil 127.0.0.1 2>&1 | grep "*** Invalid option: sil" >/dev/null] ++ if [nslookup -sil 127.0.0.1 2>&1 | fgrep "*** Invalid option: sil" >/dev/null] + then + AC_MSG_RESULT("$PATH_TO_NSLOOKUP") + AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$PATH_TO_NSLOOKUP") @@ -621,7 +621,7 @@ fi |