Fix errno usage. Add DragonFly support. Always use config.guess /

config.sub from pkgsrc.

12 files changed, 110 insertions, 42 deletions

diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index c57e8875523..5ae71f2deb0 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/26 23:39:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/27 13:47:11 joerg Exp $
 #
 
 DISTNAME=		nocol-4.3.1
@@ -17,7 +17,7 @@ HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	< ${WRKSRC}/answers
 
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl:run mkdirhier
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/cmu-snmp/snmp/libtool \
 			${WRKSRC}/cmu-snmp/snmpapps/libtool
@@ -41,6 +41,13 @@ post-patch:
 	${SED} -e 's|@prefix@|${PREFIX}|g' -e "s|@FQDN@|$$fqdn|g" 	\
 			${FILESDIR}/answers > ${WRKSRC}/answers)
 
+pre-configure:
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmp
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmpapps
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmp
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmpapps
+
+
 post-install:
 	# Ensure webnocol audio and images files are available if needed
 	#
diff --git a/net/nocol/distinfo b/net/nocol/distinfo
index 730ce2db3bf..93aa1a36f4b 100644
--- a/net/nocol/distinfo
+++ b/net/nocol/distinfo
@@ -1,18 +1,22 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 12:13:56 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/12/27 13:47:11 joerg Exp $
 
 SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325
 RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8
 Size (nocol-4.3.1.tar.gz) = 1117438 bytes
 SHA1 (patch-aa) = 217d15d5329d30032ee18a666e62cdefe5018445
 SHA1 (patch-ab) = 5c49ef3bd58b84e0f1ea7ba319c574b86fa2aa3e
-SHA1 (patch-ac) = b09448987e09644e8e2f8e8667331a3c3b24323f
+SHA1 (patch-ac) = 3df358560f8f5773c14ddc6378dcbd4f8a19ee9b
 SHA1 (patch-ad) = a64750ad0bfa40f8c01e3d6af49b40c525f13985
 SHA1 (patch-ae) = 57bfc3941aa765eda2a54da45122a5fde642ee3f
-SHA1 (patch-af) = 1c863a4895b893c98ba5bd7ccf2bc8e33a84615f
-SHA1 (patch-ag) = d977f618285d7bb2f80a468fee0260db8d3b77e3
 SHA1 (patch-ah) = 14091c7a6c8de7dd451e4292f2d0121ab3643158
 SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d
 SHA1 (patch-aj) = 0eb201f47864132b04702fab4d03e452c07c2e2a
 SHA1 (patch-ak) = 8013fbe6dbff80749dbdc0d0fad391741e48a468
 SHA1 (patch-al) = aa4fa83d53c72e17ea9ffe2685f326ebbbde9132
-SHA1 (patch-am) = 165dc833464d7b85f6e0ee4a943c1fd9087aa32a
+SHA1 (patch-am) = 810cbecf5bb1f8a995579e8352be1007f09fa69e
+SHA1 (patch-an) = ed0e6099bdc29faf90de8b2916c858e8df57e493
+SHA1 (patch-ao) = 114ebcc55d00981cc6709095f3280509880d76eb
+SHA1 (patch-ap) = 45f30a886adda7831df056cf0f7a136b97a7e17d
+SHA1 (patch-aq) = 13697bbaed2c324851810d6df7677ff807844a6e
+SHA1 (patch-ar) = cba8de7526efde9d8598b9119ca8d27e3c60279f
+SHA1 (patch-as) = be1b999af6459b83fe7bfcab9e83b2e830198da6
diff --git a/net/nocol/patches/patch-ac b/net/nocol/patches/patch-ac
index 66ea987a456..1f1a3a08a7f 100644
--- a/net/nocol/patches/patch-ac
+++ b/net/nocol/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2000/07/13 11:09:18 abs Exp $
+$NetBSD: patch-ac,v 1.5 2005/12/27 13:47:11 joerg Exp $
 
---- netconsole/help_page.c.orig	Thu Jul 13 11:16:00 2000
-+++ netconsole/help_page.c	Thu Jul 13 11:16:32 2000
-@@ -38,7 +38,7 @@
+--- netconsole/help_page.c.orig	1998-07-31 18:22:13.000000000 +0000
++++ netconsole/help_page.c
+@@ -38,11 +38,10 @@
  # define HELPFILE	"helpfile"
  #endif
  
@@ -11,3 +11,7 @@ $NetBSD: patch-ac,v 1.4 2000/07/13 11:09:18 abs Exp $
  
  help_page()
  {
+-    extern int errno;
+     extern char *helpfile ;			/* In netconsole.h  */
+     WINDOW *hwin;
+     char buffer[MAXLINE], *strcat() ;
diff --git a/net/nocol/patches/patch-af b/net/nocol/patches/patch-af
deleted file mode 100644
index 89cf919bddf..00000000000
--- a/net/nocol/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/09/02 09:35:44 skrll Exp $
-
---- cmu-snmp/snmp/config.guess.orig	Mon Oct  2 10:19:14 2000
-+++ cmu-snmp/snmp/config.guess
-@@ -411,6 +411,9 @@
-     i?86:BSD/386:*:* | *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- 	exit 0 ;;
-+    macppc:NetBSD:*:*)
-+	echo powerpc-apple-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-     *:FreeBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- 	exit 0 ;;
diff --git a/net/nocol/patches/patch-ag b/net/nocol/patches/patch-ag
deleted file mode 100644
index f5d402c114c..00000000000
--- a/net/nocol/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/09/02 09:35:44 skrll Exp $
-
---- cmu-snmp/snmpapps/config.guess.orig	Mon Oct  2 10:24:24 2000
-+++ cmu-snmp/snmpapps/config.guess
-@@ -468,6 +468,9 @@
-     i?86:BSD/386:*:* | *:BSD/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- 	exit 0 ;;
-+    macppc:NetBSD:*:*)
-+	echo powerpc-apple-netbsd${UNAME_RELEASE}
-+	exit 0 ;;
-     *:FreeBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- 	exit 0 ;;
diff --git a/net/nocol/patches/patch-am b/net/nocol/patches/patch-am
index 0de647a123e..e73f74d6e6a 100644
--- a/net/nocol/patches/patch-am
+++ b/net/nocol/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.1 2004/07/10 20:19:11 wiz Exp $
+$NetBSD: patch-am,v 1.2 2005/12/27 13:47:11 joerg Exp $
 
---- Configure.orig	2000-01-19 05:34:04.000000000 +0100
+--- Configure.orig	2000-01-19 04:34:04.000000000 +0000
 +++ Configure
 @@ -207,7 +207,7 @@ case "$OS" in
  		OS_LIBS="${LIBRESOLV}"    # -lcompat
  		PING=`which ping`     # can do ping -c cnt host
  		;; 
 -  FREEBSD|FreeBSD\ 2*|FreeBSD\ 3*|NETBSD|NetBSD\ 1*)
-+  FREEBSD|FreeBSD\ 2*|FreeBSD\ 3*|NETBSD|NetBSD\ 1*|NetBSD\ 2*)
++  FREEBSD|FreeBSD\ 2*|FreeBSD\ 3*|NETBSD|NetBSD\ 1*|NetBSD\ 2*|NetBSD\ 3*| NetBSD\ 4*|DragonFly*)
  		OS_CFLAGS="-DFREEBSD"
  		OS_LIBS="${LIBRESOLV} -lcrypt" # some hosts -lresolv not needed
  		PING=`which ping`     # can do ping -c cnt host
diff --git a/net/nocol/patches/patch-an b/net/nocol/patches/patch-an
new file mode 100644
index 00000000000..f18135bbd9e
--- /dev/null
+++ b/net/nocol/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2005/12/27 13:47:11 joerg Exp $
+
+--- include/osdefs.h.orig	2005-12-18 20:28:55.000000000 +0000
++++ include/osdefs.h
+@@ -79,7 +79,7 @@
+ # define NOINITGROUPS
+ #endif
+ 
+-#if defined(BSDI) || defined(FREEBSD) || defined(LINUX2)
++#if defined(BSDI) || defined(FREEBSD) || defined(LINUX2) || defined(__DragonFly__)
+ # ifndef HAVESYSERR
+ #  define HAVESYSERR
+ # endif
diff --git a/net/nocol/patches/patch-ao b/net/nocol/patches/patch-ao
new file mode 100644
index 00000000000..4262b68e5d3
--- /dev/null
+++ b/net/nocol/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2005/12/27 13:47:11 joerg Exp $
+
+--- etherload/os.h.orig	2005-12-18 20:29:45.000000000 +0000
++++ etherload/os.h
+@@ -92,7 +92,7 @@
+ # define USE_BPF
+ #endif
+ 
+-#if defined(FREEBSD) || defined(__FreeBSD__)
++#if defined(FREEBSD) || defined(__FreeBSD__) || defined(__DragonFly__)
+ # define USE_BPF
+ #endif
+ 
diff --git a/net/nocol/patches/patch-ap b/net/nocol/patches/patch-ap
new file mode 100644
index 00000000000..6e34edde098
--- /dev/null
+++ b/net/nocol/patches/patch-ap
@@ -0,0 +1,21 @@
+$NetBSD: patch-ap,v 1.1 2005/12/27 13:47:11 joerg Exp $
+
+--- tpmon/tpmon.c.orig	2005-12-18 20:32:14.000000000 +0000
++++ tpmon/tpmon.c
+@@ -30,7 +30,7 @@
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #include <time.h>
+ #include <sys/time.h>
+ 
+@@ -47,7 +47,6 @@
+ #include "osdefs.h"		/* definition of RAND */
+ 
+ extern char *prognm;
+-extern int errno;
+ static int stoptest;		/* flag used by signal handler */
+ 
+ /*
diff --git a/net/nocol/patches/patch-aq b/net/nocol/patches/patch-aq
new file mode 100644
index 00000000000..4c710d7f593
--- /dev/null
+++ b/net/nocol/patches/patch-aq
@@ -0,0 +1,12 @@
+$NetBSD: patch-aq,v 1.1 2005/12/27 13:47:11 joerg Exp $
+
+--- etherload/externs.h.orig	2005-12-18 20:31:44.000000000 +0000
++++ etherload/externs.h
+@@ -14,7 +14,6 @@ extern int		breakscan;
+ extern int		sleepsecs;
+ extern int		scansecs;
+ extern int		debug;
+-extern int		errno;
+ extern int		extended;
+ extern int		ninterfaces;
+ extern int		truncation;
diff --git a/net/nocol/patches/patch-ar b/net/nocol/patches/patch-ar
new file mode 100644
index 00000000000..81841425c84
--- /dev/null
+++ b/net/nocol/patches/patch-ar
@@ -0,0 +1,9 @@
+$NetBSD: patch-ar,v 1.1 2005/12/27 13:47:11 joerg Exp $
+
+--- trapmon/trapmon.c.orig	2005-12-18 20:36:47.000000000 +0000
++++ trapmon/trapmon.c
+@@ -93,4 +93,2 @@ static char rcsid[] = 
+ 
+-extern int  errno;
+-
+ static int Print = 1;
diff --git a/net/nocol/patches/patch-as b/net/nocol/patches/patch-as
new file mode 100644
index 00000000000..0e155afcc8f
--- /dev/null
+++ b/net/nocol/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2005/12/27 13:47:11 joerg Exp $
+
+--- support/multiping/multiping.c.orig	2005-12-18 20:42:05.000000000 +0000
++++ support/multiping/multiping.c
+@@ -158,7 +158,7 @@ main(argc, argv)
+   int             argc;
+   char          **argv;
+ {
+-  extern int      errno, optind;
++  extern int      optind;
+   extern char    *optarg;
+   struct timeval  timeout;
+   struct protoent *proto;