5 files changed, 192 insertions, 0 deletions
diff --git a/lang/metaocaml/files/patch-Makefile b/lang/metaocaml/files/patch-Makefile
new file mode 100644
index 000000000000..298327adc90c
--- /dev/null
+++ b/lang/metaocaml/files/patch-Makefile
@@ -0,0 +1,12 @@
+--- ./Makefile.orig	Thu Jun  9 16:59:57 2005
++++ ./Makefile	Thu Jun  9 17:00:05 2005
+@@ -133,8 +133,7 @@
+   asmcomp/schedgen.cmx asmcomp/scheduling.cmx \
+   asmcomp/emitaux.cmx asmcomp/emit.cmx asmcomp/asmgen.cmx \
+   asmcomp/asmlink.cmx asmcomp/asmlibrarian.cmx asmcomp/asmpackager.cmx \
+-driver/pparse.cmx driver/opterrors.cmx driver/optcompile.cmx \
+-stdlib/hookdynlink.cmx
++driver/pparse.cmx driver/opterrors.cmx driver/optcompile.cmx
+ 
+ TOPLEVEL=driver/pparse.cmo driver/errors.cmo driver/compile.cmo \
+   toplevel/genprintval.cmo toplevel/toploop.cmo \
diff --git a/lang/metaocaml/files/patch-camlp4_man_Makefile b/lang/metaocaml/files/patch-camlp4_man_Makefile
new file mode 100644
index 000000000000..193781dd4bb6
--- /dev/null
+++ b/lang/metaocaml/files/patch-camlp4_man_Makefile
@@ -0,0 +1,21 @@
+--- camlp4/man/Makefile.orig	Sat Nov 22 17:30:44 2003
++++ camlp4/man/Makefile	Sat Nov 22 04:48:25 2003
+@@ -3,7 +3,6 @@
+ include ../config/Makefile
+ 
+ TARGET=camlp4.1
+-ALIASES=camlp4o.1 camlp4r.1 mkcamlp4.1 ocpp.1 camlp4o.opt.1 camlp4r.opt.1
+ 
+ all: $(TARGET)
+ 
+@@ -18,10 +17,6 @@
+ 	if test -n '$(MANDIR)'; then \
+ 	  $(MKDIR) $(MANDIR)/man1 ; \
+ 	  cp $(TARGET) $(MANDIR)/man1/. ; \
+-	  for i in $(ALIASES); do \
+-            rm -f $(MANDIR)/man1/$$i; \
+-            echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \
+-          done; \
+ 	fi
+ 
+ camlp4.1: camlp4.1.tpl
diff --git a/lang/metaocaml/files/patch-configure b/lang/metaocaml/files/patch-configure
new file mode 100644
index 000000000000..b300cbf32078
--- /dev/null
+++ b/lang/metaocaml/files/patch-configure
@@ -0,0 +1,125 @@
+--- configure.orig	Thu Jul 15 16:17:46 2004
++++ configure	Thu Jul 15 16:58:51 2004
+@@ -1113,116 +1113,14 @@
+ x11_include="not found"
+ x11_link="not found"
+ 
+-for dir in \
+-    $x11_include_dir          \
+-                              \
+-    /usr/X11R6/include        \
+-    /usr/include/X11R6        \
+-    /usr/local/X11R6/include  \
+-    /usr/local/include/X11R6  \
+-    /opt/X11R6/include        \
+-                              \
+-    /usr/X11/include          \
+-    /usr/include/X11          \
+-    /usr/local/X11/include    \
+-    /usr/local/include/X11    \
+-    /opt/X11/include          \
+-                              \
+-    /usr/X11R5/include        \
+-    /usr/include/X11R5        \
+-    /usr/local/X11R5/include  \
+-    /usr/local/include/X11R5  \
+-    /usr/local/x11r5/include  \
+-    /opt/X11R5/include        \
+-                              \
+-    /usr/X11R4/include        \
+-    /usr/include/X11R4        \
+-    /usr/local/X11R4/include  \
+-    /usr/local/include/X11R4  \
+-                              \
+-    /usr/X386/include         \
+-    /usr/x386/include         \
+-    /usr/XFree86/include/X11  \
+-                              \
+-    /usr/include              \
+-    /usr/local/include        \
+-    /usr/unsupported/include  \
+-    /usr/athena/include       \
+-    /usr/lpp/Xamples/include  \
+-                              \
+-    /usr/openwin/include      \
+-    /usr/openwin/share/include \
+-    ; \
+-do
+-  if test -f $dir/X11/X.h; then
+-    x11_include=$dir
+-    break
+-  fi
+-done
+-
+-if test "$x11_include" = "not found"; then
+-  x11_try_lib_dir=''
+-else
+-  x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'`
++if [ -n "$x11_include_dir" ]; then
++  x11_include="$x11_include_dir"
+ fi
+ 
+-for dir in \
+-    $x11_lib_dir          \
+-    $x11_try_lib_dir      \
+-                          \
+-    /usr/X11R6/lib        \
+-    /usr/lib/X11R6        \
+-    /usr/local/X11R6/lib  \
+-    /usr/local/lib/X11R6  \
+-    /opt/X11R6/lib        \
+-                          \
+-    /usr/X11/lib          \
+-    /usr/lib/X11          \
+-    /usr/local/X11/lib    \
+-    /usr/local/lib/X11    \
+-    /opt/X11/lib          \
+-                          \
+-    /usr/X11R5/lib        \
+-    /usr/lib/X11R5        \
+-    /usr/local/X11R5/lib  \
+-    /usr/local/lib/X11R5  \
+-    /usr/local/x11r5/lib  \
+-    /opt/X11R5/lib        \
+-                          \
+-    /usr/X11R4/lib        \
+-    /usr/lib/X11R4        \
+-    /usr/local/X11R4/lib  \
+-    /usr/local/lib/X11R4  \
+-                          \
+-    /usr/X386/lib         \
+-    /usr/x386/lib         \
+-    /usr/XFree86/lib/X11  \
+-                          \
+-    /usr/lib              \
+-    /usr/local/lib        \
+-    /usr/unsupported/lib  \
+-    /usr/athena/lib       \
+-    /usr/lpp/Xamples/lib  \
+-    /lib/usr/lib/X11      \
+-                          \
+-    /usr/openwin/lib      \
+-    /usr/openwin/share/lib \
+-    ; \
+-do
+-  if test -f $dir/libX11.a || \
+-     test -f $dir/libX11.so || \
+-     test -f $dir/libX11.dll.a || \
+-     test -f $dir/libX11.sa; then
+-    if test $dir = /usr/lib; then
+-      x11_link="-lX11"
+-    else
+-      x11_link="-L$dir -lX11"
+-      x11_libs="-L$dir"
+-    fi
+-    break
+-  fi
+-done
+-
++if [ -n "$x11_lib_dir" ]; then
++  x11_link="-L$x11_lib_dir -lX11"
++  x11_libs="-L$x11_lib_dir"
++fi
+ 
+ if test "$x11_include" = "not found" || test "$x11_link" = "not found"
+ then
diff --git a/lang/metaocaml/files/patch-ocamldoc_Makefile b/lang/metaocaml/files/patch-ocamldoc_Makefile
new file mode 100644
index 000000000000..544893e26311
--- /dev/null
+++ b/lang/metaocaml/files/patch-ocamldoc_Makefile
@@ -0,0 +1,22 @@
+--- ocamldoc/Makefile.orig	Sat Nov 22 17:38:34 2003
++++ ocamldoc/Makefile	Sat Nov 22 04:34:14 2003
+@@ -40,7 +40,7 @@
+ OCAMLDOC_LIBA=odoc_info.a
+ INSTALL_LIBDIR=$(OCAMLLIB)/ocamldoc
+ INSTALL_BINDIR=$(OCAMLBIN)
+-INSTALL_MANODIR=$(MANDIR)/man3
++INSTALL_MANODIR=$(MANDIR)/mann
+ 
+ INSTALL_MLIS=odoc_info.mli 
+ INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
+@@ -281,7 +281,9 @@
+ 	$(CP) ocamldoc.hva *.cmi $(GENERATORS) $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR)
+ 	$(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR)
+ 	if test -d $(INSTALL_MANODIR); then : ; else $(MKDIR) $(INSTALL_MANODIR); fi
+-	$(CP) stdlib_man/* $(INSTALL_MANODIR)
++	for f in stdlib_man/*; do \
++		$(CP) $$f $(INSTALL_MANODIR)/`basename $$f .3o`.n; \
++	done
+ 
+ installopt:
+ 	if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi
diff --git a/lang/metaocaml/files/patch-stdlib_Makefile b/lang/metaocaml/files/patch-stdlib_Makefile
new file mode 100644
index 000000000000..9ed197b03123
--- /dev/null
+++ b/lang/metaocaml/files/patch-stdlib_Makefile
@@ -0,0 +1,12 @@
+--- stdlib/Makefile.bak	Fri Apr 22 05:04:24 2005
++++ stdlib/Makefile	Fri Apr 22 05:13:40 2005
+@@ -47,8 +47,7 @@
+ 	rm -f std_exit.p.cmi
+ 
+ install:
+-	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \
+-           $(LIBDIR)
++	cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur $(LIBDIR)
+ 
+ installopt: installopt-default installopt-$(PROFILING)
+