More USE_GITHUB cleanup.

Use GH_SUBDIR, or GH_TUPLE, where applicable.

Sponsored by:	Absolight

2 files changed, 28 insertions, 61 deletions

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