CVS commit: pkgsrc/devel/ocaml-jbuilder

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri Sep  8 11:51:36 UTC 2017

Modified Files:
        pkgsrc/devel/ocaml-jbuilder: Makefile buildlink3.mk distinfo
        pkgsrc/devel/ocaml-jbuilder/patches: patch-Makefile

Log Message:
Updated package to latest version, 1.0+beta13. Changes include:

1.0+beta13 (05/09/2017)

    Generate toplevel html index for documentation (#224, Thomas Gazagnaire)
    Fix recompilation of native artifacts. Regression introduced in the last version (1.0+beta12) when digests replaces timestamps for checking staleness (#238, David Allsopp)

1.0+beta12 (18/08/2017)

    Fix the quoting of FLG lines in generated .merlin files (#200, Marcello Seri)
    Use the full path of archive files when linking. Before jbuilder would do: -I <path> file.cmxa, now it does -I <path> <path>/file.cmxa. Fixes #118 and #177
    Use an absolute path for ppx drivers in .merlin files. Merlin <3.0.0 used to run ppx commands from the directory where the .merlin was present but this is no longer the case
    Allow to use jbuilder install in contexts other than opam; if ocamlfind is present in the PATH and the user didn't pass --prefix or --libdir explicitly, use the output of ocamlfind printconf 
destdir as destination directory for library files (#179, Francois Bobot)
    Allow (:include ...) forms in all *flags fields (#153, David Allsopp)
    Add a utop subsommand. Running jbuilder utop in a directory builds and executes a custom utop toplevel with all libraries defined in the current directory (#183, Rudi Grinberg)
    Do not accept per_file anymore in preprocess field. per_file was renamed per_module and it is planned to reuse per_file for another purpose
    Warn when a file is both present in the source tree and generated by a rule. Before, jbuilder would silently ignore the rule. One now has to add a field (fallback) to custom rules to keep the 
current behavior (#218)
    Get rid of the deprecated-ppx-method findlib package for ppx rewriters (#222, fixes #163)
    Use digests (MD5) of files contents to detect changes rather than just looking at the timestamps. We still use timestamps to avoid recomputing digests. The performance difference is negligible 
and we avoid more useless recompilations, especially when switching branches for instance (#209, fixes #158)

1.0+beta11 (21/07/2017)

    Fix the error message when there are more than one <package>.opam file for a given pacakge
    Report an error when in a wrapped library, a module that is not the toplevel module depends on the toplevel module. This doesn't make as such a module would in theory be inaccessible from the 
outside
    Add ${SCOPE_ROOT} pointing to the root of the current scope, to fix some misuses of ${ROOT}
    Fix useless hint when all missing dependencies are optional (#137)
    Fix a bug preventing one from generating META.pkg.template with a custom rule (#190)
    Fix compilation of reason projects: .rei files where ignored and caused the build to fail (#184)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-jbuilder/Makefile \
    pkgsrc/devel/ocaml-jbuilder/buildlink3.mk \
    pkgsrc/devel/ocaml-jbuilder/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-jbuilder/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/devel/ocaml-jbuilder/Makefile
diff -u pkgsrc/devel/ocaml-jbuilder/Makefile:1.1 pkgsrc/devel/ocaml-jbuilder/Makefile:1.2
--- pkgsrc/devel/ocaml-jbuilder/Makefile:1.1    Tue Jul 11 11:14:58 2017
+++ pkgsrc/devel/ocaml-jbuilder/Makefile        Fri Sep  8 11:51:36 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2017/07/11 11:14:58 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/08 11:51:36 jaapb Exp $
 
-VERSION=       1.0_beta10
+VERSION=       1.0_beta13
 GITHUB_PROJECT=        jbuilder
 GITHUB_TAG=    ${VERSION:S/_/+/}
 DISTNAME=      ${GITHUB_PROJECT}-${GITHUB_TAG}
@@ -13,7 +13,7 @@ HOMEPAGE=     https://github.com/janestreet/
 COMMENT=       Composable build system for OCaml
 LICENSE=       apache-2.0
 
-WRKSRC=                ${WRKDIR}/jbuilder-1.0-beta10
+WRKSRC=                ${WRKDIR}/jbuilder-1.0-beta13
 USE_LANGUAGES= # none
 
 BUILD_TARGET=  default
Index: pkgsrc/devel/ocaml-jbuilder/buildlink3.mk
diff -u pkgsrc/devel/ocaml-jbuilder/buildlink3.mk:1.1 pkgsrc/devel/ocaml-jbuilder/buildlink3.mk:1.2
--- pkgsrc/devel/ocaml-jbuilder/buildlink3.mk:1.1       Tue Jul 11 11:14:58 2017
+++ pkgsrc/devel/ocaml-jbuilder/buildlink3.mk   Fri Sep  8 11:51:36 2017
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/07/11 11:14:58 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2017/09/08 11:51:36 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-jbuilder
 
 .if !defined(OCAML_JBUILDER_BUILDLINK3_MK)
 OCAML_JBUILDER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-jbuilder+= ocaml-jbuilder>=1.0_beta10
+BUILDLINK_API_DEPENDS.ocaml-jbuilder+= ocaml-jbuilder>=1.0_beta12
 BUILDLINK_PKGSRCDIR.ocaml-jbuilder?=   ../../devel/ocaml-jbuilder
 .endif # OCAML_JBUILDER_BUILDLINK3_MK
 
Index: pkgsrc/devel/ocaml-jbuilder/distinfo
diff -u pkgsrc/devel/ocaml-jbuilder/distinfo:1.1 pkgsrc/devel/ocaml-jbuilder/distinfo:1.2
--- pkgsrc/devel/ocaml-jbuilder/distinfo:1.1    Tue Jul 11 11:14:58 2017
+++ pkgsrc/devel/ocaml-jbuilder/distinfo        Fri Sep  8 11:51:36 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2017/07/11 11:14:58 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2017/09/08 11:51:36 jaapb Exp $
 
-SHA1 (jbuilder-1.0+beta10.tar.gz) = b16c8f743223bf24383c6eb1e8c518721456ed15
-RMD160 (jbuilder-1.0+beta10.tar.gz) = 13db40140a09503bfdd66a45f400930410507e8f
-SHA512 (jbuilder-1.0+beta10.tar.gz) = 83945d9cf3c6d61c33b83c4645b6c6b980b13f716a0541cd1833ce98543ca132a7c0efe4a46b5145e61159e7f8223fe4d1d6009b663bafb5fc79a2115fd5f521
-Size (jbuilder-1.0+beta10.tar.gz) = 251576 bytes
-SHA1 (patch-Makefile) = f2744c0f710d165746b81ae000471d6d28716a5e
+SHA1 (jbuilder-1.0+beta13.tar.gz) = 65ffe5ba57a07cd006b34c52fd2682aaaa0e4931
+RMD160 (jbuilder-1.0+beta13.tar.gz) = df5d7804f9b6c373a4a1b3c9ddb7a0dc5e074084
+SHA512 (jbuilder-1.0+beta13.tar.gz) = 8ab619bd2c9c008b01998182c6951cc3e3fc60391290146a3c78eb7d20feecfa6a31d773c637ef5a3194cb8b484b9367bd9ddf5e9b16a8e92911611e266b7b90
+Size (jbuilder-1.0+beta13.tar.gz) = 263186 bytes
+SHA1 (patch-Makefile) = be8104d33cae3ac5b8f4022489eb40cb2d326ecf

Index: pkgsrc/devel/ocaml-jbuilder/patches/patch-Makefile
diff -u pkgsrc/devel/ocaml-jbuilder/patches/patch-Makefile:1.1 pkgsrc/devel/ocaml-jbuilder/patches/patch-Makefile:1.2
--- pkgsrc/devel/ocaml-jbuilder/patches/patch-Makefile:1.1      Tue Jul 11 11:14:58 2017
+++ pkgsrc/devel/ocaml-jbuilder/patches/patch-Makefile  Fri Sep  8 11:51:36 2017
@@ -1,14 +1,18 @@
-$NetBSD: patch-Makefile,v 1.1 2017/07/11 11:14:58 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/09/08 11:51:36 jaapb Exp $
 
 Use MAKE_JOBS rather than default number
---- Makefile.orig      2017-04-17 13:50:54.000000000 +0000
+--- Makefile.orig      2017-08-18 23:51:31.000000000 +0000
 +++ Makefile
-@@ -2,7 +2,7 @@ INSTALL_ARGS := $(if $(PREFIX),--prefix 
+@@ -2,10 +2,10 @@ INSTALL_ARGS := $(if $(PREFIX),--prefix 
  BIN := ./_build/default/bin/main.exe
  
  default: boot.exe
 -      ./boot.exe -j 4 --dev
 +      ./boot.exe -j ${MAKE_JOBS} --dev
  
+ release: boot.exe
+-      ./boot.exe -j 4
++      ./boot.exe -j ${MAKE_JOBS}
+ 
  boot.exe: bootstrap.ml
        ocaml bootstrap.ml