Hi,
an update for sysutils/direnv to the latest version 2.32.2. Patch
already sent to the maintener several months ago but no reply since.
- update Makefile and add modules.inc to use MODGO_xxx instead of GH_xxx
- use GNU make with GNUMakefile to build direnv binary
- remove unnecessary pre-build and do-test sections
Build and tests OK on current/amd64 with Go 1.20.1
Tests/comments welcome and please commit if OK.
Laurent
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/direnv/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 11 Mar 2022 19:57:21 -0000 1.7
+++ Makefile 3 May 2023 06:49:11 -0000
@@ -1,38 +1,32 @@
-COMMENT = tool for managing environment based on current directory
+COMMENT = tool for managing environment based on current directory
-GH_ACCOUNT = direnv
-GH_PROJECT = direnv
-GH_TAGNAME = v2.26.0
-REVISION = 0
-
-MAINTAINER= Ashton Fagg <ash...@fagg.id.au>
-CATEGORIES = sysutils devel
-HOMEPAGE = https://direnv.net
+MODGO_MODNAME = github.com/direnv/direnv/v2
+MODGO_VERSION = v2.32.2
+
+DISTNAME = direnv-${MODGO_VERSION}
+
+MAINTAINER = Ashton Fagg <ash...@fagg.id.au>
+CATEGORIES = sysutils devel
+HOMEPAGE = https://direnv.net
# MIT
PERMIT_PACKAGE = Yes
-WANTLIB = c pthread
+WANTLIB = c pthread
-MODULES = lang/go
+MODULES = lang/go
# Unfortunately, this needs bash at runtime because all the shell
# stuff that happens underneath gets spawned in a bash subprocess
# (even if the shell you're hooking isn't bash...go figure).
-RUN_DEPENDS = shells/bash
-
-# Remove some unneeded stuff. These are just Github CI hooks.
-pre-build:
- rm -rf ${WRKSRC}/script
+RUN_DEPENDS = shells/bash
-do-build:
- ${MODGO_BUILD_CMD} github.com/direnv/direnv/...
+USE_GMAKE = Yes
do-install:
$(INSTALL_PROGRAM) $(MODGO_WORKSPACE)/bin/direnv $(PREFIX)/bin
${INSTALL_MAN} ${WRKSRC}/man/*.1 $(PREFIX)/man/man1/
-do-test:
- ${MODGO_CMD} test github.com/direnv/direnv/...
+.include "modules.inc"
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/direnv/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 30 Dec 2020 22:29:24 -0000 1.5
+++ distinfo 3 May 2023 06:49:11 -0000
@@ -1,2 +1,54 @@
-SHA256 (direnv-2.26.0.tar.gz) = s9u5f00mJ+xYiJTwhL/cdttH/1477CEFC7gYYIx4Nbk=
-SIZE (direnv-2.26.0.tar.gz) = 1378688
+SHA256 (direnv-v2.32.2.zip) = ++hNvWCRIhFnzleUtQEaSEmSrqtZRka8WIsSrhc6/eU=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.mod) = JnfIL+dPIDdyiJpagBr7Mp2VF1UId92ssXIZFpurPt0=
+SHA256 (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.zip) = Owa0u+HB4TUyiUGU6ctTrwBoaQIwApvuXqn1J92DhBU=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.mod) = 6SmRM81yQ+wmZ6oloEstrGAJI0rkwc2k7bRXSZcNrp8=
+SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.zip) = a48BdljZAN6HP8VnI3VI7yBUCCrtZGaWVeUb7u/ug8c=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = M+0HClpm4JYGhaxThkQOG1mJnnTYo4oRgGhecqIZXe0=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod) = OrnwH0YQ/ns5vYXWjo2XglNR5+KCw5zaQUV8KidvO+M=
+SHA256 (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.zip) = iOR6oF6yXGq9rXOHzMz8OedFQYlth7exJp6d0voAEA0=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.5.1.mod) = uVQhGJtkdk7en2hHL039Id48lyso3LjrKqkp0Qa8aQs=
+SHA256 (go_modules/golang.org/x/mod/@v/v0.5.1.zip) = i+0UiRIOlCimSsqXw6DRMGWjPRVkWTquReXHMcSI+XU=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod) = 9wRnadqsAr61fLzEgSgN9Z+0A8lv6CYigquoWMf3+k0=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 5u/a94opUD8IDPbSYV4onPsdnjq31XD1NmjsorSrQdo=
+SHA256 (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip) = i0N7iOzmjmEzYVD73SpMDo2A8UO83IbOTvBHxMk/PKo=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = Qh9hOWhtWJHz3FpWPQmVeA0yefZcrU0iXOpSaGeUFhw=
+SHA256 (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip) = 3BBcK01serSOVJRs4vYk6NH11HJw7/Hoj+0GzGX5H7Q=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = iWkRXko5EIhIMk55ob2KhEUjDm46rMvp+AV/tQ//yME=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod) = GBl56L1X0tngZBgtqGyaYRGqaXVeiI8IQx7OR0Kuw0M=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 8DMzMJb+GY8xUd7tk/LeunTlC7/nc5E0BFvDt85KUCQ=
+SHA256 (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.zip) = c0yvGJVJ6puF3ZP1jofj87zq7HIilEn1h5w8Bnoq1g4=
+SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.mod) = NoedWG/YAB6E2oeHGQoR5PeHSeKoHf6Lm2kxiZ//Mc8=
+SHA256 (go_modules/golang.org/x/text/@v/v0.3.0.zip) = 6jBoOVUD08fvjOFqKG91yMk4gsJaZsKqbI4q1Np6muA=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod) = iNR5Jl+Ib15ZjXbAA9DyV7QtvxuJXYIKErWrCzUBrKE=
+SHA256 (go_modules/golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.zip) = CS4GMj16VYgO5Dh5BevzWgIf/98rf3LYD7PDbkhmhlE=
+SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
+SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod) = ql4+ybt7n2gWCe+sAZ2d4ae6dxkkj/Hqon54iC2z1/U=
+SHA256 (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip) = UFnHt+lfE5uMQtkAGXL6X6aIs1ge+UbJEsHbxSQV/xY=
+SIZE (direnv-v2.32.2.zip) = 140805
+SIZE (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.mod) = 43
+SIZE (go_modules/github.com/!burnt!sushi/toml/@v/v1.2.0.zip) = 238247
+SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.mod) = 104
+SIZE (go_modules/github.com/mattn/go-isatty/@v/v0.0.14.zip) = 8919
+SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod) = 88
+SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.mod) = 146
+SIZE (go_modules/golang.org/x/crypto/@v/v0.0.0-20191011191535-87dc89f01550.zip) = 1844911
+SIZE (go_modules/golang.org/x/mod/@v/v0.5.1.mod) = 214
+SIZE (go_modules/golang.org/x/mod/@v/v0.5.1.zip) = 150900
+SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod) = 119
+SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod) = 181
+SIZE (go_modules/golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.zip) = 1421786
+SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod) = 25
+SIZE (go_modules/golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip) = 25620
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod) = 24
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.mod) = 33
+SIZE (go_modules/golang.org/x/sys/@v/v0.0.0-20220520151302-bc2c85ada10a.zip) = 1762176
+SIZE (go_modules/golang.org/x/text/@v/v0.3.0.mod) = 25
+SIZE (go_modules/golang.org/x/text/@v/v0.3.0.zip) = 6349244
+SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.mod) = 212
+SIZE (go_modules/golang.org/x/tools/@v/v0.0.0-20191119224855-298f0cb1881e.zip) = 2915387
+SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod) = 37
+SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.mod) = 37
+SIZE (go_modules/golang.org/x/xerrors/@v/v0.0.0-20191011141410-1b5146add898.zip) = 19898
Index: modules.inc
===================================================================
RCS file: modules.inc
diff -N modules.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules.inc 3 May 2023 06:49:11 -0000
@@ -0,0 +1,20 @@
+MODGO_MODULES = \
+ github.com/!burnt!sushi/toml v1.2.0 \
+ github.com/mattn/go-isatty v0.0.14 \
+ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 \
+ golang.org/x/mod v0.5.1 \
+ golang.org/x/net v0.0.0-20190620200207-3b0461eec859 \
+ golang.org/x/sync v0.0.0-20190423024810-112230192c58 \
+ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a \
+ golang.org/x/text v0.3.0 \
+ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e \
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898
+
+MODGO_MODFILES = \
+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 \
+ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 \
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a \
+ golang.org/x/sys v0.0.0-20190412213103-97732733099d \
+ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c \
+ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
+
