Fixes for recent kernel changes, this will screw over people (like me)

who have a -CURRENT before:

Fri May 5 9:58:59 2000 UTC by phk

.. however, since no __FreeBSD_version bump was performed, I can't
handle this with the usual Makefile magic.

Submitted by:	kuriyama-san
Reviewed by:	Matt Ayres <mayres@chc-chimes.com> ("it works now")

16 files changed, 216 insertions, 8 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index e6f29b277225..d1ba408bdd6c 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-GNU_CONFIGURE=	YES
+USE_AUTOCONF=	YES
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
@@ -71,5 +71,4 @@ post-install:
 	 fi
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
-
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/net-snmp-devel/files/patch-al b/net-mgmt/net-snmp-devel/files/patch-al
new file mode 100644
index 000000000000..c2464056b6bc
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-al
@@ -0,0 +1,29 @@
+--- configure.in~	Sat May  6 01:46:26 2000
++++ configure.in	Wed May 17 11:09:08 2000
+@@ -1286,6 +1286,26 @@
+ AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
+ [
+ 
++dnl 4.4 compatible but renamed on FreeBSD
++AC_TRY_COMPILE([
++#include <sys/types.h>
++#define KERNEL
++#define _KERNEL
++#include <sys/socket.h>
++#undef KERNEL
++#undef _KERNEL
++#include <net/route.h>
++],[
++
++#ifndef STRUCT_RTENTRY_HAS_RT_DST
++#define rt_dst rt_nodes->rn_key
++#endif
++
++  struct rtentry rt; 
++  rt.rt_nodes[0].rn_bit = 1;
++  rt.rt_dst;
++  ], ac_cv_RTENTRY_TYPE="BSD-4.4")
++
+ dnl 4.4 compat
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
diff --git a/net-mgmt/net-snmp-devel/files/patch-am b/net-mgmt/net-snmp-devel/files/patch-am
new file mode 100644
index 000000000000..0ad08d546705
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-am
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~	Sat Dec 18 08:41:14 1999
++++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c	Wed May 17 11:18:59 2000
+@@ -9,6 +9,9 @@
+ #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/dkstat.h>
++#ifdef freebsd5
++#include <sys/bio.h>
++#endif
+ #include <sys/buf.h>
+ #include <sys/uio.h>
+ #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp-devel/files/patch-an b/net-mgmt/net-snmp-devel/files/patch-an
new file mode 100644
index 000000000000..8153ba8c5653
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-an
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd-snmp/memory_freebsd2.c~	Tue Mar 14 06:27:00 2000
++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	Wed May 17 11:19:23 2000
+@@ -10,6 +10,9 @@
+ #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/dkstat.h>
++#ifdef freebsd5
++#include <sys/bio.h>
++#endif
+ #include <sys/buf.h>
+ #include <sys/uio.h>
+ #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index e6f29b277225..d1ba408bdd6c 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-GNU_CONFIGURE=	YES
+USE_AUTOCONF=	YES
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
@@ -71,5 +71,4 @@ post-install:
 	 fi
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
-
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/net-snmp/files/patch-al b/net-mgmt/net-snmp/files/patch-al
new file mode 100644
index 000000000000..c2464056b6bc
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-al
@@ -0,0 +1,29 @@
+--- configure.in~	Sat May  6 01:46:26 2000
++++ configure.in	Wed May 17 11:09:08 2000
+@@ -1286,6 +1286,26 @@
+ AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
+ [
+ 
++dnl 4.4 compatible but renamed on FreeBSD
++AC_TRY_COMPILE([
++#include <sys/types.h>
++#define KERNEL
++#define _KERNEL
++#include <sys/socket.h>
++#undef KERNEL
++#undef _KERNEL
++#include <net/route.h>
++],[
++
++#ifndef STRUCT_RTENTRY_HAS_RT_DST
++#define rt_dst rt_nodes->rn_key
++#endif
++
++  struct rtentry rt; 
++  rt.rt_nodes[0].rn_bit = 1;
++  rt.rt_dst;
++  ], ac_cv_RTENTRY_TYPE="BSD-4.4")
++
+ dnl 4.4 compat
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
diff --git a/net-mgmt/net-snmp/files/patch-am b/net-mgmt/net-snmp/files/patch-am
new file mode 100644
index 000000000000..0ad08d546705
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-am
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~	Sat Dec 18 08:41:14 1999
++++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c	Wed May 17 11:18:59 2000
+@@ -9,6 +9,9 @@
+ #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/dkstat.h>
++#ifdef freebsd5
++#include <sys/bio.h>
++#endif
+ #include <sys/buf.h>
+ #include <sys/uio.h>
+ #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp/files/patch-an b/net-mgmt/net-snmp/files/patch-an
new file mode 100644
index 000000000000..8153ba8c5653
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-an
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd-snmp/memory_freebsd2.c~	Tue Mar 14 06:27:00 2000
++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	Wed May 17 11:19:23 2000
+@@ -10,6 +10,9 @@
+ #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/dkstat.h>
++#ifdef freebsd5
++#include <sys/bio.h>
++#endif
+ #include <sys/buf.h>
+ #include <sys/uio.h>
+ #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index e6f29b277225..d1ba408bdd6c 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-GNU_CONFIGURE=	YES
+USE_AUTOCONF=	YES
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
@@ -71,5 +71,4 @@ post-install:
 	 fi
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
-
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/net-snmp4/files/patch-al b/net-mgmt/net-snmp4/files/patch-al
new file mode 100644
index 000000000000..c2464056b6bc
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/patch-al
@@ -0,0 +1,29 @@
+--- configure.in~	Sat May  6 01:46:26 2000
++++ configure.in	Wed May 17 11:09:08 2000
+@@ -1286,6 +1286,26 @@
+ AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
+ [
+ 
++dnl 4.4 compatible but renamed on FreeBSD
++AC_TRY_COMPILE([
++#include <sys/types.h>
++#define KERNEL
++#define _KERNEL
++#include <sys/socket.h>
++#undef KERNEL
++#undef _KERNEL
++#include <net/route.h>
++],[
++
++#ifndef STRUCT_RTENTRY_HAS_RT_DST
++#define rt_dst rt_nodes->rn_key
++#endif
++
++  struct rtentry rt; 
++  rt.rt_nodes[0].rn_bit = 1;
++  rt.rt_dst;
++  ], ac_cv_RTENTRY_TYPE="BSD-4.4")
++
+ dnl 4.4 compat
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
diff --git a/net-mgmt/net-snmp4/files/patch-am b/net-mgmt/net-snmp4/files/patch-am
new file mode 100644
index 000000000000..0ad08d546705
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/patch-am
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~	Sat Dec 18 08:41:14 1999
++++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c	Wed May 17 11:18:59 2000
+@@ -9,6 +9,9 @@
+ #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/dkstat.h>
++#ifdef freebsd5
++#include <sys/bio.h>
++#endif
+ #include <sys/buf.h>
+ #include <sys/uio.h>
+ #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp4/files/patch-an b/net-mgmt/net-snmp4/files/patch-an
new file mode 100644
index 000000000000..8153ba8c5653
--- /dev/null
+++ b/net-mgmt/net-snmp4/files/patch-an
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd-snmp/memory_freebsd2.c~	Tue Mar 14 06:27:00 2000
++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	Wed May 17 11:19:23 2000
+@@ -10,6 +10,9 @@
+ #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/dkstat.h>
++#ifdef freebsd5
++#include <sys/bio.h>
++#endif
+ #include <sys/buf.h>
+ #include <sys/uio.h>
+ #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index e6f29b277225..d1ba408bdd6c 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= 	ftp://ucd-snmp.ucdavis.edu/ \
 
 MAINTAINER=	billf@FreeBSD.org
 
-GNU_CONFIGURE=	YES
+USE_AUTOCONF=	YES
 CONFIGURE_ARGS+= --enable-shared
 .if defined(BATCH)
 CONFIGURE_ARGS+= --with-defaults --with-sys-contact=nobody@no.where
@@ -71,5 +71,4 @@ post-install:
 	 fi
 	${SETENV} OBJFORMAT="${PORTOBJFORMAT}" ${LDCONFIG} -m ${PREFIX}/lib
 
-
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/net-snmp53/files/patch-al b/net-mgmt/net-snmp53/files/patch-al
new file mode 100644
index 000000000000..c2464056b6bc
--- /dev/null
+++ b/net-mgmt/net-snmp53/files/patch-al
@@ -0,0 +1,29 @@
+--- configure.in~	Sat May  6 01:46:26 2000
++++ configure.in	Wed May 17 11:09:08 2000
+@@ -1286,6 +1286,26 @@
+ AC_CACHE_CHECK(type of rtentry structure,ac_cv_RTENTRY_TYPE,
+ [
+ 
++dnl 4.4 compatible but renamed on FreeBSD
++AC_TRY_COMPILE([
++#include <sys/types.h>
++#define KERNEL
++#define _KERNEL
++#include <sys/socket.h>
++#undef KERNEL
++#undef _KERNEL
++#include <net/route.h>
++],[
++
++#ifndef STRUCT_RTENTRY_HAS_RT_DST
++#define rt_dst rt_nodes->rn_key
++#endif
++
++  struct rtentry rt; 
++  rt.rt_nodes[0].rn_bit = 1;
++  rt.rt_dst;
++  ], ac_cv_RTENTRY_TYPE="BSD-4.4")
++
+ dnl 4.4 compat
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
diff --git a/net-mgmt/net-snmp53/files/patch-am b/net-mgmt/net-snmp53/files/patch-am
new file mode 100644
index 000000000000..0ad08d546705
--- /dev/null
+++ b/net-mgmt/net-snmp53/files/patch-am
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd-snmp/vmstat_freebsd2.c~	Sat Dec 18 08:41:14 1999
++++ agent/mibgroup/ucd-snmp/vmstat_freebsd2.c	Wed May 17 11:18:59 2000
+@@ -9,6 +9,9 @@
+ #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/dkstat.h>
++#ifdef freebsd5
++#include <sys/bio.h>
++#endif
+ #include <sys/buf.h>
+ #include <sys/uio.h>
+ #include <sys/namei.h>
diff --git a/net-mgmt/net-snmp53/files/patch-an b/net-mgmt/net-snmp53/files/patch-an
new file mode 100644
index 000000000000..8153ba8c5653
--- /dev/null
+++ b/net-mgmt/net-snmp53/files/patch-an
@@ -0,0 +1,12 @@
+--- agent/mibgroup/ucd-snmp/memory_freebsd2.c~	Tue Mar 14 06:27:00 2000
++++ agent/mibgroup/ucd-snmp/memory_freebsd2.c	Wed May 17 11:19:23 2000
+@@ -10,6 +10,9 @@
+ #include <sys/time.h>
+ #include <sys/proc.h>
+ #include <sys/dkstat.h>
++#ifdef freebsd5
++#include <sys/bio.h>
++#endif
+ #include <sys/buf.h>
+ #include <sys/uio.h>
+ #include <sys/namei.h>