Update to Moscow ML version 2.01 (January 2004)

No ChangeLog available, but a recursive diff reveals
a mostly bugfix release.

From Aleksej Saushev in private mail.

13 files changed, 251 insertions, 36 deletions

diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 839fda7219b..1c12357bfa6 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.27 2008/01/05 09:22:06 tonio Exp $
+# $NetBSD: Makefile,v 1.28 2008/04/28 10:16:57 tnn Exp $
 
-DISTNAME=	mos20src
-PKGNAME=	moscow_ml-2.00
-PKGREVISION=	1
+DISTNAME=	mos201src
+PKGNAME=	moscow_ml-2.01
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.dina.kvl.dk/pub/mosml/ \
-		ftp://ftp.csd.uu.se/pub/mirror/mosml/
+MASTER_SITES=	http://www.itu.dk/people/sestoft/mosml/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dina.kvl.dk/~sestoft/mosml.html
 COMMENT=	Moscow ML, a version of Standard ML
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/mosml/src
 USE_TOOLS+=	perl
 
@@ -18,9 +18,9 @@ BUILD_TARGET=	clean world
 MAKE_JOBS_SAFE=	no
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/moscow_ml
-	${CP} -R ${WRKDIR}/mosml/examples/* ${PREFIX}/share/examples/moscow_ml
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/moscow_ml
-	${CHMOD} -R ugo+r ${PREFIX}/share/examples/moscow_ml
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/moscow_ml
+	${CP} -R ${WRKDIR}/mosml/examples/* ${DESTDIR}${PREFIX}/share/examples/moscow_ml
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DESTDIR}${PREFIX}/share/examples/moscow_ml
+	${CHMOD} -R ugo+r ${DESTDIR}${PREFIX}/share/examples/moscow_ml
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/moscow_ml/distinfo b/lang/moscow_ml/distinfo
index 2fe4eea199d..edd04631e64 100644
--- a/lang/moscow_ml/distinfo
+++ b/lang/moscow_ml/distinfo
@@ -1,10 +1,18 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 09:03:09 agc Exp $
+$NetBSD: distinfo,v 1.5 2008/04/28 10:16:57 tnn Exp $
 
-SHA1 (mos20src.tar.gz) = 5ca90c0dc679ebb6d84cb28b5cca7d4c7a8edfbc
-RMD160 (mos20src.tar.gz) = b0663311daac8a5af76a22d111ba2c803e87715c
-Size (mos20src.tar.gz) = 2308637 bytes
+SHA1 (mos201src.tar.gz) = eba58486b10f0359fafba488fa1bf366b2aabf8a
+RMD160 (mos201src.tar.gz) = b2a9582d8c0bfdad2b8a74740e54ab33d3856637
+Size (mos201src.tar.gz) = 2314392 bytes
 SHA1 (patch-aa) = ffe745a14f8b41d2c1c278fbd6f7057a856a1e47
-SHA1 (patch-ab) = 37645c33f1f1f5c2ead0183f6adb0d1ded6c90e3
-SHA1 (patch-ac) = b7b8fa6cc0d047f769874a3e2afd75364545dc34
-SHA1 (patch-ad) = dd2900330220b4e8226b1bf4cf9d15c8e2f8e24f
+SHA1 (patch-ab) = f4f4d6307a145041e60322c91f1b5359c744cc93
+SHA1 (patch-ac) = 76d59a2370334a6e87a01d29f75b4700463d60f8
+SHA1 (patch-ad) = d76f87ed98eb836e926d0781824531694b287ad7
 SHA1 (patch-ae) = 2e2875d9997233e6696833f92d7ae77c4930499d
+SHA1 (patch-ba) = 2e6d61ef16ed7bc064d828fd22fc5c96e12cf357
+SHA1 (patch-bb) = 7ec9c19d43a0d758ecc2655b7da131e58dbe9739
+SHA1 (patch-bc) = 99953744072bb2ad603469b411b4bd5f33a935f7
+SHA1 (patch-bd) = 3e73d03cec930463c0d3d1a2c3e874b0c8c8a459
+SHA1 (patch-be) = 4742e5391e5ac9d7c5339c69b6d47d237659feed
+SHA1 (patch-bf) = 3bafc00ea7b2fd8c7992f0dc36cb4467e6815de6
+SHA1 (patch-bg) = 6ca89fb870ef066a2929b9cd7e38257c9380cd11
+SHA1 (patch-bh) = e9a12cf9804e46379c9e97c567eef974a2f7ca62
diff --git a/lang/moscow_ml/patches/patch-ab b/lang/moscow_ml/patches/patch-ab
index d4b0327271f..589a63f2800 100644
--- a/lang/moscow_ml/patches/patch-ab
+++ b/lang/moscow_ml/patches/patch-ab
@@ -1,13 +1,44 @@
-$NetBSD: patch-ab,v 1.5 2000/08/23 21:57:58 tron Exp $
+$NetBSD: patch-ab,v 1.6 2008/04/28 10:16:57 tnn Exp $
 
---- Makefile.orig	Tue Jul 18 16:16:44 2000
-+++ Makefile	Wed Aug 23 23:43:08 2000
-@@ -58,7 +58,7 @@
- 	cd compiler; make install
- 	cd toolssrc; make install
- 	cd lex; make install
+Use $(MAKE).
+DESTDIR support.
+
+--- Makefile.orig	2000-07-18 18:16:44.000000000 +0400
++++ Makefile	2008-04-27 22:36:41.000000000 +0400
+@@ -45,21 +45,21 @@
+ 
+ # Install the Mosml system
+ install:
+-	test -d $(BINDIR) || mkdir -p $(BINDIR)
+-	test -d $(LIBDIR) || mkdir -p $(LIBDIR)
+-	test -d $(INCDIR) || mkdir -p $(INCDIR)
+-	test -d $(DOCDIR) || mkdir -p $(DOCDIR)
+-	test -d $(TOOLDIR) || mkdir -p $(TOOLDIR)
+-	cd runtime; make install
+-	cd config; make install
+-	cd launch; make all install
+-	cd mosmlyac; make install
+-	cd mosmllib; make install
+-	cd compiler; make install
+-	cd toolssrc; make install
+-	cd lex; make install
 -	(cd $(INCDIR)/..; rm -f config; ln -s include config)
-+	(cd $(INCDIR); rm -f config; ln -s . config)
- 	cd doc; make install
+-	cd doc; make install
++	test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR)
++	test -d $(DESTDIR)$(LIBDIR) || mkdir -p $(DESTDIR)$(LIBDIR)
++	test -d $(DESTDIR)$(INCDIR) || mkdir -p $(DESTDIR)$(INCDIR)
++	test -d $(DESTDIR)$(DOCDIR) || mkdir -p $(DESTDIR)$(DOCDIR)
++	test -d $(DESTDIR)$(TOOLDIR) || mkdir -p $(DESTDIR)$(TOOLDIR)
++	cd runtime; $(MAKE) install DESTDIR=$(DESTDIR)
++	cd config; $(MAKE) install DESTDIR=$(DESTDIR)
++	cd launch; $(MAKE) all install DESTDIR=$(DESTDIR)
++	cd mosmlyac; $(MAKE) install DESTDIR=$(DESTDIR)
++	cd mosmllib; $(MAKE) install DESTDIR=$(DESTDIR)
++	cd compiler; $(MAKE) install DESTDIR=$(DESTDIR)
++	cd toolssrc; $(MAKE) install DESTDIR=$(DESTDIR)
++	cd lex; $(MAKE) install DESTDIR=$(DESTDIR)
++	(cd $(DESTDIR)$(INCDIR); rm -f config; ln -s . config)
++	cd doc; $(MAKE) install DESTDIR=$(DESTDIR)
  
  # Remove all generated files
+ clean:
diff --git a/lang/moscow_ml/patches/patch-ac b/lang/moscow_ml/patches/patch-ac
index fba60009674..7d0749c3309 100644
--- a/lang/moscow_ml/patches/patch-ac
+++ b/lang/moscow_ml/patches/patch-ac
@@ -1,13 +1,17 @@
-$NetBSD: patch-ac,v 1.5 2000/08/23 21:57:59 tron Exp $
+$NetBSD: patch-ac,v 1.6 2008/04/28 10:16:57 tnn Exp $
 
---- runtime/Makefile.orig	Tue Jul 18 16:16:44 2000
-+++ runtime/Makefile	Wed Aug 23 22:57:02 2000
-@@ -47,7 +47,7 @@
+DESTDIR support.
+
+--- runtime/Makefile.orig	2000-07-18 18:16:44.000000000 +0400
++++ runtime/Makefile	2008-04-27 22:38:26.000000000 +0400
+@@ -46,8 +46,8 @@
+ 	rm -f .debugobj/*.o
  
  install:
- 	${INSTALL_PROGRAM} camlrunm$(EXE) $(BINDIR)
+-	${INSTALL_PROGRAM} camlrunm$(EXE) $(BINDIR)
 -	${INSTALL_PROGRAM} *.h $(INCDIR)
-+	${INSTALL_DATA} *.h $(INCDIR)
++	${INSTALL_PROGRAM} camlrunm$(EXE) $(DESTDIR)$(BINDIR)
++	${INSTALL_DATA} *.h $(DESTDIR)$(INCDIR)
  
  primitives : $(PRIMS)
  	sed -n -e '/\/\* ML \*\//s/.* \([a-zA-Z0-9_][a-zA-Z0-9_]*\) *(.*/\1/p' \
diff --git a/lang/moscow_ml/patches/patch-ad b/lang/moscow_ml/patches/patch-ad
index 27d3df680da..5fefe4d9ea2 100644
--- a/lang/moscow_ml/patches/patch-ad
+++ b/lang/moscow_ml/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.5 2000/08/23 21:57:59 tron Exp $
+$NetBSD: patch-ad,v 1.6 2008/04/28 10:16:57 tnn Exp $
 
---- config/Makefile.orig	Wed Feb 16 16:36:57 2000
-+++ config/Makefile	Wed Aug 23 22:57:49 2000
+DESTDIR support.
+
+--- config/Makefile.orig	2000-02-16 18:36:57.000000000 +0300
++++ config/Makefile	2008-04-27 22:39:21.000000000 +0400
 @@ -4,7 +4,7 @@
  	@echo "Run 'sh autoconf' or 'sh autoconf gcc' or ..."
  
  install:
 -	$(INSTALL_PROGRAM) m.h s.h $(INCDIR)
-+	$(INSTALL_DATA) m.h s.h $(INCDIR)
++	$(INSTALL_DATA) m.h s.h $(DESTDIR)$(INCDIR)
  
  clean scratch:
  	rm -f m.h s.h
diff --git a/lang/moscow_ml/patches/patch-ba b/lang/moscow_ml/patches/patch-ba
new file mode 100644
index 00000000000..a364dc622eb
--- /dev/null
+++ b/lang/moscow_ml/patches/patch-ba
@@ -0,0 +1,32 @@
+$NetBSD: patch-ba,v 1.1 2008/04/28 10:16:57 tnn Exp $
+
+Fix insecure temporary file handling.
+DESTDIR support.
+
+--- launch/Makefile.orig	2000-01-21 13:07:13.000000000 +0300
++++ launch/Makefile	2008-04-27 22:42:28.000000000 +0400
+@@ -10,16 +10,16 @@
+ install:
+ 	(echo "#!$(BINDIR)/camlrunm"; \
+ 	 echo "exit 2"; \
+-	 cat testprog) > /tmp/testscr
+-	chmod a+x /tmp/testscr
+-	sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
+-               then echo "#!$(BINDIR)/camlrunm" > $(LIBDIR)/header; \
+-               else ${INSTALL_PROGRAM} camlexec$(EXE) $(LIBDIR)/header; \
++	 cat testprog) > ./testscr
++	chmod a+x ./testscr
++	sh -c 'if sh -c ./testscr 2>/dev/null; \
++               then echo "#!$(BINDIR)/camlrunm" > $(DESTDIR)$(LIBDIR)/header; \
++               else ${INSTALL_PROGRAM} camlexec$(EXE) $(DESTDIR)$(LIBDIR)/header; \
+                fi'
+-	rm -f /tmp/testscr
++	rm -f ./testscr
+ 	for script in mosml mosmlc mosmllex; do \
+-	  ${INSTALL_SCRIPT} $$script $(BINDIR)/$$script; \
+-	  chmod a+x $(BINDIR)/$$script; \
++	  ${INSTALL_SCRIPT} $$script $(DESTDIR)$(BINDIR)/$$script; \
++	  chmod a+x $(DESTDIR)$(BINDIR)/$$script; \
+ 	done
+ 
+ mosml: mosml.tpl
diff --git a/lang/moscow_ml/patches/patch-bb b/lang/moscow_ml/patches/patch-bb
new file mode 100644
index 00000000000..e08a524bb25
--- /dev/null
+++ b/lang/moscow_ml/patches/patch-bb
@@ -0,0 +1,15 @@
+$NetBSD: patch-bb,v 1.1 2008/04/28 10:16:57 tnn Exp $
+
+DESTDIR support.
+
+--- mosmlyac/Makefile.orig	2000-01-21 13:07:13.000000000 +0300
++++ mosmlyac/Makefile	2008-04-27 22:43:51.000000000 +0400
+@@ -18,7 +18,7 @@
+ 	rm -f mosmlyac$(EXE)
+ 
+ install:
+-	${INSTALL_PROGRAM} mosmlyac$(EXE) $(BINDIR)/mosmlyac$(EXE)
++	${INSTALL_PROGRAM} mosmlyac$(EXE) $(DESTDIR)$(BINDIR)/mosmlyac$(EXE)
+ 
+ depend:
+ 
diff --git a/lang/moscow_ml/patches/patch-bc b/lang/moscow_ml/patches/patch-bc
new file mode 100644
index 00000000000..09e2dc26e5f
--- /dev/null
+++ b/lang/moscow_ml/patches/patch-bc
@@ -0,0 +1,29 @@
+$NetBSD: patch-bc,v 1.1 2008/04/28 10:16:57 tnn Exp $
+
+DESTDIR support.
+
+--- mosmllib/Makefile.orig	2000-06-27 20:38:25.000000000 +0400
++++ mosmllib/Makefile	2008-04-27 22:46:18.000000000 +0400
+@@ -39,14 +39,14 @@
+ 	rm -f Vector.sml Word.sml Word8Array.sml Word8Vector.sml Weak.sml
+ 
+ install:
+-	${INSTALL_DATA} README $(LIBDIR)
+-	${INSTALL_DATA} *.ui $(LIBDIR)
+-	${INSTALL_DATA} *.uo $(LIBDIR)
+-	${INSTALL_DATA} *.sig $(LIBDIR)
+-	${INSTALL_DATA} General.fke $(LIBDIR)/General.sig
+-	${INSTALL_DATA} Meta.fke $(LIBDIR)/Meta.sig
+-	rm -f $(LIBDIR)/camlrunm
+-	ln -s $(BINDIR)/camlrunm $(LIBDIR)/camlrunm
++	${INSTALL_DATA} README $(DESTDIR)$(LIBDIR)
++	${INSTALL_DATA} *.ui $(DESTDIR)$(LIBDIR)
++	${INSTALL_DATA} *.uo $(DESTDIR)$(LIBDIR)
++	${INSTALL_DATA} *.sig $(DESTDIR)$(LIBDIR)
++	${INSTALL_DATA} General.fke $(DESTDIR)$(LIBDIR)/General.sig
++	${INSTALL_DATA} Meta.fke $(DESTDIR)$(LIBDIR)/Meta.sig
++	rm -f $(DESTDIR)$(LIBDIR)/camlrunm
++	ln -s $(BINDIR)/camlrunm $(DESTDIR)$(LIBDIR)/camlrunm
+ 
+ depend: Array.sml FileSys.sml Help.sml Int.sml Mosml.sml Path.sml \
+     Process.sml Strbase.sml Vector.sml Word.sml Word8Array.sml \
diff --git a/lang/moscow_ml/patches/patch-bd b/lang/moscow_ml/patches/patch-bd
new file mode 100644
index 00000000000..99a7ebf0e82
--- /dev/null
+++ b/lang/moscow_ml/patches/patch-bd
@@ -0,0 +1,19 @@
+$NetBSD: patch-bd,v 1.1 2008/04/28 10:16:57 tnn Exp $
+
+DESTDIR support.
+
+--- compiler/Makefile.orig	2000-06-27 18:46:19.000000000 +0400
++++ compiler/Makefile	2008-04-27 22:50:05.000000000 +0400
+@@ -117,9 +117,9 @@
+ 	rm -f Makefile.bak
+ 
+ install:
+-	${INSTALL_DATA} mosmlcmp $(LIBDIR)
+-	${INSTALL_DATA} mosmllnk $(LIBDIR)
+-	${INSTALL_DATA} mosmltop $(LIBDIR)
++	${INSTALL_DATA} mosmlcmp $(DESTDIR)$(LIBDIR)
++	${INSTALL_DATA} mosmllnk $(DESTDIR)$(LIBDIR)
++	${INSTALL_DATA} mosmltop $(DESTDIR)$(LIBDIR)
+ 
+ promote:
+ 	test -f ../mosmlcmp.orig || cp ../mosmlcmp ../mosmlcmp.orig
diff --git a/lang/moscow_ml/patches/patch-be b/lang/moscow_ml/patches/patch-be
new file mode 100644
index 00000000000..e5fd7c9f5e7
--- /dev/null
+++ b/lang/moscow_ml/patches/patch-be
@@ -0,0 +1,15 @@
+$NetBSD: patch-be,v 1.1 2008/04/28 10:16:57 tnn Exp $
+
+DESTDIR support.
+
+--- toolssrc/Makefile.orig	2000-01-21 13:07:13.000000000 +0300
++++ toolssrc/Makefile	2008-04-27 22:51:05.000000000 +0400
+@@ -34,7 +34,7 @@
+ 	rm -f cutdeps mosmldep
+ 
+ install:
+-	${INSTALL_DATA} cutdeps mosmldep $(TOOLDIR)
++	${INSTALL_DATA} cutdeps mosmldep $(DESTDIR)$(TOOLDIR)
+ 
+ depend: Deplex.sml Deppars.sml Mosmldep.sml
+ 	rm -f Makefile.bak
diff --git a/lang/moscow_ml/patches/patch-bf b/lang/moscow_ml/patches/patch-bf
new file mode 100644
index 00000000000..778627c8573
--- /dev/null
+++ b/lang/moscow_ml/patches/patch-bf
@@ -0,0 +1,15 @@
+$NetBSD: patch-bf,v 1.1 2008/04/28 10:16:57 tnn Exp $
+
+DESTDIR support.
+
+--- lex/Makefile.orig	2000-01-25 00:59:00.000000000 +0300
++++ lex/Makefile	2008-04-27 22:52:08.000000000 +0400
+@@ -37,7 +37,7 @@
+ 	cd test; make clean
+ 
+ install:
+-	${INSTALL_DATA} mosmllex $(LIBDIR)
++	${INSTALL_DATA} mosmllex $(DESTDIR)$(LIBDIR)
+ 
+ Grammar.sml Grammar.sig: Grammar.grm
+ 	$(MOSMLYACC) Grammar.grm
diff --git a/lang/moscow_ml/patches/patch-bg b/lang/moscow_ml/patches/patch-bg
new file mode 100644
index 00000000000..1e041e096ac
--- /dev/null
+++ b/lang/moscow_ml/patches/patch-bg
@@ -0,0 +1,24 @@
+$NetBSD: patch-bg,v 1.1 2008/04/28 10:16:57 tnn Exp $
+
+Use $(MAKE).
+DESTDIR support.
+
+--- doc/Makefile.orig	2000-06-29 18:44:27.000000000 +0400
++++ doc/Makefile	2008-04-27 22:53:31.000000000 +0400
+@@ -48,11 +48,11 @@
+ 	psnup -pa4 -2 mosmllib.ps mosmllib2up.ps
+ 
+ install:
+-	cp mosmlref.pdf $(DOCDIR)
+-	cp manual.pdf $(DOCDIR)
+-	cp mosmllib.pdf $(DOCDIR)
+-	cp mosmllib2up.pdf $(DOCDIR)
+-	cd helpsigs; make install
++	cp mosmlref.pdf $(DESTDIR)$(DOCDIR)
++	cp manual.pdf $(DESTDIR)$(DOCDIR)
++	cp mosmllib.pdf $(DESTDIR)$(DOCDIR)
++	cp mosmllib2up.pdf $(DESTDIR)$(DOCDIR)
++	cd helpsigs; $(MAKE) install DESTDIR=$(DESTDIR)
+ 
+ clean:
+ 	rm -f *.aux *.dvi *.blg *.bbl *.blg *.log *.ps
diff --git a/lang/moscow_ml/patches/patch-bh b/lang/moscow_ml/patches/patch-bh
new file mode 100644
index 00000000000..47c6d411bf4
--- /dev/null
+++ b/lang/moscow_ml/patches/patch-bh
@@ -0,0 +1,21 @@
+$NetBSD: patch-bh,v 1.1 2008/04/28 10:16:57 tnn Exp $
+
+DESTDIR support.
+
+--- doc/helpsigs/Makefile.orig	2000-08-02 16:06:16.000000000 +0400
++++ doc/helpsigs/Makefile	2008-04-27 22:54:40.000000000 +0400
+@@ -22,10 +22,10 @@
+ 	makebase $(LIBDIR)
+ 
+ install:
+-	cp helpsigs.val $(LIBDIR)
+-	test -d $(DOCDIR)/mosmllib || mkdir -p $(DOCDIR)/mosmllib
+-	cp htmlsigs/*.html $(DOCDIR)/mosmllib
+-	cp index.html $(DOCDIR)/mosmllib
++	cp helpsigs.val $(DESTDIR)$(LIBDIR)
++	test -d $(DESTDIR)$(DOCDIR)/mosmllib || mkdir -p $(DESTDIR)$(DOCDIR)/mosmllib
++	cp htmlsigs/*.html $(DESTDIR)$(DOCDIR)/mosmllib
++	cp index.html $(DESTDIR)$(DOCDIR)/mosmllib
+ 
+ depend: Lexer.sml Parser.sml 
+ 	rm -f Makefile.bak