<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/f595f0294c94cbc4a85d890d7a2a42101ab1fe18">https://github.com/macports/macports-ports/commit/f595f0294c94cbc4a85d890d7a2a42101ab1fe18</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 f595f02 smlnj: update to 110.85 (sans misguided upstream build changes)
</span>f595f02 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f595f0294c94cbc4a85d890d7a2a42101ab1fe18
</span>Author: Toby Peterson <toby@macports.org>
AuthorDate: Mon Dec 24 19:11:22 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> smlnj: update to 110.85 (sans misguided upstream build changes)
</span>---
lang/smlnj/Portfile | 50 +++++++++++-----------
.../patch-config__install.sh-correct-compiler.diff | 46 +++++++++++++++++---
2 files changed, 66 insertions(+), 30 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 79047d5..b6544fc 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,7 +3,7 @@
</span> PortSystem 1.0
name smlnj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 110.84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 110.85
</span> categories lang ml
license BSD
maintainers {toby @tobypeterson} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,30 +24,30 @@ checksums
</span>
# Files needed for basic distribution.
set srcs [list \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- doc.tgz 0ed69456e4c2b851f475057a94da406c80f46cdd02a5d9077670be33122c7020 632689f359211a54e5bbdf4e93c896630f08891a 2029114 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boot.ppc-unix.tgz f2f1ab475b42643643989406e3a50e13086e0b629098e35c25c940cdf8f57ca4 deaa9c7bdb83e3e5b4c627dd67a1724febd9484e 5701169 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boot.x86-unix.tgz a29e3b0ca623da197e9c18ea64db4c2a08fe5e6add85c0d053c4ecfa653ace82 9ceec9ade048de61c6f7a7be343aa41dffb3a4ae 5762714 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.tgz 1810d3ca768222e120c7a3f2f93aafd652705371fc73929423c671dce3cef832 49871a9447c8567ed6588e73073c71dab7117bf6 514275 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cm.tgz 7055c60481a887f27a5135ac1f33233565b99a7c99c4aa73e023e28e629b0663 c06690b11b2ded9be3c0a655c20864896832a456 220278 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.tgz 6d23aff2e75727bf6969b05a070128f187e06f60408aabf6a71e0475326fee87 fe5bd56c5b96c011c59f8313ac79817f08bdc436 862298 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runtime.tgz 5fcf4bbdeaddb247f69a333d2295f5f5c0be55b1f86ff4fbffb63f0021d84d6c 814e64047f9fa59deefba0c998b08d5032855745 355339 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system.tgz f46b1de790000a98f4aa9830325d39cb1e4867338d4db6b8a102084db1512218 452e940bc7b880b920685fbab44e9c79d13036ad 261237 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MLRISC.tgz da3c5236018fa7608863c2fe1f3c57b60013df98b5a249fb3d4edc738cdfd072 ec22dba892603565f97bc2a2e6e27b81c5b50e63 1458550 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- smlnj-lib.tgz 3356924655277416d8a491c1d601a0f567ab3d15cb17e243620e85cb28f0e9dd 37041f048382ef15252a693fb0b48ea99522dc75 456254 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- old-basis.tgz cf15fe5c242f19f0605cd38a7bef3c1ebc89d5204c4cf68fac479198dd9fed93 3b3a9b9a6753e69353da873e87d9007e0681e8a8 1080 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ckit.tgz 7e2534e393d2372cad8ff9ddd306881db91bbbcc2b0e0538e76868c86c658c36 30a418369fe24a8a0d1520efefdd1aea0fc6eb87 198419 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nlffi.tgz 8b96a82a3d63b000b70a1b982aab9750ce9caa77f316f6a923969e86b0133f31 f969a41948bf453d72336fff8f9ae33d9ddcc25c 75036 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cml.tgz 556110c746db863211ac8a97e1bf097b0e5d45dfea4b3e8194b6c389ac2b569a 2814650c03d9532e8910a928a78fcb08c45beb7b 105655 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eXene.tgz 3fe1c6a1a334e7d7359fbcfd053066c88cb7705a90975b60fff946554aa0019c 0a8df3633743d95618afa02cf890a957c5c6413a 720713 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ml-lpt.tgz 2f60e1467a69fd4fb5501354244337926bc2a65225dde328f6aa3883b14fb3a5 960ff0e66f2b8a583a187c6f8a1e0ff92214cec0 267076 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ml-lex.tgz cc7e045aa9667f1eed055db1defca0e830eed34c08f3dfdf37f698964fe04070 1443ab47d4288a9996467678e9b4ebd59a7b4030 27833 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ml-yacc.tgz cfebaeb5f08810fcc93c49bf171834b7bf14b5f7e76d206e0afa35e18887bdb9 e9abdb381be0e0b2364e8161fbe689ca5bc60fb0 101692 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ml-burg.tgz 62ea37b13788078e3ea77d3b870da42788153c348009f827f2c0b05cfc07d918 ecddaec0cc73e867f13ea3a429ca0c9beb64af13 40510 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pgraph.tgz aa2f14de13a540dbc370b45757156c0b03516a5b8f97b5759292841d7b7ac1cb 416b6a1f449eae80cb56798cb0acf2bb1f1edfae 5432 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- trace-debug-profile.tgz ecc54281b8654c75f8b9d4ebdf1ff67de71ef31297cf1b14115cd75645e46a5a 04b21e07d09e1aaf0dfb632e863fa57b0bad7b23 3939 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- heap2asm.tgz 3d33c52b650536762d47534f07709e749cc821ce515aef2fb9a746db11433e95 e614ca9624f9a7fbee1e1112afed3eb6dbde92db 1343 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- smlnj-c.tgz 145a513becb4c98991af7eae81ae19b8fff336458f1f011eafdc283cb76deee9 f72b17c375137f3aefceb7f07dabbac086eff92e 10623 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asdl.tgz 8be712200dc186b8bbe79b3ae111f2c490bf74f4709882d3459ac061f66b5b8e 27fa1fef19efb299e2a23f72c0a627fac7953921 193047 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doc.tgz fdcba3261c654b6aede711be13aca430db09d046b2fe7ac912ec4a68c34bf3e6 0f9ba842dfb865461e2746f6e946e546467754ce 2032071 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boot.ppc-unix.tgz a12b30c6a48d1de0fd3cd71f800446ca4f086ec53bb496fbf45c9aaebf4be306 1fe93b2a98d5c69a2eddc1750451709e560d2a59 5984857 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boot.x86-unix.tgz 8a9269818dc6f9d9587c8447e13fd07a71fe169ff6ac6a92fee66e498e0f3017 3addaa0af52e5f469ed317404bbe3e1be56de520 6047349 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.tgz a1bec62058678157f4142228fd6c074d9c3f3c8eca4bf13d0feec40df0c891e2 226976b199becaa3a65f838ec822c96eb79c778a 515855 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cm.tgz 05043d490e613ed85d2542cf0c8ad1f50922ea8c58aaa76141c0bfaeea94600c 2f3754911651633dc3295543aaf831d18177769f 220275 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.tgz 358974715cdce99dd12fff7f732dfde31940750a3f0098291b4f8c91e2c638ff 92beb676f3ee038fdb1965e75386cfb72fde1301 841968 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runtime.tgz c435f73728bbba585719a746f46384075a16e84bc5920ea3270345a1536a30d9 544f650aafd359c49735026ebbc0e37b06a5d7e7 355706 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system.tgz a8ba7b15d07c9ddc922da3677546d2535c75f50263c471661d9f7d4a54ac4a9f eadb11ed33c21cceab7efc3cc65b71d113143bea 261177 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MLRISC.tgz 28e86de090e3bf150a7aba322a913e10948091e53b851ff89ecb24df79332f0d 8ccb0fe24952a47684acbb95d9f0267bb7f852c5 1459573 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ smlnj-lib.tgz cd48d7fd190bfafc2d209e4466368f955725dbca5de8c81fc6a6de786de064f2 51b445846dd441891e098907c3ec9f7172c3ad8e 457036 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ old-basis.tgz 1e9ca625fa9cad7025d67b79e89e03a2b7125bf081c1915898f47cfae65c7052 416a501d63a6b0672a36556439c9993481593c8c 1080 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ckit.tgz d185a6bc577bc0ea5cc7f5248e1b08ba9c2b376c4fd05f76748d60b8057f1d93 e3eaa08ee766df85020d90e80ed981baf64afffc 198405 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nlffi.tgz fcf8ab0f2438768530a3b4bfaaa40f86af7d23f35dd3bb1a6e64403fbf8e889a fc4594a58f81810f1d94d282d7f306e890279a13 75030 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cml.tgz 43d1d06a8e62bcf21efb48f0d9c67c469eeeb40ba953f9f0cd43e191c9c7b415 3b6cdd6a393e31561bdcb7835c0b54444b00dfbc 105645 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eXene.tgz c2323b9a380d4e8cd621d5721e4691df69a4096688bdd4959bd0086dfb87aa1e 19cd145e7bdbc9ae0b4b62df0b6b13e4abc052a9 720711 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ml-lpt.tgz 602e6c553d4ea82bdea2d7a6cf70d23b91e54a41896308b5cfc15094ac83e300 4331f73e3b949533a7b63a9f7e9505044b7eea40 267076 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ml-lex.tgz 984edf37721f94851505a5902128521e46729fc08e09d3e787db73e24ea8d380 831a660525c27a8e9c5214d64b167dce266cdc48 27831 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ml-yacc.tgz 09e7ac57f9defd6902bae1d539cbd04bfba69e227a4d7fc31139da8e3e3d13e4 3485d6f9591eb17b12dcbb80ecf94c1a1b47ac96 101689 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ml-burg.tgz 096aefd291ceff19722d3236984522147de5edfa4a91837d06e5f645af565882 e15f269b879c26555c8da476f54596ab1bccf0ef 40512 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pgraph.tgz c0a89e954c8974c3d07aa71ce39d549cf02add461bfd97d09dc99f95576bb8df 52f0f33b70552a3d8287991f2ea3bcf3a1806450 5430 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ trace-debug-profile.tgz e78daf92821e33992ad9ca91ca63ba2269c41b996c0ceb547da1e6f6dba56a3a 1702e3c3239360ba439429959b668970283d9eab 3935 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ heap2asm.tgz ecc6057d18193960a55dc14e3906108655d4bf39fdb29101062e7bea739dcf14 a0c878298a41d4c35b7c213cd0b8df9cb61b1687 1341 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ smlnj-c.tgz 7cfa26a11f80b7418a67a4194c639eedbcb429b6fc732f3569b61549bd958411 bbdafae116f6023ae1db0df67d40d481d6f94803 10620 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asdl.tgz 0b6fa30e8c51a0df50aa3dcbe93774dadbada3c1ab81414cb422f9c7ec2a86b4 34d38d7be732cf89855d110aec8aac38ff2ada92 193505 \
</span> ]
foreach {tarball sha256 rmd160 size} $srcs {
<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 97f91c8..d26956f 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,13 +1,49 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/install.sh.orig 2017-06-07 16:06:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/install.sh 2018-06-25 21:07:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -353,7 +353,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/install.sh.orig 2018-12-22 14:46:19.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/install.sh 2018-12-24 19:04:26.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,35 +311,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.7*) AS_ACCEPTS_SDK=no ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.8*) AS_ACCEPTS_SDK=no ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 10.9*) AS_ACCEPTS_SDK=no ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 10.14*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_ACCEPTS_SDK=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Mojave needs a special makefile, but we need to be careful
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # about when we are running the postinstall script, so we check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # for the nolib argument
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ x"$nolib" = xfalse ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RT_MAKEFILE=mk.x86-darwin18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # location of Xcode SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ ! -x /usr/bin/xcode-select ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "$this: !!! /usr/bin/xcode-select is missing; please install Xcode"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SDK_DIR=`xcode-select -p`/Platforms/MacOSX.platform/Developer/SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # look for an SDK that supports 32-bit builds (starting with 10.13 High Sierra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # and going back to 10.10 Yosemite)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for SDK_VERS in 13 12 11 10 ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -d $SDK_DIR/MacOSX10.$SDK_VERS.sdk ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SDK="$SDK_DIR/MacOSX10.$SDK_VERS.sdk"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ x"$SDK" = xnone ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "$this: !!! SML/NJ requires support for 32-bit executables."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo " Please see http://www.smlnj.org/dist/working/$VERSION/MACOSXINSTALL for more details."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</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;'>+ *) AS_ACCEPTS_SDK=yes ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [ x"$SDK" = xnone ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -396,7 +367,18 @@
</span> vsay $this: Run-time system already exists.
else
"$CONFIGDIR"/unpack "$ROOT" runtime
+ echo $this: Adjusting the build scripts to MacPorts requirements
+ cd "$BASEDIR"/runtime/config
+ mv gen-posix-names.sh gen-posix-names.sh.orig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ awk '/SDK=none/ {print "\t18.*) SDK=MacOSX10.14.sdk ;;\n\t19.*) SDK=MacOSX10.15.sdk ;;"} {print}' gen-posix-names.sh.orig > gen-posix-names.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 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> + chmod +x gen-posix-names.sh
cd "$BASEDIR"/runtime/objs
+ /usr/bin/sed -E -i '.orig' \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,5 +53,5 @@
</span> + -e 's|^LD_LIBS[ ]*=(.*)$|LD_LIBS = \1 @LDFLAGS@|g' \
+ mk.$ARCH-$OPSYS
echo $this: Compiling the run-time system.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $MAKE -f $RT_MAKEFILE $EXTRA_DEFS
</span> if [ -x run.$ARCH-$OPSYS ]; then
</pre><pre style='margin:0'>
</pre>