--- Makefile	(revision 446194)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	fzf
-PORTVERSION=	0.16.5
+PORTVERSION=	0.16.10
 CATEGORIES=	textproc
 
 MAINTAINER=	sascha@root-login.org
@@ -17,9 +17,10 @@ 
 GH_ACCOUNT=	junegunn
 GH_SUBDIR:=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
-GH_TUPLE=	junegunn:go-runewidth:63c378b:runwidth/src/github.com/junegunn/go-runewidth \
-    		junegunn:go-shellwords:35d512a:shellwords/src/github.com/junegunn/go-shellwords \
-		junegunn:go-isatty:66b8e73:isatty/src/github.com/junegunn/go-isatty \
+GH_TUPLE=	mattn:go-runewidth:14207d2:runwidth/src/github.com/mattn/go-runewidth \
+    		mattn:go-shellwords:02e3cf0:shellwords/src/github.com/mattn/go-shellwords \
+		mattn:go-isatty:66b8e73:isatty/src/github.com/mattn/go-isatty \
+		gdamore:tcell:44772c1:tcell/src/github.com/gdamore/tcell \
 		golang:crypto:b8a2a83:terminal/src/golang.org/x/crypto
 
 PLIST_FILES=	bin/fzf man/man1/fzf.1.gz
@@ -34,13 +35,17 @@ 
 TMUX_RUN_DEPENDS=	bash:shells/bash
 TMUX_PLIST_FILES=	bin/fzf-tmux man/man1/fzf-tmux.1.gz
 
+GOENV=          GOPATH=${WRKSRC} CGO_CFLAGS="${CGO_CFLAGS}" \
+		CGO_LDFLAGS="${CGO_LDFLAGS}" GOBIN=""
+
 do-build:
-	(cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/src/fzf && \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} \
-		go build -o bin/${PORTNAME})
+	cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && \
+	${SETENV} ${MAKE_ENV} ${GOENV} ${GO_CMD} build -a \
+		-ldflags "-X main.revision=6dbc108 -w" -o bin/${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/src/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/bin/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/man1/fzf.1 ${STAGEDIR}${MANPREFIX}/man/man1
--- distinfo	(revision 446194)
+++ distinfo	(working copy)
@@ -1,11 +1,13 @@ 
-TIMESTAMP = 1487638535
-SHA256 (junegunn-fzf-0.16.5_GH0.tar.gz) = 7add1b5290af779fc1c6a3e306d696fb0e833d4efb5b60d94f9c424ac1b6f9fe
-SIZE (junegunn-fzf-0.16.5_GH0.tar.gz) = 124727
-SHA256 (junegunn-go-runewidth-63c378b_GH0.tar.gz) = e7cba5116e6f7051984005f5ab6c23d448307a6fced09eb9bd1bf49f3317b36d
-SIZE (junegunn-go-runewidth-63c378b_GH0.tar.gz) = 4503
-SHA256 (junegunn-go-shellwords-35d512a_GH0.tar.gz) = ea496265b81c60c0d590e369ca7cbcf3e87ec39d6f49c7462a7ab0483582b6fa
-SIZE (junegunn-go-shellwords-35d512a_GH0.tar.gz) = 2340
-SHA256 (junegunn-go-isatty-66b8e73_GH0.tar.gz) = 261ec4d11cc7615205c67a1dd9ffe1f88166fc50db0022700a82f39ab7e47b0d
-SIZE (junegunn-go-isatty-66b8e73_GH0.tar.gz) = 1956
+TIMESTAMP = 1500632154
+SHA256 (junegunn-fzf-0.16.10_GH0.tar.gz) = a6b9d8abcba4239d30201cc7911e9c305a5cd750081ce5cd389f8e7425f4dc93
+SIZE (junegunn-fzf-0.16.10_GH0.tar.gz) = 130154
+SHA256 (mattn-go-runewidth-14207d2_GH0.tar.gz) = e665c10f4ccefe1d320fe8fe69403754c499fe79bc737f8f1d199d86ecfb7efb
+SIZE (mattn-go-runewidth-14207d2_GH0.tar.gz) = 22365
+SHA256 (mattn-go-shellwords-02e3cf0_GH0.tar.gz) = e2e905e992b7892307a883f4a9c0d6c46ab592cade2d063aceb2b21c234a0913
+SIZE (mattn-go-shellwords-02e3cf0_GH0.tar.gz) = 3273
+SHA256 (mattn-go-isatty-66b8e73_GH0.tar.gz) = 261ec4d11cc7615205c67a1dd9ffe1f88166fc50db0022700a82f39ab7e47b0d
+SIZE (mattn-go-isatty-66b8e73_GH0.tar.gz) = 1956
+SHA256 (gdamore-tcell-44772c1_GH0.tar.gz) = 5c8edfc7aa1049dcbe3c4d888484e73f79e967add351c1cd3548a908558edac9
+SIZE (gdamore-tcell-44772c1_GH0.tar.gz) = 164791
 SHA256 (golang-crypto-b8a2a83_GH0.tar.gz) = 9c6b4a4f6daf7dbd0c3606184076c3dc2694a0e811061e1c8723940170f33f58
 SIZE (golang-crypto-b8a2a83_GH0.tar.gz) = 1305071