Update to SML/NJ 110.73

SML/NJ 110.73 provides a number of new library features,
including a new library for working with HTML 4, as well
as many bug fixes.

Details:

CM:
   + Added boolean literals (true and false) to the
     conditional-expression syntax in CM. Thus, you can write

         #if true structure Foo #endif

     in a CM file. This change is meant to make it easier to use
     autoconf to configure the build process of an SML
     application.
ML-Yacc:
   + Fixed ml-yacc examples to respect the changed signatures
     with respect to TextIO.inputLine.

SML/NJ Library:
   + Added findExe function to PathUtil module.
   + Modified the implementation of GetOpt.usageInfo so that if
     the help string has embedded newlines, then the extra lines
     are properly indented.
   + Changed the interface of JSONStreamParser to support both
     parsing files and TextIO.instreams.
   + Added HTML4 library.
   + Fixed bug in hashed cons library (bug #55).
   + Added array iterators to DynamicArray module.
Concurrent ML:
   + The paths used to specify the CML versions of libraries in
     a CM file have been rationalized (bug #68)

         $cml/basis.cm -- the CML version of $/basis.cm
         $cml/cml.cm -- core CML features
         $cml/cml-lib.cm -- CML library code
         $cml/trace-cml.cm -- TraceCML library for debugging
         $cml/smlnj-lib.cm -- CML version of the $/smlnj-lib.cm library
         $cml/inet-lib.cm -- CML version of the $/inet-lib.cm library
         $cml/unix-lib.cm -- CML version of the $/unix-lib.cm library

     Note that the old naming scheme is still supported, but may
     be removed in some future version.
   + Added Barriers module to CML.
   + Fixed the Win32 socket and polling implementation to work
     correctly with CML. Signature of poll was wrong and didn't
     handle sockets at all.
MLRISC:
   + Added support for the RTDSC and RTDSCP instructions to the
     amd64 code generator.

7 files changed, 72 insertions, 124 deletions

diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index c90d5889dd4..f4607415479 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2010/02/07 03:14:36 asau Exp $
+# $NetBSD: Makefile,v 1.23 2012/01/29 20:48:48 asau Exp $
 #
 
 DISTNAME=	boot.${BOX}-unix
@@ -30,7 +30,7 @@ MAINTAINER=	richards+netbsd@CS.Princeton.EDU
 HOMEPAGE=	http://www.smlnj.org/index.html
 COMMENT=	Popular functional language from Bell Labs
 
-SML_VERSION=	110.72
+SML_VERSION=	110.73
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/lang/smlnj/PLIST b/lang/smlnj/PLIST
index d56b2c1aa9a..faed08b6751 100644
--- a/lang/smlnj/PLIST
+++ b/lang/smlnj/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/02/07 03:14:36 asau Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/01/29 20:48:48 asau Exp $
 bin/heap2asm
 bin/heap2exec
 bin/ml-antlr
@@ -73,12 +73,18 @@ lib/smlnj/lib/cml-lib/.cm/${BOX}-unix/smlnj-lib.cm
 lib/smlnj/lib/cml-lib/.cm/${BOX}-unix/trace-cml.cm
 lib/smlnj/lib/cml/.cm/${BOX}-unix/basis.cm
 lib/smlnj/lib/cml/.cm/${BOX}-unix/cml-internal.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/cml-lib.cm
 lib/smlnj/lib/cml/.cm/${BOX}-unix/cml.cm
 lib/smlnj/lib/cml/.cm/${BOX}-unix/core-cml.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/inet-lib.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/smlnj-lib.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/trace-cml.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/unix-lib.cm
 lib/smlnj/lib/dir-tool.cm/.cm/${BOX}-unix/dir-tool.cm
 lib/smlnj/lib/eXene.cm/.cm/${BOX}-unix/eXene.cm
 lib/smlnj/lib/grm-ext.cm/.cm/${BOX}-unix/grm-ext.cm
 lib/smlnj/lib/hash-cons-lib.cm/.cm/${BOX}-unix/hash-cons-lib.cm
+lib/smlnj/lib/html4-lib.cm/.cm/${BOX}-unix/html4-lib.cm
 lib/smlnj/lib/inet-lib.cm/.cm/${BOX}-unix/inet-lib.cm
 lib/smlnj/lib/json-lib.cm/.cm/${BOX}-unix/json-lib.cm
 lib/smlnj/lib/lex-ext.cm/.cm/${BOX}-unix/lex-ext.cm
diff --git a/lang/smlnj/distinfo b/lang/smlnj/distinfo
index 32d712d8557..f74461d3fe2 100644
--- a/lang/smlnj/distinfo
+++ b/lang/smlnj/distinfo
@@ -1,68 +1,67 @@
-$NetBSD: distinfo,v 1.13 2010/02/07 03:14:36 asau Exp $
+$NetBSD: distinfo,v 1.14 2012/01/29 20:48:48 asau Exp $
 
-SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a
-RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb
-Size (smlnj-110.72/MLRISC.tgz) = 1432663 bytes
-SHA1 (smlnj-110.72/boot.x86-unix.tgz) = 799f02f3e880a829b48962994b563f7321385d87
-RMD160 (smlnj-110.72/boot.x86-unix.tgz) = bd2962ea25d6f384a3f458759a1c655960dc4208
-Size (smlnj-110.72/boot.x86-unix.tgz) = 5847908 bytes
-SHA1 (smlnj-110.72/ckit.tgz) = 0ebcdbd0a494eb051b4e6081f5e9312a0a54f03d
-RMD160 (smlnj-110.72/ckit.tgz) = 0d94d522b22b21600ad99aaf22fb671c12a6ea59
-Size (smlnj-110.72/ckit.tgz) = 199126 bytes
-SHA1 (smlnj-110.72/cm.tgz) = 0a85eaecc101c45c769e6beb8ace8a8bf0f4d32f
-RMD160 (smlnj-110.72/cm.tgz) = 821eb682bfb4e6ef6a71fe341ba018059301a233
-Size (smlnj-110.72/cm.tgz) = 201235 bytes
-SHA1 (smlnj-110.72/cml.tgz) = 9fd01c6d2d4a7cac22be75010891c1be5ab81f29
-RMD160 (smlnj-110.72/cml.tgz) = 8e3b8fd01258e74364fa1319bb8d01335aaca8d1
-Size (smlnj-110.72/cml.tgz) = 104194 bytes
-SHA1 (smlnj-110.72/compiler.tgz) = cf80dfb2150de0705fbc2b2a01fc8eefda0e9c85
-RMD160 (smlnj-110.72/compiler.tgz) = 6811090d11179312413ef789d1e292e95040606a
-Size (smlnj-110.72/compiler.tgz) = 823034 bytes
-SHA1 (smlnj-110.72/config.tgz) = a7e205a9e0753908ee3174daa5164c320c7a411f
-RMD160 (smlnj-110.72/config.tgz) = f0e8f348ec4c8b4c5860d68a0b6b554f848ca4a7
-Size (smlnj-110.72/config.tgz) = 512648 bytes
-SHA1 (smlnj-110.72/eXene.tgz) = c8b502580a719b38528f100f21f11ac1f4c2b573
-RMD160 (smlnj-110.72/eXene.tgz) = 182838ea5c6d3688f841b5edeea08f9c83b93177
-Size (smlnj-110.72/eXene.tgz) = 713820 bytes
-SHA1 (smlnj-110.72/heap2asm.tgz) = 46845fc4bed21f1c3b46540fc088936d0502e12b
-RMD160 (smlnj-110.72/heap2asm.tgz) = 24b779bdb8b21a74d0f3586f5db779e02c540253
-Size (smlnj-110.72/heap2asm.tgz) = 1308 bytes
-SHA1 (smlnj-110.72/ml-burg.tgz) = 17afacafa25d1fc33d3cbe464be66f1a7f8714fa
-RMD160 (smlnj-110.72/ml-burg.tgz) = 8b78c21f6b338baa55c9227babed4ebca10edd26
-Size (smlnj-110.72/ml-burg.tgz) = 36558 bytes
-SHA1 (smlnj-110.72/ml-lex.tgz) = 3fb5dca13de3c51ddab1c8fb95b1dfaad58fb27c
-RMD160 (smlnj-110.72/ml-lex.tgz) = 69ccfd9ba199bd4a063f1a2c2a40444e0cf9db67
-Size (smlnj-110.72/ml-lex.tgz) = 32966 bytes
-SHA1 (smlnj-110.72/ml-lpt.tgz) = 948735346b411ec5004f3294454c12bfb4176083
-RMD160 (smlnj-110.72/ml-lpt.tgz) = 86642f1b470c5f15861334072ff7543af1066881
-Size (smlnj-110.72/ml-lpt.tgz) = 258328 bytes
-SHA1 (smlnj-110.72/ml-yacc.tgz) = f7b0f53c7f676e7bb2605211d4981948c538a551
-RMD160 (smlnj-110.72/ml-yacc.tgz) = c6ce323c77b8d1ac33f6bce0a865df40e1efe310
-Size (smlnj-110.72/ml-yacc.tgz) = 101751 bytes
-SHA1 (smlnj-110.72/nlffi.tgz) = 63d043de413748fe124eb6e9f066935b4f1e96e0
-RMD160 (smlnj-110.72/nlffi.tgz) = 279741f9318b74dea838432adc21ad8f671bed6a
-Size (smlnj-110.72/nlffi.tgz) = 74688 bytes
-SHA1 (smlnj-110.72/pgraph.tgz) = 00919f8341fdcbe38ff7c908ef78fbbc4c37a5b6
-RMD160 (smlnj-110.72/pgraph.tgz) = 8341475dc03a2460799af637eeb46d3f334f451f
-Size (smlnj-110.72/pgraph.tgz) = 5417 bytes
-SHA1 (smlnj-110.72/runtime.tgz) = d9e3df41155ad9e969dd13c06f0f0fd3df177578
-RMD160 (smlnj-110.72/runtime.tgz) = 894209303d9204bae84209a8130877200251584e
-Size (smlnj-110.72/runtime.tgz) = 333396 bytes
-SHA1 (smlnj-110.72/smlnj-c.tgz) = f4bf82d695be0fca01e0f3e4075ac4d81fe3c660
-RMD160 (smlnj-110.72/smlnj-c.tgz) = 373fc5c1b0b49056bc1eb73bf9650c2f939c4540
-Size (smlnj-110.72/smlnj-c.tgz) = 10618 bytes
-SHA1 (smlnj-110.72/smlnj-lib.tgz) = 8ce9761a118569b8563f0336e010906c15943324
-RMD160 (smlnj-110.72/smlnj-lib.tgz) = fbcdc678f1c6842aaa5a2241db6564e6e81eb525
-Size (smlnj-110.72/smlnj-lib.tgz) = 258562 bytes
-SHA1 (smlnj-110.72/system.tgz) = 72f73bbbc06d23ee3c4510bb5af2fb8dec431337
-RMD160 (smlnj-110.72/system.tgz) = c6816b7c9fd57f9351b63a7ba447442c4a21fe7b
-Size (smlnj-110.72/system.tgz) = 238169 bytes
-SHA1 (smlnj-110.72/trace-debug-profile.tgz) = e80d8076d961a36e067b559c02279562856bb6ee
-RMD160 (smlnj-110.72/trace-debug-profile.tgz) = 6c85734aefd0672a645497550dacf56f503dd726
-Size (smlnj-110.72/trace-debug-profile.tgz) = 3905 bytes
+SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9
+RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb
+Size (smlnj-110.73/MLRISC.tgz) = 1422538 bytes
+SHA1 (smlnj-110.73/boot.x86-unix.tgz) = f2a6b89708d41d5968bf6f2e2ee713704f3664fd
+RMD160 (smlnj-110.73/boot.x86-unix.tgz) = c6fa71d7a14e79d095159ebd877b7562e88eeeb5
+Size (smlnj-110.73/boot.x86-unix.tgz) = 5838645 bytes
+SHA1 (smlnj-110.73/ckit.tgz) = afbb7c03aa3aac813f4ce6686a68998b2612bea9
+RMD160 (smlnj-110.73/ckit.tgz) = 56586583bbc8eff89e560e692705a7adc8f9c8e9
+Size (smlnj-110.73/ckit.tgz) = 196369 bytes
+SHA1 (smlnj-110.73/cm.tgz) = 8662fe0ec182f8aacd0673f45bb8ee90fa4e422b
+RMD160 (smlnj-110.73/cm.tgz) = ed3a6db81bd2e3c39e0cd1d09a96de97bc2831ca
+Size (smlnj-110.73/cm.tgz) = 200409 bytes
+SHA1 (smlnj-110.73/cml.tgz) = 80d75c04ab31b97690baae640285e86c758b8068
+RMD160 (smlnj-110.73/cml.tgz) = e696982679aa30bc793069e611e34a723718aaa5
+Size (smlnj-110.73/cml.tgz) = 105746 bytes
+SHA1 (smlnj-110.73/compiler.tgz) = 3ee0916bde53e92c270aa5f8115807d4af8538f3
+RMD160 (smlnj-110.73/compiler.tgz) = 30a59b3b6a7502d1e224d8548b666517096786b5
+Size (smlnj-110.73/compiler.tgz) = 816713 bytes
+SHA1 (smlnj-110.73/config.tgz) = 344542262c63cc0a9b3fdafc8c118ff0a880c779
+RMD160 (smlnj-110.73/config.tgz) = 6fd5a5e24f2de634e266cde4ff96d25e7a17786c
+Size (smlnj-110.73/config.tgz) = 511370 bytes
+SHA1 (smlnj-110.73/eXene.tgz) = 7cccbbf90191b6d862f22658851996a2bba9943a
+RMD160 (smlnj-110.73/eXene.tgz) = e087ac0944dfef3a491a8f02d85969b6ea393f19
+Size (smlnj-110.73/eXene.tgz) = 703040 bytes
+SHA1 (smlnj-110.73/heap2asm.tgz) = 7ae4b258e273b7e23709e34d5f23e2cc886a51e5
+RMD160 (smlnj-110.73/heap2asm.tgz) = 28fd26d3740f7d2402a2579a727e36a5fc3c41ea
+Size (smlnj-110.73/heap2asm.tgz) = 1313 bytes
+SHA1 (smlnj-110.73/ml-burg.tgz) = 35bd4683c66d5dbc4f688a747add9c8a7e1e09c3
+RMD160 (smlnj-110.73/ml-burg.tgz) = 28fa2576667f3b15e0c91119c7a136cab976359c
+Size (smlnj-110.73/ml-burg.tgz) = 36341 bytes
+SHA1 (smlnj-110.73/ml-lex.tgz) = b70ab6bae93ce8845e8f439baa56c50090b96eed
+RMD160 (smlnj-110.73/ml-lex.tgz) = 7685914a37c217ad1ec38750c598cda668bb0136
+Size (smlnj-110.73/ml-lex.tgz) = 33146 bytes
+SHA1 (smlnj-110.73/ml-lpt.tgz) = 54ca9f64e02bc71b08addd229895f889066fcec9
+RMD160 (smlnj-110.73/ml-lpt.tgz) = 4c3669ecff6119f5114f31acff36d68c35d1a082
+Size (smlnj-110.73/ml-lpt.tgz) = 254557 bytes
+SHA1 (smlnj-110.73/ml-yacc.tgz) = e360b0402f67d0e305f31c83429a81c7ec408c41
+RMD160 (smlnj-110.73/ml-yacc.tgz) = b1b88d5ccd6b20d8dea06e9a99dfe14282683da0
+Size (smlnj-110.73/ml-yacc.tgz) = 99921 bytes
+SHA1 (smlnj-110.73/nlffi.tgz) = 51f8ce2900a250467f8cc7e1a5849c1f0107efac
+RMD160 (smlnj-110.73/nlffi.tgz) = a72b0d21762b733bf33d942bc2f10243a4b04cbc
+Size (smlnj-110.73/nlffi.tgz) = 74485 bytes
+SHA1 (smlnj-110.73/pgraph.tgz) = f411177861e99e767987cea9bcd413008e45d2f9
+RMD160 (smlnj-110.73/pgraph.tgz) = 5a974d3f0003d6e161f428ae8f5e79fa7019bd6c
+Size (smlnj-110.73/pgraph.tgz) = 5441 bytes
+SHA1 (smlnj-110.73/runtime.tgz) = d67d8eb4a12ae4272d0a3f02e94e0c38de20efa1
+RMD160 (smlnj-110.73/runtime.tgz) = e4e179063e053cac593452009c1eb7a6d194ff63
+Size (smlnj-110.73/runtime.tgz) = 323625 bytes
+SHA1 (smlnj-110.73/smlnj-c.tgz) = fc8e3663f4db3720fa838c088d418c79e950b4ea
+RMD160 (smlnj-110.73/smlnj-c.tgz) = 7a7a301f749e64e12985c8a36710551e69ad4f08
+Size (smlnj-110.73/smlnj-c.tgz) = 10532 bytes
+SHA1 (smlnj-110.73/smlnj-lib.tgz) = 7fe0cf25c0ad9cf63e4472d190d8bdb7d3083cef
+RMD160 (smlnj-110.73/smlnj-lib.tgz) = d0a883dcd3cb59e16671b79e2230fa55c1ee7131
+Size (smlnj-110.73/smlnj-lib.tgz) = 497319 bytes
+SHA1 (smlnj-110.73/system.tgz) = 423816ef96b8b830bc1d708b1484240de2399b4b
+RMD160 (smlnj-110.73/system.tgz) = 01c0a0c4f2ea0a0615c3c1b55fa88a46bfc8de68
+Size (smlnj-110.73/system.tgz) = 227056 bytes
+SHA1 (smlnj-110.73/trace-debug-profile.tgz) = 1879601267411bf03ef6d8c06422d56b0548929d
+RMD160 (smlnj-110.73/trace-debug-profile.tgz) = e6cdae53b060c85782424d792bdf4673c5ddbf1e
+Size (smlnj-110.73/trace-debug-profile.tgz) = 3899 bytes
 SHA1 (patch-aa) = a67e8438c0ae20c1f0fac37148158b565056e5f7
 SHA1 (patch-ab) = 3d5946b2d72dee255159afe6fb25240f8fa7e306
-SHA1 (patch-ac) = f6c30285f55a9537a785d363837ecc83cfd384b7
 SHA1 (patch-ad) = a406bde2f6f7e2d93d652135b94aefd4b7aca494
 SHA1 (patch-ae) = 5796401418fd91a795fdfe75060cf654dd315ac1
 SHA1 (patch-af) = fae22c6f367b3007bbd9b46b7a7a218710723ca4
@@ -76,6 +75,4 @@ SHA1 (patch-an) = d6e1a75d5fb68423ce3181622de919c2337db2e7
 SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31
 SHA1 (patch-ap) = 8e9e28548b4e58de68a11982a355a010ea96aa29
 SHA1 (patch-aq) = 7d0734b76d778d7f584d2e70d325fd72e6554b01
-SHA1 (patch-ar) = 727afe6de54eb244c48e99c661f6b8ae3f780de0
-SHA1 (patch-as) = a2e5d474876baa1dc2484dda81708ea6ac92eb0b
-SHA1 (patch-at) = 9fd22dab9def459d3305695a38d14d25c645ff30
+SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae
diff --git a/lang/smlnj/patches/patch-ac b/lang/smlnj/patches/patch-ac
deleted file mode 100644
index 6a1c20aef56..00000000000
--- a/lang/smlnj/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2009/09/22 14:48:47 asau Exp $
-
---- config/_arch-n-opsys.orig	2008-08-13 22:37:59.000000000 +0400
-+++ config/_arch-n-opsys	2009-01-27 17:24:34.000000000 +0300
-@@ -118,13 +118,15 @@
-     ;;
-   NetBSD)
-     case `uname -r` in
--      2*) OPSYS=netbsd2;;
--      3*) OPSYS=netbsd;;
--      *) exit 1;;
-+      1.*)  exit 1;;
-+      2.*) OPSYS=netbsd2;;
-+      *) OPSYS=netbsd;;
-     esac
-     HEAP_OPSYS=bsd
--    case `uname -m` in
-+    case `uname -p` in
-       *86) ARCH=x86;;
-+      powerpc) ARCH=ppc;;
-+      sparc) ARCH=sparc;;
-       *) exit 1;;
-     esac
-     ;;
diff --git a/lang/smlnj/patches/patch-ar b/lang/smlnj/patches/patch-ar
deleted file mode 100644
index 8d0b2212d2a..00000000000
--- a/lang/smlnj/patches/patch-ar
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ar,v 1.2 2009/09/22 14:48:47 asau Exp $
-
-NetBSD has POSIX signals since 2.0 at least.
-
---- src/runtime/include/ml-unixdep.h.orig	2008-12-05 20:57:39.000000000 +0300
-+++ src/runtime/include/ml-unixdep.h	2009-03-19 00:14:35.000000000 +0300
-@@ -323,7 +323,7 @@
- #elif defined(OPSYS_NETBSD) /* version 3.x */
- #  define OS_NAME	"BSD"
- #  define HAS_POSIX_LIBRARIES
--#  define HAS_BSD_SIGS
-+#  define HAS_POSIX_SIGS
- #  define HAS_GETRUSAGE
- #  define HAS_SETITIMER
- #  define HAS_MMAP
diff --git a/lang/smlnj/patches/patch-as b/lang/smlnj/patches/patch-as
deleted file mode 100644
index c25cd6b814b..00000000000
--- a/lang/smlnj/patches/patch-as
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-as,v 1.1 2009/09/22 14:48:47 asau Exp $
-
-NetBSD has POSIX signals since 2.0 at least.
-
---- base/runtime/include/ml-unixdep.h.orig	2008-12-05 20:57:39.000000000 +0300
-+++ base/runtime/include/ml-unixdep.h	2009-03-19 00:16:29.000000000 +0300
-@@ -323,7 +323,7 @@
- #elif defined(OPSYS_NETBSD) /* version 3.x */
- #  define OS_NAME	"BSD"
- #  define HAS_POSIX_LIBRARIES
--#  define HAS_BSD_SIGS
-+#  define HAS_POSIX_SIGS
- #  define HAS_GETRUSAGE
- #  define HAS_SETITIMER
- #  define HAS_MMAP
diff --git a/lang/smlnj/patches/patch-at b/lang/smlnj/patches/patch-at
index 7ad49df90f6..db5f9e95c13 100644
--- a/lang/smlnj/patches/patch-at
+++ b/lang/smlnj/patches/patch-at
@@ -1,6 +1,5 @@
-$NetBSD: patch-at,v 1.1 2009/09/22 14:48:47 asau Exp $
+$NetBSD: patch-at,v 1.2 2012/01/29 20:48:48 asau Exp $
 
-NetBSD has POSIX signals since 2.0 at least.
 Don't unpack archive, since it is hard to fix,
 unpack before patch phase instead.