diff options
| author | jaapb <jaapb> | 2014-10-09 19:08:28 +0000 |
|---|---|---|
| committer | jaapb <jaapb> | 2014-10-09 19:08:28 +0000 |
| commit | 1a93afa68d05d255de5b2f201b2664e039ac2c72 (patch) | |
| tree | 6f5b02526ac6485976a0fa7b0ce5d3e5e5176c28 /lang/ocaml | |
| parent | 2e14035c0c480a55424b10b9bec7768f7b8fa1fe (diff) | |
| download | pkgsrc-1a93afa68d05d255de5b2f201b2664e039ac2c72.tar.gz | |
Update to ocaml 4.02.0. Main changes (apart from ocamldoc and bugfixes, see
also upstream changelog):
Language features:
- Attributes and extension nodes
- Generative functors
- Module aliases
* Alternative syntax for string literals {id|...|id} (can break comments)
- Separation between read-only strings (type string) and read-write byte
sequences (type bytes). Activated by command-line option -safe-string.
Build system for the OCaml distribution:
- Use -bin-annot when building.
- Use GNU make instead of portable makefiles.
- Updated build instructions for 32-bit Mac OS X on Intel hardware.
Shedding weight:
* Removed Camlp4 from the distribution, now available as third-party software.
* Removed Labltk from the distribution, now available as a third-party library.
Type system:
* Keep typing of pattern cases independent in principal mode
- Allow opening a first-class module or applying a generative functor
in the body of a generative functor. Allow it also in the body of
an applicative functor if no types are created
* Module aliases are now typed in a specific way, which remembers their
identity. In particular this changes the signature inferred by
"module type of"
- Slight change in the criterion to distinguish private
abbreviations and private row types: create a private abbreviation for
closed objects and fixed polymorphic variants.
* Compare first class module types structurally rather than
nominally. Value subtyping allows module subtyping as long as the internal
representation is unchanged.
Compilers:
- More aggressive constant propagation, including float and
int32/int64/nativeint arithmetic. Constant propagation for floats
can be turned off with option -no-float-const-prop, for codes that
change FP rounding modes at run-time.
- New back-end optimization pass: common subexpression elimination (CSE).
(Reuses results of previous computations instead of recomputing them.)
- New back-end optimization pass: dead code elimination.
(Removes arithmetic and load instructions whose results are unused.)
- Optimization of sequences of string patterns
- Experimental native code generator for AArch64 (ARM 64 bits)
- Optimization of integer division and modulus by constant divisors
- Add "-open" command line flag for opening a single module before typing
* "-o" now sets module name to the output file name up to the first "."
(it also applies when "-o" is not given, i.e. the module name is then
the input file name up to the first ".")
* better sharing of structured constants
- new flag to keep locations in cmi files
- issue warning 3 when referring to a value marked with
the [@@ocaml.deprecated] attribute
- a new format implementation based on GADTs
* Constant exception constructors no longer allocate
- avoid unnecessary boxing in let
- Better compilation of optional arguments with default values
- ocamlopt -opaque option for incremental native compilation
Toplevel interactive system:
- New "#show_*" directives
Runtime system:
- New configure option "-no-naked-pointers" to improve performance by
avoiding page table tests during block darkening and the marking phase
of the major GC. In this mode, all out-of-heap pointers must point at
things that look like OCaml values: in particular they must have a valid
header. The colour of said headers should be black.
- Fixed bug in native code version of [caml_raise_with_string] that could
potentially lead to heap corruption.
- Blocks initialized by [CAMLlocal*] and [caml_alloc] are now filled with
[Val_unit] rather than zero.
- Fixed a major performance problem on large heaps (~1GB) by making heap
increments proportional to heap size by default
- Structural equality treats exception specifically
- efficient comparison/indexing of exceptions
- avoid using unsafe C library functions (strcpy, strcat, sprintf)
- An ISO C99-compliant C compiler and standard library is now assumed.
(Plus special exceptions for MSVC.) In particular, emulation code for
64-bit integer arithmetic was removed, the C compiler must support a
64-bit integer type.
Standard library:
* Add new modules Bytes and BytesLabels for mutable byte sequences.
- add List.sort_uniq and Set.of_list
- a faster version of "raise" which does not maintain the backtrace
- support "Unix.kill pid Sys.sigkill" under Windows
- speed improvement for Buffer
- efficient creation of uninitialized float arrays
- Improve documentation regarding finalisers and multithreading
- Trigger warning 3 for all values marked as deprecated in the documentation.
Diffstat (limited to 'lang/ocaml')
33 files changed, 533 insertions, 797 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 12fc5bf571f..de616668009 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.90 2014/03/13 11:08:51 jperkin Exp $ +# $NetBSD: Makefile,v 1.91 2014/10/09 19:08:28 jaapb Exp $ .include "Makefile.common" -PKGREVISION= 2 - -CONFIGURE_ARGS+= -no-tk +#CONFIGURE_ARGS+= -no-tk CONFIGURE_ARGS+= -cc ${CC} CONFIGURE_ENV+= disable_x11=yes diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index 91760b003eb..9b3a140e090 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.38 2013/11/01 10:47:50 jaapb Exp $ +# $NetBSD: Makefile.common,v 1.39 2014/10/09 19:08:28 jaapb Exp $ # used by x11/labltk/Makefile # used by x11/ocaml-graphics/Makefile -DISTNAME= ocaml-4.01.0 +DISTNAME= ocaml-4.02.0 CATEGORIES= lang -MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.01/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-4.02/ +#EXTRACT_SUFX= .tar.bz2 MAINTAINER= jaapb@NetBSD.org HOMEPAGE= http://caml.inria.fr/ocaml/ @@ -23,8 +23,8 @@ CONFIGURE_ARGS+= -host ${MACHINE_GNU_PLATFORM:Q} CONFIGURE_ARGS+= -mandir ${PREFIX}/${PKGMANDIR} CPPFLAGS+= -DDB_DBM_HSEARCH -INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ - MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} +INSTALL_MAKE_FLAGS+= PREFIX=${PREFIX} \ + MANDIR=${PREFIX}/${PKGMANDIR} DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST index 0c3b5c708f4..5ab33d446bf 100644 --- a/lang/ocaml/PLIST +++ b/lang/ocaml/PLIST @@ -1,14 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2014/05/13 10:15:05 jaapb Exp $ -bin/camlp4 -bin/camlp4boot -bin/camlp4o -bin/camlp4of -bin/camlp4oof -bin/camlp4orf -bin/camlp4prof -bin/camlp4r -bin/camlp4rf -bin/mkcamlp4 +@comment $NetBSD: PLIST,v 1.27 2014/10/09 19:08:28 jaapb Exp $ bin/ocaml bin/ocamlbuild bin/ocamlbuild.byte @@ -45,6 +35,12 @@ lib/ocaml/bigarray.mli lib/ocaml/buffer.cmi lib/ocaml/buffer.ml lib/ocaml/buffer.mli +lib/ocaml/bytes.cmi +lib/ocaml/bytes.ml +lib/ocaml/bytes.mli +lib/ocaml/bytesLabels.cmi +lib/ocaml/bytesLabels.ml +lib/ocaml/bytesLabels.mli lib/ocaml/callback.cmi lib/ocaml/callback.ml lib/ocaml/callback.mli @@ -65,8 +61,16 @@ lib/ocaml/caml/signals.h lib/ocaml/caml/socketaddr.h lib/ocaml/caml/threads.h lib/ocaml/caml/unixsupport.h +lib/ocaml/caml/version.h lib/ocaml/camlheader lib/ocaml/camlheader_ur +lib/ocaml/camlinternalFormat.cmi +lib/ocaml/camlinternalFormat.ml +lib/ocaml/camlinternalFormat.mli +lib/ocaml/camlinternalFormatBasics.cmi +lib/ocaml/camlinternalFormatBasics.cmx +lib/ocaml/camlinternalFormatBasics.ml +lib/ocaml/camlinternalFormatBasics.mli lib/ocaml/camlinternalLazy.cmi lib/ocaml/camlinternalLazy.ml lib/ocaml/camlinternalLazy.mli @@ -76,88 +80,47 @@ lib/ocaml/camlinternalMod.mli lib/ocaml/camlinternalOO.cmi lib/ocaml/camlinternalOO.ml lib/ocaml/camlinternalOO.mli -lib/ocaml/camlp4/Camlp4.cmi -lib/ocaml/camlp4/Camlp4Bin.cmi -lib/ocaml/camlp4/Camlp4Bin.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmo -lib/ocaml/camlp4/Camlp4Top.cmi -lib/ocaml/camlp4/Camlp4Top.cmo -lib/ocaml/camlp4/Camlp4Top/Rprint.cmi -lib/ocaml/camlp4/Camlp4Top/Rprint.cmo -lib/ocaml/camlp4/Camlp4Top/Top.cmi -lib/ocaml/camlp4/Camlp4Top/Top.cmo -lib/ocaml/camlp4/Camlp4_config.cmi -lib/ocaml/camlp4/Camlp4_import.cmi -lib/ocaml/camlp4/camlp4fulllib.cma -lib/ocaml/camlp4/camlp4lib.cma -lib/ocaml/camlp4/camlp4o.cma -lib/ocaml/camlp4/camlp4of.cma -lib/ocaml/camlp4/camlp4oof.cma -lib/ocaml/camlp4/camlp4orf.cma -lib/ocaml/camlp4/camlp4prof.cmi -lib/ocaml/camlp4/camlp4prof.cmo -lib/ocaml/camlp4/camlp4r.cma -lib/ocaml/camlp4/camlp4rf.cma lib/ocaml/char.cmi lib/ocaml/char.ml lib/ocaml/char.mli +lib/ocaml/callback.cmi +lib/ocaml/callback.ml +lib/ocaml/callback.mli +lib/ocaml/caml/alloc.h +lib/ocaml/caml/bigarray.h +lib/ocaml/caml/callback.h +lib/ocaml/caml/compatibility.h +lib/ocaml/caml/config.h +lib/ocaml/caml/custom.h +lib/ocaml/caml/fail.h +lib/ocaml/caml/hash.h +lib/ocaml/caml/intext.h +lib/ocaml/caml/memory.h +lib/ocaml/caml/misc.h +lib/ocaml/caml/mlvalues.h +lib/ocaml/caml/printexc.h +lib/ocaml/caml/signals.h +lib/ocaml/caml/socketaddr.h +lib/ocaml/caml/threads.h +lib/ocaml/caml/unixsupport.h +lib/ocaml/camlheader +lib/ocaml/camlheader_ur +lib/ocaml/camlinternalLazy.cmi +lib/ocaml/camlinternalLazy.ml +lib/ocaml/camlinternalLazy.mli +lib/ocaml/camlinternalMod.cmi +lib/ocaml/camlinternalMod.ml +lib/ocaml/camlinternalMod.mli +lib/ocaml/camlinternalOO.cmi +lib/ocaml/camlinternalOO.ml +lib/ocaml/camlinternalOO.mli +lib/ocaml/char.cmi +lib/ocaml/char.ml +lib/ocaml/char.mli +lib/ocaml/compiler-libs/CSE.cmi +lib/ocaml/compiler-libs/CSEgen.cmi lib/ocaml/compiler-libs/annot.cmi -lib/ocaml/compiler-libs/ast_mapper.cmi +lib/ocaml/compiler-libs/ast_helper.cmi lib/ocaml/compiler-libs/ast_mapper.cmi lib/ocaml/compiler-libs/asttypes.cmi lib/ocaml/compiler-libs/btype.cmi @@ -180,6 +143,7 @@ lib/ocaml/compiler-libs/config.cmi lib/ocaml/compiler-libs/consistbl.cmi lib/ocaml/compiler-libs/ctype.cmi lib/ocaml/compiler-libs/datarepr.cmi +lib/ocaml/compiler-libs/deadcode.cmi lib/ocaml/compiler-libs/dll.cmi lib/ocaml/compiler-libs/envaux.cmi lib/ocaml/compiler-libs/emitcode.cmi @@ -228,6 +192,7 @@ lib/ocaml/compiler-libs/printtyp.cmi lib/ocaml/compiler-libs/printtyped.cmi lib/ocaml/compiler-libs/runtimedef.cmi lib/ocaml/compiler-libs/simplif.cmi +lib/ocaml/compiler-libs/strmatch.cmi lib/ocaml/compiler-libs/stypes.cmi lib/ocaml/compiler-libs/subst.cmi lib/ocaml/compiler-libs/switch.cmi @@ -332,17 +297,13 @@ lib/ocaml/num.mli lib/ocaml/nums.cma lib/ocaml/obj.cmi lib/ocaml/obj.ml -lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmo lib/ocaml/obj.mli lib/ocaml/objinfo_helper lib/ocaml/ocamlbuild/ocamlbuild.cmo lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi -lib/ocaml/ocamlbuild/ocamlbuild_executor.cmo lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi -lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmo lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi -lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmo lib/ocaml/ocamlbuild/ocamlbuildlib.cma lib/ocaml/ocamldoc/ocamldoc.hva lib/ocaml/ocamldoc/odoc.cmi @@ -360,6 +321,7 @@ lib/ocaml/ocamldoc/odoc_dep.cmi lib/ocaml/ocamldoc/odoc_dot.cmi lib/ocaml/ocamldoc/odoc_env.cmi lib/ocaml/ocamldoc/odoc_exception.cmi +lib/ocaml/ocamldoc/odoc_extension.cmi lib/ocaml/ocamldoc/odoc_gen.cmi lib/ocaml/ocamldoc/odoc_global.cmi lib/ocaml/ocamldoc/odoc_html.cmi @@ -485,7 +447,6 @@ lib/ocaml/weak.cmi lib/ocaml/weak.ml lib/ocaml/weak.mli man/man1/ocaml.1 -man/man1/ocamlbuild.1 man/man1/ocamlc.1 man/man1/ocamlc.opt.1 man/man1/ocamlcp.1 @@ -495,92 +456,102 @@ man/man1/ocamldoc.1 man/man1/ocamllex.1 man/man1/ocamlmktop.1 man/man1/ocamlopt.1 -man/man1/ocamloptp.1 man/man1/ocamlopt.opt.1 +man/man1/ocamloptp.1 man/man1/ocamlprof.1 man/man1/ocamlrun.1 man/man1/ocamlyacc.1 -man/man3/Arg.3o -man/man3/Array.3o -man/man3/ArrayLabels.3o -man/man3/Bigarray.3o -man/man3/Bigarray.Array1.3o -man/man3/Bigarray.Array2.3o -man/man3/Bigarray.Array3.3o -man/man3/Bigarray.Genarray.3o -man/man3/Buffer.3o -man/man3/Callback.3o -man/man3/CamlinternalLazy.3o -man/man3/CamlinternalMod.3o -man/man3/CamlinternalOO.3o -man/man3/Complex.3o -man/man3/Digest.3o -man/man3/Filename.3o -man/man3/Format.3o -man/man3/Gc.3o -man/man3/Genlex.3o -man/man3/Hashtbl.3o -man/man3/Hashtbl.HashedType.3o -man/man3/Hashtbl.Make.3o -man/man3/Hashtbl.MakeSeeded.3o -man/man3/Hashtbl.S.3o -man/man3/Hashtbl.SeededHashedType.3o -man/man3/Hashtbl.SeededS.3o -man/man3/Int32.3o -man/man3/Int64.3o -man/man3/Lexing.3o -man/man3/List.3o -man/man3/ListLabels.3o -man/man3/Map.3o -man/man3/Map.Make.3o -man/man3/Map.OrderedType.3o -man/man3/Map.S.3o -man/man3/Marshal.3o -man/man3/MoreLabels.3o -man/man3/MoreLabels.Hashtbl.3o -man/man3/MoreLabels.Hashtbl.HashedType.3o -man/man3/MoreLabels.Hashtbl.Make.3o -man/man3/MoreLabels.Hashtbl.MakeSeeded.3o -man/man3/MoreLabels.Hashtbl.S.3o -man/man3/MoreLabels.Hashtbl.SeededHashedType.3o -man/man3/MoreLabels.Hashtbl.SeededS.3o -man/man3/MoreLabels.Map.3o -man/man3/MoreLabels.Map.Make.3o -man/man3/MoreLabels.Map.OrderedType.3o -man/man3/MoreLabels.Map.S.3o -man/man3/MoreLabels.Set.3o -man/man3/MoreLabels.Set.Make.3o -man/man3/MoreLabels.Set.OrderedType.3o -man/man3/MoreLabels.Set.S.3o -man/man3/Nativeint.3o -man/man3/Num.3o -man/man3/Obj.3o -man/man3/Oo.3o -man/man3/Parsing.3o -man/man3/Pervasives.3o -man/man3/Pervasives.LargeFile.3o -man/man3/Printexc.3o -man/man3/Printf.3o -man/man3/Queue.3o -man/man3/Random.3o -man/man3/Random.State.3o -man/man3/Scanf.3o -man/man3/Scanf.Scanning.3o -man/man3/Set.Make.3o -man/man3/Set.OrderedType.3o -man/man3/Set.S.3o -man/man3/Sort.3o -man/man3/Stack.3o -man/man3/StdLabels.3o -man/man3/StdLabels.Array.3o -man/man3/StdLabels.List.3o -man/man3/StdLabels.String.3o -man/man3/Str.3o -man/man3/Stream.3o -man/man3/StringLabels.3o -man/man3/Sys.3o -man/man3/Unix.3o -man/man3/Unix.LargeFile.3o -man/man3/Weak.3o -man/man3/Weak.Make.3o -man/man3/Weak.S.3o +man/man3o/Arg.3o +man/man3o/Array.3o +man/man3o/ArrayLabels.3o +man/man3o/Bigarray.3o +man/man3o/Bigarray.Array1.3o +man/man3o/Bigarray.Array2.3o +man/man3o/Bigarray.Array3.3o +man/man3o/Bigarray.Genarray.3o +man/man3o/Buffer.3o +man/man3o/Bytes.3o +man/man3o/BytesLabels.3o +man/man3o/Callback.3o +man/man3o/CamlinternalFormat.3o +man/man3o/CamlinternalFormatBasics.3o +man/man3o/CamlinternalLazy.3o +man/man3o/CamlinternalMod.3o +man/man3o/CamlinternalOO.3o +man/man3o/Char.3o +man/man3o/String.3o +man/man3o/Complex.3o +man/man3o/Digest.3o +man/man3o/Filename.3o +man/man3o/Format.3o +man/man3o/Gc.3o +man/man3o/Genlex.3o +man/man3o/Hashtbl.3o +man/man3o/Hashtbl.HashedType.3o +man/man3o/Hashtbl.Make.3o +man/man3o/Hashtbl.MakeSeeded.3o +man/man3o/Hashtbl.S.3o +man/man3o/Hashtbl.SeededHashedType.3o +man/man3o/Hashtbl.SeededS.3o +man/man3o/Int32.3o +man/man3o/Int64.3o +man/man3o/Lazy.3o +man/man3o/Lexing.3o +man/man3o/List.3o +man/man3o/ListLabels.3o +man/man3o/Map.3o +man/man3o/Map.Make.3o +man/man3o/Map.OrderedType.3o +man/man3o/Map.S.3o +man/man3o/Marshal.3o +man/man3o/MoreLabels.3o +man/man3o/MoreLabels.Hashtbl.3o +man/man3o/MoreLabels.Hashtbl.HashedType.3o +man/man3o/MoreLabels.Hashtbl.Make.3o +man/man3o/MoreLabels.Hashtbl.MakeSeeded.3o +man/man3o/MoreLabels.Hashtbl.S.3o +man/man3o/MoreLabels.Hashtbl.SeededHashedType.3o +man/man3o/MoreLabels.Hashtbl.SeededS.3o +man/man3o/MoreLabels.Map.3o +man/man3o/MoreLabels.Map.Make.3o +man/man3o/MoreLabels.Map.OrderedType.3o +man/man3o/MoreLabels.Map.S.3o +man/man3o/MoreLabels.Set.3o +man/man3o/MoreLabels.Set.Make.3o +man/man3o/MoreLabels.Set.OrderedType.3o +man/man3o/MoreLabels.Set.S.3o +man/man3o/Nativeint.3o +man/man3o/Num.3o +man/man3o/Obj.3o +man/man3o/Oo.3o +man/man3o/Parsing.3o +man/man3o/Pervasives.3o +man/man3o/Pervasives.LargeFile.3o +man/man3o/Printexc.3o +man/man3o/Printexc.Slot.3o +man/man3o/Printf.3o +man/man3o/Queue.3o +man/man3o/Random.3o +man/man3o/Random.State.3o +man/man3o/Scanf.3o +man/man3o/Scanf.Scanning.3o +man/man3o/Set.3o +man/man3o/Set.Make.3o +man/man3o/Set.OrderedType.3o +man/man3o/Set.S.3o +man/man3o/Sort.3o +man/man3o/Stack.3o +man/man3o/StdLabels.3o +man/man3o/StdLabels.Array.3o +man/man3o/StdLabels.Bytes.3o +man/man3o/StdLabels.List.3o +man/man3o/StdLabels.String.3o +man/man3o/Str.3o +man/man3o/Stream.3o +man/man3o/StringLabels.3o +man/man3o/Sys.3o +man/man3o/Unix.3o +man/man3o/Unix.LargeFile.3o +man/man3o/Weak.3o +man/man3o/Weak.Make.3o +man/man3o/Weak.S.3o diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt index 1adefb13194..64a5286f6a8 100644 --- a/lang/ocaml/PLIST.opt +++ b/lang/ocaml/PLIST.opt @@ -1,10 +1,4 @@ -@comment $NetBSD: PLIST.opt,v 1.21 2014/05/13 10:15:05 jaapb Exp $ -bin/camlp4o.opt -bin/camlp4of.opt -bin/camlp4oof.opt -bin/camlp4orf.opt -bin/camlp4r.opt -bin/camlp4rf.opt +@comment $NetBSD: PLIST.opt,v 1.22 2014/10/09 19:08:28 jaapb Exp $ bin/ocamlbuild.native bin/ocamlc.opt bin/ocamldep.opt @@ -23,78 +17,13 @@ lib/ocaml/bigarray.a lib/ocaml/bigarray.cmx lib/ocaml/bigarray.cmxa lib/ocaml/buffer.cmx +lib/ocaml/bytes.cmx +lib/ocaml/bytesLabels.cmx lib/ocaml/callback.cmx +lib/ocaml/camlinternalFormat.cmx lib/ocaml/camlinternalLazy.cmx lib/ocaml/camlinternalMod.cmx lib/ocaml/camlinternalOO.cmx -lib/ocaml/camlp4/Camlp4Bin.cmx -lib/ocaml/camlp4/Camlp4Bin.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o -lib/ocaml/camlp4/Camlp4Top/Rprint.cmx -lib/ocaml/camlp4/Camlp4Top/Rprint.o -lib/ocaml/camlp4/Camlp4Top/Top.cmx -lib/ocaml/camlp4/Camlp4Top/Top.o -lib/ocaml/camlp4/camlp4fulllib.a -lib/ocaml/camlp4/camlp4fulllib.cmxa -lib/ocaml/camlp4/camlp4lib.a -lib/ocaml/camlp4/camlp4lib.cmxa -lib/ocaml/camlp4/camlp4prof.cmx -lib/ocaml/camlp4/camlp4prof.o lib/ocaml/char.cmx lib/ocaml/complex.cmx lib/ocaml/compiler-libs/arch.cmi @@ -222,8 +151,9 @@ lib/ocaml/ocamlbuild/ocamlbuild.cmx lib/ocaml/ocamlbuild/ocamlbuild.o lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx lib/ocaml/ocamlbuild/ocamlbuild_executor.o +lib/ocaml/ocamlbuild/ocamlbuild_pack.cmx lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx -lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmx +lib/ocaml/ocamlbuild/ocamlbuild_plugin.o lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmx lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o lib/ocaml/ocamlbuild/ocamlbuildlib.a diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index 6c74f0311c1..c395da53ae4 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2013/11/01 10:47:50 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2014/10/09 19:08:28 jaapb Exp $ BUILDLINK_TREE+= ocaml @@ -6,10 +6,12 @@ BUILDLINK_TREE+= ocaml OCAML_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2 -BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.01.0 +BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.02.0 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml #BUILDLINK_DEPMETHOD.ocaml?= build +BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.ocaml}/lib/ocaml + .include "../../mk/bsd.fast.prefs.mk" .if ${OPSYS} == "Darwin" INSTALL_UNSTRIPPED= yes diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index e3b24142c4b..9015b9a4275 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,34 +1,25 @@ -$NetBSD: distinfo,v 1.75 2014/05/13 10:17:44 jaapb Exp $ +$NetBSD: distinfo,v 1.76 2014/10/09 19:08:28 jaapb Exp $ -SHA1 (ocaml-4.01.0.tar.bz2) = a814feca204e50f082515a3845cdd18c6d0e24b6 -RMD160 (ocaml-4.01.0.tar.bz2) = eedf28f446489c6b2c1f82782f5ee852293fc0b7 -Size (ocaml-4.01.0.tar.bz2) = 3691090 bytes -SHA1 (patch-Makefile) = 5b22191b98138f7a50d77c60dc6bec359e47f0a9 +SHA1 (ocaml-4.02.0.tar.gz) = 402d730d1c9b5e45b327a0b3fc61a24dff08a747 +RMD160 (ocaml-4.02.0.tar.gz) = 59c72f1378565d49e86be6723506d5b1e2eb376b +Size (ocaml-4.02.0.tar.gz) = 3048921 bytes +SHA1 (patch-Makefile) = 0aea370689374398924724f1989158dc061c2a18 SHA1 (patch-asmcomp_power_emit.mlp) = 726e09e4902b96f4790c7a8093eb245dd7028bf4 -SHA1 (patch-asmrun_Makefile) = 6768fb2ecf42239fe08bf59132dd9dc2a49ab171 -SHA1 (patch-asmrun_power-bsd.S) = bd52898dde14adc1dbf9cd85a7f8af4d77218e6f -SHA1 (patch-asmrun_signals_osdep.h) = cc7131ef020563ae28c1fddbe8fe634174f73826 -SHA1 (patch-byterun_Makefile) = 9681ce78c78879d29d9c58f35278a14e6cb18e96 -SHA1 (patch-camlp4_man_Makefile) = c3a5dc09a2cc15d969c4e074be7da98a979f7db4 +SHA1 (patch-asmrun_Makefile) = b6301628b71e3fe3553f32342805ae90159cc773 +SHA1 (patch-asmrun_power-bsd.S) = 5428a486835a0254a1768b3157b6b1fdf5ae8dd3 +SHA1 (patch-asmrun_signals_osdep.h) = d9dba52a3e1e0170976e64a1ef1860aa5ab560ae +SHA1 (patch-byterun_Makefile) = 2b88b35e5ffcccc315542cb814b9e826126acb54 SHA1 (patch-config_auto__aux_gethostbyaddr.c) = ce724831e93081d3e51a122fef14b17543c3221c SHA1 (patch-config_auto__aux_gethostbyname.c) = f05a6026a18ca7557558383103c6a2fc08caee28 -SHA1 (patch-configure) = 4f302dd5713060eb53a2255173406d9b9017d5a1 -SHA1 (patch-debugger_Makefile.shared) = 583fa88caf965164aa3b638dda4c2a6e8878bdf9 -SHA1 (patch-man_Makefile) = 3f52dd1fcbde53399852a6490d5f27fc7c1c98e5 -SHA1 (patch-ocamldoc_Makefile) = d09c5f779dc1da9317d1c6e5eb4b251a9af45562 -SHA1 (patch-otherlibs_Makefile.shared) = 2264e22c3e0079b31ff498ddb387358fc3a503cc -SHA1 (patch-otherlibs_dynlink_Makefile) = b045aa0d16dcc7327a37482189168dcab6976a08 -SHA1 (patch-otherlibs_labltk_browser_Makefile.shared) = 5558d385f962195563ca7dd68a238a97b5ffb8a6 -SHA1 (patch-otherlibs_labltk_camltk_Makefile) = ea2883bea5258304d565868ce09cf47bdb3c7025 -SHA1 (patch-otherlibs_labltk_compiler_Makefile) = 387e8f41f4efdb733385b9b0c4dd576d3cc03cb8 -SHA1 (patch-otherlibs_labltk_frx_Makefile) = 94142aaade7b3c2f44509f1907f1ee4bbf793d79 -SHA1 (patch-otherlibs_labltk_jpf_Makefile) = 2f768f78ed4c723c567f1a4c0ac3eff00a716261 -SHA1 (patch-otherlibs_labltk_labltk_Makefile) = 31c496143255c31f1e3474fbc775f4bd7689a642 -SHA1 (patch-otherlibs_labltk_lib_Makefile) = 20bb9f5fffc3271d45025bfd5b033173e8cf5319 -SHA1 (patch-otherlibs_labltk_support_Makefile) = 9bf06605324e167fb09f4f943ebc147c54868b67 -SHA1 (patch-otherlibs_systhreads_Makefile) = 89db3ff91128c4773edf28d2c91f3c4923472e86 -SHA1 (patch-otherlibs_threads_Makefile) = 9848e587914f1c65f11fe9cb60529ab5f15b26c8 -SHA1 (patch-stdlib_Makefile) = 85c89d6b9caf08056407da3564e7d2f5353b93a0 -SHA1 (patch-stdlib_Makefile.shared) = 42dafb10f88b501982fb0d65c380f1fa61740f54 -SHA1 (patch-tools_Makefile.shared) = 8c23fc72c627e2315451e6223946e9257c3e341d -SHA1 (patch-tools_ocamlmklib) = 1e7992994ced49230dba091ddf4210ce1277c566 +SHA1 (patch-configure) = 4f65c0657d80a31aa4d68e875d4b0b39a2d422ad +SHA1 (patch-debugger_Makefile.shared) = 9acaa17f22a66311859b6ac4a0c047e6693fce33 +SHA1 (patch-man_Makefile) = 7d8c1468c3365803505841a7f688d84c07231a3c +SHA1 (patch-ocamldoc_Makefile) = bf76adf76a2b65c3983dccb483c857600ed9dde8 +SHA1 (patch-otherlibs_Makefile.shared) = c5de4dd0f2be9cd35ba61b480b222ffa7baa891d +SHA1 (patch-otherlibs_dynlink_Makefile) = 41cecb61230880a40c55f2f8f25d2b250864eb24 +SHA1 (patch-otherlibs_systhreads_Makefile) = f3cdf000f58927dff44b4ce61153c1df8e9eceea +SHA1 (patch-otherlibs_threads_Makefile) = bcaaeb85724e50ce058b79ab4224c9f1aaadd47b +SHA1 (patch-stdlib_Makefile) = 501b45018245950c78d663bbd6eea1c38a6d04d2 +SHA1 (patch-stdlib_Makefile.shared) = 64a4366efec37aed04ed1bec79a0039bf6fde68f +SHA1 (patch-tools_Makefile.shared) = ff10364c68df2ac548468c9e5d1ab66458d3413e +SHA1 (patch-tools_ocamlmklib) = 926eff8927ff31ee060140f7358d75c11f230a76 diff --git a/lang/ocaml/hacks.mk b/lang/ocaml/hacks.mk index 16eaa70a8bf..34f29f5878b 100644 --- a/lang/ocaml/hacks.mk +++ b/lang/ocaml/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.3 2014/01/17 10:03:23 pho Exp $ +# $NetBSD: hacks.mk,v 1.4 2014/10/09 19:08:28 jaapb Exp $ .if !defined(OCAML_HACKS_MK) OCAML_HACKS_MK= defined @@ -28,11 +28,11 @@ SUBST_STAGE.no_compact_unwind= pre-configure ### produces a binary which segfaults. The binary is used during part of the ### build process. ### -.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) -. if !empty(CC_VERSION:Mgcc-4.4.*) -PKG_HACKS+= optimisation -BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-O -. endif -.endif +#.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) +#. if !empty(CC_VERSION:Mgcc-4.4.*) +#PKG_HACKS+= optimisation +#BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-O +#. endif +#.endif .endif # OCAML_HACKS_MK diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile index 33e276a33bd..d6228d90a4c 100644 --- a/lang/ocaml/patches/patch-Makefile +++ b/lang/ocaml/patches/patch-Makefile @@ -1,9 +1,9 @@ -$NetBSD: patch-Makefile,v 1.3 2013/11/01 10:47:50 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.4 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start ---- Makefile.orig 2013-06-17 13:15:18.000000000 +0000 +--- Makefile.orig 2014-08-06 11:58:44.000000000 +0000 +++ Makefile -@@ -174,8 +174,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c +@@ -184,8 +184,10 @@ LIBFILES=stdlib.cma std_exit.cmo *.cmi c # Start up the system from the distribution compiler coldstart: cd byterun; $(MAKE) all @@ -14,83 +14,84 @@ Use BSD_INSTALL_* instead of mkdir and cp; remove ocamlrun before cold start cp yacc/ocamlyacc$(EXE) boot/ocamlyacc$(EXE) cd stdlib; $(MAKE) COMPILER=../boot/ocamlc all cd stdlib; cp $(LIBFILES) ../boot -@@ -265,29 +267,29 @@ base.opt: checkstack runtime core ocaml - COMPLIBDIR=$(LIBDIR)/compiler-libs +@@ -300,31 +302,31 @@ INSTALL_MANDIR=$(DESTDIR)$(MANDIR) install: -- if test -d $(BINDIR); then : ; else $(MKDIR) $(BINDIR); fi -- if test -d $(LIBDIR); then : ; else $(MKDIR) $(LIBDIR); fi -- if test -d $(STUBLIBDIR); then : ; else $(MKDIR) $(STUBLIBDIR); fi -- if test -d $(COMPLIBDIR); then : ; else $(MKDIR) $(COMPLIBDIR); fi -+ if test -d $(BINDIR); then : ; else $(BSD_INSTALL_PROGRAM_DIR) $(BINDIR); fi -+ if test -d $(LIBDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(LIBDIR); fi -+ if test -d $(STUBLIBDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(STUBLIBDIR); fi -+ if test -d $(COMPLIBDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(COMPLIBDIR); fi - if test -d $(MANDIR)/man$(MANEXT); then : ; \ -- else $(MKDIR) $(MANDIR)/man$(MANEXT); fi -- cp VERSION $(LIBDIR)/ -+ else $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man$(MANEXT); fi -+ $(BSD_INSTALL_DATA) VERSION $(LIBDIR)/ - cd $(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \ - dllthreads.so dllunix.so dllgraphics.so dllstr.so \ - dlltkanim.so + if test -d $(INSTALL_BINDIR); then : ; \ +- else $(MKDIR) $(INSTALL_BINDIR); fi ++ else $(BSD_INSTALL_PROGRAM_DIR) $(INSTALL_BINDIR); fi + if test -d $(INSTALL_LIBDIR); then : ; \ +- else $(MKDIR) $(INSTALL_LIBDIR); fi ++ else $(BSD_INSTALL_DATA_DIR) $(INSTALL_LIBDIR); fi + if test -d $(INSTALL_STUBLIBDIR); then : ; \ +- else $(MKDIR) $(INSTALL_STUBLIBDIR); fi ++ else $(BSD_INSTALL_DATA_DIR) $(INSTALL_STUBLIBDIR); fi + if test -d $(INSTALL_COMPLIBDIR); then : ; \ +- else $(MKDIR) $(INSTALL_COMPLIBDIR); fi ++ else $(BSD_INSTALL_DATA_DIR) $(INSTALL_COMPLIBDIR); fi + if test -d $(INSTALL_MANDIR)/man$(MANEXT); then : ; \ +- else $(MKDIR) $(INSTALL_MANDIR)/man$(MANEXT); fi +- cp VERSION $(INSTALL_LIBDIR)/ ++ else $(BSD_INSTALL_MAN_DIR) $(INSTALL_MANDIR)/man$(MANEXT); fi ++ $(BSD_INSTALL_DATA) VERSION $(INSTALL_LIBDIR)/ + cd $(INSTALL_LIBDIR); rm -f dllbigarray.so dllnums.so dllthreads.so \ + dllunix.so dllgraphics.so dllstr.so cd byterun; $(MAKE) install -- cp ocamlc $(BINDIR)/ocamlc$(EXE) -- cp ocaml $(BINDIR)/ocaml$(EXE) -+ $(BSD_INSTALL_SCRIPT) ocamlc $(BINDIR)/ocamlc$(EXE) -+ $(BSD_INSTALL_SCRIPT) ocaml $(BINDIR)/ocaml$(EXE) +- cp ocamlc $(INSTALL_BINDIR)/ocamlc$(EXE) +- cp ocaml $(INSTALL_BINDIR)/ocaml$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlc $(INSTALL_BINDIR)/ocamlc$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocaml $(INSTALL_BINDIR)/ocaml$(EXE) cd stdlib; $(MAKE) install -- cp lex/ocamllex $(BINDIR)/ocamllex$(EXE) -- cp yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE) +- cp lex/ocamllex $(INSTALL_BINDIR)/ocamllex$(EXE) +- cp yacc/ocamlyacc$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE) - cp utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \ -+ $(BSD_INSTALL_SCRIPT) lex/ocamllex $(BINDIR)/ocamllex$(EXE) -+ $(BSD_INSTALL_PROGRAM) yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE) ++ $(BSD_INSTALL_SCRIPT) lex/ocamllex $(INSTALL_BINDIR)/ocamllex$(EXE) ++ $(BSD_INSTALL_SCRIPT) yacc/ocamlyacc$(EXE) $(INSTALL_BINDIR)/ocamlyacc$(EXE) + $(BSD_INSTALL_DATA) utils/*.cmi parsing/*.cmi typing/*.cmi bytecomp/*.cmi driver/*.cmi \ - toplevel/*.cmi $(COMPLIBDIR) + toplevel/*.cmi $(INSTALL_COMPLIBDIR) - cp compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \ + $(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cma compilerlibs/ocamlbytecomp.cma \ compilerlibs/ocamltoplevel.cma $(BYTESTART) $(TOPLEVELSTART) \ - $(COMPLIBDIR) -- cp expunge $(LIBDIR)/expunge$(EXE) -- cp toplevel/topdirs.cmi $(LIBDIR) -+ $(BSD_INSTALL_SCRIPT) expunge $(LIBDIR)/expunge$(EXE) -+ $(BSD_INSTALL_DATA) toplevel/topdirs.cmi $(LIBDIR) + $(INSTALL_COMPLIBDIR) +- cp expunge $(INSTALL_LIBDIR)/expunge$(EXE) +- cp toplevel/topdirs.cmi $(INSTALL_LIBDIR) ++ $(BSD_INSTALL_SCRIPT) expunge $(INSTALL_LIBDIR)/expunge$(EXE) ++ $(BSD_INSTALL_DATA) toplevel/topdirs.cmi $(INSTALL_LIBDIR) cd tools; $(MAKE) install -cd man; $(MAKE) install for i in $(OTHERLIBRARIES); do \ -@@ -297,17 +299,17 @@ install: - if test -f ocamlopt; then $(MAKE) installopt; else :; fi - if test -f debugger/ocamldebug; then (cd debugger; $(MAKE) install); \ +@@ -335,16 +337,16 @@ install: + else :; fi + if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) install); \ else :; fi -- cp config/Makefile $(LIBDIR)/Makefile.config -+ $(BSD_INSTALL_DATA) config/Makefile $(LIBDIR)/Makefile.config - BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) PREFIX=$(PREFIX) \ - ./build/partial-install.sh +- cp config/Makefile $(INSTALL_LIBDIR)/Makefile.config ++ $(BSD_INSTALL_DATA) config/Makefile $(INSTALL_LIBDIR)/Makefile.config + if test -f ocamlopt; then $(MAKE) installopt; else :; fi # Installation of the native-code compiler installopt: cd asmrun; $(MAKE) install -- cp ocamlopt $(BINDIR)/ocamlopt$(EXE) -+ $(BSD_INSTALL_SCRIPT) ocamlopt $(BINDIR)/ocamlopt$(EXE) +- cp ocamlopt $(INSTALL_BINDIR)/ocamlopt$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlopt $(INSTALL_BINDIR)/ocamlopt$(EXE) cd stdlib; $(MAKE) installopt -- cp asmcomp/*.cmi $(COMPLIBDIR) -- cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(COMPLIBDIR) -+ $(BSD_INSTALL_DATA) asmcomp/*.cmi $(COMPLIBDIR) -+ $(BSD_INSTALL_DATA) compilerlibs/ocamloptcomp.cma $(OPTSTART) $(COMPLIBDIR) - cd ocamldoc; $(MAKE) installopt - for i in $(OTHERLIBRARIES); \ - do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done -@@ -315,10 +317,10 @@ installopt: +- cp asmcomp/*.cmi $(INSTALL_COMPLIBDIR) +- cp compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR) ++ $(BSD_INSTALL_DATA) asmcomp/*.cmi $(INSTALL_COMPLIBDIR) ++ $(BSD_INSTALL_DATA) compilerlibs/ocamloptcomp.cma $(OPTSTART) $(INSTALL_COMPLIBDIR) + if test -n "$(WITH_OCAMLDOC)"; then (cd ocamldoc; $(MAKE) installopt); \ + else :; fi + if test -n "$(WITH_OCAMLBUILD)"; then (cd ocamlbuild; $(MAKE) installopt); \ +@@ -355,10 +357,10 @@ installopt: cd tools; $(MAKE) installopt installoptopt: -- cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE) -- cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE) -- cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE) +- cp ocamlc.opt $(INSTALL_BINDIR)/ocamlc.opt$(EXE) +- cp ocamlopt.opt $(INSTALL_BINDIR)/ocamlopt.opt$(EXE) +- cp lex/ocamllex.opt $(INSTALL_BINDIR)/ocamllex.opt$(EXE) - cp compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \ -+ $(BSD_INSTALL_PROGRAM) ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE) -+ $(BSD_INSTALL_PROGRAM) ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE) -+ $(BSD_INSTALL_PROGRAM) lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE) ++ $(BSD_INSTALL_PROGRAM) ocamlc.opt $(INSTALL_BINDIR)/ocamlc.opt$(EXE) ++ $(BSD_INSTALL_PROGRAM) ocamlopt.opt $(INSTALL_BINDIR)/ocamlopt.opt$(EXE) ++ $(BSD_INSTALL_PROGRAM) lex/ocamllex.opt $(INSTALL_BINDIR)/ocamllex.opt$(EXE) + $(BSD_INSTALL_DATA) compilerlibs/ocamlcommon.cmxa compilerlibs/ocamlcommon.a \ compilerlibs/ocamlbytecomp.cmxa compilerlibs/ocamlbytecomp.a \ compilerlibs/ocamloptcomp.cmxa compilerlibs/ocamloptcomp.a \ diff --git a/lang/ocaml/patches/patch-asmrun_Makefile b/lang/ocaml/patches/patch-asmrun_Makefile index 06608d716a2..8c6859eb6e7 100644 --- a/lang/ocaml/patches/patch-asmrun_Makefile +++ b/lang/ocaml/patches/patch-asmrun_Makefile @@ -1,31 +1,31 @@ -$NetBSD: patch-asmrun_Makefile,v 1.2 2013/11/01 10:47:50 jaapb Exp $ +$NetBSD: patch-asmrun_Makefile,v 1.3 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- asmrun/Makefile.orig 2013-06-24 08:16:27.000000000 +0000 +--- asmrun/Makefile.orig 2014-04-12 10:17:02.000000000 +0000 +++ asmrun/Makefile -@@ -63,14 +63,14 @@ libasmrunp.a: $(POBJS) +@@ -65,14 +65,14 @@ INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR) install: install-default install-$(RUNTIMED) install-$(PROFILING) install-default: -- cp libasmrun.a $(LIBDIR)/libasmrun.a -+ $(BSD_INSTALL_DATA) libasmrun.a $(LIBDIR)/libasmrun.a - cd $(LIBDIR); $(RANLIB) libasmrun.a +- cp libasmrun.a $(INSTALL_LIBDIR)/libasmrun.a ++ $(BSD_INSTALL_DATA) libasmrun.a $(INSTALL_LIBDIR)/libasmrun.a + cd $(INSTALL_LIBDIR); $(RANLIB) libasmrun.a install-noruntimed: .PHONY: install-noruntimed install-runtimed: -- cp libasmrund.a $(LIBDIR)/libasmrund.a -+ $(BSD_INSTALL_DATA) libasmrund.a $(LIBDIR)/libasmrund.a - cd $(LIBDIR); $(RANLIB) libasmrund.a +- cp libasmrund.a $(INSTALL_LIBDIR)/libasmrund.a ++ $(BSD_INSTALL_DATA) libasmrund.a $(INSTALL_LIBDIR)/libasmrund.a + cd $(INSTALL_LIBDIR); $(RANLIB) libasmrund.a .PHONY: install-runtimed -@@ -78,7 +78,7 @@ install-noprof: - rm -f $(LIBDIR)/libasmrunp.a; ln -s libasmrun.a $(LIBDIR)/libasmrunp.a +@@ -81,7 +81,7 @@ install-noprof: + ln -s libasmrun.a $(INSTALL_LIBDIR)/libasmrunp.a install-prof: -- cp libasmrunp.a $(LIBDIR)/libasmrunp.a -+ $(BSD_INSTALL_DATA) libasmrunp.a $(LIBDIR)/libasmrunp.a - cd $(LIBDIR); $(RANLIB) libasmrunp.a +- cp libasmrunp.a $(INSTALL_LIBDIR)/libasmrunp.a ++ $(BSD_INSTALL_DATA) libasmrunp.a $(INSTALL_LIBDIR)/libasmrunp.a + cd $(INSTALL_LIBDIR); $(RANLIB) libasmrunp.a power-bsd_elf.S: power-elf.S diff --git a/lang/ocaml/patches/patch-asmrun_power-bsd.S b/lang/ocaml/patches/patch-asmrun_power-bsd.S index 6fab51c20d9..dcb74724249 100644 --- a/lang/ocaml/patches/patch-asmrun_power-bsd.S +++ b/lang/ocaml/patches/patch-asmrun_power-bsd.S @@ -1,9 +1,11 @@ -$NetBSD: patch-asmrun_power-bsd.S,v 1.1 2012/10/08 15:05:32 jaapb Exp $ +$NetBSD: patch-asmrun_power-bsd.S,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Add profiling to power architecture ---- asmrun/power-bsd.S.orig 2012-09-11 13:01:14.000000000 +0000 +--- asmrun/power-bsd.S.orig 2014-08-19 13:37:35.000000000 +0000 +++ asmrun/power-bsd.S -@@ -15,2 +15,31 @@ +@@ -11,6 +11,35 @@ + /* */ + /***********************************************************************/ +#if defined(PROFILING) +#define PROFILE_CAML \ @@ -35,31 +37,61 @@ Add profiling to power architecture +#endif + #define Addrglobal(reg,glob) \ -@@ -35,2 +64,3 @@ caml_system__code_begin: + addis reg, 0, glob@ha; \ + addi reg, reg, glob@l +@@ -31,6 +60,7 @@ caml_system__code_begin: + .globl caml_call_gc + .type caml_call_gc, @function caml_call_gc: + PROFILE_CAML /* Set up stack frame */ -@@ -187,2 +217,3 @@ caml_call_gc: + stwu 1, -0x1A0(1) + /* 0x1A0 = 4*32 (int regs) + 8*32 (float regs) + 32 (space for C call) */ +@@ -183,6 +213,7 @@ caml_call_gc: + .globl caml_c_call + .type caml_c_call, @function caml_c_call: + PROFILE_CAML /* Save return address */ -@@ -215,2 +246,3 @@ caml_c_call: + mflr 25 + /* Get ready to call C function (address in 11) */ +@@ -253,6 +284,7 @@ caml_reraise_exn: + .globl caml_raise_exception + .type caml_raise_exception, @function caml_raise_exception: -+ P ROFILE_C - /* Reload OCaml global registers */ -@@ -235,2 +267,3 @@ caml_raise_exception: ++ PROFILE_C + Loadglobal(0, caml_backtrace_active, 11) + cmpwi 0, 0 + bne .L121 +@@ -287,6 +319,7 @@ caml_raise_exception: + .globl caml_start_program + .type caml_start_program, @function caml_start_program: + PROFILE_C Addrglobal(12, caml_program) -@@ -385,2 +418,3 @@ caml_start_program: + + /* Code shared between caml_start_program and caml_callback */ +@@ -437,6 +470,7 @@ caml_start_program: + .globl caml_callback_exn + .type caml_callback_exn, @function caml_callback_exn: + PROFILE_C /* Initial shuffling of arguments */ -@@ -395,2 +429,3 @@ caml_callback_exn: + mr 0, 3 /* Closure */ + mr 3, 4 /* Argument */ +@@ -447,6 +481,7 @@ caml_callback_exn: + .globl caml_callback2_exn + .type caml_callback2_exn, @function caml_callback2_exn: + PROFILE_C mr 0, 3 /* Closure */ -@@ -405,2 +440,3 @@ caml_callback2_exn: + mr 3, 4 /* First argument */ + mr 4, 5 /* Second argument */ +@@ -457,6 +492,7 @@ caml_callback2_exn: + .globl caml_callback3_exn + .type caml_callback3_exn, @function caml_callback3_exn: + PROFILE_C mr 0, 3 /* Closure */ + mr 3, 4 /* First argument */ + mr 4, 5 /* Second argument */ diff --git a/lang/ocaml/patches/patch-asmrun_signals_osdep.h b/lang/ocaml/patches/patch-asmrun_signals_osdep.h index 70c3060d3d2..b55ff09a654 100644 --- a/lang/ocaml/patches/patch-asmrun_signals_osdep.h +++ b/lang/ocaml/patches/patch-asmrun_signals_osdep.h @@ -1,28 +1,27 @@ -$NetBSD: patch-asmrun_signals_osdep.h,v 1.1 2012/10/08 15:05:32 jaapb Exp $ +$NetBSD: patch-asmrun_signals_osdep.h,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Use correct data structures for power architecture ---- asmrun/signals_osdep.h.orig 2012-02-04 10:15:24.000000000 +0000 +--- asmrun/signals_osdep.h.orig 2014-05-13 13:20:48.000000000 +0000 +++ asmrun/signals_osdep.h -@@ -212,12 +212,22 @@ - #define SET_SIGACT(sigact,name) \ +@@ -248,12 +248,21 @@ sigact.sa_handler = (void (*)(int)) (name); \ sigact.sa_flags = 0 -+ -+ #ifdef __NetBSD__ + ++#ifdef __NetBSD__ + typedef register_t context_reg; + #define CONTEXT_PC (context->sc_frame.srr0) + #define CONTEXT_EXCEPTION_POINTER (context->sc_frame.fixreg[29]) + #define CONTEXT_YOUNG_LIMIT (context->sc_frame.fixreg[30]) + #define CONTEXT_YOUNG_PTR (context->sc_frame.fixreg[31]) -+ -+ #else - ++ #define CONTEXT_SP (context->sc_frame.fixreg[1]) ++#else typedef unsigned long context_reg; #define CONTEXT_PC (context->regs->nip) #define CONTEXT_EXCEPTION_POINTER (context->regs->gpr[29]) #define CONTEXT_YOUNG_LIMIT (context->regs->gpr[30]) #define CONTEXT_YOUNG_PTR (context->regs->gpr[31]) -+ #endif /* __NetBSD */ + #define CONTEXT_SP (context->regs->gpr[1]) ++#endif /* __NetBSD__ */ /****************** PowerPC, BSD */ diff --git a/lang/ocaml/patches/patch-byterun_Makefile b/lang/ocaml/patches/patch-byterun_Makefile index 400fece54c5..291ec3a3af2 100644 --- a/lang/ocaml/patches/patch-byterun_Makefile +++ b/lang/ocaml/patches/patch-byterun_Makefile @@ -1,9 +1,9 @@ -$NetBSD: patch-byterun_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-byterun_Makefile,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- byterun/Makefile.orig 2012-06-04 16:33:59.000000000 +0000 +--- byterun/Makefile.orig 2014-04-07 07:06:17.000000000 +0000 +++ byterun/Makefile -@@ -15,7 +15,7 @@ +@@ -13,7 +13,7 @@ include Makefile.common @@ -11,13 +11,13 @@ Use BSD_INSTALL_* instead of mkdir and cp +CFLAGS+=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR) DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS) $(IFLEXDIR) - OBJS=$(COMMONOBJS) unix.o main.o -@@ -48,7 +48,7 @@ libcamlrun_shared.so: $(PICOBJS) + OBJS=$(COMMONOBJS) $(UNIX_OR_WIN32).o main.o +@@ -46,7 +46,7 @@ libcamlrun_shared.so: $(PICOBJS) install:: if test -f libcamlrun_shared.so; then \ -- cp libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so; fi -+ $(BSD_INSTALL_PROGRAM) libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so; fi +- cp libcamlrun_shared.so $(INSTALL_LIBDIR)/libcamlrun_shared.so; fi ++ $(BSD_INSTALL_PROGRAM) libcamlrun_shared.so $(INSTALL_LIBDIR)/libcamlrun_shared.so; fi clean:: rm -f libcamlrun_shared.so diff --git a/lang/ocaml/patches/patch-camlp4_man_Makefile b/lang/ocaml/patches/patch-camlp4_man_Makefile deleted file mode 100644 index c1d4dd1b52a..00000000000 --- a/lang/ocaml/patches/patch-camlp4_man_Makefile +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-camlp4_man_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- camlp4/man/Makefile.orig 2011-07-27 14:17:02.000000000 +0000 -+++ camlp4/man/Makefile -@@ -20,8 +20,8 @@ include ../config/Makefile.base - - install-local: - if test -n '$(MANDIR)'; then \ -- $(MKDIR) $(MANDIR)/man1 ; \ -- cp $(TARGET) $(MANDIR)/man1/. ; \ -+ $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man1 -+ $(BSD_INSTALL_MAN) $(TARGET) $(MANDIR)/man1/. ; \ - for i in $(ALIASES); do \ - rm -f $(MANDIR)/man1/$$i; \ - echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \ diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure index 2e538aa82a1..2c635239ef9 100644 --- a/lang/ocaml/patches/patch-configure +++ b/lang/ocaml/patches/patch-configure @@ -1,11 +1,10 @@ -$NetBSD: patch-configure,v 1.7 2013/11/04 16:39:32 joerg Exp $ +$NetBSD: patch-configure,v 1.8 2014/10/09 19:08:28 jaapb Exp $ Several configure changes to work on and detect NetBSD (and some other OSes) - ---- configure.orig 2013-07-23 14:48:47.000000000 +0000 +--- configure.orig 2014-08-21 10:06:19.000000000 +0000 +++ configure -@@ -271,14 +271,14 @@ iflexdir="" - case "$bytecc,$host" in +@@ -318,11 +318,11 @@ TOOLCHAIN="cc" + case "$bytecc,$target" in cc,*-*-nextstep*) # GNU C extensions disabled, but __GNUC__ still defined! - bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix" @@ -17,12 +16,8 @@ Several configure changes to work on and detect NetBSD (and some other OSes) + bytecccompopts="$gcc_warnings -DSHRINKED_GNUC" mathlib="";; *,*-*-darwin*) -- bytecccompopts="-fno-defer-pop $gcc_warnings" -+ bytecccompopts="$gcc_warnings" - mathlib="" - mkexe="$mkexe -Wl,-no_compact_unwind" - # Tell gcc that we can use 32-bit code addresses for threaded code -@@ -287,11 +287,11 @@ case "$bytecc,$host" in + bytecccompopts="$gcc_warnings" +@@ -334,11 +334,11 @@ case "$bytecc,$target" in echo "# define ARCH_CODE32" >> m.h echo "#endif" >> m.h;; *,*-*-beos*) @@ -30,30 +25,39 @@ Several configure changes to work on and detect NetBSD (and some other OSes) + bytecccompopts="$gcc_warnings" # No -lm library mathlib="";; - gcc,alpha*-*-osf*) + *gcc,alpha*-*-osf*) - bytecccompopts="-fno-defer-pop $gcc_warnings" + bytecccompopts="$gcc_warnings" if cc="$bytecc" sh ./hasgot -mieee; then bytecccompopts="-mieee $bytecccompopts"; fi -@@ -319,11 +319,11 @@ case "$bytecc,$host" in +@@ -366,11 +366,11 @@ case "$bytecc,$target" in bytecccompopts="-DUMK";; - gcc*,powerpc-*-aix*) + *gcc*,powerpc-*-aix*) # Avoid name-space pollution by requiring Unix98-conformant includes - bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";; + bytecccompopts="$gcc_warnings -D_XOPEN_SOURCE=500";; *,powerpc-*-aix*) bytecccompopts="-D_XOPEN_SOURCE=500";; - gcc*,*-*-cygwin*) + *gcc*,*-*-cygwin*) - bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32" + bytecccompopts="$gcc_warnings -U_WIN32" dllccompopts="-U_WIN32 -DCAML_DLL" - if test $withsharedlibs = yes; then + if test $with_sharedlibs = yes; then flexlink="flexlink -chain cygwin -merge-manifest -stack 16777216" -@@ -340,14 +340,14 @@ case "$bytecc,$host" in +@@ -391,7 +391,7 @@ case "$bytecc,$target" in exe=".exe" ostype="Cygwin";; - gcc*,x86_64-*-linux*) + *gcc*,*-*-mingw*) +- bytecccompopts="-fno-defer-pop $gcc_warnings" ++ bytecccompopts="$gcc_warnings" + dllccompopt="-DCAML_DLL" + if test $with_sharedlibs = yes; then + case "$target" in +@@ -415,14 +415,14 @@ case "$bytecc,$target" in + SO="dll" + ;; + *gcc*,x86_64-*-linux*) - bytecccompopts="-fno-defer-pop $gcc_warnings" + bytecccompopts="$gcc_warnings" # Tell gcc that we can use 32-bit code addresses for threaded code @@ -61,13 +65,13 @@ Several configure changes to work on and detect NetBSD (and some other OSes) echo "#ifndef __PIC__" >> m.h echo "# define ARCH_CODE32" >> m.h echo "#endif" >> m.h;; - gcc*) + *gcc*) - bytecccompopts="-fno-defer-pop $gcc_warnings";; + bytecccompopts="$gcc_warnings";; esac # Configure compiler to use in further tests -@@ -542,7 +542,7 @@ if test $withsharedlibs = "yes"; then +@@ -655,7 +655,7 @@ if test $with_sharedlibs = "yes"; then mksharedlib="$flexlink" mkmaindll="$flexlink -maindll" shared_libraries_supported=true;; @@ -76,7 +80,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) sharedcccompopts="-fPIC" mksharedlib="$bytecc -shared" bytecclinkopts="$bytecclinkopts -Wl,-E" -@@ -638,7 +638,7 @@ if test $withsharedlibs = "yes"; then +@@ -752,7 +752,7 @@ if test $with_sharedlibs = "yes"; then x86_64-*-linux*) natdynlink=true;; i[3456]86-*-darwin[89].*) natdynlink=true;; i[3456]86-*-darwin*) @@ -85,16 +89,16 @@ Several configure changes to work on and detect NetBSD (and some other OSes) natdynlink=true fi;; x86_64-*-darwin*) natdynlink=true;; -@@ -652,6 +652,8 @@ if test $withsharedlibs = "yes"; then +@@ -766,6 +766,8 @@ if test $with_sharedlibs = "yes"; then x86_64-*-openbsd*) natdynlink=true;; - i[345]86-*-netbsd*) natdynlink=true;; + i[3456]86-*-netbsd*) natdynlink=true;; x86_64-*-netbsd*) natdynlink=true;; -+ i[345]86-*-dragonfly) natdynlink=true;; -+ x86_64-*-dragonfly) natdynlink=true;; ++ i[3456]86-*-dragonfly*) natdynlink=true;; ++ x86_64-*-dragonfly*) natdynlink=true;; i386-*-gnu0.3) natdynlink=true;; arm*-*-linux*) natdynlink=true;; - esac -@@ -677,6 +679,7 @@ case "$host" in + arm*-*-freebsd*) natdynlink=true;; +@@ -793,6 +795,7 @@ case "$target" in sparc*-*-gnu*) arch=sparc; system=gnu;; i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;; i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;; @@ -102,7 +106,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) i[3456]86-*-nextstep*) arch=i386; system=nextstep;; i[3456]86-*-solaris*) if $arch64; then arch=amd64; system=solaris -@@ -685,6 +688,7 @@ case "$host" in +@@ -801,6 +804,7 @@ case "$target" in fi;; i[3456]86-*-beos*) arch=i386; system=beos;; i[3456]86-*-cygwin*) arch=i386; system=cygwin;; @@ -110,7 +114,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) i[3456]86-*-darwin*) if $arch64; then arch=amd64; system=macosx else -@@ -697,6 +701,7 @@ case "$host" in +@@ -814,6 +818,7 @@ case "$target" in powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; powerpc-*-darwin*) arch=power; system=rhapsody if $arch64;then model=ppc64;else model=ppc;fi;; @@ -118,16 +122,15 @@ Several configure changes to work on and detect NetBSD (and some other OSes) armv6*-*-linux-gnueabihf) arch=arm; model=armv6; system=linux_eabihf;; arm*-*-linux-gnueabihf) arch=arm; system=linux_eabihf;; armv7*-*-linux-gnueabi) arch=arm; model=armv7; system=linux_eabi;; -@@ -709,6 +714,8 @@ case "$host" in +@@ -829,6 +834,7 @@ case "$target" in x86_64-*-gnu*) arch=amd64; system=gnu;; x86_64-*-freebsd*) arch=amd64; system=freebsd;; x86_64-*-netbsd*) arch=amd64; system=netbsd;; + x86_64-*-dragonfly*) arch=amd64; system=dragonfly;; -+ x86_64-*-solaris*) arch=amd64; system=solaris;; x86_64-*-openbsd*) arch=amd64; system=openbsd;; x86_64-*-darwin*) arch=amd64; system=macosx;; - esac -@@ -745,7 +752,7 @@ case "$arch,$nativecc,$system,$host_type + x86_64-*-mingw*) arch=amd64; system=mingw;; +@@ -868,7 +874,7 @@ case "$arch,$nativecc,$system,$target" i if $arch64; then partialld="ld -r -arch ppc64"; fi;; *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";; @@ -136,27 +139,24 @@ Several configure changes to work on and detect NetBSD (and some other OSes) *,gcc*,*,*) nativecccompopts="$gcc_warnings";; esac -@@ -765,8 +772,8 @@ case "$arch,$model,$system" in - aspp='gcc -c';; - arm,*,*) as='as'; - aspp='gcc -c';; -- i386,*,solaris) as='as' -- aspp='/usr/ccs/bin/as -P';; -+ i386,*,solaris) as='as --32' -+ aspp='gcc -traditional -c';; - i386,*,*) as='as' - aspp='gcc -c';; - power,*,elf) as='as -u -m ppc' -@@ -800,6 +807,8 @@ case "$arch,$model,$system" in - amd64,*,linux) profiling='prof';; - amd64,*,gnu) profiling='prof';; - arm,*,linux*) profiling='prof';; -+ power,*,bsd) profiling='prof';; -+ *,*,dragonfly) profiling='prof';; +@@ -885,7 +891,7 @@ case "$arch,$system" in + amd64,solaris) as="${TOOLPREF}as --64" + aspp="${TOOLPREF}gcc -m64 -c";; + i386,solaris) as="${TOOLPREF}as" +- aspp="/usr/ccs/bin/${TOOLPREF}as -P";; ++ aspp="gcc -traditional -c";; + power,elf) as="${TOOLPREF}as -u -m ppc" + aspp="${TOOLPREF}gcc -c";; + power,rhapsody) as="${TOOLPREF}as -arch $model" +@@ -924,6 +930,7 @@ case "$arch,$system" in + arm,linux*) profiling='prof';; + power,elf) profiling='prof';; + power,bsd*) profiling='prof';; ++ *,*,dragonfly) profiling='prof';; *) profiling='noprof';; esac -@@ -1258,6 +1267,8 @@ fi +@@ -1413,6 +1420,8 @@ fi x11_include="not found" x11_link="not found" @@ -165,7 +165,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then if pkg-config --exists x11 2>/dev/null; then x11_include=`pkg-config --cflags x11` -@@ -1304,6 +1315,7 @@ if test "$x11_include" = "not found"; th +@@ -1459,6 +1468,7 @@ if test "$x11_include" = "not found"; th /usr/XFree86/include/X11 \ \ /usr/include \ @@ -173,7 +173,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes) /usr/local/include \ /usr/unsupported/include \ /usr/athena/include \ -@@ -1361,6 +1373,7 @@ if test "$x11_include" = "not found"; th +@@ -1516,6 +1526,7 @@ if test "$x11_include" = "not found"; th \ /usr/lib64 \ /usr/lib \ @@ -181,18 +181,18 @@ Several configure changes to work on and detect NetBSD (and some other OSes) /usr/local/lib \ /usr/unsupported/lib \ /usr/athena/lib \ -@@ -1382,18 +1395,16 @@ if test "$x11_include" = "not found"; th +@@ -1537,18 +1548,16 @@ if test "$x11_include" = "not found"; th if test $dir = /usr/lib; then x11_link="-lX11" else - x11_libs="-L$dir" -- case "$host" in +- case "$target" in - *-kfreebsd*-gnu) x11_link="-L$dir -lX11";; - *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";; - *) x11_link="-L$dir -lX11";; - esac -+ x11_libs="-L$dir ${COMPILER_RPATH_FLAG}$dir" -+ x11_link="-L$dir ${COMPILER_RPATH_FLAG}$dir -lX11" ++ x11_libs="-L$dir ${COMPILER_RPATH_FLAG}$dir" ++ x11_link="-L$dir ${COMPILER_RPATH_FLAG}$dir -lX11" fi break fi diff --git a/lang/ocaml/patches/patch-debugger_Makefile.shared b/lang/ocaml/patches/patch-debugger_Makefile.shared index 98f1e322288..91d704e7906 100644 --- a/lang/ocaml/patches/patch-debugger_Makefile.shared +++ b/lang/ocaml/patches/patch-debugger_Makefile.shared @@ -1,14 +1,14 @@ -$NetBSD: patch-debugger_Makefile.shared,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-debugger_Makefile.shared,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- debugger/Makefile.shared.orig 2012-05-31 12:41:49.000000000 +0000 +--- debugger/Makefile.shared.orig 2014-04-29 11:56:17.000000000 +0000 +++ debugger/Makefile.shared -@@ -83,7 +83,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS) +@@ -86,7 +86,7 @@ ocamldebug$(EXE): $(OBJS) $(OTHEROBJS) $(CAMLC) $(LINKFLAGS) -o ocamldebug$(EXE) -linkall $(OTHEROBJS) $(OBJS) install: -- cp ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE) -+ $(BSD_INSTALL_SCRIPT) ocamldebug$(EXE) $(BINDIR)/ocamldebug$(EXE) +- cp ocamldebug$(EXE) $(INSTALL_BINDIR)/ocamldebug$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamldebug$(EXE) $(INSTALL_BINDIR)/ocamldebug$(EXE) clean:: rm -f ocamldebug$(EXE) diff --git a/lang/ocaml/patches/patch-man_Makefile b/lang/ocaml/patches/patch-man_Makefile index f0a66e8d1d5..4cb3ff42112 100644 --- a/lang/ocaml/patches/patch-man_Makefile +++ b/lang/ocaml/patches/patch-man_Makefile @@ -1,14 +1,14 @@ -$NetBSD: patch-man_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-man_Makefile,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- man/Makefile.orig 2012-03-16 15:53:07.000000000 +0000 +--- man/Makefile.orig 2014-04-12 10:17:02.000000000 +0000 +++ man/Makefile -@@ -17,7 +17,7 @@ include ../config/Makefile - DIR=$(MANDIR)/man$(MANEXT) +@@ -15,7 +15,7 @@ include ../config/Makefile + INSTALL_DIR=$(DESTDIR)$(MANDIR)/man$(MANEXT) install: -- for i in *.m; do cp $$i $(DIR)/`basename $$i .m`.$(MANEXT); done -+ for i in *.m; do $(BSD_INSTALL_MAN) $$i $(DIR)/`basename $$i .m`.$(MANEXT); done - echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' > $(DIR)/ocamlc.opt.$(MANEXT) - echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' > $(DIR)/ocamlopt.opt.$(MANEXT) - echo '.so man$(MANEXT)/ocamlcp.$(MANEXT)' > $(DIR)/ocamloptp.$(MANEXT) +- for i in *.m; do cp $$i $(INSTALL_DIR)/`basename $$i .m`.$(MANEXT); done ++ for i in *.m; do $(BSD_INSTALL_MAN) $$i $(INSTALL_DIR)/`basename $$i .m`.$(MANEXT); done + echo '.so man$(MANEXT)/ocamlc.$(MANEXT)' \ + > $(INSTALL_DIR)/ocamlc.opt.$(MANEXT) + echo '.so man$(MANEXT)/ocamlopt.$(MANEXT)' \ diff --git a/lang/ocaml/patches/patch-ocamldoc_Makefile b/lang/ocaml/patches/patch-ocamldoc_Makefile index 70e688bd2e5..6198b3328df 100644 --- a/lang/ocaml/patches/patch-ocamldoc_Makefile +++ b/lang/ocaml/patches/patch-ocamldoc_Makefile @@ -1,9 +1,18 @@ -$NetBSD: patch-ocamldoc_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-ocamldoc_Makefile,v 1.2 2014/10/09 19:08:28 jaapb Exp $ -Use BSD_INSTALL_* instead of mkdir and cp ---- ocamldoc/Makefile.orig 2012-07-13 11:23:13.000000000 +0000 +Use BSD_INSTALL_* instead of mkdir and cp; install in man3o +--- ocamldoc/Makefile.orig 2014-07-21 15:44:24.000000000 +0000 +++ ocamldoc/Makefile -@@ -273,24 +273,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll +@@ -41,7 +41,7 @@ INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/oca + INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom + INSTALL_BINDIR=$(DESTDIR)$(OCAMLBIN) + #MANO: man ocamldoc +-INSTALL_MANODIR=$(DESTDIR)$(MANDIR)/man3 ++INSTALL_MANODIR=$(DESTDIR)$(MANDIR)/man3o + + INSTALL_MLIS=odoc_info.mli + INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi) +@@ -240,24 +240,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll # Installation targets ###################### install: dummy @@ -21,11 +30,11 @@ Use BSD_INSTALL_* instead of mkdir and cp + $(BSD_INSTALL_SCRIPT) $(OCAMLDOC) $(INSTALL_BINDIR)/$(OCAMLDOC)$(EXE) + $(BSD_INSTALL_DATA) ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) $(INSTALL_LIBDIR) + $(BSD_INSTALL_DATA) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) -+ if test -d $(INSTALL_MANODIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALL_MANODIR); fi -+ if test -d stdlib_man; then $(BSD_INSTALL_DATA) stdlib_man/* $(INSTALL_MANODIR); else : ; fi ++ if test -d $(INSTALL_MANODIR); then : ; else $(BSD_INSTALL_MAN_DIR) $(INSTALL_MANODIR); fi ++ if test -d stdlib_man; then $(BSD_INSTALL_MAN) stdlib_man/* $(INSTALL_MANODIR); else : ; fi installopt: - if test -f $(OCAMLDOC_OPT) ; then $(MAKE) installopt_really ; fi + if test -f $(OCAMLDOC_OPT); then $(MAKE) installopt_really ; fi installopt_really: - if test -d $(INSTALL_BINDIR); then : ; else $(MKDIR) $(INSTALL_BINDIR); fi @@ -34,7 +43,7 @@ Use BSD_INSTALL_* instead of mkdir and cp - $(CP) ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR) - $(CP) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) + if test -d $(INSTALL_BINDIR); then : ; else $(BSD_INSTALL_PROGRAM_DIR) $(INSTALL_BINDIR); fi -+ if test -d $(INSTALL_LIBDIR); then : ; else $(BSD_INSTAALL_DATA_DIR) $(INSTALL_LIBDIR); fi ++ if test -d $(INSTALL_LIBDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALL_LIBDIR); fi + $(BSD_INSTALL_PROGRAM) $(OCAMLDOC_OPT) $(INSTALL_BINDIR)/$(OCAMLDOC_OPT)$(EXE) + $(BSD_INSTALL_DATA) ocamldoc.hva $(OCAMLDOC_LIBA) $(OCAMLDOC_LIBCMXA) $(INSTALL_LIBDIR) + $(BSD_INSTALL_DATA) $(INSTALL_MLIS) $(INSTALL_CMIS) $(INSTALL_LIBDIR) diff --git a/lang/ocaml/patches/patch-otherlibs_Makefile.shared b/lang/ocaml/patches/patch-otherlibs_Makefile.shared index dc196f025f1..638b4e776ca 100644 --- a/lang/ocaml/patches/patch-otherlibs_Makefile.shared +++ b/lang/ocaml/patches/patch-otherlibs_Makefile.shared @@ -1,28 +1,28 @@ -$NetBSD: patch-otherlibs_Makefile.shared,v 1.2 2013/02/18 16:29:28 jaapb Exp $ +$NetBSD: patch-otherlibs_Makefile.shared,v 1.3 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/Makefile.shared.orig 2011-07-27 14:17:02.000000000 +0000 +--- otherlibs/Makefile.shared.orig 2014-04-29 11:56:17.000000000 +0000 +++ otherlibs/Makefile.shared -@@ -58,16 +58,16 @@ lib$(CLIBNAME).$(A): $(COBJS) +@@ -61,16 +61,16 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI install:: if test -f dll$(CLIBNAME)$(EXT_DLL); then \ -- cp dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi -- cp lib$(CLIBNAME).$(A) $(LIBDIR)/ -+ $(BSD_INSTALL_LIB) dll$(CLIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi -+ $(BSD_INSTALL_DATA) lib$(CLIBNAME).$(A) $(LIBDIR)/ - cd $(LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A) -- cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/ -- if test -n "$(HEADERS)"; then cp $(HEADERS) $(LIBDIR)/caml/; fi -+ $(BSD_INSTALL_DATA) $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(LIBDIR)/ -+ if test -n "$(HEADERS)"; then $(BSD_INSTALL_DATA) $(HEADERS) $(LIBDIR)/caml/; fi +- cp dll$(CLIBNAME)$(EXT_DLL) $(INSTALL_STUBLIBDIR)/; fi +- cp lib$(CLIBNAME).$(A) $(INSTALL_LIBDIR)/ ++ $(BSD_INSTALL_LIB) dll$(CLIBNAME)$(EXT_DLL) $(INSTALL_STUBLIBDIR)/; fi ++ $(BSD_INSTALL_DATA) lib$(CLIBNAME).$(A) $(INSTALL_LIBDIR)/ + cd $(INSTALL_LIBDIR); $(RANLIB) lib$(CLIBNAME).$(A) +- cp $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(INSTALL_LIBDIR)/ +- if test -n "$(HEADERS)"; then cp $(HEADERS) $(INSTALL_LIBDIR)/caml/; fi ++ $(BSD_INSTALL_DATA) $(LIBNAME).cma $(CMIFILES) $(CMIFILES:.cmi=.mli) $(INSTALL_LIBDIR)/ ++ if test -n "$(HEADERS)"; then $(BSD_INSTALL_DATA) $(HEADERS) $(INSTALL_LIBDIR)/caml/; fi installopt: -- cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/ -+ $(BSD_INSTALL_DATA) $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(LIBDIR)/ - cd $(LIBDIR); $(RANLIB) $(LIBNAME).a -- if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(LIBDIR)/; fi -+ if test -f $(LIBNAME).cmxs; then $(BSD_INSTALL_DATA) $(LIBNAME).cmxs $(LIBDIR)/; fi +- cp $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALL_LIBDIR)/ ++ $(BSD_INSTALL_DATA) $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALL_LIBDIR)/ + cd $(INSTALL_LIBDIR); $(RANLIB) $(LIBNAME).a +- if test -f $(LIBNAME).cmxs; then cp $(LIBNAME).cmxs $(INSTALL_LIBDIR)/; fi ++ if test -f $(LIBNAME).cmxs; then $(BSD_INSTALL_DATA) $(LIBNAME).cmxs $(INSTALL_LIBDIR)/; fi partialclean: rm -f *.cm* diff --git a/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile b/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile index 2a590abf446..ea6c5dd5b88 100644 --- a/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile +++ b/lang/ocaml/patches/patch-otherlibs_dynlink_Makefile @@ -1,21 +1,21 @@ -$NetBSD: patch-otherlibs_dynlink_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-otherlibs_dynlink_Makefile,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/dynlink/Makefile.orig 2012-05-30 13:29:48.000000000 +0000 +--- otherlibs/dynlink/Makefile.orig 2014-04-29 11:56:17.000000000 +0000 +++ otherlibs/dynlink/Makefile -@@ -66,12 +66,12 @@ extract_crc: dynlink.cma extract_crc.cmo - $(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo +@@ -74,12 +74,12 @@ extract_crc: dynlink.cma extract_crc.cmo + INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR) install: -- cp dynlink.cmi dynlink.cma dynlink.mli $(LIBDIR) -- cp extract_crc $(LIBDIR)/extract_crc$(EXE) -+ $(BSD_INSTALL_DATA) dynlink.cmi dynlink.cma dynlink.mli $(LIBDIR) -+ $(BSD_INSTALL_SCRIPT) extract_crc $(LIBDIR)/extract_crc$(EXE) +- cp dynlink.cmi dynlink.cma dynlink.mli $(INSTALL_LIBDIR) +- cp extract_crc $(INSTALL_LIBDIR)/extract_crc$(EXE) ++ $(BSD_INSTALL_DATA) dynlink.cmi dynlink.cma dynlink.mli $(INSTALL_LIBDIR) ++ $(BSD_INSTALL_SCRIPT) extract_crc $(INSTALL_LIBDIR)/extract_crc$(EXE) installopt: if $(NATDYNLINK); then \ -- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \ -+ $(BSD_INSTALL_DATA) $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \ - cd $(LIBDIR) && $(RANLIB) dynlink.$(A); \ +- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(INSTALL_LIBDIR) && \ ++ $(BSD_INSTALL_DATA) $(NATOBJS) dynlink.cmxa dynlink.$(A) $(INSTALL_LIBDIR) && \ + cd $(INSTALL_LIBDIR) && $(RANLIB) dynlink.$(A); \ fi diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_browser_Makefile.shared b/lang/ocaml/patches/patch-otherlibs_labltk_browser_Makefile.shared deleted file mode 100644 index f052e4395dd..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_labltk_browser_Makefile.shared +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-otherlibs_labltk_browser_Makefile.shared,v 1.1 2012/10/08 15:05:33 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/labltk/browser/Makefile.shared.orig 2012-05-30 13:29:48.000000000 +0000 -+++ otherlibs/labltk/browser/Makefile.shared -@@ -63,7 +63,7 @@ help.ml: - - install: - if test -f ocamlbrowser$(EXE); then : ; \ -- cp ocamlbrowser$(EXE) $(BINDIR); fi -+ $(BSD_INSTALL_SCRIPT) ocamlbrowser$(EXE) $(BINDIR); fi - - clean: - rm -f *.cm? ocamlbrowser$(EXE) dummy.mli *~ *.orig *.$(O) help.ml diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_camltk_Makefile b/lang/ocaml/patches/patch-otherlibs_labltk_camltk_Makefile deleted file mode 100644 index 48ec0ae28dd..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_labltk_camltk_Makefile +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-otherlibs_labltk_camltk_Makefile,v 1.2 2013/11/01 10:47:50 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/labltk/camltk/Makefile.orig 2013-03-19 17:49:49.000000000 +0000 -+++ otherlibs/labltk/camltk/Makefile -@@ -32,14 +32,14 @@ camltkobjs: $(CAMLTKOBJS) - camltkobjsx: $(CAMLTKOBJSX) - - install: -- if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi -- cp $(CAMLTKOBJS:.cmo=.cmi) $(INSTALLDIR) -- cp $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR) -+ if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi -+ $(BSD_INSTALL_DATA) $(CAMLTKOBJS:.cmo=.cmi) $(INSTALLDIR) -+ $(BSD_INSTALL_DATA) $(CWIDGETOBJS:.cmo=.mli) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/*.cmi - - installopt: -- @if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi -- cp $(CAMLTKOBJSX) $(INSTALLDIR) -+ @if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi -+ $(BSD_INSTALL_DATA) $(CAMLTKOBJSX) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/*.cmx - - clean: diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_compiler_Makefile b/lang/ocaml/patches/patch-otherlibs_labltk_compiler_Makefile deleted file mode 100644 index 3018c58d5a1..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_labltk_compiler_Makefile +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-otherlibs_labltk_compiler_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/labltk/compiler/Makefile.orig 2011-07-27 14:17:02.000000000 +0000 -+++ otherlibs/labltk/compiler/Makefile -@@ -61,8 +61,8 @@ scratch : - rm -f *.cm* pplex.ml ppyac.ml ppyac.mli pp$(EXE) - - install: -- cp tkcompiler$(EXE) $(INSTALLDIR) -- cp pp$(EXE) $(INSTALLDIR) -+ $(BSD_INSTALL_SCRIPT) tkcompiler$(EXE) $(INSTALLDIR) -+ $(BSD_INSTALL_SCRIPT) pp$(EXE) $(INSTALLDIR) - - .SUFFIXES : - .SUFFIXES : .mli .ml .cmi .cmo .mlp diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_frx_Makefile b/lang/ocaml/patches/patch-otherlibs_labltk_frx_Makefile deleted file mode 100644 index 12f7f350bdd..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_labltk_frx_Makefile +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-otherlibs_labltk_frx_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/labltk/frx/Makefile.orig 2011-07-27 14:17:02.000000000 +0000 -+++ otherlibs/labltk/frx/Makefile -@@ -36,10 +36,10 @@ frxlib.cmxa: $(OBJSX) - $(CAMLOPTLIBR) -o frxlib.cmxa $(OBJSX) - - install: -- cp *.cmi *.mli frxlib.cma $(INSTALLDIR) -+ $(BSD_INSTALL_DATA) *.cmi *.mli frxlib.cma $(INSTALLDIR) - - installopt: -- cp frxlib.cmxa frxlib.$(A) $(INSTALLDIR) -+ $(BSD_INSTALL_DATA) frxlib.cmxa frxlib.$(A) $(INSTALLDIR) - - clean: - rm -f *.cm* *.$(O) *.$(A) diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_jpf_Makefile b/lang/ocaml/patches/patch-otherlibs_labltk_jpf_Makefile deleted file mode 100644 index 8d5c2521d6b..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_labltk_jpf_Makefile +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-otherlibs_labltk_jpf_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/labltk/jpf/Makefile.orig 2011-07-27 14:17:02.000000000 +0000 -+++ otherlibs/labltk/jpf/Makefile -@@ -37,10 +37,10 @@ jpflib.cmxa: $(OBJSX) - $(CAMLOPTLIBR) -o jpflib.cmxa $(OBJSX) - - install: -- cp $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR) -+ $(BSD_INSTALL_DATA) $(OBJS:.cmo=.cmi) $(OBJS:.cmo=.mli) jpflib.cma $(INSTALLDIR) - - installopt: -- cp jpflib.cmxa jpflib.$(A) $(OBJS:.cmo=.cmx) $(INSTALLDIR) -+ $(BSD_INSTALL_DATA) jpflib.cmxa jpflib.$(A) $(OBJS:.cmo=.cmx) $(INSTALLDIR) - - clean: - rm -f *.cm* *.$(O) *.$(A) *~ *test diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_labltk_Makefile b/lang/ocaml/patches/patch-otherlibs_labltk_labltk_Makefile deleted file mode 100644 index a8a055bdb32..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_labltk_labltk_Makefile +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-otherlibs_labltk_labltk_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/labltk/labltk/Makefile.orig 2011-07-27 14:17:02.000000000 +0000 -+++ otherlibs/labltk/labltk/Makefile -@@ -32,13 +32,13 @@ labltkobjs: $(LABLTKOBJS) - labltkobjsx: $(LABLTKOBJSX) - - install: -- if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi -- cp $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR) -+ if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi -+ $(BSD_INSTALL_DATA) $(LABLTKOBJS:.cmo=.cmi) $(WIDGETOBJS:.cmo=.mli) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/*.cmi - - installopt: -- @if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi -- cp $(LABLTKOBJSX) $(INSTALLDIR) -+ @if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi -+ $(BSD_INSTALL_DATA) $(LABLTKOBJSX) $(INSTALLDIR) - chmod 644 $(INSTALLDIR)/*.cmx - - clean: diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_lib_Makefile b/lang/ocaml/patches/patch-otherlibs_labltk_lib_Makefile deleted file mode 100644 index 9d1e69bdcae..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_labltk_lib_Makefile +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-otherlibs_labltk_lib_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/labltk/lib/Makefile.orig 2012-05-24 16:17:19.000000000 +0000 -+++ otherlibs/labltk/lib/Makefile -@@ -80,26 +80,21 @@ $(LIBNAME): Makefile $(TOPDIR)/config/Ma - @echo 'exec $(INSTALLDIR)/$(LIBNAME)top$(EXE) -I $(INSTALLDIR) "$$@"' >> $@ - - install-script: $(LIBNAME) -- cp $(LIBNAME) $(BINDIR) -- chmod 755 $(BINDIR)/$(LIBNAME) -+ $(BSD_INSTALL_SCRIPT) $(LIBNAME) $(BINDIR) - - install-batch: - cp labltk.bat $(BINDIR) - - install: -- if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi -- cp $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR) -- chmod 644 $(INSTALLDIR)/$(LIBNAME).cma -- chmod 755 $(INSTALLDIR)/$(LIBNAME)top$(EXE) -- @if test -d $(BINDIR); then : ; else mkdir $(BINDIR); fi -+ if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi -+ $(BSD_INSTALL_DATA) $(LIBNAME).cma $(LIBNAME)top$(EXE) $(INSTALLDIR) -+ @if test -d $(BINDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(BINDIR); fi - @case x$(TOOLCHAIN) in \ - xmingw|xmsvc) $(MAKE) install-batch ;; \ - *) $(MAKE) install-script ;; \ - esac - - installopt: -- @if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi -- cp $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALLDIR) -+ @if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi -+ $(BSD_INSTALL_DATA) $(LIBNAME).cmxa $(LIBNAME).$(A) $(INSTALLDIR) - cd $(INSTALLDIR); $(RANLIB) $(LIBNAME).$(A) -- chmod 644 $(INSTALLDIR)/$(LIBNAME).cmxa -- chmod 644 $(INSTALLDIR)/$(LIBNAME).$(A) diff --git a/lang/ocaml/patches/patch-otherlibs_labltk_support_Makefile b/lang/ocaml/patches/patch-otherlibs_labltk_support_Makefile deleted file mode 100644 index e79a5fa6441..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_labltk_support_Makefile +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-otherlibs_labltk_support_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/labltk/support/Makefile.orig 2011-09-15 13:38:45.000000000 +0000 -+++ otherlibs/labltk/support/Makefile -@@ -42,19 +42,17 @@ PUBMLI=fileevent.mli protocol.mli textva - PUB= $(PUBMLI) $(PUBMLI:.mli=.cmi) tkthread.mli tkthread.cmi tkthread.cmo - - install: -- if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi -- cp $(PUB) lib$(LIBNAME).$(A) $(INSTALLDIR) -+ if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi -+ $(BSD_INSTALL_DATA) $(PUB) lib$(LIBNAME).$(A) $(INSTALLDIR) - cd $(INSTALLDIR); $(RANLIB) lib$(LIBNAME).$(A) -- cd $(INSTALLDIR); chmod 644 $(PUB) lib$(LIBNAME).$(A) - if test -f dll$(LIBNAME)$(EXT_DLL); then \ -- cp dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi -+ $(BSD_INSTALL_DATA) dll$(LIBNAME)$(EXT_DLL) $(STUBLIBDIR)/; fi - - installopt: -- @if test -d $(INSTALLDIR); then : ; else mkdir $(INSTALLDIR); fi -- cp $(PUBMLI:.mli=.cmx) $(INSTALLDIR) -+ @if test -d $(INSTALLDIR); then : ; else $(BSD_INSTALL_DATA_DIR) $(INSTALLDIR); fi -+ $(BSD_INSTALL_DATA) $(PUBMLI:.mli=.cmx) $(INSTALLDIR) - if test -f tkthread.$(O); then \ -- cp tkthread.cmx tkthread.$(O) $(INSTALLDIR); \ -- chmod 644 $(INSTALLDIR)/tkthread.cmx $(INSTALLDIR)/tkthread.$(O); \ -+ $(BSD_INSTALL_DATA) tkthread.cmx tkthread.$(O) $(INSTALLDIR); \ - fi - - clean: diff --git a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile index 04e596aef2b..95b4f8b8986 100644 --- a/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile +++ b/lang/ocaml/patches/patch-otherlibs_systhreads_Makefile @@ -1,33 +1,35 @@ -$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.2 2013/02/18 16:29:28 jaapb Exp $ +$NetBSD: patch-otherlibs_systhreads_Makefile,v 1.3 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/systhreads/Makefile.orig 2012-06-08 11:35:37.000000000 +0000 +--- otherlibs/systhreads/Makefile.orig 2014-04-29 11:56:17.000000000 +0000 +++ otherlibs/systhreads/Makefile -@@ -70,19 +70,19 @@ clean: partialclean - rm -f *.o *.a *.so +@@ -77,21 +77,21 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI install: -- if test -f dllthreads.so; then cp dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi -- cp libthreads.a $(LIBDIR)/libthreads.a -+ if test -f dllthreads.so; then $(BSD_INSTALL_LIB) dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi -+ $(BSD_INSTALL_DATA) libthreads.a $(LIBDIR)/libthreads.a - cd $(LIBDIR); $(RANLIB) libthreads.a -- if test -d $(LIBDIR)/threads; then :; else mkdir $(LIBDIR)/threads; fi -- cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads -+ if test -d $(LIBDIR)/threads; then :; else $(BSD_INSTALL_DATA_DIR) $(LIBDIR)/threads; fi -+ $(BSD_INSTALL_DATA) $(THREAD_OBJS:.cmo=.cmi) threads.cma $(LIBDIR)/threads - rm -f $(LIBDIR)/threads/stdlib.cma -- cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR) -- cp threads.h $(LIBDIR)/caml/threads.h -+ $(BSD_INSTALL_DATA) thread.mli mutex.mli condition.mli event.mli threadUnix.mli $(LIBDIR) -+ $(BSD_INSTALL_DATA) threads.h $(LIBDIR)/caml/threads.h + if test -f dllthreads.so; then \ +- cp dllthreads.so $(INSTALL_STUBLIBDIR)/dllthreads.so; fi +- cp libthreads.a $(INSTALL_LIBDIR)/libthreads.a ++ $(BSD_INSTALL_LIB) dllthreads.so $(INSTALL_STUBLIBDIR)/dllthreads.so; fi ++ $(BSD_INSTALL_DATA) libthreads.a $(INSTALL_LIBDIR)/libthreads.a + cd $(INSTALL_LIBDIR); $(RANLIB) libthreads.a + if test -d $(INSTALL_LIBDIR)/threads; then :; \ +- else mkdir $(INSTALL_LIBDIR)/threads; fi +- cp $(THREAD_OBJS:.cmo=.cmi) threads.cma $(INSTALL_LIBDIR)/threads ++ else $(BSD_INSTALL_DATA_DIR) $(INSTALL_LIBDIR)/threads; fi ++ $(BSD_INSTALL_DATA) $(THREAD_OBJS:.cmo=.cmi) threads.cma $(INSTALL_LIBDIR)/threads + rm -f $(INSTALL_LIBDIR)/threads/stdlib.cma +- cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \ ++ $(BSD_INSTALL_DATA) thread.mli mutex.mli condition.mli event.mli threadUnix.mli \ + $(INSTALL_LIBDIR) +- cp threads.h $(INSTALL_LIBDIR)/caml/threads.h ++ $(BSD_INSTALL_DATA) threads.h $(INSTALL_LIBDIR)/caml/threads.h installopt: -- cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a -+ $(BSD_INSTALL_DATA) libthreadsnat.a $(LIBDIR)/libthreadsnat.a - cd $(LIBDIR); $(RANLIB) libthreadsnat.a -- cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads -+ $(BSD_INSTALL_DATA) $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads - cd $(LIBDIR)/threads; $(RANLIB) threads.a +- cp libthreadsnat.a $(INSTALL_LIBDIR)/libthreadsnat.a ++ $(BSD_INSTALL_DATA) libthreadsnat.a $(INSTALL_LIBDIR)/libthreadsnat.a + cd $(INSTALL_LIBDIR); $(RANLIB) libthreadsnat.a +- cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(INSTALL_LIBDIR)/threads ++ $(BSD_INSTALL_DATA) $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(INSTALL_LIBDIR)/threads + cd $(INSTALL_LIBDIR)/threads; $(RANLIB) threads.a .SUFFIXES: .ml .mli .cmo .cmi .cmx diff --git a/lang/ocaml/patches/patch-otherlibs_threads_Makefile b/lang/ocaml/patches/patch-otherlibs_threads_Makefile index 08564aca688..4c371c5e1d9 100644 --- a/lang/ocaml/patches/patch-otherlibs_threads_Makefile +++ b/lang/ocaml/patches/patch-otherlibs_threads_Makefile @@ -1,22 +1,22 @@ -$NetBSD: patch-otherlibs_threads_Makefile,v 1.3 2013/11/01 10:47:50 jaapb Exp $ +$NetBSD: patch-otherlibs_threads_Makefile,v 1.4 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/threads/Makefile.orig 2013-07-23 14:48:47.000000000 +0000 +--- otherlibs/threads/Makefile.orig 2014-04-29 11:56:17.000000000 +0000 +++ otherlibs/threads/Makefile -@@ -97,12 +97,12 @@ clean: partialclean +@@ -102,12 +102,12 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI install: - if test -f dllvmthreads.so; then cp dllvmthreads.so $(STUBLIBDIR)/.; fi -- mkdir -p $(LIBDIR)/vmthreads -- cp libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a -+ $(BSD_INSTALL_DATA_DIR) -p $(LIBDIR)/vmthreads -+ $(BSD_INSTALL_DATA) libvmthreads.a $(LIBDIR)/vmthreads/libvmthreads.a - cd $(LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a + if test -f dllvmthreads.so; then cp dllvmthreads.so $(INSTALL_STUBLIBDIR)/.; fi +- mkdir -p $(INSTALL_LIBDIR)/vmthreads +- cp libvmthreads.a $(INSTALL_LIBDIR)/vmthreads/libvmthreads.a ++ $(BSD_INSTALL_DATA_DIR) -p $(INSTALL_LIBDIR)/vmthreads ++ $(BSD_INSTALL_DATA) libvmthreads.a $(INSTALL_LIBDIR)/vmthreads/libvmthreads.a + cd $(INSTALL_LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a - cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \ + $(BSD_INSTALL_DATA) thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \ - threads.cma stdlib.cma unix.cma $(LIBDIR)/vmthreads + threads.cma stdlib.cma unix.cma $(INSTALL_LIBDIR)/vmthreads - cp thread.mli mutex.mli condition.mli event.mli threadUnix.mli \ + $(BSD_INSTALL_DATA) thread.mli mutex.mli condition.mli event.mli threadUnix.mli \ - $(LIBDIR)/vmthreads + $(INSTALL_LIBDIR)/vmthreads installopt: diff --git a/lang/ocaml/patches/patch-stdlib_Makefile b/lang/ocaml/patches/patch-stdlib_Makefile index fabc6693f3c..e496f3f1d6a 100644 --- a/lang/ocaml/patches/patch-stdlib_Makefile +++ b/lang/ocaml/patches/patch-stdlib_Makefile @@ -1,23 +1,23 @@ -$NetBSD: patch-stdlib_Makefile,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-stdlib_Makefile,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- stdlib/Makefile.orig 2011-07-27 14:17:02.000000000 +0000 +--- stdlib/Makefile.orig 2014-04-12 10:17:02.000000000 +0000 +++ stdlib/Makefile @@ -25,7 +25,7 @@ allopt-prof: stdlib.p.cmxa std_exit.p.cm installopt: installopt-default installopt-$(PROFILING) installopt-default: -- cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(LIBDIR) -+ $(BSD_INSTALL_DATA) stdlib.cmxa stdlib.a std_exit.o *.cmx $(LIBDIR) - cd $(LIBDIR); $(RANLIB) stdlib.a +- cp stdlib.cmxa stdlib.a std_exit.o *.cmx $(INSTALL_LIBDIR) ++ $(BSD_INSTALL_DATA) stdlib.cmxa stdlib.a std_exit.o *.cmx $(INSTALL_LIBDIR) + cd $(INSTALL_LIBDIR); $(RANLIB) stdlib.a installopt-noprof: -@@ -36,7 +36,7 @@ installopt-noprof: - rm -f $(LIBDIR)/std_exit.p.o; ln -s std_exit.o $(LIBDIR)/std_exit.p.o +@@ -39,7 +39,7 @@ installopt-noprof: + ln -s std_exit.o $(INSTALL_LIBDIR)/std_exit.p.o installopt-prof: -- cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR) -+ $(BSD_INSTALL_DATA) stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(LIBDIR) - cd $(LIBDIR); $(RANLIB) stdlib.p.a +- cp stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(INSTALL_LIBDIR) ++ $(BSD_INSTALL_DATA) stdlib.p.cmxa stdlib.p.a std_exit.p.cmx std_exit.p.o $(INSTALL_LIBDIR) + cd $(INSTALL_LIBDIR); $(RANLIB) stdlib.p.a stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx) diff --git a/lang/ocaml/patches/patch-stdlib_Makefile.shared b/lang/ocaml/patches/patch-stdlib_Makefile.shared index 7b20504780c..b05c5b89a10 100644 --- a/lang/ocaml/patches/patch-stdlib_Makefile.shared +++ b/lang/ocaml/patches/patch-stdlib_Makefile.shared @@ -1,14 +1,14 @@ -$NetBSD: patch-stdlib_Makefile.shared,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-stdlib_Makefile.shared,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- stdlib/Makefile.shared.orig 2012-04-19 13:12:23.000000000 +0000 +--- stdlib/Makefile.shared.orig 2014-05-12 15:37:29.000000000 +0000 +++ stdlib/Makefile.shared -@@ -41,7 +41,7 @@ OTHERS=array.cmo list.cmo char.cmo strin - all: stdlib.cma std_exit.cmo camlheader camlheader_ur +@@ -42,7 +42,7 @@ all: stdlib.cma std_exit.cmo camlheader + INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR) install: install-$(RUNTIMED) - cp stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \ + $(BSD_INSTALL_DATA) stdlib.cma std_exit.cmo *.cmi *.mli *.ml camlheader camlheader_ur \ - $(LIBDIR) + $(INSTALL_LIBDIR) install-noruntimed: diff --git a/lang/ocaml/patches/patch-tools_Makefile.shared b/lang/ocaml/patches/patch-tools_Makefile.shared index 73dc783a178..b02dd652eca 100644 --- a/lang/ocaml/patches/patch-tools_Makefile.shared +++ b/lang/ocaml/patches/patch-tools_Makefile.shared @@ -1,56 +1,56 @@ -$NetBSD: patch-tools_Makefile.shared,v 1.1 2012/10/08 15:05:33 jaapb Exp $ +$NetBSD: patch-tools_Makefile.shared,v 1.2 2014/10/09 19:08:28 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- tools/Makefile.shared.orig 2012-05-31 12:41:49.000000000 +0000 +--- tools/Makefile.shared.orig 2014-05-12 10:41:21.000000000 +0000 +++ tools/Makefile.shared -@@ -53,9 +53,9 @@ clean:: - rm -f ocamldep.opt +@@ -59,9 +59,9 @@ INSTALL_BINDIR=$(DESTDIR)$(BINDIR) + INSTALL_LIBDIR=$(DESTDIR)$(LIBDIR) install:: -- cp ocamldep $(BINDIR)/ocamldep$(EXE) -+ $(BSD_INSTALL_SCRIPT) ocamldep $(BINDIR)/ocamldep$(EXE) +- cp ocamldep $(INSTALL_BINDIR)/ocamldep$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamldep $(INSTALL_BINDIR)/ocamldep$(EXE) if test -f ocamldep.opt; \ -- then cp ocamldep.opt $(BINDIR)/ocamldep.opt$(EXE); else :; fi -+ then $(BSD_INSTALL_PROGRAM) ocamldep.opt $(BINDIR)/ocamldep.opt$(EXE); else :; fi +- then cp ocamldep.opt $(INSTALL_BINDIR)/ocamldep.opt$(EXE); else :; fi ++ then $(BSD_INSTALL_PROGRAM) ocamldep.opt $(INSTALL_BINDIR)/ocamldep.opt$(EXE); else :; fi # The profiler -@@ -77,13 +77,13 @@ ocamloptp: ocamloptp.cmo +@@ -83,13 +83,13 @@ ocamloptp: ocamloptp.cmo opt:: profiling.cmx install:: -- cp ocamlprof $(BINDIR)/ocamlprof$(EXE) -- cp ocamlcp $(BINDIR)/ocamlcp$(EXE) -- cp ocamloptp $(BINDIR)/ocamloptp$(EXE) -- cp profiling.cmi profiling.cmo $(LIBDIR) -+ $(BSD_INSTALL_SCRIPT) ocamlprof $(BINDIR)/ocamlprof$(EXE) -+ $(BSD_INSTALL_SCRIPT) ocamlcp $(BINDIR)/ocamlcp$(EXE) -+ $(BSD_INSTALL_SCRIPT) ocamloptp $(BINDIR)/ocamloptp$(EXE) -+ $(BSD_INSTALL_DATA) profiling.cmi profiling.cmo $(LIBDIR) +- cp ocamlprof $(INSTALL_BINDIR)/ocamlprof$(EXE) +- cp ocamlcp $(INSTALL_BINDIR)/ocamlcp$(EXE) +- cp ocamloptp $(INSTALL_BINDIR)/ocamloptp$(EXE) +- cp profiling.cmi profiling.cmo $(INSTALL_LIBDIR) ++ $(BSD_INSTALL_SCRIPT) ocamlprof $(INSTALL_BINDIR)/ocamlprof$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlcp $(INSTALL_BINDIR)/ocamlcp$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamloptp $(INSTALL_BINDIR)/ocamloptp$(EXE) ++ $(BSD_INSTALL_DATA) profiling.cmi profiling.cmo $(INSTALL_LIBDIR) installopt:: -- cp profiling.cmx profiling.o $(LIBDIR) -+ $(BSD_INSTALL_DATA) profiling.cmx profiling.o $(LIBDIR) +- cp profiling.cmx profiling.$(O) $(INSTALL_LIBDIR) ++ $(BSD_INSTALL_DATA) profiling.cmx profiling.$(O) $(INSTALL_LIBDIR) clean:: rm -f ocamlprof ocamlcp ocamloptp -@@ -104,7 +104,7 @@ myocamlbuild_config.ml: ../config/Makefi - cp ../myocamlbuild_config.ml . +@@ -101,7 +101,7 @@ ocamlmklib: ocamlmklibconfig.cmo ocamlmk + $(CAMLC) $(LINKFLAGS) -o ocamlmklib ocamlmklibconfig.cmo ocamlmklib.cmo install:: -- cp ocamlmklib $(BINDIR)/ocamlmklib$(EXE) -+ $(BSD_INSTALL_SCRIPT) ocamlmklib $(BINDIR)/ocamlmklib$(EXE) +- cp ocamlmklib $(INSTALL_BINDIR)/ocamlmklib$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlmklib $(INSTALL_BINDIR)/ocamlmklib$(EXE) clean:: rm -f ocamlmklib -@@ -280,8 +280,8 @@ objinfo: objinfo_helper$(EXE) $(OBJINFO) +@@ -289,8 +289,8 @@ objinfo: objinfo_helper$(EXE) $(OBJINFO) $(CAMLC) -o objinfo $(OBJINFO) install:: -- cp objinfo $(BINDIR)/ocamlobjinfo$(EXE) -- cp objinfo_helper$(EXE) $(LIBDIR)/objinfo_helper$(EXE) -+ $(BSD_INSTALL_SCRIPT) objinfo $(BINDIR)/ocamlobjinfo$(EXE) -+ $(BSD_INSTALL_SCRIPT) objinfo_helper$(EXE) $(LIBDIR)/objinfo_helper$(EXE) +- cp objinfo $(INSTALL_BINDIR)/ocamlobjinfo$(EXE) +- cp objinfo_helper$(EXE) $(INSTALL_LIBDIR)/objinfo_helper$(EXE) ++ $(BSD_INSTALL_SCRIPT) objinfo $(INSTALL_BINDIR)/ocamlobjinfo$(EXE) ++ $(BSD_INSTALL_SCRIPT) objinfo_helper$(EXE) $(INSTALL_LIBDIR)/objinfo_helper$(EXE) clean:: rm -f objinfo objinfo_helper$(EXE) diff --git a/lang/ocaml/patches/patch-tools_ocamlmklib b/lang/ocaml/patches/patch-tools_ocamlmklib index df9a97fda46..6ef862dfd5e 100644 --- a/lang/ocaml/patches/patch-tools_ocamlmklib +++ b/lang/ocaml/patches/patch-tools_ocamlmklib @@ -1,9 +1,9 @@ -$NetBSD: patch-tools_ocamlmklib,v 1.2 2013/11/01 10:47:50 jaapb Exp $ +$NetBSD: patch-tools_ocamlmklib,v 1.3 2014/10/09 19:08:28 jaapb Exp $ -Add elfmode parameter to ocamlmklib ---- tools/ocamlmklib.mlp.orig 2012-07-17 18:25:54.000000000 +0000 -+++ tools/ocamlmklib.mlp -@@ -26,6 +26,7 @@ and c_objs = ref [] (* .o, .a, . +Add ELF mode support to ocamlmklib +--- tools/ocamlmklib.ml.orig 2014-04-29 11:56:17.000000000 +0000 ++++ tools/ocamlmklib.ml +@@ -25,6 +25,7 @@ and c_objs = ref [] (* .o, .a, . and caml_libs = ref [] (* -cclib to pass to ocamlc, ocamlopt *) and caml_opts = ref [] (* -ccopt to pass to ocamlc, ocamlopt *) and dynlink = ref supports_shared_libraries @@ -11,7 +11,7 @@ Add elfmode parameter to ocamlmklib and failsafe = ref false (* whether to fall back on static build only *) and c_libs = ref [] (* libs to pass to mksharedlib and ocamlc -cclib *) and c_Lopts = ref [] (* options to pass to mksharedlib and ocamlc -cclib *) -@@ -95,8 +96,9 @@ let parse_arguments argv = +@@ -94,8 +95,9 @@ let parse_arguments argv = c_libs := s :: !c_libs else if starts_with s "-L" then (c_Lopts := s :: !c_Lopts; @@ -23,12 +23,12 @@ Add elfmode parameter to ocamlmklib else if s = "-ocamlc" then ocamlc := next_arg () else if s = "-ocamlopt" then -@@ -107,6 +109,8 @@ let parse_arguments argv = +@@ -106,6 +108,8 @@ let parse_arguments argv = output_c := next_arg() else if s = "-dllpath" || s = "-R" || s = "-rpath" then rpath := next_arg() :: !rpath + else if s = "-elfmode" then -+ elfmode := true ++ elfmode := true else if starts_with s "-R" then rpath := chop_prefix s "-R" :: !rpath else if s = "-Wl,-rpath" then |