summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--lang/Makefile1
-rw-r--r--lang/caml-light/Makefile34
-rw-r--r--lang/caml-light/distinfo2
-rw-r--r--lang/caml-light/files/patch-aa54
-rw-r--r--lang/caml-light/files/patch-ab108
-rw-r--r--lang/caml-light/files/patch-ad9
-rw-r--r--lang/caml-light/files/patch-ae13
-rw-r--r--lang/caml-light/files/patch-af8
-rw-r--r--lang/caml-light/files/patch-ag11
-rw-r--r--lang/caml-light/files/patch-contrib_caml-tex_Makefile15
-rw-r--r--lang/caml-light/files/patch-contrib_camlsearch_doc_Makefile6
-rw-r--r--lang/caml-light/files/patch-contrib_camlsearch_source_Makefile32
-rw-r--r--lang/caml-light/files/patch-contrib_debugger_Makefile29
-rw-r--r--lang/caml-light/files/patch-contrib_libgraph_Makefile38
-rw-r--r--lang/caml-light/files/patch-contrib_libnum_Makefile34
-rw-r--r--lang/caml-light/files/patch-contrib_libnum_bignum_Makefile20
-rw-r--r--lang/caml-light/files/patch-contrib_libstr_Makefile49
-rw-r--r--lang/caml-light/files/patch-contrib_libstr_regex_Makefile.in19
-rw-r--r--lang/caml-light/files/patch-contrib_libunix_Makefile40
-rw-r--r--lang/caml-light/files/patch-contrib_lorder_Makefile36
-rw-r--r--lang/caml-light/files/patch-contrib_mletags_Makefile36
-rw-r--r--lang/caml-light/files/patch-contrib_profiler_Makefile56
-rw-r--r--lang/caml-light/files/patch-src_launch_Makefile29
-rw-r--r--lang/caml-light/files/patch-src_launch_camlc.tpl49
-rw-r--r--lang/caml-light/files/patch-src_launch_camllight.tpl19
-rw-r--r--lang/caml-light/files/patch-src_launch_camlmktop.tpl24
-rw-r--r--lang/caml-light/files/patch-src_runtime_Makefile14
-rw-r--r--lang/caml-light/files/patch-src_yacc_main.c81
-rw-r--r--lang/caml-light/pkg-descr24
-rw-r--r--lang/caml-light/pkg-plist195
31 files changed, 1 insertions, 1085 deletions
diff --git a/MOVED b/MOVED
index 788914296ee1..4e75c4f8beec 100644
--- a/MOVED
+++ b/MOVED
@@ -7026,3 +7026,4 @@ games/alienarena||2014-09-07|Has expired: Not staged
games/alienarena-data||2014-09-07|Useless with alienarena removed
net/libexosip2-legacy|net/libexosip2|2014-09-07|Has expired: Superseded by net/libexosip2
net/libosip|net/libosip2|2014-09-07|Has expired: Superseded by net/libosip2
+lang/caml-light||2014-09-07|Not staged
diff --git a/lang/Makefile b/lang/Makefile
index 9fc8577267ec..c1a7f5ddcfb4 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -22,7 +22,6 @@
SUBDIR += bigloo
SUBDIR += bsh
SUBDIR += bwbasic
- SUBDIR += caml-light
SUBDIR += ccl
SUBDIR += cdent
SUBDIR += cduce
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
deleted file mode 100644
index 11ce92e93a8c..000000000000
--- a/lang/caml-light/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: jkoshy
-# $FreeBSD$
-
-PORTNAME= caml
-PORTVERSION= 0.75
-PORTREVISION= 4
-CATEGORIES= lang elisp
-MASTER_SITES= http://caml.inria.fr/pub/distrib/caml-light-0.75/ \
- ftp://arcadia.informatik.uni-muenchen.de/pub/comp/programming/languages/functional/caml-light/
-
-DISTNAME= cl75unix
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Strongly typed functional language belonging to the ML family
-
-USE_XORG= x11
-WRKSRC= ${WRKDIR}/cl75
-ALL_TARGET= configure world bootstrap
-MAN1= camlc.1 camllex.1 camllibr.1 camllight.1 camlmktop.1 \
- camlrun.1 camlyacc.1 mletags.1 camllorder.1 camlsearch.1
-
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-do-build:
- cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET}
-
-# build some contrib stuff too
-do-install:
- cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
- cd ${WRKSRC}/contrib; ${SETENV} ${MAKE_ENV} ${MAKE} all \
- ${INSTALL_TARGET}
-
-.include <bsd.port.post.mk>
diff --git a/lang/caml-light/distinfo b/lang/caml-light/distinfo
deleted file mode 100644
index e9aac31d40fe..000000000000
--- a/lang/caml-light/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cl75unix.tar.gz) = ac2ad4c7b28716ec3f0e2e24b8b092b99253a573ac8de7da396e08e8bcd10fd2
-SIZE (cl75unix.tar.gz) = 1108206
diff --git a/lang/caml-light/files/patch-aa b/lang/caml-light/files/patch-aa
deleted file mode 100644
index 81b7c3f5b325..000000000000
--- a/lang/caml-light/files/patch-aa
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/Makefile.orig Wed Mar 3 16:25:57 1999
-+++ src/Makefile Sat Aug 5 09:56:37 2006
-@@ -2,14 +2,14 @@
-
- # Which C compiler to use.
- # Performance is often improved if you use gcc 2.x instead of cc.
--CC=gcc
-+#CC=gcc
-
- # Additional options to $(CC).
- # If you are using gcc, add -fno-defer-pop.
- # This option circumvents a gcc bug on some platforms (680x0, 80386).
- # If you are using Linux with libc6 (RedHat 5, Debian 2), add -D__FAVOR_BSD
- # This option avoids signal-related problems.
--OPTS=-fno-defer-pop -D__FAVOR_BSD
-+OPTS=-fno-defer-pop -D__FAVOR_BSD ${CFLAGS}
-
- # Extra libraries that have to be linked with the runtime system.
- # The math library "-lm" is linked by default.
-@@ -26,19 +26,19 @@
- # not all Unix C preprocessors define it.
- # If your cpp is too fussy, make tools/clprepro and use this:
- # CPP=../../src/tools/clprepro -Dunix
--CPP=/lib/cpp -P -traditional -Dunix
-+CPP=/usr/bin/cpp -P -traditional -Dunix ${CPPFLAGS}
-
- # The directory where public executables will be installed
--BINDIR=/usr/local/bin
-+BINDIR=${PREFIX}/bin
-
- # The directory where the Caml Light standard library will be installed
--LIBDIR=/usr/local/lib/caml-light
-+LIBDIR=${PREFIX}/lib/caml-light
-
- # The manual section where the manual pages will be installed
- MANEXT=1
-
- # The directory where the manual pages will be installed
--MANDIR=/usr/local/man/man$(MANEXT)
-+MANDIR=${PREFIX}/man/man$(MANEXT)
-
- # Some "make"s need this to ensure that they call the Bourne shell,
- # not the C shell. Seems harmless on most other "make"s.
-@@ -120,8 +120,8 @@
-
- # Install the Caml Light system
- install:
-- if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi
-- if test -d $(LIBDIR); then : ; else mkdir $(LIBDIR); fi
-+ if test -d $(BINDIR); then : ; else mkdir -p $(BINDIR); fi
-+ if test -d $(LIBDIR); then : ; else mkdir -p $(LIBDIR); fi
- cd runtime; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
- cd launch; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
- cd lib; make BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) install
diff --git a/lang/caml-light/files/patch-ab b/lang/caml-light/files/patch-ab
deleted file mode 100644
index 338db1e2cc21..000000000000
--- a/lang/caml-light/files/patch-ab
+++ /dev/null
@@ -1,108 +0,0 @@
---- contrib/Makefile.orig Sun Nov 12 02:57:42 2000
-+++ contrib/Makefile Sat Aug 5 09:57:42 2006
-@@ -5,24 +5,24 @@
- # Remember that "libunix" is required for
- # "debugger", "libgraph", "camltk", "camltk4", and "search_isos".
- PACKAGES=libunix libgraph debugger libnum libstr mletags \
-- camlmode lorder profiler camltk4 camlsearch
-+ camlmode lorder profiler camlsearch
- # caml-tex
- # caml-latex2e
- # camltk
-
- # Which C compiler to use.
- # Should be the same compiler used to compile the main system (../src).
--CC=gcc
-+#CC=gcc
-
- # Any additional options to $(CC).
--OPTS=
-+OPTS=${CFLAGS}
-
- # How to call the C preprocessor on a file that does not have the .c extension.
- # That's /lib/cpp on most machines, sometimes /usr/bin/cpp,
- # and /usr/ccs/lib/cpp under Solaris.
- # The -P option suppresses the generation of "# linenum" directives,
- # which are not understood by Caml Light.
--CPP=/lib/cpp -P
-+CPP=/usr/bin/cpp -P
-
- # Test to see whether ranlib exists on the machine
- RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
-@@ -31,27 +31,27 @@
- RANLIB=ranlib
-
- # The directory where public executables will be installed
--BINDIR=/usr/local/bin
-+BINDIR=${PREFIX}/bin
-
- # The directory where library files will be installed
--LIBDIR=/usr/local/lib/caml-light
-+LIBDIR=${PREFIX}/lib/caml-light
-
- # The manual section where the manual pages will be installed
- MANEXT=1
-
- # The directory where the manual pages will be installed
--MANDIR=/usr/local/man/man$(MANEXT)
-+MANDIR=${PREFIX}/man/man$(MANEXT)
-
- # The path to the include directory containing the X11/*.h includes
- # (usually /usr/include; for SunOS with OpenLook, /usr/openwin/include)
- # Needed for the "libgraph" and "camltk" packages.
--X11_INCLUDES=/usr/X11R6/include
-+X11_INCLUDES=${LOCALBASE}/include
- #X11_INCLUDES=/usr/include/X11
-
- # The path to the directory containing the X11 libraries.
- # (usually /usr/lib; for SunOS with OpenLook, /usr/openwin/lib)
- # Needed for the "libgraph" and "camltk" packages.
--X11_LIB=/usr/X11R6/lib
-+X11_LIB=${LOCALBASE}/lib
- #X11_LIB=/usr/lib/X11
-
- # Name of the target architecture.
-@@ -68,19 +68,19 @@
-
- # Name of the directory where LaTeX style files should be installed.
- # Needed only for the "caml-tex" and "caml-latex2e" packages.
--TEXINPUTDIR=/usr/lib/texmf/tex/latex/etc
-+TEXINPUTDIR=${PREFIX}/lib/texmf/tex/latex/etc
-
- # Name of the directory where Emacs Lisp files should be installed.
- # Needed only for the "camlmode" package.
--EMACSLISPDIR=/usr/lib/emacs/site-lisp
-+EMACSLISPDIR=${PREFIX}/share/emacs/site-lisp
-
- # Name of the directories where the tcl.h and tk.h includes can be found.
- # Needed only for the "camltk" package.
-
- # /usr/local configuration
- # True64 configuration
--TCLINCLDIR=/usr/local/lib/tcl8.0/include
--TKINCLDIR=/usr/local/lib/tk8.0/include
-+TCLINCLDIR=${LOCALBASE}/lib/tcl8.4/include
-+TKINCLDIR=${LOCALBASE}/lib/tk8.4/include
- # RedHat Linux configuration
- #TCLINCLDIR=/usr/include
- #TKINCLDIR=/usr/include
-@@ -89,8 +89,8 @@
- # Needed only for the "camltk" package.
- # /usr/local configuration
- # True64 Unix configuration
--TKLIBDIR=/usr/local/lib/tk8.0/lib
--TCLLIBDIR=/usr/local/lib/tcl8.0/lib
-+TKLIBDIR=${LOCALBASE}/lib/tk8.4/lib
-+TCLLIBDIR=${LOCALBASE}/lib/tcl8.4/lib
-
- # RedHat Linux configuration
- #TKLIBDIR=/usr/lib
-@@ -100,7 +100,7 @@
- # a custom Tcl/Tk with various extensions (such as Xpm)
- #TKLIBS=-ltk -ltcl -lX11
- # True64 Unix configuration
--TKLIBS=-ltk8.0 -ltcl8.0 -lX11 -lm
-+TKLIBS=-ltk8.4 -ltcl8.4 -lX11 -lm
- # RedHat Linux configuration
- #TKLIBS=-ltk8.0 -ltcl8.0 -lX11 -ldl -lm
-
diff --git a/lang/caml-light/files/patch-ad b/lang/caml-light/files/patch-ad
deleted file mode 100644
index 556877869d9f..000000000000
--- a/lang/caml-light/files/patch-ad
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/man/Makefile.orig Tue Nov 1 20:36:06 1994
-+++ src/man/Makefile Sat Aug 5 09:59:15 2006
-@@ -3,4 +3,5 @@
- MANDIR=/usr/man/man$(MANEXT)
-
- install:
-- for f in $(MAN); do cp $$f $(MANDIR)/`basename $$f .m`.$(MANEXT); done
-+ mkdir -p ${MANDIR}
-+ for f in $(MAN); do ${BSD_INSTALL_MAN} $$f $(MANDIR)/`basename $$f .m`.$(MANEXT); done
diff --git a/lang/caml-light/files/patch-ae b/lang/caml-light/files/patch-ae
deleted file mode 100644
index b5f3ba40814b..000000000000
--- a/lang/caml-light/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- contrib/camlmode/Makefile.orig Mon Dec 2 19:43:37 1996
-+++ contrib/camlmode/Makefile Sat Aug 5 10:00:05 2006
-@@ -11,8 +11,8 @@
- all:
-
- install:
-- cp $(FILES) $(EMACSLISPDIR)
-- dir=`pwd`; cd $(EMACSLISPDIR); $(EMACS) -batch -l $$dir/compile
-+ mkdir -p $(EMACSLISPDIR)
-+ ${BSD_INSTALL_DATA} $(FILES) $(EMACSLISPDIR)
-
- clean:
- rm -f *~ #*#
diff --git a/lang/caml-light/files/patch-af b/lang/caml-light/files/patch-af
deleted file mode 100644
index 24495056b53d..000000000000
--- a/lang/caml-light/files/patch-af
+++ /dev/null
@@ -1,8 +0,0 @@
---- contrib/camlsearch/emacs-lisp/Makefile.orig Sat Feb 4 21:12:23 1995
-+++ contrib/camlsearch/emacs-lisp/Makefile Sat Aug 5 10:00:54 2006
-@@ -1,3 +1,4 @@
- SOURCES=caml-search.el
- install: $(SOURCES)
-- cp $(SOURCES) $(ELISPDIR)
-+ mkdir -p $(ELISPDIR)
-+ ${BSD_INSTALL_DATA} $(SOURCES) $(ELISPDIR)
diff --git a/lang/caml-light/files/patch-ag b/lang/caml-light/files/patch-ag
deleted file mode 100644
index 47642f20b048..000000000000
--- a/lang/caml-light/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/runtime/io.h-- Thu Jan 12 09:59:39 1995
-+++ src/runtime/io.h Sat Aug 2 20:57:13 2003
-@@ -7,6 +7,8 @@
- #include "misc.h"
- #include "mlvalues.h"
-
-+#include <unistd.h>
-+
- #ifndef IO_BUFFER_SIZE
- #define IO_BUFFER_SIZE 4096
- #endif
diff --git a/lang/caml-light/files/patch-contrib_caml-tex_Makefile b/lang/caml-light/files/patch-contrib_caml-tex_Makefile
deleted file mode 100644
index ff1730fe9e6a..000000000000
--- a/lang/caml-light/files/patch-contrib_caml-tex_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- contrib/caml-tex/Makefile.orig Sat Aug 5 10:01:47 2006
-+++ contrib/caml-tex/Makefile Sat Aug 5 10:02:30 2006
-@@ -7,9 +7,9 @@
- all:
-
- install:
-- - cp caml-tex $(BINDIR)/caml-tex
-- - cp caml.sty caml-sl.sty $(TEXINPUTDIR)
-- - cp caml-tex.1 $(MANDIR)/caml-tex.$(MANEXT)
-+ - ${BSD_INSTALL_DATA} caml-tex $(BINDIR)/caml-tex
-+ - ${BSD_INSTALL_DATA} caml.sty caml-sl.sty $(TEXINPUTDIR)
-+ - ${BSD_INSTALL_MAN} caml-tex.1 $(MANDIR)/caml-tex.$(MANEXT)
-
- caml-tex.doc: caml-tex.1
- nroff -man caml-tex.1 | sed -e 's/_//g' > caml-tex.doc
diff --git a/lang/caml-light/files/patch-contrib_camlsearch_doc_Makefile b/lang/caml-light/files/patch-contrib_camlsearch_doc_Makefile
deleted file mode 100644
index 405e6b71593a..000000000000
--- a/lang/caml-light/files/patch-contrib_camlsearch_doc_Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
---- contrib/camlsearch/doc/Makefile-- Thu Dec 22 21:41:25 1994
-+++ contrib/camlsearch/doc/Makefile Sun Aug 6 14:01:43 2006
-@@ -1,2 +1,2 @@
- install:
-- cp camlsearch.l $(MANDIR)/camlsearch.$(MANEXT)
-+ ${BSD_INSTALL_MAN} camlsearch.l $(MANDIR)/camlsearch.$(MANEXT)
diff --git a/lang/caml-light/files/patch-contrib_camlsearch_source_Makefile b/lang/caml-light/files/patch-contrib_camlsearch_source_Makefile
deleted file mode 100644
index a7bf944090c4..000000000000
--- a/lang/caml-light/files/patch-contrib_camlsearch_source_Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
---- contrib/camlsearch/source/Makefile.orig Thu Dec 24 00:36:57 1998
-+++ contrib/camlsearch/source/Makefile Sun Aug 6 14:00:09 2006
-@@ -1,6 +1,6 @@
--CAMLCOMP =camlc -c
--CAMLLEX =camllex
--CAMLYACC =camlyacc
-+CAMLCOMP =${PREFIX}/bin/camlc -c
-+CAMLLEX =${PREFIX}/bin/camllex
-+CAMLYACC =${PREFIX}/bin/camlyacc
- CAMLTEX =../tools/caml-tex-format
- CAMLDETEX =../tools/caml-tex-extract
- COMPFLAGS =-I $(UNIXLIBDIR) -I $(COMPLIBDIR) $(DEBUG) -W
-@@ -25,7 +25,7 @@
-
- # Crée l'executable
- $(NAME): $(OBJS)
-- camlc -custom -g $(LINKFLAGS) -o $(NAME) $(COMPOBJS) $(OBJS) $(UNIXLIBDIR)/libunix.a
-+ ${PREFIX}/bin/camlc -custom -g $(LINKFLAGS) -o $(NAME) $(COMPOBJS) $(OBJS) $(UNIXLIBDIR)/libunix.a
-
- # Formate pour TeX
- report: $(TEXOBJ)
-@@ -33,8 +33,8 @@
-
- # Install CamlSearch
- install: $(NAME)
-- cp $(NAME) $(INSTALLDIR)
-- chmod 755 $(INSTALLDIR)/$(NAME)
-+ ${BSD_INSTALL_SCRIPT} $(NAME) $(INSTALLDIR)
-+
- # Efface les fichiers inutiles
- clean:
- rm -f $(NAME)
diff --git a/lang/caml-light/files/patch-contrib_debugger_Makefile b/lang/caml-light/files/patch-contrib_debugger_Makefile
deleted file mode 100644
index c61f137c04fd..000000000000
--- a/lang/caml-light/files/patch-contrib_debugger_Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./contrib/debugger/Makefile-- Thu Dec 24 00:36:56 1998
-+++ ./contrib/debugger/Makefile Sun Aug 6 11:38:17 2006
-@@ -1,19 +1,19 @@
- # Makefile for the Caml Light debugger
-
- # These options are overriden when called from ../Makefile
--CC=cc
-+#CC=cc
- OPTS=
--LIBDIR=/usr/local/lib/caml-light
--CPP=/lib/cpp -P
-+LIBDIR=${PREFIX}/lib/caml-light
-+CPP=/usr/bin/cpp -P
-
- # Compilation options
--CAMLC=camlc
--CAMLLEX=camllex
--CAMLYACC=camlyacc
-+CAMLC=${PREFIX}/bin/camlc
-+CAMLLEX=${PREFIX}/bin/camllex
-+CAMLYACC=${PREFIX}/bin/camlyacc
- INCLUDES=-I ../libunix -I ../../src/compiler -I ../../src/linker -I ../../src/toplevel
- COMPFLAGS=-W $(INCLUDES)
- LINKFLAGS=$(INCLUDES)
--CFLAGS=$(OPTS) -O -I../../src/runtime
-+CFLAGS+=$(OPTS) -I../../src/runtime
-
- EXTERNOBJS = \
- config.zo globals.zo misc.zo interntl.zo \
diff --git a/lang/caml-light/files/patch-contrib_libgraph_Makefile b/lang/caml-light/files/patch-contrib_libgraph_Makefile
deleted file mode 100644
index 705c0063f8ca..000000000000
--- a/lang/caml-light/files/patch-contrib_libgraph_Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./contrib/libgraph/Makefile-- Thu Dec 24 00:36:55 1998
-+++ ./contrib/libgraph/Makefile Sun Aug 6 11:37:59 2006
-@@ -1,17 +1,17 @@
- # Makefile for the portable graphics library
-
- # These options are overriden when called from ../Makefile
--CC=cc
-+#CC=cc
- OPTS=
--X11_INCLUDES=/usr/include
--X11_LIB=/usr/lib
--CPP=/lib/cpp -P
-+X11_INCLUDES=${LOCALBASE}
-+X11_LIB=${LOCALBASE}/lib
-+CPP=/usr/bin/cpp -P
-
--BINDIR=/usr/local/bin
--LIBDIR=/usr/local/lib/caml-light
-+BINDIR=${PREFIX}/bin
-+LIBDIR=${PREFIX}/lib/caml-light
-
- # Compilation options
--CFLAGS=$(OPTS) -I../../src/runtime -I$(X11_INCLUDES) -O
-+CFLAGS+=$(OPTS) -I../../src/runtime -I$(X11_INCLUDES)
-
- # Test to see whether ranlib exists on the machine
- RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
-@@ -20,8 +20,8 @@
- RANLIB=ranlib
-
- # The Caml Light compilers
--CAMLC=camlc
--CAMLMKTOP=camlmktop
-+CAMLC=${PREFIX}/bin/camlc
-+CAMLMKTOP=${PREFIX}/bin/camlmktop
- COMPFLAGS=-W -I ../libunix
-
- OBJS=open.o draw.o fill.o color.o text.o \
diff --git a/lang/caml-light/files/patch-contrib_libnum_Makefile b/lang/caml-light/files/patch-contrib_libnum_Makefile
deleted file mode 100644
index 60c21f330580..000000000000
--- a/lang/caml-light/files/patch-contrib_libnum_Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./contrib/libnum/Makefile-- Thu Dec 24 00:36:56 1998
-+++ ./contrib/libnum/Makefile Sun Aug 6 11:40:07 2006
-@@ -12,12 +12,12 @@
- RANLIB=ranlib
-
- # Compilation options
--CFLAGS=-O -I../../src/runtime -I./bignum/h
--CAMLC=camlc
-+CFLAGS+=-I../../src/runtime -I./bignum/h
-+CAMLC=${PREFIX}/bin/camlc
- CAMLCOMP=$(CAMLC) -c
- COMPFLAGS=-W #-O fast
--CAMLLIBR=camllibr
--CAMLMKTOP=camlmktop
-+CAMLLIBR=${PREFIX}/bin/camllibr
-+CAMLMKTOP=${PREFIX}/bin/camlmktop
-
- ZOFILES=int_misc.zo fnat.zo nat.zo big_int.zo arith_flags.zo ratio.zo \
- num.zo arith_status.zo
-@@ -43,10 +43,10 @@
- cd bignum; make $(BIGNUM_ARCH) CC="$(CC)"
-
- install:
-- cp libnums.a $(LIBDIR)/libnums.a
-- if $(RANLIBTEST); then cd $(LIBDIR); $(RANLIB) libnums.a; else true; fi
-- cp nums.zo $(ZIFILES) $(LIBDIR)
-- cp camlnum $(LIBDIR)
-+ ${BSD_INSTALL_DATA} libnums.a $(LIBDIR)
-+ if $(RANLIBTEST); then (cd $(LIBDIR); $(RANLIB) libnums.a); else true; fi
-+ ${BSD_INSTALL_DATA} nums.zo $(ZIFILES) $(LIBDIR)
-+ ${BSD_INSTALL_SCRIPT} camlnum $(LIBDIR)
-
- clean:
- rm -f libnums.a *.o *.z[io] camlnum
diff --git a/lang/caml-light/files/patch-contrib_libnum_bignum_Makefile b/lang/caml-light/files/patch-contrib_libnum_bignum_Makefile
deleted file mode 100644
index 872b71cb2e9f..000000000000
--- a/lang/caml-light/files/patch-contrib_libnum_bignum_Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- contrib/libnum/bignum/Makefile.orig Sat Aug 5 10:03:23 2006
-+++ contrib/libnum/bignum/Makefile Sat Aug 5 10:05:03 2006
-@@ -4,7 +4,7 @@
- # modified_on Thu Nov 2 14:23:14 GMT+1:00 1989 by gangnet
- # modified_on Wed Jul 5 10:23:54 GMT+2:00 1989 by bertin
-
--CC = cc
-+#CC = cc
- AR = ar
- RANLIB = ranlib
- RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
-@@ -327,7 +327,7 @@
- rm -f bignum.00.shar
- $(SENDMAIL) $(SENDMAILFLAGS) $(USER) <tosend
- for i in `ls bignum.[0-9][0-9].shar`; \
-- do cp sendmail_header tosend; \
-+ do ${BSD_INSTALL_DATA} sendmail_header tosend; \
- echo $$i | sed -e "s/^bignum0*/Subject: BigNum - Part /" >>tosend; \
- echo "# Remove all text above and including this line." >>tosend; \
- sed -e "s/modified_on/modified_on/g" <$$i >>tosend; \
diff --git a/lang/caml-light/files/patch-contrib_libstr_Makefile b/lang/caml-light/files/patch-contrib_libstr_Makefile
deleted file mode 100644
index 71aa2f6b65d1..000000000000
--- a/lang/caml-light/files/patch-contrib_libstr_Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
---- contrib/libstr/Makefile.orig Thu Dec 24 00:36:56 1998
-+++ contrib/libstr/Makefile Sun Aug 6 15:25:09 2006
-@@ -1,7 +1,7 @@
- # Makefile for the strings library
-
- # These options are overriden when called from ../Makefile
--CC=cc
-+#CC=cc
- OPTS=
-
- # Test to see whether ranlib exists on the machine
-@@ -11,8 +11,8 @@
- RANLIB=ranlib
-
- # Compilation options
--CFLAGS=-O -I$(REGEXLIB) -I../../src/runtime
--CAMLC=camlc
-+CFLAGS=-I$(REGEXLIB) -I../../src/runtime
-+CAMLC=${PREFIX}/bin/camlc
- CAMLCOMP=$(CAMLC) -c
- COMPFLAGS=-W
- REGEXLIB=regex-0.12
-@@ -26,10 +26,10 @@
- if test -f /bin/ranlib -o -f /usr/bin/ranlib; then ranlib libstr.a; fi
-
- camlstr: libstr.a str.zo
-- camlmktop -o camlstr -custom str.zo libstr.a
-+ ${PREFIX}/bin/camlmktop -o camlstr -custom str.zo libstr.a
-
- $(REGEXLIB)/regex.o: $(REGEXLIB)/regex.c $(REGEXLIB)/regex.h
-- cd $(REGEXLIB); CC="$(CC)" sh configure; make
-+ cd $(REGEXLIB); CC="$(CC) $(CFLAGS)" sh configure; make
-
- clean:
- rm -f libstr.a *.o *.zo *.zi camlstr
-@@ -37,10 +37,10 @@
- cd $(REGEXLIB); if test -f Makefile; then make distclean; else exit 0; fi
-
- install:
-- cp libstr.a $(LIBDIR)/libstr.a
-+ ${BSD_INSTALL_DATA} libstr.a $(LIBDIR)
- if $(RANLIBTEST); then cd $(LIBDIR); $(RANLIB) libstr.a; else true; fi
-- cp str.zo str.zi $(LIBDIR)
-- cp camlstr $(LIBDIR)
-+ ${BSD_INSTALL_DATA} str.zo str.zi $(LIBDIR)
-+ ${BSD_INSTALL_SCRIPT} camlstr $(LIBDIR)
-
- .SUFFIXES: .ml .mli .zo .zi .tex
-
diff --git a/lang/caml-light/files/patch-contrib_libstr_regex_Makefile.in b/lang/caml-light/files/patch-contrib_libstr_regex_Makefile.in
deleted file mode 100644
index 2c50beec167a..000000000000
--- a/lang/caml-light/files/patch-contrib_libstr_regex_Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- contrib/libstr/regex-0.12/Makefile.in-- Mon Nov 14 22:09:41 1994
-+++ contrib/libstr/regex-0.12/Makefile.in Sun Aug 6 15:38:53 2006
-@@ -26,13 +26,13 @@
- # -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to
- # the corresponding C procedures). If not -DDEBUG, the macros
- # are used.
--CPPFLAGS =
-+CPPFLAGS ?=
-
- # Likewise, you can override CFLAGS to optimize, use -Wall, etc.
--CFLAGS = -O
-+CFLAGS ?= -O
-
- # Ditto for LDFLAGS and LOADLIBES.
--LDFLAGS =
-+LDFLAGS ?=
- LOADLIBES =
-
- srcdir = @srcdir@
diff --git a/lang/caml-light/files/patch-contrib_libunix_Makefile b/lang/caml-light/files/patch-contrib_libunix_Makefile
deleted file mode 100644
index 3c7e7cc05b82..000000000000
--- a/lang/caml-light/files/patch-contrib_libunix_Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./contrib/libunix/Makefile-- Thu Dec 24 00:36:54 1998
-+++ ./contrib/libunix/Makefile Sun Aug 6 11:42:16 2006
-@@ -3,7 +3,7 @@
- # These options are overriden when called from ../Makefile
- CC=cc
- OPTS=
--LIBDIR=/usr/local/lib/caml-light
-+LIBDIR=${PREFIX}/lib/caml-light
-
- # Test to see whether ranlib exists on the machine
- RANLIBTEST=test -f /usr/bin/ranlib -o -f /bin/ranlib
-@@ -12,11 +12,11 @@
- RANLIB=ranlib
-
- # Compilation options
--CFLAGS=-I../../src/runtime -O $(OPTS)
--CAMLC=camlc
-+CFLAGS+=-I../../src/runtime $(OPTS)
-+CAMLC=${PREFIX}/bin/camlc
- CAMLCOMP=$(CAMLC) -c
- COMPFLAGS=-W
--CAMLMKTOP=camlmktop
-+CAMLMKTOP=${PREFIX}/bin/camlmktop
-
- OBJS=accept.o access.o addrofstr.o alarm.o bind.o chdir.o chmod.o \
- chown.o chroot.o close.o closedir.o connect.o cst2constr.o cstringv.o \
-@@ -51,10 +51,10 @@
- rm -f libunix.a *.o *.zi *.zo lint-blurb camlunix
-
- install:
-- cp libunix.a $(LIBDIR)/libunix.a
-+ ${BSD_INSTALL_DATA} libunix.a $(LIBDIR)
- if $(RANLIBTEST); then cd $(LIBDIR); $(RANLIB) libunix.a; else true; fi
-- cp $(INTF) $(IMPL) $(LIBDIR)
-- cp camlunix $(LIBDIR)
-+ ${BSD_INSTALL_DATA} $(INTF) $(IMPL) $(LIBDIR)
-+ ${BSD_INSTALL_SCRIPT} camlunix $(LIBDIR)
-
- .SUFFIXES: .ml .mli .zo .zi
-
diff --git a/lang/caml-light/files/patch-contrib_lorder_Makefile b/lang/caml-light/files/patch-contrib_lorder_Makefile
deleted file mode 100644
index 49d734d61df3..000000000000
--- a/lang/caml-light/files/patch-contrib_lorder_Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- contrib/lorder/Makefile.orig Thu Dec 24 00:36:56 1998
-+++ contrib/lorder/Makefile Sun Aug 6 12:14:52 2006
-@@ -1,9 +1,9 @@
--MANDIR=/usr/man/man1
--BINDIR=/usr/local/bin
-+MANDIR=${PREFIX}/man/man1
-+BINDIR=${PREFIX}/bin
-
--CPP=/lib/cpp -P -Dunix
-+CPP=/usr/bin/cpp -P -Dunix
-
--CAMLC=camlc
-+CAMLC=${PREFIX}/bin/camlc
- CAMLCOMP=$(CAMLC) -c
- COMPFLAGS=-g -W -I ../../src/compiler
- LINKFLAGS=-g -I ../../src/compiler
-@@ -15,7 +15,7 @@
- all: camllorder
-
- camllorder: $(OBJS)
-- camlc $(LINKFLAGS) -o camllorder $(COMPILEROBJS) $(OBJS)
-+ ${CAMLC} $(LINKFLAGS) -o camllorder $(COMPILEROBJS) $(OBJS)
-
- clean:
- rm -f *.z[oi] camllorder Makefile.bak
-@@ -26,8 +26,8 @@
- rm -f camllorder.tar.Z
-
- install:
-- cp camllorder $(BINDIR)
-- cp camllorder.1 $(MANDIR)
-+ ${BSD_INSTALL_SCRIPT} camllorder $(BINDIR)
-+ ${BSD_INSTALL_MAN} camllorder.1 $(MANDIR)
-
-
- .SUFFIXES :
diff --git a/lang/caml-light/files/patch-contrib_mletags_Makefile b/lang/caml-light/files/patch-contrib_mletags_Makefile
deleted file mode 100644
index 8bf0e04324f0..000000000000
--- a/lang/caml-light/files/patch-contrib_mletags_Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- contrib/mletags/Makefile.orig Thu Dec 24 00:36:56 1998
-+++ contrib/mletags/Makefile Sun Aug 6 12:13:31 2006
-@@ -1,9 +1,9 @@
- # Configuration
--CPP=/lib/cpp -P
--CAMLC=camlc
-+CPP=/usr/bin/cpp -P
-+CAMLC=${PREFIX}/bin/camlc
- CAMLCOMP=$(CAMLC) -c -g
--CAMLLEX=camllex
--CAMLYACC=camlyacc
-+CAMLLEX=${PREFIX}/bin/camllex
-+CAMLYACC=${PREFIX}/bin/camlyacc
-
- COMPFLAGS=-W -O fast
- LINKFLAGS=-g
-@@ -14,7 +14,7 @@
- all: mletags
-
- mletags: $(OBJS)
-- camlc -o mletags $(LINKFLAGS) $(OBJS)
-+ $(CAMLC) -o mletags $(LINKFLAGS) $(OBJS)
-
- lexer.mll: lexer.mlp
- $(CPP) -Dunix lexer.mlp > lexer.mll
-@@ -37,8 +37,8 @@
- compress mletags.tar
-
- install: mletags mletags.man
-- cp mletags $(BINDIR)
-- cp mletags.man $(MANDIR)/mletags.$(MANEXT)
-+ ${BSD_INSTALL_SCRIPT} mletags $(BINDIR)
-+ ${BSD_INSTALL_MAN} mletags.man $(MANDIR)/mletags.$(MANEXT)
-
- TAGS:
- ./mletags *.ml *.mli
diff --git a/lang/caml-light/files/patch-contrib_profiler_Makefile b/lang/caml-light/files/patch-contrib_profiler_Makefile
deleted file mode 100644
index 81f6e3291565..000000000000
--- a/lang/caml-light/files/patch-contrib_profiler_Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
---- contrib/profiler/Makefile.orig Thu Dec 24 00:36:56 1998
-+++ contrib/profiler/Makefile Sun Aug 6 13:57:37 2006
-@@ -1,9 +1,9 @@
--CPP=/lib/cpp -P
-+CPP=/usr/bin/cpp -P
-
--CAMLC=camlc
-+CAMLC=${PREFIX}/bin/camlc
- CAMLCOMP=$(CAMLC) -c
--CAMLLEX=camllex
--CAMLYACC=camlyacc
-+CAMLLEX=${PREFIX}/bin/camllex
-+CAMLYACC=${PREFIX}/bin/camlyacc
-
- COMPFLAGS=-W -g -I ../../src/compiler
- LINKFLAGS=-g -I ../../src/compiler
-@@ -27,7 +27,7 @@
- all: camlpro stdlibp.zo prodump.zo
-
- camlpro: $(OBJS)
-- camlc $(LINKFLAGS) -o camlpro $(COMPILEROBJS) $(OBJS)
-+ ${CAMLC} $(LINKFLAGS) -o camlpro $(COMPILEROBJS) $(OBJS)
-
- camlpro.ml: camlpro.mlp
- @rm -f camlpro.ml
-@@ -35,22 +35,22 @@
- @chmod -w camlpro.ml
-
- prodump.zo: prodump.ml
-- camlc -c -O none prodump.ml
-+ ${CAMLC} -c -O none prodump.ml
-
- stdlibp.zo: profiler.ml profiler.mli io.ml
-- camlc -c -O none profiler.mli
-- camlc -c -O none profiler.ml
-+ ${CAMLC} -c -O none profiler.mli
-+ ${CAMLC} -c -O none profiler.ml
- /bin/rm -f io.mli
- -ln -s ../../src/lib/io.mli ./io.mli
-- camlc -c -O none io.mli
-- camlc -c -O none io.ml
-- camllibr -stdlib ../../src/lib -o stdlibp.zo $(PRO_IMPL)
-+ ${CAMLC} -c -O none io.mli
-+ ${CAMLC} -c -O none io.ml
-+ ${PREFIX}/bin/camllibr -stdlib ../../src/lib -o stdlibp.zo $(PRO_IMPL)
-
- install:
-- cp camlpro $(LIBDIR)/camlinstr
-+ ${BSD_INSTALL_SCRIPT} camlpro $(LIBDIR)/camlinstr
- rm -f $(BINDIR)/camlpro
- ln -s $(LIBDIR)/camlinstr $(BINDIR)/camlpro
-- cp stdlibp.zo prodump.zo profiler.zi $(LIBDIR)
-+ ${BSD_INSTALL_DATA} stdlibp.zo prodump.zo profiler.zi $(LIBDIR)
-
- clean:
- rm -f *.z[oi] camlinstr camlpro io.mli camlpro.ml
diff --git a/lang/caml-light/files/patch-src_launch_Makefile b/lang/caml-light/files/patch-src_launch_Makefile
deleted file mode 100644
index afba4c517322..000000000000
--- a/lang/caml-light/files/patch-src_launch_Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/launch/Makefile.orig 1995-02-22 10:33:26.000000000 +0100
-+++ src/launch/Makefile 2011-11-12 10:26:48.000000000 +0100
-@@ -11,22 +11,15 @@
- # have write permission in the current directory if NFS-mounted...
-
- install:
-- (echo "#!$(BINDIR)/camlrun"; \
-- echo "exit 2"; \
-- cat testprog) > /tmp/testscr
-- chmod a+x /tmp/testscr
-- sh -c 'if sh -c /tmp/testscr 2>/dev/null; \
-- then echo "#!$(BINDIR)/camlrun" > $(LIBDIR)/header; \
-- else cp camlexec $(LIBDIR)/header; \
-- fi'
-- rm -f /tmp/testscr
-+ echo "#!$(BINDIR)/camlrun" > $(LIBDIR)/header
- for script in camlc camllight camlmktop; do \
-- cp $$script $(BINDIR)/$$script; \
-+ ${BSD_INSTALL_SCRIPT} $$script $(BINDIR)/$$script; \
- chmod a+x $(BINDIR)/$$script; \
- done
-
- SEDCOMMANDS=\
-- -e 's|LIBDIR|$(LIBDIR)|' -e 's|CC|$(CC) $(OPTS)|' -e 's|LIBS|$(LIBS)|'
-+ -e 's|LIBDIR|$(LIBDIR)|' -e 's|CC|$(CC) $(OPTS)|' -e 's|LIBS|$(LIBS)|' \
-+ -e 's|BINDIR|$(BINDIR)|'
-
- camlc: camlc.tpl ../version.h
- sed $(SEDCOMMANDS) \
diff --git a/lang/caml-light/files/patch-src_launch_camlc.tpl b/lang/caml-light/files/patch-src_launch_camlc.tpl
deleted file mode 100644
index 6e812a81ab04..000000000000
--- a/lang/caml-light/files/patch-src_launch_camlc.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/launch/camlc.tpl-- Sun Aug 6 12:07:15 2006
-+++ src/launch/camlc.tpl Sun Aug 6 12:00:03 2006
-@@ -1,5 +1,6 @@
- #!/bin/sh
-
-+camlrun=BINDIR/camlrun
- stdlib=LIBDIR
- linkalso=true
- includes=""
-@@ -30,14 +31,14 @@
- if $profile
- then
- $stdlib/camlinstr -m $proflags -stdlib $stdlib $includes $compopt $1 ${1}t || { rc=$?; rm -f ${1}t; exit $rc; }
-- camlrun $stdlib/camlcomp -stdlib $stdlib $includes $compopt ${1}t || { rc=$?; rm -f ${1}t; exit $rc; }
-+ $camlrun $stdlib/camlcomp -stdlib $stdlib $includes $compopt ${1}t || { rc=$?; rm -f ${1}t; exit $rc; }
- rm -f ${1}t
- else
-- camlrun $stdlib/camlcomp -stdlib $stdlib $includes $compopt $1 || exit $?
-+ $camlrun $stdlib/camlcomp -stdlib $stdlib $includes $compopt $1 || exit $?
- fi
- linkfiles="$linkfiles $1";;
- *.mli)
-- camlrun $stdlib/camlcomp -stdlib $stdlib $includes $compopt $1 || exit $?
-+ $camlrun $stdlib/camlcomp -stdlib $stdlib $includes $compopt $1 || exit $?
- ;;
- *.zo)
- linkfiles="$linkfiles $1";;
-@@ -63,9 +64,9 @@
- -v|-version)
- echo "The Caml Light system, version" VERSION
- echo " (standard library from $stdlib)"
-- camlrun -V
-- camlrun $stdlib/camlcomp -version
-- camlrun $stdlib/camllink -version;;
-+ $camlrun -V
-+ $camlrun $stdlib/camlcomp -version
-+ $camlrun $stdlib/camllink -version;;
- -files)
- linkfiles="$linkfiles $1 $2"
- shift;;
-@@ -106,7 +107,7 @@
- done
-
- if $linkalso && test -n "$linkfiles"; then
-- camlrun $stdlib/camllink -stdlib $stdlib $includes $custom $linkopt \
-+ $camlrun $stdlib/camllink -stdlib $stdlib $includes $custom $linkopt \
- -exec $linkout $stdlib/stdlib$p.zo $linkfiles $prodump || exit $?
- if test -n "$custom"; then
- if mv $linkout /tmp/camlcode.$$ \
diff --git a/lang/caml-light/files/patch-src_launch_camllight.tpl b/lang/caml-light/files/patch-src_launch_camllight.tpl
deleted file mode 100644
index 96df7acd6497..000000000000
--- a/lang/caml-light/files/patch-src_launch_camllight.tpl
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/launch/camllight.tpl-- Fri Jun 23 22:28:07 1995
-+++ src/launch/camllight.tpl Sun Aug 6 12:00:50 2006
-@@ -1,6 +1,7 @@
- #!/bin/sh
-
- stdlib=LIBDIR
-+camlrun=BINDIR/camlrun
- includes=""
- options=""
-
-@@ -12,7 +13,7 @@
- while : ; do
- case $1 in
- "")
-- exec camlrun $stdlib/camltop -stdlib $stdlib $includes $options;;
-+ exec $camlrun $stdlib/camltop -stdlib $stdlib $includes $options;;
- -I|-include)
- includes="$includes -I $2"
- shift;;
diff --git a/lang/caml-light/files/patch-src_launch_camlmktop.tpl b/lang/caml-light/files/patch-src_launch_camlmktop.tpl
deleted file mode 100644
index 0f5e9d14ec52..000000000000
--- a/lang/caml-light/files/patch-src_launch_camlmktop.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/launch/camlmktop.tpl-- Mon Feb 24 16:01:07 1997
-+++ src/launch/camlmktop.tpl Sun Aug 6 12:01:27 2006
-@@ -1,5 +1,6 @@
- #!/bin/sh
-
-+camlrun=BINDIR/camlrun
- stdlib=LIBDIR
- linkfiles=""
- custom=""
-@@ -58,11 +59,11 @@
- shift
- done
-
--camlrun $stdlib/provide -stdlib $stdlib $includes $perv > /tmp/camlreq.$$ \
-+$camlrun $stdlib/provide -stdlib $stdlib $includes $perv > /tmp/camlreq.$$ \
- || exit $?
--camlrun $stdlib/camllink -stdlib $stdlib $custom -require /tmp/camlreq.$$ \
-+$camlrun $stdlib/camllink -stdlib $stdlib $custom -require /tmp/camlreq.$$ \
- -exec /tmp/camlout.$$ -g $includes stdlib$p.zo toplib.zo $linkfiles topmain.zo || exit $?
--camlrun $stdlib/expunge $debug /tmp/camlout.$$ $output sys $perv || exit $?
-+$camlrun $stdlib/expunge $debug /tmp/camlout.$$ $output sys $perv || exit $?
- rm -f /tmp/camlreq.$$ /tmp/camlout.$$
- if test -n "$custom"; then
- if mv $output /tmp/camlcode.$$ \
diff --git a/lang/caml-light/files/patch-src_runtime_Makefile b/lang/caml-light/files/patch-src_runtime_Makefile
deleted file mode 100644
index 17d383b2dd06..000000000000
--- a/lang/caml-light/files/patch-src_runtime_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/runtime/Makefile.orig Tue Jun 10 17:54:35 1997
-+++ src/runtime/Makefile Sun Aug 6 15:20:36 2006
-@@ -1,9 +1,9 @@
- # Makefile for the Caml Light runtime system
-
- # These options are overriden when called from ../Makefile.
--CC=cc
-+#CC=cc
- OPTS=#-fno-defer-pop
--CFLAGS=-O2 $(OPTS) -I..
-+CFLAGS=$(OPTS) -I..
- LIBS=
-
- # Test to see whether ranlib exists on the machine
diff --git a/lang/caml-light/files/patch-src_yacc_main.c b/lang/caml-light/files/patch-src_yacc_main.c
deleted file mode 100644
index 78292dece3fb..000000000000
--- a/lang/caml-light/files/patch-src_yacc_main.c
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/yacc/main.c.orig 1995-06-07 15:34:32.000000000 +0200
-+++ src/yacc/main.c 2011-11-12 10:09:52.000000000 +0100
-@@ -1,4 +1,5 @@
- #include <signal.h>
-+#include <stdlib.h> /* for mkstemp(), getenv() */
- #include "defs.h"
-
- char dflag;
-@@ -31,6 +32,11 @@
- char *union_file_name;
- char *verbose_file_name;
-
-+static int action_fd = -1;
-+static int entry_fd = -1;
-+static int text_fd = -1;
-+static int union_fd = -1;
-+
- FILE *action_file; /* a temp file, used to save actions associated */
- /* with rules until the parser is written */
- FILE *entry_file;
-@@ -72,7 +78,6 @@
- extern char *mktemp();
- extern char *getenv();
-
--
- done(k)
- int k;
- {
-@@ -276,11 +281,20 @@
- union_file_name[len + 5] = 'u';
-
- #ifndef NO_UNIX
-- mktemp(action_file_name);
-- mktemp(entry_file_name);
-- mktemp(text_file_name);
-- mktemp(union_file_name);
-+ action_fd = mkstemp(action_file_name);
-+ entry_fd = mkstemp(entry_file_name);
-+ text_fd = mkstemp(text_file_name);
-+ union_fd = mkstemp(union_file_name);
- #endif
-+ if (action_fd < 0)
-+ open_error(action_file_name);
-+ if (entry_fd < 0)
-+ open_error(entry_file_name);
-+ if (text_fd < 0)
-+ open_error(text_file_name);
-+ if (union_fd < 0)
-+ open_error(union_file_name);
-+
-
- len = strlen(file_prefix);
-
-@@ -321,15 +335,15 @@
- open_error(input_file_name);
- }
-
-- action_file = fopen(action_file_name, "w");
-+ action_file = fdopen(action_fd, "w");
- if (action_file == 0)
- open_error(action_file_name);
-
-- entry_file = fopen(entry_file_name, "w");
-+ entry_file = fdopen(entry_fd, "w");
- if (entry_file == 0)
- open_error(entry_file_name);
-
-- text_file = fopen(text_file_name, "w");
-+ text_file = fdopen(text_fd, "w");
- if (text_file == 0)
- open_error(text_file_name);
-
-@@ -345,7 +359,7 @@
- defines_file = fopen(defines_file_name, "w");
- if (defines_file == 0)
- open_error(defines_file_name);
-- union_file = fopen(union_file_name, "w");
-+ union_file = fdopen(union_fd, "w");
- if (union_file == 0)
- open_error(union_file_name);
- }
diff --git a/lang/caml-light/pkg-descr b/lang/caml-light/pkg-descr
deleted file mode 100644
index 9eb8520503f9..000000000000
--- a/lang/caml-light/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Caml is a strongly-typed functional programming language from the
-ML family, close to Standard ML but slightly different.
-
-WWW: http://caml.inria.fr/
-
-The Caml Light system comprises the following parts:
- - An interactive system, based on a read-eval-print loop.
- - A batch compiler and linker, `camlc'. The compiler
- produces standalone executable programs.
- - A medium-sized standard library.
- - A tool to build libraries of frequently-used program modules.
- - A parser generator and a lexical analyzer generator, in the
- style of lex and yacc.
- - Various programming tools:
- - A source-level debugger with replay capabilities (``time travel'').
- - An hypertext browser for modules.
- - A simple Emacs editing mode, plus the ability to run the
- - toplevel or the debugger under Emacs.
- - Search by types on modules.
- - Several interface libraries:
- - Portable graphic primitives (simple line and text drawings).
- - Interface with the Unix system calls.
- - Arbitrary-precision rational arithmetic (extremely efficient).
- - High-level string operations (regular expressions, ...).
diff --git a/lang/caml-light/pkg-plist b/lang/caml-light/pkg-plist
deleted file mode 100644
index 813423bade03..000000000000
--- a/lang/caml-light/pkg-plist
+++ /dev/null
@@ -1,195 +0,0 @@
-bin/camlrun
-bin/camlc
-bin/camllight
-bin/camlmktop
-bin/camllibr
-bin/camllex
-bin/camlyacc
-bin/camldebug
-bin/camlpro
-bin/mletags
-bin/camllorder
-bin/camlsearch
-lib/caml-light/libcaml.a
-lib/caml-light/misc.h
-lib/caml-light/alloc.h
-lib/caml-light/mlvalues.h
-lib/caml-light/config.h
-lib/caml-light/memory.h
-lib/caml-light/header
-lib/caml-light/stdlib.zo
-lib/caml-light/string.ml
-lib/caml-light/stream.ml
-lib/caml-light/stack.ml
-lib/caml-light/sort.ml
-lib/caml-light/set.ml
-lib/caml-light/random.ml
-lib/caml-light/queue.ml
-lib/caml-light/printf.ml
-lib/caml-light/printexc.ml
-lib/caml-light/parsing.ml
-lib/caml-light/pair.ml
-lib/caml-light/map.ml
-lib/caml-light/list.ml
-lib/caml-light/lexing.ml
-lib/caml-light/io.ml
-lib/caml-light/int.ml
-lib/caml-light/hashtbl.ml
-lib/caml-light/genlex.ml
-lib/caml-light/gc.ml
-lib/caml-light/fvect.ml
-lib/caml-light/fstring.ml
-lib/caml-light/format.ml
-lib/caml-light/float.ml
-lib/caml-light/filename.ml
-lib/caml-light/fchar.ml
-lib/caml-light/exc.ml
-lib/caml-light/eq.ml
-lib/caml-light/char.ml
-lib/caml-light/bool.ml
-lib/caml-light/baltree.ml
-lib/caml-light/arg.ml
-lib/caml-light/vect.mli
-lib/caml-light/sys.mli
-lib/caml-light/string.mli
-lib/caml-light/stream.mli
-lib/caml-light/stack.mli
-lib/caml-light/sort.mli
-lib/caml-light/set.mli
-lib/caml-light/ref.mli
-lib/caml-light/random.mli
-lib/caml-light/queue.mli
-lib/caml-light/printf.mli
-lib/caml-light/printexc.mli
-lib/caml-light/parsing.mli
-lib/caml-light/pair.mli
-lib/caml-light/obj.mli
-lib/caml-light/map.mli
-lib/caml-light/list.mli
-lib/caml-light/lexing.mli
-lib/caml-light/camlcomp
-lib/caml-light/io.mli
-lib/caml-light/int.mli
-lib/caml-light/hashtbl.mli
-lib/caml-light/genlex.mli
-lib/caml-light/gc.mli
-lib/caml-light/fvect.mli
-lib/caml-light/fstring.mli
-lib/caml-light/format.mli
-lib/caml-light/float.mli
-lib/caml-light/filename.mli
-lib/caml-light/fchar.mli
-lib/caml-light/exc.mli
-lib/caml-light/eq.mli
-lib/caml-light/char.mli
-lib/caml-light/bool.mli
-lib/caml-light/baltree.mli
-lib/caml-light/arg.mli
-lib/caml-light/vect.zix
-lib/caml-light/string.zix
-lib/caml-light/stream.zix
-lib/caml-light/stack.zix
-lib/caml-light/set.zix
-lib/caml-light/sort.zix
-lib/caml-light/random.zix
-lib/caml-light/queue.zix
-lib/caml-light/printf.zix
-lib/caml-light/printexc.zix
-lib/caml-light/parsing.zix
-lib/caml-light/pair.zix
-lib/caml-light/map.zix
-lib/caml-light/list.zix
-lib/caml-light/lexing.zix
-lib/caml-light/io.zix
-lib/caml-light/int.zix
-lib/caml-light/hashtbl.zix
-lib/caml-light/genlex.zix
-lib/caml-light/gc.zix
-lib/caml-light/fvect.zix
-lib/caml-light/fstring.zix
-lib/caml-light/format.zix
-lib/caml-light/float.zix
-lib/caml-light/filename.zix
-lib/caml-light/fchar.zix
-lib/caml-light/exc.zix
-lib/caml-light/eq.zix
-lib/caml-light/char.zix
-lib/caml-light/bool.zix
-lib/caml-light/baltree.zix
-lib/caml-light/arg.zix
-lib/caml-light/vect.zi
-lib/caml-light/toplevel.zi
-lib/caml-light/sys.zi
-lib/caml-light/string.zi
-lib/caml-light/stream.zi
-lib/caml-light/stack.zi
-lib/caml-light/sort.zi
-lib/caml-light/set.zi
-lib/caml-light/ref.zi
-lib/caml-light/random.zi
-lib/caml-light/queue.zi
-lib/caml-light/printf.zi
-lib/caml-light/printexc.zi
-lib/caml-light/parsing.zi
-lib/caml-light/pair.zi
-lib/caml-light/obj.zi
-lib/caml-light/map.zi
-lib/caml-light/list.zi
-lib/caml-light/lexing.zi
-lib/caml-light/iparsing.zi
-lib/caml-light/io.zi
-lib/caml-light/int.zi
-lib/caml-light/hashtbl.zi
-lib/caml-light/genlex.zi
-lib/caml-light/gc.zi
-lib/caml-light/fvect.zi
-lib/caml-light/fstring.zi
-lib/caml-light/format.zi
-lib/caml-light/float.zi
-lib/caml-light/filename.zi
-lib/caml-light/fchar.zi
-lib/caml-light/exc.zi
-lib/caml-light/eq.zi
-lib/caml-light/char.zi
-lib/caml-light/bool.zi
-lib/caml-light/baltree.zi
-lib/caml-light/arg.zi
-lib/caml-light/vect.ml
-lib/caml-light/camllink
-lib/caml-light/camltop
-lib/caml-light/toplevel.mli
-lib/caml-light/provide
-lib/caml-light/expunge
-lib/caml-light/toplib.zo
-lib/caml-light/topmain.zo
-lib/caml-light/camlmsgs.txt
-lib/caml-light/libunix.a
-lib/caml-light/unix.zo
-lib/caml-light/unix.zi
-lib/caml-light/camlunix
-lib/caml-light/libgraph.a
-lib/caml-light/graphics.zo
-lib/caml-light/graphics.zi
-lib/caml-light/camlgraph
-lib/caml-light/libnums.a
-lib/caml-light/nat.zi
-lib/caml-light/ratio.zi
-lib/caml-light/num.zi
-lib/caml-light/arith_status.zi
-lib/caml-light/fnat.zi
-lib/caml-light/big_int.zi
-lib/caml-light/nums.zo
-lib/caml-light/camlnum
-lib/caml-light/libstr.a
-lib/caml-light/str.zi
-lib/caml-light/str.zo
-lib/caml-light/camlstr
-lib/caml-light/camlinstr
-lib/caml-light/profiler.zi
-lib/caml-light/prodump.zo
-lib/caml-light/stdlibp.zo
-share/emacs/site-lisp/camldebug.el
-share/emacs/site-lisp/inf-caml.el
-share/emacs/site-lisp/caml.el
-share/emacs/site-lisp/caml-search.el
-@dirrm lib/caml-light