pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/40954



The following reply was made to PR pkg/40954; it has been noted by GNATS.

From: Christopher Richards <richards%CS.Princeton.EDU@localhost>
To: Christopher Richards <richards%cs.princeton.edu@localhost>
Cc: gnats-bugs%netbsd.org@localhost, "Jeremy C. Reed" 
<reed%reedmedia.net@localhost>
Subject: Re: pkg/40954
Date: Wed, 11 Mar 2009 18:47:36 -0400

 My apologies for the base64. I'm resending the patch in-line.
 
 Chris
 
 diff -x CVS -urN lang/smlnj.orig/Makefile lang/smlnj/Makefile
 --- lang/smlnj.orig/Makefile   2008-05-25 22:13:21.000000000 -0400
 +++ lang/smlnj/Makefile        2009-03-11 16:57:34.000000000 -0400
 @@ -3,11 +3,8 @@
 
  DISTNAME=     boot.${BOX}-unix
  PKGNAME=      smlnj-${SML_VERSION}
 -PKGREVISION=  3
  CATEGORIES=   lang
 -MASTER_SITES= ftp://flint.cs.yale.edu/pub/smlnj/working/${SML_VERSION}/ \
 -              http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/ \
 -              ftp://flint.cs.yale.edu/pub/smlnj/working/${SML_VERSION}/
 +MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${SML_VERSION}/
  DISTFILES=    MLRISC.tgz                      \
                boot.${BOX}-unix.tgz            \
                ckit.tgz                        \
 @@ -16,28 +13,27 @@
                compiler.tgz                    \
                config.tgz                      \
                eXene.tgz                       \
 +              heap2asm.tgz                    \
                ml-burg.tgz                     \
                ml-lex.tgz                      \
 -              ml-nlffi-lib.tgz                \
 -              ml-nlffigen.tgz                 \
 +              ml-lpt.tgz                      \
                ml-yacc.tgz                     \
 +              nlffi.tgz                       \
 +              pgraph.tgz                      \
                runtime.tgz                     \
 +              smlnj-c.tgz                     \
                smlnj-lib.tgz                   \
 -              system.tgz
 +              system.tgz                      \
 +              trace-debug-profile.tgz
 
  MAINTAINER=   richards+netbsd%CS.Princeton.EDU@localhost
  HOMEPAGE=     http://www.smlnj.org/index.html
  COMMENT=      Popular functional language from Bell Labs
 
 -SML_VERSION=  110.42
 +SML_VERSION=  110.69
 
  PKG_DESTDIR_SUPPORT=  user-destdir
 
 -# Other mirror sites that generally carry only released versions of SML
 -#     ftp://rodin.stanford.edu/pub/smlnj/release/
 -#     ftp://ftp.cl.cam.ac.uk/MIRRORED/smlnj/release/
 -#     ftp://ftp.ntua.gr/pub/lang/smlnj/release/
 -
  WRKSRC=               ${WRKDIR}
  DIST_SUBDIR=  smlnj-${SML_VERSION}
  USE_TOOLS+=   gmake pax
 @@ -46,9 +42,7 @@
  CONFLICTS=    sml-nj-[0-9]*
 
  SML_BASE=     ${PREFIX}/lib/smlnj
 -SML_LIBDIR=   ${SML_BASE}/lib
 -SML_BINDIR=   ${SML_BASE}/bin
 -SML_SCRIPTS=  _link-sml _run-sml _ml-build _ml-makedepend
 +SML_SCRIPTS=  _heap2exec _link-sml _ml-build _ml-makedepend _run-sml
 
  .include "../../lang/smlnj/Makefile.common"
 
 @@ -56,7 +50,7 @@
 
  # create parent directory for the runtime system
  pre-extract:
 -      ${MKDIR} ${WRKDIR}/src || ${TRUE}
 +      ${MKDIR} ${WRKDIR}/base || ${TRUE}
 
  # make it easier to patch the runtime system
  do-extract:
 @@ -65,7 +59,7 @@
                cd ${WRKDIR}; ${EXTRACT_CMD}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        extract_file="${_DISTDIR}/runtime.tgz"; export extract_file;    \
 -              cd ${WRKDIR}/src; ${EXTRACT_CMD}
 +              cd ${WRKDIR}/base; ${EXTRACT_CMD}
 
  # make symlinks to the dist files
  post-extract:
 @@ -80,7 +74,7 @@
                ${SED} -e 's|@SML_BASE@|${SML_BASE}|g'  \
                        < "$${f}.tmp" > "$${f}";        \
        done;                                           \
 -      cd ${WRKDIR}/src/runtime/objs;                  \
 +      cd ${WRKDIR}/base/runtime/objs;                 \
        for f in *; do                                  \
                ${CP} "$${f}" "$${f}.tmp";              \
                ${SED} -e 's|@CFLAGS@|${CFLAGS}|g'      \
 diff -x CVS -urN lang/smlnj.orig/Makefile.common lang/smlnj/Makefile.common
 --- lang/smlnj.orig/Makefile.common    2008-04-12 18:43:02.000000000 -0400
 +++ lang/smlnj/Makefile.common 2009-03-11 16:56:44.000000000 -0400
 @@ -1,4 +1,5 @@
  # $NetBSD: Makefile.common,v 1.8 2008/04/12 22:43:02 jlam Exp $
 +# used by lang/smlnj/Makefile
 
  # smlnj also supports hppa, sparc, ppc, mlrisc & alpha
  # pkg support for those platforms, and say, solaris-x86
 diff -x CVS -urN lang/smlnj.orig/PLIST lang/smlnj/PLIST
 --- lang/smlnj.orig/PLIST      2008-04-12 18:43:03.000000000 -0400
 +++ lang/smlnj/PLIST   2009-03-11 17:22:10.000000000 -0400
 @@ -1,262 +1,333 @@
 -@comment $NetBSD: PLIST,v 1.5 2008/04/12 22:43:03 jlam Exp $
 +@comment $NetBSD$
 +bin/heap2asm
 +bin/heap2exec
 +bin/ml-antlr
  bin/ml-build
  bin/ml-burg
  bin/ml-lex
  bin/ml-makedepend
  ${PLIST.nlffi}bin/ml-nlffigen
 +bin/ml-ulex
  bin/ml-yacc
  bin/nowhere
  bin/sml
  lib/smlnj/bin/.arch-n-opsys
 +lib/smlnj/bin/.heap/heap2asm.${BOX}-${OS}
 +lib/smlnj/bin/.heap/ml-antlr.${BOX}-${OS}
  lib/smlnj/bin/.heap/ml-burg.${BOX}-${OS}
  lib/smlnj/bin/.heap/ml-lex.${BOX}-${OS}
  ${PLIST.nlffi}lib/smlnj/bin/.heap/ml-nlffigen.${BOX}-${OS}
 +lib/smlnj/bin/.heap/ml-ulex.${BOX}-${OS}
  lib/smlnj/bin/.heap/ml-yacc.${BOX}-${OS}
  lib/smlnj/bin/.heap/nowhere.${BOX}-${OS}
  lib/smlnj/bin/.heap/sml.${BOX}-${OS}
  lib/smlnj/bin/.link-sml
  lib/smlnj/bin/.run-sml
  lib/smlnj/bin/.run/run.${BOX}-${LOWER_OPSYS}
 +lib/smlnj/bin/heap2asm
 +lib/smlnj/bin/heap2exec
 +lib/smlnj/bin/ml-antlr
  lib/smlnj/bin/ml-build
  lib/smlnj/bin/ml-burg
  lib/smlnj/bin/ml-lex
  lib/smlnj/bin/ml-makedepend
  ${PLIST.nlffi}lib/smlnj/bin/ml-nlffigen
 +lib/smlnj/bin/ml-ulex
  lib/smlnj/bin/ml-yacc
  lib/smlnj/bin/nowhere
  lib/smlnj/bin/sml
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/ALPHA.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Control.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Graphs.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/HPPA.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/IA32.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Lib.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/MLRISC.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/MLTREE.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/PPC.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/SPARC.cm
 -lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Visual.cm
 -lib/smlnj/lib/basis.cm/CM/${BOX}-unix/basis.cm
 -lib/smlnj/lib/burg-ext.cm/CM/${BOX}-unix/burg-ext.cm
 -${PLIST.nlffi}lib/smlnj/lib/c/CM/${BOX}-unix/c.cm
 -${PLIST.nlffi}lib/smlnj/lib/c/internals/CM/${BOX}-unix/c-int.cm
 -${PLIST.nlffi}lib/smlnj/lib/c/memory/CM/${BOX}-unix/memory.cm
 -lib/smlnj/lib/ckit-lib.cm/CM/${BOX}-unix/ckit-lib.cm
 -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.cm
 -lib/smlnj/lib/cml/CM/${BOX}-unix/core-cml.cm
 -lib/smlnj/lib/controls-lib.cm/CM/${BOX}-unix/controls-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/html-lib.cm/CM/${BOX}-unix/html-lib.cm
 -lib/smlnj/lib/inet-lib.cm/CM/${BOX}-unix/inet-lib.cm
 -lib/smlnj/lib/lex-ext.cm/CM/${BOX}-unix/lex-ext.cm
 -lib/smlnj/lib/make-tool.cm/CM/${BOX}-unix/make-tool.cm
 -lib/smlnj/lib/ml-yacc-lib.cm/CM/${BOX}-unix/ml-yacc-lib.cm
 -lib/smlnj/lib/mlburg-tool.cm/CM/${BOX}-unix/mlburg-tool.cm
 -lib/smlnj/lib/mllex-tool.cm/CM/${BOX}-unix/mllex-tool.cm
 -lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/match-compiler.cm
 -lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/parser.cm
 -lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/pp.cm
 -lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/prec-parser.cm
 -lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/sml-ast.cm
 -lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/source-map.cm
 -lib/smlnj/lib/mlyacc-tool.cm/CM/${BOX}-unix/mlyacc-tool.cm
 -lib/smlnj/lib/noweb-tool.cm/CM/${BOX}-unix/noweb-tool.cm
 -lib/smlnj/lib/nw-ext.cm/CM/${BOX}-unix/nw-ext.cm
 +lib/smlnj/lib/SMLNJ-BASIS/.cm/${BOX}-unix/basis.cm
 +lib/smlnj/lib/SMLNJ-LIB/Controls/.cm/${BOX}-unix/controls-lib.cm
 +lib/smlnj/lib/SMLNJ-LIB/HTML/.cm/${BOX}-unix/html-lib.cm
 +lib/smlnj/lib/SMLNJ-LIB/PP/.cm/${BOX}-unix/pp-lib.cm
 +lib/smlnj/lib/SMLNJ-LIB/Util/.cm/${BOX}-unix/smlnj-lib.cm
 +lib/smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/${BOX}-unix/ml-yacc-lib.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/ALPHA.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/AMD64-Peephole.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/AMD64.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/CCall-Vararg.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/CCall-sparc.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/CCall-x86-64.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/CCall-x86.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/CCall.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Control.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Graphs.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/HPPA.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/IA32-Peephole.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/IA32.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Lib.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/MLRISC.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/MLTREE.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/PPC.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Peephole.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/RA.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/SPARC.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/StagedAlloc.cm
 +lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Visual.cm
 +lib/smlnj/lib/burg-ext.cm/.cm/${BOX}-unix/burg-ext.cm
 +${PLIST.nlffi}lib/smlnj/lib/c/.cm/${BOX}-unix/c.cm
 +${PLIST.nlffi}lib/smlnj/lib/c/internals/.cm/${BOX}-unix/c-int.cm
 +${PLIST.nlffi}lib/smlnj/lib/c/memory/.cm/${BOX}-unix/memory.cm
 +lib/smlnj/lib/ckit-lib.cm/.cm/${BOX}-unix/ckit-lib.cm
 +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.cm
 +lib/smlnj/lib/cml/.cm/${BOX}-unix/core-cml.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/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
 +lib/smlnj/lib/make-tool.cm/.cm/${BOX}-unix/make-tool.cm
 +lib/smlnj/lib/ml-antlr-tool.cm/.cm/${BOX}-unix/ml-antlr-tool.cm
 +lib/smlnj/lib/ml-lpt-lib.cm/.cm/${BOX}-unix/ml-lpt-lib.cm
 +lib/smlnj/lib/ml-ulex-tool.cm/.cm/${BOX}-unix/ml-ulex-tool.cm
 +lib/smlnj/lib/mlburg-tool.cm/.cm/${BOX}-unix/mlburg-tool.cm
 +lib/smlnj/lib/mllex-tool.cm/.cm/${BOX}-unix/mllex-tool.cm
 +lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/match-compiler.cm
 +lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/parser.cm
 +lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/pp.cm
 +lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/prec-parser.cm
 +lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/sml-ast.cm
 +lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/source-map.cm
 +lib/smlnj/lib/mlyacc-tool.cm/.cm/${BOX}-unix/mlyacc-tool.cm
 +lib/smlnj/lib/noweb-tool.cm/.cm/${BOX}-unix/noweb-tool.cm
 +lib/smlnj/lib/nw-ext.cm/.cm/${BOX}-unix/nw-ext.cm
  lib/smlnj/lib/pathconfig
 -lib/smlnj/lib/pgraph-util.cm/CM/${BOX}-unix/pgraph-util.cm
 -lib/smlnj/lib/pgraph.cm/CM/${BOX}-unix/pgraph.cm
 -lib/smlnj/lib/pickle-lib.cm/CM/${BOX}-unix/pickle-lib.cm
 -lib/smlnj/lib/pp-lib.cm/CM/${BOX}-unix/pp-lib.cm
 -lib/smlnj/lib/reactive-lib.cm/CM/${BOX}-unix/reactive-lib.cm
 -lib/smlnj/lib/regexp-lib.cm/CM/${BOX}-unix/regexp-lib.cm
 -lib/smlnj/lib/shell-tool.cm/CM/${BOX}-unix/shell-tool.cm
 -lib/smlnj/lib/smlnj-lib.cm/CM/${BOX}-unix/smlnj-lib.cm
 -lib/smlnj/lib/smlnj/CM/${BOX}-unix/cm.cm
 -lib/smlnj/lib/smlnj/CM/${BOX}-unix/cmb.cm
 -lib/smlnj/lib/smlnj/CM/${BOX}-unix/compiler.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/ALPHA.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/Control.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/Graphs.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/HPPA.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/IA32.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/Lib.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/MLRISC.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/MLTREE.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/PPC.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/SPARC.cm
 -lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/Visual.cm
 -lib/smlnj/lib/smlnj/cm/CM/${BOX}-unix/cm.cm
 -lib/smlnj/lib/smlnj/cm/CM/${BOX}-unix/tools.cm
 -lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/alpha32-unix.cm
 -lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/current.cm
 -lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/hppa-unix.cm
 -lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/ppc-macos.cm
 -lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/ppc-unix.cm
 -lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/sparc-unix.cm
 -lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/x86-unix.cm
 -lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/x86-win32.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/all.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/alpha32.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/compiler.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/current.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/hppa.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/minimal-only.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/minimal.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/ppc.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/sparc.cm
 -lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/x86.cm
 -lib/smlnj/lib/smlnj/init/CM/${BOX}-unix/init.cmi
 -lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/cm-lib.cm
 -lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/cm-sig-lib.cm
 -lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/cm0.cm
 -lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/intsys.cm
 -lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/srcpath-lib.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/alpha32.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/basics.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/core.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/debugprof.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/elabdata.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/elaborate.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/execute.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/hppa.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/parser.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/ppc.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/sparc.cm
 -lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/x86.cm
 -lib/smlnj/lib/unix-lib.cm/CM/${BOX}-unix/unix-lib.cm
 -@dirrm lib/smlnj/lib/unix-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/unix-lib.cm/CM
 +lib/smlnj/lib/pgraph-util.cm/.cm/${BOX}-unix/pgraph-util.cm
 +lib/smlnj/lib/pgraph.cm/.cm/${BOX}-unix/pgraph.cm
 +lib/smlnj/lib/pickle-lib.cm/.cm/${BOX}-unix/pickle-lib.cm
 +lib/smlnj/lib/reactive-lib.cm/.cm/${BOX}-unix/reactive-lib.cm
 +lib/smlnj/lib/regexp-lib.cm/.cm/${BOX}-unix/regexp-lib.cm
 +lib/smlnj/lib/shell-tool.cm/.cm/${BOX}-unix/shell-tool.cm
 +lib/smlnj/lib/smlnj-tdp/.cm/${BOX}-unix/back-trace.cm
 +lib/smlnj/lib/smlnj-tdp/.cm/${BOX}-unix/coverage.cm
 +lib/smlnj/lib/smlnj-tdp/.cm/${BOX}-unix/plugins.cm
 +lib/smlnj/lib/smlnj/.cm/${BOX}-unix/cm.cm
 +lib/smlnj/lib/smlnj/.cm/${BOX}-unix/cmb.cm
 +lib/smlnj/lib/smlnj/.cm/${BOX}-unix/compiler.cm
 +lib/smlnj/lib/smlnj/.cm/${BOX}-unix/installer.cm
 +lib/smlnj/lib/smlnj/.cm/${BOX}-unix/library-install.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/ALPHA.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/AMD64.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/Control.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/Graphs.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/HPPA.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/IA32.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/Lib.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/MLRISC.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/MLTREE.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/PPC.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/SPARC.cm
 +lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/Visual.cm
 +lib/smlnj/lib/smlnj/basis/.cm/${BOX}-unix/basis.cm
 +lib/smlnj/lib/smlnj/cm/.cm/${BOX}-unix/cm.cm
 +lib/smlnj/lib/smlnj/cm/.cm/${BOX}-unix/tools.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/alpha32-unix.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/amd64-unix.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/current.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/hppa-unix.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/ppc-macos.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/ppc-unix.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/sparc-unix.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/x86-unix.cm
 +lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/x86-win32.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/all.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/alpha32.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/amd64.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/compiler.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/current.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/hppa.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/minimal-only.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/minimal.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/ppc.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/sparc.cm
 +lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/x86.cm
 +lib/smlnj/lib/smlnj/init/.cm/${BOX}-unix/init.cmi
 +lib/smlnj/lib/smlnj/installer/.cm/${BOX}-unix/util.cm
 +lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/cm-lib.cm
 +lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/cm-sig-lib.cm
 +lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/cm0.cm
 +lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/intsys.cm
 +lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/smlnj-version.cm
 +lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/srcpath-lib.cm
 +lib/smlnj/lib/smlnj/ml-yacc/.cm/${BOX}-unix/ml-yacc-lib.cm
 +lib/smlnj/lib/smlnj/smlnj-lib/.cm/${BOX}-unix/controls-lib.cm
 +lib/smlnj/lib/smlnj/smlnj-lib/.cm/${BOX}-unix/html-lib.cm
 +lib/smlnj/lib/smlnj/smlnj-lib/.cm/${BOX}-unix/pp-lib.cm
 +lib/smlnj/lib/smlnj/smlnj-lib/.cm/${BOX}-unix/smlnj-lib.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/alpha32.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/amd64.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/basics.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/core.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/debugprof.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/elabdata.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/elaborate.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/execute.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/hppa.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/parser.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/ppc.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/sparc.cm
 +lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/x86.cm
 +lib/smlnj/lib/unix-lib.cm/.cm/${BOX}-unix/unix-lib.cm
 +@dirrm lib/smlnj/lib/unix-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/unix-lib.cm/.cm
  @dirrm lib/smlnj/lib/unix-lib.cm
 -@dirrm lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj/viscomp/CM
 +@dirrm lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/viscomp/.cm
  @dirrm lib/smlnj/lib/smlnj/viscomp
 -@dirrm lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj/internal/CM
 +@dirrm lib/smlnj/lib/smlnj/smlnj-lib/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/smlnj-lib/.cm
 +@dirrm lib/smlnj/lib/smlnj/smlnj-lib
 +@dirrm lib/smlnj/lib/smlnj/ml-yacc/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/ml-yacc/.cm
 +@dirrm lib/smlnj/lib/smlnj/ml-yacc
 +@dirrm lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/internal/.cm
  @dirrm lib/smlnj/lib/smlnj/internal
 -@dirrm lib/smlnj/lib/smlnj/init/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj/init/CM
 +@dirrm lib/smlnj/lib/smlnj/installer/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/installer/.cm
 +@dirrm lib/smlnj/lib/smlnj/installer
 +@dirrm lib/smlnj/lib/smlnj/init/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/init/.cm
  @dirrm lib/smlnj/lib/smlnj/init
 -@dirrm lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj/compiler/CM
 +@dirrm lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/compiler/.cm
  @dirrm lib/smlnj/lib/smlnj/compiler
 -@dirrm lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj/cmb/CM
 +@dirrm lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/cmb/.cm
  @dirrm lib/smlnj/lib/smlnj/cmb
 -@dirrm lib/smlnj/lib/smlnj/cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj/cm/CM
 +@dirrm lib/smlnj/lib/smlnj/cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/cm/.cm
  @dirrm lib/smlnj/lib/smlnj/cm
 -@dirrm lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj/MLRISC/CM
 +@dirrm lib/smlnj/lib/smlnj/basis/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/basis/.cm
 +@dirrm lib/smlnj/lib/smlnj/basis
 +@dirrm lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/MLRISC/.cm
  @dirrm lib/smlnj/lib/smlnj/MLRISC
 -@dirrm lib/smlnj/lib/smlnj/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj/CM
 -@dirrm lib/smlnj/lib/smlnj-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/smlnj-lib.cm/CM
 -@dirrm lib/smlnj/lib/smlnj-lib.cm
 +@dirrm lib/smlnj/lib/smlnj/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj/.cm
 +@dirrm lib/smlnj/lib/smlnj-tdp/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/smlnj-tdp/.cm
 +@dirrm lib/smlnj/lib/smlnj-tdp
  @dirrm lib/smlnj/lib/smlnj
 -@dirrm lib/smlnj/lib/shell-tool.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/shell-tool.cm/CM
 +@dirrm lib/smlnj/lib/shell-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/shell-tool.cm/.cm
  @dirrm lib/smlnj/lib/shell-tool.cm
 -@dirrm lib/smlnj/lib/regexp-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/regexp-lib.cm/CM
 +@dirrm lib/smlnj/lib/regexp-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/regexp-lib.cm/.cm
  @dirrm lib/smlnj/lib/regexp-lib.cm
 -@dirrm lib/smlnj/lib/reactive-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/reactive-lib.cm/CM
 +@dirrm lib/smlnj/lib/reactive-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/reactive-lib.cm/.cm
  @dirrm lib/smlnj/lib/reactive-lib.cm
 -@dirrm lib/smlnj/lib/pp-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/pp-lib.cm/CM
 -@dirrm lib/smlnj/lib/pp-lib.cm
 -@dirrm lib/smlnj/lib/pickle-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/pickle-lib.cm/CM
 +@dirrm lib/smlnj/lib/pickle-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/pickle-lib.cm/.cm
  @dirrm lib/smlnj/lib/pickle-lib.cm
 -@dirrm lib/smlnj/lib/pgraph.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/pgraph.cm/CM
 +@dirrm lib/smlnj/lib/pgraph.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/pgraph.cm/.cm
  @dirrm lib/smlnj/lib/pgraph.cm
 -@dirrm lib/smlnj/lib/pgraph-util.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/pgraph-util.cm/CM
 +@dirrm lib/smlnj/lib/pgraph-util.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/pgraph-util.cm/.cm
  @dirrm lib/smlnj/lib/pgraph-util.cm
 -@dirrm lib/smlnj/lib/nw-ext.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/nw-ext.cm/CM
 +@dirrm lib/smlnj/lib/nw-ext.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/nw-ext.cm/.cm
  @dirrm lib/smlnj/lib/nw-ext.cm
 -@dirrm lib/smlnj/lib/noweb-tool.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/noweb-tool.cm/CM
 +@dirrm lib/smlnj/lib/noweb-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/noweb-tool.cm/.cm
  @dirrm lib/smlnj/lib/noweb-tool.cm
 -@dirrm lib/smlnj/lib/mlyacc-tool.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/mlyacc-tool.cm/CM
 +@dirrm lib/smlnj/lib/mlyacc-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/mlyacc-tool.cm/.cm
  @dirrm lib/smlnj/lib/mlyacc-tool.cm
 -@dirrm lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/mlrisc-tools/CM
 +@dirrm lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/mlrisc-tools/.cm
  @dirrm lib/smlnj/lib/mlrisc-tools
 -@dirrm lib/smlnj/lib/mllex-tool.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/mllex-tool.cm/CM
 +@dirrm lib/smlnj/lib/mllex-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/mllex-tool.cm/.cm
  @dirrm lib/smlnj/lib/mllex-tool.cm
 -@dirrm lib/smlnj/lib/mlburg-tool.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/mlburg-tool.cm/CM
 +@dirrm lib/smlnj/lib/mlburg-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/mlburg-tool.cm/.cm
  @dirrm lib/smlnj/lib/mlburg-tool.cm
 -@dirrm lib/smlnj/lib/ml-yacc-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/ml-yacc-lib.cm/CM
 -@dirrm lib/smlnj/lib/ml-yacc-lib.cm
 -@dirrm lib/smlnj/lib/make-tool.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/make-tool.cm/CM
 +@dirrm lib/smlnj/lib/ml-ulex-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/ml-ulex-tool.cm/.cm
 +@dirrm lib/smlnj/lib/ml-ulex-tool.cm
 +@dirrm lib/smlnj/lib/ml-lpt-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/ml-lpt-lib.cm/.cm
 +@dirrm lib/smlnj/lib/ml-lpt-lib.cm
 +@dirrm lib/smlnj/lib/ml-antlr-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/ml-antlr-tool.cm/.cm
 +@dirrm lib/smlnj/lib/ml-antlr-tool.cm
 +@dirrm lib/smlnj/lib/make-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/make-tool.cm/.cm
  @dirrm lib/smlnj/lib/make-tool.cm
 -@dirrm lib/smlnj/lib/lex-ext.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/lex-ext.cm/CM
 +@dirrm lib/smlnj/lib/lex-ext.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/lex-ext.cm/.cm
  @dirrm lib/smlnj/lib/lex-ext.cm
 -@dirrm lib/smlnj/lib/inet-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/inet-lib.cm/CM
 +@dirrm lib/smlnj/lib/json-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/json-lib.cm/.cm
 +@dirrm lib/smlnj/lib/json-lib.cm
 +@dirrm lib/smlnj/lib/inet-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/inet-lib.cm/.cm
  @dirrm lib/smlnj/lib/inet-lib.cm
 -@dirrm lib/smlnj/lib/html-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/html-lib.cm/CM
 -@dirrm lib/smlnj/lib/html-lib.cm
 -@dirrm lib/smlnj/lib/hash-cons-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/hash-cons-lib.cm/CM
 +@dirrm lib/smlnj/lib/hash-cons-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/hash-cons-lib.cm/.cm
  @dirrm lib/smlnj/lib/hash-cons-lib.cm
 -@dirrm lib/smlnj/lib/grm-ext.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/grm-ext.cm/CM
 +@dirrm lib/smlnj/lib/grm-ext.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/grm-ext.cm/.cm
  @dirrm lib/smlnj/lib/grm-ext.cm
 -@dirrm lib/smlnj/lib/eXene.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/eXene.cm/CM
 +@dirrm lib/smlnj/lib/eXene.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/eXene.cm/.cm
  @dirrm lib/smlnj/lib/eXene.cm
 -@dirrm lib/smlnj/lib/dir-tool.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/dir-tool.cm/CM
 +@dirrm lib/smlnj/lib/dir-tool.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/dir-tool.cm/.cm
  @dirrm lib/smlnj/lib/dir-tool.cm
 -@dirrm lib/smlnj/lib/controls-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/controls-lib.cm/CM
 -@dirrm lib/smlnj/lib/controls-lib.cm
 -@dirrm lib/smlnj/lib/cml/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/cml/CM
 -@dirrm lib/smlnj/lib/cml-lib/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/cml-lib/CM
 +@dirrm lib/smlnj/lib/cml/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/cml/.cm
 +@dirrm lib/smlnj/lib/cml-lib/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/cml-lib/.cm
  @dirrm lib/smlnj/lib/cml-lib
  @dirrm lib/smlnj/lib/cml
 -@dirrm lib/smlnj/lib/ckit-lib.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/ckit-lib.cm/CM
 +@dirrm lib/smlnj/lib/ckit-lib.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/ckit-lib.cm/.cm
  @dirrm lib/smlnj/lib/ckit-lib.cm
 -${PLIST.nlffi}@dirrm lib/smlnj/lib/c/memory/CM/${BOX}-unix
 -${PLIST.nlffi}@dirrm lib/smlnj/lib/c/memory/CM
 +${PLIST.nlffi}@dirrm lib/smlnj/lib/c/memory/.cm/${BOX}-unix
 +${PLIST.nlffi}@dirrm lib/smlnj/lib/c/memory/.cm
  ${PLIST.nlffi}@dirrm lib/smlnj/lib/c/memory
 -${PLIST.nlffi}@dirrm lib/smlnj/lib/c/internals/CM/${BOX}-unix
 -${PLIST.nlffi}@dirrm lib/smlnj/lib/c/internals/CM
 +${PLIST.nlffi}@dirrm lib/smlnj/lib/c/internals/.cm/${BOX}-unix
 +${PLIST.nlffi}@dirrm lib/smlnj/lib/c/internals/.cm
  ${PLIST.nlffi}@dirrm lib/smlnj/lib/c/internals
 -${PLIST.nlffi}@dirrm lib/smlnj/lib/c/CM/${BOX}-unix
 -${PLIST.nlffi}@dirrm lib/smlnj/lib/c/CM
 +${PLIST.nlffi}@dirrm lib/smlnj/lib/c/.cm/${BOX}-unix
 +${PLIST.nlffi}@dirrm lib/smlnj/lib/c/.cm
  ${PLIST.nlffi}@dirrm lib/smlnj/lib/c
 -@dirrm lib/smlnj/lib/burg-ext.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/burg-ext.cm/CM
 +@dirrm lib/smlnj/lib/burg-ext.cm/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/burg-ext.cm/.cm
  @dirrm lib/smlnj/lib/burg-ext.cm
 -@dirrm lib/smlnj/lib/basis.cm/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/basis.cm/CM
 -@dirrm lib/smlnj/lib/basis.cm
 -@dirrm lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix
 -@dirrm lib/smlnj/lib/SMLNJ-MLRISC/CM
 +@dirrm lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/SMLNJ-MLRISC/.cm
  @dirrm lib/smlnj/lib/SMLNJ-MLRISC
 +@dirrm lib/smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/SMLNJ-ML-YACC-LIB/.cm
 +@dirrm lib/smlnj/lib/SMLNJ-ML-YACC-LIB
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/Util/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/Util/.cm
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/Util
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/PP/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/PP/.cm
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/PP
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/HTML/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/HTML/.cm
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/HTML
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/Controls/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/Controls/.cm
 +@dirrm lib/smlnj/lib/SMLNJ-LIB/Controls
 +@dirrm lib/smlnj/lib/SMLNJ-LIB
 +@dirrm lib/smlnj/lib/SMLNJ-BASIS/.cm/${BOX}-unix
 +@dirrm lib/smlnj/lib/SMLNJ-BASIS/.cm
 +@dirrm lib/smlnj/lib/SMLNJ-BASIS
  @dirrm lib/smlnj/lib
  @dirrm lib/smlnj/bin/.run
  @dirrm lib/smlnj/bin/.heap
 diff -x CVS -urN lang/smlnj.orig/distinfo lang/smlnj/distinfo
 --- lang/smlnj.orig/distinfo   2007-01-19 08:09:25.000000000 -0500
 +++ lang/smlnj/distinfo        2009-03-11 14:53:26.000000000 -0400
 @@ -1,74 +1,80 @@
  $NetBSD: distinfo,v 1.11 2007/01/19 13:09:25 dmcmahill Exp $
 
 -SHA1 (smlnj-110.42/MLRISC.tgz) = 55055ed06f7dd2ef178ef365c018f0f38f740528
 -RMD160 (smlnj-110.42/MLRISC.tgz) = 40aebe1cbf975e098bdf5115fd13b428e845195a
 -Size (smlnj-110.42/MLRISC.tgz) = 1173187 bytes
 -SHA1 (smlnj-110.42/boot.ppc-unix.tgz) =
 50c12d123cbb953283cc01308bda94ba6a004f10
 -RMD160 (smlnj-110.42/boot.ppc-unix.tgz) =
 b4c2b8683024f2e377dc131eb377190c49808122
 -Size (smlnj-110.42/boot.ppc-unix.tgz) = 5063945 bytes
 -SHA1 (smlnj-110.42/boot.sparc-unix.tgz) =
 d90361e8de683bde9f2ce76d5a3fdc0b9bcf7b1f
 -RMD160 (smlnj-110.42/boot.sparc-unix.tgz) =
 9b2c44e69ee46e24b51358939a3e8b494e6bce53
 -Size (smlnj-110.42/boot.sparc-unix.tgz) = 5216813 bytes
 -SHA1 (smlnj-110.42/boot.x86-unix.tgz) =
 7e85b25459886179be0bcb949cd489f62c0a5424
 -RMD160 (smlnj-110.42/boot.x86-unix.tgz) =
 2af62e8196de6e7da03cfda10d4799bf7a56188e
 -Size (smlnj-110.42/boot.x86-unix.tgz) = 5147025 bytes
 -SHA1 (smlnj-110.42/ckit.tgz) = f47599df014c9c6dcd02c0bfcc0fad5d1409451b
 -RMD160 (smlnj-110.42/ckit.tgz) = 87c737cf032f18c4381297ee895f07c81f4bd5d3
 -Size (smlnj-110.42/ckit.tgz) = 168000 bytes
 -SHA1 (smlnj-110.42/cm.tgz) = c102131e974e91426bab1cc30005f8e02f7622b6
 -RMD160 (smlnj-110.42/cm.tgz) = e80f68805c33ff98d2139cdef04df179670114c0
 -Size (smlnj-110.42/cm.tgz) = 202633 bytes
 -SHA1 (smlnj-110.42/cml.tgz) = 61f20116032d284a0d2eecd5f14de5378ff4ea6d
 -RMD160 (smlnj-110.42/cml.tgz) = f372145c1444814de2185d52cf422a5dc7d9ce70
 -Size (smlnj-110.42/cml.tgz) = 128485 bytes
 -SHA1 (smlnj-110.42/compiler.tgz) = fbde2959e05c04333131450d152a6ac5890b2867
 -RMD160 (smlnj-110.42/compiler.tgz) = 00af4ad5382c93e59a1a66d3c9cce5d13a8c102c
 -Size (smlnj-110.42/compiler.tgz) = 704669 bytes
 -SHA1 (smlnj-110.42/config.tgz) = f7c1b75019c274872d599b9f5a42ce0ee1926c24
 -RMD160 (smlnj-110.42/config.tgz) = 0ccd824debb96db27f419820f98135242401f6af
 -Size (smlnj-110.42/config.tgz) = 13660 bytes
 -SHA1 (smlnj-110.42/eXene.tgz) = e213539308047636da34a82fbcc7d59a8f03ea7a
 -RMD160 (smlnj-110.42/eXene.tgz) = 5eb1a2527126587f4c894ae7e9c23d8c4209539c
 -Size (smlnj-110.42/eXene.tgz) = 695431 bytes
 -SHA1 (smlnj-110.42/ml-burg.tgz) = 8c69fd51f7eb86b941883fa7c309b7e54baf28ea
 -RMD160 (smlnj-110.42/ml-burg.tgz) = d05eee14de5443d9a3b434ea0e35d91c61aea740
 -Size (smlnj-110.42/ml-burg.tgz) = 31696 bytes
 -SHA1 (smlnj-110.42/ml-lex.tgz) = 524714f95cd014e55624e9d1b270a77100f28cd1
 -RMD160 (smlnj-110.42/ml-lex.tgz) = 6e830a1b50503ebfe8f7429cb6e6674fe3a17805
 -Size (smlnj-110.42/ml-lex.tgz) = 32108 bytes
 -SHA1 (smlnj-110.42/ml-nlffi-lib.tgz) = 
5222ccdc1d9737360a0ce60b05137b476282e9f3
 -RMD160 (smlnj-110.42/ml-nlffi-lib.tgz) =
 821c4416429a71337c7676093bf3625e26db1761
 -Size (smlnj-110.42/ml-nlffi-lib.tgz) = 33645 bytes
 -SHA1 (smlnj-110.42/ml-nlffigen.tgz) = d3e0e064dfd0fd3c12bda72e098224ebea180a6a
 -RMD160 (smlnj-110.42/ml-nlffigen.tgz) =
 e5e7a3fbe03aae141765de9b8e4495e796e32ec7
 -Size (smlnj-110.42/ml-nlffigen.tgz) = 28836 bytes
 -SHA1 (smlnj-110.42/ml-yacc.tgz) = ff4a077099a6f8d2bb8b32a64c9ef45e89358346
 -RMD160 (smlnj-110.42/ml-yacc.tgz) = 5d9767e53f62a2fbcb27296979034f585274a430
 -Size (smlnj-110.42/ml-yacc.tgz) = 95608 bytes
 -SHA1 (smlnj-110.42/runtime.tgz) = 913b2c4ca3edea2fd7fcc09c482665fb92e5f540
 -RMD160 (smlnj-110.42/runtime.tgz) = 8ce0479245b17678971e6af1a5798e358559d17c
 -Size (smlnj-110.42/runtime.tgz) = 313057 bytes
 -SHA1 (smlnj-110.42/smlnj-lib.tgz) = c48a8e19d4a14799d7596ce896f4a2040fe1c2bf
 -RMD160 (smlnj-110.42/smlnj-lib.tgz) = c403e9206eb939e04e88e9a37ca797bbd341ef27
 -Size (smlnj-110.42/smlnj-lib.tgz) = 251230 bytes
 -SHA1 (smlnj-110.42/system.tgz) = 0b9f61052a6413ac1d391a6b7ddf903875d192ff
 -RMD160 (smlnj-110.42/system.tgz) = 5f9cbdd50e47160f3190d08189f7b1f35bf646c9
 -Size (smlnj-110.42/system.tgz) = 177548 bytes
 -SHA1 (patch-aa) = 370fc94462f60fcf1b28ddad2266311b19d92eca
 -SHA1 (patch-ab) = 3d5946b2d72dee255159afe6fb25240f8fa7e306
 -SHA1 (patch-ac) = 7b3ea837db260542d1477ccbe0dba24c6afbc1e2
 -SHA1 (patch-ad) = a406bde2f6f7e2d93d652135b94aefd4b7aca494
 -SHA1 (patch-ae) = 5796401418fd91a795fdfe75060cf654dd315ac1
 -SHA1 (patch-af) = a2b75a7309398b6869995cb46aeedc1416700da4
 -SHA1 (patch-ag) = dae9c89ccc7ada96bd3ac4b2bae1da6427902fb4
 -SHA1 (patch-ah) = 4d1f861cf18424db18fbcd19fd2e123b9a0a5247
 -SHA1 (patch-ai) = dfb45b2c7d59bcd9230edb30d5dfffd4dab5782e
 -SHA1 (patch-aj) = 24bbb65b02e97bec7673dccbf07fce9853c94984
 -SHA1 (patch-ak) = 55738c10e5adc6b99d909a784f256b24e250990e
 -SHA1 (patch-al) = 82842e8662670336e134f12e0851d5f61413211d
 -SHA1 (patch-am) = 06d8cb145217c46ada440e0d3e7420ea99651064
 -SHA1 (patch-an) = d6e1a75d5fb68423ce3181622de919c2337db2e7
 -SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31
 -SHA1 (patch-ap) = 8e9e28548b4e58de68a11982a355a010ea96aa29
 -SHA1 (patch-aq) = 7d0734b76d778d7f584d2e70d325fd72e6554b01
 -SHA1 (patch-ar) = 7e0bcad61ecdc39bb0fc038ea02921d683ba8648
 +SHA1 (smlnj-110.69/MLRISC.tgz) = 77091a1d1336c22c656e85a2ded4240d96fb1aec
 +RMD160 (smlnj-110.69/MLRISC.tgz) = 14c1b5ac6d509362aa6d5da951f794c3d783eb60
 +Size (smlnj-110.69/MLRISC.tgz) = 1435001 bytes
 +SHA1 (smlnj-110.69/boot.x86-unix.tgz) =
 f6167dbbad3b9d5c36c8c04621b5ca966c8836ae
 +RMD160 (smlnj-110.69/boot.x86-unix.tgz) =
 fd3e4c33a06865f825ea98942811d3fc2312aa27
 +Size (smlnj-110.69/boot.x86-unix.tgz) = 5847027 bytes
 +SHA1 (smlnj-110.69/ckit.tgz) = d04c95308996d44205c9f0d2cfd4f5c0288e4658
 +RMD160 (smlnj-110.69/ckit.tgz) = e8997e8d06ebb796355e1c1de55801fd81c91b86
 +Size (smlnj-110.69/ckit.tgz) = 199406 bytes
 +SHA1 (smlnj-110.69/cm.tgz) = c133a316e83c128184ff976e15316442ed411726
 +RMD160 (smlnj-110.69/cm.tgz) = 9f51608bf6f3154131954dd155b0e212ba568b2f
 +Size (smlnj-110.69/cm.tgz) = 202292 bytes
 +SHA1 (smlnj-110.69/cml.tgz) = 4078eb6d1307323b0d67b51b1a864813141937c9
 +RMD160 (smlnj-110.69/cml.tgz) = 76af48b7fe46ad3bbc7e651442d03f9f0179ac5e
 +Size (smlnj-110.69/cml.tgz) = 104709 bytes
 +SHA1 (smlnj-110.69/compiler.tgz) = e19e208874490149035ef7be3521310d887715d3
 +RMD160 (smlnj-110.69/compiler.tgz) = 57b149b8aea8290ff2acaa89bd900012842f69df
 +Size (smlnj-110.69/compiler.tgz) = 824874 bytes
 +SHA1 (smlnj-110.69/config.tgz) = 62323fc515f22a5682bb26cce4e6fafb81fd8df8
 +RMD160 (smlnj-110.69/config.tgz) = 0a70d77abd3b9743375bca86cc01a00726ac4698
 +Size (smlnj-110.69/config.tgz) = 504169 bytes
 +SHA1 (smlnj-110.69/eXene.tgz) = 55f1cd7944b732fb5fae76941fd77f447a80755c
 +RMD160 (smlnj-110.69/eXene.tgz) = ead27c3e525955b1ba64979ddaccb8aa336cc3c6
 +Size (smlnj-110.69/eXene.tgz) = 714587 bytes
 +SHA1 (smlnj-110.69/heap2asm.tgz) = 9a25077dad7f65e785515ec850880a52c2ee2e41
 +RMD160 (smlnj-110.69/heap2asm.tgz) = 23e7bad78f11e284d5aedaf6d399234cd8df731b
 +Size (smlnj-110.69/heap2asm.tgz) = 1327 bytes
 +SHA1 (smlnj-110.69/ml-burg.tgz) = f3a2520cd1664f4728b03b39cf60a26583ee73ed
 +RMD160 (smlnj-110.69/ml-burg.tgz) = 53892a1e62d30d166374ced13d48be49b44debc2
 +Size (smlnj-110.69/ml-burg.tgz) = 36670 bytes
 +SHA1 (smlnj-110.69/ml-lex.tgz) = 8e7d338d3cc03c3009efee24ae10af6d44883aae
 +RMD160 (smlnj-110.69/ml-lex.tgz) = 1a230216b9458278182a28d3412d0fb7c8ecf81a
 +Size (smlnj-110.69/ml-lex.tgz) = 33061 bytes
 +SHA1 (smlnj-110.69/ml-lpt.tgz) = a5430e3900f70117759adde8481cd22b73b1c61b
 +RMD160 (smlnj-110.69/ml-lpt.tgz) = a67530a9230a4d96ae67b642fd04a28f9f6ca7b7
 +Size (smlnj-110.69/ml-lpt.tgz) = 257417 bytes
 +SHA1 (smlnj-110.69/ml-yacc.tgz) = d8cf44d4e813174ca9398b79267dfc53970529d0
 +RMD160 (smlnj-110.69/ml-yacc.tgz) = 53b71d3d6a0da27efd584c043edd223da32bec3c
 +Size (smlnj-110.69/ml-yacc.tgz) = 102025 bytes
 +SHA1 (smlnj-110.69/nlffi.tgz) = 484727a1df899e6289f421dca607646fc277d7a9
 +RMD160 (smlnj-110.69/nlffi.tgz) = 1d2b2cd4667ddd6620ac65d1487a721873db28ea
 +Size (smlnj-110.69/nlffi.tgz) = 75176 bytes
 +SHA1 (smlnj-110.69/pgraph.tgz) = 717f5b85c1f9b331df8495a53b6a635faf55c386
 +RMD160 (smlnj-110.69/pgraph.tgz) = f6eb61fe34093d42702953a546a3ee7ee2fe5644
 +Size (smlnj-110.69/pgraph.tgz) = 5453 bytes
 +SHA1 (smlnj-110.69/runtime.tgz) = c00e0892580b85a1db6ee285c4281f7f5cb740da
 +RMD160 (smlnj-110.69/runtime.tgz) = 52a6b812f56d3f97ee11e533a7d65003ddea97cc
 +Size (smlnj-110.69/runtime.tgz) = 333887 bytes
 +SHA1 (smlnj-110.69/smlnj-c.tgz) = a0c32f25fd7a3f1bf23b584fcbabf99c5b46f5ca
 +RMD160 (smlnj-110.69/smlnj-c.tgz) = ddf74fcddac3d32a2da4c041cb5e29ecc2bc6e51
 +Size (smlnj-110.69/smlnj-c.tgz) = 10627 bytes
 +SHA1 (smlnj-110.69/smlnj-lib.tgz) = 004d7082b1bea36ce8ac412f70bc7f764f362628
 +RMD160 (smlnj-110.69/smlnj-lib.tgz) = 60b4ffbc61ba139eac9ddf0dafd1a27efa44243d
 +Size (smlnj-110.69/smlnj-lib.tgz) = 257519 bytes
 +SHA1 (smlnj-110.69/system.tgz) = 36999858646da3d918f62630ea4126e52cbd9693
 +RMD160 (smlnj-110.69/system.tgz) = aad65d42888e6c59401013bc0f1221cea07a52dd
 +Size (smlnj-110.69/system.tgz) = 239953 bytes
 +SHA1 (smlnj-110.69/trace-debug-profile.tgz) =
 925740fade3dfde42068b65d3f3fb1afa3b47159
 +RMD160 (smlnj-110.69/trace-debug-profile.tgz) =
 c70c14b3b9c0646eb00dcc82ff5cab587c5ca7d6
 +Size (smlnj-110.69/trace-debug-profile.tgz) = 3937 bytes
 +SHA1 (patch-ab) = 178b8808702b2fa557eedff387902fce08193d90
 +SHA1 (patch-ac) = f0caa03e30e165283386914c280598967ca0c00d
 +SHA1 (patch-ad) = d68bce46fe95a1fcd0da943b6a1eba1c9f059061
 +SHA1 (patch-ae) = f7363da1f17810a8dbefb288e7db9745a2b0cd58
 +SHA1 (patch-af) = a2e343b12e37d94cfb491b161b3b1ba2d9f49291
 +SHA1 (patch-ag) = 519f444977b9268259fea86111e3be0c041e5d00
 +SHA1 (patch-ah) = 8ffc1e3aa3f24956dcffe31e2e5e65815fc1c085
 +SHA1 (patch-ai) = a5916d6da4ae31da4912c3a4f9df601abd42ddce
 +SHA1 (patch-aj) = 89c8bd510a4bb58b9c9d23b3b4b9951f4ffb54cd
 +SHA1 (patch-ak) = 571a5098d715a0ab878972f9748ec0519f9e92ef
 +SHA1 (patch-al) = f47a6e567a553d6e662921eb7c2d5d7d34f56b2d
 +SHA1 (patch-am) = a687d1764d7c1aa1be9dd9db298a280723846514
 +SHA1 (patch-an) = 8368134653bf174858c8f1ea6788d28a6caaa105
 +SHA1 (patch-ao) = d45902f9766e0a823d8b12d909f782b4bb651cb4
 +SHA1 (patch-ap) = d41f572e56873dfe1b58bf1b7b350d778fabf6d5
 +SHA1 (patch-aq) = df1c8892a836ad460afa04281f8df339524cbd9e
 +SHA1 (patch-ar) = 03173dc63610b6f1cf0aa39e2fbb864922a12c3f
 +SHA1 (patch-as) = e1e6fd0cce3a1c21f3ceabdd0720cb7fe6688126
 diff -x CVS -urN lang/smlnj.orig/files/targets lang/smlnj/files/targets
 --- lang/smlnj.orig/files/targets      2003-07-01 19:10:34.000000000 -0400
 +++ lang/smlnj/files/targets   2009-03-11 13:12:03.000000000 -0400
 @@ -1,11 +1,19 @@
 -request ml-yacc
 +request ml-ulex
 +request ml-ulex-mllex-tool
  request ml-lex
 +request ml-lex-lex-ext
 +request ml-yacc
 +request ml-yacc-grm-ext
 +request ml-antlr
 +request ml-lpt-lib
  request ml-burg
  request smlnj-lib
  request pgraph-util
 +request tdp-util
  request cml
  request cml-lib
  request eXene
 +request mlrisc
  request ckit
  #if !defined(__powerpc__)
  request ml-nlffi-lib
 @@ -13,3 +21,4 @@
  #endif
  request mlrisc-tools
  request nowhere
 +request heap2asm
 diff -x CVS -urN lang/smlnj.orig/patches/patch-aa lang/smlnj/patches/patch-aa
 --- lang/smlnj.orig/patches/patch-aa   2004-06-06 00:38:29.000000000 -0400
 +++ lang/smlnj/patches/patch-aa        1969-12-31 19:00:00.000000000 -0500
 @@ -1,71 +0,0 @@
 -$NetBSD: patch-aa,v 1.4 2004/06/06 04:38:29 snj Exp $
 -
 ---- config/targets.orig       Thu Oct 10 12:02:10 2002
 -+++ config/targets
 -@@ -41,7 +41,7 @@ request ml-lex
 -
 - # build ML-Burg
 - #
 --#request ml-burg
 -+request ml-burg
 -
 - # pre-compile and install the remaining components of the SML/NJ library
 - # (everything except smlnj-lib.cm, aka Util, itself)
 -@@ -50,7 +50,7 @@ request smlnj-lib
 -
 - # pre-compile and install CM "portable graph" utility library
 - #
 --#request pgraph-util
 -+request pgraph-util
 -
 - # pre-compile and install Concurrent ML, which is a library for
 message-passing
 - # concurrency.
 -@@ -65,12 +65,12 @@ request cml-lib
 - # pre-compile and install eXene, which is a library for X-Windows 
programming.
 - # EXene requires CML.
 - #
 --#request eXene
 -+request eXene
 -
 - # pre-compile and install the C-Kit, which is a library for parsing and
 - # type-checking C programs
 - #
 --#request ckit
 -+request ckit
 -
 - # pre-compile and install the ML-NLFFI Library, which is the core of
 - # a new foreign function interface (where "foreign" functions are
 -@@ -79,7 +79,7 @@ request cml-lib
 - # the new FFI.
 - # This preview release currently works only under X86/Linux.
 - #
 --#request ml-nlffi-lib
 -+request ml-nlffi-lib
 -
 - # build ML-NLFFI-Gen, a program generator tool used in conjunction with
 - # the new "NLFFI" foreign function interface.  The tool generates ML
 -@@ -87,13 +87,13 @@ request cml-lib
 - # (Requires ckit!)
 - # This preview release currently works only under X86/Linux.
 - #
 --#request ml-nlffigen
 -+request ml-nlffigen
 -
 - # pre-compile and install the MLRISC Tools library.
 - # This library is for parsing and pretty printing SML code.
 - # It's used by various MLRISC code generator generator.
 - #
 --#request mlrisc-tools
 -+request mlrisc-tools
 -
 - # Build and install the 'nowhere' program translator.
 - # This tool translates programs with conditional patterns (where clauses)
 -@@ -101,7 +101,7 @@ request cml-lib
 - # (bad) documentation.
 - # (Requires the mlrisc-tools library!)
 - #
 --#request nowhere
 -+request nowhere
 -
 - # Note: autoloading is always enabled.
 - #   In order to customize what is being pre-registered for autoloading
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ab lang/smlnj/patches/patch-ab
 --- lang/smlnj.orig/patches/patch-ab   2003-07-01 19:19:13.000000000 -0400
 +++ lang/smlnj/patches/patch-ab        2009-03-11 14:32:17.000000000 -0400
 @@ -1,7 +1,7 @@
  $NetBSD: patch-ab,v 1.2 2003/07/01 23:19:13 jtb Exp $
 
 ---- /dev/null
 -+++ src/runtime/objs/mk.ppc-netbsd
 +--- base/runtime/objs/mk.ppc-netbsd.orig      2009-03-11 13:21:11.000000000 
-0400
 ++++ base/runtime/objs/mk.ppc-netbsd
  @@ -0,0 +1,24 @@
  +# mk.ppc-netbsd
  +#
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ac lang/smlnj/patches/patch-ac
 --- lang/smlnj.orig/patches/patch-ac   2003-07-01 19:19:14.000000000 -0400
 +++ lang/smlnj/patches/patch-ac        2009-03-11 14:32:17.000000000 -0400
 @@ -1,17 +1,19 @@
 -$NetBSD: patch-ac,v 1.3 2003/07/01 23:19:14 jtb Exp $
 +$NetBSD$
 
 ---- config/_arch-n-opsys.orig
 +--- config/_arch-n-opsys.orig 2008-08-13 14:37:59.000000000 -0400
  +++ config/_arch-n-opsys
 -@@ -106,11 +106,13 @@
 +@@ -119,12 +119,13 @@ case `uname -s` in
     NetBSD)
 -     OPSYS=netbsd
 +     case `uname -r` in
 +       2*) OPSYS=netbsd2;;
 +-      3*) OPSYS=netbsd;;
 +-      *) exit 1;;
 ++      *) OPSYS=netbsd;;
 +     esac
       HEAP_OPSYS=bsd
  -    case `uname -m` in
  +    case `uname -p` in
 -       i386) ARCH=x86;;
 -       i486) ARCH=x86;;
 -       i586) ARCH=x86;;
 -       i686) ARCH=x86;;
 +       *86) ARCH=x86;;
  +      powerpc) ARCH=ppc;;
  +      sparc) ARCH=sparc;;
         *) exit 1;;
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ad lang/smlnj/patches/patch-ad
 --- lang/smlnj.orig/patches/patch-ad   2003-07-01 19:19:14.000000000 -0400
 +++ lang/smlnj/patches/patch-ad        2009-03-11 14:32:17.000000000 -0400
 @@ -1,7 +1,7 @@
  $NetBSD: patch-ad,v 1.3 2003/07/01 23:19:14 jtb Exp $
 
 ---- src/runtime/include/asm-base.h.orig
 -+++ src/runtime/include/asm-base.h
 +--- base/runtime/include/asm-base.h.orig      2008-12-05 12:57:39.000000000 
-0500
 ++++ base/runtime/include/asm-base.h
  @@ -36,6 +36,11 @@
   #    define _ASM
   #    include <sys/stack.h>
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ae lang/smlnj/patches/patch-ae
 --- lang/smlnj.orig/patches/patch-ae   2003-03-21 17:20:56.000000000 -0500
 +++ lang/smlnj/patches/patch-ae        2009-03-11 14:32:17.000000000 -0400
 @@ -1,8 +1,8 @@
  $NetBSD: patch-ae,v 1.1.1.1 2003/03/21 22:20:56 wiz Exp $
 
 ---- src/runtime/mach-dep/SPARC.prim.asm.orig  Fri Jun 15 15:05:19 2001
 -+++ src/runtime/mach-dep/SPARC.prim.asm
 -@@ -307,7 +307,7 @@ pending_sigs:     /* there are pending signa
 +--- base/runtime/mach-dep/SPARC.prim.asm.orig 2008-02-29
 18:09:05.000000000 -0500
 ++++ base/runtime/mach-dep/SPARC.prim.asm
 +@@ -308,7 +308,7 @@ pending_sigs:     /* there are pending signa
        mov     ALLOCPTR,LIMITPTR           /* (delay slot) */
 
 
 @@ -11,7 +11,7 @@
   /* ZeroLimitPtr:
    *
    * Zero the heap limit pointer so that a trap will be generated on
 the next limit
 -@@ -622,13 +622,62 @@ _ml_mul:
 +@@ -623,13 +623,62 @@ _ml_mul:
        mov     %g1,%l1                   /* save %g1 which may get trashed */
        mov     %g2,%l2
        mov     %g3,%l3
 @@ -74,7 +74,7 @@
        restore %o0,0,%o2                 /* result in %o2 (delay slot) */
        retl
        nop
 -@@ -642,7 +691,15 @@ _ml_mul:
 +@@ -643,7 +692,15 @@ _ml_mul:
    * locals of the new window, since .div is a leaf routine.
    */
   _ml_div:
 @@ -91,7 +91,7 @@
        addcc   %i3,%g0,%o1             /* %o1 is divisor (and check for zero) 
*/
        bz      1f
                                    /* save %g1, %g2 and %g3 (using new window) 
*/
 -@@ -650,9 +707,30 @@ _ml_div:
 +@@ -651,9 +708,30 @@ _ml_div:
        mov     %g1,%l1                 /* (delay slot) */
        mov     %g2,%l2
        mov     %g3,%l3
 @@ -122,7 +122,7 @@
        mov     %l3,%g3
        mov     %l2,%g2
        mov     %l1,%g1
 -@@ -679,11 +757,24 @@ _ml_umul:
 +@@ -680,11 +758,24 @@ _ml_umul:
        mov     %g2,%l2
        mov     %g3,%l3
        mov     %i2,%o0
 @@ -147,7 +147,7 @@
        ret
        restore %o0,0,%o2                 /* result in %o2 (delay slot) */
 
 -@@ -694,7 +785,12 @@ _ml_umul:
 +@@ -695,7 +786,12 @@ _ml_umul:
    * locals of the new window, since .div is a leaf routine.
    */
   _ml_udiv:
 @@ -161,7 +161,7 @@
        addcc   %i3,%g0,%o1             /* %o1 is divisor (and check for zero) 
*/
        bz      1f
                                    /* save %g1, %g2 and %g3 (using new window) 
*/
 -@@ -702,9 +798,23 @@ _ml_udiv:
 +@@ -703,9 +799,23 @@ _ml_udiv:
        mov     %g1,%l1                 /* (delay slot) */
        mov     %g2,%l2
        mov     %g3,%l3
 diff -x CVS -urN lang/smlnj.orig/patches/patch-af lang/smlnj/patches/patch-af
 --- lang/smlnj.orig/patches/patch-af   2006-03-28 16:35:27.000000000 -0500
 +++ lang/smlnj/patches/patch-af        2009-03-11 14:32:17.000000000 -0400
 @@ -1,8 +1,8 @@
 -$NetBSD: patch-af,v 1.4 2006/03/28 21:35:27 gavan Exp $
 +$NetBSD$
 
 ---- src/runtime/mach-dep/signal-sysdep.h.orig 2002-10-10
 19:20:04.000000000 +0100
 -+++ src/runtime/mach-dep/signal-sysdep.h
 -@@ -147,7 +147,7 @@ extern void SetFSR(int);
 +--- base/runtime/mach-dep/signal-sysdep.h.orig        2008-12-05
 12:57:39.000000000 -0500
 ++++ base/runtime/mach-dep/signal-sysdep.h
 +@@ -171,7 +171,7 @@ extern void SetFSR(int);
     /* disable all FP exceptions */
   #  define SIG_InitFPE()    SetFSR(0)
 
 @@ -11,66 +11,69 @@
       /** SPARC, SUNOS **/
   #    define USE_ZERO_LIMIT_PTR_FN
   #    define SIG_FAULT1               SIGFPE
 -@@ -318,6 +318,19 @@ extern void SetFSR();
 -
 - #    define SIG_Flags           0
 +@@ -340,6 +340,21 @@ extern void SetFSR();
 + #    define SIG_ResetFPE(scp)           { (scp)->regs->gpr[PT_FPSCR] = 0x0; }
 +      typedef void SigReturn_t;
 
  +#  elif (defined(TARGET_PPC) && defined(OPSYS_NETBSD))
  +    /* PPC, NetBSD */
  +
 -+#    define SIG_FAULT1          SIGTRAP
 ++#    define SIG_FAULT1               SIGTRAP
  +
 -+#    define INT_DIVZERO(s, c)           ((s) == SIGTRAP)
 -+#    define INT_OVFLW(s, c)             ((s) == SIGTRAP)
 -+#    define SIG_GetPC(scp)              ((scp)->sc_frame.srr0)
 -+#    define SIG_SetPC(scp, addr)        { (scp)->sc_frame.srr0 =
 (long)(addr); }
 -+#    define SIG_ZeroLimitPtr(scp)       {
 ((scp)->sc_frame.fixreg[15] = 0); } /* limitptr = 15 (see
 src/runtime/mach-dep/PPC.prim.asm) */
 -+#    define SIG_GetCode(info,scp)       (info)
 ++#    define INT_DIVZERO(s, c)                ((s) == SIGTRAP)
 ++#    define INT_OVFLW(s, c)          ((s) == SIGTRAP)
 ++#    define SIG_GetPC(scp)           ((scp)->sc_frame.srr0)
 ++#    define SIG_SetPC(scp, addr)     { (scp)->sc_frame.srr0 = (long)(addr); }
 ++     /* limitptr = 15 (see base/runtime/mach-dep/PPC.prim.asm) */
 ++#    define SIG_ZeroLimitPtr(scp)    { ((scp)->sc_frame.fixreg[15] = 0); }
 ++#    define SIG_GetCode(info,scp)    (info)
  +     typedef void SigReturn_t;
  +
 -
 ++
   #  endif /* HOST_RS6000/HOST_PPC */
 
 -@@ -463,35 +476,15 @@ extern Addr_t *ML_X86Frame;   /* used to
 + #elif defined(HOST_HPPA)
 +@@ -452,30 +467,24 @@ extern Addr_t *ML_X86Frame;             /* used to
 
 - #  elif defined(OPSYS_NETBSD)
 -     /** x86, NetBSD **/
 --/* NetBSD (including versions 1.0 and 1.1) generates SIGBUS rather
 --   than SIGFPE for overflows.  The real fix is a trivial change to
 --   kernel sources, which has already been reported (NetBSD internal
 --   problem identification "port-i386/1833").
 --
 --   If you want to fix this on your NetBSD system.  Edit machdep.c in
 --   directory /sys/arch/i386/i386, and find the line
 --
 --        setgate(&idt[  4], &IDTVEC(ofl),     0, SDT_SYS386TGT, SEL_KPL);
 --
 --   Change SEL_KPL to SEL_UPL.  With SEL_KPL, the int overflow trap is
 --   not accessible at user level, and a protection fault occurs instead
 --   (thus the seg fault).  SEL_UPL will allow user processes to generate
 --   this trap.
 --
 --   For the change to take effect, recompile your kernel, install it
 --   and reboot. */
 --#    define SIG_FAULT1               SIGFPE
 +      typedef void SigReturn_t;
 +
 +-#  elif defined(OPSYS_NETBSD2)
 +-    /** x86, NetBSD (version 2.x) **/
 ++#  elif (defined(OPSYS_NETBSD2) || defined(OPSYS_NETBSD))
 ++    /** x86, NetBSD **/
 + #    define SIG_FAULT1               SIGFPE
  -#    define SIG_FAULT2               SIGBUS
  -#    define INT_DIVZERO(s, c)        0
  -#    define INT_OVFLW(s, c)  (((s) == SIGFPE) || ((s) == SIGBUS))
 --
 ++#    define INT_DIVZERO(s, c)        ((s) == SIGFPE)
 ++#    define INT_OVFLW(s, c)  ((s) == SIGFPE)
 +
  -#    define SIG_GetCode(info, scp)   (info)
  -#    define SIG_GetPC(scp)           ((scp)->sc_pc)
  -#    define SIG_SetPC(scp, addr)     { (scp)->sc_pc = (long)(addr); }
 -+#    define SIG_FAULT1                       SIGFPE
 -+#    define INT_DIVZERO(s, c)                ((s) == SIGFPE)
 -+#    define INT_OVFLW(s, c)          ((s) == SIGFPE)
 -+
 +-#    define SIG_ZeroLimitPtr(scp)    { ML_X86Frame[LIMITPTR_X86OFFSET] = 0; }
  +#    define SIG_GetCode(info, scp)   (0)
 -+#    define SIG_GetPC(scp)           ((scp)->uc_mcontext.__gregs[_REG_EIP])
 -+#    define SIG_SetPC(scp,
 addr)  {(scp)->uc_mcontext.__gregs[_REG_EIP] = (long)(addr); }
 - #    define SIG_ZeroLimitPtr(scp)    { ML_X86Frame[LIMITPTR_X86OFFSET] = 0; }
 
  -     typedef void SigReturn_t;
 --
 - #  elif defined(OPSYS_SOLARIS)
 -      /** x86, Solaris */
 ++#    if defined(OPSYS_NETBSD2)
 ++#      define SIG_GetPC(scp)         ((scp)->sc_pc)
 ++#      define SIG_SetPC(scp, addr)   { (scp)->sc_pc = (long)(addr); }
 ++       typedef void SigReturn_t;
 +
 +-#  elif defined(OPSYS_NETBSD)
 +-    /** x86, NetBSD (version 3.x) **/
 +-#    define SIG_FAULT1               SIGFPE
 +-#    define SIG_FAULT2               SIGBUS
 +-#    define INT_DIVZERO(s, c)        0
 +-#    define INT_OVFLW(s, c)  (((s) == SIGFPE) || ((s) == SIGBUS))
 ++#    elif defined(OPSYS_NETBSD)
 ++#      define SIG_GetPC(scp)         (_UC_MACHINE_PC(scp))
 ++#      define SIG_SetPC(scp, addr)   { _UC_MACHINE_SET_PC(scp, ((long)
 (addr))); }
 ++#    endif
 +
 +-#    define SIG_GetCode(info, scp)   (info)
 +-#    define SIG_GetPC(scp)           (_UC_MACHINE_PC(scp))
 +-#    define SIG_SetPC(scp, addr)     { _UC_MACHINE_SET_PC(scp, ((long) 
(addr))); }
 + #    define SIG_ZeroLimitPtr(scp)    { ML_X86Frame[LIMITPTR_X86OFFSET] = 0; }
 
 + #  elif defined(OPSYS_OPENBSD)
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ag lang/smlnj/patches/patch-ag
 --- lang/smlnj.orig/patches/patch-ag   2003-03-21 17:54:39.000000000 -0500
 +++ lang/smlnj/patches/patch-ag        2009-03-11 14:32:17.000000000 -0400
 @@ -1,7 +1,7 @@
  $NetBSD: patch-ag,v 1.2 2003/03/21 22:54:39 wiz Exp $
 
 ---- src/runtime/objs/mk.sparc-netbsd.orig     Thu Sep 19 03:54:01 2002
 -+++ src/runtime/objs/mk.sparc-netbsd
 +--- base/runtime/objs/mk.sparc-netbsd.orig    2009-03-11 13:21:11.000000000 
-0400
 ++++ base/runtime/objs/mk.sparc-netbsd
  @@ -0,0 +1,24 @@
  +# mk.sparc-netbsd
  +#
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ah lang/smlnj/patches/patch-ah
 --- lang/smlnj.orig/patches/patch-ah   2003-03-21 17:54:40.000000000 -0500
 +++ lang/smlnj/patches/patch-ah        2009-03-11 14:32:17.000000000 -0400
 @@ -1,6 +1,6 @@
 -$NetBSD: patch-ah,v 1.1 2003/03/21 22:54:40 wiz Exp $
 +$NetBSD$
 
 ---- config/_link-sml.orig     Thu Oct 17 02:44:32 2002
 +--- config/_link-sml.orig     2005-01-03 16:13:16.000000000 -0500
  +++ config/_link-sml
  @@ -17,6 +17,7 @@ unset ENV
   #
 @@ -9,4 +9,4 @@
  +SMLNJ_HOME="${SMLNJ_HOME:-@SML_BASE@}"
 
   # the path of the directory in which executables (like this file) are kept.
 - if [ x${SMLNJ_HOME} = x ] ; then
 + if [ x"$SMLNJ_HOME" = x ] ; then
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ai lang/smlnj/patches/patch-ai
 --- lang/smlnj.orig/patches/patch-ai   2003-03-21 17:54:40.000000000 -0500
 +++ lang/smlnj/patches/patch-ai        2009-03-11 14:32:17.000000000 -0400
 @@ -1,6 +1,6 @@
 -$NetBSD: patch-ai,v 1.1 2003/03/21 22:54:40 wiz Exp $
 +$NetBSD$
 
 ---- config/_ml-build.orig     Thu Oct 17 02:44:32 2002
 +--- config/_ml-build.orig     2007-02-12 16:05:27.000000000 -0500
  +++ config/_ml-build
  @@ -1,5 +1,7 @@
   #!@SHELL@
 @@ -8,5 +8,5 @@
  +SMLNJ_HOME="${SMLNJ_HOME:-@SML_BASE@}"
  +
   if [ x${SMLNJ_HOME} = x ] ; then
 -     BIN_DIR=@BINDIR@
 - else
 +     BIN_DIR="@BINDIR@"
 +     LIB_DIR="@LIBDIR@"
 diff -x CVS -urN lang/smlnj.orig/patches/patch-aj lang/smlnj/patches/patch-aj
 --- lang/smlnj.orig/patches/patch-aj   2003-03-21 17:54:41.000000000 -0500
 +++ lang/smlnj/patches/patch-aj        2009-03-11 14:32:17.000000000 -0400
 @@ -1,6 +1,6 @@
 -$NetBSD: patch-aj,v 1.1 2003/03/21 22:54:41 wiz Exp $
 +$NetBSD$
 
 ---- config/_ml-makedepend.orig        Thu Oct 17 02:44:32 2002
 +--- config/_ml-makedepend.orig        2008-03-27 15:23:09.000000000 -0400
  +++ config/_ml-makedepend
  @@ -1,5 +1,7 @@
   #!@SHELL@
 @@ -8,5 +8,5 @@
  +SMLNJ_HOME="${SMLNJ_HOME:-@SML_BASE@}"
  +
   if [ x${SMLNJ_HOME} = x ] ; then
 -     BIN_DIR=@BINDIR@
 +     BIN_DIR="@BINDIR@"
   else
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ak lang/smlnj/patches/patch-ak
 --- lang/smlnj.orig/patches/patch-ak   2003-03-21 17:54:41.000000000 -0500
 +++ lang/smlnj/patches/patch-ak        2009-03-11 14:32:17.000000000 -0400
 @@ -1,6 +1,6 @@
 -$NetBSD: patch-ak,v 1.1 2003/03/21 22:54:41 wiz Exp $
 +$NetBSD$
 
 ---- config/_run-sml.orig      Thu Oct 17 02:44:32 2002
 +--- config/_run-sml.orig      2004-12-17 16:12:23.000000000 -0500
  +++ config/_run-sml
  @@ -19,6 +19,7 @@ unset ENV
   #
 @@ -8,5 +8,5 @@
   #
  +SMLNJ_HOME="${SMLNJ_HOME:-@SML_BASE@}"
 
 - # the path of the directory in which executables (like this file) are kept.
 - if [ x${SMLNJ_HOME} = x ] ; then
 + # On cygwin, make sure SMLNJ_HOME is given a POSIX-style pathname.
 + if [ x"$SMLNJ_HOME" != x ] ; then
 diff -x CVS -urN lang/smlnj.orig/patches/patch-al lang/smlnj/patches/patch-al
 --- lang/smlnj.orig/patches/patch-al   2004-06-06 00:38:29.000000000 -0400
 +++ lang/smlnj/patches/patch-al        2009-03-11 14:32:17.000000000 -0400
 @@ -1,15 +1,13 @@
 -$NetBSD: patch-al,v 1.3 2004/06/06 04:38:29 snj Exp $
 +$NetBSD$
 
 ---- src/runtime/objs/mk.x86-netbsd.orig       2000-11-06 13:41:04.000000000 
-0800
 -+++ src/runtime/objs/mk.x86-netbsd    2004-06-05 21:16:03.000000000 -0700
 -@@ -9,8 +9,8 @@ MAKE =                gmake
 +--- base/runtime/objs/mk.x86-netbsd.orig      2006-02-10 17:14:59.000000000 
-0500
 ++++ base/runtime/objs/mk.x86-netbsd
 +@@ -9,7 +9,7 @@ MAKE =                gmake
 
   ARFLAGS =    Trcv
   CC =         gcc -ansi
  -CFLAGS =     -O2
 --CPP =                gcc -x c -E -P -ansi
  +CFLAGS =     @CFLAGS@
 -+CPP =                gcc -x assembler-with-cpp -E -P
 + CPP =                gcc -x assembler-with-cpp -E -P
   #CPP =               /usr/bin/cpp -P
 
 - XOBJS =
 diff -x CVS -urN lang/smlnj.orig/patches/patch-am lang/smlnj/patches/patch-am
 --- lang/smlnj.orig/patches/patch-am   2003-03-21 17:54:42.000000000 -0500
 +++ lang/smlnj/patches/patch-am        2009-03-11 14:32:17.000000000 -0400
 @@ -1,7 +1,7 @@
  $NetBSD: patch-am,v 1.1 2003/03/21 22:54:42 wiz Exp $
 
 ---- src/runtime/objs/mk.sparc-solaris.orig    Fri Jun 15 15:05:19 2001
 -+++ src/runtime/objs/mk.sparc-solaris
 +--- base/runtime/objs/mk.sparc-solaris.orig   2001-06-15 15:05:19.000000000 
-0400
 ++++ base/runtime/objs/mk.sparc-solaris
  @@ -8,7 +8,7 @@ AS =          /usr/ccs/bin/as
   AR =         /usr/ccs/bin/ar
   GCC =                gcc
 diff -x CVS -urN lang/smlnj.orig/patches/patch-an lang/smlnj/patches/patch-an
 --- lang/smlnj.orig/patches/patch-an   2003-03-21 17:54:43.000000000 -0500
 +++ lang/smlnj/patches/patch-an        2009-03-11 14:32:17.000000000 -0400
 @@ -1,7 +1,7 @@
  $NetBSD: patch-an,v 1.1 2003/03/21 22:54:43 wiz Exp $
 
 ---- src/runtime/objs/mk.sparc-sunos.orig      Thu Jun  1 14:33:52 2000
 -+++ src/runtime/objs/mk.sparc-sunos
 +--- base/runtime/objs/mk.sparc-sunos.orig     2000-06-01 14:34:03.000000000 
-0400
 ++++ base/runtime/objs/mk.sparc-sunos
  @@ -4,7 +4,7 @@
   SHELL                = /bin/sh
 
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ao lang/smlnj/patches/patch-ao
 --- lang/smlnj.orig/patches/patch-ao   2003-07-01 19:19:14.000000000 -0400
 +++ lang/smlnj/patches/patch-ao        2009-03-11 14:32:17.000000000 -0400
 @@ -1,8 +1,8 @@
  $NetBSD: patch-ao,v 1.2 2003/07/01 23:19:14 jtb Exp $
 
 ---- src/runtime/kernel/boot.c.orig
 -+++ src/runtime/kernel/boot.c
 -@@ -124,7 +124,7 @@
 +--- base/runtime/kernel/boot.c.orig   2005-11-02 17:24:39.000000000 -0500
 ++++ base/runtime/kernel/boot.c
 +@@ -130,7 +130,7 @@ PVT ml_val_t BuildFileList (ml_state_t *
       ml_val_t fileList;
   # define SIZE_BUF_LEN        128     /* this should be plenty for two 
numbers */
       char        sizeBuf[SIZE_BUF_LEN];
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ap lang/smlnj/patches/patch-ap
 --- lang/smlnj.orig/patches/patch-ap   2003-07-01 19:19:14.000000000 -0400
 +++ lang/smlnj/patches/patch-ap        2009-03-11 14:32:17.000000000 -0400
 @@ -1,7 +1,7 @@
  $NetBSD: patch-ap,v 1.2 2003/07/01 23:19:14 jtb Exp $
 
 ---- src/runtime/include/cache-flush.h.orig
 -+++ src/runtime/include/cache-flush.h
 +--- base/runtime/include/cache-flush.h.orig   2001-04-20 09:26:46.000000000 
-0400
 ++++ base/runtime/include/cache-flush.h
  @@ -40,7 +40,7 @@
   extern FlushICache (void *addr, int nbytes);
 
 diff -x CVS -urN lang/smlnj.orig/patches/patch-aq lang/smlnj/patches/patch-aq
 --- lang/smlnj.orig/patches/patch-aq   2003-07-01 19:19:14.000000000 -0400
 +++ lang/smlnj/patches/patch-aq        2009-03-11 14:32:17.000000000 -0400
 @@ -1,8 +1,8 @@
  $NetBSD: patch-aq,v 1.2 2003/07/01 23:19:14 jtb Exp $
 
 ---- src/runtime/mach-dep/PPC.prim.asm.orig
 -+++ src/runtime/mach-dep/PPC.prim.asm
 -@@ -813,7 +813,7 @@
 +--- base/runtime/mach-dep/PPC.prim.asm.orig   2005-05-03 13:26:49.000000000 
-0400
 ++++ base/runtime/mach-dep/PPC.prim.asm
 +@@ -846,7 +846,7 @@ CENTRY(RestoreFPRegs)
        lfd     f31, 136(r3)
        blr
 
 diff -x CVS -urN lang/smlnj.orig/patches/patch-ar lang/smlnj/patches/patch-ar
 --- lang/smlnj.orig/patches/patch-ar   2006-03-28 16:35:27.000000000 -0500
 +++ lang/smlnj/patches/patch-ar        2009-03-11 14:32:17.000000000 -0400
 @@ -1,9 +1,9 @@
 -$NetBSD: patch-ar,v 1.1 2006/03/28 21:35:27 gavan Exp $
 +$NetBSD$
 
 ---- src/runtime/include/ml-unixdep.h.orig     2002-10-12 02:03:50.000000000 
+0100
 -+++ src/runtime/include/ml-unixdep.h
 -@@ -309,14 +309,14 @@ extern char     *sys_errlist[];
 - #elif defined(OPSYS_NETBSD)
 +--- base/runtime/include/ml-unixdep.h.orig    2008-12-05 12:57:39.000000000 
-0500
 ++++ base/runtime/include/ml-unixdep.h
 +@@ -323,7 +323,7 @@ extern char     *sys_errlist[];
 + #elif defined(OPSYS_NETBSD) /* version 3.x */
   #  define OS_NAME    "BSD"
   #  define HAS_POSIX_LIBRARIES
  -#  define HAS_BSD_SIGS
 @@ -11,11 +11,3 @@
   #  define HAS_GETRUSAGE
   #  define HAS_SETITIMER
   #  define HAS_MMAP
 - #  define HAS_SELECT
 - #  define HAS_SCALBN
 - #  define HAS_ILOGB
 --#  define HAS_SIGCONTEXT
 -+#  define HAS_UCONTEXT
 - #  define HAS_STRERROR
 -
 - #endif
 diff -x CVS -urN lang/smlnj.orig/patches/patch-as lang/smlnj/patches/patch-as
 --- lang/smlnj.orig/patches/patch-as   1969-12-31 19:00:00.000000000 -0500
 +++ lang/smlnj/patches/patch-as        2009-03-11 14:32:17.000000000 -0400
 @@ -0,0 +1,12 @@
 +$NetBSD$
 +
 +--- config/_heap2exec.orig    2006-04-20 11:28:53.000000000 -0400
 ++++ config/_heap2exec
 +@@ -1,5 +1,7 @@
 + #!@SHELL@
 +
 ++SMLNJ_HOME="${SMLNJ_HOME:-@SML_BASE@}"
 ++
 + CMD=`basename "$0"`
 +
 + usage() {
 


Home | Main Index | Thread Index | Old Index