1 files changed, 43 insertions, 123 deletions

diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 5f7841f097fb..8f08f713092b 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -15,134 +15,54 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	go>=1.5.0:lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	eknkc:amber \
-		spf13:DEFAULT,afero,jWalterWeatherman,cast,cobra \
-		spf13:fsync,nitro,pflag,viper \
-		yosssi:ace \
-		BurntSushi:toml \
-		PuerkitoBio:purell,urlesc \
-		bep:inflect \
-		dchest:cssmin \
-		fsnotify:fsnotify \
-		gorilla:websocket \
-		hashicorp:hcl \
-		kardianos:osext \
-		kr:fs \
-		kyokomi:emoji \
-		magiconair:properties \
-		miekg:mmark \
-		mitchellh:mapstructure \
-		pkg:errors,sftp \
-		russross:blackfriday \
-		shurcooL:sanitized_anchor_name \
-		golang:crypto,sys,text,net \
-		go-yaml:yaml \
-		cpuguy83:go_md2man \
-		nicksnyder:go_i18n \
-		pelletier:go_toml,go_buffruneio
-GH_PROJECT=	amber:amber afero:afero \
-		jWalterWeatherman:jWalterWeatherman ace:ace toml:toml \
-		purell:purell urlesc:urlesc inflect:inflect cssmin:cssmin \
-		fsnotify:fsnotify websocket:websocket hcl:hcl osext:osext \
-		fs:fs emoji:emoji properties:properties mmark:mmark \
-		mapstructure:mapstructure errors:errors sftp:sftp \
-		go-md2man:go_md2man blackfriday:blackfriday \
-		sanitized_anchor_name:sanitized_anchor_name cast:cast \
-		cobra:cobra fsync:fsync nitro:nitro pflag:pflag viper:viper \
-		crypto:crypto sys:sys text:text yaml:yaml go-i18n:go_i18n \
-		go-toml:go_toml go-buffruneio:go_buffruneio net:net
-GH_TAGNAME=	80f9e27:amber 52e4a6c:afero \
-		33c24e7:jWalterWeatherman ea038f4:ace bbd5bb6:toml \
-		8a29053:purell 5bd2802:urlesc b896c45:inflect \
-		a65d4d2:go_md2man fb8d9b4:cssmin 944cff2:fsnotify \
-		1f512fc:websocket 6f5bfed:hcl c2c54e5:osext 2788f0d:fs \
-		17c5e70:emoji c265cfa:properties c584d6f:mmark \
-		a6ef2f0:mapstructure 645ef00:errors 4d0e916:sftp \
-		0b647d0:blackfriday 1dba4b3:sanitized_anchor_name 2580bc9:cast \
-		9c28e4b:cobra 1773df7:fsync 24d7ef3:nitro b83537d:pflag \
-		ec4eb2f:viper d172538:crypto 8d1157a:sys ede1cb9:text \
-		a5b47d3:yaml e6c90c3:go_i18n 64ff1ea:go_toml \
-		df1e16f:go_buffruneio f4b625e:net
+GH_ACCOUNT=	spf13
+GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
+GH_TUPLE=	eknkc:amber:80f9e27:amber/src/github.com/eknkc/amber \
+		spf13:afero:52e4a6c:afero/src/github.com/spf13/afero \
+		spf13:jWalterWeatherman:33c24e7:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \
+		spf13:cast:2580bc9:cast/src/github.com/spf13/cast \
+		spf13:cobra:9c28e4b:cobra/src/github.com/spf13/cobra \
+		spf13:fsync:1773df7:fsync/src/github.com/spf13/fsync \
+		spf13:nitro:24d7ef3:nitro/src/github.com/spf13/nitro \
+		spf13:pflag:b83537d:pflag/src/github.com/spf13/pflag \
+		spf13:viper:ec4eb2f:viper/src/github.com/spf13/viper \
+		yosssi:ace:ea038f4:ace/src/github.com/yosssi/ace \
+		BurntSushi:toml:bbd5bb6:toml/src/github.com/BurntSushi/toml \
+		PuerkitoBio:purell:8a29053:purell/src/github.com/PuerkitoBio/purell \
+		PuerkitoBio:urlesc:5bd2802:urlesc/src/github.com/PuerkitoBio/urlesc \
+		bep:inflect:b896c45:inflect/src/github.com/bep/inflect \
+		dchest:cssmin:fb8d9b4:cssmin/src/github.com/dchest/cssmin \
+		fsnotify:fsnotify:944cff2:fsnotify/src/github.com/fsnotify/fsnotify \
+		gorilla:websocket:1f512fc:websocket/src/github.com/gorilla/websocket \
+		hashicorp:hcl:6f5bfed:hcl/src/github.com/hashicorp/hcl \
+		kardianos:osext:c2c54e5:osext/src/github.com/kardianos/osext \
+		kr:fs:2788f0d:fs/src/github.com/kr/fs \
+		kyokomi:emoji:17c5e70:emoji/src/github.com/kyokomi/emoji \
+		magiconair:properties:c265cfa:properties/src/github.com/magiconair/properties \
+		miekg:mmark:c584d6f:mmark/src/github.com/miekg/mmark \
+		mitchellh:mapstructure:a6ef2f0:mapstructure/src/github.com/mitchellh/mapstructure \
+		pkg:errors:645ef00:errors/src/github.com/pkg/errors \
+		pkg:sftp:4d0e916:sftp/src/github.com/pkg/sftp \
+		russross:blackfriday:0b647d0:blackfriday/src/github.com/russross/blackfriday \
+		shurcooL:sanitized_anchor_name:1dba4b3:sanitized_anchor_name/src/github.com/shurcooL/sanitized_anchor_name \
+		golang:crypto:d172538:crypto/src/golang.org/x/crypto \
+		golang:sys:8d1157a:sys/src/golang.org/x/sys \
+		golang:text:ede1cb9:text/src/golang.org/x/text \
+		golang:net:f4b625e:net/src/golang.org/x/net \
+		go-yaml:yaml:a5b47d3:yaml/src/gopkg.in/yaml.v2 \
+		cpuguy83:go-md2man:a65d4d2:go_md2man/src/github.com/cpuguy83/go-md2man \
+		nicksnyder:go-i18n:e6c90c3:go_i18n/src/github.com/nicksnyder/go-i18n \
+		pelletier:go-toml:64ff1ea:go_toml/src/github.com/pelletier/go-toml \
+		pelletier:go-buffruneio:df1e16f:go_buffruneio/src/github.com/pelletier/go-buffruneio
 
 STRIP=		# stripping can break go binaries
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/src/github.com/BurntSushi
-	@${MKDIR} ${WRKSRC}/src/github.com/PuerkitoBio
-	@${MKDIR} ${WRKSRC}/src/github.com/bep
-	@${MKDIR} ${WRKSRC}/src/github.com/cpuguy83
-	@${MKDIR} ${WRKSRC}/src/github.com/dchest
-	@${MKDIR} ${WRKSRC}/src/github.com/eknkc
-	@${MKDIR} ${WRKSRC}/src/github.com/fsnotify
-	@${MKDIR} ${WRKSRC}/src/github.com/gorilla
-	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
-	@${MKDIR} ${WRKSRC}/src/github.com/kardianos
-	@${MKDIR} ${WRKSRC}/src/github.com/kr
-	@${MKDIR} ${WRKSRC}/src/github.com/kyokomi
-	@${MKDIR} ${WRKSRC}/src/github.com/magiconair
-	@${MKDIR} ${WRKSRC}/src/github.com/miekg
-	@${MKDIR} ${WRKSRC}/src/github.com/mitchellh
-	@${MKDIR} ${WRKSRC}/src/github.com/pkg
-	@${MKDIR} ${WRKSRC}/src/github.com/russross
-	@${MKDIR} ${WRKSRC}/src/github.com/shurcooL
-	@${MKDIR} ${WRKSRC}/src/github.com/spf13
-	@${MKDIR} ${WRKSRC}/src/github.com/spf13/hugo
-	@${MKDIR} ${WRKSRC}/src/github.com/yosssi
-	@${MKDIR} ${WRKSRC}/src/github.com/nicksnyder
-	@${MKDIR} ${WRKSRC}/src/github.com/pelletier
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MKDIR} ${WRKSRC}/src/gopkg.in
-.for src in CONTRIBUTING.md Dockerfile LICENSE.md Makefile README.md bench.sh \
-		bufferpool commands create docs examples helpers hugofs \
-		hugolib livereload main.go parser requirements.txt source \
-		target tpl transform utils watcher wercker.yml
-		@${MV} ${WRKSRC}/${src} \
-			${WRKSRC}/src/github.com/spf13/${PORTNAME}
-.endfor
-	@${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/BurntSushi/toml
-	@${MV} ${WRKSRC_purell} ${WRKSRC}/src/github.com/PuerkitoBio/purell
-	@${MV} ${WRKSRC_urlesc} ${WRKSRC}/src/github.com/PuerkitoBio/urlesc
-	@${MV} ${WRKSRC_inflect} ${WRKSRC}/src/github.com/bep/inflect
-	@${MV} ${WRKSRC_go_md2man} ${WRKSRC}/src/github.com/cpuguy83/go-md2man
-	@${MV} ${WRKSRC_cssmin} ${WRKSRC}/src/github.com/dchest/cssmin
-	@${MV} ${WRKSRC_amber} ${WRKSRC}/src/github.com/eknkc/amber
-	@${MV} ${WRKSRC_fsnotify} ${WRKSRC}/src/github.com/fsnotify/fsnotify
-	@${MV} ${WRKSRC_websocket} ${WRKSRC}/src/github.com/gorilla/websocket
-	@${MV} ${WRKSRC_hcl} ${WRKSRC}/src/github.com/hashicorp/hcl
-	@${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/kardianos/osext
-	@${MV} ${WRKSRC_fs} ${WRKSRC}/src/github.com/kr/fs
-	@${MV} ${WRKSRC_emoji} ${WRKSRC}/src/github.com/kyokomi/emoji
-	@${MV} ${WRKSRC_properties} ${WRKSRC}/src/github.com/magiconair/properties
-	@${MV} ${WRKSRC_mmark} ${WRKSRC}/src/github.com/miekg/mmark
-	@${MV} ${WRKSRC_mapstructure} ${WRKSRC}/src/github.com/mitchellh/mapstructure
-	@${MV} ${WRKSRC_errors} ${WRKSRC}/src/github.com/pkg/errors
-	@${MV} ${WRKSRC_sftp} ${WRKSRC}/src/github.com/pkg/sftp
-	@${MV} ${WRKSRC_blackfriday} ${WRKSRC}/src/github.com/russross/blackfriday
-	@${MV} ${WRKSRC_sanitized_anchor_name} ${WRKSRC}/src/github.com/shurcooL/sanitized_anchor_name
-	@${MV} ${WRKSRC_afero} ${WRKSRC}/src/github.com/spf13/afero
-	@${MV} ${WRKSRC_cast} ${WRKSRC}/src/github.com/spf13/cast
-	@${MV} ${WRKSRC_cobra} ${WRKSRC}/src/github.com/spf13/cobra
-	@${MV} ${WRKSRC_fsync} ${WRKSRC}/src/github.com/spf13/fsync
-	@${MV} ${WRKSRC_jWalterWeatherman} ${WRKSRC}/src/github.com/spf13/jwalterweatherman
-	@${MV} ${WRKSRC_nitro} ${WRKSRC}/src/github.com/spf13/nitro
-	@${MV} ${WRKSRC_pflag} ${WRKSRC}/src/github.com/spf13/pflag
-	@${MV} ${WRKSRC_viper} ${WRKSRC}/src/github.com/spf13/viper
-	@${MV} ${WRKSRC_ace} ${WRKSRC}/src/github.com/yosssi/ace
-	@${MV} ${WRKSRC_go_i18n} ${WRKSRC}/src/github.com/nicksnyder/go-i18n
-	@${MV} ${WRKSRC_go_toml} ${WRKSRC}/src/github.com/pelletier/go-toml
-	@${MV} ${WRKSRC_go_buffruneio} ${WRKSRC}/src/github.com/pelletier/go-buffruneio
-	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
-	@${MV} ${WRKSRC_sys} ${WRKSRC}/src/golang.org/x/sys
-	@${MV} ${WRKSRC_text} ${WRKSRC}/src/golang.org/x/text
-	@${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net
-	@${MV} ${WRKSRC_yaml} ${WRKSRC}/src/gopkg.in/yaml.v2
-
 do-build:
-	@cd ${WRKSRC}/src/github.com/spf13/${PORTNAME} && ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}
-	@cd ${WRKSRC}/src/github.com/spf13/${PORTNAME} && ./bin/${PORTNAME} gen man --dir man/man1/
+	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}
+	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME} && ./bin/${PORTNAME} gen man --dir man/man1/
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/spf13/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 .for i in hugo.1 hugo_benchmark.1 hugo_check.1 hugo_config.1 hugo_convert.1 \
 		hugo_convert_toJSON.1 hugo_convert_toTOML.1 \
 		hugo_convert_toYAML.1 hugo_gen.1 hugo_gen_autocomplete.1 \
@@ -151,7 +71,7 @@ do-install:
 		hugo_list_future.1 hugo_new.1 hugo_new_site.1 hugo_new_theme.1 \
 		hugo_server.1 hugo_undraft.1 hugo_version.1 hugo_env.1 \
 		hugo_list_expired.1
-		${INSTALL_MAN} ${WRKSRC}/src/github.com/spf13/${PORTNAME}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1
+		${INSTALL_MAN} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1
 .endfor
 
 .include <bsd.port.mk>