diff options
| author | tron <tron@pkgsrc.org> | 2008-06-06 16:18:03 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2008-06-06 16:18:03 +0000 |
| commit | ca02394a1740dc2e56be5024ed00b426ab4ec0b0 (patch) | |
| tree | 61202c5f9ec96107eb85a4a8d5faa19d08e78c61 /net | |
| parent | c3c673e66e304db44fb4908cc84df129b0c16de3 (diff) | |
| download | pkgsrc-ca02394a1740dc2e56be5024ed00b426ab4ec0b0.tar.gz | |
Combine the to patches for "agent/mibgroup/mibII/ip.c" to make this
actually build.
Diffstat (limited to 'net')
| -rw-r--r-- | net/net-snmp/distinfo | 5 | ||||
| -rw-r--r-- | net/net-snmp/patches/patch-ai | 13 | ||||
| -rw-r--r-- | net/net-snmp/patches/patch-dk | 16 |
3 files changed, 11 insertions, 23 deletions
diff --git a/net/net-snmp/distinfo b/net/net-snmp/distinfo index 935db46cbec..c531f1d8667 100644 --- a/net/net-snmp/distinfo +++ b/net/net-snmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.44 2008/06/05 19:09:41 christos Exp $ +$NetBSD: distinfo,v 1.45 2008/06/06 16:18:03 tron Exp $ SHA1 (net-snmp-5.4.1.tar.gz) = ac5ba033c10d53d3057415121f8c4936c643c208 RMD160 (net-snmp-5.4.1.tar.gz) = 3723488dab8d164702a7d55c9c72eeaec07dd50c @@ -11,7 +11,7 @@ SHA1 (patch-ae) = 721e62bb42b6d3787f36316cf2628cd71ae6a6ce SHA1 (patch-af) = 88d0433a6a233dc52fec10e29183d820c50bd524 SHA1 (patch-ag) = 7021f7238c37635c9c32ceca681fd42aa125437f SHA1 (patch-ah) = 9ad04b5c0046a82c4e601e4f3abb2dd491846489 -SHA1 (patch-ai) = 92384b3ac6d735abe81b9aea990251dd5fdbc21b +SHA1 (patch-ai) = c57baca06856187115db39fd50668203dad0a94c SHA1 (patch-aj) = 30c28c4801cea33d54e68bbde603e7d531dfb2f8 SHA1 (patch-ak) = cccad21d4f56e79799a433ef7bf0e8ff4e917afb SHA1 (patch-al) = 2609e273d557e1ce06c1295d86965fe26ac7ff08 @@ -25,7 +25,6 @@ SHA1 (patch-de) = 63fd3863d287f123f26e657cff5d87c00b21779c SHA1 (patch-dg) = 6e6e396add0613dd76e3b8618008a7ebf8103c7c SHA1 (patch-dh) = c9a776d6574df008adae52a2f08930e0662f70b3 SHA1 (patch-di) = e0e1039c1adbf10ae56c50998ff74b39193e7348 -SHA1 (patch-dk) = 1025ce87163a45175cc4733b95af7db5fa3da4ff SHA1 (patch-dl) = 746d937ff861294f5b858bee8cc2a99c976e1907 SHA1 (patch-dm) = 05c182f5bc1751ea0a0bcc7e21f24684b3c4933a SHA1 (patch-dn) = 16c68c667c129c4fcccdbff704d7d25481691710 diff --git a/net/net-snmp/patches/patch-ai b/net/net-snmp/patches/patch-ai index fd09a9c04c6..665077a5a41 100644 --- a/net/net-snmp/patches/patch-ai +++ b/net/net-snmp/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.4 2008/06/05 19:09:41 christos Exp $ +$NetBSD: patch-ai,v 1.5 2008/06/06 16:18:04 tron Exp $ ---- agent/mibgroup/mibII/ip.c.orig 2008-06-05 13:45:21.000000000 -0400 -+++ agent/mibgroup/mibII/ip.c 2008-06-04 19:36:30.000000000 -0400 -@@ -217,6 +217,13 @@ +--- agent/mibgroup/mibII/ip.c.orig 2008-06-06 15:51:31.000000000 +0100 ++++ agent/mibgroup/mibII/ip.c 2008-06-06 15:55:38.000000000 +0100 +@@ -212,6 +212,18 @@ #define USES_TRADITIONAL_IPSTAT #endif @@ -13,6 +13,11 @@ $NetBSD: patch-ai,v 1.4 2008/06/05 19:09:41 christos Exp $ +#define IP_STAT_STRUCTURE struct ipstat +#endif + ++#ifdef dragonfly ++#define IP_STAT_STRUCTURE struct ip_stats ++#define USES_TRADITIONAL_IPSTAT ++#endif ++ #if !defined(IP_STAT_STRUCTURE) #define IP_STAT_STRUCTURE struct ipstat #define USES_TRADITIONAL_IPSTAT diff --git a/net/net-snmp/patches/patch-dk b/net/net-snmp/patches/patch-dk deleted file mode 100644 index 2fe796f9672..00000000000 --- a/net/net-snmp/patches/patch-dk +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dk,v 1.2 2007/02/05 12:06:16 adam Exp $ - ---- agent/mibgroup/mibII/ip.c.orig 2006-09-15 02:48:40.000000000 +0200 -+++ agent/mibgroup/mibII/ip.c -@@ -212,6 +212,11 @@ long ipTTL, oldipTTL; - #define USES_TRADITIONAL_IPSTAT - #endif - -+#ifdef dragonfly -+#define IP_STAT_STRUCTURE struct ip_stats -+#define USES_TRADITIONAL_IPSTAT -+#endif -+ - #if !defined(IP_STAT_STRUCTURE) - #define IP_STAT_STRUCTURE struct ipstat - #define USES_TRADITIONAL_IPSTAT |