<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a88d61b32b0cfbcbc9cf3537b232cc1c6953dcf2">https://github.com/macports/macports-ports/commit/a88d61b32b0cfbcbc9cf3537b232cc1c6953dcf2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a88d61b32b0cfbcbc9cf3537b232cc1c6953dcf2
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Wed Jul 26 12:28:32 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> mosml: update to latest upstream, make -dynlibs its subport, close a bunch of old tickets
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/39662
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58503
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/39665
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/39664
</span>---
lang/mosml-dynlibs/Portfile | 43 ----
lang/mosml-dynlibs/files/patch-configure.diff | 8 -
.../files/patch-src-Makefile-inc.diff | 46 ----
lang/mosml-dynlibs/files/patch-src-Makefile.diff | 18 --
lang/mosml-dynlibs/files/patch-src-dynlibs.diff | 206 ---------------
.../files/patch-src-launch-Makefile.diff | 46 ----
lang/mosml/Portfile | 96 ++++---
lang/mosml/files/0001-mosml.patch | 145 +++++++++++
lang/mosml/files/0002-mosml-dynlibs.patch | 275 +++++++++++++++++++++
lang/mosml/files/patch-src-Makefile-inc.diff | 46 ----
lang/mosml/files/patch-src-Makefile.diff | 18 --
lang/mosml/files/patch-src-dynlibs.diff | 206 ---------------
lang/mosml/files/patch-src-launch-Makefile.diff | 46 ----
lang/mosml/files/patch-src-runtime-mosml.c.diff | 13 -
lang/mosml/files/patch-src-runtime-sys.c.diff | 13 -
15 files changed, 485 insertions(+), 740 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml-dynlibs/Portfile b/lang/mosml-dynlibs/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37ca9dd747d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml-dynlibs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name mosml-dynlibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.01_0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lang devel ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Moscow ML dynamic libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Dynamic libraries for Moscow ML includes: \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- intinf, crypt, munix, mregex, msocket, mgdbm, mgd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.itu.dk/people/sestoft/mosml.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.itu.dk/people/sestoft/mosml/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles mos201src.tar.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b2a9582d8c0bfdad2b8a74740e54ab33d3856637 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ec5695358a4aa4702d856c026f3cf0bce77275e8d1318fd90d455a44c46edff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2314392
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile-inc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-launch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-dynlibs.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${worksrcpath}/configure -permissions +x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target world-dyn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args -Csrc DESTROOT=${prefix} ${build.target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install-world-dyn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args -Csrc DESTROOT=${destroot}${prefix} ${destroot.target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gmp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gdbm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gd2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml-dynlibs/files/patch-configure.diff b/lang/mosml-dynlibs/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1614eb2ac85..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml-dynlibs/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure 2006-08-27 16:12:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2006-08-27 16:07:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cd src/config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+./autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cd ..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml-dynlibs/files/patch-src-Makefile-inc.diff b/lang/mosml-dynlibs/files/patch-src-Makefile-inc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6d923561808..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml-dynlibs/files/patch-src-Makefile-inc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.inc 2006-08-27 16:20:05.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.inc 2006-08-27 16:30:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to install stuff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MOSMLHOME=${HOME}/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MOSMLHOME=${DESTROOT}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Various utility programs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PROGRAM=cp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,14 +22,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # To compile the runtime system camlrunm under Cygwin with support for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dynamically loadable libraries (DDLs), uncomment these:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ADDPRIMS=dynlib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ADDOBJS=dynlib.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ADDRUNCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ADDDYNLIBCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ADDPRIMS=dynlib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ADDOBJS=dynlib.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ADDRUNCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ADDDYNLIBCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Linux (x86 or Alpha), use:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPP=/lib/cpp -P -traditional -Dunix -Umsdos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRIP=strip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD=gcc -rdynamic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DYNLD=ld -shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,10 +114,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # DOCDIR contains documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR=${MOSMLHOME}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBDIR=${MOSMLHOME}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCDIR=${MOSMLHOME}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DOCDIR=${MOSMLHOME}/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--TOOLDIR=${MOSMLHOME}/tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBDIR=${MOSMLHOME}/lib/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCDIR=${MOSMLHOME}/include/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DOCDIR=${MOSMLHOME}/share/doc/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TOOLDIR=${MOSMLHOME}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LIBDIR=${MOSMLHOME}/lib/moscow_ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TOOLDIR=${MOSMLHOME}/libexec/moscow_ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml-dynlibs/files/patch-src-Makefile.diff b/lang/mosml-dynlibs/files/patch-src-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4875d21a624..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml-dynlibs/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile 2006-08-27 16:20:05.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2006-08-27 16:44:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,7 +16,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build the entire system for the first time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- world:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd config; sh autoconf $(CC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd runtime; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp runtime/camlrunm$(EXE) .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd mosmlyac; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +57,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd compiler; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd toolssrc; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd lex; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (cd $(INCDIR)/..; rm -f config; ln -s include config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd doc; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove all generated files
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml-dynlibs/files/patch-src-dynlibs.diff b/lang/mosml-dynlibs/files/patch-src-dynlibs.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1dde640a7d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml-dynlibs/files/patch-src-dynlibs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,206 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/include/config.h ./include/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/include/config.h 2004-01-19 15:02:21.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/config.h 2008-12-03 11:39:56.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _config_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__MWERKS__) || defined(THINK_C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__MWERKS__) || defined(THINK_C) || defined(LSB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "m.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "s.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/Makefile ./src/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/Makefile 2008-11-28 14:42:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/Makefile 2008-12-09 17:09:12.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd lex; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd launch; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+world-dyn:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/msocket; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/crypt; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/munix; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mregex; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mgdbm; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mgd; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/intinf; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install-world-dyn: dirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/msocket; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/crypt; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/munix; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mregex; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mgdbm; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mgd; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/intinf; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uptodate:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd runtime; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp runtime/camlrunm$(EXE) .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,13 +60,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd toolssrc; make clean all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd lex; make clean all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Install the Mosml system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dirs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(BINDIR) || mkdir -p $(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(LIBDIR) || mkdir -p $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(INCDIR) || mkdir -p $(INCDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(DOCDIR) || mkdir -p $(DOCDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(TOOLDIR) || mkdir -p $(TOOLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Install the Mosml system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install: dirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd runtime; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd config; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd launch; make all install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/Makefile.inc ./src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/Makefile.inc 2008-11-28 14:42:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/Makefile.inc 2008-12-09 17:24:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,9 +30,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Linux (x86 or Alpha), use:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STRIP=strip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LD=gcc -rdynamic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DYNLD=ld -shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STRIP=echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LD=gcc -Wl,-rpath -Wl,${DESTROOT}/lib/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DYNLD=gcc -bundle -bundle_loader ${DESTROOT}/bin/camlrunm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ADDRUNLIBS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ADDRUNCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ADDDYNLIBCFLAGS=-DLSB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Cygwin 20.1, use:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ---------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/crypt/Makefile ./src/dynlibs/crypt/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/crypt/Makefile 2000-02-16 15:36:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/crypt/Makefile 2008-11-28 15:22:08.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,8 +13,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c -o crypt.o crypt.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcrypt.so: crypt.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DYNLD) -lcrypt -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# $(DYNLD) -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DYNLD) -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp libcrypt.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f *.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/intinf/Makefile ./src/dynlibs/intinf/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/intinf/Makefile 2000-02-16 15:36:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/intinf/Makefile 2008-12-09 17:58:03.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,12 +5,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to find GMP header file and compiled library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GMPDIR=${HOME}/c/gmp-2.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GMPDIR=/opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GMPINCDIR=${GMPDIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GMPLIBDIR=${GMPDIR}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GMPDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GMPINCDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,16 +20,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLLEX=mosmllex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLYACC=mosmlyac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--all: libmgmp.so IntInf.uo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all: libmgmp.so IntInf.uo IntInf.ui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install: all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp libmgmp.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp IntInf.uo $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp IntInf.ui $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp IntInf.sig $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- intinf.o: intinf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c -o intinf.o intinf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmgmp.so: intinf.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DYNLD) -o libmgmp.so intinf.o ${GMPDIR}/libgmp.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DYNLD) -o libmgmp.so intinf.o ${GMPLIBDIR}/libgmp.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mosml testintinf.sml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/mgd/Makefile ./src/dynlibs/mgd/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/mgd/Makefile 2000-02-23 17:11:42.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/mgd/Makefile 2008-11-28 15:44:28.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,12 +5,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to find gd header file and compiled library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GDDIR=${HOME}/c/gd-1.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GDINCDIR=/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GDLIBDIR=/opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDINCDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c -o mgd.o mgd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmgd.so: mgd.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -L/usr/X11R6/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DYNLD) -o libmgd.so mgd.o ${GDLIBDIR}/libgd.a -L/usr/X11R6/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -R/pack/libs/lib -L/pack/libs/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test: Graphs.uo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/mgdbm/Makefile ./src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/mgdbm/Makefile 2000-02-16 15:36:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/mgdbm/Makefile 2008-11-28 15:42:39.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,10 +5,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to find GDBM header file and compiled library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GDBMLIBDIR=${HOME}/c/gdbm-1.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GDBMINCDIR=${HOME}/c/gdbm-1.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#GDBMLIBDIR=/usr/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#GDBMINCDIR=/usr/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GDBMLIBDIR=/opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GDBMINCDIR=/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/munix/munix.c ./src/dynlibs/munix/munix.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/munix/munix.c 2000-01-21 10:07:13.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/munix/munix.c 2008-11-28 15:20:53.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,8 +59,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- failwith("EINVAL"); break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EISDIR:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- failwith("EISDIR"); break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ELIBBAD:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- failwith("ELIBBAD"); break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* case ELIBBAD:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ failwith("ELIBBAD"); break; */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ECHILD:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- failwith("ECHILD"); break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EINTR:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/runtime/config.h ./src/runtime/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/runtime/config.h 2000-01-21 10:07:13.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/runtime/config.h 2008-12-08 14:59:31.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _config_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__MWERKS__) || defined(THINK_C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__MWERKS__) || defined(THINK_C) || defined(LSB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "m.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "s.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml-dynlibs/files/patch-src-launch-Makefile.diff b/lang/mosml-dynlibs/files/patch-src-launch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c8b749c35b8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml-dynlibs/files/patch-src-launch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/launch/Makefile 2006-08-27 16:20:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/launch/Makefile 2006-08-27 16:57:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Unix Makefile for launching Moscow ML
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Based on Caml Light (copyright 1993 INRIA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TRUEBINDIR=/opt/local/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TRUELIBDIR=/opt/local/lib/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: mosml mosmlc mosmllex camlexec testprog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat testprog) > /tmp/testscr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod a+x /tmp/testscr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- then echo "#!$(BINDIR)/camlrunm" > $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ then echo "#!$(TRUEBINDIR)/camlrunm" > $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else ${INSTALL_PROGRAM} camlexec$(EXE) $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f /tmp/testscr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,20 +26,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mosml: mosml.tpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" mosml.tpl > mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosml.tpl > mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mosmlc: mosmlc.tpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" mosmlc.tpl > mosmlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosmlc.tpl > mosmlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mosmllex: mosmllex.tpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" mosmllex.tpl > mosmllex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosmllex.tpl > mosmllex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testprog: testprog.sml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MOSMLC) testprog.sml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MOSMLL) -noheader -o testprog BasicIO.uo testprog.uo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlexec.c: camlexec.tpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" camlexec.tpl > camlexec.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" camlexec.tpl > camlexec.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlexec: camlexec.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(OPTS) -o camlexec$(EXE) camlexec.c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/Portfile b/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c61999137a..c23c2f7fcbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +1,85 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.01
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup kfl mosml 13c581aec46eea134e478f2e2b6456278e36ecce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories lang devel ml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span> description Moscow ML is an implementation of Standard ML (SML)
long_description Moscow ML is a light-weight implementation of Standard ML \
(SML), a strict functional language widely used in teaching \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- and research. Version 2.01 implements the full SML language, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- including SML Modules, and much of the SML Basis Library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and research. Version 2.10.1 of Moscow ML implements \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the full Standard ML language, as revised 1997, including Modules \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and some extensions, yet is backwards compatible with versions \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ prior to 2.00, and implements large parts of the new SML Basis Library.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.itu.dk/people/sestoft/mosml.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.itu.dk/people/sestoft/mosml/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles mos201src.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://mosml.org
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b2a9582d8c0bfdad2b8a74740e54ab33d3856637 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ec5695358a4aa4702d856c026f3cf0bce77275e8d1318fd90d455a44c46edff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2314392
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a684b544fdd204a7408930c7b77611fcbf28dc44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9c18aaac26f6cf8b8394ea7ef3d2fc1e57de34715feea5860b4ea139757e4b95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2577422
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile-inc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-launch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-dynlibs.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-runtime-mosml.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-runtime-sys.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.rename yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdbm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 0001-mosml.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|LD=gcc|LD=${configure.cc}|" ${worksrcpath}/src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|CC=gcc|CC=${configure.cc}|" ${worksrcpath}/src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|CCP=|CPP=${configure.cpp}|" ${worksrcpath}/src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/Makefile.inc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/launch/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/intinf/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CC@|${configure.cc}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/Makefile.inc
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.dir ${worksrcpath}/src/config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ./autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args ${configure.cc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.dir ${worksrcpath}/src
</span> build.target world
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args -Csrc DESTROOT=${prefix} ${build.target}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.pre_args -Csrc DESTROOT=${destroot}${prefix} ${destroot.target}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "ln -sf ${prefix}/bin/camlrunm ${destroot}${prefix}/lib/mosml/camlrunm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-dynlibs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgs_v 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mys_v 57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mosml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mysql${mys_v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgresql${pgs_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-mosml-dynlibs.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@DESTDIR@|${destroot}|" ${worksrcpath}/src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d {intinf mgd mgdbm mmysql mpq mregex msocket} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dynlibs/${d}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PGSQL@|postgresql${pgs_v}|g" ${worksrcpath}/src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@MYSQL@|mysql${mys_v}|g" ${worksrcpath}/src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/src/dynlibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ROOTDIR="${prefix}/lib/mosml" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CAMLRT="${prefix}/lib/mosml"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/lib/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/0001-mosml.patch b/lang/mosml/files/0001-mosml.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ceb8f18e859
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0001-mosml.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,145 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0fc5c76fd8e648c4da769c36dd0c86540c598b45 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 05:25:18 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] Fix Makefile.inc for Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/Makefile.inc src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6f8cf3e..8ddfd24 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Unix configuration Makefile for Moscow ML -*- mode: makefile -*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Where to install stuff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PREFIX=/usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PREFIX=@PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # BINDIR contains true executable files, such as scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LIBDIR contains bytecode files (such as mosmlcmp and library units), and .dll/.so for dynlibs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,13 +13,23 @@ BINDIR=${PREFIX}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBDIR=${PREFIX}/lib/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCDIR=${PREFIX}/include/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOCDIR=${PREFIX}/share/doc/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TOOLDIR=${PREFIX}/share/mosml/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TOOLDIR=${PREFIX}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Where to install the man pages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Man pages for commands go in $(MANDIR)/man$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANDIR=${PREFIX}/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANEXT=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GMPDIR=@PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GMPINCDIR=${GMPDIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GMPLIBDIR=${GMPDIR}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GDINCDIR=@PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GDLIBDIR=@PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GDBMINCDIR=@PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GDBMLIBDIR=@PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSION=2.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +47,7 @@ BASELIBS=-lm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This works with most systems, including MacOS X with XCode installed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC=gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC=@CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CC=gcc -mmacosx-version-min=10.7 # for building OS X package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CC=/usr/sepp/bin/gcc # Solaris at KVL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,9 +82,9 @@ ifeq ($(UNAME_S),Linux)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYNLD=gcc -shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(UNAME_S),Darwin) # For MacOS X, use the same as Linux except DYNDL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPP=cpp -P -traditional -Dunix -Umsdos -Wno-invalid-pp-token
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPP=cpp -P -traditional -Dunix -Umsdos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRIP=strip -S
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LD=$(CC) -rdynamic -Wl,-rpath,$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LD=$(CC) -Wl,-rpath,$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DYNLD=$(LD) -bundle -undefined dynamic_lookup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(UNAME_S),Cross_W32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/intinf/Makefile src/dynlibs/intinf/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d8beaf0..425f09b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/intinf/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/intinf/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,10 +5,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Where to find GMP header file and compiled library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#GMPDIR=${HOME}/c/gmp-2.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GMPINCDIR=/usr/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GMPLIBDIR=/usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,9 +14,9 @@ CFLAGS=-Dunix -O3 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(CAMLRT) -I${GMPINCDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLTOOLS=camlrunm $(TOOLDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all: libmgmp.so IntInf.uo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: libmgmp.so IntInf.uo IntInf.ui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install: all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) libmgmp.so $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) IntInf.sig $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) IntInf.ui $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/launch/Makefile src/launch/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1b2f2aa..1f0bc13 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/launch/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/launch/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Unix Makefile for launching Moscow ML
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Based on Caml Light (copyright 1993 INRIA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TRUEBINDIR=@PREFIX@/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++TRUELIBDIR=@PREFIX@/lib/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: mosml mosmlc mosmllex camlexec testprog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +23,7 @@ old_install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat testprog) > /tmp/testscr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ chmod a+x /tmp/testscr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- then echo "#!$(BINDIR)/camlrunm" > $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ then echo "#!$(TRUEBINDIR)/camlrunm" > $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ${INSTALL_PROGRAM} camlexec$(EXE) $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f /tmp/testscr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,20 +38,20 @@ uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(DESTDIR)$(BINDIR) && ${UNINSTALL_SCRIPT} mosml mosmlc mosmllex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mosml: mosml.tpl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" mosml.tpl > mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosml.tpl > mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mosmlc: mosmlc.tpl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" -e "s|VERSION|$(VERSION)|" mosmlc.tpl > mosmlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosmlc.tpl > mosmlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mosmllex: mosmllex.tpl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" mosmllex.tpl > mosmllex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosmllex.tpl > mosmllex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ testprog: testprog.sml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MOSMLC) testprog.sml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MOSMLL) -noheader -o testprog BasicIO.uo testprog.uo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ camlexec.c: camlexec.tpl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" camlexec.tpl > camlexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" camlexec.tpl > camlexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ camlexec: camlexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(OPTS) -o camlexec$(EXE) camlexec.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,4 +61,3 @@ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f camlexec.c camlexec$(EXE) mosmlc mosml mosmllex testprog testprog.u[io]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depend:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/0002-mosml-dynlibs.patch b/lang/mosml/files/0002-mosml-dynlibs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c1edc1c8250
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/files/0002-mosml-dynlibs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,275 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3129d7168c1e91511f8f9505709f5f2defca9a5b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 08:41:30 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] Fix dynlibs build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/Makefile.inc src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8ddfd24..683a150 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,9 @@ INCDIR=${PREFIX}/include/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOCDIR=${PREFIX}/share/doc/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TOOLDIR=${PREFIX}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# This is not needed for the main port, only for dynlibs:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DESTDIR=@DESTDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Where to install the man pages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Man pages for commands go in $(MANDIR)/man$(MANEXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANDIR=${PREFIX}/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/Makefile src/dynlibs/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 603d412..0f714d6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,53 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd crypt; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd interface; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd intinf; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgd; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgdbm; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mmysql; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mpq; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mregex; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd msocket; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd munix; make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd intinf; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd crypt; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgd; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgdbm; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mmysql; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mpq; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mregex; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd msocket; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd munix; make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd intinf; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgd; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgdbm; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mmysql; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mpq; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mregex; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd msocket; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd munix; make uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd interface; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd intinf; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgd; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgdbm; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mmysql; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mpq; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mregex; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd munix; make test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd crypt; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd interface; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd intinf; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgd; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mgdbm; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mmysql; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mpq; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd mregex; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd msocket; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd munix; make clean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/crypt/Makefile src/dynlibs/crypt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1fe1b52..5f2791b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/crypt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/crypt/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,15 +6,17 @@ OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASELIBS=-lm -ldl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all: libcrypt.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: libcrypt.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "Now execute 'mosml crypt.sml' to test the C function"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crypt.o: crypt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) -c -o crypt.o crypt.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcrypt.so: crypt.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(DYNLD) -lcrypt -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# $(DYNLD) -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(DYNLD) -lcrypto -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${INSTALL_DATA} libcrypt.so $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f *.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mgd/Makefile src/dynlibs/mgd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 550326d..d265c36 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mgd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mgd/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,14 +5,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Where to find gd header file and compiled library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GDDIR=${HOME}/c/gd-1.7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I${GDINCDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MOSMLTOOLS=@PREFIX@/bin/camlrunm $(TOOLDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLL=mosmlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLLEX=mosmllex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,15 +22,13 @@ mgd.o: mgd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) -c -o mgd.o mgd.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libmgd.so: mgd.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -L/usr/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -L/usr/X11R6/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -R/pack/libs/lib -L/pack/libs/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(DYNLD) -o libmgd.so mgd.o ${GDLIBDIR}/libgd.a -L/usr/X11R6/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test: Graphs.uo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mosml testgdimage.sml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${INSTALL_DATA} libmgd.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${INSTALL_DATA} libmgd.so $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${UNINSTALL_DATA} $(LIBDIR)/libmgd.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mgdbm/Makefile src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7218150..ff6627a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,11 +5,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Where to find GDBM header file and compiled library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GDBMLIBDIR=${HOME}/c/gdbm-1.7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GDBMINCDIR=${HOME}/c/gdbm-1.7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#GDBMLIBDIR=/usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#GDBMINCDIR=/usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +14,7 @@ BASELIBS=-lm -ldl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all: libmgdbm.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${INSTALL_DATA} libmgdbm.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${INSTALL_DATA} libmgdbm.so $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${UNINSTALL_DATA} $(LIBDIR)/libmgdbm.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mmysql/Makefile src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0853210..16202e5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mmysql/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,17 +5,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Where to find the Mysql header file and compiled library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MYSQLLIBDIR=/usr/lib/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MYSQLINCDIR=/usr/include/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MYSQLLIBDIR=/usr/local/lib/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#MYSQLINCDIR=/usr/local/include/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MYSQLLIBDIR=@PREFIX@/lib/@MYSQL@/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MYSQLINCDIR=@PREFIX@/include/@MYSQL@/mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS= -Dunix -O2 $(OPTS) -I$(INCDIR) -I ${MYSQLINCDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MOSMLTOOLS=@PREFIX@/bin/camlrunm $(TOOLDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLL=mosmlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLLEX=mosmllex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,11 +25,10 @@ mmysql.o: mmysql.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CFLAGS) -c -o mmysql.o mmysql.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libmmysql.so: mmysql.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient -lnsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# $(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(DYNLD) -o libmmysql.so mmysql.o -L${MYSQLLIBDIR} -lmysqlclient
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${INSTALL_DATA} libmmysql.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${INSTALL_DATA} libmmysql.so $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${UNINSTALL_DATA} $(LIBDIR)/libmmysql.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mpq/Makefile src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8d8cec4..5cc0044 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,23 +7,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note: Unix distributions vary widely in the PGSQLLIBDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and PGSQLINCDIR locations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PGSQLLIBDIR=/usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PGSQLINCDIR=/usr/include/postgresql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#PGSQLLIBDIR=/usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#PGSQLINCDIR=/usr/include/pgsql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#PGSQLLIBDIR=/usr/local/pgsql/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#PGSQLINCDIR=/usr/local/pgsql/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#PGSQLLIBDIR=/usr/lib/pgsql/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#PGSQLINCDIR=/usr/lib/pgsql/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#PGSQLLIBDIR=/pack/postgresql/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#PGSQLINCDIR=/pack/postgresql/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PGSQLLIBDIR=@PREFIX@/lib/@PGSQL@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PGSQLINCDIR=@PREFIX@/include/@PGSQL@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${PGSQLINCDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MOSMLTOOLS=@PREFIX@/bin/camlrunm $(TOOLDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLL=mosmlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLLEX=mosmllex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,11 +28,11 @@ mpq.o: mpq.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libmpq.so: mpq.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Some recent Linux distributions need this:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(DYNLD) -lcrypt -o libmpq.so mpq.o ${PGSQLLIBDIR}/libpq.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(DYNLD) -lcrypto -o libmpq.so mpq.o ${PGSQLLIBDIR}/libpq.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $(DYNLD) -o libmpq.so mpq.o ${PGSQLLIBDIR}/libpq.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${INSTALL_DATA} libmpq.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${INSTALL_DATA} libmpq.so $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${UNINSTALL_DATA} $(LIBDIR)/libmpq.so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/dynlibs/mregex/Makefile src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2fd659b..04660c1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@ include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MOSMLTOOLS=@PREFIX@/bin/camlrunm $(TOOLDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLL=mosmlc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MOSMLLEX=mosmllex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@ libmregex.so: mregex.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(DYNLD) -o libmregex.so regex-0.12/regex.o mregex.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${INSTALL_DATA} libmregex.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${INSTALL_DATA} libmregex.so $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${UNINSTALL_DATA} $(LIBDIR)/libmregex.so
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/patch-src-Makefile-inc.diff b/lang/mosml/files/patch-src-Makefile-inc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6d923561808..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/patch-src-Makefile-inc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.inc 2006-08-27 16:20:05.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.inc 2006-08-27 16:30:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to install stuff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MOSMLHOME=${HOME}/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MOSMLHOME=${DESTROOT}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Various utility programs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PROGRAM=cp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,14 +22,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # To compile the runtime system camlrunm under Cygwin with support for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dynamically loadable libraries (DDLs), uncomment these:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ADDPRIMS=dynlib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ADDOBJS=dynlib.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ADDRUNCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ADDDYNLIBCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ADDPRIMS=dynlib.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ADDOBJS=dynlib.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ADDRUNCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ADDDYNLIBCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Linux (x86 or Alpha), use:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPP=/lib/cpp -P -traditional -Dunix -Umsdos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRIP=strip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD=gcc -rdynamic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DYNLD=ld -shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,10 +114,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # DOCDIR contains documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BINDIR=${MOSMLHOME}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBDIR=${MOSMLHOME}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCDIR=${MOSMLHOME}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DOCDIR=${MOSMLHOME}/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--TOOLDIR=${MOSMLHOME}/tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBDIR=${MOSMLHOME}/lib/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCDIR=${MOSMLHOME}/include/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DOCDIR=${MOSMLHOME}/share/doc/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TOOLDIR=${MOSMLHOME}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # LIBDIR=${MOSMLHOME}/lib/moscow_ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TOOLDIR=${MOSMLHOME}/libexec/moscow_ml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/patch-src-Makefile.diff b/lang/mosml/files/patch-src-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4875d21a624..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile 2006-08-27 16:20:05.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2006-08-27 16:44:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,7 +16,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build the entire system for the first time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- world:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cd config; sh autoconf $(CC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd runtime; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp runtime/camlrunm$(EXE) .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd mosmlyac; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +57,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd compiler; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd toolssrc; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd lex; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (cd $(INCDIR)/..; rm -f config; ln -s include config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd doc; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove all generated files
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/patch-src-dynlibs.diff b/lang/mosml/files/patch-src-dynlibs.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1dde640a7d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/patch-src-dynlibs.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,206 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/include/config.h ./include/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/include/config.h 2004-01-19 15:02:21.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./include/config.h 2008-12-03 11:39:56.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _config_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__MWERKS__) || defined(THINK_C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__MWERKS__) || defined(THINK_C) || defined(LSB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "m.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "s.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/Makefile ./src/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/Makefile 2008-11-28 14:42:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/Makefile 2008-12-09 17:09:12.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd lex; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd launch; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+world-dyn:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/msocket; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/crypt; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/munix; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mregex; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mgdbm; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mgd; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/intinf; make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install-world-dyn: dirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/msocket; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/crypt; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/munix; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mregex; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mgdbm; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/mgd; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd dynlibs/intinf; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uptodate:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd runtime; make all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp runtime/camlrunm$(EXE) .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,13 +60,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd toolssrc; make clean all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd lex; make clean all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Install the Mosml system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dirs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(BINDIR) || mkdir -p $(BINDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(LIBDIR) || mkdir -p $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(INCDIR) || mkdir -p $(INCDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(DOCDIR) || mkdir -p $(DOCDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test -d $(TOOLDIR) || mkdir -p $(TOOLDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Install the Mosml system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install: dirs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd runtime; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd config; make install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd launch; make all install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/Makefile.inc ./src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/Makefile.inc 2008-11-28 14:42:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/Makefile.inc 2008-12-09 17:24:00.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,9 +30,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Linux (x86 or Alpha), use:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=/usr/bin/cpp -P -traditional -Dunix -Umsdos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STRIP=strip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LD=gcc -rdynamic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DYNLD=ld -shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+STRIP=echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LD=gcc -Wl,-rpath -Wl,${DESTROOT}/lib/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DYNLD=gcc -bundle -bundle_loader ${DESTROOT}/bin/camlrunm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ADDRUNLIBS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ADDRUNCFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ADDDYNLIBCFLAGS=-DLSB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Cygwin 20.1, use:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ---------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/crypt/Makefile ./src/dynlibs/crypt/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/crypt/Makefile 2000-02-16 15:36:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/crypt/Makefile 2008-11-28 15:22:08.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,8 +13,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c -o crypt.o crypt.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcrypt.so: crypt.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DYNLD) -lcrypt -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# $(DYNLD) -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DYNLD) -o libcrypt.so crypt.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp libcrypt.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clean:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f *.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/intinf/Makefile ./src/dynlibs/intinf/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/intinf/Makefile 2000-02-16 15:36:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/intinf/Makefile 2008-12-09 17:58:03.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,12 +5,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to find GMP header file and compiled library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GMPDIR=${HOME}/c/gmp-2.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GMPDIR=/opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GMPINCDIR=${GMPDIR}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GMPLIBDIR=${GMPDIR}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GMPDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GMPINCDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,16 +20,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLLEX=mosmllex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLYACC=mosmlyac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--all: libmgmp.so IntInf.uo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all: libmgmp.so IntInf.uo IntInf.ui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install: all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp libmgmp.so $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp IntInf.uo $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp IntInf.ui $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp IntInf.sig $(LIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- intinf.o: intinf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c -o intinf.o intinf.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmgmp.so: intinf.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DYNLD) -o libmgmp.so intinf.o ${GMPDIR}/libgmp.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DYNLD) -o libmgmp.so intinf.o ${GMPLIBDIR}/libgmp.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mosml testintinf.sml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/mgd/Makefile ./src/dynlibs/mgd/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/mgd/Makefile 2000-02-23 17:11:42.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/mgd/Makefile 2008-11-28 15:44:28.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,12 +5,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to find gd header file and compiled library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GDDIR=${HOME}/c/gd-1.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GDINCDIR=/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GDLIBDIR=/opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTS=-fno-defer-pop
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS=-Dunix -O2 $(OPTS) $(ADDDYNLIBCFLAGS) -I$(INCDIR) -I ${GDINCDIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLTOOLS=camlrunm $(MOSMLHOME)/tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MOSMLC=mosmlc -c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(CFLAGS) -c -o mgd.o mgd.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libmgd.so: mgd.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -L/usr/X11R6/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(DYNLD) -o libmgd.so mgd.o ${GDLIBDIR}/libgd.a -L/usr/X11R6/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $(DYNLD) -o libmgd.so mgd.o ${GDDIR}/libgd.a -R/pack/libs/lib -L/pack/libs/lib -lpng -lz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test: Graphs.uo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/mgdbm/Makefile ./src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/mgdbm/Makefile 2000-02-16 15:36:57.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/mgdbm/Makefile 2008-11-28 15:42:39.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,10 +5,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Where to find GDBM header file and compiled library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GDBMLIBDIR=${HOME}/c/gdbm-1.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GDBMINCDIR=${HOME}/c/gdbm-1.7.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#GDBMLIBDIR=/usr/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#GDBMINCDIR=/usr/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GDBMLIBDIR=/opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GDBMINCDIR=/opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/dynlibs/munix/munix.c ./src/dynlibs/munix/munix.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/dynlibs/munix/munix.c 2000-01-21 10:07:13.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/dynlibs/munix/munix.c 2008-11-28 15:20:53.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,8 +59,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- failwith("EINVAL"); break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EISDIR:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- failwith("EISDIR"); break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case ELIBBAD:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- failwith("ELIBBAD"); break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* case ELIBBAD:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ failwith("ELIBBAD"); break; */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ECHILD:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- failwith("ECHILD"); break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case EINTR:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -urN ../mosml.orig/src/runtime/config.h ./src/runtime/config.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../mosml.orig/src/runtime/config.h 2000-01-21 10:07:13.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/runtime/config.h 2008-12-08 14:59:31.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _config_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__MWERKS__) || defined(THINK_C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__MWERKS__) || defined(THINK_C) || defined(LSB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "m.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "s.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/patch-src-launch-Makefile.diff b/lang/mosml/files/patch-src-launch-Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c8b749c35b8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/patch-src-launch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/launch/Makefile 2006-08-27 16:20:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/launch/Makefile 2006-08-27 16:57:52.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Unix Makefile for launching Moscow ML
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Based on Caml Light (copyright 1993 INRIA)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TRUEBINDIR=/opt/local/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+TRUELIBDIR=/opt/local/lib/mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include ../Makefile.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: mosml mosmlc mosmllex camlexec testprog
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat testprog) > /tmp/testscr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod a+x /tmp/testscr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- then echo "#!$(BINDIR)/camlrunm" > $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ then echo "#!$(TRUEBINDIR)/camlrunm" > $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else ${INSTALL_PROGRAM} camlexec$(EXE) $(LIBDIR)/header; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f /tmp/testscr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,20 +26,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mosml: mosml.tpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" mosml.tpl > mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosml.tpl > mosml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mosmlc: mosmlc.tpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" mosmlc.tpl > mosmlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosmlc.tpl > mosmlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mosmllex: mosmllex.tpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" mosmllex.tpl > mosmllex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" mosmllex.tpl > mosmllex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testprog: testprog.sml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MOSMLC) testprog.sml
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MOSMLL) -noheader -o testprog BasicIO.uo testprog.uo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlexec.c: camlexec.tpl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sed -e "s|LIBDIR|$(LIBDIR)|" -e "s|BINDIR|$(BINDIR)|" camlexec.tpl > camlexec.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed -e "s|LIBDIR|$(TRUELIBDIR)|" -e "s|BINDIR|$(TRUEBINDIR)|" camlexec.tpl > camlexec.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camlexec: camlexec.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(OPTS) -o camlexec$(EXE) camlexec.c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/patch-src-runtime-mosml.c.diff b/lang/mosml/files/patch-src-runtime-mosml.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 93f2cfa8298..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/patch-src-runtime-mosml.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/runtime/mosml.c 2004-01-15 12:02:51.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/runtime/mosml.c 2011-12-05 15:05:54.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -965,8 +965,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef HAS_STRERROR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (!defined(__FreeBSD__) && !defined(linux))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- extern int sys_nerr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- extern char * sys_errlist [];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// extern int sys_nerr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// extern char * sys_errlist [];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern char *realpath();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/files/patch-src-runtime-sys.c.diff b/lang/mosml/files/patch-src-runtime-sys.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aeddebeab10..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/files/patch-src-runtime-sys.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/runtime/sys.c 2000-07-19 23:13:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/runtime/sys.c 2011-12-05 15:01:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,8 +33,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern int sys_nerr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char * sys_errlist [];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// extern int sys_nerr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// extern char * sys_errlist [];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char * error_message(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>