Index: head/sysutils/ipfs-go/Makefile
===================================================================
--- head/sysutils/ipfs-go/Makefile	(revision 436272)
+++ head/sysutils/ipfs-go/Makefile	(revision 436273)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	ipfs-go
-PORTVERSION=	0.3.10
+PORTVERSION=	0.4.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
-MAINTAINER=	wg@FreeBSD.org
+MAINTAINER=	jhixson@gmail.com
 COMMENT=	IPFS implementation in Go
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
+LICENSE=	MIT
 
-BROKEN_i386=	does not build
+BUILD_DEPENDS=	go>=1.7:lang/go
 
-USES=		gmake
+ONLY_FOR_ARCHS=	amd64
 
+USES=		compiler go
+
 USE_GITHUB=	yes
-GH_ACCOUNT=	ipfs
-GH_PROJECT=	go-ipfs
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GH_ACCOUNT=	jhixson74
 
 MAKE_ENV+=	GOPATH=${WRKSRC}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 USE_RC_SUBR=	${PORTNAME}
 
 STRIP=		# stripping can break go binaries
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == i386
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-32bit
-.endif
-
-post-patch:
-	${GREP} -lR github.com/ipfs/go-ipfs/vendor/QmQg1J6vikuXF9oDvm4wpdeAUvvkVEKW1EYDw9HhTMnP2b/go-log ${WRKSRC} 2>/dev/null | \
-	 while read gosrc; do sed -i.bak 's#github.com/ipfs/go-ipfs/vendor/##g' $$gosrc; done
-
 do-build:
-	cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build
+	cd ${WRKSRC}/src/github.com/ipfs/go-ipfs/cmd/ipfs; \
+		${SETENV} ${BUILD_ENV} ${MAKE_ENV} go build -v -x \
+			-ldflags "-X main.GitDescribe=${DISTVERSIONFULL}" -o bin/${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/cmd/ipfs/ipfs ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/ipfs/go-ipfs/cmd/ipfs/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.pre.mk>
+
+# golang assumes that if clang is in use, it is called "clang" and not "cc". If
+# it's called "cc", go fails.
+.if ${COMPILER_TYPE} == clang
+BUILD_ENV=  CC=clang
+.endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/ipfs-go/distinfo
===================================================================
--- head/sysutils/ipfs-go/distinfo	(revision 436272)
+++ head/sysutils/ipfs-go/distinfo	(revision 436273)
@@ -1,2 +1,3 @@
-SHA256 (ipfs-go-ipfs-v0.3.10_GH0.tar.gz) = 5f3e465ed0b37e1886ea71bd89586faf5968048be18e8105b7ca908376865edc
-SIZE (ipfs-go-ipfs-v0.3.10_GH0.tar.gz) = 3047589
+TIMESTAMP = 1489661432
+SHA256 (jhixson74-ipfs-go-v0.4.7_GH0.tar.gz) = 2aeaa4da7593c5d05536af12620896d02df51f05d6b5d2bd5233c90574263372
+SIZE (jhixson74-ipfs-go-v0.4.7_GH0.tar.gz) = 33007329
Index: head/sysutils/ipfs-go/files/extra-patch-32bit
===================================================================
--- head/sysutils/ipfs-go/files/extra-patch-32bit	(revision 436272)
+++ head/sysutils/ipfs-go/files/extra-patch-32bit	(nonexistent)
@@ -1,11 +0,0 @@
---- src/github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport/poll/poll_bsd.go.orig	2015-08-02 14:00:34 UTC
-+++ src/github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-reuseport/poll/poll_bsd.go
-@@ -21,7 +21,7 @@ func New(fd int) (p *Poller, err error) 
- 	}
- 
- 	p.event = syscall.Kevent_t{
--		Ident:  uint64(fd),
-+		Ident:  uint32(fd),
- 		Filter: syscall.EVFILT_WRITE,
- 		Flags:  syscall.EV_ADD | syscall.EV_ENABLE | syscall.EV_ONESHOT,
- 		Fflags: 0,

Property changes on: head/sysutils/ipfs-go/files/extra-patch-32bit
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property