diff options
author | jaapb <jaapb@pkgsrc.org> | 2018-07-19 12:46:04 +0000 |
---|---|---|
committer | jaapb <jaapb@pkgsrc.org> | 2018-07-19 12:46:04 +0000 |
commit | 3574d498f197f7944bd40a3cc38d2130b9fd0b39 (patch) | |
tree | 649c51a0b848716dd12408389443288770f27cb9 | |
parent | bd0f636555d0fef54e93ae18112888ec6955c3b8 (diff) | |
download | pkgsrc-3574d498f197f7944bd40a3cc38d2130b9fd0b39.tar.gz |
Committed correct version of Makefile patch for lang/ocaml
-rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-Makefile | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 30d97517389..c74d3eb0c01 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.122 2018/07/19 12:16:38 jaapb Exp $ +$NetBSD: distinfo,v 1.123 2018/07/19 12:46:04 jaapb Exp $ SHA1 (ocaml-4.07.0.tar.gz) = 19dba9822a43fc0fe48b4b539d5762ee45c3397f RMD160 (ocaml-4.07.0.tar.gz) = 4e471d3c4ac44e99db0b85bd7f8546fc0ce1f2cf SHA512 (ocaml-4.07.0.tar.gz) = 2f8c4eb9ee8f4bc041903ef7cf689b956991c4f065ac2c45ced7200bc53c1f0847c5fd4348998280c4c08cc583030c9b52a6d4825f90e356fac1719651c8fb9a Size (ocaml-4.07.0.tar.gz) = 4211784 bytes -SHA1 (patch-Makefile) = 7cc1a24ad27e5d290065edc7a62f2d22693e829d +SHA1 (patch-Makefile) = c117fc5d17f9c81814acb92ba10d94f7a0d4cf69 SHA1 (patch-Makefile.common) = f7e1d1dbebf91679338c192ffc62c83cd0f2d17e SHA1 (patch-asmcomp_amd64_emit.mlp) = 68cc42afd6439347524f2d81c48305dcbc173869 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f diff --git a/lang/ocaml/patches/patch-Makefile b/lang/ocaml/patches/patch-Makefile index cbc9743d115..b59fdce1616 100644 --- a/lang/ocaml/patches/patch-Makefile +++ b/lang/ocaml/patches/patch-Makefile @@ -1,9 +1,9 @@ -$NetBSD: patch-Makefile,v 1.12 2018/07/19 12:16:38 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.13 2018/07/19 12:46:04 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir --- Makefile.orig 2018-07-10 14:09:26.000000000 +0000 +++ Makefile -@@ -597,19 +597,19 @@ endif +@@ -597,10 +597,10 @@ endif # Installation .PHONY: install install: @@ -18,19 +18,6 @@ Use BSD_INSTALL_* instead of mkdir $(INSTALL_DATA) \ VERSION \ "$(INSTALL_LIBDIR)" - $(MAKE) -C byterun install -- $(INSTALL_PROG) ocaml "$(INSTALL_BINDIR)/ocaml$(EXE)" -- $(INSTALL_PROG) ocamlc "$(INSTALL_BINDIR)/ocamlc.byte$(EXE)" -+ $(INSTALL_DATA) ocaml "$(INSTALL_BINDIR)/ocaml$(EXE)" -+ $(INSTALL_DATA) ocamlc "$(INSTALL_BINDIR)/ocamlc.byte$(EXE)" - $(MAKE) -C stdlib install -- $(INSTALL_PROG) lex/ocamllex "$(INSTALL_BINDIR)/ocamllex.byte$(EXE)" -- $(INSTALL_PROG) yacc/ocamlyacc$(EXE) "$(INSTALL_BINDIR)/ocamlyacc$(EXE)" -+ $(INSTALL_DATA) lex/ocamllex "$(INSTALL_BINDIR)/ocamllex.byte$(EXE)" -+ $(INSTALL_DATA) yacc/ocamlyacc$(EXE) "$(INSTALL_BINDIR)/ocamlyacc$(EXE)" - $(INSTALL_DATA) \ - utils/*.cmi utils/*.cmt utils/*.cmti utils/*.mli \ - parsing/*.cmi parsing/*.cmt parsing/*.cmti parsing/*.mli \ @@ -630,7 +630,7 @@ install: "$(INSTALL_LIBDIR)" $(MAKE) -C tools install |