<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/0b7be99d9bc58f2f966e1076c415c16425cd9e2f">https://github.com/macports/macports-ports/commit/0b7be99d9bc58f2f966e1076c415c16425cd9e2f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0b7be99d9bc58f2f966e1076c415c16425cd9e2f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Mar 16 23:13:24 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> stklos-devel: New port, version 1.70-20230307-3bc8d1f9
</span>---
lang/stklos-devel/Portfile | 81 +++++++++++++++++++++++++
lang/stklos-devel/files/dynamic_lookup.patch | 12 ++++
lang/stklos-devel/files/generate-git-info.patch | 14 +++++
lang/stklos-devel/files/no-gtklos.patch | 19 ++++++
lang/stklos-devel/files/tmpcomp.patch | 22 +++++++
5 files changed, 148 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/stklos-devel/Portfile b/lang/stklos-devel/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..00ac6498f43
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/stklos-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,81 @@
</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 stklos and stklos-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;'>+# Versions newer than this don't build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/egallesio/STklos/issues/514
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup egallesio STklos 3bc8d1f9b7474f5458f22b9aa8f1595fc2c90946
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name stklos-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.70-20230307-[string range ${git.branch} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a77a23c3183d8347b33214a4aa29d6639da52495 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e666d7067926704e6212dfc24c827e8bc0e9b5f9751d0d1088f596c1ff59b828 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9313029
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories lang
</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 GPL-2+ GPL-3+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts [string map [list -devel {}] ${subport}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description free Scheme system supporting most R7RS language features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description STklos is a free Scheme system supporting most of the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ language features defined in R7RS. The aim of this \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implementation is to be fast as well as light. The \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implementation is based on an ad-hoc Virtual Machine.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://stklos.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir stklos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles dynamic_lookup.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ generate-git-info.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-gtklos.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmpcomp.patch
</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;'>+ set vparts [split ${version} -]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@VERSION@|[lindex ${vparts} 0]|g;s|@COMMIT@|[lindex ${vparts} 2]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/utils/generate-git-info
</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;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:boehmgc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libedit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libffi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't regenerate the documentation with asciidoctor if it is installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_prog_ASCIIDOCTOR=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The install target depends on install-sources which I assume we don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # need. The install-base target normally strips the executable which will
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make it not work with extensions because the symbols the extensions want
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to use have been stripped out:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/egallesio/STklos/issues/353#issuecomment-1028125323
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/egallesio/STklos/issues/440#issuecomment-1473044496
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There is an install-base-no-strip target which sets STRIP=no before
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # calling install-base, however install-doc depends on install-base, so if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we use "install-base-no-strip install-doc" then the executable will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # installed unstripped, and then will be reinstalled stripped. It's simpler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to use install-base and set STRIP=no ourselves.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target install-base install-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args STRIP=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/[string map [list stklos- extensions/ -devel {}] ${subport}]/lib/stklos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env COMP=${prefix}/bin/stklos-compile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/stklos-devel/files/dynamic_lookup.patch b/lang/stklos-devel/files/dynamic_lookup.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b6a6c687ee6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/stklos-devel/files/dynamic_lookup.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/egallesio/STklos/pull/512
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- utils/shlib-options.orig 2023-03-10 11:37:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ utils/shlib-options 2023-03-16 14:42:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +161,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OS=DARWIN;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_COMP_FLAGS="-fPIC -fno-common"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SH_LOAD_FLAGS='-bundle -flat_namespace -undefined suppress'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SH_LOAD_FLAGS='-bundle -undefined dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_LOADER="$CC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_SUFFIX='so'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH_LIB_SUFFIX='dylib'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/stklos-devel/files/generate-git-info.patch b/lang/stklos-devel/files/generate-git-info.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d3b91fb73d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/stklos-devel/files/generate-git-info.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't use git to get information. It won't work because we're not building in a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+git clone. These placeholders will be replaced by code in the Portfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/egallesio/STklos/issues/515
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- utils/generate-git-info.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ utils/generate-git-info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,4 +6,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-git_tag="$(git describe --tags --abbrev=0 2>/dev/null || true)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-git_branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-git_commit="$(git rev-parse --short HEAD 2>/dev/null || true)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-git_modified="$(git diff-index --name-only HEAD 2>/dev/null | xargs -n 1 printf ' \\"%s\\"')"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++git_tag=stklos-@VERSION@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++git_branch=master
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++git_commit=@COMMIT@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++git_modified=
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/stklos-devel/files/no-gtklos.patch b/lang/stklos-devel/files/no-gtklos.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4f8f9189097
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/stklos-devel/files/no-gtklos.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't search for libraries that are only used by the gtklos extension.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-03-07 05:24:11.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-03-16 22:43:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7584,6 +7584,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ HAVE_CANVAS=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GOOCANV=absent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GOOVERS=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if false; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do we have GTK+?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ${PKGCONFIG} --exists gtk+-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7611,6 +7612,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GOOCANV=present
</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;'>++fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### SFI-176 stuff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/stklos-devel/files/tmpcomp.patch b/lang/stklos-devel/files/tmpcomp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b8133f9b94d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/stklos-devel/files/tmpcomp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix parallel build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/egallesio/STklos/issues/493
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- utils/tmpcomp.orig 2023-03-10 11:37:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ utils/tmpcomp 2023-03-16 15:07:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +82,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/src/stklos -c -q -b ${prefix}/src/boot.img \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -f ${prefix}/utils/stklos-compile.stk -- \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --no-time $Copt --output=$out $in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --no-time $Copt --output="$out.$$" "$in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++status=$?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test $status -gt 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f "$out.$$"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit $status
</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;'>++test -e "$out.$$" && mv "$out.$$" "$out"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test X$Copt = X -a -e $out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span></pre><pre style='margin:0'>
</pre>