Upgrade to v110.40.

Submitted by: 	Johannes 5 Joemann <joemann@beefree.free.de> [MAINTAINER]

8 files changed, 48 insertions, 137 deletions

diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index 0da908e08a50..2422132135df 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smlnj
-PORTVERSION=	110.39
+PORTVERSION=	110.40
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PORTVERSION}/ \
 		ftp://flint.cs.yale.edu/pub/smlnj/working/${PORTVERSION}/ \
@@ -64,9 +64,6 @@ MLEXE+=		ml-burg ml-nlffigen nowhere
 PLIST=		${WRKDIR}/.PLIST
 MLSRCPLIST=	${WRKDIR}/.PLIST.src
 MLPLISTFILES=	${.CURDIR}/pkg-plist ${FILESDIR}/plist-everything ${MLSRCPLIST}
-.if defined(WITH_FLINT)
-MLPLISTFILES+=	${FILESDIR}/plist-flint
-.endif
 .endif
 
 pre-fetch:
@@ -86,7 +83,9 @@ pre-fetch:
 	@${ECHO} 'Use make WITH_FLINT=yes to apply a p''atch w''hich makes'
 	@${ECHO} ' the compiler'"'"'s FLINT structures visible (see'
 	@${ECHO} ' http://flint.cs.yale.edu/flint/publications/tcif.html),'
-	@${ECHO} ' use it with CM.autoload "$$smlnj/viscomp/core_flint.cm";'
+	@${ECHO} ' use it with CM.autoload "$$smlnj/viscomp/core.cm";'
+	@${ECHO} ' or see http://offshore.free.de/~5/FLINTerpreter/sml2flint/'
+	@${ECHO} ' for code that should help you to get started.'
 	@${ECHO} ' This implies WITH_RECOMPILE.'
 .endif
 	@${ECHO}
diff --git a/lang/sml-nj-devel/distinfo b/lang/sml-nj-devel/distinfo
index 6f6dc0284a93..e3f6230f4e61 100644
--- a/lang/sml-nj-devel/distinfo
+++ b/lang/sml-nj-devel/distinfo
@@ -1,17 +1,17 @@
-MD5 (sml-nj/110.39/MLRISC.tgz) = cb74a1c1fc9f5354ad4bf4c02b0915d4
-MD5 (sml-nj/110.39/boot.alpha32-unix.tgz) = cc856cd36ff8920f15004663104d896a
-MD5 (sml-nj/110.39/boot.x86-unix.tgz) = cabe4ed98d581c0f24a83a111e15fef1
-MD5 (sml-nj/110.39/ckit.tgz) = 5e3ba003b78228e8f0d3e945f023c334
-MD5 (sml-nj/110.39/cm.tgz) = 1c06333c1f2359aa39de5d8f2efa85e2
-MD5 (sml-nj/110.39/cml.tgz) = 558e43aeef15fcb024f0a12d5f921088
-MD5 (sml-nj/110.39/compiler.tgz) = 3c4202ec4d4dea3b23d4049ef095d991
-MD5 (sml-nj/110.39/config.tgz) = 132f56f7b2a253761331cd8786dabcc5
-MD5 (sml-nj/110.39/eXene.tgz) = 32c311a842ce0809b2bac8a3523f8bac
-MD5 (sml-nj/110.39/ml-burg.tgz) = b4b4c2d2979c2ce7c0a3f373257b45fa
-MD5 (sml-nj/110.39/ml-lex.tgz) = f1c675afb253325a041480779d5cc7c3
-MD5 (sml-nj/110.39/ml-nlffi-lib.tgz) = 665ce0d2257baa2faf53cf798154686f
-MD5 (sml-nj/110.39/ml-nlffigen.tgz) = 0c279fe7c55dfc2b7efeb54fa8477a66
-MD5 (sml-nj/110.39/ml-yacc.tgz) = b298f537dfb9ccb473bd077131339563
-MD5 (sml-nj/110.39/runtime.tgz) = 3f1e7c63f0cb04a24a3cf6fe053d485f
-MD5 (sml-nj/110.39/smlnj-lib.tgz) = 2ffec46d10e6dd9620c2895d8b59e570
-MD5 (sml-nj/110.39/system.tgz) = af051e0779d11a64dde36fcf25547948
+MD5 (sml-nj/110.40/MLRISC.tgz) = fc520b7bc99382f89076c4caa129731e
+MD5 (sml-nj/110.40/boot.alpha32-unix.tgz) = 2b83c90164413c72bf5a42b5fc542cc1
+MD5 (sml-nj/110.40/boot.x86-unix.tgz) = 2d45cb95e60a09ee90d19e344f7dca7c
+MD5 (sml-nj/110.40/ckit.tgz) = 890dd3e3872e4a5da15c22e07196bbca
+MD5 (sml-nj/110.40/cm.tgz) = 877e1b6ee638cd9be670befa37bd66d8
+MD5 (sml-nj/110.40/cml.tgz) = 67df22a8e8c2fc3c1518cb7095ddf930
+MD5 (sml-nj/110.40/compiler.tgz) = 8e87648b69e0ffff669b3f671da7bc57
+MD5 (sml-nj/110.40/config.tgz) = ed336e5af1e3f3ff2349ca31f9c40679
+MD5 (sml-nj/110.40/eXene.tgz) = 37f501ca4716c402b1db818765d0bc8b
+MD5 (sml-nj/110.40/ml-burg.tgz) = f2bdc17217838b81d70b4c0c13f595a3
+MD5 (sml-nj/110.40/ml-lex.tgz) = 3c268b4985e36e4c6d14cbaa41cccd58
+MD5 (sml-nj/110.40/ml-nlffi-lib.tgz) = 21fdaa15e4a3091b3930d22e51725431
+MD5 (sml-nj/110.40/ml-nlffigen.tgz) = e6bcc3c9efe2d00918cf82b17cf06d46
+MD5 (sml-nj/110.40/ml-yacc.tgz) = 6e64cb092be23f9de6121d15b309f41b
+MD5 (sml-nj/110.40/runtime.tgz) = 177e5cdf52bdc6896fd22b0cbede5bfb
+MD5 (sml-nj/110.40/smlnj-lib.tgz) = 1a54da15026b7cee7e0eb12e5711dfd9
+MD5 (sml-nj/110.40/system.tgz) = 66cf95def5a979ebc2b849091c044feb
diff --git a/lang/sml-nj-devel/files/do-patch-src-makeml b/lang/sml-nj-devel/files/do-patch-src-makeml
index bdc33ed2951d..8be80ccde9de 100644
--- a/lang/sml-nj-devel/files/do-patch-src-makeml
+++ b/lang/sml-nj-devel/files/do-patch-src-makeml
@@ -1,5 +1,5 @@
---- src/system/makeml.orig	Wed Apr 18 17:43:09 2001
-+++ src/system/makeml	Wed Aug 15 18:36:30 2001
+--- src/system/makeml.orig	Fri May 17 22:48:38 2002
++++ src/system/makeml	Thu May 23 02:25:57 2002
 @@ -6,7 +6,9 @@
  twoup=`pwd`
  cd $here
@@ -15,9 +15,9 @@
  # ... unless it was already set at the time we run this script.
  #
  
--CM_PATHCONFIG_DEFAULT=${CM_PATHCONFIG_DEFAULT:-$twoup/lib/pathconfig}
-+CM_PATHCONFIG_DEFAULT=${CM_PATHCONFIG_DEFAULT:-$INSTALLROOT/lib/pathconfig}
- export CM_PATHCONFIG_DEFAULT
+-CM_PATHCONFIG=${CM_PATHCONFIG:-$twoup/lib/pathconfig}
++CM_PATHCONFIG=${CM_PATHCONFIG:-$INSTALLROOT/lib/pathconfig}
+ export CM_PATHCONFIG
  
  #
  # use the arch-n-opsys script to determine the ARCH/OS if possible
diff --git a/lang/sml-nj-devel/files/optional-patch-flint-access b/lang/sml-nj-devel/files/optional-patch-flint-access
index 3119f7e09729..8469e964adb0 100644
--- a/lang/sml-nj-devel/files/optional-patch-flint-access
+++ b/lang/sml-nj-devel/files/optional-patch-flint-access
@@ -1,25 +1,3 @@
---- src/cm/cm-lib.cm.orig	Fri Feb  8 21:02:55 2002
-+++ src/cm/cm-lib.cm	Thu Feb 28 02:38:24 2002
-@@ -14,6 +14,8 @@
- 	structure Sharing
- 	signature TOOLS
- 	structure Subst
-+	(* required by Backend.Compile.elaborate: *)
-+	structure UniquePid
- is
- 	$/basis.cm
- 	$/smlnj-lib.cm
---- src/cm/compile/uniquepid.sml.orig	Fri Feb  8 21:02:55 2002
-+++ src/cm/compile/uniquepid.sml	Thu Feb 28 03:07:33 2002
-@@ -17,7 +17,7 @@
-     type triplet = { staticPid: pid, fingerprint: pid, pepper: string }
- in    
- structure UniquePid :> sig
--    type info
-+    type info = triplet option
-     val reset : unit -> unit
-     val getInfo : GeneralParams.info -> SrcPath.file -> info
-     val uniquepid : info -> pid -> pid * string
 --- src/compiler/core.cm.orig	Fri Dec 14 22:01:23 2001
 +++ src/compiler/core.cm	Thu Feb 28 02:43:48 2002
 @@ -81,6 +81,26 @@
@@ -49,31 +27,3 @@
  is
  
  TopLevel/environ/environ.sig
---- src/system/smlnj/internal/intsys.cm.orig	Thu Sep 13 17:19:18 2001
-+++ src/system/smlnj/internal/intsys.cm	Thu Feb 28 05:54:57 2002
-@@ -32,7 +32,7 @@
- 	$smlnj/init/init.cmi : cm
- 
- 	$/basis.cm
--	$smlnj/viscomp/core.cm
-+	$smlnj/viscomp/core_flint.cm
- 
- 	(* need access to CM's "init" function *)
- 	$smlnj/internal/cm0.cm
---- src/system/smlnj/viscomp/core_flint.cm.orig	Thu Feb 28 03:06:08 2002
-+++ src/system/smlnj/viscomp/core_flint.cm	Thu Feb 28 03:46:52 2002
-@@ -0,0 +1,14 @@
-+(*
-+ * Just a quick hack to avoid a cyclic dependency between
-+ * cm/cm-lib.cm and compiler/core.cm. This happens because
-+ * Compiler.elaborate requires cm's structure UniquePid,
-+ * and we need Compiler.elaborate to generate FLINT terms.
-+ * -5- 20020228
-+ *)
-+
-+Library
-+	library($smlnj/viscomp/core.cm)
-+	structure UniquePid
-+is
-+	$smlnj/viscomp/core.cm
-+	$smlnj/internal/cm-lib.cm
diff --git a/lang/sml-nj-devel/files/patch-ab b/lang/sml-nj-devel/files/patch-ab
index 0ea33ef5bdf3..cac586c50abb 100644
--- a/lang/sml-nj-devel/files/patch-ab
+++ b/lang/sml-nj-devel/files/patch-ab
@@ -1,48 +1,6 @@
---- config/install.sh.orig	Fri Feb 15 23:17:39 2002
-+++ config/install.sh	Wed Feb 20 03:36:14 2002
-@@ -92,6 +92,17 @@
-     return 0
- }
- 
-+isin() {
-+    tested_x=$1
-+    shift
-+    for set_y in "$@" ; do
-+	if [ ${tested_x} = ${set_y} ] ; then
-+	    return 0
-+	fi
-+    done
-+    return 1
-+}
-+
- require() {
-     require_who=$1
-     shift
-@@ -105,8 +116,10 @@
- }
- 
- onepass() {
--    while read depline ; do
--	require $depline
-+    while read depwho depon ; do
-+	if isin $depwho ${TARGETS} ; then
-+		require $depwho $depon
-+	fi
-     done
- }
- 
-@@ -123,9 +136,7 @@
- #
- NEWTARGETS=""
- for t in ${ALLTARGETS} ; do
--    if isnotin $t ${TARGETS} ; then
--	:
--    else
-+    if isin $t ${TARGETS} ; then
- 	NEWTARGETS="$NEWTARGETS $t"
-     fi
- done
-@@ -552,6 +563,28 @@
+--- config/install.sh.orig	Fri May 17 22:48:36 2002
++++ config/install.sh	Thu May 23 01:40:27 2002
+@@ -550,6 +550,28 @@
  ######################################################################
  
  #
@@ -71,7 +29,7 @@
  # create the various sub directories
  #
  for dir in $BINDIR $HEAPDIR $RUNDIR $LIBDIR $SRCDIR ; do
-@@ -668,7 +701,7 @@
+@@ -666,7 +688,7 @@
      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
      if [ -x run.$ARCH-$OPSYS ]; then
  	mv run.$ARCH-$OPSYS $RUNDIR
@@ -80,7 +38,7 @@
      else
  	complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -732,6 +765,8 @@
+@@ -730,6 +752,8 @@
  	do
  	    unpack $src $ROOT/src $src $src
          done
diff --git a/lang/sml-nj-devel/files/plist-everything b/lang/sml-nj-devel/files/plist-everything
index 36f585c7f633..1b9ed3df7299 100644
--- a/lang/sml-nj-devel/files/plist-everything
+++ b/lang/sml-nj-devel/files/plist-everything
@@ -7,8 +7,9 @@ smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd
 smlnj/bin/ml-burg
 smlnj/bin/ml-nlffigen
 smlnj/bin/nowhere
-smlnj/lib/c-int.cm/CM/%%MLARCH%%-unix/c-int.cm
-smlnj/lib/c.cm/CM/%%MLARCH%%-unix/c.cm
+smlnj/lib/c/CM/%%MLARCH%%-unix/c.cm
+smlnj/lib/c/internals/CM/%%MLARCH%%-unix/c-int.cm
+smlnj/lib/c/memory/CM/%%MLARCH%%-unix/memory.cm
 smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix/ckit-lib.cm
 smlnj/lib/cml/CM/%%MLARCH%%-unix/basis.cm
 smlnj/lib/cml/CM/%%MLARCH%%-unix/cml-internal.cm
@@ -17,7 +18,6 @@ smlnj/lib/cml/CM/%%MLARCH%%-unix/core-cml.cm
 smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/smlnj-lib.cm
 smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/trace-cml.cm
 smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix/eXene.cm
-smlnj/lib/memory.cm/CM/%%MLARCH%%-unix/memory.cm
 smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/match-compiler.cm
 smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/parser.cm
 smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/pp.cm
@@ -34,18 +34,18 @@ smlnj/lib/pgraph-util.cm/CM/%%MLARCH%%-unix/pgraph-util.cm
 @dirrm smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/eXene.cm/CM
 @dirrm smlnj/lib/eXene.cm
-@dirrm smlnj/lib/c-int.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/c-int.cm/CM
-@dirrm smlnj/lib/c-int.cm
-@dirrm smlnj/lib/c.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/c.cm/CM
-@dirrm smlnj/lib/c.cm
+@dirrm smlnj/lib/c/memory/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/memory/CM
+@dirrm smlnj/lib/c/memory
+@dirrm smlnj/lib/c/internals/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/internals/CM
+@dirrm smlnj/lib/c/internals
+@dirrm smlnj/lib/c/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/CM
+@dirrm smlnj/lib/c
 @dirrm smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/ckit-lib.cm/CM
 @dirrm smlnj/lib/ckit-lib.cm
-@dirrm smlnj/lib/memory.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/memory.cm/CM
-@dirrm smlnj/lib/memory.cm
 @dirrm smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/mlrisc-tools/CM
 @dirrm smlnj/lib/mlrisc-tools
diff --git a/lang/sml-nj-devel/files/plist-flint b/lang/sml-nj-devel/files/plist-flint
deleted file mode 100644
index 6081641f6be7..000000000000
--- a/lang/sml-nj-devel/files/plist-flint
+++ /dev/null
@@ -1 +0,0 @@
-smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix/core_flint.cm
diff --git a/lang/sml-nj-devel/pkg-plist b/lang/sml-nj-devel/pkg-plist
index 519a5ecbbd0b..4d2936d68cf8 100644
--- a/lang/sml-nj-devel/pkg-plist
+++ b/lang/sml-nj-devel/pkg-plist
@@ -28,6 +28,7 @@ smlnj/lib/SMLNJ-MLRISC/CM/%%MLARCH%%-unix/SPARC.cm
 smlnj/lib/SMLNJ-MLRISC/CM/%%MLARCH%%-unix/Visual.cm
 smlnj/lib/basis.cm/CM/%%MLARCH%%-unix/basis.cm
 smlnj/lib/burg-ext.cm/CM/%%MLARCH%%-unix/burg-ext.cm
+smlnj/lib/controls-lib.cm/CM/%%MLARCH%%-unix/controls-lib.cm
 smlnj/lib/dir-tool.cm/CM/%%MLARCH%%-unix/dir-tool.cm
 smlnj/lib/grm-ext.cm/CM/%%MLARCH%%-unix/grm-ext.cm
 smlnj/lib/hash-cons-lib.cm/CM/%%MLARCH%%-unix/hash-cons-lib.cm
@@ -61,6 +62,7 @@ smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/MLRISC.cm
 smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/MLTREE.cm
 smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/PPC.cm
 smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/SPARC.cm
+smlnj/lib/smlnj/MLRISC/CM/%%MLARCH%%-unix/Visual.cm
 smlnj/lib/smlnj/cm/CM/%%MLARCH%%-unix/cm.cm
 smlnj/lib/smlnj/cm/CM/%%MLARCH%%-unix/tools.cm
 smlnj/lib/smlnj/cmb/CM/%%MLARCH%%-unix/alpha32-unix.cm
@@ -113,6 +115,9 @@ smlnj/lib/unix-lib.cm/CM/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/burg-ext.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/burg-ext.cm/CM
 @dirrm smlnj/lib/burg-ext.cm
+@dirrm smlnj/lib/controls-lib.cm/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/controls-lib.cm/CM
+@dirrm smlnj/lib/controls-lib.cm
 @dirrm smlnj/lib/dir-tool.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/dir-tool.cm/CM
 @dirrm smlnj/lib/dir-tool.cm