<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/1b89c570e5904dda3a21f92f5e4850547aa3e06a">https://github.com/macports/macports-ports/commit/1b89c570e5904dda3a21f92f5e4850547aa3e06a</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 1b89c57 direnv-devel: update to ce9945a8 (20170903).
</span>1b89c57 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1b89c570e5904dda3a21f92f5e4850547aa3e06a
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Sep 6 09:14:35 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> direnv-devel: update to ce9945a8 (20170903).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Split the cmd_dotenv patch and post-patch hook into release and devel versions.
</span>---
devel/direnv/Portfile | 35 ++++++++++++++--------
devel/direnv/files/patch-Makefile.diff | 6 ++--
devel/direnv/files/patch-cmd_dotenv.go.devel.diff | 12 ++++++++
...nv.go.diff => patch-cmd_dotenv.go.release.diff} | 0
4 files changed, 37 insertions(+), 16 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 91a87cc..8c92363 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;'>@@ -20,14 +20,32 @@ if {${name} eq ${subport}} {
</span> checksums rmd160 e04348c22a8f8026f6a53ffbdecfcc3e24d63db3 \
sha256 f9e2e59afb4ec7d9ea8b99b7430b201999de28f88d18e139a60cb89bc68813d1
conflicts direnv-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix importing of dotenv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-cmd_dotenv.go.release.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # move 'dotenv' into 'src/dotenv' to make GOPATH happy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/dotenv ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport direnv-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup direnv direnv 295569da5a2f9d48d68f56a64cd0ba37bd904884
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20170828
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 7dfafb0b075fd18c94ff116acd618a52f641ba72 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 92dddf5134176565bd952b3e84c58a32367cb48d1a4689085fffb085f9ecf176
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup direnv direnv ce9945a8888ead47652b9a6f4acbca3a39c48528
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170903
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 82d87cbbc8243a8ad18d4eaa3ceee99cb9363715 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb869c4377886c2ba42df3ad408601ad461ee5f4741b373ba473b078fa8f7b56
</span> conflicts direnv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix importing of dotenv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-cmd_dotenv.go.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # move 'dotenv' into 'src/dotenv' to make GOPATH happy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file mkdir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/vendor/github.com/direnv/go-dotenv ${worksrcpath}/src/dotenv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# override github information
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,18 +56,9 @@ homepage http://direnv.net/
</span>
depends_lib-append port:go
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix importing of dotenv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cmd_dotenv.go.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fix PREFIX and DESTDIR variables to match what 'port' needs
patchfiles-append patch-Makefile.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # move 'dotenv' into 'src/dotenv' to make GOPATH happy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/dotenv ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
build.env-append GOPATH=${worksrcpath}
<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><span style='display:block; white-space:pre;color:#808080;'>index 1a4cea2..d3a6a37 100644
</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;'>+++ b/devel/direnv/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2016-11-04 12:12:11.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2016-11-04 12:12:55.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile
</span> @@ -1,4 +1,4 @@
-DESTDIR ?= /usr/local
+PREFIX ?= /usr/local
MAN_MD = $(wildcard man/*.md)
ROFFS = $(MAN_MD:.md=)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,12 +50,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,12 +50,11 @@ test: build
</span> ./test/direnv-test.sh
install: all
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/direnv/files/patch-cmd_dotenv.go.devel.diff b/devel/direnv/files/patch-cmd_dotenv.go.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..87a4058
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/direnv/files/patch-cmd_dotenv.go.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmd_dotenv.go.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmd_dotenv.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,8 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "fmt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "io/ioutil"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "github.com/direnv/go-dotenv"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "dotenv"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // `direnv private dotenv [SHELL [PATH_TO_DOTENV]]`
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/direnv/files/patch-cmd_dotenv.go.diff b/devel/direnv/files/patch-cmd_dotenv.go.release.diff
</span>similarity index 100%
rename from devel/direnv/files/patch-cmd_dotenv.go.diff
rename to devel/direnv/files/patch-cmd_dotenv.go.release.diff
</pre><pre style='margin:0'>
</pre>