<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/30aa660716c355f7abe4b8ff0d13e54be9d696b6">https://github.com/macports/macports-ports/commit/30aa660716c355f7abe4b8ff0d13e54be9d696b6</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 30aa660 elvis: fix build on Mojave
</span>30aa660 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 30aa660716c355f7abe4b8ff0d13e54be9d696b6
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 17 22:12:33 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> elvis: fix build on Mojave
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58058
</span>---
editors/elvis/Portfile | 9 ++-
editors/elvis/files/configure.diff | 122 +++++++++++++++++++++++++++++++++++++
2 files changed, 129 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/elvis/Portfile b/editors/elvis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70b5f6e..f5dc260 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/elvis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/elvis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,14 @@ variant universal {}
</span>
configure.cc "${configure.cc} ${configure.optflags} [get_canonical_archflags cc]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --without-x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --without-x --verbose
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-ref.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-ref.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.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;'>+ reinplace "s|@@SDKROOT@@|${configure.sdkroot}|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# The x11 variant is seriously borked and needs patching to compile
#variant x11 { depends_lib port:xorg-libX11 port:xorg-libOTHERS???
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/elvis/files/configure.diff b/editors/elvis/files/configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6d65fd2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/elvis/files/configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,122 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2003-10-21 12:32:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2019-02-17 01:53:23.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,8 +59,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # work okay, usually.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set some defaults
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XINCPATH="/usr/X11R6/include /usr/X11/include /usr/include /usr/include/X11 /usr/local/X11/include /usr/openwin/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XLIBPATH="/lib /usr/lib /usr/X11/lib /usr/local/X11/lib /usr/openwin/lib /usr/X11R6/lib /usr/ucblib /usr/ccs/lib /usr/local/lib "`echo "$LD_LIBRARY_PATH" | tr ':' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XINCPATH="/usr/X11R6/include /usr/X11/include @@SDKROOT@@/usr/include /usr/include/X11 /usr/local/X11/include /usr/openwin/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XLIBPATH="/lib @@SDKROOT@@/usr/lib /usr/X11/lib /usr/local/X11/lib /usr/openwin/lib /usr/X11R6/lib /usr/ucblib /usr/ccs/lib /usr/local/lib "`echo "$LD_LIBRARY_PATH" | tr ':' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GNUPATH=`echo "$PATH" | tr ':' ' '`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=/usr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BINDIR='$(PREFIX)/bin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -488,49 +488,49 @@
</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;'>+ # Check for some known system quirks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -f /usr/include/sys/ptem.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -f @@SDKROOT@@/usr/include/sys/ptem.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has a <sys/ptem.h> file so I assume elvis needs it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_WINSIZE=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has no <sys/ptem.h> file so I assume elvis doesn't need it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -f /usr/include/termcap.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -f @@SDKROOT@@/usr/include/termcap.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has a <termcap.h> file so I assume elvis needs it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_SPEED_T=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has no <termcap.h> file so I assume elvis doesn't need it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -f /usr/include/sys/wait.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -f @@SDKROOT@@/usr/include/sys/wait.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has a <sys/wait.h> file so I assume elvis needs it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_WAIT_H=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has no <sys/wait.h> file so I assume elvis doesn't need it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -f /usr/include/sys/select.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -f @@SDKROOT@@/usr/include/sys/select.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has a <sys/select.h> file so I assume elvis needs it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_SELECT_H=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has no <sys/select.h> file so I assume elvis doesn't need it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -f /usr/include/sys/ioctl.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -f @@SDKROOT@@/usr/include/sys/ioctl.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has a <sys/ioctl.h> file so I assume elvis needs it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_IOCTL_H=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has no <sys/ioctl.h> file so I assume elvis doesn't need it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -f /usr/include/netinet/in.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -f @@SDKROOT@@/usr/include/netinet/in.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has a <netinet/in.h> file so I assume elvis needs it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_IN_H=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has no <netinet/in.h> file so I assume elvis doesn't need it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -f /usr/include/sys/socket.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if [ -f @@SDKROOT@@/usr/include/sys/socket.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "This system has a <sys/socket.h> file so I assume elvis needs it"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_SOCKET_H=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -548,7 +548,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "Does this system support setpgid()?"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if fgrep setpgid /usr/include/unistd.h >/dev/null 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if fgrep setpgid @@SDKROOT@@/usr/include/unistd.h >/dev/null 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why " Assuming yes, because it is declared in <unistd.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_SETPGID=undef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -557,7 +557,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_SETPGID=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "Does this system support freopen()?"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if fgrep freopen /usr/include/stdio.h >/dev/null 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if fgrep freopen @@SDKROOT@@/usr/include/stdio.h >/dev/null 2>/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why " Assuming yes, because it is declared in <stdio.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_FREOPEN=undef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -584,7 +584,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why " Assuming no, because this is a Sun system."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_INET_ATON=define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elif fgrep inet_aton /usr/include/arpa/inet.h </dev/null >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif fgrep inet_aton @@SDKROOT@@/usr/include/arpa/inet.h </dev/null >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why " Assuming yes, because it is declared in <arpa/inet.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_INET_ATON=undef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -605,7 +605,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "Does this system support memmove()?"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if fgrep memmove /usr/include/string*.h </dev/null >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if fgrep memmove @@SDKROOT@@/usr/include/string*.h </dev/null >/dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why " Assuming yes, because it is declared in <string.h> or <strings.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEED_MEMMOVE=undef
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -619,13 +619,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sgtty) USE=" -DUSE_SGTTY" ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why "Choosing a type of ioctl() calls, since no --ioctl=... argument was given"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -f /usr/include/termios.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -f @@SDKROOT@@/usr/include/termios.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args="$args --ioctl=termios"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ why " Assuming --ioctl=termios because <termios.h> exists"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -f /usr/include/termio.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -f @@SDKROOT@@/usr/include/termio.h ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE=" -DUSE_TERMIO"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args="$args --ioctl=termio"
</span></pre><pre style='margin:0'>
</pre>