CVS commit: pkgsrc/lang/ocaml

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Jul 19 12:46:04 UTC 2018

Modified Files:
        pkgsrc/lang/ocaml: distinfo
        pkgsrc/lang/ocaml/patches: patch-Makefile

Log Message:
Committed correct version of Makefile patch for lang/ocaml


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ocaml/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.122 pkgsrc/lang/ocaml/distinfo:1.123
--- pkgsrc/lang/ocaml/distinfo:1.122    Thu Jul 19 12:16:38 2018
+++ pkgsrc/lang/ocaml/distinfo  Thu Jul 19 12:46:04 2018
@@ -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

Index: pkgsrc/lang/ocaml/patches/patch-Makefile
diff -u pkgsrc/lang/ocaml/patches/patch-Makefile:1.12 pkgsrc/lang/ocaml/patches/patch-Makefile:1.13
--- pkgsrc/lang/ocaml/patches/patch-Makefile:1.12       Thu Jul 19 12:16:38 2018
+++ pkgsrc/lang/ocaml/patches/patch-Makefile    Thu Jul 19 12:46:04 2018
@@ -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