Remove dragonfly.h, it is included upstream now.

Restore patch-dt (MIB_SYSTEM_LIBS), still needed for DragonFly.
This commit is contained in:
joerg 2007-08-12 13:36:36 +00:00
parent 6cffd558cc
commit fa8a956e56
4 changed files with 16 additions and 27 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.62 2007/08/11 11:05:56 adam Exp $
# $NetBSD: Makefile,v 1.63 2007/08/12 13:36:36 joerg Exp $
DISTNAME= net-snmp-5.4.1
CATEGORIES= net
@ -113,7 +113,6 @@ REPLACE_FILES.bash= local/mib2c-update
INSTALLATION_DIRS+= share/examples/net-snmp
post-extract:
cp ${FILESDIR}/dragonfly.h ${WRKSRC}/include/net-snmp/system
.if ${OPSYS} == "DragonFly"
cp ${FILESDIR}/cpu_dragonfly.c ${WRKSRC}/agent/mibgroup/hardware/cpu/cpu_nlist.c
.endif

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.40 2007/08/11 11:05:56 adam Exp $
$NetBSD: distinfo,v 1.41 2007/08/12 13:36:37 joerg Exp $
SHA1 (net-snmp-5.4.1.tar.gz) = ac5ba033c10d53d3057415121f8c4936c643c208
RMD160 (net-snmp-5.4.1.tar.gz) = 3723488dab8d164702a7d55c9c72eeaec07dd50c
@ -29,6 +29,7 @@ SHA1 (patch-dp) = 3ecdfa78a5c7a86715d3fd3ab8bbd0208a0d685d
SHA1 (patch-dq) = 619d94d9937098b684ee8d0f1a3a92dfdff2155c
SHA1 (patch-dr) = ab75e5cf3448d9c0520b6e7d2c68adfbf3ab639b
SHA1 (patch-ds) = 4d59f016eca12660f94dcba89f94e395323ab7b4
SHA1 (patch-dt) = bd1884af6fb3743e79ab926fcd952068cb9a3642
SHA1 (patch-du) = a07160ee1197d8aefa3ccaf7fb255be48311e8bc
SHA1 (patch-ea) = 9d8d6b167b87d7e4f184b06f1279a55072a7645e
SHA1 (patch-ee) = ec2a41ba9489bf71412169c0f8367eac214e3738

View file

@ -1,24 +0,0 @@
#include "freebsd.h"
/*
* dragonfly is a superset of freebsd4
*/
#define freebsd2 1
#define freebsd3 1
#define freebsd4 1
#undef IFADDR_SYMBOL
#define IFADDR_SYMBOL "in_ifaddrhead"
#undef PROC_SYMBOL
#define PROC_SYMBOL "allproc"
#undef NPROC_SYMBOL
#define NPROC_SYMBOL "nprocs"
#undef TOTAL_MEMORY_SYMBOL
#undef MBSTAT_SYMBOL
#undef INP_NEXT_SYMBOL
#define INP_NEXT_SYMBOL inp_next

View file

@ -0,0 +1,13 @@
$NetBSD: patch-dt,v 1.7 2007/08/12 13:36:38 joerg Exp $
--- agent/Makefile.in.orig 2007-08-12 13:04:23.000000000 +0000
+++ agent/Makefile.in
@@ -147,7 +147,7 @@ libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VE
$(RANLIB) $(AGENTLIB)
libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS)
- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(LDFLAGS) $(LIB_LD_LIBS)
+ $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(HELPERLIB) $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(LDFLAGS) $(LIB_LD_LIBS) ${MIB_SYSTEM_LIBS}
$(RANLIB) $(MIBLIB)
agentlib: $(AGENTLIB)