<pre style='margin:0'>
Landon Fuller (landonf) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/38038b053af7f649054f5c5edfb1626fd0bc88e4">https://github.com/macports/macports-ports/commit/38038b053af7f649054f5c5edfb1626fd0bc88e4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 38038b053af7f649054f5c5edfb1626fd0bc88e4
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Thu Jun 9 17:31:00 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> everparse: update to 20220602-e722715
</span>---
devel/everparse/Portfile | 46 +++++++++++----------
devel/everparse/files/everparse-hints.tar.xz | Bin 520704 -> 581052 bytes
.../files/patch-batch-driver-toolchain-paths | 18 ++++----
devel/everparse/files/patch-fix-tests-mkdir | 6 +--
4 files changed, 36 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/everparse/Portfile b/devel/everparse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6940da30d90..afec40831f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/everparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/everparse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup github 1.0
name everparse
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup project-everest everparse 33d5538d8a92096d39879547a0744983b0fb75a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20210827-[string range ${github.version} 0 6]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup project-everest everparse e7227152dfade6cb4f0adf7dc03816273c0ef4e0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20220602-[string range ${github.version} 0 6]
</span> revision 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ long_description EverParse provides LowParse, verified-secure F*/Low* parser
</span> QuackyDucky, an untrusted compiler for generating verified secure parsers from a \
message format specification.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f5b69e47a6ad116eaab2e9fe736d9066cd0e7d65 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f2c8b58739781587f6b11a60b141bf41f4b0e5bfd2ae5acb95131b1c65ac55e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 863706
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 914ba6a092a8507d8c8678a469c22a5e4963d0e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 708a744e0740d594859e989522de14b71bec153f3d34612b55751cf33a5f10ab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 903279
</span>
depends_lib port:fstar \
port:kremlin \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,8 +51,8 @@ pre-patch {
</span> post-patch {
foreach {key path_var subdir} {
@FSTAR_HOME@ fstar.home "/home"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- @KREMLIN_HOME@ kremlin.home "/home"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @QD_HOME@ lowparse.home ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @KRML_HOME@ kremlin.home "/home"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @EVERPARSE_HOME@ lowparse.home ""
</span> } {
reinplace "s|${key}|[set ${path_var}]${subdir}|g" \
src/3d/ocaml/Batch.ml
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,33 +65,35 @@ distfiles-append everparse-hints.tar.xz
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set fstar.hint_flags {--hint_dir .hints --record_hints --use_hints}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.type gnu
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append "OTHERFLAGS=--hint_dir .hints --record_hints --use_hints"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append OTHERFLAGS=${fstar.hint_flags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EVERPARSE_FSTAR_OPTIONS=${fstar.hint_flags}
</span> build.args FSTAR_HOME=${fstar.home}/home \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- KREMLIN_HOME=${kremlin.home}/home
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KRML_HOME=${kremlin.home}/home
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span> # Link lowparse's .hint directories to the top-level ${workpath} directory
# we actually package up in everparse-hints.tar.xz
set eph_hints ${workpath}/lowparse.hints
file mkdir ${eph_hints}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {eph_src} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/lowparse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/3d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/3d/prelude
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests/lowparse
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests/sample0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests/sample
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests/bitfields
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests/unit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fs-traverse -tails {eph_src} ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set d ${worksrcpath}/${eph_src}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set f [file tail ${eph_src}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Skip non-directories, and directories with a leading `.` (but not ".")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file isdirectory ${d}] || [string match ".?*" $f]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file mkdir ${eph_hints}/${eph_src}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf ${eph_hints}/${eph_src} ${worksrcpath}/${eph_src}/.hints
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -sfh ${eph_hints}/${eph_src} ${d}/.hints
</span> }
}
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create QD_HOME layout compatible with src/package/package.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create EVERPARSE_HOME layout compatible with src/package/package.sh
</span> set everparse_root ${prefix}/libexec/everparse
set everparse_bin ${everparse_root}/bin
set everparse_lib ${everparse_root}/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/everparse/files/everparse-hints.tar.xz b/devel/everparse/files/everparse-hints.tar.xz
</span><span style='display:block; white-space:pre;color:#808080;'>index b2fa30d4aa6..ba8cb55e702 100644
</span>Binary files a/devel/everparse/files/everparse-hints.tar.xz and b/devel/everparse/files/everparse-hints.tar.xz differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/everparse/files/patch-batch-driver-toolchain-paths b/devel/everparse/files/patch-batch-driver-toolchain-paths
</span><span style='display:block; white-space:pre;color:#808080;'>index 4da2c708d8f..c5011a9a336 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/everparse/files/patch-batch-driver-toolchain-paths
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/everparse/files/patch-batch-driver-toolchain-paths
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span> --- src/3d/ocaml/Batch.ml.orig.1 2020-08-04 09:59:54.153758000 -0600
+++ src/3d/ocaml/Batch.ml 2020-08-04 10:06:32.902125000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,10 +2,10 @@
</span> open OS
(* paths *)
-let fstar_home = OS.getenv "FSTAR_HOME"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--let kremlin_home = OS.getenv "KREMLIN_HOME"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-let krml_home = OS.getenv "KRML_HOME"
</span> +let fstar_home = try OS.getenv "FSTAR_HOME" with Undefined_environment_variable _ -> "@FSTAR_HOME@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+let kremlin_home = try OS.getenv "KREMLIN_HOME" with Undefined_environment_variable _ -> "@KREMLIN_HOME@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let kremlib = filename_concat kremlin_home "kremlib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--let qd_home = OS.getenv "QD_HOME"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+let qd_home = try OS.getenv "QD_HOME" with Undefined_environment_variable _ -> "@QD_HOME@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let lowparse_home = filename_concat (filename_concat qd_home "src") "lowparse"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let ddd_home = filename_concat (filename_concat qd_home "src") "3d"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let ddd_prelude_home = filename_concat (filename_concat (filename_concat qd_home "src") "3d") "prelude"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++let krml_home = try OS.getenv "KRML_HOME" with Undefined_environment_variable _ -> "@KRML_HOME@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let krmllib = filename_concat krml_home "krmllib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-let everparse_home = OS.getenv "EVERPARSE_HOME"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++let everparse_home = try OS.getenv "EVERPARSE_HOME" with Undefined_environment_variable _ -> "@EVERPARSE_HOME@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let lowparse_home = filename_concat (filename_concat everparse_home "src") "lowparse"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let ddd_home = filename_concat (filename_concat everparse_home "src") "3d"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ let ddd_prelude_home = filename_concat (filename_concat (filename_concat everparse_home "src") "3d") "prelude"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/everparse/files/patch-fix-tests-mkdir b/devel/everparse/files/patch-fix-tests-mkdir
</span><span style='display:block; white-space:pre;color:#808080;'>index c984635857f..e763f8d2f2a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/everparse/files/patch-fix-tests-mkdir
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/everparse/files/patch-fix-tests-mkdir
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- tests/unit/Makefile.orig.1 2020-08-04 09:52:39.060371000 -0600
+++ tests/unit/Makefile 2020-08-04 09:52:47.099995000 -0600
@@ -71,7 +71,7 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ALL_KRML_FILES := $(filter-out kremlin/prims.krml,$(ALL_KRML_FILES))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ALL_KRML_FILES := $(filter-out krml/prims.krml,$(ALL_KRML_FILES))
</span>
extract: $(ALL_KRML_FILES) # from .depend
- -@mkdir out
+ -@mkdir -p out
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(KREMLIN) -skip-compilation $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(KRML) -skip-compilation $^
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.exe: $(ALL_KRML_FILES) kremlin/Test.krml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.exe: $(ALL_KRML_FILES) krml/Test.krml
</span></pre><pre style='margin:0'>
</pre>