More USE_GITHUB cleanup.

Use GH_SUBDIR, or GH_TUPLE, where applicable.

Sponsored by:	Absolight

19 files changed, 97 insertions, 288 deletions

diff --git a/databases/leofs/Makefile b/databases/leofs/Makefile
index 0bbccca8c057..33d5999fa2ee 100644
--- a/databases/leofs/Makefile
+++ b/databases/leofs/Makefile
@@ -118,14 +118,13 @@ label=		${dep:C,^.*:,,}
 GH_ACCOUNT:=	${GH_ACCOUNT} ${account}:${label}
 GH_PROJECT:=	${GH_PROJECT} ${project}:${label}
 GH_TAGNAME:=	${GH_TAGNAME} ${tagname}:${label}
+GH_SUBDIR:=	${GH_SUBDIR} deps/${label}:${label}
 .endfor
 
 post-extract:
 .for dep in ${LEOFS_DEPS}
 .for tagname in ${dep:C,^[^=]+=([^\?]+)\?.*$,\1,}
 .for label in ${dep:C,^.*:,,}
-	@${MKDIR} ${WRKSRC}/deps
-	@${MV} ${WRKSRC_${label}} ${WRKSRC}/deps/${label}
 	@if [ -f "${WRKSRC}/deps/${label}/src/${label}.app.src" ]; then \
 	    ${REINPLACE_CMD} -e "s|{vsn, *git}|{vsn, \"${tagname}\"}|" \
 		"${WRKSRC}/deps/${label}/src/${label}.app.src"; \
diff --git a/games/libretro-cores/Makefile b/games/libretro-cores/Makefile
index 00988ba9eaab..b0d70fed1d38 100644
--- a/games/libretro-cores/Makefile
+++ b/games/libretro-cores/Makefile
@@ -79,7 +79,7 @@ ALL_CORES+=	libretro:yabause:yabause:b121882:x
 USE_GITHUB=	nodefault
 
 # variables that depend on ALL_CORES
-GH_TUPLE=	${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\1:\2:\4:\3,}
+GH_TUPLE=	${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\1:\2:\4:\3/\2,}
 CORE_DIRS=	${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\2,}
 
 #PLIST_FILES+=	${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),libexec/libretro/\3_libretro.so,}
@@ -108,12 +108,6 @@ DOS2UNIX_FILES=	hatari/Makefile.libretro
 USE_CXXSTD=	gnu++11
 .endif
 
-post-extract:
-	@${MKDIR} ${WRKSRC}
-.for dir in ${ALL_CORES:C,^([^:]*):([^:]*):([^:]*):([^:]*):([^:]*),\2:\3,}
-	@${MV} ${WRKSRC_${dir:C/^([^:]*):([^:]*)/\2/}} ${WRKSRC}/${dir:C/^([^:]*):([^:]*)/\1/}
-.endfor
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/"__VA_ARGS__/" __VA_ARGS__/' \
 		${WRKSRC}/desmume/desmume/src/wifi.cpp
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index f408dd3b9e00..8f2add862b91 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -5,12 +5,6 @@ PORTNAME=	mozc
 PORTVERSION=	2.17.2322.102
 PORTREVISION=	2
 CATEGORIES=	japanese
-MASTER_SITES=	https://codeload.github.com/google/${PORTNAME}/tar.gz/9b4c9e0?dummy=/:main \
-		https://codeload.github.com/hiroyuki-komatsu/japanese-usage-dictionary/tar.gz/e5b3425?dummy=/:udic
-DISTFILES=	google-${PORTNAME}-9b4c9e0_GH0.tar.gz:main \
-		hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz:udic
-EXTRACT_ONLY=	google-${PORTNAME}-9b4c9e0_GH0.tar.gz \
-		hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT?=	Mozc Japanese Input Method, Server
@@ -25,9 +19,12 @@ LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
 		libzinnia.so:japanese/zinnia
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
+USE_GITHUB=	yes
+GH_TUPLE=	google:${PORTNAME}:9b4c9e0 \
+		hiroyuki-komatsu:japanese-usage-dictionary:e5b3425:udic
+
 USES=		compiler:c++11-lang pkgconfig iconv:wchar_t gmake \
 		tar:bzip2 python:2.7,build shebangfix
-WRKSRC=		${WRKDIR}/${PORTNAME}-9b4c9e0
 SHEBANG_FILES=	src/build_mozc.py
 BUILD_WRKSRC=	${WRKSRC}/src
 
@@ -153,7 +150,7 @@ post-extract-mozc_server:
 	    ${PYTHON_CMD} ${BUILD_WRKSRC}/dictionary/gen_zip_code_seed.py \
 	    --zip_code=ken_all.csv --jigyosyo=jigyosyo.csv \
 	    >> dictionary09.txt
-	${MV} ${WRKDIR}/japanese-usage-dictionary-e5b3425/usage_dict.txt \
+	${MV} ${WRKSRC_udic}/usage_dict.txt \
 	    ${BUILD_WRKSRC}/third_party/japanese_usage_dictionary
 
 post-extract: post-extract-mozc_server
@@ -259,14 +256,7 @@ do-install-ibus_mozc:
 
 # uim_mozc
 .if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc" || make(makesum)
-#USE_GITHUB=	yes	# XXX
-GH_ACCOUNT=	e-kato
-GH_PROJECT=	macuim
-GH_TAGNAME=	v0.6.16.2.1
-DISTFILES+=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}_GH0${EXTRACT_SUFX}:gh_uim
-EXTRACT_ONLY+=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}_GH0${EXTRACT_SUFX}
-MASTER_SITES+=	https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/:gh_uim
-WRKSRC_MU=	${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:C/^v//}
+GH_TUPLE+=	e-kato:macuim:v0.6.16.2.1:MU
 
 LIB_DEPENDS+=	libuim.so:textproc/uim
 RUN_DEPENDS+=	mozc_server:japanese/mozc-server \
diff --git a/japanese/mozc-server/distinfo b/japanese/mozc-server/distinfo
index 839bd8d3508a..1f5abcbc6a02 100644
--- a/japanese/mozc-server/distinfo
+++ b/japanese/mozc-server/distinfo
@@ -1,12 +1,13 @@
-SHA256 (google-mozc-9b4c9e0_GH0.tar.gz) = b7f57c4bfbff9a7e657de4f8213bac2f8d3cc454076463ddc66e32ebcf7bf795
-SIZE (google-mozc-9b4c9e0_GH0.tar.gz) = 57248995
-SHA256 (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz) = 2af954cd844c6a3113449d7dca37e36b769ecb2b49d3a54318a3bdee1a75af56
-SIZE (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425.tar.gz) = 71050
+TIMESTAMP = 1481723411
 SHA256 (ken_all-20160428.zip) = dd732957ca98dcad8c68aaa89447d77bd9201f26a19241f2531cb3f4ba2296f0
 SIZE (ken_all-20160428.zip) = 1684351
 SHA256 (jigyosyo-20160428.zip) = b95ed393343ed85363e8e7e14725af5e0b0586e60289a386fdba288e0e36f040
 SIZE (jigyosyo-20160428.zip) = 752471
-SHA256 (e-kato-macuim-v0.6.16.2.1_GH0.tar.bz2) = ae999a2f02379bd049484a22684c37be5eb1f4db9763fa79885c4981502336e9
-SIZE (e-kato-macuim-v0.6.16.2.1_GH0.tar.bz2) = 324549
+SHA256 (google-mozc-2.17.2322.102-9b4c9e0_GH0.tar.gz) = b7f57c4bfbff9a7e657de4f8213bac2f8d3cc454076463ddc66e32ebcf7bf795
+SIZE (google-mozc-2.17.2322.102-9b4c9e0_GH0.tar.gz) = 57248995
+SHA256 (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425_GH0.tar.gz) = 2af954cd844c6a3113449d7dca37e36b769ecb2b49d3a54318a3bdee1a75af56
+SIZE (hiroyuki-komatsu-japanese-usage-dictionary-e5b3425_GH0.tar.gz) = 71050
+SHA256 (e-kato-macuim-v0.6.16.2.1_GH0.tar.gz) = ae999a2f02379bd049484a22684c37be5eb1f4db9763fa79885c4981502336e9
+SIZE (e-kato-macuim-v0.6.16.2.1_GH0.tar.gz) = 324549
 SHA256 (fcitx-mozc-2.17.2313.102.1.patch) = 52a7ed450f075eca3f4d468390ef59f9a439e0ac74327639802a7f11caa1a2c2
 SIZE (fcitx-mozc-2.17.2313.102.1.patch) = 140531
diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index 348112fdac2f..2106d8decb80 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -16,19 +16,13 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 PLIST=		${.CURDIR}/pkg-plist
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	rust-lang
-GH_PROJECT=	rust \
-		compiler-rt:compiler_rt \
-		hoedown:hoedown \
-		jemalloc:jemalloc \
-		libc:liblibc \
-		rust-installer:rust_installer
-GH_TAGNAME=	7ed6068 \
-		ac3d1cd:compiler_rt \
-		a3736a0:hoedown \
-		e058ca6:jemalloc \
-		b0d6253:liblibc \
-		c37d374:rust_installer
+GH_TUPLE=	rust-lang:rust:7ed6068 \
+		rust-lang:compiler-rt:ac3d1cd:compiler_rt/src/compiler-rt \
+		rust-lang:hoedown:a3736a0:hoedown/src/rt/hoedown \
+		rust-lang:jemalloc:e058ca6:jemalloc/src/jemalloc \
+		rust-lang:libc:b0d6253:liblibc/src/liblibc \
+		rust-lang:rust-installer:c37d374:rust_installer/src/rust-installer \
+		rust-lang:llvm:7ca76af:llvm
 
 BUILD_DEPENDS=		cmake:devel/cmake
 
@@ -42,19 +36,6 @@ PORT_LLVM_GH_PROJECT_OFF=	llvm:llvm
 PORT_LLVM_GH_TAGNAME_OFF=	7ca76af:llvm
 PORT_LLVM_VARS_OFF=		NOPRECIOUSMAKEVARS=1 # ARCH
 
-post-extract:	slave-post-extract
-slave-post-extract:
-	@(${RMDIR} ${WRKSRC}/src/compiler-rt && \
-	  ${MV} ${WRKSRC_compiler_rt} ${WRKSRC}/src/compiler-rt)
-	@(${RMDIR} ${WRKSRC}/src/rt/hoedown && \
-	  ${MV} ${WRKSRC_hoedown} ${WRKSRC}/src/rt/hoedown)
-	@(${RMDIR} ${WRKSRC}/src/jemalloc && \
-	  ${MV} ${WRKSRC_jemalloc} ${WRKSRC}/src/jemalloc)
-	@(${RMDIR} ${WRKSRC}/src/liblibc && \
-	  ${MV} ${WRKSRC_liblibc} ${WRKSRC}/src/liblibc)
-	@(${RMDIR} ${WRKSRC}/src/rust-installer && \
-	  ${MV} ${WRKSRC_rust_installer} ${WRKSRC}/src/rust-installer)
-
 post-extract-PORT_LLVM-off:
 	@(${RMDIR} ${WRKSRC}/src/llvm && \
 	  ${MV} ${WRKSRC_llvm} ${WRKSRC}/src/llvm)
diff --git a/lang/swift/Makefile b/lang/swift/Makefile
index 881bbdc2c7cf..398a4a1174fb 100644
--- a/lang/swift/Makefile
+++ b/lang/swift/Makefile
@@ -27,6 +27,9 @@ GH_PROJECT=	swift:DEFAULT swift-llvm:llvm swift-clang:clang swift-lldb:lldb \
 		swift-corelibs-xctest:xctest swift-corelibs-foundation:xcfound
 GH_TAGNAME=	swift-${PORTVERSION}-RELEASE:DEFAULT,llvm,clang,lldb,cmark \
 		swift-DEVELOPMENT-SNAPSHOT-2016-05-03-a:llbuild,swiftpm,xctest,xcfound
+GH_SUBDIR=	llvm:llvm clang:clang lldb:lldb cmark:cmark llbuild:llbuild \
+		swiftpm:swiftpm swift-corelibs-xctest:xctest \
+		swift-corelibs-foundation:xcfound
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		iconv libedit ninja perl5 pkgconfig python:3,build sqlite
@@ -55,14 +58,6 @@ BROKEN=		Does not build
 post-extract:
 	@${MKDIR} ${WRKSRC}
 	@${MV} ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}-RELEASE ${WRKSRC}/swift
-	@${MV} ${WRKSRC_llvm} ${WRKSRC}/llvm
-	@${MV} ${WRKSRC_clang} ${WRKSRC}/clang
-	@${MV} ${WRKSRC_lldb} ${WRKSRC}/lldb
-	@${MV} ${WRKSRC_cmark} ${WRKSRC}/cmark
-	@${MV} ${WRKSRC_llbuild} ${WRKSRC}/llbuild
-	@${MV} ${WRKSRC_swiftpm} ${WRKSRC}/swiftpm
-	@${MV} ${WRKSRC_xctest} ${WRKSRC}/swift-corelibs-xctest
-	@${MV} ${WRKSRC_xcfound} ${WRKSRC}/swift-corelibs-foundation
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index a70cdd1e5986..a1fa31c50df5 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -67,7 +67,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 CONFLICTS_BUILD=compat9x
 
 USE_GITHUB=	yes
-GH_TUPLE=	xbmc:xbmc:c327c53 xbmc:FFmpeg:2.8.6-Jarvis-16.0:ffmpeg
+GH_TUPLE=	xbmc:xbmc:c327c53 \
+		xbmc:FFmpeg:2.8.6-Jarvis-16.0:ffmpeg/tools/depends/target/ffmpeg
 
 USES=		autoreconf:build compiler:c++11-lib gettext gmake iconv jpeg \
 		libtool pkgconfig python:2 ssl
@@ -154,9 +155,6 @@ SFTP_CONFIGURE_ENABLE=	ssh
 
 CONFIGURE_ARGS+=	--disable-debug --disable-alsa --disable-texturepacker
 
-post-extract:
-	${MV} ${WRKSRC_ffmpeg} ${WRKSRC}/tools/depends/target/ffmpeg/
-
 post-patch:
 	${REINPLACE_CMD} 's;make;gmake;' \
 		${WRKSRC}/bootstrap \
diff --git a/net-im/cutegram/Makefile b/net-im/cutegram/Makefile
index 34c204602da2..6b5b8811e3ad 100644
--- a/net-im/cutegram/Makefile
+++ b/net-im/cutegram/Makefile
@@ -20,6 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Aseman-Land
 GH_PROJECT=	Cutegram aseman-qt-tools:tools
 GH_TAGNAME=	91bf14b:tools
+GH_SUBDIR=	Cutegram/asemantools:tools
 
 USES=		qmake:outsource desktop-file-utils
 USE_QT5=	qmake_build buildtools_build core qml quick sql xml multimedia \
@@ -29,10 +30,6 @@ QMAKE_ARGS=	LIBQTELEGRAM_INCLUDE_PATH="${LOCALBASE}/include/libqtelegram-ae" \
 		TELEGRAMQML_INCLUDE_PATH="${LOCALBASE}/include/telegramqml"
 INSTALLS_ICONS=	yes
 
-post-extract:
-	@${RMDIR} ${WRKSRC}/Cutegram/asemantools && \
-	${MV} ${WRKSRC_tools} ${WRKSRC}/Cutegram/asemantools
-
 post-patch:
 	@${REINPLACE_CMD} -e "/isEmpty(OPENSSL_INCLUDE_PATH)/d" \
                ${WRKSRC}/Cutegram/Cutegram.pro
diff --git a/net-im/telegram-purple/Makefile b/net-im/telegram-purple/Makefile
index 89658d318014..20c26f222d01 100644
--- a/net-im/telegram-purple/Makefile
+++ b/net-im/telegram-purple/Makefile
@@ -30,6 +30,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	majn:DEFAULT,tgl vysheng:tlparser
 GH_PROJECT=	tgl:tgl tl-parser:tlparser
 GH_TAGNAME?=	624cf5a:tgl 36bf190:tlparser
+GH_SUBDIR=	tgl:tgl tgl/tl-parser:tlparser
 
 BROKEN_sparc64=	cannot compile: assertion fails
 
@@ -37,8 +38,4 @@ pre-configure:
 	@${REINPLACE_CMD} -e 's|/etc/telegram-purple/server.tglpub|${PREFIX}/etc/telegram-purple/server.tglpub|g' \
 		 ${WRKSRC}/telegram-purple.c
 
-post-extract:
-	@${MV} ${WRKSRC_tgl}/* ${WRKSRC}/tgl
-	@${MV} ${WRKSRC_tlparser}/* ${WRKSRC}/tgl/tl-parser
-
 .include <bsd.port.mk>
diff --git a/net-im/telegram/Makefile b/net-im/telegram/Makefile
index 9b9d23571466..f9e33e5563fa 100644
--- a/net-im/telegram/Makefile
+++ b/net-im/telegram/Makefile
@@ -26,7 +26,8 @@ GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	vysheng
 GH_PROJECT=	tg tgl:tgl tl-parser:tlparser
-GH_TAGNAME=	1.3.1 2.0.1:tgl 1659d87:tlparser
+GH_TAGNAME=	2.0.1:tgl 1659d87:tlparser
+GH_SUBDIR=	tgl:tgl tgl/tl-parser:tlparser
 
 PLIST_FILES=	bin/telegram-cli \
 		etc/telegram-cli/server.pub
@@ -38,10 +39,6 @@ PORTDOCS=	*
 USE_GCC=	yes
 .endif
 
-post-extract:
-	@${MV} ${WRKSRC_tgl}/* ${WRKSRC}/tgl
-	@${MV} ${WRKSRC_tlparser}/* ${WRKSRC}/tgl/tl-parser
-
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/telegram-cli
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/telegram-cli ${STAGEDIR}${PREFIX}/bin
diff --git a/net/syncthing-inotify/Makefile b/net/syncthing-inotify/Makefile
index 2154753a4596..4aad17d3c613 100644
--- a/net/syncthing-inotify/Makefile
+++ b/net/syncthing-inotify/Makefile
@@ -11,25 +11,15 @@ COMMENT=	Syncthing inotify monitor
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	syncthing cenkalti:backoff zillode:notify syncthing:ignore
-GH_PROJECT=	backoff:backoff notify:notify syncthing:ignore
-GH_TAGNAME=	9831e1e:backoff 2da5cc9:notify v0.13.4:ignore
+GH_ACCOUNT=	syncthing 
+GH_TUPLE=	cenkalti:backoff:9831e1e:backoff/src/github.com/cenkalti/backoff \
+		zillode:notify:2da5cc9:notify/src/github.com/zillode/notify \
+		syncthing:syncthing:v0.13.4:ignore/src/github.com/syncthing/syncthing
 
 STRIP=		# stripping can break go binaries
 
 PLIST_FILES=	bin/syncthing-inotify
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/src/github.com/cenkalti
-	@${MKDIR} ${WRKSRC}/src/github.com/zillode
-	@${MKDIR} ${WRKSRC}/src/github.com/syncthing
-	@${MV} ${WRKSRC_backoff} \
-		${WRKSRC}/src/github.com/cenkalti/backoff
-	@${MV} ${WRKSRC_notify} \
-		${WRKSRC}/src/github.com/zillode/notify
-	@${MV} ${WRKSRC_ignore} \
-		${WRKSRC}/src/github.com/syncthing/syncthing
-
 do-build:
 	@cd ${WRKSRC} ; ${SETENV} GOPATH=${WRKSRC} go build
 	@${MV} ${WRKSRC}/syncthing-inotify-${PORTVERSION} ${WRKSRC}/syncthing-inotify
diff --git a/print/cups-connector/Makefile b/print/cups-connector/Makefile
index a458bfd140bd..96e7852fee7d 100644
--- a/print/cups-connector/Makefile
+++ b/print/cups-connector/Makefile
@@ -16,12 +16,12 @@ BUILD_DEPENDS=	go:lang/go \
 
 USES=		compiler pkgconfig
 USE_GITHUB=	yes
-GH_ACCOUNT=	google:DEFAULT codegangsta:cli coreos:gosystemd \
-		golang:oauth2,net mildred:xdg
-GH_PROJECT=	cli:cli go-systemd:gosystemd oauth2:oauth2 net:net \
-		go-xdg:xdg
-GH_TAGNAME=	1fdc26d:DEFAULT a294348:cli 7b2428f:gosystemd \
-		2cd4472:oauth2 6acef71:net 875014b:xdg
+GH_TUPLE=	google:cups-connector:1fdc26d:DEFAULT/src/github.com/google/cups-connector \
+		codegangsta:cli:a294348:cli/src/github.com/codegangsta/cli \
+		coreos:go-systemd:7b2428f:gosystemd/src/github.com/coreos/go-systemd \
+		golang:oauth2:2cd4472:oauth2/src/golang.org/x/oauth2 \
+		golang:net:6acef71:net/src/golang.org/x/net \
+		mildred:go-xdg:875014b:xdg/src/launchpad.net/go-xdg/v0
 
 BIN_FILES=	gcp-connector-util gcp-cups-connector
 PLIST_FILES=	${BIN_FILES:S/^/bin\//}
@@ -33,21 +33,6 @@ PORTDOCS=	CONTRIBUTING.md README.md
 post-patch:
 	@${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" \
 		${WRKSRC}/cups/core.go ${WRKSRC}/privet/avahi.go
-	@${MKDIR} ${WRKSRC}/src/github.com/google/cups-connector
-.for src in cdd cups gcp gcp-connector-util gcp-cups-connector \
-	gcp-windows-connector lib log manager monitor privet winspool xmpp
-	@${MV} ${WRKSRC}/${src} \
-		${WRKSRC}/src/github.com/google/cups-connector
-.endfor
-	@${MKDIR} ${WRKSRC}/src/github.com/codegangsta
-	@${MKDIR} ${WRKSRC}/src/github.com/coreos
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MKDIR} ${WRKSRC}/src/launchpad.net/go-xdg
-	@${MV} ${WRKSRC_cli} ${WRKSRC}/src/github.com/codegangsta/cli
-	@${MV} ${WRKSRC_gosystemd} ${WRKSRC}/src/github.com/coreos/go-systemd
-	@${MV} ${WRKSRC_oauth2} ${WRKSRC}/src/golang.org/x/oauth2
-	@${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net
-	@${MV} ${WRKSRC_xdg} ${WRKSRC}/src/launchpad.net/go-xdg/v0
 
 do-build:
 .for bin in ${BIN_FILES}
diff --git a/security/honeybadger/Makefile b/security/honeybadger/Makefile
index 464f2e31e67d..a4cafbf6d749 100644
--- a/security/honeybadger/Makefile
+++ b/security/honeybadger/Makefile
@@ -10,12 +10,13 @@ COMMENT=	Quantum Insert detector and 0-day catcher
 BUILD_DEPENDS=	go:lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	david415:DEFAULT google:gp fatih:co mattn:gc,gi \
-		golang:xs,xn
-GH_PROJECT=	HoneyBadger:DEFAULT gopacket:gp color:co go-colorable:gc \
-		go-isatty:gi net:xn sys:xs
-GH_TAGNAME=	11dc0ca:DEFAULT f361903:gp 7a5857d:co 9fdad7c:gc 56b76bd:gi \
-		b6d7b13:xn 50c6bc5:xs
+GH_TUPLE=	david415:HoneyBadger:11dc0ca:DEFAULT/src/github.com/david415/HoneyBadger \
+		google:gopacket:f361903:gp/src/github.com/google/gopacket \
+		fatih:color:7a5857d:co/src/github.com/fatih/color \
+		mattn:go-colorable:9fdad7c:gc/src/github.com/mattn/go-colorable \
+		mattn:go-isatty:56b76bd:gi/src/github.com/mattn/go-isatty \
+		golang:sys:50c6bc5:xs/src/golang.org/x/sys \
+		golang:net:b6d7b13:xn/src/golang.org/x/net
 
 BIN_FILES=	handshakeHijacker honeyBadger \
 		honeybadgerReportTool honeybadgerReportToolColor sprayInjector
@@ -28,33 +29,6 @@ PORTDOCS=	README.rst LICENSE LICENSE_BSD
 
 LICENSE=	GPLv3
 
-post-patch:
-	@${MKDIR} ${WRKSRC}/src/github.com/david415/HoneyBadger
-.for src in .travis.yml LICENSE LICENSE_BSD README.rst attack blocks cmd \
-	connection.go connection_test.go dispatcher.go dispatcher_test.go \
-	drivers logging ordered_coalesce.go ordered_coalesce_test.go \
-	pcap_integration_test.go retrospective.go retrospective_test.go \
-	sniffer.go supervisor.go types
-	@${MV} ${WRKSRC}/${src} \
-		${WRKSRC}/src/github.com/david415/HoneyBadger
-.endfor
-	@${MKDIR} ${WRKSRC}/src/github.com/google
-	@${MKDIR} ${WRKSRC}/src/github.com/fatih
-	@${MKDIR} ${WRKSRC}/src/github.com/mattn
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKSRC_gp} \
-		${WRKSRC}/src/github.com/google/gopacket
-	@${MV} ${WRKSRC_co} \
-		${WRKSRC}/src/github.com/fatih/color
-	@${MV} ${WRKSRC_gc} \
-		${WRKSRC}/src/github.com/mattn/go-colorable
-	@${MV} ${WRKSRC_gi} \
-		${WRKSRC}/src/github.com/mattn/go-isatty
-	@${MV} ${WRKSRC_xn} \
-		${WRKSRC}/src/golang.org/x/net
-	@${MV} ${WRKSRC_xs} \
-		${WRKSRC}/src/golang.org/x/sys
-
 do-build:
 .for bin in ${BIN_FILES}
 	cd ${WRKSRC}/src/github.com/david415/HoneyBadger/cmd/${bin}; ${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build
diff --git a/sysutils/epazote/Makefile b/sysutils/epazote/Makefile
index 6fc5421279bf..49026b2be39f 100644
--- a/sysutils/epazote/Makefile
+++ b/sysutils/epazote/Makefile
@@ -15,33 +15,14 @@ BUILD_DEPENDS=  go>=1.7:lang/go
 USES=           compiler
 
 USE_GITHUB=     yes
-GH_ACCOUNT=     epazote:DEFAULT \
-		epazote:scheduler \
-		go-yaml:yaml
-GH_PROJECT=     epazote scheduler:scheduler yaml:yaml
-GH_TAGNAME=	0.1.0:scheduler v2:yaml
+GH_TUPLE=	epazote:scheduler:0.1.0:scheduler/src/github.com/epazote/scheduler \
+		go-yaml:yaml:v2:yaml/src/gopkg.in/yaml.v2
+GH_SUBDIR=	src/github.com/${PORTNAME}/${PORTNAME}
 
 STRIP=          # stripping can break go binaries
 
 PLIST_FILES=	bin/epazote
 
-post-patch:
-	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-.for src in a_test.go block.go block_test.go changelog.md cmd color.go \
-       	color_test.go config.go config_test.go epazote.go examples \
-	mail.go mail_test.go mailman.go mailman_test.go report.go \
-	report_test.go request.go request_test.go scandir.go \
-	scandir_test.go singleton.go singleton_test.go start.go \
-       	start_test.go supervice.go supervice_test.go test try.go try_test.go
-	@${MV} ${WRKSRC}/${src} \
-	${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-.endfor
-	@${MV} ${WRKSRC_scheduler}/${src} \
-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/scheduler
-	@${MKDIR} ${WRKSRC}/src/gopkg.in
-	@${MV} ${WRKSRC_yaml}/ \
-		${WRKSRC}/src/gopkg.in/yaml.v2
-
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
 	${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
diff --git a/sysutils/nomad/Makefile b/sysutils/nomad/Makefile
index aabf4ba42728..c86ad94542a9 100644
--- a/sysutils/nomad/Makefile
+++ b/sysutils/nomad/Makefile
@@ -18,12 +18,15 @@ ONLY_FOR_ARCHS=	amd64
 USES=	compiler
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	hashicorp:DEFAULT kardianos:govendor mitchellh:gox \
-		golang:tools axw:gocov matm:gocov_html ugorji:go
-GH_PROJECT=	govendor:govendor gox:gox tools:tools gocov:gocov \
-		gocov-html:gocov_html go:go
-GH_TAGNAME=	v1.0.8:govendor v0.3.0:gox  8b84dae:tools \
-		 c77561c:gocov v1.1:gocov_html faddd61:go
+GH_ACCOUNT=	hashicorp
+GH_SUBDIR=	src/github.com/hashicorp/nomad
+GH_TUPLE=	kardianos:govendor:v1.0.8:govendor/src/github.com/kardianos/govendor \
+		mitchellh:gox:v0.3.0:gox/src/github.com/mitchellh/gox \
+		golang:tools:8b84dae:tools/src/golang.org/x/tools \
+		axw:gocov:c77561c:gocov/src/github.com/axw/gocov \
+		matm:gocov-html:v1.1:gocov_html/src/gopkg.in/matm/v1/gocov-html \
+		ugorji:go:faddd61:go/src/github.com/ugorji/go
+
 
 USE_RC_SUBR= nomad
 
@@ -32,35 +35,6 @@ GROUPS=	nomad
 
 STRIP=
 
-post-patch:
-	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp/nomad
-.for src in .gitignore .travis.yml api CHANGELOG.md client command \
-	commands.go demo dist GNUmakefile helper ISSUE_TEMPLATE.md jobspec \
-	LICENSE main_test.go main.go nomad README.md scheduler scripts \
-	testutil Vagrantfile vendor version.go website
-	@${MV} ${WRKSRC}/${src} \
-		${WRKSRC}/src/github.com/hashicorp/nomad
-.endfor
-	@${MKDIR} ${WRKSRC}/src/github.com/axw
-	@${MKDIR} ${WRKSRC}/src/github.com/kardianos
-	@${MKDIR} ${WRKSRC}/src/github.com/matm
-	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
-	@${MKDIR} ${WRKSRC}/src/github.com/ugorji
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MKDIR} ${WRKSRC}/src/gopkg.in/matm/v1
-	@${MV} ${WRKSRC_govendor} \
-		${WRKSRC}/src/github.com/kardianos/govendor
-	@${MV} ${WRKSRC_gox} \
-		${WRKSRC}/src/github.com/mitchellh/gox
-	@${MV} ${WRKSRC_gocov} \
-		${WRKSRC}/src/github.com/axw/gocov
-	@${MV} ${WRKSRC_go} \
-		${WRKSRC}/src/github.com/ugorji/go
-	@${MV} ${WRKSRC_gocov_html} \
-		${WRKSRC}/src/gopkg.in/matm/v1/gocov-html
-	@${MV} ${WRKSRC_tools} \
-		${WRKSRC}/src/golang.org/x/tools
-
 do-build:
 	@cd ${WRKSRC}/src/github.com/hashicorp/nomad; \
 	${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \
diff --git a/sysutils/restic/Makefile b/sysutils/restic/Makefile
index 2bbb7836bdcd..689167e3ae95 100644
--- a/sysutils/restic/Makefile
+++ b/sysutils/restic/Makefile
@@ -14,23 +14,21 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 BROKEN=		fails to build
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	restic:DEFAULT,chunker juju:errors golang:crypto
-GH_PROJECT=	chunker:chunker errors:errors crypto:crypto
-GH_TAGNAME=	16a28ff:chunker 1b5e39b:errors 74f810a:crypto
+GH_TUPLE=	restic:chunker:16a28ff:chunker/src/github.com/restic/chunker \
+		juju:errors:1b5e39b:errors/src/github.com/juju/errors \
+		golang:crypto:74f810a:crypto/src/golang.org/x/crypto
 
 STRIP=		# stripping can break go binaries
 
+# Seems to build even less when using
+# GH_SUBDIR=/src/github.com/${GH_ACCOUNT}/${PORTNAME} instead of this
+# post-extract thing:
 post-extract:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 .for src in CONTRIBUTING.md Godeps LICENSE Makefile README.md VERSION Vagrantfile appveyor.yml archiver.go archiver_int_test.go archiver_test.go backend build.go cache.go cache_test.go checker cmd crypto debug doc doc.go filter fuse lock.go lock_test.go lock_unix.go lock_windows.go node.go node_darwin.go node_freebsd.go node_linux.go node_openbsd.go node_test.go node_unix.go node_windows.go pack pipe progress.go repository restorer.go run_integration_tests.go run_tests.go snapshot.go snapshot_test.go test tree.go tree_test.go walk.go walk_test.go
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/restic/${PORTNAME}
 .endfor
-	@${MKDIR} ${WRKSRC}/src/github.com/juju
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MV} ${WRKSRC_chunker} ${WRKSRC}/src/github.com/restic/chunker
-	@${MV} ${WRKSRC_errors} ${WRKSRC}/src/github.com/juju/errors
-	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go run build.go
diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile
index 7c8b51d0dda5..782423a60002 100644
--- a/textproc/multimarkdown/Makefile
+++ b/textproc/multimarkdown/Makefile
@@ -16,6 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	fletcher:DEFAULT nddrylliog:greg
 GH_PROJECT=	MultiMarkdown-4 greg:greg
 GH_TAGNAME=	98ecf13:greg
+GH_SUBDIR=	greg:greg
 
 ALL_TARGET=	${PORTNAME}
 USES=		gmake
@@ -27,25 +28,15 @@ HELPERS_DESC=		Helper scripts (conflicts with emulators/mtools)
 
 CHEAT_SHEET_GH_PROJECT=	human-markdown-reference:cheat
 CHEAT_SHEET_GH_TAGNAME=	199dae8:cheat
+CHEAT_SHEET_GH_SUBDIR=	cheat-sheet:cheat
 EXTRAS_GH_PROJECT=	MMD-Support:support
 EXTRAS_GH_TAGNAME=	685c95c:support
+EXTRAS_GH_SUBDIR=	Support:support
 
 HELPERS_CONFLICTS_INSTALL=	mtools-*
 
 OPTIONS_SUB=	yes
 
-post-extract:
-	@${RMDIR} ${WRKSRC}/greg
-	@${MV} ${WRKSRC_greg} ${WRKSRC}/greg
-
-post-extract-CHEAT_SHEET-on:
-	@${RMDIR} ${WRKSRC}/cheat-sheet
-	@${MV} ${WRKSRC_cheat} ${WRKSRC}/cheat-sheet
-
-post-extract-EXTRAS-on:
-	@${RMDIR} ${WRKSRC}/Support
-	@${MV} ${WRKSRC_support} ${WRKSRC}/Support
-
 post-patch:
 	@${REINPLACE_CMD} -E "s/^(CFLAGS).+=/\1 \+=/" ${WRKSRC}/Makefile ${WRKSRC}/greg/Makefile
 	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g" ${WRKSRC}/scripts/*
diff --git a/www/uchiwa/Makefile b/www/uchiwa/Makefile
index b9cca580d685..16b33c750070 100644
--- a/www/uchiwa/Makefile
+++ b/www/uchiwa/Makefile
@@ -19,76 +19,43 @@ UCHIWA_SHAREDIR=	${PREFIX}/share/uchiwa/public
 USE_RC_SUBR=	${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	sensu:DEFAULT
-GH_TUPLE=	dgrijalva:jwt-go:61124b62ad244d655f87d944aefaa2ae5a0d2f16:jwtgo
-GH_TUPLE+=	gorilla:context:215affda49addc4c8ef7e2534915df2c8c35c6cd:context
-GH_TUPLE+=	mitchellh:mapstructure:f7d28d5aeab42b9b95d2e6d6b956f73a290077fc:mapstructure
-GH_TUPLE+=	palourde:mergo:d931ffd2c07cb4caf7194e0f6af9ac6771c26d54:mergo
-GH_TUPLE+=	stretchr:objx:cbeaeb16a013161a98496fad62933b1d21786672:objx
-GH_TUPLE+=	stretchr:testify:e4ec8152c15fc46bd5056ce65997a07c7d415325:testify
-GH_TUPLE+=	sensu:uchiwa-web:${PORTVERSION}:uchiwaweb
-GH_TUPLE+=	angular:bower-angular-cookies:b89821e37d3011ad0bca9a4847a8fcc59f90fabb:bowerangularcookies
-GH_TUPLE+=	urish:angular-moment:0.9.2:urishangularmoment
-GH_TUPLE+=	angular:bower-angular:v1.4.11:angularbowerangular
-GH_TUPLE+=	angular:bower-angular-route:v1.4.11:angularbowerangularroute
-GH_TUPLE+=	angular:bower-angular-sanitize:v1.4.11:angularbowerangularsanitize
-GH_TUPLE+=	twbs:bootstrap:v3.1.1:bootstrap
-GH_TUPLE+=	twbs:bootstrap-sass:v3.1.1:bootstrapsass
-GH_TUPLE+=	foxandxss:angular-toastr:1.6.0:forandxssangulartoastr
-GH_TUPLE+=	wallin:angular-gravatar:0.3.2:wallinangulargravatar
-GH_TUPLE+=	fortawesome:font-awesome:v4.4.0:fortawesomefontawesome
-GH_TUPLE+=	components:highlightjs:08edd75426b52b165cc2b8a569870df4794c36dc:componentshighlightjs
-GH_TUPLE+=	angular-ui:bootstrap-bower:0.13.4:angularuibootstrapbower
-GH_TUPLE+=	moment:moment:2.8.4:momentmoment
-GH_TUPLE+=	jquery:jquery-dist:3.0.0:jqueryjquery
-GH_TUPLE+=	jashkenas:underscore:1f4bf626f23a99f7a676f5076dc1b1475554c8f7:jashkenasunderscore
-GH_TUPLE+=	kless:osutil:3ac994847c4376a4b905fc0a19f450c5a4bec647:klessosutil
+GH_TUPLE=	dgrijalva:jwt-go:61124b62ad244d655f87d944aefaa2ae5a0d2f16:jwtgo/src/github.com/dgrijalva/jwt-go
+GH_TUPLE+=	gorilla:context:215affda49addc4c8ef7e2534915df2c8c35c6cd:context/src/github.com/gorilla/context
+GH_TUPLE+=	mitchellh:mapstructure:f7d28d5aeab42b9b95d2e6d6b956f73a290077fc:mapstructure/src/github.com/mitchellh/mapstructure
+GH_TUPLE+=	palourde:mergo:d931ffd2c07cb4caf7194e0f6af9ac6771c26d54:mergo/src/github.com/palourde/mergo
+GH_TUPLE+=	stretchr:objx:cbeaeb16a013161a98496fad62933b1d21786672:objx/src/github.com/stretchr/objx
+GH_TUPLE+=	stretchr:testify:e4ec8152c15fc46bd5056ce65997a07c7d415325:testify/src/github.com/stretchr/testify
+GH_TUPLE+=	sensu:uchiwa-web:${PORTVERSION}:uchiwaweb/public/bower_components/uchiwa-web
+GH_TUPLE+=	angular:bower-angular-cookies:b89821e37d3011ad0bca9a4847a8fcc59f90fabb:bowerangularcookies/public/bower_components/angular-cookies
+GH_TUPLE+=	urish:angular-moment:0.9.2:urishangularmoment/public/bower_components/angular-moment
+GH_TUPLE+=	angular:bower-angular:v1.4.11:angularbowerangular/public/bower_components/angular
+GH_TUPLE+=	angular:bower-angular-route:v1.4.11:angularbowerangularroute/public/bower_components/angular-route
+GH_TUPLE+=	angular:bower-angular-sanitize:v1.4.11:angularbowerangularsanitize/public/bower_components/angular-sanitize
+GH_TUPLE+=	twbs:bootstrap:v3.1.1:bootstrap/public/bower_components/bootstrap
+GH_TUPLE+=	twbs:bootstrap-sass:v3.1.1:bootstrapsass/public/bower_components/bootstrap-sass-official
+GH_TUPLE+=	foxandxss:angular-toastr:1.6.0:forandxssangulartoastr/public/bower_components/angular-toastr
+GH_TUPLE+=	wallin:angular-gravatar:0.3.2:wallinangulargravatar/public/bower_components/angular-gravatar
+GH_TUPLE+=	fortawesome:Font-Awesome:v4.4.0:fortawesomefontawesome/public/bower_components/fontawesome
+GH_TUPLE+=	components:highlightjs:08edd75426b52b165cc2b8a569870df4794c36dc:componentshighlightjs/public/bower_components/highlightjs
+GH_TUPLE+=	angular-ui:bootstrap-bower:0.13.4:angularuibootstrapbower/public/bower_components/angular-bootstrap
+GH_TUPLE+=	moment:moment:2.8.4:momentmoment/public/bower_components/moment
+GH_TUPLE+=	jquery:jquery-dist:3.0.0:jqueryjquery/public/bower_components/jquery
+GH_TUPLE+=	jashkenas:underscore:1f4bf626f23a99f7a676f5076dc1b1475554c8f7:jashkenasunderscore/public/bower_components/underscore
+GH_TUPLE+=	kless:osutil:3ac994847c4376a4b905fc0a19f450c5a4bec647:klessosutil/src/github.com/kless/osutil
+
 USERS=	uchiwa
 GROUPS=	uchiwa
 
 STRIP=	#
 
-post-patch:
-	@${MKDIR} ${WRKSRC}/src/github.com/sensu/uchiwa
-	@${MKDIR} ${WRKSRC}/src/github.com/dgrijalva
-	@${MKDIR} ${WRKSRC}/src/github.com/gorilla
-	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
-	@${MKDIR} ${WRKSRC}/src/github.com/palourde
-	@${MKDIR} ${WRKSRC}/src/github.com/stretchr
-	@${MKDIR} ${WRKSRC}/src/github.com/stretchr/testify
-	@${MKDIR} ${WRKSRC}/src/github.com/kless
-	@${MKDIR} ${WRKSRC}/src/github.com/tools
-
+post-extract:
+	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 .for src in .travis.yml Gruntfile.js bower.json package.json uchiwa \
 	Dockerfile LICENSE config.json.example public uchiwa.go .bowerrc \
 	Godeps README.md fixtures
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 .endfor
-	@${MV} ${WRKSRC_jwtgo} ${WRKSRC}/src/github.com/dgrijalva/jwt-go
-	@${MV} ${WRKSRC_context} ${WRKSRC}/src/github.com/gorilla/context
-	@${MV} ${WRKSRC_mapstructure} ${WRKSRC}/src/github.com/mitchellh/mapstructure
-	@${MV} ${WRKSRC_mergo} ${WRKSRC}/src/github.com/palourde/mergo
-	@${MV} ${WRKSRC_objx} ${WRKSRC}/src/github.com/stretchr/objx
-	@${MV} ${WRKSRC_testify}/assert ${WRKSRC}/src/github.com/stretchr/testify/assert
-	@${MV} ${WRKSRC_testify}/mock ${WRKSRC}/src/github.com/stretchr/testify/mock
-	@${MV} ${WRKSRC_klessosutil} ${WRKSRC}/src/github.com/kless/osutil
-	@${MKDIR} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components
-	@${MV} ${WRKSRC_bowerangularcookies} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/angular-cookies
-	@${MV} ${WRKSRC_urishangularmoment} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/angular-moment
-	@${MV} ${WRKSRC_angularbowerangular} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/angular
-	@${MV} ${WRKSRC_angularbowerangularroute} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/angular-route
-	@${MV} ${WRKSRC_angularbowerangularsanitize} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/angular-sanitize
-	@${MV} ${WRKSRC_bootstrap} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/bootstrap
-	@${MV} ${WRKSRC_bootstrapsass} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/bootstrap-sass-official
-	@${MV} ${WRKSRC_forandxssangulartoastr} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/angular-toastr
-	@${MV} ${WRKSRC_wallinangulargravatar} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/angular-gravatar
-	@${MV} ${WRKDIR}/Font-Awesome-4.4.0 ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/fontawesome
-	@${MV} ${WRKSRC_componentshighlightjs} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/highlightjs
-	@${MV} ${WRKSRC_angularuibootstrapbower} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/angular-bootstrap
-	@${MV} ${WRKSRC_jqueryjquery} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/jquery
-	@${MV} ${WRKSRC_jashkenasunderscore} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/underscore
-	@${MV} ${WRKSRC_momentmoment} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/moment
-	@${MV} ${WRKSRC_uchiwaweb} ${WRKSRC}/src/github.com/sensu/uchiwa/public/bower_components/uchiwa-web
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/sensu && ${SETENV} GOPATH=${WRKSRC} go install ./...
diff --git a/www/uchiwa/distinfo b/www/uchiwa/distinfo
index b4db05c7a617..cf8b4a4de96e 100644
--- a/www/uchiwa/distinfo
+++ b/www/uchiwa/distinfo
@@ -33,8 +33,8 @@ SHA256 (foxandxss-angular-toastr-1.6.0_GH0.tar.gz) = a1f27884ce936580df3716adec6
 SIZE (foxandxss-angular-toastr-1.6.0_GH0.tar.gz) = 26166
 SHA256 (wallin-angular-gravatar-0.3.2_GH0.tar.gz) = 938d248fd115cf2bc6b24416cc908aa34bb7bf4b1649f67348d2c571458505a7
 SIZE (wallin-angular-gravatar-0.3.2_GH0.tar.gz) = 14827
-SHA256 (fortawesome-font-awesome-v4.4.0_GH0.tar.gz) = 3962ab205a1547be1e10a840f44fa6b6a28359e6f3f21932f0f8dabf419eeccb
-SIZE (fortawesome-font-awesome-v4.4.0_GH0.tar.gz) = 2310490
+SHA256 (fortawesome-Font-Awesome-v4.4.0_GH0.tar.gz) = 3962ab205a1547be1e10a840f44fa6b6a28359e6f3f21932f0f8dabf419eeccb
+SIZE (fortawesome-Font-Awesome-v4.4.0_GH0.tar.gz) = 2310490
 SHA256 (components-highlightjs-08edd75426b52b165cc2b8a569870df4794c36dc_GH0.tar.gz) = 3b576e352ce0331485cb39b42983f40a69c810b9a29ba72f0850243236961df7
 SIZE (components-highlightjs-08edd75426b52b165cc2b8a569870df4794c36dc_GH0.tar.gz) = 401481
 SHA256 (angular-ui-bootstrap-bower-0.13.4_GH0.tar.gz) = 38f15424f8eac597198bb0a1dfdddddb6afbfe3ef9633b24240f3bc070ec036b