<pre style='margin:0'>
tobypeterson pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0cdfaad59bdbdf8a505a75fe03588983510accbe">https://github.com/macports/macports-ports/commit/0cdfaad59bdbdf8a505a75fe03588983510accbe</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 0cdfaad smlnj: update to 110.94
</span>0cdfaad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0cdfaad59bdbdf8a505a75fe03588983510accbe
</span>Author: Toby Peterson <toby@macports.org>
AuthorDate: Mon Nov 4 14:19:55 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> smlnj: update to 110.94
</span>---
lang/smlnj/Portfile | 61 ++++++++++++----------
lang/smlnj/files/patch-config-_arch-n-opsys.diff | 10 ----
.../patch-config__install.sh-correct-compiler.diff | 12 ++---
3 files changed, 36 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/smlnj/Portfile b/lang/smlnj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5ccce9..5174c04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/smlnj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/smlnj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name smlnj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 110.85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 110.94
</span> categories lang ml
license BSD
maintainers {toby @tobypeterson} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +19,7 @@ platforms darwin
</span> master_sites http://smlnj.cs.uchicago.edu/dist/working/${version}/
dist_subdir ${name}/${version}_${revision}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs x86_64 i386 ppc
</span> universal_variant no
distfiles
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,30 +27,31 @@ checksums
</span>
# Files needed for basic distribution.
set srcs [list \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- doc.tgz fdcba3261c654b6aede711be13aca430db09d046b2fe7ac912ec4a68c34bf3e6 0f9ba842dfb865461e2746f6e946e546467754ce 2032071 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boot.ppc-unix.tgz a12b30c6a48d1de0fd3cd71f800446ca4f086ec53bb496fbf45c9aaebf4be306 1fe93b2a98d5c69a2eddc1750451709e560d2a59 5984857 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boot.x86-unix.tgz 8a9269818dc6f9d9587c8447e13fd07a71fe169ff6ac6a92fee66e498e0f3017 3addaa0af52e5f469ed317404bbe3e1be56de520 6047349 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.tgz a1bec62058678157f4142228fd6c074d9c3f3c8eca4bf13d0feec40df0c891e2 226976b199becaa3a65f838ec822c96eb79c778a 515855 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cm.tgz 05043d490e613ed85d2542cf0c8ad1f50922ea8c58aaa76141c0bfaeea94600c 2f3754911651633dc3295543aaf831d18177769f 220275 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.tgz 358974715cdce99dd12fff7f732dfde31940750a3f0098291b4f8c91e2c638ff 92beb676f3ee038fdb1965e75386cfb72fde1301 841968 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runtime.tgz c435f73728bbba585719a746f46384075a16e84bc5920ea3270345a1536a30d9 544f650aafd359c49735026ebbc0e37b06a5d7e7 355706 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system.tgz a8ba7b15d07c9ddc922da3677546d2535c75f50263c471661d9f7d4a54ac4a9f eadb11ed33c21cceab7efc3cc65b71d113143bea 261177 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MLRISC.tgz 28e86de090e3bf150a7aba322a913e10948091e53b851ff89ecb24df79332f0d 8ccb0fe24952a47684acbb95d9f0267bb7f852c5 1459573 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- smlnj-lib.tgz cd48d7fd190bfafc2d209e4466368f955725dbca5de8c81fc6a6de786de064f2 51b445846dd441891e098907c3ec9f7172c3ad8e 457036 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- old-basis.tgz 1e9ca625fa9cad7025d67b79e89e03a2b7125bf081c1915898f47cfae65c7052 416a501d63a6b0672a36556439c9993481593c8c 1080 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ckit.tgz d185a6bc577bc0ea5cc7f5248e1b08ba9c2b376c4fd05f76748d60b8057f1d93 e3eaa08ee766df85020d90e80ed981baf64afffc 198405 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nlffi.tgz fcf8ab0f2438768530a3b4bfaaa40f86af7d23f35dd3bb1a6e64403fbf8e889a fc4594a58f81810f1d94d282d7f306e890279a13 75030 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cml.tgz 43d1d06a8e62bcf21efb48f0d9c67c469eeeb40ba953f9f0cd43e191c9c7b415 3b6cdd6a393e31561bdcb7835c0b54444b00dfbc 105645 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eXene.tgz c2323b9a380d4e8cd621d5721e4691df69a4096688bdd4959bd0086dfb87aa1e 19cd145e7bdbc9ae0b4b62df0b6b13e4abc052a9 720711 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ml-lpt.tgz 602e6c553d4ea82bdea2d7a6cf70d23b91e54a41896308b5cfc15094ac83e300 4331f73e3b949533a7b63a9f7e9505044b7eea40 267076 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ml-lex.tgz 984edf37721f94851505a5902128521e46729fc08e09d3e787db73e24ea8d380 831a660525c27a8e9c5214d64b167dce266cdc48 27831 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ml-yacc.tgz 09e7ac57f9defd6902bae1d539cbd04bfba69e227a4d7fc31139da8e3e3d13e4 3485d6f9591eb17b12dcbb80ecf94c1a1b47ac96 101689 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ml-burg.tgz 096aefd291ceff19722d3236984522147de5edfa4a91837d06e5f645af565882 e15f269b879c26555c8da476f54596ab1bccf0ef 40512 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pgraph.tgz c0a89e954c8974c3d07aa71ce39d549cf02add461bfd97d09dc99f95576bb8df 52f0f33b70552a3d8287991f2ea3bcf3a1806450 5430 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- trace-debug-profile.tgz e78daf92821e33992ad9ca91ca63ba2269c41b996c0ceb547da1e6f6dba56a3a 1702e3c3239360ba439429959b668970283d9eab 3935 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- heap2asm.tgz ecc6057d18193960a55dc14e3906108655d4bf39fdb29101062e7bea739dcf14 a0c878298a41d4c35b7c213cd0b8df9cb61b1687 1341 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- smlnj-c.tgz 7cfa26a11f80b7418a67a4194c639eedbcb429b6fc732f3569b61549bd958411 bbdafae116f6023ae1db0df67d40d481d6f94803 10620 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asdl.tgz 0b6fa30e8c51a0df50aa3dcbe93774dadbada3c1ab81414cb422f9c7ec2a86b4 34d38d7be732cf89855d110aec8aac38ff2ada92 193505 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc.tgz e52ba725ffbe131e2d97c234753cfcfb7765b9f13f7cc6a476a6c12f8583acf5 fd28b61fe1d921086fc280b38179892af528c3d0 2088161 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boot.amd64-unix.tgz 032c08034070cdc6132081538be6a32cd459055689d30005401c9a6f02498119 03e3179def5271235418ed5670265224c83ff737 6037153 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boot.ppc-unix.tgz e28e007289cc77108ec6cea610d04ace4f696ad42ea105cf88e9acee40a82fcc e36c75d8f4aa07d6d3e112e3c85307cebeb70015 5949077 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boot.x86-unix.tgz 71c7bc2f7763d52211a7f0188619dbd175b12bb18f97b30cf392ccfdea1fe762 0def8d29dc22c391562829b4cc96cb53fe2f99ca 6024880 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.tgz 6a29d26f4a4aa11e5fe7c50399fa940d27a01ae2caa412d1ad65b33555e6d69b 60c23e2018f133b3779cce2a9569027aaad0788a 516610 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cm.tgz 77765f396304c0081022637afc2c6038cf5f86b6be1d6642ffb9db1766b6e0f4 759b82433827d483bdc2b903049ad639c84a9526 220262 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.tgz 430d725645fe9dec0a41c0a5b90060994170b5ea6ceb4b320c6f257d0290bdba b186ca0cbdf805f2b9373ae571f1fa302f192259 848653 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runtime.tgz e9938960302d4f628fa889ddb4d85fb4f9237506aa5acd73883832725b4bb823 2ff3a3690f8fc0290f2e6cc4d481fb4eb2e1443f 353325 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system.tgz b052852206fe418cdca119a4eafcb5d06822c3dbb9e2afa06e79b9d4eb00b152 b8b0ca41d5e9d78fd1fa7033b98922849fb3da4d 274077 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MLRISC.tgz 3b2e5f8f674b9670ad5b3f702ec8f994fc0fb296b50592d400d6e1fb9d0b6e78 1f1afb31ee722d4f49a81c549a668f18969c2245 1460022 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ smlnj-lib.tgz e78571bc578668850daa653a15f10d3dc6d50bde53390e87d9a3ac79347f74ef 2209dcb295aafee961d953c0975fac4997dd09c1 457926 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ old-basis.tgz 6221cae7356d115a622328836f9b5da87a261c424ed6542399d52b06bee54fce 197eda24bc914d8409f400e96d01a3fea04462ac 1212 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ckit.tgz e25b55ea2b05e8b15c705f342d56bd87766452aacef37f9d71f392c6f9380995 1bee58b377718314791018e73cb77a52bac7a2b2 201007 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nlffi.tgz 1482e387ea24d2949f034cdb5178b335eea36c2aa351e4bdefb72fb18229638d ab94d423d4c0787f2ce46e817cac83ea8a1bbbdb 75090 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cml.tgz 74e0e50e8e13214d07a0aef66e9f11f40c928fd7afa6efa76f7b0c8c75b50060 db3a2aeea3f671f5756f26fadda3f80f08618e1e 105355 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eXene.tgz 008bae665cb15291cab4dbd8a96e21f55c3e2f5ac1600ac63f264a7dc9801d5e d321997faabeb74a180680eb7431a52de940e6a6 720698 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ml-lpt.tgz d27f80d2be7c87cc389ed7f40850b16d778f213b9dfc0750fbf714b728416714 987b8f46c4eea0dfd9e1be83d07c2cadda1d6cbc 267247 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ml-lex.tgz 31ccbc5598063a6ea11073f78737c764a63e272462824a287e326c8026335c14 4fd424ea1bffcce33c4f4d2892bdcd8609b5c189 27869 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ml-yacc.tgz d5c09318c754e13695df916ef83f2c83bb4a3f668970f82d5bfbf4ef9c2143ee 54bec4b274f8c6333920da86357aba9690f535bb 101726 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ml-burg.tgz fdd38446833c9ddf720bd02daaa1a5065e32c97bd01785e4b30612d866271c0b 41a9a572b61453f2c67ec3f1761ad274f37af5be 40550 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgraph.tgz 04990ce4039cf6c62af98241223bbba31601528c43425334e971ee66487d9830 c5f2a494106b56de157402b4f7d78ea80d02f6b4 5432 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trace-debug-profile.tgz 91c425663df0cfacee5b4d6bd8341e9169bb1c4cf25fc6fd1946da0701ba11fd 4763ee5e6d8917c2bc3df13baad95e6dbd09fcbf 3936 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ heap2asm.tgz e6f0b066ced939be72567c82bd0d32495e8e98a66604a6f28b2705c9896b163c fa23eed40397a908c0460f2474495731ec3da59f 1395 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ smlnj-c.tgz 01ba46f2e2ab6cb6a112fa83e88d89f91e57393d656108ea88dd17bb26cbdef0 2fa8cc073be5dc60d2e20de4bff3929c6079ee59 10622 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asdl.tgz 85f3ec58e8f6ec7da9eb9e2204cd65824798c742828d4a4fcac7c0d29c3703e4 941d85292cef5cbb8e1e0f21210e3f5b7b0e982f 205535 \
</span> ]
foreach {tarball sha256 rmd160 size} $srcs {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ extract.mkdir yes
</span> extract.only config.tgz
### patch ###
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-config__install.sh-correct-compiler.diff patch-config-_arch-n-opsys.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-config__install.sh-correct-compiler.diff
</span>
post-patch {
reinplace "s|@CC@|${configure.cc}|" ${worksrcpath}/config/install.sh
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,7 @@ configure {
</span> ${worksrcpath}/config/srcarchiveurl
reinplace "s|#request src-smlnj|request src-smlnj|" \
${worksrcpath}/config/targets
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#request eXene|request eXene|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #reinplace "s|#request eXene|request eXene|" \
</span> ${worksrcpath}/config/targets
reinplace "s|#request mlrisc-tools|request mlrisc-tools|" \
${worksrcpath}/config/targets
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +91,9 @@ configure {
</span> build.env URLGETTER=curl
build.cmd ${worksrcpath}/config/install.sh
build.target
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append -default 64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
### destroot ###
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/smlnj/files/patch-config-_arch-n-opsys.diff b/lang/smlnj/files/patch-config-_arch-n-opsys.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 85fdd8b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/smlnj/files/patch-config-_arch-n-opsys.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/_arch-n-opsys.orig 2018-06-25 20:48:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/_arch-n-opsys 2018-06-25 20:49:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,6 +50,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 16*) OPSYS=darwin; HEAP_OPSYS=darwin ;; # macOS 10.12 Sierra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 17*) OPSYS=darwin; HEAP_OPSYS=darwin ;; # macOS 10.13 High Sierra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 18*) OPSYS=darwin; HEAP_OPSYS=darwin ;; # macOS 10.14 Mojave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 19*) OPSYS=darwin; HEAP_OPSYS=darwin ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) exit 1;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/smlnj/files/patch-config__install.sh-correct-compiler.diff b/lang/smlnj/files/patch-config__install.sh-correct-compiler.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d26956f..b87c4ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/smlnj/files/patch-config__install.sh-correct-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/smlnj/files/patch-config__install.sh-correct-compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/install.sh.orig 2018-12-22 14:46:19.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/install.sh 2018-12-24 19:04:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -311,35 +311,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/install.sh.orig 2019-10-21 11:03:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/install.sh 2019-11-04 14:11:22.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -308,35 +308,6 @@
</span> 10.7*) AS_ACCEPTS_SDK=no ;;
10.8*) AS_ACCEPTS_SDK=no ;;
10.9*) AS_ACCEPTS_SDK=no ;;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,15 +36,11 @@
</span> *) AS_ACCEPTS_SDK=yes ;;
esac
if [ x"$SDK" = xnone ] ; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -396,7 +367,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -395,7 +366,14 @@
</span> vsay $this: Run-time system already exists.
else
"$CONFIGDIR"/unpack "$ROOT" runtime
+ echo $this: Adjusting the build scripts to MacPorts requirements
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd "$BASEDIR"/runtime/config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mv gen-posix-names.sh gen-posix-names.sh.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ awk '/18\.\*\)/ {print "\t18.*) SDK=MacOSX10.14.sdk ;;\n\t19.*) SDK=MacOSX10.15.sdk ;;"; next} {print}' gen-posix-names.sh.orig > gen-posix-names.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ chmod +x gen-posix-names.sh
</span> cd "$BASEDIR"/runtime/objs
+ /usr/bin/sed -E -i '.orig' \
+ -e 's|^CC[ ]*=[ ]*cc|CC = @CC@|g' \
</pre><pre style='margin:0'>
</pre>