From 7d753f876dae94f487139080519f0581b406d9ec Mon Sep 17 00:00:00 2001 From: asau Date: Thu, 19 Aug 2010 08:06:53 +0000 Subject: Update to O'Caml 3.12.0, add test target. Some of the highlights in release 3.12 are: * Polymorphic recursion is supported, using explicit type declarations on the recursively-defined identifiers. * First-class modules: module expressions can be embedded as values of the core language, then manipulated like any other first-class value, then projected back to the module level. * New operator to modify a signature a posteriori: S with type t := tau denotes signature S where the t type component is removed and substituted by the type tau elsewhere. * New notations for record expressions and record patterns: { lbl } as shorthand for { lbl = lbl }, and { ...; _ } marks record patterns where some labels were intentionally omitted. * Local open let open ... in ... now supported by popular demand. * Type variables can be bound as type parameters to functions; such types are treated like abstract types within the function body, and like type variables (possibly generalized) outside. * The module type of construct enables to recover the module type of a given module. * Explicit method override using the method! keyword, with associated warnings and errors. --- lang/ocaml/Makefile | 5 +++- lang/ocaml/Makefile.common | 6 ++--- lang/ocaml/PLIST | 10 ++++---- lang/ocaml/PLIST.opt | 10 +------- lang/ocaml/PLIST.stub | 4 ++-- lang/ocaml/distinfo | 27 ++++++++++----------- lang/ocaml/patches/patch-aj | 12 +++++----- lang/ocaml/patches/patch-an | 16 ++++++------- lang/ocaml/patches/patch-at | 37 ++++++++++++++++++----------- lang/ocaml/patches/patch-az | 21 ++++++++-------- lang/ocaml/patches/patch-bd | 14 +++++------ lang/ocaml/patches/patch-bh | 33 ++++++++++++++++---------- lang/ocaml/patches/patch-bk | 21 ---------------- lang/ocaml/patches/patch-bo | 26 ++++++++++---------- lang/ocaml/patches/patch-bs | 44 ++++++++++++++++++---------------- lang/ocaml/patches/patch-bt | 58 ++++++++++++++++++++++++++------------------- 16 files changed, 175 insertions(+), 169 deletions(-) delete mode 100644 lang/ocaml/patches/patch-bk (limited to 'lang/ocaml') diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index a7947776635..58a78ea06b9 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2009/11/19 03:18:58 minskim Exp $ +# $NetBSD: Makefile,v 1.65 2010/08/19 08:06:53 asau Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -54,4 +54,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST INSTALL_MAKE_FLAGS+= SHELL=${SH:Q} .endif +do-test: + cd $(WRKSRC)/testsuite && $(MAKE_PROGRAM) all + .include "../../mk/bsd.pkg.mk" diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index f5f71725ff7..068207d9355 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.25 2010/04/21 23:08:49 zafer Exp $ +# $NetBSD: Makefile.common,v 1.26 2010/08/19 08:06:53 asau Exp $ # used by x11/labltk/Makefile # used by x11/ocaml-graphics/Makefile -DISTNAME= ocaml-3.11.2 +DISTNAME= ocaml-3.12.0 CATEGORIES= lang -MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.11/ +MASTER_SITES= http://caml.inria.fr/pub/distrib/ocaml-3.12/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= adam@NetBSD.org diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST index 3c561f27478..2d38f616287 100644 --- a/lang/ocaml/PLIST +++ b/lang/ocaml/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2009/09/07 21:48:13 tonio Exp $ +@comment $NetBSD: PLIST,v 1.22 2010/08/19 08:06:53 asau Exp $ bin/camlp4 bin/camlp4boot bin/camlp4o @@ -21,11 +21,11 @@ bin/ocamldoc bin/ocamllex bin/ocamlmklib bin/ocamlmktop +bin/ocamlobjinfo bin/ocamlprof bin/ocamlrun bin/ocamlyacc lib/ocaml/Makefile.config -lib/ocaml/addlabels lib/ocaml/arg.cmi lib/ocaml/arg.ml lib/ocaml/arg.mli @@ -61,6 +61,8 @@ 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 @@ -233,9 +235,9 @@ lib/ocaml/lexing.ml lib/ocaml/lexing.mli lib/ocaml/libbigarray.a lib/ocaml/libcamlrun.a +lib/ocaml/libcamlstr.a lib/ocaml/libmldbm.a lib/ocaml/libnums.a -lib/ocaml/libstr.a lib/ocaml/libthreads.a lib/ocaml/libunix.a lib/ocaml/list.cmi @@ -265,6 +267,7 @@ lib/ocaml/nums.cma lib/ocaml/obj.cmi lib/ocaml/obj.ml lib/ocaml/obj.mli +lib/ocaml/objinfo_helper lib/ocaml/ocamlbuild/ocamlbuild.cmo lib/ocaml/ocamlbuild/ocamlbuild.o lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi @@ -356,7 +359,6 @@ lib/ocaml/ratio.mli lib/ocaml/scanf.cmi lib/ocaml/scanf.ml lib/ocaml/scanf.mli -lib/ocaml/scrapelabels lib/ocaml/set.cmi lib/ocaml/set.ml lib/ocaml/set.mli diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt index 07b9a464114..31b5b913fef 100644 --- a/lang/ocaml/PLIST.opt +++ b/lang/ocaml/PLIST.opt @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.opt,v 1.15 2009/09/07 21:48:13 tonio Exp $ +@comment $NetBSD: PLIST.opt,v 1.16 2010/08/19 08:06:53 asau Exp $ bin/camlp4o.opt bin/camlp4of.opt bin/camlp4oof.opt @@ -20,7 +20,6 @@ lib/ocaml/big_int.cmx lib/ocaml/bigarray.a lib/ocaml/bigarray.cmx lib/ocaml/bigarray.cmxa -lib/ocaml/bigarray.cmxs lib/ocaml/buffer.cmx lib/ocaml/callback.cmx lib/ocaml/camlinternalLazy.cmx @@ -65,11 +64,7 @@ lib/ocaml/complex.cmx lib/ocaml/dbm.a lib/ocaml/dbm.cmx lib/ocaml/dbm.cmxa -lib/ocaml/dbm.cmxs lib/ocaml/digest.cmx -lib/ocaml/dynlink.a -lib/ocaml/dynlink.cmx -lib/ocaml/dynlink.cmxa lib/ocaml/filename.cmx lib/ocaml/format.cmx lib/ocaml/gc.cmx @@ -94,7 +89,6 @@ lib/ocaml/nativeint.cmx lib/ocaml/num.cmx lib/ocaml/nums.a lib/ocaml/nums.cmxa -lib/ocaml/nums.cmxs lib/ocaml/obj.cmx lib/ocaml/ocamlbuild/ocamlbuild.cmx lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx @@ -127,7 +121,6 @@ lib/ocaml/stdlib.p.cmxa lib/ocaml/str.a lib/ocaml/str.cmx lib/ocaml/str.cmxa -lib/ocaml/str.cmxs lib/ocaml/stream.cmx lib/ocaml/string.cmx lib/ocaml/stringLabels.cmx @@ -142,6 +135,5 @@ lib/ocaml/threads/threads.cmxa lib/ocaml/unix.a lib/ocaml/unix.cmx lib/ocaml/unix.cmxa -lib/ocaml/unix.cmxs lib/ocaml/unixLabels.cmx lib/ocaml/weak.cmx diff --git a/lang/ocaml/PLIST.stub b/lang/ocaml/PLIST.stub index 755f11773af..dfd23d89f31 100644 --- a/lang/ocaml/PLIST.stub +++ b/lang/ocaml/PLIST.stub @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST.stub,v 1.4 2009/06/14 18:03:37 joerg Exp $ +@comment $NetBSD: PLIST.stub,v 1.5 2010/08/19 08:06:53 asau Exp $ lib/ocaml/stublibs/dllbigarray.so +lib/ocaml/stublibs/dllcamlstr.so lib/ocaml/stublibs/dllmldbm.so lib/ocaml/stublibs/dllnums.so -lib/ocaml/stublibs/dllstr.so lib/ocaml/stublibs/dllthreads.so lib/ocaml/stublibs/dllunix.so lib/ocaml/stublibs/dllvmthreads.so diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 632a34a7762..3b8dc01f9f6 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,37 +1,36 @@ -$NetBSD: distinfo,v 1.50 2010/04/21 23:08:49 zafer Exp $ +$NetBSD: distinfo,v 1.51 2010/08/19 08:06:53 asau Exp $ -SHA1 (ocaml-3.11.2.tar.bz2) = 59053ce0078da2367f4ce61da886d22c6e86a46d -RMD160 (ocaml-3.11.2.tar.bz2) = a407e579b7fa134fc8126c5c5b544dd60cedecb1 -Size (ocaml-3.11.2.tar.bz2) = 2346284 bytes +SHA1 (ocaml-3.12.0.tar.bz2) = 33ebbfb1115806f117808f37e40d206c8994943d +RMD160 (ocaml-3.12.0.tar.bz2) = 3d10d5f7431d8200688fa74122e7ed528126a0fa +Size (ocaml-3.12.0.tar.bz2) = 2639049 bytes SHA1 (patch-aa) = 858f326fe4db7971a05b3b001c6aecc02ecb2903 SHA1 (patch-ab) = e91cbb94c0897ffd02daebc19835a24c257dccd9 SHA1 (patch-ac) = efe8290b394f40d6675fc9d57557c49ddafdb239 SHA1 (patch-ad) = f2c1dcc3c31db31e2484fdea1076692a63252a87 SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488 -SHA1 (patch-aj) = f25a82ce98080c1b5514d7a9f026aea0da54821f -SHA1 (patch-an) = 7a56338a19015b407cbfa8a328655e2bd035f8bf -SHA1 (patch-at) = 010de581e8a153fc322c4966cb9db1b2706b62c6 +SHA1 (patch-aj) = 6fd989f1e5dd1263890c14459dd4ab85d75e86cd +SHA1 (patch-an) = 8fb8efecd2b3f0ec6f913a0840f4cfebcbb6161e +SHA1 (patch-at) = b8ca7e6fa643b4dfbd165a5a1187f96834823617 SHA1 (patch-au) = 1e36bcdf39d40e781273ea51df213db05ff46c89 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2 SHA1 (patch-aw) = 5838ca13ba0f5d9328b9bb2135604f72e7d8b87b SHA1 (patch-ax) = d46667e6874aa8aa656f6fb15ddcedc493d7bdf1 SHA1 (patch-ay) = 702dd7d24ac94851bbb0f2c3f22e2141345ee8ea -SHA1 (patch-az) = 1aa4bfe207eb4348987612576f30490bee2376ff +SHA1 (patch-az) = 9b9e1cfa8972e6bea9563d4d12866d567fdce668 SHA1 (patch-bb) = 50bd9aa5b46052d8f35c04f6e4c3cbb365d2f93c SHA1 (patch-bc) = 3b6cab5af3d34b2d25c7ba718e5dd89e2d1f2171 -SHA1 (patch-bd) = 226fd916ee68db9165e15e462bbf38d3d6bac8a6 +SHA1 (patch-bd) = 50df69a687953e8c34a36366396ea32a111e64ed SHA1 (patch-be) = 6c7232154b4935b9b4606940fd35799e20fafde2 SHA1 (patch-bf) = 0b4efd564362b816154bfd7ffacecae27c75c0ee SHA1 (patch-bg) = 91cb75e2d7f347b9ef7f3f1814d0c7deccfedd3a -SHA1 (patch-bh) = eac23a1bfb0f50b5aff781c227c3c4e7449b67d5 +SHA1 (patch-bh) = c7b1e218c67b9691452e7d1c8b53febe844d156c SHA1 (patch-bi) = aaf8fcb6ecde980cb914258efe93bd37ec9f0bf4 -SHA1 (patch-bk) = 733ad5463a1775a6e64d106c56bb311e92ac842e -SHA1 (patch-bo) = 322c322336d44a0d9c0bd8f1582d56ff873bd7e4 +SHA1 (patch-bo) = 318b5c023c692a3d6fb05b3276e755fae642d6b0 SHA1 (patch-bp) = 45038c5900aefdb8d21b8c3d3b8798b45014bae2 SHA1 (patch-bq) = 2ac3b7c1cdf9bdf1e6dcd5905e54291169d069c6 SHA1 (patch-br) = f9dacbd8742a9cdc9ae0232f297898f0df62a95b -SHA1 (patch-bs) = c23258399923794a24ae365e6120256cbc439dd6 -SHA1 (patch-bt) = 58e733154df2194dc45558a90adc387c6cbca87b +SHA1 (patch-bs) = 24788a31a5bdfe502e9586002574fdc077455536 +SHA1 (patch-bt) = 400ac1c2935690bd204da116272017ec167f4b0d SHA1 (patch-bu) = 0b3bbe273142ebed3a24e7e92d4cfd9f30a032b6 SHA1 (patch-bv) = 595641bb079174f393e420bdf5c48fe8ca1912cf diff --git a/lang/ocaml/patches/patch-aj b/lang/ocaml/patches/patch-aj index ce21f873b40..f073b4b7daf 100644 --- a/lang/ocaml/patches/patch-aj +++ b/lang/ocaml/patches/patch-aj @@ -1,14 +1,14 @@ -$NetBSD: patch-aj,v 1.7 2009/09/07 21:48:13 tonio Exp $ +$NetBSD: patch-aj,v 1.8 2010/08/19 08:06:53 asau Exp $ ---- byterun/Makefile.orig 2009-05-25 14:25:25.000000000 +0200 -+++ byterun/Makefile 2009-06-09 10:51:23.000000000 +0200 +--- byterun/Makefile.orig 2010-07-28 17:19:44.000000000 +0400 ++++ byterun/Makefile 2010-08-12 14:30:11.000000000 +0400 @@ -15,7 +15,7 @@ include Makefile.common -CFLAGS=-DCAML_NAME_SPACE -O $(BYTECCCOMPOPTS) $(IFLEXDIR) -+CFLAGS+=-DCAML_NAME_SPACE $(BYTECCCOMPOPTS) $(IFLEXDIR) - DFLAGS=-DCAML_NAME_SPACE -g -DDEBUG $(BYTECCCOMPOPTS) ++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 @@ @@ -16,7 +16,7 @@ $NetBSD: patch-aj,v 1.7 2009/09/07 21:48:13 tonio Exp $ 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 ++ $(BSD_INSTALL_PROGRAM) libcamlrun_shared.so $(LIBDIR)/libcamlrun_shared.so; fi clean:: rm -f libcamlrun_shared.so diff --git a/lang/ocaml/patches/patch-an b/lang/ocaml/patches/patch-an index 6ef9e624f6b..b7580205616 100644 --- a/lang/ocaml/patches/patch-an +++ b/lang/ocaml/patches/patch-an @@ -1,15 +1,15 @@ -$NetBSD: patch-an,v 1.3 2007/09/14 15:34:11 adam Exp $ +$NetBSD: patch-an,v 1.4 2010/08/19 08:06:53 asau Exp $ ---- camlp4/man/Makefile.orig 2006-06-29 10:12:44.000000000 +0200 -+++ camlp4/man/Makefile -@@ -9,8 +9,8 @@ include ../config/Makefile.base +--- camlp4/man/Makefile.orig 2010-01-22 15:48:24.000000000 +0300 ++++ camlp4/man/Makefile 2010-08-12 14:31:23.000000000 +0400 +@@ -9,8 +9,8 @@ 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/. ; \ ++ $(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; \ + rm -f $(MANDIR)/man1/$$i; \ + echo '.so man1/$(TARGET)' > $(MANDIR)/man1/$$i; \ diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at index ac223f0430a..e2b8df554fc 100644 --- a/lang/ocaml/patches/patch-at +++ b/lang/ocaml/patches/patch-at @@ -1,17 +1,26 @@ -$NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ +$NetBSD: patch-at,v 1.19 2010/08/19 08:06:53 asau Exp $ ---- configure.orig 2009-05-20 08:33:09.000000000 -0700 -+++ configure -@@ -516,7 +516,7 @@ if test $withsharedlibs = "yes"; then +--- configure.orig 2010-07-28 17:18:22.000000000 +0400 ++++ configure 2010-08-12 14:49:14.000000000 +0400 +@@ -520,7 +520,7 @@ mksharedlib="$flexlink" mkmaindll="$flexlink -maindll" shared_libraries_supported=true;; - *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*) + *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-dragonfly) - cmxs="cmxs" sharedcccompopts="-fPIC" mksharedlib="$bytecc -shared" -@@ -615,12 +615,13 @@ case "$host" in + bytecclinkopts="$bytecclinkopts -Wl,-E" +@@ -620,7 +620,7 @@ + i[3456]86-*-linux*) natdynlink=true;; + x86_64-*-linux*) natdynlink=true;; + i[3456]86-*-darwin10.*) +- if test $arch64 == true; then ++ if test $arch64 = true; then + natdynlink=true + fi;; + i[3456]86-*-darwin[89]*) natdynlink=true;; +@@ -653,12 +653,13 @@ alpha*-*-netbsd*) arch=alpha; system=netbsd;; alpha*-*-openbsd*) arch=alpha; system=openbsd;; sparc*-*-sunos4.*) arch=sparc; system=sunos;; @@ -26,7 +35,7 @@ $NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ i[3456]86-*-nextstep*) arch=i386; system=nextstep;; i[3456]86-*-solaris*) if $arch64; then arch=amd64; system=solaris -@@ -629,6 +630,7 @@ case "$host" in +@@ -667,6 +668,7 @@ fi;; i[3456]86-*-beos*) arch=i386; system=beos;; i[3456]86-*-cygwin*) arch=i386; system=cygwin;; @@ -34,7 +43,7 @@ $NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ i[3456]86-*-darwin*) if $arch64; then arch=amd64; system=macosx else -@@ -655,7 +657,9 @@ case "$host" in +@@ -693,7 +695,9 @@ x86_64-*-freebsd*) arch=amd64; system=freebsd;; x86_64-*-netbsd*) arch=amd64; system=netbsd;; x86_64-*-openbsd*) arch=amd64; system=openbsd;; @@ -44,7 +53,7 @@ $NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ esac # Some platforms exist both in 32-bit and 64-bit variants, not distinguished -@@ -756,6 +760,7 @@ case "$arch,$model,$system" in +@@ -794,6 +798,7 @@ case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; amd64,*,linux) profiling='prof';; amd64,*,gnu) profiling='prof';; @@ -52,7 +61,7 @@ $NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ *) profiling='noprof';; esac -@@ -1144,6 +1149,8 @@ if test "$pthread_wanted" = "yes"; then +@@ -1198,6 +1203,8 @@ pthread_caml_link="-cclib -lpthread -cclib -lposix4";; *-*-freebsd*) pthread_link="-pthread" pthread_caml_link="-cclib -pthread";; @@ -61,7 +70,7 @@ $NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ *-*-openbsd*) pthread_link="-pthread" pthread_caml_link="-cclib -pthread";; *) pthread_link="-lpthread" -@@ -1195,6 +1202,7 @@ fi +@@ -1249,6 +1256,7 @@ x11_include="not found" x11_link="not found" @@ -69,7 +78,7 @@ $NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ for dir in \ $x11_include_dir \ \ -@@ -1247,6 +1255,7 @@ do +@@ -1301,6 +1309,7 @@ break fi done @@ -77,7 +86,7 @@ $NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ if test "$x11_include" = "not found"; then x11_try_lib_dir='' -@@ -1341,31 +1350,8 @@ dbm_include="not found" +@@ -1395,31 +1404,8 @@ dbm_link="not found" use_gdbm_ndbm=no @@ -111,7 +120,7 @@ $NetBSD: patch-at,v 1.18 2009/11/19 03:05:57 minskim Exp $ if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then echo "NDBM not found, the \"dbm\" library will not be supported." else -@@ -1375,8 +1361,8 @@ else +@@ -1429,8 +1415,8 @@ else dbm_include="-I$dbm_include" fi diff --git a/lang/ocaml/patches/patch-az b/lang/ocaml/patches/patch-az index 58ef2adc437..3e19d4245f0 100644 --- a/lang/ocaml/patches/patch-az +++ b/lang/ocaml/patches/patch-az @@ -1,19 +1,20 @@ -$NetBSD: patch-az,v 1.3 2009/09/07 21:48:14 tonio Exp $ +$NetBSD: patch-az,v 1.4 2010/08/19 08:06:53 asau Exp $ ---- otherlibs/dynlink/Makefile.orig 2008-04-16 08:50:31.000000000 +0200 -+++ otherlibs/dynlink/Makefile 2009-05-21 11:09:19.000000000 +0200 -@@ -66,11 +66,11 @@ +--- otherlibs/dynlink/Makefile.orig 2010-05-28 19:09:22.000000000 +0400 ++++ otherlibs/dynlink/Makefile 2010-08-12 14:56:17.000000000 +0400 +@@ -66,12 +66,12 @@ $(CAMLC) $(COMPFLAGS) -o extract_crc dynlink.cma extract_crc.cmo 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) ++ $(BSD_INSTALL_DATA) dynlink.cmi dynlink.cma dynlink.mli $(LIBDIR) ++ $(BSD_INSTALL_SCRIPT) extract_crc $(LIBDIR)/extract_crc$(EXE) installopt: -- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) -+ ${BSD_INSTALL_DATA} $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) - cd $(LIBDIR); $(RANLIB) dynlink.$(A) + if $(NATDYNLINK); then \ +- cp $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR) && \ ++ $(BSD_INSTALL_DATA) $(NATOBJS) dynlink.cmxa dynlink.$(A) $(LIBDIR); \ + cd $(LIBDIR) && $(RANLIB) dynlink.$(A); \ + fi - partialclean: diff --git a/lang/ocaml/patches/patch-bd b/lang/ocaml/patches/patch-bd index fcf42b67c45..d9a05a572f1 100644 --- a/lang/ocaml/patches/patch-bd +++ b/lang/ocaml/patches/patch-bd @@ -1,15 +1,15 @@ -$NetBSD: patch-bd,v 1.2 2009/09/07 21:48:14 tonio Exp $ +$NetBSD: patch-bd,v 1.3 2010/08/19 08:06:53 asau Exp $ ---- ./otherlibs/labltk/compiler/Makefile.orig 2002-04-26 14:15:45.000000000 +0200 -+++ ./otherlibs/labltk/compiler/Makefile -@@ -45,8 +45,8 @@ scratch : +--- otherlibs/labltk/compiler/Makefile.orig 2010-01-19 16:12:47.000000000 +0300 ++++ otherlibs/labltk/compiler/Makefile 2010-08-12 14:35:37.000000000 +0400 +@@ -45,8 +45,8 @@ rm -f *.cm* pplex.ml ppyac.ml ppyac.mli pp$(EXE) - install: + install: - cp tkcompiler$(EXE) $(INSTALLDIR) - cp pp$(EXE) $(INSTALLDIR) -+ ${BSD_INSTALL_SCRIPT} tkcompiler$(EXE) $(INSTALLDIR) -+ ${BSD_INSTALL_SCRIPT} 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-bh b/lang/ocaml/patches/patch-bh index 469cd60cac0..9a1f236b7f8 100644 --- a/lang/ocaml/patches/patch-bh +++ b/lang/ocaml/patches/patch-bh @@ -1,28 +1,37 @@ -$NetBSD: patch-bh,v 1.3 2009/09/07 21:48:14 tonio Exp $ +$NetBSD: patch-bh,v 1.4 2010/08/19 08:06:53 asau Exp $ ---- otherlibs/labltk/lib/Makefile.orig 2009-04-30 16:24:53.000000000 +0200 -+++ otherlibs/labltk/lib/Makefile 2009-05-21 11:18:47.000000000 +0200 -@@ -58,17 +58,12 @@ +--- otherlibs/labltk/lib/Makefile.orig 2010-06-08 04:54:09.000000000 +0400 ++++ otherlibs/labltk/lib/Makefile 2010-08-12 14:39:56.000000000 +0400 +@@ -58,26 +58,21 @@ @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 -- cp $(LIBNAME) $(BINDIR) -- chmod 755 $(BINDIR)/$(LIBNAME) -+ 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 -+ ${BSD_INSTALL_SCRIPT} $(LIBNAME) $(BINDIR) ++ 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) ++ @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-bk b/lang/ocaml/patches/patch-bk deleted file mode 100644 index 461c10b94e1..00000000000 --- a/lang/ocaml/patches/patch-bk +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-bk,v 1.3 2009/09/07 21:48:14 tonio Exp $ - ---- otherlibs/labltk/tkanim/Makefile.orig 2009-04-30 16:24:53.000000000 +0200 -+++ otherlibs/labltk/tkanim/Makefile 2009-05-21 11:22:11.000000000 +0200 -@@ -57,13 +57,13 @@ - - - install: -- cp tkanim.cma *.cmi *.mli libtkanim.$(A) $(INSTALLDIR) -+ ${BSD_INSTALL_DATA} tkanim.cma *.cmi *.mli libtkanim.$(A) $(INSTALLDIR) - if [ -f dlltkanim$(EXT_DLL) ]; then \ -- cp dlltkanim$(EXT_DLL) $(STUBLIBDIR)/; \ -+ ${BSD_INSTALL_DATA} dlltkanim$(EXT_DLL) $(STUBLIBDIR)/; \ - fi - - installopt: -- cp tkanim.cmxa tkanim.$(A) $(INSTALLDIR) -+ ${BSD_INSTALL_DATA} tkanim.cmxa tkanim.$(A) $(INSTALLDIR) - - depend: tkanim.ml - $(CAMLDEP) *.mli *.ml > .depend diff --git a/lang/ocaml/patches/patch-bo b/lang/ocaml/patches/patch-bo index 92d9406273b..c3f56ccb7e6 100644 --- a/lang/ocaml/patches/patch-bo +++ b/lang/ocaml/patches/patch-bo @@ -1,30 +1,32 @@ -$NetBSD: patch-bo,v 1.2 2005/02/04 21:35:51 adrianp Exp $ +$NetBSD: patch-bo,v 1.3 2010/08/19 08:06:53 asau Exp $ ---- otherlibs/systhreads/Makefile.orig 2003-08-21 14:52:07.000000000 +0100 -+++ otherlibs/systhreads/Makefile 2004-10-12 22:21:43.000000000 +0100 -@@ -70,18 +70,18 @@ - rm -f $(GENFILES) +--- otherlibs/systhreads/Makefile.orig 2010-04-27 11:55:08.000000000 +0400 ++++ otherlibs/systhreads/Makefile 2010-08-12 14:42:34.000000000 +0400 +@@ -70,19 +70,19 @@ + rm -f *.o *.a *.so 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_DATA} dllthreads.so $(STUBLIBDIR)/dllthreads.so; fi -+ ${BSD_INSTALL_DATA} libthreads.a $(LIBDIR)/libthreads.a ++ if test -f dllthreads.so; then $(BSD_INSTALL_DATA) 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 ++ 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) -+ ${BSD_INSTALL_DATA} 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 installopt: - cp libthreadsnat.a $(LIBDIR)/libthreadsnat.a -+ ${BSD_INSTALL_DATA} 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 ++ $(BSD_INSTALL_DATA) $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.a $(LIBDIR)/threads cd $(LIBDIR)/threads; $(RANLIB) threads.a .SUFFIXES: .ml .mli .cmo .cmi .cmx diff --git a/lang/ocaml/patches/patch-bs b/lang/ocaml/patches/patch-bs index 038fb11dcf1..d82694ab2c9 100644 --- a/lang/ocaml/patches/patch-bs +++ b/lang/ocaml/patches/patch-bs @@ -1,63 +1,65 @@ -$NetBSD: patch-bs,v 1.6 2009/09/07 21:48:14 tonio Exp $ +$NetBSD: patch-bs,v 1.7 2010/08/19 08:06:53 asau Exp $ ---- tools/Makefile.shared.orig 2007-11-22 23:14:43.000000000 +0100 -+++ tools/Makefile.shared -@@ -51,9 +51,9 @@ clean:: +--- tools/Makefile.shared.orig 2010-06-07 10:58:41.000000000 +0400 ++++ tools/Makefile.shared 2010-08-12 14:44:51.000000000 +0400 +@@ -52,9 +52,9 @@ rm -f ocamldep.opt install:: - cp ocamldep $(BINDIR)/ocamldep$(EXE) -+ ${BSD_INSTALL_SCRIPT} ocamldep $(BINDIR)/ocamldep$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamldep $(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 $(BSD_INSTALL_PROGRAM) ocamldep.opt $(BINDIR)/ocamldep.opt$(EXE); else :; fi # The profiler -@@ -69,15 +69,15 @@ ocamlcp: ocamlcp.cmo - $(CAMLC) $(LINKFLAGS) -o ocamlcp main_args.cmo ocamlcp.cmo +@@ -70,15 +70,15 @@ + $(CAMLC) $(LINKFLAGS) -o ocamlcp warnings.cmo main_args.cmo ocamlcp.cmo install:: - cp ocamlprof $(BINDIR)/ocamlprof$(EXE) - cp ocamlcp $(BINDIR)/ocamlcp$(EXE) - cp profiling.cmi profiling.cmo $(LIBDIR) -+ ${BSD_INSTALL_SCRIPT} ocamlprof $(BINDIR)/ocamlprof$(EXE) -+ ${BSD_INSTALL_SCRIPT} ocamlcp $(BINDIR)/ocamlcp$(EXE) -+ ${BSD_INSTALL_DATA} profiling.cmi profiling.cmo $(LIBDIR) ++ $(BSD_INSTALL_SCRIPT) ocamlprof $(BINDIR)/ocamlprof$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlcp $(BINDIR)/ocamlcp$(EXE) ++ $(BSD_INSTALL_DATA) profiling.cmi profiling.cmo $(LIBDIR) clean:: rm -f ocamlprof ocamlcp install:: - cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE) -+ ${BSD_INSTALL_SCRIPT} ocamlmktop $(BINDIR)/ocamlmktop$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlmktop $(BINDIR)/ocamlmktop$(EXE) clean:: rm -f ocamlmktop -@@ -97,7 +97,7 @@ myocamlbuild_config.ml: ../config/Makefi +@@ -98,7 +98,7 @@ cp ../myocamlbuild_config.ml . install:: - cp ocamlmklib $(BINDIR)/ocamlmklib$(EXE) -+ ${BSD_INSTALL_SCRIPT} ocamlmklib $(BINDIR)/ocamlmklib$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlmklib $(BINDIR)/ocamlmklib$(EXE) clean:: rm -f ocamlmklib -@@ -121,7 +121,7 @@ clean:: +@@ -122,7 +122,7 @@ # To make custom toplevels (see Makefile/Makefile.nt) install:: - cp ocamlmktop $(BINDIR)/ocamlmktop$(EXE) -+ ${BSD_INSTALL_SCRIPT} ocamlmktop $(BINDIR)/ocamlmktop$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlmktop $(BINDIR)/ocamlmktop$(EXE) clean:: rm -f ocamlmktop -@@ -171,7 +171,7 @@ addlabels: addlabels.ml - $(ADDLABELS_IMPORTS) addlabels.ml +@@ -239,8 +239,8 @@ + $(CAMLC) -o objinfo $(OBJINFO) install:: -- cp addlabels $(LIBDIR) -+ ${BSD_INSTALL_DATA} addlabels $(LIBDIR) +- 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) clean:: - rm -f addlabels + rm -f objinfo objinfo_helper$(EXE) diff --git a/lang/ocaml/patches/patch-bt b/lang/ocaml/patches/patch-bt index 790b22b6df2..83d1ce94be9 100644 --- a/lang/ocaml/patches/patch-bt +++ b/lang/ocaml/patches/patch-bt @@ -1,28 +1,28 @@ -$NetBSD: patch-bt,v 1.4 2009/09/07 21:48:14 tonio Exp $ +$NetBSD: patch-bt,v 1.5 2010/08/19 08:06:53 asau Exp $ ---- ./Makefile.orig 2008-10-23 17:29:11.000000000 +0200 -+++ ./Makefile -@@ -268,25 +268,25 @@ opt.opt: checkstack runtime core ocaml o +--- Makefile.orig 2010-06-16 05:32:26.000000000 +0400 ++++ Makefile 2010-08-12 14:47:49.000000000 +0400 +@@ -273,25 +273,25 @@ # Installation 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 $(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 $(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 $(MANDIR)/man$(MANEXT); then : ; \ - else $(MKDIR) $(MANDIR)/man$(MANEXT); fi -+ else ${BSD_INSTALL_MAN_DIR} $(MANDIR)/man$(MANEXT); fi ++ else $(BSD_INSTALL_MAN_DIR) $(MANDIR)/man$(MANEXT); fi cd $(LIBDIR); rm -f dllbigarray.so dlllabltk.so dllnums.so \ - dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \ - dlltkanim.so + dllthreads.so dllunix.so dllgraphics.so dllmldbm.so dllstr.so \ + dlltkanim.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) ++ $(BSD_INSTALL_SCRIPT) ocamlc $(BINDIR)/ocamlc$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocaml $(BINDIR)/ocaml$(EXE) cd stdlib; $(MAKE) install - cp lex/ocamllex $(BINDIR)/ocamllex$(EXE) - cp yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE) @@ -31,35 +31,43 @@ $NetBSD: patch-bt,v 1.4 2009/09/07 21:48:14 tonio Exp $ - cp typing/outcometree.cmi typing/outcometree.mli $(LIBDIR) - cp toplevel/topstart.cmo $(LIBDIR) - cp toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \ -+ ${BSD_INSTALL_SCRIPT} lex/ocamllex $(BINDIR)/ocamllex$(EXE) -+ ${BSD_INSTALL_PROGRAM} yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE) -+ ${BSD_INSTALL_DATA} toplevel/toplevellib.cma $(LIBDIR)/toplevellib.cma -+ ${BSD_INSTALL_DATA} expunge $(LIBDIR)/expunge$(EXE) -+ ${BSD_INSTALL_DATA} typing/outcometree.cmi typing/outcometree.mli $(LIBDIR) -+ ${BSD_INSTALL_DATA} toplevel/topstart.cmo $(LIBDIR) -+ ${BSD_INSTALL_DATA} toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \ ++ $(BSD_INSTALL_SCRIPT) lex/ocamllex $(BINDIR)/ocamllex$(EXE) ++ $(BSD_INSTALL_PROGRAM) yacc/ocamlyacc$(EXE) $(BINDIR)/ocamlyacc$(EXE) ++ $(BSD_INSTALL_DATA) toplevel/toplevellib.cma $(LIBDIR)/toplevellib.cma ++ $(BSD_INSTALL_DATA) expunge $(LIBDIR)/expunge$(EXE) ++ $(BSD_INSTALL_DATA) typing/outcometree.cmi typing/outcometree.mli $(LIBDIR) ++ $(BSD_INSTALL_DATA) toplevel/topstart.cmo $(LIBDIR) ++ $(BSD_INSTALL_DATA) toplevel/toploop.cmi toplevel/topdirs.cmi toplevel/topmain.cmi \ $(LIBDIR) cd tools; $(MAKE) install - -$(MAKE) -C man install -@@ -304,17 +304,17 @@ install: + -cd man; $(MAKE) install +@@ -302,24 +302,24 @@ + if test -f ocamlopt; then $(MAKE) installopt; else :; fi + if test -f debugger/ocamldebug; then (cd debugger; $(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 + # Installation of the native-code compiler installopt: cd asmrun; $(MAKE) install - cp ocamlopt $(BINDIR)/ocamlopt$(EXE) -+ ${BSD_INSTALL_SCRIPT} ocamlopt $(BINDIR)/ocamlopt$(EXE) ++ $(BSD_INSTALL_SCRIPT) ocamlopt $(BINDIR)/ocamlopt$(EXE) cd stdlib; $(MAKE) installopt cd ocamldoc; $(MAKE) installopt for i in $(OTHERLIBRARIES); \ do (cd otherlibs/$$i; $(MAKE) installopt) || exit $$?; done if test -f ocamlc.opt; \ - then cp ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE); else :; fi -+ then ${BSD_INSTALL_PROGRAM} ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE); else :; fi ++ then $(BSD_INSTALL_PROGRAM) ocamlc.opt $(BINDIR)/ocamlc.opt$(EXE); else :; fi if test -f ocamlopt.opt; \ - then cp ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE); else :; fi -+ then ${BSD_INSTALL_PROGRAM} ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE); else :; fi ++ then $(BSD_INSTALL_PROGRAM) ocamlopt.opt $(BINDIR)/ocamlopt.opt$(EXE); else :; fi if test -f lex/ocamllex.opt; \ - then cp lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE); else :; fi -+ then ${BSD_INSTALL_PROGRAM} lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE); else :; fi ++ then $(BSD_INSTALL_PROGRAM) lex/ocamllex.opt $(BINDIR)/ocamllex.opt$(EXE); else :; fi clean:: partialclean -- cgit v1.2.3