Attachment #194904 for bug #229355





PORTNAME=	grv
DISTVERSIONPREFIX=	v
DISTVERSION=	0.2.0
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	dg@syrec.org

GH_ACCOUNT=	rgburke
GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
GH_TUPLE=	bradfitz:slice:d9036e2:slice/src/github.com/bradfitz/slice \
		camlistore:go4:9599cf2:reflectutil/src/go4.org \
		davecgh:go-spew:8991bc2:spew/src/github.com/davecgh/go-spew \
		gobwas:glob:f00a739:glob/src/github.com/gobwas/glob \
		golang:crypto:a49355c:crypto/src/golang.org/x/crypto \
		golang:sys:63fc586:sys/src/golang.org/x/sys \
		mattn:go-runewidth:ce7b0b5:runewidth/src/github.com/mattn/go-runewidth \
		pmezard:go-difflib:792786c:difflib/src/github.com/pmezard/go-difflib \
		rgburke:goncurses:74f667a:goncurses/src/github.com/rgburke/goncurses \
		rjeczalik:notify:d152f3c:notify/src/github.com/rjeczalik/notify \
		Sirupsen:logrus:75068be:logrus/src/github.com/Sirupsen/logrus \
		stretchr:objx:0ab728f:objx/src/github.com/stretchr/objx \
		stretchr:testify:f35b8ab:testify/src/github.com/stretchr/testify \
		tchap:go-patricia:5ad6cdb:patricia/src/github.com/tchap/go-patricia \
		libgit2:git2go:9abc050:git2go/src/gopkg.in/libgit2/git2go.v27 # Keep git2go branch in sync with devel/libgit2 version

PLIST_FILES=	bin/grv





TIMESTAMP = 1530019157
SHA256 (rgburke-grv-v0.2.0_GH0.tar.gz) = 67988ce85d51603ac861b879b1491bcaa136350fdfff8c218170804aaa55b848
SIZE (rgburke-grv-v0.2.0_GH0.tar.gz) = 5150042
SHA256 (bradfitz-slice-d9036e2_GH0.tar.gz) = 30446ea3f3428f802a6238216cce2a9eeef42429b7be9523073c02d0b976c5ac
SIZE (bradfitz-slice-d9036e2_GH0.tar.gz) = 2623
SHA256 (camlistore-go4-9599cf2_GH0.tar.gz) = 3a25f0a4301fd44ca61a49c41e2c1ad49bf7ab6edf654b1870f1b32a48da6a0c
SIZE (camlistore-go4-9599cf2_GH0.tar.gz) = 139080
SHA256 (davecgh-go-spew-8991bc2_GH0.tar.gz) = df061bffb51b9ccc2eb2c6eb156e96e764ec2391dd2d68eec737ff2e088251d4
SIZE (davecgh-go-spew-8991bc2_GH0.tar.gz) = 42161
SHA256 (gobwas-glob-f00a739_GH0.tar.gz) = 00f2e8f40a8be489a902dc6c7640b207260fd36ed3f264e95f77fd471b7b882f
SIZE (gobwas-glob-f00a739_GH0.tar.gz) = 26188
SHA256 (golang-crypto-a49355c_GH0.tar.gz) = 6e320a3b23c4d03d8d63a4bf888e1b8f4b3e1c8499b6a1dd7397ce8f1b9ca525
SIZE (golang-crypto-a49355c_GH0.tar.gz) = 1616998
SHA256 (golang-sys-63fc586_GH0.tar.gz) = fd291116abf9e771e446647b4acbef48eb78cc768bac64a4ade907c0c3dd1ffe
SIZE (golang-sys-63fc586_GH0.tar.gz) = 976766
SHA256 (mattn-go-runewidth-ce7b0b5_GH0.tar.gz) = e3c7ab1a10c7b35accd18e08e12be4206ee805e44812969a4351199ea5a41b62
SIZE (mattn-go-runewidth-ce7b0b5_GH0.tar.gz) = 22963
SHA256 (pmezard-go-difflib-792786c_GH0.tar.gz) = 7c2a6d7ea0700411ba7d13865230c03bd6734d3ff6c213357bda121f5bb707fb
SIZE (pmezard-go-difflib-792786c_GH0.tar.gz) = 11401
SHA256 (rgburke-goncurses-74f667a_GH0.tar.gz) = af7aabf62aee38639417ac1eef9c3aaabea7e56e5f88c5702cab7a9652613e22
SIZE (rgburke-goncurses-74f667a_GH0.tar.gz) = 46774
SHA256 (rjeczalik-notify-d152f3c_GH0.tar.gz) = 20835f21ab3b0c69cc1c54ee6634ac335d21afc98f0630b90073a89b54e2a1af
SIZE (rjeczalik-notify-d152f3c_GH0.tar.gz) = 56313
SHA256 (Sirupsen-logrus-75068be_GH0.tar.gz) = 35c0ba63048a16546218d1caf8210e2ba1860b678395af275864a646a5f7dcf3
SIZE (Sirupsen-logrus-75068be_GH0.tar.gz) = 27683
SHA256 (stretchr-objx-0ab728f_GH0.tar.gz) = 90d06571d718b42858703a1c4ec456715d3639b9ba5866893cfc2d7626a04370
SIZE (stretchr-objx-0ab728f_GH0.tar.gz) = 76161
SHA256 (stretchr-testify-f35b8ab_GH0.tar.gz) = b7a2961d37598e0fc1bf7e9041f717ec770c7ec935d4a79a2d40f5e6722fe6a2
SIZE (stretchr-testify-f35b8ab_GH0.tar.gz) = 101718
SHA256 (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = ea8127ce3b9e7bedf4ffbe998179d94ebe1c59ad36ece22aa5682fb27d5bab4b
SIZE (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = 11903
SHA256 (libgit2-git2go-9abc050_GH0.tar.gz) = 1e11a65dcf4b601ed68acf5e743ee720f48ef3ade686e2db82f019e5b1a6a1f4
SIZE (libgit2-git2go-9abc050_GH0.tar.gz) = 72758

Lines 1-11 Link Here

(-)devel/grv/files/patch-cmd_grv_repo__data__loader.go (-11 lines)
1	--- cmd/grv/repo_data_loader.go.orig 2018-05-15 13:55:57 UTC
2	+++ cmd/grv/repo_data_loader.go
3	@@ -9,7 +9,7 @@ import (
4
5	log "github.com/Sirupsen/logrus"
6	slice "github.com/bradfitz/slice"
7	- git "gopkg.in/libgit2/git2go.v26"
8	+ git "gopkg.in/libgit2/git2go.v27"
9	)
10
11	const (




--- src/gopkg.in/libgit2/git2go.v27/diff.go.orig	2018-05-15 14:06:24 UTC
+++ src/gopkg.in/libgit2/git2go.v27/diff.go
@@ -14,7 +14,7 @@ import (
 	"unsafe"
 )
 
-type DiffFlag int
+type DiffFlag int64
 
 const (
 	DiffFlagBinary    DiffFlag = C.GIT_DIFF_FLAG_BINARY
@@ -405,7 +405,7 @@ func (diff *Diff) Patch(deltaIndex int) 
 	return newPatchFromC(patchPtr), nil
 }
 
-type DiffOptionsFlag int
+type DiffOptionsFlag int64
 
 const (
 	DiffNormal                 DiffOptionsFlag = C.GIT_DIFF_NORMAL

Return to bug 229355

Lines 2-9 Link Here

(-)devel/grv/Makefile (-13 / +12 lines)
2		2
3	PORTNAME= grv	3	PORTNAME= grv
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.1.3	5	DISTVERSION= 0.2.0
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8		7
9	MAINTAINER= dg@syrec.org	8	MAINTAINER= dg@syrec.org
Lines 20-39 Link Here
20	GH_ACCOUNT= rgburke	19	GH_ACCOUNT= rgburke
21	GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME}	20	GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME}
22	GH_TUPLE= bradfitz:slice:d9036e2:slice/src/github.com/bradfitz/slice \	21	GH_TUPLE= bradfitz:slice:d9036e2:slice/src/github.com/bradfitz/slice \
23	camlistore:go4:fba789b:reflectutil/src/go4.org \	22	camlistore:go4:9599cf2:reflectutil/src/go4.org \
24	davecgh:go-spew:87df7c6:spew/src/github.com/davecgh/go-spew \	23	davecgh:go-spew:8991bc2:spew/src/github.com/davecgh/go-spew \
25	gobwas:glob:51eb1ee:glob/src/github.com/gobwas/glob \	24	gobwas:glob:f00a739:glob/src/github.com/gobwas/glob \
26	golang:crypto:1875d0a:crypto/src/golang.org/x/crypto \	25	golang:crypto:a49355c:crypto/src/golang.org/x/crypto \
27	golang:sys:37707fd:sys/src/golang.org/x/sys \	26	golang:sys:63fc586:sys/src/golang.org/x/sys \
28	mattn:go-runewidth:97311d9:runewidth/src/github.com/mattn/go-runewidth \	27	mattn:go-runewidth:ce7b0b5:runewidth/src/github.com/mattn/go-runewidth \
29	pmezard:go-difflib:792786c:difflib/src/github.com/pmezard/go-difflib \	28	pmezard:go-difflib:792786c:difflib/src/github.com/pmezard/go-difflib \
30	rgburke:goncurses:74f667a:goncurses/src/github.com/rgburke/goncurses \	29	rgburke:goncurses:74f667a:goncurses/src/github.com/rgburke/goncurses \
31	rjeczalik:notify:c31e5f2:notify/src/github.com/rjeczalik/notify \	30	rjeczalik:notify:d152f3c:notify/src/github.com/rjeczalik/notify \
32	Sirupsen:logrus:768a92a:logrus/src/github.com/Sirupsen/logrus \	31	Sirupsen:logrus:75068be:logrus/src/github.com/Sirupsen/logrus \
33	stretchr:objx:8a3f715:objx/src/github.com/stretchr/objx \	32	stretchr:objx:0ab728f:objx/src/github.com/stretchr/objx \
34	stretchr:testify:a726187:testify/src/github.com/stretchr/testify \	33	stretchr:testify:f35b8ab:testify/src/github.com/stretchr/testify \
35	tchap:go-patricia:5ad6cdb:patricia/src/github.com/tchap/go-patricia \	34	tchap:go-patricia:5ad6cdb:patricia/src/github.com/tchap/go-patricia \
36	libgit2:git2go:b479bd1:git2go/src/gopkg.in/libgit2/git2go.v27 # Keep git2go branch in sync with devel/libgit2 version	35	libgit2:git2go:9abc050:git2go/src/gopkg.in/libgit2/git2go.v27 # Keep git2go branch in sync with devel/libgit2 version
37		36
38	PLIST_FILES= bin/grv	37	PLIST_FILES= bin/grv
39		38

Lines 1-33 Link Here

(-)devel/grv/distinfo (-25 / +25 lines)
1	TIMESTAMP = 1526392501	1	TIMESTAMP = 1530019157
2	SHA256 (rgburke-grv-v0.1.3_GH0.tar.gz) = c4684393c5f68be42e4c6c57e9209de8c79426b772cd313083dc34c5a5aac02d	2	SHA256 (rgburke-grv-v0.2.0_GH0.tar.gz) = 67988ce85d51603ac861b879b1491bcaa136350fdfff8c218170804aaa55b848
3	SIZE (rgburke-grv-v0.1.3_GH0.tar.gz) = 4229360	3	SIZE (rgburke-grv-v0.2.0_GH0.tar.gz) = 5150042
4	SHA256 (bradfitz-slice-d9036e2_GH0.tar.gz) = 30446ea3f3428f802a6238216cce2a9eeef42429b7be9523073c02d0b976c5ac	4	SHA256 (bradfitz-slice-d9036e2_GH0.tar.gz) = 30446ea3f3428f802a6238216cce2a9eeef42429b7be9523073c02d0b976c5ac
5	SIZE (bradfitz-slice-d9036e2_GH0.tar.gz) = 2623	5	SIZE (bradfitz-slice-d9036e2_GH0.tar.gz) = 2623
6	SHA256 (camlistore-go4-fba789b_GH0.tar.gz) = 14623c4196629db8fe82d66c62ce497e59cfc3fa8b948b767c55e986cd929721	6	SHA256 (camlistore-go4-9599cf2_GH0.tar.gz) = 3a25f0a4301fd44ca61a49c41e2c1ad49bf7ab6edf654b1870f1b32a48da6a0c
7	SIZE (camlistore-go4-fba789b_GH0.tar.gz) = 78856	7	SIZE (camlistore-go4-9599cf2_GH0.tar.gz) = 139080
8	SHA256 (davecgh-go-spew-87df7c6_GH0.tar.gz) = 27fc117797f5da86efefd7cbd44da0400e237423a5633086e682882c3838cb54	8	SHA256 (davecgh-go-spew-8991bc2_GH0.tar.gz) = df061bffb51b9ccc2eb2c6eb156e96e764ec2391dd2d68eec737ff2e088251d4
9	SIZE (davecgh-go-spew-87df7c6_GH0.tar.gz) = 42156	9	SIZE (davecgh-go-spew-8991bc2_GH0.tar.gz) = 42161
10	SHA256 (gobwas-glob-51eb1ee_GH0.tar.gz) = 664219022e7081c313f6fccf2afb145f4a1d1142d0577f3cd8ab24131249e25b	10	SHA256 (gobwas-glob-f00a739_GH0.tar.gz) = 00f2e8f40a8be489a902dc6c7640b207260fd36ed3f264e95f77fd471b7b882f
11	SIZE (gobwas-glob-51eb1ee_GH0.tar.gz) = 25009	11	SIZE (gobwas-glob-f00a739_GH0.tar.gz) = 26188
12	SHA256 (golang-crypto-1875d0a_GH0.tar.gz) = 648f2ad0b7a255d9286af0202d6ebdfb5703eb3b9d82691c67b32f6092c1ef22	12	SHA256 (golang-crypto-a49355c_GH0.tar.gz) = 6e320a3b23c4d03d8d63a4bf888e1b8f4b3e1c8499b6a1dd7397ce8f1b9ca525
13	SIZE (golang-crypto-1875d0a_GH0.tar.gz) = 1445933	13	SIZE (golang-crypto-a49355c_GH0.tar.gz) = 1616998
14	SHA256 (golang-sys-37707fd_GH0.tar.gz) = 9a86c90f564594b3f201540d19fb4fb828e1df8af61bb2fa9190a760cba039a7	14	SHA256 (golang-sys-63fc586_GH0.tar.gz) = fd291116abf9e771e446647b4acbef48eb78cc768bac64a4ade907c0c3dd1ffe
15	SIZE (golang-sys-37707fd_GH0.tar.gz) = 795284	15	SIZE (golang-sys-63fc586_GH0.tar.gz) = 976766
16	SHA256 (mattn-go-runewidth-97311d9_GH0.tar.gz) = 8330497728f75464111ee7145fc97cfa588cb0d6561b3af5447aa05d489bca85	16	SHA256 (mattn-go-runewidth-ce7b0b5_GH0.tar.gz) = e3c7ab1a10c7b35accd18e08e12be4206ee805e44812969a4351199ea5a41b62
17	SIZE (mattn-go-runewidth-97311d9_GH0.tar.gz) = 22384	17	SIZE (mattn-go-runewidth-ce7b0b5_GH0.tar.gz) = 22963
18	SHA256 (pmezard-go-difflib-792786c_GH0.tar.gz) = 7c2a6d7ea0700411ba7d13865230c03bd6734d3ff6c213357bda121f5bb707fb	18	SHA256 (pmezard-go-difflib-792786c_GH0.tar.gz) = 7c2a6d7ea0700411ba7d13865230c03bd6734d3ff6c213357bda121f5bb707fb
19	SIZE (pmezard-go-difflib-792786c_GH0.tar.gz) = 11401	19	SIZE (pmezard-go-difflib-792786c_GH0.tar.gz) = 11401
20	SHA256 (rgburke-goncurses-74f667a_GH0.tar.gz) = af7aabf62aee38639417ac1eef9c3aaabea7e56e5f88c5702cab7a9652613e22	20	SHA256 (rgburke-goncurses-74f667a_GH0.tar.gz) = af7aabf62aee38639417ac1eef9c3aaabea7e56e5f88c5702cab7a9652613e22
21	SIZE (rgburke-goncurses-74f667a_GH0.tar.gz) = 46774	21	SIZE (rgburke-goncurses-74f667a_GH0.tar.gz) = 46774
22	SHA256 (rjeczalik-notify-c31e5f2_GH0.tar.gz) = 622ce128a6da4c01ea924f0409bd0b36ce52a56380effef9802eb8b558e20ac1	22	SHA256 (rjeczalik-notify-d152f3c_GH0.tar.gz) = 20835f21ab3b0c69cc1c54ee6634ac335d21afc98f0630b90073a89b54e2a1af
23	SIZE (rjeczalik-notify-c31e5f2_GH0.tar.gz) = 56294	23	SIZE (rjeczalik-notify-d152f3c_GH0.tar.gz) = 56313
24	SHA256 (Sirupsen-logrus-768a92a_GH0.tar.gz) = ce58ca8b5b3628757e89a526c5399b684914b1c9979ac5e6cbe30181bbabc55a	24	SHA256 (Sirupsen-logrus-75068be_GH0.tar.gz) = 35c0ba63048a16546218d1caf8210e2ba1860b678395af275864a646a5f7dcf3
25	SIZE (Sirupsen-logrus-768a92a_GH0.tar.gz) = 28603	25	SIZE (Sirupsen-logrus-75068be_GH0.tar.gz) = 27683
26	SHA256 (stretchr-objx-8a3f715_GH0.tar.gz) = 2602184e83baec18f98b2a7ba5d874b423c374ffb84d28a474e69b931412f8a9	26	SHA256 (stretchr-objx-0ab728f_GH0.tar.gz) = 90d06571d718b42858703a1c4ec456715d3639b9ba5866893cfc2d7626a04370
27	SIZE (stretchr-objx-8a3f715_GH0.tar.gz) = 75047	27	SIZE (stretchr-objx-0ab728f_GH0.tar.gz) = 76161
28	SHA256 (stretchr-testify-a726187_GH0.tar.gz) = 799b0b2de51ec7ec5aad54b3ccf7cbca95715f9167310f99487b21e87fcfec51	28	SHA256 (stretchr-testify-f35b8ab_GH0.tar.gz) = b7a2961d37598e0fc1bf7e9041f717ec770c7ec935d4a79a2d40f5e6722fe6a2
29	SIZE (stretchr-testify-a726187_GH0.tar.gz) = 96955	29	SIZE (stretchr-testify-f35b8ab_GH0.tar.gz) = 101718
30	SHA256 (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = ea8127ce3b9e7bedf4ffbe998179d94ebe1c59ad36ece22aa5682fb27d5bab4b	30	SHA256 (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = ea8127ce3b9e7bedf4ffbe998179d94ebe1c59ad36ece22aa5682fb27d5bab4b
31	SIZE (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = 11903	31	SIZE (tchap-go-patricia-5ad6cdb_GH0.tar.gz) = 11903
32	SHA256 (libgit2-git2go-b479bd1_GH0.tar.gz) = 6ac991fc5af8b9ede6fc60c1ecc900c3eb8c84513d8d36c0d03f37e3004324c8	32	SHA256 (libgit2-git2go-9abc050_GH0.tar.gz) = 1e11a65dcf4b601ed68acf5e743ee720f48ef3ade686e2db82f019e5b1a6a1f4
33	SIZE (libgit2-git2go-b479bd1_GH0.tar.gz) = 72737	33	SIZE (libgit2-git2go-9abc050_GH0.tar.gz) = 72758

Lines 1-20 Link Here

(-)devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go (-20 lines)
1	--- src/gopkg.in/libgit2/git2go.v27/diff.go.orig 2018-05-15 14:06:24 UTC
2	+++ src/gopkg.in/libgit2/git2go.v27/diff.go
3	@@ -14,7 +14,7 @@ import (
4	"unsafe"
5	)
6
7	-type DiffFlag int
8	+type DiffFlag int64
9
10	const (
11	DiffFlagBinary DiffFlag = C.GIT_DIFF_FLAG_BINARY
12	@@ -405,7 +405,7 @@ func (diff *Diff) Patch(deltaIndex int)
13	return newPatchFromC(patchPtr), nil
14	}
15
16	-type DiffOptionsFlag int
17	+type DiffOptionsFlag int64
18
19	const (
20	DiffNormal DiffOptionsFlag = C.GIT_DIFF_NORMAL