The if.h changes broke libdnet and nmap, diff below lets them build
but otherwise tested. Anyone have time to do that?
Index: libdnet/Makefile
===================================================================
RCS file: /cvs/ports/net/libdnet/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- libdnet/Makefile 15 Nov 2011 23:11:55 -0000 1.31
+++ libdnet/Makefile 14 Nov 2012 11:21:38 -0000
@@ -7,8 +7,8 @@ MODPY_EGG_VERSION=1.12
DISTNAME= libdnet-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-python= py-${DISTNAME}
-REVISION-main= 4
-REVISION-python= 4
+REVISION-main= 5
+REVISION-python= 5
SHARED_LIBS= dnet 1.0
Index: libdnet/patches/patch-src_intf_c
===================================================================
RCS file: libdnet/patches/patch-src_intf_c
diff -N libdnet/patches/patch-src_intf_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ libdnet/patches/patch-src_intf_c 14 Nov 2012 11:21:38 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- src/intf.c.orig Wed Nov 14 04:15:30 2012
++++ src/intf.c Wed Nov 14 04:16:33 2012
+@@ -66,7 +66,13 @@
+ /* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
+ struct dnet_ifaliasreq {
+ char ifra_name[IFNAMSIZ];
+- struct sockaddr ifra_addr;
++ union {
++ struct sockaddr ifrau_addr;
++ int ifrau_align;
++ } ifra_ifrau;
++#ifndef ifra_addr
++#define ifra_addr ifra_ifrau.ifrau_addr
++#endif
+ struct sockaddr ifra_brdaddr;
+ struct sockaddr ifra_mask;
+ int ifra_cookie; /* XXX - IRIX!@#$ */
Index: nmap/Makefile
===================================================================
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- nmap/Makefile 19 Sep 2012 08:15:09 -0000 1.103
+++ nmap/Makefile 14 Nov 2012 11:21:38 -0000
@@ -8,8 +8,8 @@ DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
-REVISION-main= 0
-REVISION-zenmap=0
+REVISION-main= 1
+REVISION-zenmap=1
CATEGORIES= net security
MASTER_SITES= http://nmap.org/dist/
Index: nmap/patches/patch-libdnet-stripped_src_intf_c
===================================================================
RCS file: nmap/patches/patch-libdnet-stripped_src_intf_c
diff -N nmap/patches/patch-libdnet-stripped_src_intf_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nmap/patches/patch-libdnet-stripped_src_intf_c 14 Nov 2012 11:21:38
-0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+--- libdnet-stripped/src/intf.c.orig Wed Nov 14 04:18:29 2012
++++ libdnet-stripped/src/intf.c Wed Nov 14 04:19:10 2012
+@@ -76,7 +76,13 @@
+ /* XXX - superset of ifreq, for portable SIOC{A,D}IFADDR */
+ struct dnet_ifaliasreq {
+ char ifra_name[IFNAMSIZ];
+- struct sockaddr ifra_addr;
++ union {
++ struct sockaddr ifrau_addr;
++ int ifrau_align;
++ } ifra_ifrau;
++#ifndef ifra_addr
++#define ifra_addr ifra_ifrau.ifrau_addr
++#endif
+ struct sockaddr ifra_brdaddr;
+ struct sockaddr ifra_mask;
+ int ifra_cookie; /* XXX - IRIX!@#$ */
