untangle net-snmp to stop using openbsd{4,5}.h etc.

net/net-snmp/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.88 2016/03/16 21:19:38 naddy Exp $
+# $OpenBSD: Makefile,v 1.89 2016/05/12 22:00:14 sthen Exp $
 
 COMMENT-main=	extendable SNMP implementation
 COMMENT-tkmib=	graphical SNMP MIB browser
 
 V=		5.7.3
-REVISION-main=	6
+REVISION-main=	7
 
 DISTNAME=	net-snmp-$V
 MULTI_PACKAGES=	-main -tkmib
@@ -63,6 +63,7 @@ pre-configure:
 	    ${WRKSRC}/include/net-snmp/net-snmp-config.h.in > /dev/null; then \
 	    echo 'DEFAULT_MIBS in the port Makefile is out of sync'; exit 1; fi
 	@perl -pi -e 's,(snmpd\(8\)|snmpd\.conf\(5\)),netsnmp-\1,' ${WRKSRC}/man/*
+	rm ${WRKSRC}/include/net-snmp/system/openbsd[0-9].h
 
 post-install:
 	@perl -pi -e 's,^(#define[ ]PACKAGE_.*)$$,/* $$1 */,' \

net/net-snmp/patches/patch-Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.3 2016/05/12 22:00:14 sthen Exp $
+--- Makefile.in.orig	Thu May 12 22:55:09 2016
++++ Makefile.in	Thu May 12 22:55:14 2016
+@@ -24,7 +24,7 @@ INCLUDESUBDIRHEADERS= aix.h bsd.h bsdi3.h bsdi4.h bsdi
+ 	freebsd12.h freebsd.h \
+         generic.h \
+ 	hpux.h irix.h linux.h mingw32.h mips.h netbsd.h osf5.h \
+-	openbsd.h openbsd5.h openbsd4.h \
++	openbsd.h \
+ 	solaris2.3.h solaris2.4.h solaris2.5.h solaris2.6.h \
+ 	solaris.h sunos.h svr5.h sysv.h ultrix4.h
+ INCLUDESUBDIR2=machine

net/net-snmp/patches/patch-agent_mibgroup_mibII_icmp_h

@@ -0,0 +1,13 @@
+$OpenBSD: patch-agent_mibgroup_mibII_icmp_h,v 1.1 2016/05/12 22:00:14 sthen Exp $
+--- agent/mibgroup/mibII/icmp.h.orig	Thu May 12 22:22:06 2016
++++ agent/mibgroup/mibII/icmp.h	Thu May 12 22:22:13 2016
+@@ -16,8 +16,7 @@ config_arch_require(freebsd9,  mibII/kernel_sysctl)
+ config_arch_require(freebsd10, mibII/kernel_sysctl)
+ config_arch_require(netbsd,    mibII/kernel_netbsd)
+ config_arch_require(netbsdelf, mibII/kernel_netbsd)
+-config_arch_require(openbsd4,  mibII/kernel_sysctl)
+-config_arch_require(openbsd5,  mibII/kernel_sysctl)
++config_arch_require(openbsd,   mibII/kernel_sysctl)
+ config_arch_require(dragonfly2, mibII/kernel_sysctl)
+ config_arch_require(dragonfly3, mibII/kernel_sysctl)
+ config_arch_require(darwin10,  mibII/kernel_sysctl)

net/net-snmp/patches/patch-configure_d_config_os_progs

@@ -0,0 +1,16 @@
+$OpenBSD: patch-configure_d_config_os_progs,v 1.3 2016/05/12 22:00:14 sthen Exp $
+
+target_os contains the first number of the OS version number,
+which is a poor thing to use on OpenBSD.
+
+--- configure.d/config_os_progs.orig	Thu May 12 22:19:21 2016
++++ configure.d/config_os_progs	Thu May 12 22:19:30 2016
+@@ -184,7 +184,7 @@ AC_SUBST(NON_GNU_VPATH)
+ #
+ AC_CANONICAL_TARGET
+ changequote(, )
+-PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'`
++PARTIALTARGETOS=`echo $target_os | sed -e 's/[-._].*//' -e 's/openbsd[0-9]/openbsd/'`
+ changequote([, ])
+ AC_MSG_CACHE_ADD(Building for:               $PARTIALTARGETOS)
+ 

net/net-snmp/patches/patch-include_net-snmp_system_openbsd_h

@@ -0,0 +1,17 @@
+$OpenBSD: patch-include_net-snmp_system_openbsd_h,v 1.8 2016/05/12 22:00:14 sthen Exp $
+
+quick hack to define the old openbsd{3,4,5} from before stripping
+the version number part when defining the OS macro (see config_os_progs)
+
+--- include/net-snmp/system/openbsd.h.orig	Thu May 12 22:17:49 2016
++++ include/net-snmp/system/openbsd.h	Thu May 12 22:18:06 2016
+@@ -2,6 +2,9 @@
+ 
+ #define netbsd1 netbsd1         /* we're really close to this */
+ #define openbsd openbsd
++#define openbsd3 openbsd3
++#define openbsd4 openbsd4
++#define openbsd5 openbsd5
+ #define UVM
+ 
+ #undef MBPOOL_SYMBOL

net/net-snmp/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.20 2015/11/05 23:43:46 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.21 2016/05/12 22:00:14 sthen Exp $
 @newgroup _netsnmp:760
 @newuser _netsnmp:760:_netsnmp:daemon:Net-SNMP user:/nonexistent:/sbin/nologin
 @conflict p5-SNMP-*
@@ -204,8 +204,6 @@ include/net-snmp/system/mingw32.h
 include/net-snmp/system/mips.h
 include/net-snmp/system/netbsd.h
 include/net-snmp/system/openbsd.h
-include/net-snmp/system/openbsd4.h
-include/net-snmp/system/openbsd5.h
 include/net-snmp/system/osf5.h
 include/net-snmp/system/solaris.h
 include/net-snmp/system/solaris2.3.h