<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/1567a64bf5a0797bd19c6ee53b157089471221cb">https://github.com/macports/macports-ports/commit/1567a64bf5a0797bd19c6ee53b157089471221cb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1567a64bf5a0797bd19c6ee53b157089471221cb
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Dec 12 20:30:14 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> ksh93-devel: New port, version 93u+m-1.0.0-beta.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64181
</span>---
shells/ksh/Portfile | 2 +-
shells/ksh93-devel/Portfile | 60 ++++++++++++++++++++++++++++++++++
shells/ksh93-devel/files/memccpy.patch | 37 +++++++++++++++++++++
shells/ksh93/Portfile | 4 ++-
4 files changed, 101 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/ksh/Portfile b/shells/ksh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8db25ffa931..74c6398b783 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/ksh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/ksh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ PortGroup legacysupport 1.0
</span> legacysupport.newest_darwin_requires_legacy 13
name ksh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ksh93 pdksh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ksh93 ksh93-devel pdksh
</span> categories shells
platforms darwin freebsd
maintainers {ryandesign @ryandesign} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/ksh93-devel/Portfile b/shells/ksh93-devel/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bcdd61f4ad1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please keep the ksh93 and ksh93-devel ports as similar as possible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ksh93 ksh 1.0.0-beta.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 05ab17ff1b248ccfdc0e7e71c929f171458b9fcf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7d77b59a9352ffe3fc60a1af936e022c1f12cb42753d4a8a116d6c8126915738 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2376823
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name ksh93-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 93u+m-${github.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ksh ksh-devel ksh93 pdksh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories shells
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin freebsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license EPL-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description continued development of the AT&T KornShell
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description This is ksh 93u+m, a continuation of the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ development of the KornShell, based on ksh 93u+ by \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ David Korn and AT&T Research.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ksh93
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append memccpy.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd bin/package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Build output is misleading: You will see "CC=cc" and builds being done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# by "cc", but that "cc" is a wrapper script created by the build system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# which in turn calls the compiler we specify here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "CC=${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CCFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "NPROC=${build.jobs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args SHELL="/bin/sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${build.dir}/arch/${ksharch}/bin/ksh \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0444 ${build.dir}/src/cmd/ksh93/sh.1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/man/man1/ksh.1
</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;'>+options ksharch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default ksharch {[ksharch]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc ksharch {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global build.cmd build.dir build.env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [exec env {*}${build.env} ${build.dir}/${build.cmd} host type]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..81cc19c3ec6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/ksh93-devel/files/memccpy.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix detection of memccpy. (Apple's build worked around the broken test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+by setting -D_lib_memccpy in CCFLAGS instead.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ksh93/ksh/issues/373
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ksh93/ksh/commit/5d8ae3604ac2dfa2b32056b296f243fff7e5c5d6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/libast/features/lib.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/libast/features/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ }end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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:#e0ffe0;'>++ #ifndef MAP_FAILED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define MAP_FAILED ((void*)-1) /* introduced in POSIX-1.2017 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if _STD_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void gotcha(int sig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m = n * (sizeof(x)-1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>++ 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:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((fd = open("/dev/zero", O_RDWR)) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!(srcbuf = (char*)mmap(NULL, siz, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 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:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!mmap(srcbuf + siz, siz, PROT_NONE, MAP_PRIVATE, fd, 0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (mmap(srcbuf + siz, siz, PROT_NONE, MAP_PRIVATE, fd, 0) == MAP_FAILED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < siz; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ srcbuf[i] = 'x';
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/shells/ksh93/Portfile b/shells/ksh93/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cd716cafa3..779fa007eab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/shells/ksh93/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/shells/ksh93/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,15 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Please keep the ksh93 and ksh93-devel ports as similar as possible.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> epoch 2
github.setup att ast 2012-08-01
revision 2
name ksh93
version 93u+[string map {- {}} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ksh ksh-devel pdksh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts ksh ksh-devel ksh93-devel pdksh
</span> categories shells
platforms darwin freebsd
maintainers {ryandesign @ryandesign} openmaintainer
</pre><pre style='margin:0'>
</pre>