misc/exercism: update to 2.2.5

2 files changed, 6 insertions, 35 deletions

diff --git a/misc/exercism/Makefile b/misc/exercism/Makefile
index 1410c411b1e4..262399c3aaaa 100644
--- a/misc/exercism/Makefile
+++ b/misc/exercism/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	exercism
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	misc
 
@@ -12,9 +12,7 @@ COMMENT=	CLI client for exercism.io
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	codegangsta:cg kardianos:osext golang:text,net davecgh:spew pmezard:diff stretchr:testify
-GH_PROJECT=	cli:DEFAULT cli:cg osext:osext text:text net:net go-spew:spew go-difflib:diff testify:testify
-GH_TAGNAME=	bca61c4:cg 6e7f843:osext 3eb7007:text 51854ab:net 5215b55:spew e8554b8:diff e3a8ff8:testify
+GH_PROJECT=	cli
 
 STRIP=		# stripping can break go binaries
 
@@ -23,26 +21,13 @@ PLIST_FILES=	bin/exercism
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
 .for src in .gitignore .travis.yml CHANGELOG.md LICENSE README.md RELEASE.md \
-	api bin cmd config exercism fixtures user debug paths
+	api bin cmd config exercism fixtures user debug paths vendor
 	@${MV} ${WRKSRC}/${src} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
 .endfor
-	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MKDIR} ${WRKSRC}/src/github.com/codegangsta
-	@${MKDIR} ${WRKSRC}/src/github.com/kardianos
-	@${MKDIR} ${WRKSRC}/src/github.com/davecgh
-	@${MKDIR} ${WRKSRC}/src/github.com/pmezard
-	@${MKDIR} ${WRKSRC}/src/github.com/stretchr
-	@${MV} ${WRKSRC_cg} ${WRKSRC}/src/github.com/codegangsta/cli
-	@${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/kardianos/osext
-	@${MV} ${WRKSRC_spew} ${WRKSRC}/src/github.com/davecgh/go-spew
-	@${MV} ${WRKSRC_diff} ${WRKSRC}/src/github.com/pmezard/go-difflib
-	@${MV} ${WRKSRC_testify} ${WRKSRC}/src/github.com/stretchr/testify
-	@${MV} ${WRKSRC_text} ${WRKSRC}/src/golang.org/x/text
-	@${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net
 
 do-build:
 	@(cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-		${SETENV} GOPATH=${WRKSRC} go build -o bin/exercism exercism/main.go)
+		${SETENV} GO15VENDOREXPERIMENT=1 GOPATH=${WRKSRC} go build -o bin/exercism exercism/main.go)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/bin/exercism ${STAGEDIR}${PREFIX}/bin
diff --git a/misc/exercism/distinfo b/misc/exercism/distinfo
index 212cf520dbcb..b15fff759c97 100644
--- a/misc/exercism/distinfo
+++ b/misc/exercism/distinfo
@@ -1,16 +1,2 @@
-SHA256 (exercism-cli-v2.2.3_GH0.tar.gz) = ec04288438d8c7db89c430a2e7ca81c95a22a9826d024f25b31e09181db9c84d
-SIZE (exercism-cli-v2.2.3_GH0.tar.gz) = 33475
-SHA256 (codegangsta-cli-bca61c4_GH0.tar.gz) = 7412284f55e1f5594eaaeace5a16875668ff9c1de1d7ecd5778b667c5ec9c5d2
-SIZE (codegangsta-cli-bca61c4_GH0.tar.gz) = 19936
-SHA256 (kardianos-osext-6e7f843_GH0.tar.gz) = 46cedd30cfc2b576226df5c1f4694b6f0d89927d396053a890e7f4b95afce62f
-SIZE (kardianos-osext-6e7f843_GH0.tar.gz) = 4219
-SHA256 (golang-text-3eb7007_GH0.tar.gz) = b3cfe138ba44472c2bee2cacb15095536a40844ce378db26f451a9265bf3dc48
-SIZE (golang-text-3eb7007_GH0.tar.gz) = 3732219
-SHA256 (golang-net-51854ab_GH0.tar.gz) = 685a7eee0d2cee38d2435ebfbeea5d446af14bc26c989ef2f0ce86eb57643f89
-SIZE (golang-net-51854ab_GH0.tar.gz) = 537367
-SHA256 (davecgh-go-spew-5215b55_GH0.tar.gz) = a73d6352d8172dfb648e6aa25a8b81ed5c1895295090c876bef01d017264cbac
-SIZE (davecgh-go-spew-5215b55_GH0.tar.gz) = 41794
-SHA256 (pmezard-go-difflib-e8554b8_GH0.tar.gz) = 924f8b0dcae8c7b5b4f8f391f8a5b3046c37f471a8a49c2c38bf50bb0e5f83f9
-SIZE (pmezard-go-difflib-e8554b8_GH0.tar.gz) = 11266
-SHA256 (stretchr-testify-e3a8ff8_GH0.tar.gz) = a9eba073bbc58e40b85a263894a1bdf1cd1fd3acef0b5bfffc89a2307f23ab8c
-SIZE (stretchr-testify-e3a8ff8_GH0.tar.gz) = 39381
+SHA256 (exercism-cli-v2.2.5_GH0.tar.gz) = 39c0d1e0d0618e5d2871cb13c206d1ff185a653c99d1b2c4244e948032ea2125
+SIZE (exercism-cli-v2.2.5_GH0.tar.gz) = 2019553