summaryrefslogtreecommitdiff
path: root/lang/ocaml/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ocaml/patches')
-rw-r--r--lang/ocaml/patches/patch-aa6
-rw-r--r--lang/ocaml/patches/patch-al30
-rw-r--r--lang/ocaml/patches/patch-am12
-rw-r--r--lang/ocaml/patches/patch-at24
-rw-r--r--lang/ocaml/patches/patch-aw6
-rw-r--r--lang/ocaml/patches/patch-bv14
6 files changed, 45 insertions, 47 deletions
diff --git a/lang/ocaml/patches/patch-aa b/lang/ocaml/patches/patch-aa
index 9b035483943..5328669f175 100644
--- a/lang/ocaml/patches/patch-aa
+++ b/lang/ocaml/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-aa,v 1.7 2006/10/03 21:06:25 adam Exp $
---- asmcomp/i386/emit.mlp.orig 2004-11-30 18:07:11.000000000 +0100
+--- asmcomp/i386/emit.mlp.orig 2006-03-29 16:49:19.000000000 +0200
+++ asmcomp/i386/emit.mlp
-@@ -780,7 +780,7 @@ let emit_profile () =
+@@ -835,7 +835,7 @@ let emit_profile () =
` movl %esp, %ebp\n`;
` pushl %ecx\n`;
` pushl %edx\n`;
diff --git a/lang/ocaml/patches/patch-al b/lang/ocaml/patches/patch-al
index d452f437756..8ee37d75e7f 100644
--- a/lang/ocaml/patches/patch-al
+++ b/lang/ocaml/patches/patch-al
@@ -1,35 +1,25 @@
-$NetBSD: patch-al,v 1.5 2005/03/24 11:32:50 adam Exp $
+$NetBSD: patch-al,v 1.6 2006/10/03 21:06:25 adam Exp $
---- camlp4/camlp4/Makefile.orig 2005-01-31 10:38:53.000000000 +0000
+--- camlp4/camlp4/Makefile.orig 2006-09-12 10:58:10.000000000 +0200
+++ camlp4/camlp4/Makefile
-@@ -71,24 +71,33 @@ compare:
+@@ -73,24 +73,24 @@ EXPORTED = mLast quotation ast2pt pcaml
install:
-$(MKDIR) "$(BINDIR)"
-$(MKDIR) "$(LIBDIR)/camlp4"
- cp $(CAMLP4) "$(BINDIR)/."
-- cp mLast.mli quotation.mli ast2pt.mli pcaml.mli spretty.mli "$(LIBDIR)/camlp4/."
-- cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi "$(LIBDIR)/camlp4/."
-- cp argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
-+ ${BSD_INSTALL_SCRIPT} $(CAMLP4) $(BINDIR)/.
-+ ${BSD_INSTALL_DATA} mLast.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} mLast.cmi $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} quotation.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} quotation.cmi $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} ast2pt.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} ast2pt.cmi $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} pcaml.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} pcaml.cmi $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} spretty.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} spretty.cmi $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} argl.cmi $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} argl.cmo $(LIBDIR)/camlp4/
++ ${BSD_INSTALL_SCRIPT} $(CAMLP4) "$(BINDIR)/."
+ for ext in mli cmi cmo cmx o; do for mod in $(EXPORTED); do \
+- cp $${mod}.$${ext} "$(LIBDIR)/camlp4/."; done; done
++ ${BSD_INSTALL_DATA} $${mod}.$${ext} "$(LIBDIR)/camlp4/."; done; done
+ cp argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
for f in argl.o argl.cmx; do \
if test -r $$f ; then \
- cp $$f "$(LIBDIR)/camlp4/." ; \
+ ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." ; \
fi ; \
done
- cp camlp4.cma $(LIBDIR)/camlp4/.
+- cp camlp4.cma $(LIBDIR)/camlp4/.
++ ${BSD_INSTALL_DATA} camlp4.cma $(LIBDIR)/camlp4/.
for f in camlp4.$(A) camlp4.p.$(A) ; do \
if test -f $$f ; then \
- cp $$f "$(LIBDIR)/camlp4/." && ( cd "$(LIBDIR)/camlp4/." && $(RANLIB) $$f ) ; \
diff --git a/lang/ocaml/patches/patch-am b/lang/ocaml/patches/patch-am
index 11556365857..65520166f2c 100644
--- a/lang/ocaml/patches/patch-am
+++ b/lang/ocaml/patches/patch-am
@@ -1,6 +1,6 @@
-$NetBSD: patch-am,v 1.4 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-am,v 1.5 2006/10/03 21:06:25 adam Exp $
---- camlp4/lib/Makefile.orig 2004-11-30 19:57:03.000000000 +0100
+--- camlp4/lib/Makefile.orig 2006-09-14 17:32:20.000000000 +0200
+++ camlp4/lib/Makefile
@@ -44,19 +44,19 @@ compare:
done
@@ -8,14 +8,14 @@ $NetBSD: patch-am,v 1.4 2006/01/16 09:41:48 adam Exp $
install:
- -$(MKDIR) "$(LIBDIR)/camlp4"
- cp $(TARGET) *.mli "$(LIBDIR)/camlp4/."
-- cp *.cmi "$(LIBDIR)/camlp4/."
-+ -${BSD_INSTALL_DATA_DIR} $(LIBDIR)/camlp4
+- cp *.cmi *.cmo "$(LIBDIR)/camlp4/."
++ -${BSD_INSTALL_DATA_DIR} "$(LIBDIR)/camlp4"
+ ${BSD_INSTALL_DATA} $(TARGET) *.mli "$(LIBDIR)/camlp4/."
-+ ${BSD_INSTALL_DATA} *.cmi "$(LIBDIR)/camlp4/."
++ ${BSD_INSTALL_DATA} *.cmi *.cmo "$(LIBDIR)/camlp4/."
test -f $(TARGET:.cma=.cmxa) && $(MAKE) installopt LIBDIR="$(LIBDIR)" || true
installopt:
- for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx ; do \
+ for f in $(TARGET:.cma=.cmxa) $(TARGET:.cma=.p.cmxa) *.cmx *.o ; do \
- test -f $$f && cp $$f "$(LIBDIR)/camlp4/." || true ; \
+ test -f $$f && ${BSD_INSTALL_DATA} $$f "$(LIBDIR)/camlp4/." || true ; \
done
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index f177f9c8183..2a95524d848 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,6 +1,6 @@
-$NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
+$NetBSD: patch-at,v 1.12 2006/10/03 21:06:25 adam Exp $
---- configure.orig 2006-03-30 10:00:19.000000000 +0000
+--- configure.orig 2006-03-30 12:00:19.000000000 +0200
+++ configure
@@ -483,7 +483,7 @@ mksharedlibrpath=''
@@ -24,7 +24,15 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
i[3456]86-*-darwin*) arch=i386; system=macosx;;
i[3456]86-*-gnu*) arch=i386; system=gnu;;
mips-*-irix6*) arch=mips; system=irix;;
-@@ -672,6 +674,7 @@ case "$arch,$model,$system" in
+@@ -596,6 +598,7 @@ case "$host" in
+ x86_64-*-linux*) arch=amd64; system=linux;;
+ x86_64-*-gnu*) arch=amd64; system=gnu;;
+ x86_64-*-freebsd*) arch=amd64; system=freebsd;;
++ x86_64-*-netbsd*) arch=amd64; system=netbsd;;
+ x86_64-*-openbsd*) arch=amd64; system=openbsd;;
+ esac
+
+@@ -672,6 +675,7 @@ case "$arch,$model,$system" in
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
amd64,*,linux) profiling='prof';;
amd64,*,gnu) profiling='prof';;
@@ -32,7 +40,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
*) profiling='noprof';;
esac
-@@ -1060,6 +1063,7 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1060,6 +1064,7 @@ if test "$pthread_wanted" = "yes"; then
case "$host" in
*-*-solaris*) pthread_link="-lpthread -lposix4";;
*-*-freebsd*) pthread_link="-pthread";;
@@ -40,7 +48,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
*-*-openbsd*) pthread_link="-pthread";;
*) pthread_link="-lpthread";;
esac
-@@ -1107,6 +1111,7 @@ fi
+@@ -1107,6 +1112,7 @@ fi
x11_include="not found"
x11_link="not found"
@@ -48,7 +56,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
for dir in \
$x11_include_dir \
\
-@@ -1153,6 +1158,7 @@ do
+@@ -1153,6 +1159,7 @@ do
break
fi
done
@@ -56,7 +64,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
if test "$x11_include" = "not found"; then
x11_try_lib_dir=''
-@@ -1242,31 +1248,8 @@ dbm_include="not found"
+@@ -1242,31 +1249,8 @@ dbm_include="not found"
dbm_link="not found"
use_gdbm_ndbm=no
@@ -90,7 +98,7 @@ $NetBSD: patch-at,v 1.11 2006/04/30 17:03:20 joerg Exp $
if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
echo "NDBM not found, the \"dbm\" library will not be supported."
else
-@@ -1278,8 +1261,8 @@ else
+@@ -1278,8 +1262,8 @@ else
fi
echo "DBM_INCLUDES=$dbm_include" >> Makefile
echo "DBM_LINK=$dbm_link" >> Makefile
diff --git a/lang/ocaml/patches/patch-aw b/lang/ocaml/patches/patch-aw
index 64891d0797c..bc6ff1eed57 100644
--- a/lang/ocaml/patches/patch-aw
+++ b/lang/ocaml/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.4 2006/01/16 09:41:48 adam Exp $
+$NetBSD: patch-aw,v 1.5 2006/10/03 21:06:25 adam Exp $
---- ocamldoc/Makefile.orig 2005-11-10 15:44:36.000000000 +0100
+--- ocamldoc/Makefile.orig 2006-08-10 14:45:09.000000000 +0200
+++ ocamldoc/Makefile
-@@ -254,24 +254,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
+@@ -258,24 +258,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
# Installation targets
######################
install: dummy
diff --git a/lang/ocaml/patches/patch-bv b/lang/ocaml/patches/patch-bv
index d2d55625181..839dc22a8b0 100644
--- a/lang/ocaml/patches/patch-bv
+++ b/lang/ocaml/patches/patch-bv
@@ -1,15 +1,15 @@
-$NetBSD: patch-bv,v 1.2 2005/09/04 13:57:51 tonio Exp $
+$NetBSD: patch-bv,v 1.3 2006/10/03 21:06:25 adam Exp $
---- camlp4/compile/Makefile.orig 2005-09-03 16:16:48.000000000 +0200
-+++ camlp4/compile/Makefile 2005-09-03 16:18:35.000000000 +0200
-@@ -30,8 +30,8 @@
+--- camlp4/compile/Makefile.orig 2006-09-12 10:58:10.000000000 +0200
++++ camlp4/compile/Makefile
+@@ -30,8 +30,8 @@ $D_fast.ml: compile.cmo $(SRC)
OTOP=$(OTOP) EXE=$(EXE) ./compile.sh $(COMP_OPT) $(SRC) >> $D_fast.ml
install:
- if test -f camlp4$D.fast.opt; then cp camlp4$D.fast.opt $(BINDIR)/camlp4$D.opt$(EXE); fi
-- for TARG in pa_$D_fast.cmi pa_$D_fast.cmo pa_$D_fast.cmx ; do if test -f $$TARG; then cp $$TARG "$(LIBDIR)/camlp4/."; fi; done
-+ if test -f camlp4$D.fast.opt; then ${BSD_INSTALL_PROGRAM} camlp4$D.fast.opt $(BINDIR)/camlp4$D.opt$(EXE); fi
-+ for TARG in pa_$D_fast.cmi pa_$D_fast.cmo pa_$D_fast.cmx ; do if test -f $$TARG; then ${BSD_INSTALL_DATA} $$TARG "$(LIBDIR)/camlp4/."; fi; done
+- for TARG in pa_$D_fast.cmi pa_$D_fast.cmo pa_$D_fast.cmx pa_$D_fast.o ; do if test -f $$TARG; then cp $$TARG "$(LIBDIR)/camlp4/."; fi; done
++ if test -f camlp4$D.fast.opt; then ${BSD_INSTALL_DATA} camlp4$D.fast.opt $(BINDIR)/camlp4$D.opt$(EXE); fi
++ for TARG in pa_$D_fast.cmi pa_$D_fast.cmo pa_$D_fast.cmx pa_$D_fast.o ; do if test -f $$TARG; then ${BSD_INSTALL_DATA} $$TARG "$(LIBDIR)/camlp4/."; fi; done
clean::
rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-08 12:00:50 +0000