<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6824884cf6ebadd9bb17e1acd8e17de428aea54f">https://github.com/macports/macports-ports/commit/6824884cf6ebadd9bb17e1acd8e17de428aea54f</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 6824884cf6e boxes: update to 1.3
</span>6824884cf6e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6824884cf6ebadd9bb17e1acd8e17de428aea54f
</span>Author: jungx098 <jungx098@gmail.com>
AuthorDate: Wed Jan 6 13:34:36 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> boxes: update to 1.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 1.3
</span><span style='display:block; white-space:pre;color:#404040;'> * update build.args
</span><span style='display:block; white-space:pre;color:#404040;'> * add patches
</span>---
textproc/boxes/Portfile | 19 ++++++++++++-----
textproc/boxes/files/boxes.c.diff | 10 +++++++++
textproc/boxes/files/regexp.h.diff | 10 +++++++++
textproc/boxes/files/testrunner.sh.diff | 36 +++++++++++++++++++++++++++++++++
textproc/boxes/files/tools.c.diff | 10 +++++++++
5 files changed, 80 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/boxes/Portfile b/textproc/boxes/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c707043112b..fe9084dd253 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/boxes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/boxes/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ascii-boxes boxes 1.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ascii-boxes boxes 1.3 v
</span>
categories textproc
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,10 +18,17 @@ long_description boxes is a text filter which can draw various \
</span>
homepage http://boxes.thomasjensen.com
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f175439db5e62f348321790b53e67b3b075aef11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 13af290ceab5eccfc54f9e230a70c8f2a1ade3fbe64b8e59a60f52e0cf5877f1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c7cb62e5d491562c766d1ba9404544d1e80c46f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c42d59e6fe58282b6e4835434326af6613f6a87219d3117989ec3886596ad95b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 99591
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:bison port:cctools port:flex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles boxes.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regexp.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ testrunner.sh.diff
</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;'>+depends_build-append port:bison port:cctools port:flex port:gsed
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +40,9 @@ variant emacs description {Install boxes.el for running inside emacs} {
</span> }
build.target ;# default target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CC=${configure.cc} GLOBALCONF=${prefix}/share/boxes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC=${configure.cc} GLOBALCONF=${prefix}/share/boxes CFLAGS_ADDTL="-D_POSIX_C_SOURCE=200809L"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span>
destroot {
xinstall -m 755 ${worksrcpath}/src/boxes ${destroot}${prefix}/bin/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/boxes/files/boxes.c.diff b/textproc/boxes/files/boxes.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..24fb90d1883
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/boxes/files/boxes.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/boxes.c.orig 2021-01-06 13:25:01.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/boxes.c 2021-01-06 13:25:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <strings.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/boxes/files/regexp.h.diff b/textproc/boxes/files/regexp.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..add67b3c6b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/boxes/files/regexp.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/regexp/regexp.h.orig 2021-01-06 13:25:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/regexp/regexp.h 2021-01-06 13:26:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* extern size_t regsub(); */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern size_t myregsub();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* extern void regerror(); */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void regerror(char *msg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* REGEXP_H */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/boxes/files/testrunner.sh.diff b/textproc/boxes/files/testrunner.sh.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..951d45a25a7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/boxes/files/testrunner.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/testrunner.sh.orig 2021-01-06 15:44:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/testrunner.sh 2021-01-06 15:50:28.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,18 +54,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ declare -i expectedReturnCode=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ $(grep -c "^:EXPECTED-ERROR " $testCaseFile) -eq 1 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- expectedReturnCode=$(grep "^:EXPECTED-ERROR " $testCaseFile | sed -e 's/:EXPECTED-ERROR //')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ expectedReturnCode=$(grep "^:EXPECTED-ERROR " $testCaseFile | gsed -e 's/:EXPECTED-ERROR //')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ declare -r testInputFile=${testCaseFile/%.txt/.input.tmp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ declare -r testExpectationFile=${testCaseFile/%.txt/.expected.tmp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-declare -r testFilterFile=${testCaseFile/%.txt/.sed.tmp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++declare -r testFilterFile=${testCaseFile/%.txt/.gsed.tmp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ declare -r testOutputFile=${testCaseFile/%.txt/.out.tmp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-declare -r boxesArgs=$(cat $testCaseFile | sed -n '/^:ARGS/,+1p' | grep -v ^:INPUT | sed '1d')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++declare -r boxesArgs=$(cat $testCaseFile | gsed -n '/^:ARGS/,+1p' | grep -v ^:INPUT | gsed '1d')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cat $testCaseFile | sed -n '/^:INPUT/,/^:OUTPUT-FILTER/p;' | sed '1d;$d' | tr -d '\r' > $testInputFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cat $testCaseFile | sed -n '/^:OUTPUT-FILTER/,/^:EXPECTED\b.*$/p;' | sed '1d;$d' | tr -d '\r' > $testFilterFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cat $testCaseFile | sed -n '/^:EXPECTED/,/^:EOF/p;' | sed '1d;$d' | tr -d '\r' > $testExpectationFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat $testCaseFile | gsed -n '/^:INPUT/,/^:OUTPUT-FILTER/p;' | gsed '1d;$d' | tr -d '\r' > $testInputFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat $testCaseFile | gsed -n '/^:OUTPUT-FILTER/,/^:EXPECTED\b.*$/p;' | gsed '1d;$d' | tr -d '\r' > $testFilterFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat $testCaseFile | gsed -n '/^:EXPECTED/,/^:EOF/p;' | gsed '1d;$d' | tr -d '\r' > $testExpectationFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ declare boxesBinary=../src/boxes.exe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ ! -x $boxesBinary ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat $testInputFile | $boxesBinary $boxesArgs >$testOutputFile 2>&1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ declare -ir actualReturnCode=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-cat $testOutputFile | tr -d '\r' | sed -f $testFilterFile | diff - $testExpectationFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++cat $testOutputFile | tr -d '\r' | gsed -f $testFilterFile | diff - $testExpectationFile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ $? -ne 0 ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ >&2 echo "Error in test case: $testCaseFile (top: actual; bottom: expected)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/boxes/files/tools.c.diff b/textproc/boxes/files/tools.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8d0fefd2f31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/boxes/files/tools.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tools.c.orig 2021-01-06 13:25:07.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tools.c 2021-01-06 13:25:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <strings.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "shape.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "boxes.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tools.h"
</span></pre><pre style='margin:0'>
</pre>