Hi,
I would like to stop including netinet6/in6_var.h directly from
netinet/in_var.h. This reduces inter header dependencies and makes
ipv6 development easier.
Unfortunatly these 6 ports depend on the implcit inclusion of
netinet6/in6_var.h.
devel/jdk/1.6
devel/jdk/1.7
devel/libgtop2
net/ifmcstat
net/xorp
www/chromium
Patch is simple, just add #include <netinet6/in6_var.h> to make it
compile again.
ok?
bluhm
Index: devel/jdk/1.6/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/devel/jdk/1.6/Makefile,v
retrieving revision 1.48
diff -u -p -u -p -r1.48 Makefile
--- devel/jdk/1.6/Makefile 22 Aug 2013 16:21:17 -0000 1.48
+++ devel/jdk/1.6/Makefile 6 Sep 2013 20:03:18 -0000
@@ -10,9 +10,9 @@ UPDATE= 32
BUILD= b27
PKGNAME= jdk-${VERSION}
PKGNAME-main= jdk-${VERSION}
-REVISION-main= 5
+REVISION-main= 6
PKGNAME-jre= jre-${VERSION}
-REVISION-jre= 5
+REVISION-jre= 6
# see jaxp/jaxp.properties & jaxws/jaxws.properties
# in ${WRKDIR} for names and download locations of extra distfiles
Index:
devel/jdk/1.6/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
===================================================================
RCS file:
devel/jdk/1.6/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
diff -N
devel/jdk/1.6/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
devel/jdk/1.6/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
5 Sep 2013 17:41:11 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig Thu Sep 5
02:33:44 2013
++++ jdk/src/solaris/native/java/net/NetworkInterface.c Thu Sep 5 19:39:48 2013
+@@ -55,6 +55,7 @@
+ #include <net/if_var.h>
+ #elif defined(__OpenBSD__)
+ #include <netinet/if_ether.h>
++#include <netinet6/in6_var.h>
+ #endif
+ #include <net/if_dl.h>
+ #include <netinet/in_var.h>
Index: devel/jdk/1.7/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/devel/jdk/1.7/Makefile,v
retrieving revision 1.64
diff -u -p -u -p -r1.64 Makefile
--- devel/jdk/1.7/Makefile 1 Jun 2013 21:12:15 -0000 1.64
+++ devel/jdk/1.7/Makefile 7 Sep 2013 16:54:35 -0000
@@ -11,6 +11,7 @@ B= b11
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
PKGNAME-jre= jre-${V}
+REVISION= 1
EPOCH= 0
JDK_SRC= openjdk-7u6-fcs-src-b24-28_aug_2012.zip
Index:
devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
===================================================================
RCS file:
devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
diff -N
devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++
devel/jdk/1.7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface_c
7 Sep 2013 16:54:12 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- jdk/src/solaris/native/java/net/NetworkInterface.c.orig Sat Sep 7
17:12:52 2013
++++ jdk/src/solaris/native/java/net/NetworkInterface.c Sat Sep 7 18:53:36 2013
+@@ -65,6 +65,7 @@
+ #include <net/if_var.h>
+ #elif defined(__OpenBSD__)
+ #include <netinet/if_ether.h>
++#include <netinet6/in6_var.h>
+ #elif defined(__NetBSD__)
+ #include <net/if_ether.h>
+ #endif
Index: devel/libgtop2/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/devel/libgtop2/Makefile,v
retrieving revision 1.104
diff -u -p -u -p -r1.104 Makefile
--- devel/libgtop2/Makefile 28 Sep 2013 08:50:35 -0000 1.104
+++ devel/libgtop2/Makefile 2 Oct 2013 17:10:25 -0000
@@ -7,7 +7,7 @@ COMMENT= portable library for obtaining
GNOME_VERSION= 2.28.5
GNOME_PROJECT= libgtop
PKGNAME= libgtop2-${VERSION}
-REVISION= 0
+REVISION= 1
SHARED_LIBS= gtop-2.0 9.0 # .9.0
Index: devel/libgtop2/patches/patch-sysdeps_openbsd_netload_c
===================================================================
RCS file: devel/libgtop2/patches/patch-sysdeps_openbsd_netload_c
diff -N devel/libgtop2/patches/patch-sysdeps_openbsd_netload_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/libgtop2/patches/patch-sysdeps_openbsd_netload_c 6 Sep 2013
17:11:40 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- sysdeps/openbsd/netload.c.orig Sat Jul 27 14:40:23 2013
++++ sysdeps/openbsd/netload.c Fri Sep 6 19:11:28 2013
+@@ -42,6 +42,7 @@
+
+ #include <netinet/in.h>
+ #include <netinet/in_var.h>
++#include <netinet6/in6_var.h>
+
+ static const unsigned long _glibtop_sysdeps_netload =
+ (1L << GLIBTOP_NETLOAD_IF_FLAGS) +
Index: net/ifmcstat/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/net/ifmcstat/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- net/ifmcstat/Makefile 11 Mar 2013 11:35:47 -0000 1.6
+++ net/ifmcstat/Makefile 7 Sep 2013 14:51:19 -0000
@@ -3,7 +3,7 @@
COMMENT = show Ethernet Multicast memberships
DISTNAME = ifmcstat-1.0
-REVISION = 0
+REVISION = 1
CATEGORIES = net
HOMEPAGE =
http://opengrok.netbsd.org/source/xref/usr.sbin/ifmcstat/
Index: net/ifmcstat/patches/patch-ifmcstat_c
===================================================================
RCS file: net/ifmcstat/patches/patch-ifmcstat_c
diff -N net/ifmcstat/patches/patch-ifmcstat_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/ifmcstat/patches/patch-ifmcstat_c 7 Sep 2013 14:50:45 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- ifmcstat.c.orig Tue Jul 21 09:47:07 2009
++++ ifmcstat.c Sat Sep 7 16:50:32 2013
+@@ -58,6 +58,7 @@
+ # include <net/if_ether.h>
+ #endif
+ #include <netinet/in_var.h>
++#include <netinet6/in6_var.h>
+ #include <arpa/inet.h>
+
+ #include <netdb.h>
Index: net/xorp/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/net/xorp/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- net/xorp/Makefile 15 Aug 2013 09:21:10 -0000 1.28
+++ net/xorp/Makefile 6 Sep 2013 18:07:55 -0000
@@ -5,7 +5,7 @@ COMMENT-main= eXtensible Open Router Pla
VERSION= 1.6
DISTNAME= xorp-${VERSION}
PKGNAME-main= ${DISTNAME}
-REVISION-main= 2
+REVISION-main= 3
CATEGORIES= net
HOMEPAGE= http://www.xorp.org/
Index: net/xorp/patches/patch-configure
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/net/xorp/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-configure
--- net/xorp/patches/patch-configure 18 Aug 2011 19:22:31 -0000 1.1
+++ net/xorp/patches/patch-configure 6 Sep 2013 17:47:42 -0000
@@ -1,7 +1,17 @@
$OpenBSD: patch-configure,v 1.1 2011/08/18 19:22:31 sthen Exp $
---- configure.orig Wed Jan 7 13:47:14 2009
-+++ configure Tue Aug 16 21:31:41 2011
-@@ -43568,8 +43568,8 @@ echo "${ECHO_T}no" >&6; }
+--- configure.orig Wed Jan 7 19:47:14 2009
++++ configure Fri Sep 6 19:47:22 2013
+@@ -35100,6 +35100,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef HAVE_NETINET_IN_VAR_H
+ #include <netinet/in_var.h>
+ #endif
++#ifdef HAVE_NETINET6_IN6_VAR_H
++#include <netinet6/in6_var.h>
++#endif
+ // XXX: a hack needed if <netinet6/nd6.h> is not C++ friendly
+ // #define prf_ra in6_prflags::prf_ra
+ #include <netinet6/nd6.h>
+@@ -43568,8 +43571,8 @@ echo "${ECHO_T}no" >&6; }
CPARANOIDFLAGS="-Werror -W -Wall -Wwrite-strings -Wbad-function-cast
-Wcast-qual -Wpointer-arith -Wcast-align -Wnested-externs"
CXXPARANOIDFLAGS="-Werror -W -Wall -Wwrite-strings -Wcast-qual
-Wpointer-arith -Wcast-align -Wstrict-prototypes -Woverloaded-virtual
-Wtraditional"
else
Index: www/chromium/Makefile
===================================================================
RCS file: /data/mirror/openbsd/cvs/ports/www/chromium/Makefile,v
retrieving revision 1.154
diff -u -p -u -p -r1.154 Makefile
--- www/chromium/Makefile 11 Oct 2013 14:53:57 -0000 1.154
+++ www/chromium/Makefile 14 Oct 2013 09:43:29 -0000
@@ -7,7 +7,7 @@ COMMENT= Chromium browser
V= 29.0.1547.76
DISTNAME= chromium-${V}
-REVISION= 2
+REVISION= 3
CATEGORIES= www
Index: www/chromium/patches/patch-net_dns_address_sorter_posix_cc
===================================================================
RCS file: www/chromium/patches/patch-net_dns_address_sorter_posix_cc
diff -N www/chromium/patches/patch-net_dns_address_sorter_posix_cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ www/chromium/patches/patch-net_dns_address_sorter_posix_cc 6 Sep 2013
21:49:53 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- net/dns/address_sorter_posix.cc.orig Thu Jul 25 03:31:22 2013
++++ net/dns/address_sorter_posix.cc Fri Sep 6 23:46:26 2013
+@@ -11,6 +11,7 @@
+ #include <ifaddrs.h>
+ #include <net/if.h>
+ #include <netinet/in_var.h>
++#include <netinet6/in6_var.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #endif
