Index: head/lang/go/Makefile =================================================================== --- head/lang/go/Makefile (revision 395797) +++ head/lang/go/Makefile (revision 395798) @@ -1,64 +1,69 @@ # Created by: Devon H. O'Dell # $FreeBSD$ PORTNAME= go PORTVERSION= 1.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang MASTER_SITES= http://golang.org/dl/ DISTNAME= go${PORTVERSION}.src MAINTAINER= jlaffaye@FreeBSD.org COMMENT= Go programming language LICENSE= BSD3CLAUSE BUILD_DEPENDS= go14>=1.4:${PORTSDIR}/lang/go14 USES= shebangfix SHEBANG_LANG= sh SHEBANG_FILES= ${WRKSRC}/src/*.bash \ ${WRKSRC}/doc/articles/wiki/*.bash \ ${WRKSRC}/test/bench/shootout/timing.sh sh_OLD_CMD= ${SETENV} bash sh_CMD= ${SH} WRKSRC= ${WRKDIR}/go ONLY_FOR_ARCHS= i386 amd64 armv6 .include .if ${ARCH} == "i386" GOARCH=386 .elif ${ARCH} == "amd64" GOARCH=amd64 .elif ${ARCH} == "armv6" GOARCH=arm .else IGNORE= unknown arch ${ARCH} .endif PLIST_SUB+= ARCH=${GOARCH} + +.if (${OSVERSION} >= 1100000) +EXTRA_PATCHES+= ${FILESDIR}/struct-if_data-patch +.endif post-patch: @cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete do-build: cd ${WRKSRC}/src && \ CC=${CC} \ GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go \ GOROOT_BOOTSTRAP=${LOCALBASE}/go14 \ GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \ ${SH} make.bash do-install: @${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX} .for f in go gofmt @${LN} -sf ${PREFIX}/go/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f} .endfor regression-test: build cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${SH} run.bash --no-rebuild --banner .include Index: head/lang/go/files/struct-if_data-patch =================================================================== --- head/lang/go/files/struct-if_data-patch (nonexistent) +++ head/lang/go/files/struct-if_data-patch (revision 395798) @@ -0,0 +1,261 @@ +diff -ur go.orig/src/syscall/types_freebsd.go go/src/syscall/types_freebsd.go +--- src/syscall/types_freebsd.go 2015-08-26 16:13:15.191076000 +0200 ++++ src/syscall/types_freebsd.go 2015-08-26 16:13:44.079240000 +0200 +@@ -106,15 +106,16 @@ + + // This structure is a duplicate of if_data on FreeBSD 8-STABLE. + // See /usr/include/net/if.h. ++#undef ifi_epoch ++#undef ifi_lastchange + struct if_data8 { + u_char ifi_type; + u_char ifi_physical; + u_char ifi_addrlen; + u_char ifi_hdrlen; + u_char ifi_link_state; +- u_char ifi_spare_char1; +- u_char ifi_spare_char2; +- u_char ifi_datalen; ++ u_char ifi_vhid; ++ u_short ifi_datalen; + u_long ifi_mtu; + u_long ifi_metric; + u_long ifi_baudrate; +diff -ur go.orig/src/syscall/ztypes_freebsd_386.go go/src/syscall/ztypes_freebsd_386.go +--- src/syscall/ztypes_freebsd_386.go 2015-08-26 16:13:15.209213000 +0200 ++++ src/syscall/ztypes_freebsd_386.go 2015-08-26 17:14:32.558231000 +0200 +@@ -280,9 +280,9 @@ + } + + const ( +- sizeofIfMsghdr = 0x64 ++ sizeofIfMsghdr = 0xa8 + SizeofIfMsghdr = 0x60 +- sizeofIfData = 0x54 ++ sizeofIfData = 0x98 + SizeofIfData = 0x50 + SizeofIfaMsghdr = 0x14 + SizeofIfmaMsghdr = 0x10 +@@ -314,59 +314,60 @@ + } + + type ifData struct { +- Type uint8 +- Physical uint8 +- Addrlen uint8 +- Hdrlen uint8 +- Link_state uint8 +- Vhid uint8 +- Baudrate_pf uint8 +- Datalen uint8 +- Mtu uint32 +- Metric uint32 +- Baudrate uint32 +- Ipackets uint32 +- Ierrors uint32 +- Opackets uint32 +- Oerrors uint32 +- Collisions uint32 +- Ibytes uint32 +- Obytes uint32 +- Imcasts uint32 +- Omcasts uint32 +- Iqdrops uint32 +- Noproto uint32 +- Hwassist uint64 +- Epoch int32 +- Lastchange Timeval ++ Type uint8 ++ Physical uint8 ++ Addrlen uint8 ++ Hdrlen uint8 ++ Link_state uint8 ++ Vhid uint8 ++ Datalen uint16 ++ Mtu uint32 ++ Metric uint32 ++ Baudrate uint64 ++ Ipackets uint64 ++ Ierrors uint64 ++ Opackets uint64 ++ Oerrors uint64 ++ Collisions uint64 ++ Ibytes uint64 ++ Obytes uint64 ++ Imcasts uint64 ++ Omcasts uint64 ++ Iqdrops uint64 ++ Oqdrops uint64 ++ Noproto uint64 ++ Hwassist uint64 ++ Epoch int32 ++ X__ifi_epoch_pad [4]byte ++ Lastchange Timeval ++ X__ifi_lastchange_pad [8]byte + } + + type IfData struct { +- Type uint8 +- Physical uint8 +- Addrlen uint8 +- Hdrlen uint8 +- Link_state uint8 +- Spare_char1 uint8 +- Spare_char2 uint8 +- Datalen uint8 +- Mtu uint32 +- Metric uint32 +- Baudrate uint32 +- Ipackets uint32 +- Ierrors uint32 +- Opackets uint32 +- Oerrors uint32 +- Collisions uint32 +- Ibytes uint32 +- Obytes uint32 +- Imcasts uint32 +- Omcasts uint32 +- Iqdrops uint32 +- Noproto uint32 +- Hwassist uint32 +- Epoch int32 +- Lastchange Timeval ++ Type uint8 ++ Physical uint8 ++ Addrlen uint8 ++ Hdrlen uint8 ++ Link_state uint8 ++ Vhid uint8 ++ Datalen uint16 ++ Mtu uint32 ++ Metric uint32 ++ Baudrate uint32 ++ Ipackets uint32 ++ Ierrors uint32 ++ Opackets uint32 ++ Oerrors uint32 ++ Collisions uint32 ++ Ibytes uint32 ++ Obytes uint32 ++ Imcasts uint32 ++ Omcasts uint32 ++ Iqdrops uint32 ++ Noproto uint32 ++ Hwassist uint32 ++ Epoch int32 ++ Lastchange Timeval + } + + type IfaMsghdr struct { +diff -ur go.orig/src/syscall/ztypes_freebsd_amd64.go go/src/syscall/ztypes_freebsd_amd64.go +--- src/syscall/ztypes_freebsd_amd64.go 2015-08-26 16:13:15.194477000 +0200 ++++ src/syscall/ztypes_freebsd_amd64.go 2015-08-26 17:16:22.936248000 +0200 +@@ -316,59 +316,58 @@ + } + + type ifData struct { +- Type uint8 +- Physical uint8 +- Addrlen uint8 +- Hdrlen uint8 +- Link_state uint8 +- Vhid uint8 +- Baudrate_pf uint8 +- Datalen uint8 +- Mtu uint64 +- Metric uint64 +- Baudrate uint64 +- Ipackets uint64 +- Ierrors uint64 +- Opackets uint64 +- Oerrors uint64 +- Collisions uint64 +- Ibytes uint64 +- Obytes uint64 +- Imcasts uint64 +- Omcasts uint64 +- Iqdrops uint64 +- Noproto uint64 +- Hwassist uint64 +- Epoch int64 +- Lastchange Timeval ++ Type uint8 ++ Physical uint8 ++ Addrlen uint8 ++ Hdrlen uint8 ++ Link_state uint8 ++ Vhid uint8 ++ Datalen uint16 ++ Mtu uint32 ++ Metric uint32 ++ Baudrate uint64 ++ Ipackets uint64 ++ Ierrors uint64 ++ Opackets uint64 ++ Oerrors uint64 ++ Collisions uint64 ++ Ibytes uint64 ++ Obytes uint64 ++ Imcasts uint64 ++ Omcasts uint64 ++ Iqdrops uint64 ++ Oqdrops uint64 ++ Noproto uint64 ++ Hwassist uint64 ++ X__ifi_epoch [8]byte ++ X__ifi_lastchange [16]byte + } + + type IfData struct { +- Type uint8 +- Physical uint8 +- Addrlen uint8 +- Hdrlen uint8 +- Link_state uint8 +- Spare_char1 uint8 +- Spare_char2 uint8 +- Datalen uint8 +- Mtu uint64 +- Metric uint64 +- Baudrate uint64 +- Ipackets uint64 +- Ierrors uint64 +- Opackets uint64 +- Oerrors uint64 +- Collisions uint64 +- Ibytes uint64 +- Obytes uint64 +- Imcasts uint64 +- Omcasts uint64 +- Iqdrops uint64 +- Noproto uint64 +- Hwassist uint64 +- Epoch int64 +- Lastchange Timeval ++ Type uint8 ++ Physical uint8 ++ Addrlen uint8 ++ Hdrlen uint8 ++ Link_state uint8 ++ Vhid uint8 ++ Datalen uint16 ++ Mtu uint64 ++ Metric uint64 ++ Baudrate uint64 ++ Ipackets uint64 ++ Ierrors uint64 ++ Opackets uint64 ++ Oerrors uint64 ++ Collisions uint64 ++ Ibytes uint64 ++ Obytes uint64 ++ Imcasts uint64 ++ Omcasts uint64 ++ Iqdrops uint64 ++ Noproto uint64 ++ Hwassist uint64 ++ Epoch int64 ++ Lastchange Timeval + } + + type IfaMsghdr struct { Property changes on: head/lang/go/files/struct-if_data-patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property