<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c1613dfe606ef4af17d938dff1b21829adca9f39">https://github.com/macports/macports-ports/commit/c1613dfe606ef4af17d938dff1b21829adca9f39</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c1613dfe606ef4af17d938dff1b21829adca9f39
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 16 23:36:07 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> ksh93-devel: Update to 93u+m-1.0.0-beta.2
</span>---
shells/ksh93-devel/Portfile | 14 ++++---------
shells/ksh93-devel/files/memccpy.patch | 37 ----------------------------------
2 files changed, 4 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/ksh93-devel/Portfile b/shells/ksh93-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b40476a2d8f..35c1596a64e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/ksh93-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/ksh93-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup github 1.0
</span>
# Please keep the ksh93 and ksh93-devel ports as similar as possible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ksh93 ksh 1.0.0-beta.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ksh93 ksh 1.0.0-beta.2 v
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 05ab17ff1b248ccfdc0e7e71c929f171458b9fcf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7d77b59a9352ffe3fc60a1af936e022c1f12cb42753d4a8a116d6c8126915738 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2376823
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3d094f6af730d619afbb0974a64fcb0001d1fafd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d8678d23c3c9633a03e4fc895e604cdd0af2ff006d0268579b3a29beddfb8463 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2238224
</span>
name ksh93-devel
version 93u+m-${github.version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,14 +28,8 @@ long_description This is ksh 93u+m, a continuation of the \
</span> dist_subdir ksh93
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append memccpy.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Need to investigate:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# src/lib/libast/hash/hashalloc.c:155:16: error: non-const lvalue reference to type '__builtin_va_list' cannot bind to a temporary of type 'va_list' (aka 'char *')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 ppc ppc64 x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.cmd bin/package
build.target make
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/ksh93-devel/files/memccpy.patch b/shells/ksh93-devel/files/memccpy.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 81cc19c3ec6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/ksh93-devel/files/memccpy.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix detection of memccpy. (Apple's build worked around the broken test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-by setting -D_lib_memccpy in CCFLAGS instead.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/ksh93/ksh/issues/373
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/ksh93/ksh/commit/5d8ae3604ac2dfa2b32056b296f243fff7e5c5d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/libast/features/lib.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/libast/features/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,6 +446,9 @@ tst lib_memcmp string.h note{ standard memcmp interface that works }end execute{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tst lib_memccpy string.h unistd.h stdlib.h fcntl.h signal.h sys/types.h sys/stat.h sys/mman.h fcntl.h note{ standard memccpy interface that works }end execute{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #ifndef MAP_FAILED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define MAP_FAILED ((void*)-1) /* introduced in POSIX-1.2017 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if _STD_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void gotcha(int sig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -490,7 +493,7 @@ tst lib_memccpy string.h unistd.h stdlib.h fcntl.h signal.h sys/types.h sys/stat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m = n * (sizeof(x)-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(b = mmap((void*)0, m, PROT_READ|PROT_WRITE, MAP_PRIVATE, d, (off_t)0)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((b = mmap((void*)0, m, PROT_READ|PROT_WRITE, MAP_PRIVATE, d, (off_t)0)) == MAP_FAILED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(d);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -544,9 +547,9 @@ tst lib_memccpy string.h unistd.h stdlib.h fcntl.h signal.h sys/types.h sys/stat
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((fd = open("/dev/zero", O_RDWR)) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(srcbuf = (char*)mmap(NULL, siz, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((srcbuf = (char*)mmap(NULL, siz, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0)) == MAP_FAILED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!mmap(srcbuf + siz, siz, PROT_NONE, MAP_PRIVATE, fd, 0))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (mmap(srcbuf + siz, siz, PROT_NONE, MAP_PRIVATE, fd, 0) == MAP_FAILED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < siz; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srcbuf[i] = 'x';
</span></pre><pre style='margin:0'>
</pre>