Get rid of autoconf and automake dependencies by adding a configure patch.

3 files changed, 176 insertions, 12 deletions

diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile
index 61f1479fea0..5731018da9c 100644
--- a/net/netsaint-plugins/Makefile
+++ b/net/netsaint-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/06/17 11:10:22 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/10/02 19:58:01 wiz Exp $
 #
 
 DISTNAME=		netsaint-plugins-1.2.9-4
@@ -11,9 +11,6 @@ MAINTAINER=		murray@river-styx.org
 HOMEPAGE=		http://netsaintplug.sourceforge.net/
 COMMENT=		NetSaint plugins
 
-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
@@ -26,12 +23,5 @@ DEPENDS+=		{ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/ssh
 CONFIGURE_ARGS+=      --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc"
 .endif
 
-pre-configure:
-	cd ${WRKSRC};	\
-	${LOCALBASE}/bin/aclocal;	\
-	${LOCALBASE}/bin/autoheader;	\
-	${LOCALBASE}/bin/automake -a --foreign -i;	\
-	${LOCALBASE}/bin/autoconf
-
 .include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netsaint-plugins/distinfo b/net/netsaint-plugins/distinfo
index 3933515090e..2e25bdd0b49 100644
--- a/net/netsaint-plugins/distinfo
+++ b/net/netsaint-plugins/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/07/02 13:00:40 wiz Exp $
+$NetBSD: distinfo,v 1.7 2002/10/02 19:58:02 wiz Exp $
 
 SHA1 (netsaint-plugins-1.2.9-4.tar.gz) = d4d6a52c0f5ca8470cd9b9ee52d427b2ecf940e6
 Size (netsaint-plugins-1.2.9-4.tar.gz) = 352023 bytes
 SHA1 (patch-aa) = 209680a6ffc320d1da82135027b9a5bd5d905690
+SHA1 (patch-ab) = a2dba2793eb369cbcb77635165f72c719503b5ce
diff --git a/net/netsaint-plugins/patches/patch-ab b/net/netsaint-plugins/patches/patch-ab
new file mode 100644
index 00000000000..2c579d72d77
--- /dev/null
+++ b/net/netsaint-plugins/patches/patch-ab
@@ -0,0 +1,173 @@
+$NetBSD: patch-ab,v 1.3 2002/10/02 19:58:03 wiz Exp $
+
+--- configure.orig	Thu Apr 26 20:46:17 2001
++++ configure
+@@ -2547,7 +2547,7 @@ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-if test "$ac_cv_lib_ldap_main" = "yes"; then
++if false; then
+   LDAPLIBS="-lldap -llber"\
+   LDAPINCLUDE="-I/usr/include/ldap"
+   
+@@ -3715,11 +3715,67 @@ EOF
+ 
+ 
+ 
++for ac_func in select socket strdup strstr strtod strtol strtoul
++do
++echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
++echo "configure:3722: checking for $ac_func" >&5
++if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 3727 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char $ac_func();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++$ac_func();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_$ac_func=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++
+ 
+ echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
+-echo "configure:3721: checking for getopt_long" >&5
++echo "configure:3777: checking for getopt_long" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3723 "configure"
++#line 3779 "configure"
+ #include "confdefs.h"
+ #include <getopt.h>
+ #include <stdlib.h>
+@@ -3859,62 +3915,6 @@ LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIB
+ fi
+ 
+ 
+-for ac_func in select socket strdup strstr strtod strtol strtoul
+-do
+-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3866: checking for $ac_func" >&5
+-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 3871 "configure"
+-#include "confdefs.h"
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func(); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char $ac_func();
+-
+-int main() {
+-
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-$ac_func();
+-#endif
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_func_$ac_func=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_$ac_func=no"
+-fi
+-rm -f conftest*
+-fi
+-
+-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_func 1
+-EOF
+- 
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-done
+-
+-
+ echo $ac_n "checking for type of socket size""... $ac_c" 1>&6
+ echo "configure:3920: checking for type of socket size" >&5
+ cat > conftest.$ac_ext <<EOF
+@@ -4271,7 +4271,7 @@ EOF
+ #define RSS_FORMAT "%d %s"
+ EOF
+ 
+-	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'"
+ 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
+ 	cat >> confdefs.h <<\EOF
+@@ -4859,7 +4859,7 @@ if test -n "$ac_cv_path_PATH_TO_NSLOOKUP
+ then
+ 	echo $ac_n "checking "nslookup syntax"""... $ac_c" 1>&6
+ echo "configure:4862: checking "nslookup syntax"" >&5
+-	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
+ 		echo "$ac_t"""$PATH_TO_NSLOOKUP"" 1>&6
+ 		cat >> confdefs.h <<EOF
+@@ -5001,7 +5001,7 @@ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-if test -f "$PATH_TO_SNMPGET"
++if false;
+ then
+ 	cat >> confdefs.h <<EOF
+ #define PATH_TO_SNMPGET "$PATH_TO_SNMPGET"