3 files changed, 79 insertions, 59 deletions
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index c9de0b1c910..0ffd2e91f98 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/04/05 00:59:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 1999/04/21 20:47:22 abs Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp
 #
 
@@ -25,18 +25,6 @@ MAKE_ENV+=	PKG_PREFIX="${PREFIX}"
 
 .include "../../mk/bsd.prefs.mk"
 
-# XXX This most horrible hack is necessary because of the stupid linker's
-# insistence on requiring that all externals referenced from a shared library
-# be defined, even if nothing elese from the library is ever used.  In this
-# case the libwrap.so library is at fault as it references 'deny_severity' and
-# 'allow_severity', but none of the configure tests will include this, nor
-# indeed will any product binary except for snmpd (which is the only one that
-# actualy uses tcp_wrappers).
-#
-# /usr/libexec/ld.so: Undefined symbol "_deny_severity" in conftest:/usr/lib/libwrap.so.0.0
-#
-CFLAGS+=	-static
-
 pre-configure:
 	(cd ${WRKSRC}; autoreconf --force)
 
diff --git a/net/ucd-snmp/patches/patch-aa b/net/ucd-snmp/patches/patch-aa
index 77edbc9705a..57964846559 100644
--- a/net/ucd-snmp/patches/patch-aa
+++ b/net/ucd-snmp/patches/patch-aa
@@ -1,46 +1,67 @@
-$NetBSD: patch-aa,v 1.5 1999/04/05 01:01:30 hubertf Exp $
-
-*** configure.in-ORIG	Mon Mar 15 18:31:43 1999
---- configure.in	Sun Apr  4 16:42:20 1999
-***************
-*** 821,831 ****
-  
-  AC_CHECK_STRUCT_FOR([
-  #include <sys/types.h>
-- #define KERNEL
-- #define _KERNEL
-  #include <sys/socket.h>
-- #undef KERNEL
-- #undef _KERNEL
-  #include <net/route.h>
-  ], rtentry, rt_dst, no)
-  
---- 821,827 ----
-***************
-*** 836,846 ****
-  dnl 4.4 compat
-  AC_TRY_COMPILE([
-  #include <sys/types.h>
-- #define KERNEL
-- #define _KERNEL
-  #include <sys/socket.h>
-- #undef KERNEL
-- #undef _KERNEL
-  #include <net/route.h>
-  ],[
-  
---- 832,838 ----
-***************
-*** 857,867 ****
-  if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
-  AC_TRY_COMPILE([
-  #include <sys/types.h>
-- #define KERNEL
-- #define _KERNEL
-  #include <sys/socket.h>
-- #undef KERNEL
-- #undef _KERNEL
-  #include <net/route.h>
-  ],[
-  struct rtentry rt; 
---- 849,855 ----
+# XXX The LIBWRAP horrible hack is necessary because of the stupid linker's
+# insistence on requiring that all externals referenced from a shared library
+# be defined, even if nothing elese from the library is ever used.  In this
+# case the libwrap.so library is at fault as it references 'deny_severity' and
+# 'allow_severity', but none of the configure tests will include this, nor
+# indeed will any product binary except for snmpd (which is the only one that
+# actualy uses tcp_wrappers).
+#
+# /usr/libexec/ld.so: Undefined symbol "_deny_severity" in conftest:/usr/lib/libwrap.so.0.0
+#
+--- configure.in.orig	Mon Mar 15 15:31:43 1999
++++ configure.in	Tue Apr 20 18:35:51 1999
+@@ -97,14 +97,15 @@
+ AC_ARG_WITH(libwrap,
+ [  --with-libwrap[=LIBPATH]        Compile in libwrap (tcp_wrappers) support.],
+     if test "x$withval" != "x" -a -d "$withval"; then
+-        LIBS="-L$withval -lwrap $LIBS"
++        LIBWRAP="-L$withval -lwrap"
+     elif test "x$withval" = "xyes"; then
+-        LIBS="-lwrap $LIBS"
++        LIBWRAP="-lwrap"
+     else
+-        LIBS="$withval $LIBS"
++        LIBWRAP="$withval"
+     fi
+     AC_DEFINE(USE_LIBWRAP)
+ )
++AC_SUBST(LIBWRAP)
+ 
+ AC_ARG_WITH(mib_modules,
+ [  --with-mib-modules=\"item1 ...\"  Compile with additional mib modules
+@@ -821,11 +822,7 @@
+ 
+ AC_CHECK_STRUCT_FOR([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ], rtentry, rt_dst, no)
+ 
+@@ -836,11 +833,7 @@
+ dnl 4.4 compat
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ],[
+ 
+@@ -857,11 +850,7 @@
+ if test "x$ac_cv_RTENTRY_TYPE" = "x"; then
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+-#define KERNEL
+-#define _KERNEL
+ #include <sys/socket.h>
+-#undef KERNEL
+-#undef _KERNEL
+ #include <net/route.h>
+ ],[
+ struct rtentry rt; 
diff --git a/net/ucd-snmp/patches/patch-ab b/net/ucd-snmp/patches/patch-ab
new file mode 100644
index 00000000000..6b7f22c165a
--- /dev/null
+++ b/net/ucd-snmp/patches/patch-ab
@@ -0,0 +1,11 @@
+--- agent/Makefile.in.orig	Tue Apr 20 18:13:58 1999
++++ agent/Makefile.in	Tue Apr 20 18:14:11 1999
+@@ -4,7 +4,7 @@
+ 
+ TARG=	 snmpd
+ USELIBS= ../snmplib/libsnmp.$(SHLIB_EXTENSION)$(SHLIB_VERSION)
+-LIBS=	 -L../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@
++LIBS=	 -L../snmplib $(CC_RUNTIME_ARG) -lsnmp @LIBS@ @LIBWRAP@
+ 
+ CPPFLAGS=@CPPFLAGS@ -I.. -I$(srcdir)/.. -I$(srcdir)/../snmplib \
+ 	-I$(srcdir) -I. -I$(srcdir)/mibgroup -Imibgroup