Index: head/textproc/jid/Makefile
===================================================================
--- head/textproc/jid/Makefile	(revision 434670)
+++ head/textproc/jid/Makefile	(revision 434671)
@@ -1,47 +1,32 @@
 # Created by: Sofian Brabez <sbz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	jid
 PORTVERSION=	0.7.2
 CATEGORIES=	textproc
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	JSON Incremental Digger
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	simeji
-GH_TUPLE=	bitly:go-simplejson:aabad6e:simplejson \
-		fatih:color:7824417:color \
-		mattn:go-runewidth:9e777a8:runewidth \
-		nsf:termbox-go:3540b76:termbox \
-		nwidger:jsoncolor:75a6de4:jsoncolor \
-		pkg:errors:645ef00:errors
+GH_SUBDIR=	src/github.com/simeji/jid
+GH_TUPLE=	bitly:go-simplejson:aabad6e:simplejson/src/github.com/bitly/go-simplejson \
+		fatih:color:7824417:color/src/github.com/fatih/color \
+		mattn:go-runewidth:9e777a8:runewidth/src/github.com/mattn/go-runewidth \
+		nsf:termbox-go:3540b76:termbox/src/github.com/nsf/termbox-go \
+		nwidger:jsoncolor:75a6de4:jsoncolor/src/github.com/nwidger/jsoncolor \
+		pkg:errors:645ef00:errors/src/github.com/pkg/errors
 
 USES=		go
 
 PLIST_FILES=	bin/jid
 
-pre-build: .SILENT
-	${MKDIR} ${WRKDIR}/src/github.com/mattn
-	${MV} ${WRKDIR}/go-runewidth-9e777a8 ${WRKDIR}/src/github.com/mattn/go-runewidth
-	${MKDIR} ${WRKDIR}/src/github.com/fatih
-	${MV} ${WRKDIR}/color-7824417 ${WRKDIR}/src/github.com/fatih/color
-	${MKDIR} ${WRKDIR}/src/github.com/bitly
-	${MV} ${WRKDIR}/go-simplejson-aabad6e ${WRKDIR}/src/github.com/bitly/go-simplejson
-	${MKDIR} ${WRKDIR}/src/github.com/nsf
-	${MV} ${WRKDIR}/termbox-go-3540b76 ${WRKDIR}/src/github.com/nsf/termbox-go
-	${MKDIR} ${WRKDIR}/src/github.com/nwidger
-	${MV} ${WRKDIR}/jsoncolor-75a6de4 ${WRKDIR}/src/github.com/nwidger/jsoncolor
-	${MKDIR} ${WRKDIR}/src/github.com/pkg
-	${MV} ${WRKDIR}/errors-645ef00 ${WRKDIR}/src/github.com/pkg/errors
-	${MKDIR} ${WRKDIR}/src/github.com/simeji
-	${CP} -r ${WRKDIR}/jid-${PORTVERSION} ${WRKDIR}/src/github.com/simeji/jid
-
 do-build:
-	@(cd ${WRKDIR}/src/github.com/simeji/jid; \
-		${SETENV} ${GO_ENV} ${GO_CMD} build -v -o ${WRKDIR}/bin/jid cmd/jid/jid.go)
+	@(cd ${WRKSRC}; \
+		${SETENV} ${GO_ENV} GOPATH=${WRKSRC} ${GO_CMD} build -v -o ${WRKSRC}/bin/jid cmd/jid/jid.go)
 
 .include <bsd.port.mk>