<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2a9e4db0e50f36afcd99b0c7214530ea081dc267">https://github.com/macports/macports-ports/commit/2a9e4db0e50f36afcd99b0c7214530ea081dc267</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2a9e4db direnv: simplify port, use golang-1.0 portgroup
</span>2a9e4db is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2a9e4db0e50f36afcd99b0c7214530ea081dc267
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Wed Oct 17 20:37:46 2018 +0900
<span style='display:block; white-space:pre;color:#404040;'> direnv: simplify port, use golang-1.0 portgroup
</span>---
devel/direnv/Portfile | 61 ++++++++++++-------------------
devel/direnv/files/patch-GNUmakefile.diff | 30 ---------------
devel/direnv/files/patch-Makefile.diff | 25 -------------
3 files changed, 23 insertions(+), 93 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/direnv/Portfile b/devel/direnv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a02905c..c246edb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/direnv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/direnv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup golang 1.0
</span>
name direnv
categories devel sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,62 +13,47 @@ maintainers {michaelld @michaelld} openmaintainer
</span> description ${name} is an environment switcher for the shell.
long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${description} It knows how to hook into bash, zsh, tcsh and fish shell to load or unload environment variables depending on the current directory. This allows project-specific environment variables without cluttering the \"~/.profile\" file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${description} It knows how to hook into bash, zsh, tcsh and fish shell to \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ load or unload environment variables depending on the current \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ directory. This allows project-specific environment variables without \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cluttering the \"~/.profile\" file.
</span>
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup direnv direnv 2.17.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 58a963b1af1de56536708d354abc78824e54e811 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 74632f5c46faf1f57239c755b3783a7ce8b75d6808f1c348482ab5995083aee2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 92933
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts direnv-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix PREFIX and DESTDIR variables to match what 'port' needs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ go.setup github.com/direnv/direnv 2.17.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 58a963b1af1de56536708d354abc78824e54e811 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 74632f5c46faf1f57239c755b3783a7ce8b75d6808f1c348482ab5995083aee2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 92933
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts direnv-devel
</span> }
subport direnv-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup direnv direnv e78e393f2340d89f31d2be7b3b95169aa5f528fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 15416418fb6087563afeec44e534af7ed741d180 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8395a4c30a500eb0b559c64289360dd17541ac18eed97bd10e89ca38c462ba2c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 94428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ go.setup github.com/direnv/direnv e78e393f2340d89f31d2be7b3b95169aa5f528fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20181004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 15416418fb6087563afeec44e534af7ed741d180 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8395a4c30a500eb0b559c64289360dd17541ac18eed97bd10e89ca38c462ba2c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 94428
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts direnv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts direnv
</span> long_description ${long_description}: \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- This port follows the GIT master version of ${name}, which is typically updated every few days to weeks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port follows the GIT master version of ${name}, which is \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typically updated every few days to weeks.
</span>
# devel dependency
# add to both at next release
depends_build-append port:shfmt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix PREFIX and DESTDIR variables to match what 'port' needs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-GNUmakefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
# override github information
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://direnv.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://direnv.net/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# builds with 'go' internally
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target all
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:go
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix importing of locally-provided external projects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${worksrcpath}/vendor ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "cd ${worksrcpath} && make install DESTDIR=${destroot}${prefix}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append GOPATH=${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PREFIX=${prefix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/direnv/files/patch-GNUmakefile.diff b/devel/direnv/files/patch-GNUmakefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d727b79..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/direnv/files/patch-GNUmakefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- GNUmakefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ GNUmakefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,9 +3,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ############################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set this to change the target installation path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DESTDIR ?= /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BINDIR = ${DESTDIR}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MANDIR = ${DESTDIR}/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX ?= /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BINDIR = ${PREFIX}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MANDIR = ${PREFIX}/share/man
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Override the go executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GO = go
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,10 +151,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -d $(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install direnv $(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -d $(MANDIR)/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -R man/*.1 $(MANDIR)/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install direnv $(DESTDIR)$(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(MANDIR)/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -R man/*.1 $(DESTDIR)$(MANDIR)/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .PHONY: dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dist: | $(base)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/direnv/files/patch-Makefile.diff b/devel/direnv/files/patch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d1ffb70..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/direnv/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DESTDIR ?= /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PREFIX ?= /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAN_MD = $(wildcard man/*.md)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ROFFS = $(MAN_MD:.md=)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,12 +54,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elvish ./test/direnv-test.elv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -d $(DESTDIR)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -d $(DESTDIR)/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install direnv $(DESTDIR)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -R man/*.1 $(DESTDIR)/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install -d $(DESTDIR)$(PREFIX)/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install direnv $(DESTDIR)$(PREFIX)/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -R man/*.1 $(DESTDIR)$(PREFIX)/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dist:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- go get github.com/mitchellh/gox
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gox -output "dist/direnv.{{.OS}}-{{.Arch}}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span></pre><pre style='margin:0'>
</pre>