summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authoradam <adam>2005-03-24 11:32:50 +0000
committeradam <adam>2005-03-24 11:32:50 +0000
commit49cc44c3470df1446e60214ed77890932c9ac240 (patch)
tree51b62955539c24a9958a09eb5151e1f3884749d6 /lang/ocaml
parent40270d9dc2a72d8ba87b96533d1bfec3ac9c71aa (diff)
downloadpkgsrc-49cc44c3470df1446e60214ed77890932c9ac240.tar.gz
Changes 3.08.3:
New features: - support for ocamlopt -pack under Mac OS X (PR#2634, PR#3320) - ignore unknown warning options for forward and backward compatibility - runtime: export caml_compare_unordered (PR#3479) - camlp4: install argl.* files (PR#3439) - ocamldoc: add -man-section option - labltk: add the "solid" relief option (PR#3343) - compiler: ocamlc -i now prints variance annotations Bug fixes: - typing: fix unsoundness in type declaration variance inference. Type parameters which are constrained must now have an explicit variant annotation, otherwise they are invariant. This is not backward compatible, so this might break code which either uses subtyping or uses the relaxed value restriction (i.e. was not typable before 3.07) - typing: erroneous partial match warning for polymorphic variants (PR#3424) - runtime: handle the case of an empty command line (PR#3409, PR#3444) - stdlib: make Sys.executable_name an absolute path in native code (PR#3303) - runtime: fix memory leak in finalise.c - runtime: auto-trigger compaction even if gc is called manually (PR#3392) - stdlib: fix segfault in Obj.dup on zero-sized values (PR#3406) - camlp4: correct parsing of the $ identifier (PR#3310, PR#3469) - windows (MS tools): use link /lib instead of lib (PR#3333) - windows (MS tools): change default install destination - autoconf: better checking of SSE2 instructions (PR#3329, PR#3330) - graphics: make close_graph close the X display as well as the window (PR#3312) - num: fix big_int_of_string (empty string) (PR#3483) - num: fix big bug on 64-bit architecture (PR#3299) - str: better documentation of string_match and string_partial_match (PR#3395) - unix: fix file descriptor leak in Unix.accept (PR#3423) - unix: miscellaneous clean-ups - unix: fix documentation of Unix.tm (PR#3341) - graphics: fix problem when allocating lots of images under Windows (PR#3433) - compiler: fix error message with -pack when .cmi is missing (PR#3028) - cygwin: fix problem with compilation of camlheader (PR#3485) - stdlib: Filename.basename doesn't return an empty string any more (PR#3451) - stdlib: better documentation of Open_excl flag (PR#3450) - ocamlcp: accept -thread option (PR#3511) - ocamldep: handle spaces in file names (PR#3370) - compiler: remove spurious warning in pattern-matching on variants (PR#3424) - windows: better handling of InterpreterPath registry entry (PR#3334, PR#3432)
Diffstat (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/Makefile.common7
-rw-r--r--lang/ocaml/PLIST8
-rw-r--r--lang/ocaml/PLIST.opt4
-rw-r--r--lang/ocaml/distinfo35
-rw-r--r--lang/ocaml/patches/patch-aa8
-rw-r--r--lang/ocaml/patches/patch-ag13
-rw-r--r--lang/ocaml/patches/patch-aj17
-rw-r--r--lang/ocaml/patches/patch-al28
-rw-r--r--lang/ocaml/patches/patch-at14
-rw-r--r--lang/ocaml/patches/patch-ax17
-rw-r--r--lang/ocaml/patches/patch-ay17
-rw-r--r--lang/ocaml/patches/patch-ba14
-rw-r--r--lang/ocaml/patches/patch-bm17
-rw-r--r--lang/ocaml/patches/patch-bn17
-rw-r--r--lang/ocaml/patches/patch-bp17
-rw-r--r--lang/ocaml/patches/patch-bq17
-rw-r--r--lang/ocaml/patches/patch-bs18
-rw-r--r--lang/ocaml/patches/patch-bu17
18 files changed, 193 insertions, 92 deletions
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 3c882b2f59c..3873bfe8a2e 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2005/03/18 18:17:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/03/24 11:32:50 adam Exp $
-DISTNAME= ocaml-3.08.2
+DISTNAME= ocaml-3.08.3
CATEGORIES= lang
-MASTER_SITES= ftp://ftp.inria.fr/INRIA/cristal/ocaml/ocaml-3.08/
+MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.08/
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://caml.inria.fr/ocaml/
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index aa609e1506a..632be60943d 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/02/04 21:35:51 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.12 2005/03/24 11:32:50 adam Exp $
bin/camlp4
bin/camlp4o
bin/camlp4r
@@ -42,8 +42,8 @@ lib/ocaml/callback.mli
lib/ocaml/caml/alloc.h
lib/ocaml/caml/bigarray.h
lib/ocaml/caml/callback.h
-lib/ocaml/caml/config.h
lib/ocaml/caml/compatibility.h
+lib/ocaml/caml/config.h
lib/ocaml/caml/custom.h
lib/ocaml/caml/fail.h
lib/ocaml/caml/intext.h
@@ -57,6 +57,8 @@ lib/ocaml/camlheader_ur
lib/ocaml/camlinternalOO.cmi
lib/ocaml/camlinternalOO.ml
lib/ocaml/camlinternalOO.mli
+lib/ocaml/camlp4/argl.cmi
+lib/ocaml/camlp4/argl.cmo
lib/ocaml/camlp4/ast2pt.cmi
lib/ocaml/camlp4/ast2pt.mli
lib/ocaml/camlp4/camlp4.cma
@@ -341,9 +343,9 @@ lib/ocaml/vmthreads/mutex.mli
lib/ocaml/vmthreads/stdlib.cma
lib/ocaml/vmthreads/thread.cmi
lib/ocaml/vmthreads/thread.mli
-lib/ocaml/vmthreads/threads.cma
lib/ocaml/vmthreads/threadUnix.cmi
lib/ocaml/vmthreads/threadUnix.mli
+lib/ocaml/vmthreads/threads.cma
lib/ocaml/vmthreads/unix.cma
lib/ocaml/weak.cmi
lib/ocaml/weak.ml
diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt
index 8b43be6b266..1336caf57d6 100644
--- a/lang/ocaml/PLIST.opt
+++ b/lang/ocaml/PLIST.opt
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.8 2005/02/04 21:35:51 adrianp Exp $
+@comment $NetBSD: PLIST.opt,v 1.9 2005/03/24 11:32:50 adam Exp $
bin/camlp4o.opt
bin/camlp4r.opt
bin/ocamlc.opt
@@ -19,6 +19,8 @@ lib/ocaml/bigarray.cmxa
lib/ocaml/buffer.cmx
lib/ocaml/callback.cmx
lib/ocaml/camlinternalOO.cmx
+lib/ocaml/camlp4/argl.cmx
+lib/ocaml/camlp4/argl.o
lib/ocaml/camlp4/camlp4.a
lib/ocaml/camlp4/camlp4.cmxa
lib/ocaml/camlp4/extfold.cmx
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index f2bb91a859c..dee9c9ad301 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,29 +1,30 @@
-$NetBSD: distinfo,v 1.26 2005/02/24 09:03:09 agc Exp $
+$NetBSD: distinfo,v 1.27 2005/03/24 11:32:50 adam Exp $
-SHA1 (ocaml-3.08.2.tar.gz) = dc0d1ea4bbf0fb714b693621ec7f0b6cfd4eb354
-RMD160 (ocaml-3.08.2.tar.gz) = 9262c5104cc5c2e4c95bebbb1b31d0005c3c5774
-Size (ocaml-3.08.2.tar.gz) = 2437387 bytes
-SHA1 (patch-aa) = 29b692a7987fb886f5159b2b95044c7e0f2ef76b
+SHA1 (ocaml-3.08.3.tar.bz2) = 2ebbc72faea2ae8b96a42c489ecbcf34df9dbe76
+RMD160 (ocaml-3.08.3.tar.bz2) = 83fcab89371f228c35d826eb204c80e3380ddf27
+Size (ocaml-3.08.3.tar.bz2) = 2026597 bytes
+SHA1 (patch-aa) = 3f8945cac58be358ef4e3e15b6fc2d1ddf43d8be
SHA1 (patch-ac) = b8920fe365e02d2db3fee53afdce368af98941e3
+SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1
SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
SHA1 (patch-ai) = a63857c935bf09a9c8d621aa67ef3a13ca4bbd20
-SHA1 (patch-aj) = e2b0cec6eede0eaee928fdf222fad46d64f648c1
+SHA1 (patch-aj) = 4a121fd01719b1beec94e72d545e46d789cc22d9
SHA1 (patch-ak) = 3d87b50076c00f1ffa14754824e783949c2a57a9
-SHA1 (patch-al) = 237cfbe9489b9969402dad63ef1586bc5b162d3b
+SHA1 (patch-al) = 3e70780d3f32c0fdcded63efa5304a61592c688c
SHA1 (patch-am) = ec1b31021a4c6904360d714adea7056b615f0932
SHA1 (patch-an) = 535dd56444e1bb4c1ca68898610b00208693d9f7
SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998
SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86
SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222
SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5
-SHA1 (patch-at) = c78e94bf87a900c0267729e5635715da56b20989
+SHA1 (patch-at) = 1d18a9e0f3e5a4000d834a0716a8baae22ba7a7d
SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930
SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
SHA1 (patch-aw) = d04e90deb9b13ecd67b2653623ed4c2039d348af
-SHA1 (patch-ax) = 81843d235df97e5cea6344af14f2b9b0f74cd48c
-SHA1 (patch-ay) = 538b5d0aa3353add40f72714ca0d8edc413aa867
+SHA1 (patch-ax) = f9fb031e4ab7c5d5fc27bfe6ad69942d92fc6776
+SHA1 (patch-ay) = ae0fcda810e61967f879f4f18cb17de291f7834b
SHA1 (patch-az) = 7ef66ce5ac11a5012f30db3161b1aadcd8c55c7e
-SHA1 (patch-ba) = 621471e4725b848537fe9995d9752d5652966dde
+SHA1 (patch-ba) = f9dfb3a88438145055f0caa25b7c6a9b5cb377c7
SHA1 (patch-bb) = d60cca088fa92cf15a4d46d53dd42ed84f851f9c
SHA1 (patch-bc) = 4aa365ca555e01955c7787588a4effeacca7b8b0
SHA1 (patch-bd) = 2ab20ead8779de1f2eb77d3504e89d182f39a63d
@@ -33,13 +34,13 @@ SHA1 (patch-bg) = 760ab3521c7cc9cc573799f6d499e926502354c2
SHA1 (patch-bh) = ea8d3a21f1957af3c048f8b586df7b4aec50f58a
SHA1 (patch-bi) = 93b0700588ef5e34d28f2fe06bc5974290822708
SHA1 (patch-bk) = ed30ca7afe04ff89c7a5ef8384d37c4f68e9efe7
-SHA1 (patch-bm) = 0a0502e94410ebc30a925974150f32c35a3b40b2
-SHA1 (patch-bn) = 2a1fca93f0747eb6e1f2330893b50ee0d2496625
+SHA1 (patch-bm) = fccbd39eb43088da8363687b6757db6fe3abb10d
+SHA1 (patch-bn) = e8970e19c8be0d8ec5fda67677a783b7ce82507b
SHA1 (patch-bo) = 322c322336d44a0d9c0bd8f1582d56ff873bd7e4
-SHA1 (patch-bp) = 46501689da1c77a85761b7b41c40b45a14f18230
-SHA1 (patch-bq) = f51ea79a7682aa64a2a4ca09a34a0fb1439361db
+SHA1 (patch-bp) = 45038c5900aefdb8d21b8c3d3b8798b45014bae2
+SHA1 (patch-bq) = 88ce7c503d9f6f5ebcc2f944c420aa1c01c3baee
SHA1 (patch-br) = d91f952083102dff8d161056f4c2895063d38b8d
-SHA1 (patch-bs) = cd0edb5ad01c93bcac8edfad874238bc7bf2a340
+SHA1 (patch-bs) = 680bdf1278a5bea369f7fcec61c91e2905c86b0f
SHA1 (patch-bt) = be4212ecdf6a8eb8c2d22bdd75b328e938c883b5
-SHA1 (patch-bu) = e5230aaaccb60d3db0efcde9897bc00b41b5071c
+SHA1 (patch-bu) = df80c076248e1ad1ab6eae195bda724ea354a55e
SHA1 (patch-bv) = 1627a57f513a88f0933c3188acfdf7a822864662
diff --git a/lang/ocaml/patches/patch-aa b/lang/ocaml/patches/patch-aa
index 1ede31ba943..e01b5dc8cb0 100644
--- a/lang/ocaml/patches/patch-aa
+++ b/lang/ocaml/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-aa,v 1.5 2005/03/24 11:32:50 adam Exp $
---- asmcomp/i386/emit.mlp.orig 2004-10-10 22:25:58.000000000 +0100
-+++ asmcomp/i386/emit.mlp 2004-10-10 22:26:21.000000000 +0100
-@@ -771,7 +771,7 @@
+--- asmcomp/i386/emit.mlp.orig 2004-05-03 12:46:50.000000000 +0000
++++ asmcomp/i386/emit.mlp
+@@ -775,7 +775,7 @@ let emit_profile () =
` movl %esp, %ebp\n`;
` pushl %ecx\n`;
` pushl %edx\n`;
diff --git a/lang/ocaml/patches/patch-ag b/lang/ocaml/patches/patch-ag
new file mode 100644
index 00000000000..7f12722d940
--- /dev/null
+++ b/lang/ocaml/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.4 2005/03/24 11:32:50 adam Exp $
+
+--- yacc/Makefile.orig 2005-03-24 11:39:56.000000000 +0000
++++ yacc/Makefile
+@@ -17,7 +17,7 @@
+ include ../config/Makefile
+
+ CC=$(BYTECC)
+-CFLAGS=-O -DNDEBUG $(BYTECCCOMPOPTS)
++CFLAGS+=-DNDEBUG $(BYTECCCOMPOPTS)
+
+ OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \
+ skeleton.o symtab.o verbose.o warshall.o
diff --git a/lang/ocaml/patches/patch-aj b/lang/ocaml/patches/patch-aj
index d96640913a8..63ab90e1dd7 100644
--- a/lang/ocaml/patches/patch-aj
+++ b/lang/ocaml/patches/patch-aj
@@ -1,8 +1,17 @@
-$NetBSD: patch-aj,v 1.4 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-aj,v 1.5 2005/03/24 11:32:50 adam Exp $
---- byterun/Makefile.orig 2004-07-16 17:11:33.000000000 +0100
-+++ byterun/Makefile 2004-10-15 16:08:41.000000000 +0100
-@@ -48,14 +48,14 @@
+--- byterun/Makefile.orig 2004-08-20 15:11:36.000000000 +0000
++++ byterun/Makefile
+@@ -16,7 +16,7 @@
+ include ../config/Makefile
+
+ CC=$(BYTECC)
+-CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS)
++CFLAGS+=-DCAML_NAME_SPACE $(BYTECCCOMPOPTS)
+ DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS)
+
+ OBJS=interp.o misc.o stacks.o fix_code.o startup.o main.o \
+@@ -48,14 +48,14 @@ ocamlrund$(EXE): libcamlrund.a prims.o
prims.o libcamlrund.a $(BYTECCLIBS)
install:
diff --git a/lang/ocaml/patches/patch-al b/lang/ocaml/patches/patch-al
index e7baa297b54..d452f437756 100644
--- a/lang/ocaml/patches/patch-al
+++ b/lang/ocaml/patches/patch-al
@@ -1,27 +1,35 @@
-$NetBSD: patch-al,v 1.4 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-al,v 1.5 2005/03/24 11:32:50 adam Exp $
---- camlp4/camlp4/Makefile.orig 2004-10-14 16:06:37.000000000 +0100
-+++ camlp4/camlp4/Makefile 2004-10-14 16:10:46.000000000 +0100
-@@ -71,18 +71,26 @@
+--- camlp4/camlp4/Makefile.orig 2005-01-31 10:38:53.000000000 +0000
++++ camlp4/camlp4/Makefile
+@@ -71,24 +71,33 @@ compare:
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 camlp4.cma $(LIBDIR)/camlp4/.
+- cp argl.cmi argl.cmo "$(LIBDIR)/camlp4/."
+ ${BSD_INSTALL_SCRIPT} $(CAMLP4) $(BINDIR)/.
+ ${BSD_INSTALL_DATA} mLast.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} quotation.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} ast2pt.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} pcaml.mli $(LIBDIR)/camlp4/
-+ ${BSD_INSTALL_DATA} spretty.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} camlp4.cma $(LIBDIR)/camlp4/
++ ${BSD_INSTALL_DATA} argl.cmi $(LIBDIR)/camlp4/
++ ${BSD_INSTALL_DATA} 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/.
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-at b/lang/ocaml/patches/patch-at
index f00f3856994..b05c7aed4be 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.4 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-at,v 1.5 2005/03/24 11:32:50 adam Exp $
---- configure.orig Tue Jan 25 20:13:20 2005
-+++ configure Tue Jan 25 20:16:11 2005
-@@ -573,6 +573,7 @@
+--- configure.orig 2005-01-24 15:22:46.000000000 +0000
++++ configure
+@@ -573,6 +573,7 @@ case "$host" in
i[3456]86-*-solaris*) arch=i386; system=solaris;;
i[3456]86-*-beos*) arch=i386; system=beos;;
i[3456]86-*-cygwin*) arch=i386; system=cygwin;;
@@ -10,7 +10,7 @@ $NetBSD: patch-at,v 1.4 2005/02/04 21:35:51 adrianp Exp $
mips-*-irix6*) arch=mips; system=irix;;
hppa1.1-*-hpux*) arch=hppa; system=hpux;;
hppa2.0*-*-hpux*) arch=hppa; system=hpux;;
-@@ -657,6 +658,7 @@
+@@ -657,6 +658,7 @@ case "$arch,$model,$system" in
profiling='prof'
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
amd64,*,linux) profiling='prof';;
@@ -18,7 +18,7 @@ $NetBSD: patch-at,v 1.4 2005/02/04 21:35:51 adrianp Exp $
*) profiling='noprof';;
esac
-@@ -1113,6 +1115,7 @@
+@@ -1123,6 +1125,7 @@ fi
x11_include="not found"
x11_link="not found"
@@ -26,7 +26,7 @@ $NetBSD: patch-at,v 1.4 2005/02/04 21:35:51 adrianp Exp $
for dir in \
$x11_include_dir \
\
-@@ -1159,6 +1162,7 @@
+@@ -1169,6 +1172,7 @@ do
break
fi
done
diff --git a/lang/ocaml/patches/patch-ax b/lang/ocaml/patches/patch-ax
index 4dee29ee7de..cd3a7cb823f 100644
--- a/lang/ocaml/patches/patch-ax
+++ b/lang/ocaml/patches/patch-ax
@@ -1,8 +1,17 @@
-$NetBSD: patch-ax,v 1.1 2004/04/22 09:18:40 tron Exp $
+$NetBSD: patch-ax,v 1.2 2005/03/24 11:32:50 adam Exp $
---- otherlibs/bigarray/Makefile.orig Thu Jun 27 13:36:00 2002
-+++ otherlibs/bigarray/Makefile Thu Apr 22 10:34:37 2004
-@@ -41,13 +41,13 @@
+--- otherlibs/bigarray/Makefile.orig 2002-06-27 11:36:00.000000000 +0000
++++ otherlibs/bigarray/Makefile
+@@ -16,7 +16,7 @@
+ include ../../config/Makefile
+
+ CC=$(BYTECC)
+-CFLAGS=-I../../byterun -g -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS+=-I../../byterun -g $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ CAMLC=../../ocamlcomp.sh -I ../unix
+ CAMLOPT=../../ocamlcompopt.sh -I ../unix
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+@@ -41,13 +41,13 @@ bigarray.cmxa: $(CAML_OBJS:.cmo=.cmx)
$(CAML_OBJS:.cmo=.cmx)
install:
diff --git a/lang/ocaml/patches/patch-ay b/lang/ocaml/patches/patch-ay
index 7f2528bf65f..5026a190c87 100644
--- a/lang/ocaml/patches/patch-ay
+++ b/lang/ocaml/patches/patch-ay
@@ -1,8 +1,17 @@
-$NetBSD: patch-ay,v 1.1 2004/04/22 09:18:40 tron Exp $
+$NetBSD: patch-ay,v 1.2 2005/03/24 11:32:50 adam Exp $
---- otherlibs/dbm/Makefile.orig Thu Jun 27 13:36:01 2002
-+++ otherlibs/dbm/Makefile Thu Apr 22 10:34:37 2004
-@@ -47,13 +47,13 @@
+--- otherlibs/dbm/Makefile.orig 2002-06-27 11:36:01.000000000 +0000
++++ otherlibs/dbm/Makefile
+@@ -24,7 +24,7 @@ CAMLOPT=../../ocamlcompopt.sh
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+ COMPFLAGS=-warn-error A
+
+-CFLAGS=$(DBM_INCLUDES) -I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS+=$(DBM_INCLUDES) -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ COBJS=cldbm.o
+
+ all: libmldbm.a dbm.cmi dbm.cma
+@@ -47,13 +47,13 @@ clean: partialclean
rm -f *.a *.o *.so
install:
diff --git a/lang/ocaml/patches/patch-ba b/lang/ocaml/patches/patch-ba
index f1d801418be..ede411eea6f 100644
--- a/lang/ocaml/patches/patch-ba
+++ b/lang/ocaml/patches/patch-ba
@@ -1,21 +1,23 @@
-$NetBSD: patch-ba,v 1.3 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-ba,v 1.4 2005/03/24 11:32:50 adam Exp $
---- otherlibs/graph/Makefile.orig 2003-08-05 14:39:33.000000000 +0100
-+++ otherlibs/graph/Makefile 2005-01-13 16:14:53.000000000 +0000
-@@ -19,9 +19,9 @@
+--- otherlibs/graph/Makefile.orig 2003-08-05 13:39:33.000000000 +0000
++++ otherlibs/graph/Makefile
+@@ -18,10 +18,10 @@
+ include ../../config/Makefile
CC=$(BYTECC)
- CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+-CFLAGS=-I../../byterun $(X11_INCLUDES) -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
-CAMLC=../../ocamlcomp.sh
-CAMLOPT=../../ocamlcompopt.sh
-MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
++CFLAGS+=-I../../byterun $(X11_INCLUDES) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+CAMLC=${PREFIX}/bin/ocamlc
+CAMLOPT=${PREFIX}/bin/ocamlopt
+MKLIB=${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlmklib
COMPFLAGS=-warn-error A
OBJS=open.o draw.o fill.o color.o text.o \
-@@ -50,13 +50,13 @@
+@@ -50,13 +50,13 @@ clean: partialclean
rm -f *.a *.so *.o
install:
diff --git a/lang/ocaml/patches/patch-bm b/lang/ocaml/patches/patch-bm
index f8a24571a91..67d0d60bbfe 100644
--- a/lang/ocaml/patches/patch-bm
+++ b/lang/ocaml/patches/patch-bm
@@ -1,8 +1,17 @@
-$NetBSD: patch-bm,v 1.1 2004/04/22 09:18:45 tron Exp $
+$NetBSD: patch-bm,v 1.2 2005/03/24 11:32:50 adam Exp $
---- otherlibs/num/Makefile.orig Thu Jun 27 13:36:01 2002
-+++ otherlibs/num/Makefile Thu Apr 22 10:34:37 2004
-@@ -53,13 +53,13 @@
+--- otherlibs/num/Makefile.orig 2003-10-24 09:17:31.000000000 +0000
++++ otherlibs/num/Makefile
+@@ -19,7 +19,7 @@ include ../../config/Makefile
+
+ # Compilation options
+ CC=$(BYTECC)
+-CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
++CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
+ -DBNG_ARCH_$(BNG_ARCH) -DBNG_ASM_LEVEL=$(BNG_ASM_LEVEL)
+ CAMLC=../../ocamlcomp.sh -w s
+ CAMLOPT=../../ocamlcompopt.sh -w s
+@@ -49,13 +49,13 @@ libnums.a: $(COBJS)
$(CAMLOBJS:.cmo=.cmx): ../../ocamlopt
install:
diff --git a/lang/ocaml/patches/patch-bn b/lang/ocaml/patches/patch-bn
index 18ef8a0af6d..1681eaa777f 100644
--- a/lang/ocaml/patches/patch-bn
+++ b/lang/ocaml/patches/patch-bn
@@ -1,8 +1,17 @@
-$NetBSD: patch-bn,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-bn,v 1.3 2005/03/24 11:32:50 adam Exp $
---- otherlibs/str/Makefile.orig 2004-10-12 18:13:50.000000000 +0100
-+++ otherlibs/str/Makefile 2004-10-12 18:15:22.000000000 +0100
-@@ -48,13 +48,13 @@
+--- otherlibs/str/Makefile.orig 2002-12-09 14:05:18.000000000 +0000
++++ otherlibs/str/Makefile
+@@ -19,7 +19,7 @@ include ../../config/Makefile
+
+ # Compilation options
+ CC=$(BYTECC)
+-CFLAGS=-O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ CAMLC=../../ocamlcomp.sh
+ CAMLOPT=../../ocamlcompopt.sh
+ COMPFLAGS=-warn-error A
+@@ -48,13 +48,13 @@ clean: partialclean
rm -f *.a *.so *.o
install:
diff --git a/lang/ocaml/patches/patch-bp b/lang/ocaml/patches/patch-bp
index 0f4476524ed..2a3312a93c0 100644
--- a/lang/ocaml/patches/patch-bp
+++ b/lang/ocaml/patches/patch-bp
@@ -1,8 +1,17 @@
-$NetBSD: patch-bp,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-bp,v 1.3 2005/03/24 11:32:50 adam Exp $
---- otherlibs/threads/Makefile.orig 2004-10-12 18:17:28.000000000 +0100
-+++ otherlibs/threads/Makefile 2004-10-12 18:21:14.000000000 +0100
-@@ -99,12 +99,12 @@
+--- otherlibs/threads/Makefile.orig 2003-07-17 08:38:28.000000000 +0000
++++ otherlibs/threads/Makefile
+@@ -16,7 +16,7 @@
+ include ../../config/Makefile
+
+ CC=$(BYTECC)
+-CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
++CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
+ CAMLC=../../ocamlcomp.sh -I ../unix
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+ COMPFLAGS=-warn-error A
+@@ -99,12 +99,12 @@ clean: partialclean
rm -f pervasives.mli marshal.mli unix.mli
install:
diff --git a/lang/ocaml/patches/patch-bq b/lang/ocaml/patches/patch-bq
index 75021d4f893..fe18a01e8d5 100644
--- a/lang/ocaml/patches/patch-bq
+++ b/lang/ocaml/patches/patch-bq
@@ -1,8 +1,17 @@
-$NetBSD: patch-bq,v 1.1 2004/04/22 09:18:46 tron Exp $
+$NetBSD: patch-bq,v 1.2 2005/03/24 11:32:50 adam Exp $
---- otherlibs/unix/Makefile.orig Thu Jun 27 13:36:02 2002
-+++ otherlibs/unix/Makefile Thu Apr 22 10:34:37 2004
-@@ -65,13 +65,13 @@
+--- otherlibs/unix/Makefile.orig 2004-04-09 13:25:20.000000000 +0000
++++ otherlibs/unix/Makefile
+@@ -19,7 +19,7 @@ include ../../config/Makefile
+
+ # Compilation options
+ CC=$(BYTECC)
+-CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
++CFLAGS+=-I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS)
+ CAMLC=../../ocamlcomp.sh
+ CAMLOPT=../../ocamlcompopt.sh
+ MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
+@@ -66,13 +66,13 @@ clean: partialclean
rm -f *.a *.o *.so
install:
diff --git a/lang/ocaml/patches/patch-bs b/lang/ocaml/patches/patch-bs
index a640a8f5070..3eca653659d 100644
--- a/lang/ocaml/patches/patch-bs
+++ b/lang/ocaml/patches/patch-bs
@@ -1,8 +1,8 @@
-$NetBSD: patch-bs,v 1.2 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-bs,v 1.3 2005/03/24 11:32:50 adam Exp $
---- tools/Makefile.orig 2003-04-02 02:17:58.000000000 +0100
-+++ tools/Makefile 2004-10-12 22:57:30.000000000 +0100
-@@ -48,9 +48,9 @@
+--- tools/Makefile.orig 2005-01-24 15:22:46.000000000 +0000
++++ tools/Makefile
+@@ -48,9 +48,9 @@ clean::
rm -f ocamldep.opt
install::
@@ -14,7 +14,7 @@ $NetBSD: patch-bs,v 1.2 2005/02/04 21:35:51 adrianp Exp $
# The profiler
-@@ -66,9 +66,9 @@
+@@ -66,9 +66,9 @@ ocamlcp: ocamlcp.cmo
$(CAMLC) $(LINKFLAGS) -o ocamlcp main_args.cmo ocamlcp.cmo
install::
@@ -27,7 +27,7 @@ $NetBSD: patch-bs,v 1.2 2005/02/04 21:35:51 adrianp Exp $
clean::
rm -f ocamlprof ocamlcp
-@@ -80,7 +80,7 @@
+@@ -80,7 +80,7 @@ ocamlmktop: ocamlmktop.tpl ../config/Mak
chmod +x ocamlmktop
install::
@@ -36,7 +36,7 @@ $NetBSD: patch-bs,v 1.2 2005/02/04 21:35:51 adrianp Exp $
clean::
rm -f ocamlmktop
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ ocamlmklib: ocamlmklib.cmo
$(CAMLC) $(LINKFLAGS) -o ocamlmklib ocamlmklib.cmo
install::
@@ -45,7 +45,7 @@ $NetBSD: patch-bs,v 1.2 2005/02/04 21:35:51 adrianp Exp $
clean::
rm -f ocamlmklib
-@@ -139,7 +139,7 @@
+@@ -145,7 +145,7 @@ lexer301.ml: lexer301.mll
$(CAMLLEX) lexer301.mll
install::
@@ -54,7 +54,7 @@ $NetBSD: patch-bs,v 1.2 2005/02/04 21:35:51 adrianp Exp $
clean::
rm -f scrapelabels lexer301.ml
-@@ -155,7 +155,7 @@
+@@ -161,7 +161,7 @@ addlabels: addlabels.ml
$(ADDLABELS_IMPORTS) addlabels.ml
install::
diff --git a/lang/ocaml/patches/patch-bu b/lang/ocaml/patches/patch-bu
index 3e810767fe1..d1fd3926419 100644
--- a/lang/ocaml/patches/patch-bu
+++ b/lang/ocaml/patches/patch-bu
@@ -1,8 +1,17 @@
-$NetBSD: patch-bu,v 1.1 2005/02/04 21:35:51 adrianp Exp $
+$NetBSD: patch-bu,v 1.2 2005/03/24 11:32:50 adam Exp $
---- asmrun/Makefile.orig 2004-10-15 15:49:45.000000000 +0100
-+++ asmrun/Makefile 2004-10-15 15:52:40.000000000 +0100
-@@ -58,14 +58,14 @@
+--- asmrun/Makefile.orig 2004-05-09 15:19:16.000000000 +0000
++++ asmrun/Makefile
+@@ -18,7 +18,7 @@ include ../config/Makefile
+ CC=$(NATIVECC)
+ FLAGS=-I../byterun -DCAML_NAME_SPACE -DNATIVE_CODE \
+ -DTARGET_$(ARCH) -DSYS_$(SYSTEM)
+-CFLAGS=$(FLAGS) -O $(NATIVECCCOMPOPTS)
++CFLAGS+=$(FLAGS) $(NATIVECCCOMPOPTS)
+ DFLAGS=$(FLAGS) -g -DDEBUG $(NATIVECCCOMPOPTS)
+ PFLAGS=$(FLAGS) -pg -O -DPROFILING $(NATIVECCPROFOPTS)
+
+@@ -58,14 +58,14 @@ libasmrunp.a: $(POBJS)
install: install-default install-$(PROFILING)
install-default:
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 13:59:26 +0000