CVS commit: pkgsrc/devel/ocaml-cppo

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed Jan 10 14:48:49 UTC 2018

Modified Files:
        pkgsrc/devel/ocaml-cppo: Makefile PLIST buildlink3.mk distinfo

Log Message:
Updated package devel/ocaml-cppo to version 1.6.0.

Improvements are minor, most notably the change to support safe-string.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/ocaml-cppo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-cppo/PLIST \
    pkgsrc/devel/ocaml-cppo/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-cppo/distinfo

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-cppo/Makefile
diff -u pkgsrc/devel/ocaml-cppo/Makefile:1.12 pkgsrc/devel/ocaml-cppo/Makefile:1.13
--- pkgsrc/devel/ocaml-cppo/Makefile:1.12       Fri Sep  8 09:51:20 2017
+++ pkgsrc/devel/ocaml-cppo/Makefile    Wed Jan 10 14:48:49 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2017/09/08 09:51:20 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2018/01/10 14:48:49 jaapb Exp $
 
-DISTNAME=      cppo-1.5.0
+DISTNAME=      cppo-1.6.0
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mjambon/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -16,22 +15,43 @@ LICENSE=    modified-bsd
 USE_LANGUAGES= # none
 USE_TOOLS+=    gmake
 
-OCAML_USE_FINDLIB=     yes
+OCAML_USE_JBUILDER=    yes
+OCAML_USE_OPAM=                no # opam depends on this
+
+INSTALLATION_DIRS+=    bin ${OCAML_SITELIBDIR}/cppo_ocamlbuild \
+                       share/doc/ocaml-cppo share/doc/ocaml-cppo_ocamlbuild
+OCAML_FINDLIB_DIRS+=    cppo_ocamlbuild
 
 .include "../../mk/ocaml.mk"
 
-BUILD_TARGET=  ocamlbuild all
+# Normally, we'd do this using opam-installer, but that requires
+# this package.
+do-install:
+       for i in LICENSE.md README.md; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/install/default/doc/cppo/$$i \
+               ${DESTDIR}${PREFIX}/share/doc/ocaml-cppo; \
+               ${INSTALL_DATA} ${WRKSRC}/_build/install/default/doc/cppo_ocamlbuild/$$i \
+               ${DESTDIR}${PREFIX}/share/doc/ocaml-cppo_ocamlbuild; \
+       done
+       for i in META opam; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/cppo/$$i \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cppo; \
+       done
+       for i in META opam ocamlbuild_cppo.cmi ocamlbuild_cppo.cmt \
+               ocamlbuild_cppo.cmti ocamlbuild_cppo.mli \
+               cppo_ocamlbuild.cma; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/cppo_ocamlbuild/$$i \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cppo_ocamlbuild; \
+       done
+       ${INSTALL_PROGRAM} ${WRKSRC}/_build/install/default/bin/cppo \
+               ${DESTDIR}${PREFIX}/bin
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
-BUILD_TARGET+= opt
-MAKE_ENV+=     BEST=.native NATDYNLINK=YES
-.else
-MAKE_ENV+=     BEST=.byte
+       for i in ocamlbuild_cppo.cmx cppo_ocamlbuild.cmxa cppo_ocamlbuild.a \
+               cppo_ocamlbuild.cmxs; do \
+               ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/cppo_ocamlbuild/$$i \
+               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cppo_ocamlbuild; \
+       done
 .endif
 
-MAKE_ENV+=     BINDIR=${DESTDIR}/${PREFIX}/bin DESTDIR=${DESTDIR} OCAML_SITELIBDIR=${OCAML_SITELIBDIR}
-INSTALLATION_DIRS+=    bin ${OCAML_SITELIBDIR}/cppo_ocamlbuild
-OCAML_FINDLIB_DIRS=    cppo_ocamlbuild
-
-.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../lang/camlp4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ocaml-cppo/PLIST
diff -u pkgsrc/devel/ocaml-cppo/PLIST:1.2 pkgsrc/devel/ocaml-cppo/PLIST:1.3
--- pkgsrc/devel/ocaml-cppo/PLIST:1.2   Tue Jul 11 10:20:03 2017
+++ pkgsrc/devel/ocaml-cppo/PLIST       Wed Jan 10 14:48:49 2018
@@ -1,9 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2017/07/11 10:20:03 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/01/10 14:48:49 jaapb Exp $
 bin/cppo
+${OCAML_SITELIB}/cppo
 ${OCAML_SITELIB}/cppo_ocamlbuild/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.a
-${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/cppo_ocamlbuild.a
+${OCAML_SITELIB}/cppo_ocamlbuild/cppo_ocamlbuild.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/cppo_ocamlbuild.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/cppo_ocamlbuild.cmxs
 ${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmi
+${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmt
+${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmxs
+${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.mli
+${OCAML_SITELIB}/cppo_ocamlbuild/opam
+share/doc/ocaml-cppo/LICENSE.md
+share/doc/ocaml-cppo/README.md
+share/doc/ocaml-cppo_ocamlbuild/LICENSE.md
+share/doc/ocaml-cppo_ocamlbuild/README.md
Index: pkgsrc/devel/ocaml-cppo/buildlink3.mk
diff -u pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.2 pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.3
--- pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.2   Tue Jul 11 10:20:03 2017
+++ pkgsrc/devel/ocaml-cppo/buildlink3.mk       Wed Jan 10 14:48:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/07/11 10:20:03 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/01/10 14:48:49 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-cppo
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-cppo
 OCAML_CPPO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-cppo+=     ocaml-cppo>=1.3.1
-BUILDLINK_ABI_DEPENDS.ocaml-cppo+=     ocaml-cppo>=1.5.0
+BUILDLINK_ABI_DEPENDS.ocaml-cppo+=     ocaml-cppo>=1.6.0
 BUILDLINK_PKGSRCDIR.ocaml-cppo?=       ../../devel/ocaml-cppo
 .endif # OCAML_CPPO_BUILDLINK3_MK
 

Index: pkgsrc/devel/ocaml-cppo/distinfo
diff -u pkgsrc/devel/ocaml-cppo/distinfo:1.5 pkgsrc/devel/ocaml-cppo/distinfo:1.6
--- pkgsrc/devel/ocaml-cppo/distinfo:1.5        Tue Jul 11 10:20:03 2017
+++ pkgsrc/devel/ocaml-cppo/distinfo    Wed Jan 10 14:48:49 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2017/07/11 10:20:03 jaapb Exp $
+$NetBSD: distinfo,v 1.6 2018/01/10 14:48:49 jaapb Exp $
 
-SHA1 (cppo-1.5.0.tar.gz) = 55143c216bd6dd5424a2b17412328c0776bb8215
-RMD160 (cppo-1.5.0.tar.gz) = e0f757d4c523ca3669198e53bcc6b0270377bc74
-SHA512 (cppo-1.5.0.tar.gz) = 2cc144815b818242b6bb1dee213aa65345620eaf1afe59b25d118399d9a02d577aa9dc61dd5756661e44411acccdb2fc0320a8984e5f0d2a7390fcc816bac7e0
-Size (cppo-1.5.0.tar.gz) = 26963 bytes
+SHA1 (cppo-1.6.0.tar.gz) = 149b0d226cfc5187748cbbc1c6b1c8ddbf741dd1
+RMD160 (cppo-1.6.0.tar.gz) = 02a18e9c9ea88a426b5298bc9b2b546a05ac0c13
+SHA512 (cppo-1.6.0.tar.gz) = b10859ab908ca7a5b96a00ef69c2467d023be53ee5f7f29ee40ad99cf8c75828af2d1d946444916db5d8655449097d4e386a66b0196f6bc9f599ca9cb97a59cc
+Size (cppo-1.6.0.tar.gz) = 27965 bytes