Index: head/net/intel-em-kmod/Makefile =================================================================== --- head/net/intel-em-kmod/Makefile +++ head/net/intel-em-kmod/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= em -PORTVERSION= 7.6.2 +PORTVERSION= 7.7.4 MASTER_SITE_SUBDIR= 17509/eng MAINTAINER= franco@opnsense.org @@ -10,6 +10,8 @@ BROKEN_armv6= fails to compile: implicit declaration of function 'cp15_pmccntr_get' is invalid in C99 BROKEN_powerpc64= fails to compile: pcpu.h: size of array '__assert_0' is negative + +MAX_NETMAP_OSVERSION= 1199999 # Doesn't build w/NETMAP on 12 MASTERDIR= ${.CURDIR}/../intel-ixl-kmod PKGDIR= ${.CURDIR} Index: head/net/intel-em-kmod/distinfo =================================================================== --- head/net/intel-em-kmod/distinfo +++ head/net/intel-em-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475184682 -SHA256 (em-7.6.2.tar.gz) = 65a7041d629c5a4ef4b79486d2a0ddaeeebc730f0ef075ff0f7e78d8490756cb -SIZE (em-7.6.2.tar.gz) = 266512 +TIMESTAMP = 1538768154 +SHA256 (em-7.7.4.tar.gz) = cebbe03ca00e8fb961a9199c8aaafe5869b3b4d93ec721f53867e61594c76514 +SIZE (em-7.7.4.tar.gz) = 266142 Index: head/net/intel-ixl-kmod/Makefile =================================================================== --- head/net/intel-ixl-kmod/Makefile +++ head/net/intel-ixl-kmod/Makefile @@ -20,7 +20,6 @@ # Present version of net/intel-em-kmod has issues building with netmap(4) # support on 11+. Narrowing netmap(4) support to this port only -.if ${PORTNAME} == ixl OPTIONS_SINGLE= NETMAP OPTIONS_SINGLE_NETMAP= NETMAP_AUTO NETMAP_ON NETMAP_OFF OPTIONS_DEFAULT= NETMAP_AUTO @@ -31,7 +30,6 @@ NETMAP_ON_CFLAGS= -DDEV_NETMAP NETMAP_OFF_CFLAGS= -UDEV_NETMAP -.endif WRKSRC_SUBDIR= src @@ -46,6 +44,8 @@ PLIST_FILES+= man/man4/${link}.4.gz .endfor +MAX_NETMAP_OSVERSION?= 9900000 # Maximum OSVERSION for which NETMAP support works + .include # Fixup for slave ports that use this as a master port. sbruno @@ -54,7 +54,7 @@ ONLY_FOR_ARCHS_REASON= Not supported on other architectures, amd64 only. .endif -.if ${PORT_OPTIONS:MNETMAP_AUTO} && ${OSVERSION} >= 1100000 +.if ${PORT_OPTIONS:MNETMAP_AUTO} && ${OSVERSION} >= 1100000 && ${OSVERSION} <= ${MAX_NETMAP_OSVERSION} CFLAGS+= -DDEV_NETMAP .endif