12 files changed, 92 insertions, 22 deletions

diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index 1f1e4bae0c93..226f4b0a7026 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.4.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
diff --git a/net-mgmt/net-snmp-devel/files/patch-sctpAssocTable.c b/net-mgmt/net-snmp-devel/files/patch-sctpAssocTable.c
new file mode 100644
index 000000000000..cbcfaffba6c0
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-sctpAssocTable.c
@@ -0,0 +1,10 @@
+--- agent/mibgroup/sctp-mib/sctpAssocTable.c.orig	2009-03-07 23:12:27.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpAssocTable.c	2009-03-07 23:12:37.000000000 +0900
+@@ -6,7 +6,6 @@
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+-#include <net-snmp/agent/net-snmp-agent-includes.h>
+ #include <net-snmp/agent/table_container.h>
+ #include "sctpAssocTable.h"
+ 
diff --git a/net-mgmt/net-snmp-devel/files/patch-sctpLookupLocalPortTable.c b/net-mgmt/net-snmp-devel/files/patch-sctpLookupLocalPortTable.c
new file mode 100644
index 000000000000..9e192849fc54
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-sctpLookupLocalPortTable.c
@@ -0,0 +1,10 @@
+--- agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.c.orig	2009-03-07 23:14:02.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.c	2009-03-07 23:14:09.000000000 +0900
+@@ -6,7 +6,6 @@
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+-#include <net-snmp/agent/net-snmp-agent-includes.h>
+ #include <net-snmp/agent/table_container.h>
+ #include "sctpLookupLocalPortTable.h"
+ 
diff --git a/net-mgmt/net-snmp-devel/files/patch-sctpTables_common.c b/net-mgmt/net-snmp-devel/files/patch-sctpTables_common.c
new file mode 100644
index 000000000000..9047ca289e2a
--- /dev/null
+++ b/net-mgmt/net-snmp-devel/files/patch-sctpTables_common.c
@@ -0,0 +1,9 @@
+--- agent/mibgroup/sctp-mib/sctpTables_common.c.orig	2009-03-07 23:32:28.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpTables_common.c	2009-03-07 23:33:09.000000000 +0900
+@@ -1,3 +1,6 @@
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h>
++#include <net-snmp/agent/net-snmp-agent-includes.h>
+ #include "sctpTables_common.h"
+ #include "sctpAssocTable.h"
+ #include "sctpAssocRemAddrTable.h"
diff --git a/net-mgmt/net-snmp-devel/files/patch-sctpTables_common.h b/net-mgmt/net-snmp-devel/files/patch-sctpTables_common.h
index 35812d0c7486..b9152bea0544 100644
--- a/net-mgmt/net-snmp-devel/files/patch-sctpTables_common.h
+++ b/net-mgmt/net-snmp-devel/files/patch-sctpTables_common.h
@@ -1,13 +1,15 @@
---- agent/mibgroup/sctp-mib/sctpTables_common.h.orig	2009-01-23 23:42:34.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpTables_common.h	2009-01-23 23:43:11.000000000 +0900
-@@ -5,6 +5,10 @@
- #include <net-snmp/net-snmp-includes.h>
- #include <net-snmp/agent/net-snmp-agent-includes.h>
+--- agent/mibgroup/sctp-mib/sctpTables_common.h.orig	2008-08-18 06:29:11.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpTables_common.h	2009-02-28 14:06:27.000000000 +0900
+@@ -1,9 +1,9 @@
+ #ifndef SCTP_TABLES_COMMON_H
+ #define SCTP_TABLES_COMMON_H
  
+-#include <net-snmp/net-snmp-config.h>
+-#include <net-snmp/net-snmp-includes.h>
+-#include <net-snmp/agent/net-snmp-agent-includes.h>
 +#if defined(freebsd7)
 +#define netsnmp_table_registration_info_free SNMP_FREE
 +#endif
-+
+ 
  #define SCTP_IPADDRESS_SIZE 16
  #define SCTP_HOSTNAME_SIZE 255
- 
diff --git a/net-mgmt/net-snmp-devel/files/patch-sctpTables_freebsd.c b/net-mgmt/net-snmp-devel/files/patch-sctpTables_freebsd.c
index 5285c9be7d52..22d898f6b7d3 100644
--- a/net-mgmt/net-snmp-devel/files/patch-sctpTables_freebsd.c
+++ b/net-mgmt/net-snmp-devel/files/patch-sctpTables_freebsd.c
@@ -1,6 +1,10 @@
---- agent/mibgroup/sctp-mib/sctpTables_freebsd.c.orig	1970-01-01 09:00:00.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpTables_freebsd.c	2009-01-23 23:52:37.000000000 +0900
-@@ -0,0 +1,245 @@
+--- agent/mibgroup/sctp-mib/sctpTables_freebsd.c.orig	2009-03-07 23:31:54.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpTables_freebsd.c	2009-03-07 23:55:04.000000000 +0900
+@@ -0,0 +1,249 @@
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h>
++#include <net-snmp/agent/net-snmp-agent-includes.h>
++
 +#include "sctpAssocTable.h"
 +#include "sctpAssocLocalAddrTable.h"
 +#include "sctpAssocRemAddrTable.h"
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 1f1e4bae0c93..226f4b0a7026 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snmp
 PORTVERSION=	5.4.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	net-snmp
diff --git a/net-mgmt/net-snmp/files/patch-sctpAssocTable.c b/net-mgmt/net-snmp/files/patch-sctpAssocTable.c
new file mode 100644
index 000000000000..cbcfaffba6c0
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-sctpAssocTable.c
@@ -0,0 +1,10 @@
+--- agent/mibgroup/sctp-mib/sctpAssocTable.c.orig	2009-03-07 23:12:27.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpAssocTable.c	2009-03-07 23:12:37.000000000 +0900
+@@ -6,7 +6,6 @@
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+-#include <net-snmp/agent/net-snmp-agent-includes.h>
+ #include <net-snmp/agent/table_container.h>
+ #include "sctpAssocTable.h"
+ 
diff --git a/net-mgmt/net-snmp/files/patch-sctpLookupLocalPortTable.c b/net-mgmt/net-snmp/files/patch-sctpLookupLocalPortTable.c
new file mode 100644
index 000000000000..9e192849fc54
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-sctpLookupLocalPortTable.c
@@ -0,0 +1,10 @@
+--- agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.c.orig	2009-03-07 23:14:02.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpLookupLocalPortTable.c	2009-03-07 23:14:09.000000000 +0900
+@@ -6,7 +6,6 @@
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/net-snmp-agent-includes.h>
+-#include <net-snmp/agent/net-snmp-agent-includes.h>
+ #include <net-snmp/agent/table_container.h>
+ #include "sctpLookupLocalPortTable.h"
+ 
diff --git a/net-mgmt/net-snmp/files/patch-sctpTables_common.c b/net-mgmt/net-snmp/files/patch-sctpTables_common.c
new file mode 100644
index 000000000000..9047ca289e2a
--- /dev/null
+++ b/net-mgmt/net-snmp/files/patch-sctpTables_common.c
@@ -0,0 +1,9 @@
+--- agent/mibgroup/sctp-mib/sctpTables_common.c.orig	2009-03-07 23:32:28.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpTables_common.c	2009-03-07 23:33:09.000000000 +0900
+@@ -1,3 +1,6 @@
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h>
++#include <net-snmp/agent/net-snmp-agent-includes.h>
+ #include "sctpTables_common.h"
+ #include "sctpAssocTable.h"
+ #include "sctpAssocRemAddrTable.h"
diff --git a/net-mgmt/net-snmp/files/patch-sctpTables_common.h b/net-mgmt/net-snmp/files/patch-sctpTables_common.h
index 35812d0c7486..b9152bea0544 100644
--- a/net-mgmt/net-snmp/files/patch-sctpTables_common.h
+++ b/net-mgmt/net-snmp/files/patch-sctpTables_common.h
@@ -1,13 +1,15 @@
---- agent/mibgroup/sctp-mib/sctpTables_common.h.orig	2009-01-23 23:42:34.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpTables_common.h	2009-01-23 23:43:11.000000000 +0900
-@@ -5,6 +5,10 @@
- #include <net-snmp/net-snmp-includes.h>
- #include <net-snmp/agent/net-snmp-agent-includes.h>
+--- agent/mibgroup/sctp-mib/sctpTables_common.h.orig	2008-08-18 06:29:11.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpTables_common.h	2009-02-28 14:06:27.000000000 +0900
+@@ -1,9 +1,9 @@
+ #ifndef SCTP_TABLES_COMMON_H
+ #define SCTP_TABLES_COMMON_H
  
+-#include <net-snmp/net-snmp-config.h>
+-#include <net-snmp/net-snmp-includes.h>
+-#include <net-snmp/agent/net-snmp-agent-includes.h>
 +#if defined(freebsd7)
 +#define netsnmp_table_registration_info_free SNMP_FREE
 +#endif
-+
+ 
  #define SCTP_IPADDRESS_SIZE 16
  #define SCTP_HOSTNAME_SIZE 255
- 
diff --git a/net-mgmt/net-snmp/files/patch-sctpTables_freebsd.c b/net-mgmt/net-snmp/files/patch-sctpTables_freebsd.c
index 5285c9be7d52..22d898f6b7d3 100644
--- a/net-mgmt/net-snmp/files/patch-sctpTables_freebsd.c
+++ b/net-mgmt/net-snmp/files/patch-sctpTables_freebsd.c
@@ -1,6 +1,10 @@
---- agent/mibgroup/sctp-mib/sctpTables_freebsd.c.orig	1970-01-01 09:00:00.000000000 +0900
-+++ agent/mibgroup/sctp-mib/sctpTables_freebsd.c	2009-01-23 23:52:37.000000000 +0900
-@@ -0,0 +1,245 @@
+--- agent/mibgroup/sctp-mib/sctpTables_freebsd.c.orig	2009-03-07 23:31:54.000000000 +0900
++++ agent/mibgroup/sctp-mib/sctpTables_freebsd.c	2009-03-07 23:55:04.000000000 +0900
+@@ -0,0 +1,249 @@
++#include <net-snmp/net-snmp-config.h>
++#include <net-snmp/net-snmp-includes.h>
++#include <net-snmp/agent/net-snmp-agent-includes.h>
++
 +#include "sctpAssocTable.h"
 +#include "sctpAssocLocalAddrTable.h"
 +#include "sctpAssocRemAddrTable.h"