Index: head/devel/grv/Makefile =================================================================== --- head/devel/grv/Makefile (revision 474372) +++ head/devel/grv/Makefile (revision 474373) @@ -1,57 +1,56 @@ # $FreeBSD$ PORTNAME= grv DISTVERSIONPREFIX= v -DISTVERSION= 0.1.3 -PORTREVISION= 1 +DISTVERSION= 0.2.0 CATEGORIES= devel MAINTAINER= dg@syrec.org COMMENT= Terminal interface for viewing git repositories LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= go:lang/go LIB_DEPENDS= libgit2.so:devel/libgit2 USES= ncurses pkgconfig readline:port USE_GITHUB= yes GH_ACCOUNT= rgburke GH_SUBDIR= src/github.com/${GH_ACCOUNT}/${PORTNAME} GH_TUPLE= bradfitz:slice:d9036e2:slice/src/github.com/bradfitz/slice \ - camlistore:go4:fba789b:reflectutil/src/go4.org \ - davecgh:go-spew:87df7c6:spew/src/github.com/davecgh/go-spew \ - gobwas:glob:51eb1ee:glob/src/github.com/gobwas/glob \ - golang:crypto:1875d0a:crypto/src/golang.org/x/crypto \ - golang:sys:37707fd:sys/src/golang.org/x/sys \ - mattn:go-runewidth:97311d9:runewidth/src/github.com/mattn/go-runewidth \ + 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:c31e5f2:notify/src/github.com/rjeczalik/notify \ - Sirupsen:logrus:768a92a:logrus/src/github.com/Sirupsen/logrus \ - stretchr:objx:8a3f715:objx/src/github.com/stretchr/objx \ - stretchr:testify:a726187:testify/src/github.com/stretchr/testify \ + 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:b479bd1:git2go/src/gopkg.in/libgit2/git2go.v27 # Keep git2go branch in sync with devel/libgit2 version + libgit2:git2go:9abc050:git2go/src/gopkg.in/libgit2/git2go.v27 # Keep git2go branch in sync with devel/libgit2 version PLIST_FILES= bin/grv OPTIONS_DEFINE= DOCS PORTDOCS= * do-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build ./cmd/${PORTNAME} do-test: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go test ./cmd/${PORTNAME} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include Index: head/devel/grv/distinfo =================================================================== --- head/devel/grv/distinfo (revision 474372) +++ head/devel/grv/distinfo (revision 474373) @@ -1,33 +1,33 @@ -TIMESTAMP = 1526392501 -SHA256 (rgburke-grv-v0.1.3_GH0.tar.gz) = c4684393c5f68be42e4c6c57e9209de8c79426b772cd313083dc34c5a5aac02d -SIZE (rgburke-grv-v0.1.3_GH0.tar.gz) = 4229360 +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-fba789b_GH0.tar.gz) = 14623c4196629db8fe82d66c62ce497e59cfc3fa8b948b767c55e986cd929721 -SIZE (camlistore-go4-fba789b_GH0.tar.gz) = 78856 -SHA256 (davecgh-go-spew-87df7c6_GH0.tar.gz) = 27fc117797f5da86efefd7cbd44da0400e237423a5633086e682882c3838cb54 -SIZE (davecgh-go-spew-87df7c6_GH0.tar.gz) = 42156 -SHA256 (gobwas-glob-51eb1ee_GH0.tar.gz) = 664219022e7081c313f6fccf2afb145f4a1d1142d0577f3cd8ab24131249e25b -SIZE (gobwas-glob-51eb1ee_GH0.tar.gz) = 25009 -SHA256 (golang-crypto-1875d0a_GH0.tar.gz) = 648f2ad0b7a255d9286af0202d6ebdfb5703eb3b9d82691c67b32f6092c1ef22 -SIZE (golang-crypto-1875d0a_GH0.tar.gz) = 1445933 -SHA256 (golang-sys-37707fd_GH0.tar.gz) = 9a86c90f564594b3f201540d19fb4fb828e1df8af61bb2fa9190a760cba039a7 -SIZE (golang-sys-37707fd_GH0.tar.gz) = 795284 -SHA256 (mattn-go-runewidth-97311d9_GH0.tar.gz) = 8330497728f75464111ee7145fc97cfa588cb0d6561b3af5447aa05d489bca85 -SIZE (mattn-go-runewidth-97311d9_GH0.tar.gz) = 22384 +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-c31e5f2_GH0.tar.gz) = 622ce128a6da4c01ea924f0409bd0b36ce52a56380effef9802eb8b558e20ac1 -SIZE (rjeczalik-notify-c31e5f2_GH0.tar.gz) = 56294 -SHA256 (Sirupsen-logrus-768a92a_GH0.tar.gz) = ce58ca8b5b3628757e89a526c5399b684914b1c9979ac5e6cbe30181bbabc55a -SIZE (Sirupsen-logrus-768a92a_GH0.tar.gz) = 28603 -SHA256 (stretchr-objx-8a3f715_GH0.tar.gz) = 2602184e83baec18f98b2a7ba5d874b423c374ffb84d28a474e69b931412f8a9 -SIZE (stretchr-objx-8a3f715_GH0.tar.gz) = 75047 -SHA256 (stretchr-testify-a726187_GH0.tar.gz) = 799b0b2de51ec7ec5aad54b3ccf7cbca95715f9167310f99487b21e87fcfec51 -SIZE (stretchr-testify-a726187_GH0.tar.gz) = 96955 +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-b479bd1_GH0.tar.gz) = 6ac991fc5af8b9ede6fc60c1ecc900c3eb8c84513d8d36c0d03f37e3004324c8 -SIZE (libgit2-git2go-b479bd1_GH0.tar.gz) = 72737 +SHA256 (libgit2-git2go-9abc050_GH0.tar.gz) = 1e11a65dcf4b601ed68acf5e743ee720f48ef3ade686e2db82f019e5b1a6a1f4 +SIZE (libgit2-git2go-9abc050_GH0.tar.gz) = 72758 Index: head/devel/grv/files/patch-cmd_grv_repo__data__loader.go =================================================================== --- head/devel/grv/files/patch-cmd_grv_repo__data__loader.go (revision 474372) +++ head/devel/grv/files/patch-cmd_grv_repo__data__loader.go (nonexistent) @@ -1,11 +0,0 @@ ---- cmd/grv/repo_data_loader.go.orig 2018-05-15 13:55:57 UTC -+++ cmd/grv/repo_data_loader.go -@@ -9,7 +9,7 @@ import ( - - log "github.com/Sirupsen/logrus" - slice "github.com/bradfitz/slice" -- git "gopkg.in/libgit2/git2go.v26" -+ git "gopkg.in/libgit2/git2go.v27" - ) - - const ( Property changes on: head/devel/grv/files/patch-cmd_grv_repo__data__loader.go ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go =================================================================== --- head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go (revision 474372) +++ head/devel/grv/files/patch-src_gopkg.in_libgit2_git2go.v27_diff.go (revision 474373) @@ -1,20 +1,20 @@ ---- src/gopkg.in/libgit2/git2go.v27/diff.go.orig 2018-05-15 14:06:24 UTC +--- src/gopkg.in/libgit2/git2go.v27/diff.go.orig 2018-07-05 13:56:38 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