Attachment #100518 for bug #139807

View | Details | Raw Unified | Return to bug 139807
Collapse All | Expand All




#

PORTNAME=	smlnj
PORTVERSION=	110.71
CATEGORIES=	lang
MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
		ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/

ONLY_FOR_ARCHS=	i386

OPTIONS=	EVERYTHING "install everything from the SML/NJ distribution" off \
		RECOMPILE  "recompile the SML compiler - implies EVERYTHING" off \
		POSITION64 "use 64bit fi""le positions - implies RECOMPILE"  off

SUB_FILES=	pkg-install
SUB_LIST=	EXEBINDIR=${MLBINRELATIVE} EXENAMES="${MLEXE}"


PLIST_SUB=	MLARCH=${MLARCH}

.if defined(WITH_POSITION64)
WITH_RECOMPILE?=	${WITH_POSITION64}
CMB_COMMAND=	'(\#set o CMB.symval) "USE_64_BIT_POSITIONS" (SOME 1);'
.else
CMB_COMMAND=
.endif

.if defined(WITH_RECOMPILE)
WITH_EVERYTHING?=	${WITH_RECOMPILE}
.endif

MLBINRELATIVE=	${MLROOTRELATIVE}/bin
MLBIN=		${MLROOT}/bin
MLLIB=		${MLROOT}/lib
MLSTDSRCDIRS=	cml heap2asm ml-lex ml-lpt ml-yacc smlnj-lib
MLSRCDIRS=	base ${MLSTDSRCDIRS} \
		ckit eXene ml-burg nlffi pgraph smlnj-c
MLSRCS=
.for srcdir in ${MLSRCDIRS}
MLSRCS+=	${MLROOT}/${srcdir}

	@${ECHO} 'Use make WITH_RECOMPILE=yes to recompile the compiler.'
	@${ECHO} ' This implies WITH_EVERYTHING.'
.endif
.if !defined(WITH_POSITION64)
	@${ECHO} 'Use make WITH_POSITION64=yes to use 64bit file positions.'
	@${ECHO} ' This implies WITH_RECOMPILE.'
.endif
	@${ECHO}

# make symlinks to the dist files

RECOMPILEDIR=
.endif

MLRUNTIMEPATCHES_CMD=	cd ${FILESDIR} && \
			( ${LS} do-patch-base_runtime_* 2>&- || \
AUXDEV=		${AUXSLASH}dev
AUXDEVNULL!=	if [ -w ${AUXDEV}/null ]; then ${ECHO_CMD} -n ${AUXDEV}/null; \
		else ${ECHO_CMD} -n '${WRKDIR}/.devnull'; fi

MLRUNTIMEPATCHES!=	cd ${FILESDIR} && \
			( ${LS} do-patch-base_runtime_* 2> ${AUXDEVNULL} || \
			  ${TRUE} )
MLSTANDARDPATCHES_CMD=	cd ${FILESDIR} && \
			( for srcdir in ${MLSTDSRCDIRS} ; \
			  do ${LS} do-patch-$${srcdir}_* 2>&- ; \
			  done ) || ${TRUE}
MLSTANDARDPATCHDIRS_CMD=	cd ${FILESDIR} && \
			( for srcdir in ${MLSTDSRCDIRS} ; \
			  do if ${LS} do-patch-$${srcdir}_* 1>&- 2>&- ; \
			     then ${ECHO_CMD} -n $${srcdir} " " ; break ; fi ; \
			  done ) || ${TRUE}
.if defined(WITH_EVERYTHING)
MLSOURCEPATCHES_CMD=	cd ${FILESDIR} && \
			( ${LS} do-patch-* 2>&- || \
			  ${TRUE} )
.else
MLSOURCEPATCHES_CMD=	${TRUE}
.endif

do-build:
	cd ${WRKDIR} && unset PWD && \
	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
	MLNORUNTIMECLEAN=yes \
	MLRUNTIMEPATCHES=`${MLRUNTIMEPATCHES_CMD}` \
	MLSTANDARDPATCHES=`${MLSTANDARDPATCHES_CMD}` \
	MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \
	MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \
	./config/install.sh
.if defined(WITH_RECOMPILE)
	-${RM} ${WRKDIR}/config/targets.customized
	@${ECHO} '(* Recompiling the core system: *)'
	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
	${ECHO_CMD} ${CMB_COMMAND} ; \
	${ECHO_CMD} 'CMB.make ();' ) | \
	../../bin/sml
	@${ECHO} '(* Building the recompiled heap: *)'

	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \
		-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \
		> ${MLRUNTIMEPLIST}
	`${MLRUNTIMEPATCHES_CMD}` | \
	@${ECHO_CMD} '${p}' | \
	${SED} ${MLPATCHPATHREGEX} | \
	${SED} -E -e 's%^do-patch-(base/.*)%${MLROOTRELATIVE}/\1.orig%' \
	>> ${MLRUNTIMEPLIST}
.endfor
	@cd "${WRKDIR}" && ( \
	( ${FIND} -s -d ${MLSRCDIRS} \! -type d | \
	${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \

	@${ECHO} '(* Rebuilding the recompiled libs: *)'
	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
	${ECHO_CMD} ${CMB_COMMAND} ; \
	${ECHO_CMD} 'CMB.make ();' ) | \
	../../bin/sml
	@${ECHO} '(* Rebuilding the recompiled heap: *)'




MD5 (sml-nj/110.71/MLRISC.tgz) = a38d4c283ed619295278cda6db054e07
SHA256 (sml-nj/110.71/MLRISC.tgz) = fe86100738b12fb7edbbddf66626b96d4d13c149dd71e0cfb8132a92a7522ae1
SIZE (sml-nj/110.71/MLRISC.tgz) = 1435231
MD5 (sml-nj/110.71/boot.x86-unix.tgz) = 753c50345fcd3b97aecd5c4743388de4
SHA256 (sml-nj/110.71/boot.x86-unix.tgz) = 2f1a41e6639963a5c09b453d941c4ac7c62d5043e2cc2b25d2a18feb7517bc04
SIZE (sml-nj/110.71/boot.x86-unix.tgz) = 5849700
MD5 (sml-nj/110.71/ckit.tgz) = de846fecaade7454db0f3a7aabbf3651
SHA256 (sml-nj/110.71/ckit.tgz) = fc8320898b17106bf759bc813c69aecfe1732d0c13e9b54ed5522920bbd562a7
SIZE (sml-nj/110.71/ckit.tgz) = 199404
MD5 (sml-nj/110.71/cm.tgz) = ba5b37522aff8726935203582fc5cca8
SHA256 (sml-nj/110.71/cm.tgz) = 40bb024769f28a70b45e4ad87bb781c1277c4fa0de7ae1b5109263ed073c0300
SIZE (sml-nj/110.71/cm.tgz) = 202311
MD5 (sml-nj/110.71/cml.tgz) = 559fc31cae3f8b0808f991029ee04199
SHA256 (sml-nj/110.71/cml.tgz) = 469f013db2e6abae40db34f4e78c0ce556a730c6b9a567eea35df7aa2f6b1f96
SIZE (sml-nj/110.71/cml.tgz) = 104707
MD5 (sml-nj/110.71/compiler.tgz) = 2cb77c40207fa7490f8d9d5e0daa7e5a
SHA256 (sml-nj/110.71/compiler.tgz) = 3040cc3fed1f2b00f33d290bd52e999a8ea73d2ba847bbe5b16165276c07afaf
SIZE (sml-nj/110.71/compiler.tgz) = 825457
MD5 (sml-nj/110.71/config.tgz) = 33334c69b5f3eff1f4f65377551a89e5
SHA256 (sml-nj/110.71/config.tgz) = accafba082cb3b7e2bbfff3221bbe49dcfb8029a5d6f8002f98597890870a3be
SIZE (sml-nj/110.71/config.tgz) = 512911
MD5 (sml-nj/110.71/eXene.tgz) = 2e24fac128d1e29250c94425a6613f2b
SHA256 (sml-nj/110.71/eXene.tgz) = 23b12302c8fdeb4c94918cf1c24739c72f01114597b3bfef817c58943ec2c467
SIZE (sml-nj/110.71/eXene.tgz) = 714564
MD5 (sml-nj/110.71/heap2asm.tgz) = edee3a9c1d565b399b9bbe6a21254855
SHA256 (sml-nj/110.71/heap2asm.tgz) = 01cae1f1d5217405e367d0efd1385161602d3f0828f54e794190baa13d733d0f
SIZE (sml-nj/110.71/heap2asm.tgz) = 1326
MD5 (sml-nj/110.71/ml-burg.tgz) = 9e968edfa8f03155401c304c004445b4
SHA256 (sml-nj/110.71/ml-burg.tgz) = 429f2e974db4131c74eea141902491af9df1d55bc2c0767356434bab13b90dd5
SIZE (sml-nj/110.71/ml-burg.tgz) = 36670
MD5 (sml-nj/110.71/ml-lex.tgz) = 004919c1e1658299bce52e17e7efa260
SHA256 (sml-nj/110.71/ml-lex.tgz) = 0a951e91caa43e025eeaa03879764e93519e82ace817eaf86d5c0f469360322b
SIZE (sml-nj/110.71/ml-lex.tgz) = 33060
MD5 (sml-nj/110.71/ml-lpt.tgz) = ec612fde778f7ee0742321b7f414b160
SHA256 (sml-nj/110.71/ml-lpt.tgz) = e5c3489a9d60d4d45a266240e380a497b05f8f45ba44da83a704c4388cf664d1
SIZE (sml-nj/110.71/ml-lpt.tgz) = 254684
MD5 (sml-nj/110.71/ml-yacc.tgz) = f49b7a70f126d25aaf32a09e68185799
SHA256 (sml-nj/110.71/ml-yacc.tgz) = 3e5b9ec0af3704c7045a43d974902abddecefd8d25a41225b06b7390dcf29453
SIZE (sml-nj/110.71/ml-yacc.tgz) = 102023
MD5 (sml-nj/110.71/nlffi.tgz) = 92e156c6623b92040c1011c7384ebf3b
SHA256 (sml-nj/110.71/nlffi.tgz) = dc23c4ea4101f918fe5f92622c9b34b88cb91c62c2c41911e7117a7aa389f44a
SIZE (sml-nj/110.71/nlffi.tgz) = 75182
MD5 (sml-nj/110.71/pgraph.tgz) = bb4a20cdca80e3be06b016d1b2ecd3a2
SHA256 (sml-nj/110.71/pgraph.tgz) = e9514a3c8c002627bf2297bca020028d6d27a6a3c31f940db1dcf2dc3941885b
SIZE (sml-nj/110.71/pgraph.tgz) = 5454
MD5 (sml-nj/110.71/runtime.tgz) = 5b017473a817163587fb36e4c3921259
SHA256 (sml-nj/110.71/runtime.tgz) = ec6d38c782876db979a7b03444ded0bfaa0154d8e88c0a7befa6836f9b235763
SIZE (sml-nj/110.71/runtime.tgz) = 334109
MD5 (sml-nj/110.71/smlnj-c.tgz) = afaa63b6871387ad4d78bd831d132748
SHA256 (sml-nj/110.71/smlnj-c.tgz) = 1ae91e81e77b422367f34fa1bedced1235ba0da5363b075e62bc0d39a55e8fde
SIZE (sml-nj/110.71/smlnj-c.tgz) = 10625
MD5 (sml-nj/110.71/smlnj-lib.tgz) = 49631e6a648afedb9e29454c4052704a
SHA256 (sml-nj/110.71/smlnj-lib.tgz) = 3dd4cbe21bd9d2917d22d8b793776e6c519f175ddb96f6339f890f69d54feda9
SIZE (sml-nj/110.71/smlnj-lib.tgz) = 259309
MD5 (sml-nj/110.71/system.tgz) = 22574eb475fbb3a7d8c345ad1e9dbe04
SHA256 (sml-nj/110.71/system.tgz) = 6279962f447ce17df64a3c52e8c10f98f0e09b41d5418077d5880a9445eb3ad3
SIZE (sml-nj/110.71/system.tgz) = 239973
MD5 (sml-nj/110.71/trace-debug-profile.tgz) = 0ae3fc7bd1523080a809128cc37d8c6f
SHA256 (sml-nj/110.71/trace-debug-profile.tgz) = 3b4db9f3546c02ce5c4510e070ee304b768914914e47acdbae3a82397df1ac28
SIZE (sml-nj/110.71/trace-debug-profile.tgz) = 3935

Lines 1-10 Link Here

(-)files/patch-config_allsources (-10 lines)
1	--- config/allsources.orig Fri Nov 10 21:26:00 2006
2	+++ config/allsources Sun Jun 17 01:22:22 2007
3	@@ -10,7 +10,6 @@
4	system
5	ml-yacc
6	ml-lex
7	-lexgen
8	ml-burg
9	ml-nlffigen
10	ml-nlffi-lib




--- config/install.sh.orig	Tue May 22 18:48:30 2007
+++ config/install.sh	Sun Sep 16 02:56:22 2007
@@ -18,6 +18,8 @@
     nolib=false
 fi

 this=$0
 
 
@@ -308,7 +332,12 @@
 # the name of the bin files directory
 #
 BOOT_ARCHIVE=boot.$ARCH-unix

 
 #
 # build the run-time system
@@ -317,6 +346,11 @@
     vsay $this: Run-time system already exists.
 else
     "$CONFIGDIR"/unpack "$ROOT" runtime

     cd "$BASEDIR"/runtime/objs
     echo $this: Compiling the run-time system.
     $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
@@ -331,7 +365,7 @@
 	if [ -f run.$ARCH-$OPSYS.a ]; then
 	    mv run.$ARCH-$OPSYS.a "$RUNDIR"
 	fi

     else
 	complain "$this: !!! Run-time system build failed for some reason."
     fi
@@ -357,7 +391,7 @@
 	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
     fi
 else

 
     fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
 
@@ -415,6 +449,18 @@
 
 cd "$ROOT"
 
+# apply source patches for standard targets
+[ -n "$MLSTANDARDPATCHDIRS" ] && \
+for d in $MLSTANDARDPATCHDIRS
+do
+	"$CONFIGDIR"/unpack "$ROOT" "$d"
+done
+[ -n "$MLSTANDARDPATCHES" ] && \
+for p in $MLSTANDARDPATCHES
+do
+	do_patch $p
+done
+
 #
 # Now do all the rest using the precompiled installer:
 #
@@ -430,5 +476,12 @@
 	complain "$this: !!! Installation of libraries and programs failed."
     fi
 fi
+
+# apply all source patches
+[ -n "$MLSOURCEPATCHES" ] && \
+for p in $MLSOURCEPATCHES
+do

Lines 28-33 Link Here

(-)pkg-plist (-1 / +10 lines)
28	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm	28	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
29	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64-Peephole.cm	29	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64-Peephole.cm
30	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm	30	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/AMD64.cm
		31	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-Vararg.cm
		32	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-sparc.cm
		33	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-x86-64.cm
		34	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall-x86.cm
		35	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/CCall.cm
31	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Control.cm	36	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Control.cm
32	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm	37	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm
33	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/HPPA.cm	38	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/HPPA.cm
Lines 39-46 Link Here
39	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/PPC.cm	44	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/PPC.cm
40	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Peephole.cm	45	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Peephole.cm
41	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/RA.cm	46	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/RA.cm
42	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/SA.cm
43	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/SPARC.cm	47	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/SPARC.cm
		48	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/StagedAlloc.cm
44	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Visual.cm	49	smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Visual.cm
45	smlnj/lib/cml/.cm/%%MLARCH%%-unix/basis.cm	50	smlnj/lib/cml/.cm/%%MLARCH%%-unix/basis.cm
46	smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml-internal.cm	51	smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml-internal.cm
Lines 52-57 Link Here
52	smlnj/lib/grm-ext.cm/.cm/%%MLARCH%%-unix/grm-ext.cm	57	smlnj/lib/grm-ext.cm/.cm/%%MLARCH%%-unix/grm-ext.cm
53	smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix/hash-cons-lib.cm	58	smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix/hash-cons-lib.cm
54	smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix/inet-lib.cm	59	smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix/inet-lib.cm
		60	smlnj/lib/json-lib.cm/.cm/%%MLARCH%%-unix/json-lib.cm
55	smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix/lex-ext.cm	61	smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix/lex-ext.cm
56	smlnj/lib/make-tool.cm/.cm/%%MLARCH%%-unix/make-tool.cm	62	smlnj/lib/make-tool.cm/.cm/%%MLARCH%%-unix/make-tool.cm
57	smlnj/lib/ml-antlr-tool.cm/.cm/%%MLARCH%%-unix/ml-antlr-tool.cm	63	smlnj/lib/ml-antlr-tool.cm/.cm/%%MLARCH%%-unix/ml-antlr-tool.cm
Lines 180-185 Link Here
180	@dirrm smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix	186	@dirrm smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix
181	@dirrm smlnj/lib/inet-lib.cm/.cm	187	@dirrm smlnj/lib/inet-lib.cm/.cm
182	@dirrm smlnj/lib/inet-lib.cm	188	@dirrm smlnj/lib/inet-lib.cm
		189	@dirrm smlnj/lib/json-lib.cm/.cm/%%MLARCH%%-unix
		190	@dirrm smlnj/lib/json-lib.cm/.cm
		191	@dirrm smlnj/lib/json-lib.cm
183	@dirrm smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix	192	@dirrm smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix
184	@dirrm smlnj/lib/lex-ext.cm/.cm	193	@dirrm smlnj/lib/lex-ext.cm/.cm
185	@dirrm smlnj/lib/lex-ext.cm	194	@dirrm smlnj/lib/lex-ext.cm

Return to bug 139807

Lines 6-12 Link Here

(-)Makefile (-20 / +39 lines)
6	#	6	#
7		7
8	PORTNAME= smlnj	8	PORTNAME= smlnj
9	PORTVERSION= 110.65	9	PORTVERSION= 110.71
10	CATEGORIES= lang	10	CATEGORIES= lang
11	MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \	11	MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
12	ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/	12	ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
Lines 24-30 Link Here
24	ONLY_FOR_ARCHS= i386	24	ONLY_FOR_ARCHS= i386
25		25
26	OPTIONS= EVERYTHING "install everything from the SML/NJ distribution" off \	26	OPTIONS= EVERYTHING "install everything from the SML/NJ distribution" off \
27	RECOMPILE "recompile the SML compiler - implies EVERYTHING" off	27	RECOMPILE "recompile the SML compiler - implies EVERYTHING" off \
		28	POSITION64 "use 64bit fi""le positions - implies RECOMPILE" off
28		29
29	SUB_FILES= pkg-install	30	SUB_FILES= pkg-install
30	SUB_LIST= EXEBINDIR=${MLBINRELATIVE} EXENAMES="${MLEXE}"	31	SUB_LIST= EXEBINDIR=${MLBINRELATIVE} EXENAMES="${MLEXE}"
Lines 44-49 Link Here
44		45
45	PLIST_SUB= MLARCH=${MLARCH}	46	PLIST_SUB= MLARCH=${MLARCH}
46		47
		48	.if defined(WITH_POSITION64)
		49	WITH_RECOMPILE?= ${WITH_POSITION64}
		50	CMB_COMMAND= '(\#set o CMB.symval) "USE_64_BIT_POSITIONS" (SOME 1);'
		51	.else
		52	CMB_COMMAND=
		53	.endif
		54
47	.if defined(WITH_RECOMPILE)	55	.if defined(WITH_RECOMPILE)
48	WITH_EVERYTHING?= ${WITH_RECOMPILE}	56	WITH_EVERYTHING?= ${WITH_RECOMPILE}
49	.endif	57	.endif
Lines 58-65 Link Here
58	MLBINRELATIVE= ${MLROOTRELATIVE}/bin	66	MLBINRELATIVE= ${MLROOTRELATIVE}/bin
59	MLBIN= ${MLROOT}/bin	67	MLBIN= ${MLROOT}/bin
60	MLLIB= ${MLROOT}/lib	68	MLLIB= ${MLROOT}/lib
61	MLSRCDIRS= base ckit cml eXene heap2asm ml-burg ml-lex ml-lpt \	69	MLSTDSRCDIRS= cml heap2asm ml-lex ml-lpt ml-yacc smlnj-lib
62	ml-yacc nlffi pgraph smlnj-c smlnj-lib	70	MLSRCDIRS= base ${MLSTDSRCDIRS} \
		71	ckit eXene ml-burg nlffi pgraph smlnj-c
63	MLSRCS=	72	MLSRCS=
64	.for srcdir in ${MLSRCDIRS}	73	.for srcdir in ${MLSRCDIRS}
65	MLSRCS+= ${MLROOT}/${srcdir}	74	MLSRCS+= ${MLROOT}/${srcdir}
Lines 92-97 Link Here
92	@${ECHO} 'Use make WITH_RECOMPILE=yes to recompile the compiler.'	101	@${ECHO} 'Use make WITH_RECOMPILE=yes to recompile the compiler.'
93	@${ECHO} ' This implies WITH_EVERYTHING.'	102	@${ECHO} ' This implies WITH_EVERYTHING.'
94	.endif	103	.endif
		104	.if !defined(WITH_POSITION64)
		105	@${ECHO} 'Use make WITH_POSITION64=yes to use 64bit file positions.'
		106	@${ECHO} ' This implies WITH_RECOMPILE.'
		107	.endif
95	@${ECHO}	108	@${ECHO}
96		109
97	# make symlinks to the dist files	110	# make symlinks to the dist files
Lines 134-167 Link Here
134	RECOMPILEDIR=	147	RECOMPILEDIR=
135	.endif	148	.endif
136		149
137	# calm portlint complaining about /dev/null	150	MLRUNTIMEPATCHES_CMD= cd ${FILESDIR} && \
138	AUXSLASH= /	151	( ${LS} do-patch-base_runtime_* 2>&- \|\| \
139	AUXDEV= ${AUXSLASH}dev
140	AUXDEVNULL!= if [ -w ${AUXDEV}/null ]; then ${ECHO_CMD} -n ${AUXDEV}/null; \
141	else ${ECHO_CMD} -n '${WRKDIR}/.devnull'; fi
142
143	MLRUNTIMEPATCHES!= cd ${FILESDIR} && \
144	( ${LS} do-patch-base_runtime_* 2> ${AUXDEVNULL} \|\| \
145	${TRUE} )	152	${TRUE} )
		153	MLSTANDARDPATCHES_CMD= cd ${FILESDIR} && \
		154	( for srcdir in ${MLSTDSRCDIRS} ; \
		155	do ${LS} do-patch-$${srcdir}_* 2>&- ; \
		156	done ) \|\| ${TRUE}
		157	MLSTANDARDPATCHDIRS_CMD= cd ${FILESDIR} && \
		158	( for srcdir in ${MLSTDSRCDIRS} ; \
		159	do if ${LS} do-patch-$${srcdir}_* 1>&- 2>&- ; \
		160	then ${ECHO_CMD} -n $${srcdir} " " ; break ; fi ; \
		161	done ) \|\| ${TRUE}
146	.if defined(WITH_EVERYTHING)	162	.if defined(WITH_EVERYTHING)
147	MLSOURCEPATCHES!= cd ${FILESDIR} && \	163	MLSOURCEPATCHES_CMD= cd ${FILESDIR} && \
148	( ${LS} do-patch-* 2> ${AUXDEVNULL} \|\| \	164	( ${LS} do-patch-* 2>&- \|\| \
149	${TRUE} )	165	${TRUE} )
150	.else	166	.else
151	MLSOURCEPATCHES=	167	MLSOURCEPATCHES_CMD= ${TRUE}
152	.endif	168	.endif
153		169
154	do-build:	170	do-build:
155	cd ${WRKDIR} && unset PWD && \	171	cd ${WRKDIR} && unset PWD && \
156	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \	172	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
157	MLNORUNTIMECLEAN=yes \	173	MLNORUNTIMECLEAN=yes \
158	MLRUNTIMEPATCHES="${MLRUNTIMEPATCHES}" \	174	MLRUNTIMEPATCHES=`${MLRUNTIMEPATCHES_CMD}` \
159	MLSOURCEPATCHES="${MLSOURCEPATCHES}" ./config/install.sh	175	MLSTANDARDPATCHES=`${MLSTANDARDPATCHES_CMD}` \
		176	MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \
		177	MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \
		178	./config/install.sh
160	.if defined(WITH_RECOMPILE)	179	.if defined(WITH_RECOMPILE)
161	-${RM} ${WRKDIR}/config/targets.customized	180	-${RM} ${WRKDIR}/config/targets.customized
162	@${ECHO} '(* Recompiling the core system: *)'	181	@${ECHO} '(* Recompiling the core system: *)'
163	cd ${WRKDIR}/${RECOMPILEDIR} && ( \	182	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
164	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \	183	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
		184	${ECHO_CMD} ${CMB_COMMAND} ; \
165	${ECHO_CMD} 'CMB.make ();' ) \| \	185	${ECHO_CMD} 'CMB.make ();' ) \| \
166	../../bin/sml	186	../../bin/sml
167	@${ECHO} '(* Building the recompiled heap: *)'	187	@${ECHO} '(* Building the recompiled heap: *)'
Lines 205-216 Link Here
205	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \	225	${SED} -E -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%' \
206	-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \	226	-e 's%^(.*)/$$%@dirrm\ ${MLROOTRELATIVE}/base/\1%' \
207	> ${MLRUNTIMEPLIST}	227	> ${MLRUNTIMEPLIST}
208	.for p in ${MLRUNTIMEPATCHES}	228	`${MLRUNTIMEPATCHES_CMD}` \| \
209	@${ECHO_CMD} '${p}' \| \
210	${SED} ${MLPATCHPATHREGEX} \| \	229	${SED} ${MLPATCHPATHREGEX} \| \
211	${SED} -E -e 's%^do-patch-(base/.*)%${MLROOTRELATIVE}/\1.orig%' \	230	${SED} -E -e 's%^do-patch-(base/.*)%${MLROOTRELATIVE}/\1.orig%' \
212	>> ${MLRUNTIMEPLIST}	231	>> ${MLRUNTIMEPLIST}
213	.endfor
214	@cd "${WRKDIR}" && ( \	232	@cd "${WRKDIR}" && ( \
215	( ${FIND} -s -d ${MLSRCDIRS} \! -type d \| \	233	( ${FIND} -s -d ${MLSRCDIRS} \! -type d \| \
216	${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \	234	${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \
Lines 247-252 Link Here
247	@${ECHO} '(* Rebuilding the recompiled libs: *)'	265	@${ECHO} '(* Rebuilding the recompiled libs: *)'
248	cd ${WRKDIR}/${RECOMPILEDIR} && ( \	266	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
249	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \	267	${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \
		268	${ECHO_CMD} ${CMB_COMMAND} ; \
250	${ECHO_CMD} 'CMB.make ();' ) \| \	269	${ECHO_CMD} 'CMB.make ();' ) \| \
251	../../bin/sml	270	../../bin/sml
252	@${ECHO} '(* Rebuilding the recompiled heap: *)'	271	@${ECHO} '(* Rebuilding the recompiled heap: *)'

Lines 1-60 Link Here

(-)distinfo (-60 / +60 lines)
1	MD5 (sml-nj/110.65/MLRISC.tgz) = 6dee2df1bb58a90d86dc545261375edf	1	MD5 (sml-nj/110.71/MLRISC.tgz) = a38d4c283ed619295278cda6db054e07
2	SHA256 (sml-nj/110.65/MLRISC.tgz) = 24c036655e35f8a527b32d874231631ba84070d33fd1432de70fb38e0e5dedf4	2	SHA256 (sml-nj/110.71/MLRISC.tgz) = fe86100738b12fb7edbbddf66626b96d4d13c149dd71e0cfb8132a92a7522ae1
3	SIZE (sml-nj/110.65/MLRISC.tgz) = 1367586	3	SIZE (sml-nj/110.71/MLRISC.tgz) = 1435231
4	MD5 (sml-nj/110.65/boot.x86-unix.tgz) = df97db3fedf27627b134da88bc240d46	4	MD5 (sml-nj/110.71/boot.x86-unix.tgz) = 753c50345fcd3b97aecd5c4743388de4
5	SHA256 (sml-nj/110.65/boot.x86-unix.tgz) = 7d27f46bea0f53a87b40dbe63b3f1b4b9c7a9a851de47d718a678ff7da7f88c1	5	SHA256 (sml-nj/110.71/boot.x86-unix.tgz) = 2f1a41e6639963a5c09b453d941c4ac7c62d5043e2cc2b25d2a18feb7517bc04
6	SIZE (sml-nj/110.65/boot.x86-unix.tgz) = 5856903	6	SIZE (sml-nj/110.71/boot.x86-unix.tgz) = 5849700
7	MD5 (sml-nj/110.65/ckit.tgz) = 1afdc1549105e4a40259ac595b5e75ac	7	MD5 (sml-nj/110.71/ckit.tgz) = de846fecaade7454db0f3a7aabbf3651
8	SHA256 (sml-nj/110.65/ckit.tgz) = 356db254e4490fb59fc25af9fd21fd5ce4014b48801a1de6c70bcdd785243f21	8	SHA256 (sml-nj/110.71/ckit.tgz) = fc8320898b17106bf759bc813c69aecfe1732d0c13e9b54ed5522920bbd562a7
9	SIZE (sml-nj/110.65/ckit.tgz) = 195616	9	SIZE (sml-nj/110.71/ckit.tgz) = 199404
10	MD5 (sml-nj/110.65/cm.tgz) = 936537d0f28bc05f2b2e228cb67a30e4	10	MD5 (sml-nj/110.71/cm.tgz) = ba5b37522aff8726935203582fc5cca8
11	SHA256 (sml-nj/110.65/cm.tgz) = 25e4dffe764bc7f03784d6c06b5c8dc939458f800f127ffa3ce9c20db6f66537	11	SHA256 (sml-nj/110.71/cm.tgz) = 40bb024769f28a70b45e4ad87bb781c1277c4fa0de7ae1b5109263ed073c0300
12	SIZE (sml-nj/110.65/cm.tgz) = 200916	12	SIZE (sml-nj/110.71/cm.tgz) = 202311
13	MD5 (sml-nj/110.65/cml.tgz) = 7cdff48d92dc2d76dce22d1da0987884	13	MD5 (sml-nj/110.71/cml.tgz) = 559fc31cae3f8b0808f991029ee04199
14	SHA256 (sml-nj/110.65/cml.tgz) = 767664558904ac7599a30c22263ea9938a69e6be6a2e03e23a23bf8bcb8f9d0d	14	SHA256 (sml-nj/110.71/cml.tgz) = 469f013db2e6abae40db34f4e78c0ce556a730c6b9a567eea35df7aa2f6b1f96
15	SIZE (sml-nj/110.65/cml.tgz) = 104410	15	SIZE (sml-nj/110.71/cml.tgz) = 104707
16	MD5 (sml-nj/110.65/compiler.tgz) = 8b3cb4bdea7b89754e943432c51e6efa	16	MD5 (sml-nj/110.71/compiler.tgz) = 2cb77c40207fa7490f8d9d5e0daa7e5a
17	SHA256 (sml-nj/110.65/compiler.tgz) = 46fc836648215aadff547133d5d3f3039bf2a9adfd02b6434670c781ee0d8deb	17	SHA256 (sml-nj/110.71/compiler.tgz) = 3040cc3fed1f2b00f33d290bd52e999a8ea73d2ba847bbe5b16165276c07afaf
18	SIZE (sml-nj/110.65/compiler.tgz) = 812703	18	SIZE (sml-nj/110.71/compiler.tgz) = 825457
19	MD5 (sml-nj/110.65/config.tgz) = 833741f2d668e8de3529a6a4b2f7dccd	19	MD5 (sml-nj/110.71/config.tgz) = 33334c69b5f3eff1f4f65377551a89e5
20	SHA256 (sml-nj/110.65/config.tgz) = aadcb4fb1afe76528e307e0374859d8b9f872b50df427c934491a1b2f7e6f3f1	20	SHA256 (sml-nj/110.71/config.tgz) = accafba082cb3b7e2bbfff3221bbe49dcfb8029a5d6f8002f98597890870a3be
21	SIZE (sml-nj/110.65/config.tgz) = 17405	21	SIZE (sml-nj/110.71/config.tgz) = 512911
22	MD5 (sml-nj/110.65/eXene.tgz) = a17eb858237d8adb3732d08613501887	22	MD5 (sml-nj/110.71/eXene.tgz) = 2e24fac128d1e29250c94425a6613f2b
23	SHA256 (sml-nj/110.65/eXene.tgz) = 4dca2956f2991c82d6e86fbfc9ead0b98c3e2770da9d55c2d3fed2735e2ce392	23	SHA256 (sml-nj/110.71/eXene.tgz) = 23b12302c8fdeb4c94918cf1c24739c72f01114597b3bfef817c58943ec2c467
24	SIZE (sml-nj/110.65/eXene.tgz) = 708192	24	SIZE (sml-nj/110.71/eXene.tgz) = 714564
25	MD5 (sml-nj/110.65/heap2asm.tgz) = fe37e8a575d73a9163046cf77472aebf	25	MD5 (sml-nj/110.71/heap2asm.tgz) = edee3a9c1d565b399b9bbe6a21254855
26	SHA256 (sml-nj/110.65/heap2asm.tgz) = 68a82aaaf6fa8c52fdbb9edd7a242eb9ea33eaf5cd5bff55f0cb5264bf164f64	26	SHA256 (sml-nj/110.71/heap2asm.tgz) = 01cae1f1d5217405e367d0efd1385161602d3f0828f54e794190baa13d733d0f
27	SIZE (sml-nj/110.65/heap2asm.tgz) = 1320	27	SIZE (sml-nj/110.71/heap2asm.tgz) = 1326
28	MD5 (sml-nj/110.65/ml-burg.tgz) = 0604d5430ab3ceff4825e67d24eda908	28	MD5 (sml-nj/110.71/ml-burg.tgz) = 9e968edfa8f03155401c304c004445b4
29	SHA256 (sml-nj/110.65/ml-burg.tgz) = 535c92690b230a84e13868c5c3961ff7caacc063a03c573c7d74f68ff9fd1886	29	SHA256 (sml-nj/110.71/ml-burg.tgz) = 429f2e974db4131c74eea141902491af9df1d55bc2c0767356434bab13b90dd5
30	SIZE (sml-nj/110.65/ml-burg.tgz) = 35989	30	SIZE (sml-nj/110.71/ml-burg.tgz) = 36670
31	MD5 (sml-nj/110.65/ml-lex.tgz) = a0add456d9cc4bcf2fd43c3078322ec7	31	MD5 (sml-nj/110.71/ml-lex.tgz) = 004919c1e1658299bce52e17e7efa260
32	SHA256 (sml-nj/110.65/ml-lex.tgz) = 58cb45190a410d2d24186a2ad5982f49f1e19c2f6697faa69aa3be053d9fa750	32	SHA256 (sml-nj/110.71/ml-lex.tgz) = 0a951e91caa43e025eeaa03879764e93519e82ace817eaf86d5c0f469360322b
33	SIZE (sml-nj/110.65/ml-lex.tgz) = 33050	33	SIZE (sml-nj/110.71/ml-lex.tgz) = 33060
34	MD5 (sml-nj/110.65/ml-lpt.tgz) = 51d9cf0badcf3bfa5b2552edd9c9b378	34	MD5 (sml-nj/110.71/ml-lpt.tgz) = ec612fde778f7ee0742321b7f414b160
35	SHA256 (sml-nj/110.65/ml-lpt.tgz) = b432e08a840fde1608023558eeffcaf6f5b1e33b0f5f3bdd8fae326a0bea8bff	35	SHA256 (sml-nj/110.71/ml-lpt.tgz) = e5c3489a9d60d4d45a266240e380a497b05f8f45ba44da83a704c4388cf664d1
36	SIZE (sml-nj/110.65/ml-lpt.tgz) = 250096	36	SIZE (sml-nj/110.71/ml-lpt.tgz) = 254684
37	MD5 (sml-nj/110.65/ml-yacc.tgz) = cc9a3fc240b0b56f4b32d5bbd06b6441	37	MD5 (sml-nj/110.71/ml-yacc.tgz) = f49b7a70f126d25aaf32a09e68185799
38	SHA256 (sml-nj/110.65/ml-yacc.tgz) = 303d5afd820b916deb967bb70e04883a5bd2b6063a724cda00d1745f3991a67c	38	SHA256 (sml-nj/110.71/ml-yacc.tgz) = 3e5b9ec0af3704c7045a43d974902abddecefd8d25a41225b06b7390dcf29453
39	SIZE (sml-nj/110.65/ml-yacc.tgz) = 98502	39	SIZE (sml-nj/110.71/ml-yacc.tgz) = 102023
40	MD5 (sml-nj/110.65/nlffi.tgz) = d877cf85fdd5a1d952ba9e856cfdddfc	40	MD5 (sml-nj/110.71/nlffi.tgz) = 92e156c6623b92040c1011c7384ebf3b
41	SHA256 (sml-nj/110.65/nlffi.tgz) = fdbae1fbc661de417dcde7e8f56d74f262ffb70a62b341b787e84558b3a2a035	41	SHA256 (sml-nj/110.71/nlffi.tgz) = dc23c4ea4101f918fe5f92622c9b34b88cb91c62c2c41911e7117a7aa389f44a
42	SIZE (sml-nj/110.65/nlffi.tgz) = 73030	42	SIZE (sml-nj/110.71/nlffi.tgz) = 75182
43	MD5 (sml-nj/110.65/pgraph.tgz) = d8160b52274f113373293ebf8fa158d1	43	MD5 (sml-nj/110.71/pgraph.tgz) = bb4a20cdca80e3be06b016d1b2ecd3a2
44	SHA256 (sml-nj/110.65/pgraph.tgz) = 3983bd803d939f6b4cb0f96d82c046a71f864c39ccbe73a9a9eefd5054cdda81	44	SHA256 (sml-nj/110.71/pgraph.tgz) = e9514a3c8c002627bf2297bca020028d6d27a6a3c31f940db1dcf2dc3941885b
45	SIZE (sml-nj/110.65/pgraph.tgz) = 5446	45	SIZE (sml-nj/110.71/pgraph.tgz) = 5454
46	MD5 (sml-nj/110.65/runtime.tgz) = e637fe9584529a2179c54b0f325b2da1	46	MD5 (sml-nj/110.71/runtime.tgz) = 5b017473a817163587fb36e4c3921259
47	SHA256 (sml-nj/110.65/runtime.tgz) = e1f83be6dd11bbd6082d9d1846d9cb012c2ab7314c79bf16b86a309458b5be8c	47	SHA256 (sml-nj/110.71/runtime.tgz) = ec6d38c782876db979a7b03444ded0bfaa0154d8e88c0a7befa6836f9b235763
48	SIZE (sml-nj/110.65/runtime.tgz) = 315775	48	SIZE (sml-nj/110.71/runtime.tgz) = 334109
49	MD5 (sml-nj/110.65/smlnj-c.tgz) = 84528473fb02c8575197a25198407df0	49	MD5 (sml-nj/110.71/smlnj-c.tgz) = afaa63b6871387ad4d78bd831d132748
50	SHA256 (sml-nj/110.65/smlnj-c.tgz) = 87e83d2425f8dbd27a2c7c863b5025e94bae6e57058f096236e6987aa1c2580a	50	SHA256 (sml-nj/110.71/smlnj-c.tgz) = 1ae91e81e77b422367f34fa1bedced1235ba0da5363b075e62bc0d39a55e8fde
51	SIZE (sml-nj/110.65/smlnj-c.tgz) = 10540	51	SIZE (sml-nj/110.71/smlnj-c.tgz) = 10625
52	MD5 (sml-nj/110.65/smlnj-lib.tgz) = b43f56983759d38a4110acb863dee00e	52	MD5 (sml-nj/110.71/smlnj-lib.tgz) = 49631e6a648afedb9e29454c4052704a
53	SHA256 (sml-nj/110.65/smlnj-lib.tgz) = 5d094350160cdee7773d1ac502e57bd3be782f35022354d1b940d8f16a7d6a1a	53	SHA256 (sml-nj/110.71/smlnj-lib.tgz) = 3dd4cbe21bd9d2917d22d8b793776e6c519f175ddb96f6339f890f69d54feda9
54	SIZE (sml-nj/110.65/smlnj-lib.tgz) = 230758	54	SIZE (sml-nj/110.71/smlnj-lib.tgz) = 259309
55	MD5 (sml-nj/110.65/system.tgz) = 2875b7e8d3349ff03e7dc682bd42e9cd	55	MD5 (sml-nj/110.71/system.tgz) = 22574eb475fbb3a7d8c345ad1e9dbe04
56	SHA256 (sml-nj/110.65/system.tgz) = 95608f9718821af84b68ae210d33b7a76465a9182d4463c193abcc2a66dad8f6	56	SHA256 (sml-nj/110.71/system.tgz) = 6279962f447ce17df64a3c52e8c10f98f0e09b41d5418077d5880a9445eb3ad3
57	SIZE (sml-nj/110.65/system.tgz) = 223918	57	SIZE (sml-nj/110.71/system.tgz) = 239973
58	MD5 (sml-nj/110.65/trace-debug-profile.tgz) = db14311ae135692024bbc30ef55d222f	58	MD5 (sml-nj/110.71/trace-debug-profile.tgz) = 0ae3fc7bd1523080a809128cc37d8c6f
59	SHA256 (sml-nj/110.65/trace-debug-profile.tgz) = e347119d27d6fecad72e0cd1b355db79305a40b36edac66573b794f71a9944fa	59	SHA256 (sml-nj/110.71/trace-debug-profile.tgz) = 3b4db9f3546c02ce5c4510e070ee304b768914914e47acdbae3a82397df1ac28
60	SIZE (sml-nj/110.65/trace-debug-profile.tgz) = 3904	60	SIZE (sml-nj/110.71/trace-debug-profile.tgz) = 3935

Lines 1-5 Link Here

(-)files/patch-config_install.sh (-8 / +27 lines)
1	--- config/install.sh.orig Thu Nov 2 22:23:22 2006	1	--- config/install.sh.orig Tue May 22 18:48:30 2007
2	+++ config/install.sh Sun Nov 19 23:51:03 2006	2	+++ config/install.sh Sun Sep 16 02:56:22 2007
3	@@ -18,6 +18,8 @@	3	@@ -18,6 +18,8 @@
4	nolib=false	4	nolib=false
5	fi	5	fi
Lines 38-44 Link Here
38	this=$0	38	this=$0
39		39
40		40
41	@@ -307,7 +331,12 @@	41	@@ -308,7 +332,12 @@
42	# the name of the bin files directory	42	# the name of the bin files directory
43	#	43	#
44	BOOT_ARCHIVE=boot.$ARCH-unix	44	BOOT_ARCHIVE=boot.$ARCH-unix
Lines 52-58 Link Here
52		52
53	#	53	#
54	# build the run-time system	54	# build the run-time system
55	@@ -316,6 +345,11 @@	55	@@ -317,6 +346,11 @@
56	vsay $this: Run-time system already exists.	56	vsay $this: Run-time system already exists.
57	else	57	else
58	"$CONFIGDIR"/unpack "$ROOT" runtime	58	"$CONFIGDIR"/unpack "$ROOT" runtime
Lines 64-70 Link Here
64	cd "$BASEDIR"/runtime/objs	64	cd "$BASEDIR"/runtime/objs
65	echo $this: Compiling the run-time system.	65	echo $this: Compiling the run-time system.
66	$MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS	66	$MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
67	@@ -330,7 +364,7 @@	67	@@ -331,7 +365,7 @@
68	if [ -f run.$ARCH-$OPSYS.a ]; then	68	if [ -f run.$ARCH-$OPSYS.a ]; then
69	mv run.$ARCH-$OPSYS.a "$RUNDIR"	69	mv run.$ARCH-$OPSYS.a "$RUNDIR"
70	fi	70	fi
Lines 73-79 Link Here
73	else	73	else
74	complain "$this: !!! Run-time system build failed for some reason."	74	complain "$this: !!! Run-time system build failed for some reason."
75	fi	75	fi
76	@@ -356,7 +390,7 @@	76	@@ -357,7 +391,7 @@
77	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."	77	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
78	fi	78	fi
79	else	79	else
Lines 82-93 Link Here
82		82
83	fish "$ROOT"/"$BOOT_FILES"/smlnj/basis	83	fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
84		84
85	@@ -427,5 +461,12 @@	85	@@ -415,6 +449,18 @@
		86
		87	cd "$ROOT"
		88
		89	+# apply source patches for standard targets
		90	+[ -n "$MLSTANDARDPATCHDIRS" ] && \
		91	+for d in $MLSTANDARDPATCHDIRS
		92	+do
		93	+ "$CONFIGDIR"/unpack "$ROOT" "$d"
		94	+done
		95	+[ -n "$MLSTANDARDPATCHES" ] && \
		96	+for p in $MLSTANDARDPATCHES
		97	+do
		98	+ do_patch $p
		99	+done
		100	+
		101	#
		102	# Now do all the rest using the precompiled installer:
		103	#
		104	@@ -430,5 +476,12 @@
86	complain "$this: !!! Installation of libraries and programs failed."	105	complain "$this: !!! Installation of libraries and programs failed."
87	fi	106	fi
88	fi	107	fi
89	+	108	+
90	+# apply source patches	109	+# apply all source patches
91	+[ -n "$MLSOURCEPATCHES" ] && \	110	+[ -n "$MLSOURCEPATCHES" ] && \
92	+for p in $MLSOURCEPATCHES	111	+for p in $MLSOURCEPATCHES
93	+do	112	+do