diff --git a/devel/glab/Makefile b/devel/glab/Makefile index 5dfbf9892d2e..f40c6785dbbe 100644 --- a/devel/glab/Makefile +++ b/devel/glab/Makefile @@ -1,41 +1,36 @@ PORTNAME= glab DISTVERSIONPREFIX= v -DISTVERSION= 1.16.0 -PORTREVISION= 1 +DISTVERSION= 1.17.0 CATEGORIES= devel MAINTAINER= lcook@FreeBSD.org COMMENT= Open-source GitLab command line tool LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git USES= go:modules _BUILD_VERSION= ${DISTVERSION} _BUILD_DATE= $$(date +%d/%m/%Y) GO_MODULE= github.com/profclems/${PORTNAME} GO_TARGET= ./cmd/${PORTNAME} GO_BUILDFLAGS= -ldflags "\ -s -w \ -X main.version=${_BUILD_VERSION} \ -X main.build=${_BUILD_DATE}" PLIST_FILES= bin/${PORTNAME} PORTDOCS= README.md OPTIONS_DEFINE= DOCS -pre-build: - ${LN} -sf ${WRKSRC}/vendor/github.com/muesli/termenv/termenv_linux.go \ - ${WRKSRC}/vendor/github.com/muesli/termenv/termenv_freebsd.go - post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} \ ${STAGEDIR}${DOCSDIR} .include diff --git a/devel/glab/distinfo b/devel/glab/distinfo index 1019c6fdcdf1..2cfc6c8b42a0 100644 --- a/devel/glab/distinfo +++ b/devel/glab/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1620927190 -SHA256 (go/devel_glab/glab-v1.16.0/v1.16.0.mod) = 6f5f638daeb1751fed750f322dee7fd6bc67e45740bd311caa6313cbfae4391b -SIZE (go/devel_glab/glab-v1.16.0/v1.16.0.mod) = 1600 -SHA256 (go/devel_glab/glab-v1.16.0/v1.16.0.zip) = 7f970ae690baa4da01db08b3b1da33f72c85dac435113b9bc70a9682ff677e6a -SIZE (go/devel_glab/glab-v1.16.0/v1.16.0.zip) = 16630695 +TIMESTAMP = 1621093479 +SHA256 (go/devel_glab/glab-v1.17.0/v1.17.0.mod) = c1541a3ee51affd45c93d1e989a2ff824802b3496f07ff268e6358fbbc8320a0 +SIZE (go/devel_glab/glab-v1.17.0/v1.17.0.mod) = 1583 +SHA256 (go/devel_glab/glab-v1.17.0/v1.17.0.zip) = d0832c39defa78e0dcdfd16bda0e5d98a98f238f31b2d62eead62a36e5b6a490 +SIZE (go/devel_glab/glab-v1.17.0/v1.17.0.zip) = 16638528 diff --git a/devel/glab/files/patch-vendor_github.com_muesli_termenv_termenv__unix.go b/devel/glab/files/patch-vendor_github.com_muesli_termenv_termenv__unix.go deleted file mode 100644 index 5640a533ff19..000000000000 --- a/devel/glab/files/patch-vendor_github.com_muesli_termenv_termenv__unix.go +++ /dev/null @@ -1,20 +0,0 @@ ---- vendor/github.com/muesli/termenv/termenv_unix.go.orig 2020-01-30 12:25:39 UTC -+++ vendor/github.com/muesli/termenv/termenv_unix.go -@@ -99,7 +99,7 @@ func termStatusReport(sequence int) (string, error) { - func readWithTimeout(f *os.File) (string, bool) { - var readfds syscall.FdSet - fd := f.Fd() -- readfds.Bits[fd/64] |= 1 << (fd % 64) -+ readfds.X__fds_bits[fd/64] |= 1 << (fd % 64) - - // Use select to attempt to read from os.Stdout for 100 ms - err := sysSelect(int(fd)+1, -@@ -110,7 +110,7 @@ func readWithTimeout(f *os.File) (string, bool) { - // log.Printf("select(read stdout): %v", err) - return "", false - } -- if readfds.Bits[fd/64]&(1<<(fd%64)) == 0 { -+ if readfds.X__fds_bits[fd/64]&(1<<(fd%64)) == 0 { - // log.Print("select(read timeout)") - return "", false - }