Index: head/net/u6rd/Makefile =================================================================== --- head/net/u6rd/Makefile (revision 463857) +++ head/net/u6rd/Makefile (revision 463858) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= u6rd PORTVERSION= 1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net ipv6 MASTER_SITES= http://ftp.scythe.jp/pub/u6rd/release/ MAINTAINER= ume@FreeBSD.org COMMENT= User-space 6rd (RFC 5569) implementation LICENSE= BSD2CLAUSE GNU_CONFIGURE= yes USE_RC_SUBR= u6rd PLIST_FILES= sbin/u6rd man/man8/u6rd.8.gz OPTIONS_DEFINE= DOCS .include .if ${PORT_OPTIONS:MDOCS} PORTDOCS= NEWS README .endif post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif .include Index: head/net/u6rd/files/patch-main.c =================================================================== --- head/net/u6rd/files/patch-main.c (revision 463857) +++ head/net/u6rd/files/patch-main.c (revision 463858) @@ -1,12 +1,21 @@ --- main.c.orig 2013-06-19 11:23:58 UTC +++ main.c +@@ -25,7 +25,7 @@ + * SUCH DAMAGE. + */ + +-#include ++#include + #include + #include + #include @@ -608,7 +608,8 @@ tun2raw(struct connection *c) ip4 = (struct ipv4_header *)(buf - sizeof(*ip4)); ip4->ver_hlen = 4 << 4 | sizeof(*ip4) >> 2; ip4->tos = ntohl(ip6->ver_class_label) >> 20 & 0xff; -#if defined(__OpenBSD__) || defined(__linux__) +#if defined(__OpenBSD__) || defined(__linux__) || \ + (defined(__FreeBSD__) && __FreeBSD_version >= 1100030) ip4->len = htons(len + sizeof(*ip4)); #else ip4->len = len + sizeof(*ip4);