<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/a49fc9cf670c12d32969b6e011b8cb754a43327d">https://github.com/macports/macports-ports/commit/a49fc9cf670c12d32969b6e011b8cb754a43327d</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 a49fc9c fstar|kremlin: fix broken fstar patch, restore stable fstar/kremlin revisions accidentally reset by 'port bump'
</span>a49fc9c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a49fc9cf670c12d32969b6e011b8cb754a43327d
</span>Author: Landon Fuller <landonf@macports.org>
AuthorDate: Sat Nov 30 15:55:51 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> fstar|kremlin: fix broken fstar patch, restore stable fstar/kremlin revisions accidentally reset by 'port bump'
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59777
</span>---
lang/fstar/Portfile | 10 ++++++----
lang/fstar/files/{ => fstar-devel}/patch-examples-fix-tests | 0
lang/fstar/files/{ => fstar-stable}/patch-examples-fix-tests | 10 ----------
lang/fstar/files/{ => fstar-stable}/patch-ocaml4.08 | 0
4 files changed, 6 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/Portfile b/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4027e9c..6fcca16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +85,6 @@ if {${fstar.project} eq "fstar"} {
</span> code.
patchfiles patch-z3-path \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-examples-fix-tests \
</span> patch-fix-get_exec_dir
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,14 +145,15 @@ if {${fstar.project} eq "fstar"} {
</span> # Subport-specific configuration
subport fstar {
github.setup ${github.author} ${github.project} ${fstar.version} V
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span>
distname V${version}
checksums rmd160 bec45d793880ecf815bdc3d79cdb58f7f6ba7414 \
sha256 baa60f5f8a6c0dd5237a4fc7de5b8e940a3c620d680d255ae0057cf765163618 \
size 7173479
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-ocaml4.08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append fstar-stable/patch-ocaml4.08 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fstar-stable/patch-examples-fix-tests
</span> }
subport fstar-devel {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,6 +166,8 @@ subport fstar-devel {
</span> size 7336672
github.tarball_from tarball
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append fstar-devel/patch-examples-fix-tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
# Disable the known-broken kv_parsing test
if {${github.version} ne "469ad10d993d82364993f225ba48004119b7d073"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +181,7 @@ subport fstar-devel {
</span>
subport kremlin {
github.setup ${github.author} ${fstar.project} 0.9.6.0 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 9
</span>
distname v${version}
worksrcdir kremlin-${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/patch-examples-fix-tests b/lang/fstar/files/fstar-devel/patch-examples-fix-tests
</span>similarity index 100%
copy from lang/fstar/files/patch-examples-fix-tests
copy to lang/fstar/files/fstar-devel/patch-examples-fix-tests
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/patch-examples-fix-tests b/lang/fstar/files/fstar-stable/patch-examples-fix-tests
</span>similarity index 96%
rename from lang/fstar/files/patch-examples-fix-tests
rename to lang/fstar/files/fstar-stable/patch-examples-fix-tests
<span style='display:block; white-space:pre;color:#808080;'>index 5926c03..2cf451d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/fstar/files/patch-examples-fix-tests
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/fstar/files/fstar-stable/patch-examples-fix-tests
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,13 +177,3 @@ diff -ru examples.orig/tactics/bench/Makefile examples/tactics/bench/Makefile
</span> EXCLUDED_FSTAR_FILES=PolyStub.fst
POLYS=$(foreach FACTOR,1 2 3,\
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/param/Makefile.orig 2019-11-29 14:59:14.453844000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/param/Makefile 2019-11-29 14:59:39.246708000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSTAR_HOME=../..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- KREMLIN_HOME?=$(FSTAR_HOME)/../Kremlin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDE_PATHS=$(KREMLIN_HOME)/kremlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCLUDE_PATHS=$(KREMLIN_HOME)/lib/kremlin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSTAR_FILES = $(wildcard *.fst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: verify-all
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/fstar/files/patch-ocaml4.08 b/lang/fstar/files/fstar-stable/patch-ocaml4.08
</span>similarity index 100%
rename from lang/fstar/files/patch-ocaml4.08
rename to lang/fstar/files/fstar-stable/patch-ocaml4.08
</pre><pre style='margin:0'>
</pre>