On 2020/11/03 13:20, Ashton Fagg wrote: > Ping again with an update and a correction. > > I have updated the port (attached) to the newest version of direnv. I > also noticed in my testing on a different machine, that shells/bash is a > required runtime dependency. I have corrected that as well. > > Again, portcheck is clean. > > make configure, make build, make fake, make package and make install all > succeed, package works as expected on my amd64 -current test machine. > > make test also seems to work with some caveats. I need to investigate > that and will send whatever suggestion I figure out upstream should this > get merged. > > Thanks, > > Ash >
here's a tidied version, commentary inline
: diff 41b0c4e209e76641a71993320b7b1ee60c2504ab /usr/ports/mystuff
: blob - 8e479487ed17bc8c7ee91b8d997fb7183170edb9
: file + sysutils/direnv/Makefile
: --- sysutils/direnv/Makefile
: +++ sysutils/direnv/Makefile
: @@ -1,14 +1,13 @@
: # $OpenBSD: Makefile.template,v 1.88 2020/05/15 01:32:48 abieber Exp $
:
: -COMMENT = tool for managing environment based on current directory
: +COMMENT = tool for managing environment based on current directory
:
: GH_ACCOUNT = direnv
: GH_PROJECT = direnv
: -VERSION = 2.23.1
: -GH_TAGNAME = v${VERSION}
: +GH_TAGNAME = v2.23.1
:
: -MAINTAINER= Ashton Fagg <[email protected]>
: -CATEGORIES = sysutils devel
: +MAINTAINER= Ashton Fagg <[email protected]>
: +CATEGORIES = sysutils devel
: HOMEPAGE = https://direnv.net
clean up whitespace (and some more below), don't indirect for var only used once
:
: # MIT
: @@ -16,38 +15,25 @@ PERMIT_PACKAGE = Yes
:
: WANTLIB = c pthread
:
: -USE_GMAKE = Yes
unused unnecessary dependency
: +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
: +RUN_DEPENDS = shells/bash
:
: -pre-build: remove-github-actions
: +# Remove some unneeded stuff. These are just Github CI hooks.
: +pre-build:
: + rm -rf ${WRKSRC}/script
remove indirection, porters aren't usually expecting to see this for
"normal" targets (normally just for "maintainer convenience" targets)
so it makes it a bit harder to figure out
:
: do-build:
: - cd ${WRKSRC}; ${MODGO_BUILD_CMD} github.com/direnv/direnv/...
: + ${MODGO_BUILD_CMD} github.com/direnv/direnv/...
cd is done automatically
:
: -# This removes some unneeded stuff. These are just
: -# Github CI hooks.
: -remove-github-actions:
: - rm -rf ${WRKSRC}/script
: -
: do-install:
: $(INSTALL_PROGRAM) $(MODGO_WORKSPACE)/bin/direnv $(PREFIX)/bin
: - $(INSTALL_MAN) \
: - $(WRKSRC)/man/direnv.1 $(PREFIX)/man/man1/direnv.1
: - $(INSTALL_MAN) \
: - $(WRKSRC)/man/direnv-stdlib.1 $(PREFIX)/man/man1/direnv-stdlib.1
: - $(INSTALL_MAN) \
: - $(WRKSRC)/man/direnv-fetchurl.1
$(PREFIX)/man/man1/direnv-fetchurl.1
: - $(INSTALL_MAN) \
: - $(WRKSRC)/man/direnv.toml.1 $(PREFIX)/man/man1/direnv.toml.1
: + ${INSTALL_MAN} ${WRKSRC}/man/*.1 $(PREFIX)/man/man1/
simpler, less likely to get out of sync with updates
:
: do-test:
: - cd ${WRKSRC};
: ${MODGO_CMD} test github.com/direnv/direnv/...
cd is done automatically; in this case it was cd'ing in one shell and then
running test in another, so the cd wouldn't even apply
:
: .include <bsd.port.mk>
: blob - 3c433d4d887f767b56756c1c40e43c1131d14ed6
: file + sysutils/direnv/pkg/DESCR
: --- sysutils/direnv/pkg/DESCR
: +++ sysutils/direnv/pkg/DESCR
: @@ -1,12 +1,12 @@
: direnv is an extension for POSIX shells that adds the ability to modify
: the environment based on the current working directory.
:
: -Before each prompt, direnv checks for the existence of .envrc in the current
: -and parent directories. If the file exists, and is authorized, it is loaded
into
: -a bash sub-shell and all exported variables are then captured by direnv and
made
: -available to the current shell.
: +Before each prompt, direnv checks for the existence of .envrc in the
: +current and parent directories. If the file exists, and is authorized,
: +it is loaded into a bash sub-shell and all exported variables are then
: +captured by direnv and made available to the current shell.
:
: -This allows for project specific environment variables to be defined without
: -cluttering .profile.
: +This allows for project specific environment variables to be defined
: +without cluttering .profile.
:
: Supports common shells such as bash, zsh, fish, tcsh, elvish.
:
reformat to <80 columns, reflow to look neat
this one is ok sthen@ to import
direnv.tgz
Description: application/tar-gz
