Wed Jan 10 14:48:49 2018 UTC ()
Updated package devel/ocaml-cppo to version 1.6.0.

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


(jaapb)
diff -r1.12 -r1.13 pkgsrc/devel/ocaml-cppo/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/ocaml-cppo/PLIST
diff -r1.2 -r1.3 pkgsrc/devel/ocaml-cppo/buildlink3.mk
diff -r1.5 -r1.6 pkgsrc/devel/ocaml-cppo/distinfo
cvs diff -r1.12 -r1.13 pkgsrc/devel/ocaml-cppo/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-cppo/Makefile 2017/09/08 09:51:20 1.12
+++ pkgsrc/devel/ocaml-cppo/Makefile 2018/01/10 14:48:49 1.13
@@ -1,37 +1,57 @@ @@ -1,37 +1,57 @@
1# $NetBSD: Makefile,v 1.12 2017/09/08 09:51:20 jaapb Exp $ 1# $NetBSD: Makefile,v 1.13 2018/01/10 14:48:49 jaapb Exp $
2 2
3DISTNAME= cppo-1.5.0 3DISTNAME= cppo-1.6.0
4PKGNAME= ocaml-${DISTNAME} 4PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 1 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_GITHUB:=mjambon/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mjambon/}
8GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
9GITHUB_PROJECT= cppo 8GITHUB_PROJECT= cppo
10 9
11MAINTAINER= jaapb@NetBSD.org 10MAINTAINER= jaapb@NetBSD.org
12#HOMEPAGE= http://mjambon.com/cppo.html 11#HOMEPAGE= http://mjambon.com/cppo.html
13COMMENT= C-style preprocessor for OCaml 12COMMENT= C-style preprocessor for OCaml
14LICENSE= modified-bsd 13LICENSE= modified-bsd
15 14
16USE_LANGUAGES= # none 15USE_LANGUAGES= # none
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake
18 17
19OCAML_USE_FINDLIB= yes 18OCAML_USE_JBUILDER= yes
 19OCAML_USE_OPAM= no # opam depends on this
 20
 21INSTALLATION_DIRS+= bin ${OCAML_SITELIBDIR}/cppo_ocamlbuild \
 22 share/doc/ocaml-cppo share/doc/ocaml-cppo_ocamlbuild
 23OCAML_FINDLIB_DIRS+= cppo_ocamlbuild
20 24
21.include "../../mk/ocaml.mk" 25.include "../../mk/ocaml.mk"
22 26
23BUILD_TARGET= ocamlbuild all 27# Normally, we'd do this using opam-installer, but that requires
 28# this package.
 29do-install:
 30 for i in LICENSE.md README.md; do \
 31 ${INSTALL_DATA} ${WRKSRC}/_build/install/default/doc/cppo/$$i \
 32 ${DESTDIR}${PREFIX}/share/doc/ocaml-cppo; \
 33 ${INSTALL_DATA} ${WRKSRC}/_build/install/default/doc/cppo_ocamlbuild/$$i \
 34 ${DESTDIR}${PREFIX}/share/doc/ocaml-cppo_ocamlbuild; \
 35 done
 36 for i in META opam; do \
 37 ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/cppo/$$i \
 38 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cppo; \
 39 done
 40 for i in META opam ocamlbuild_cppo.cmi ocamlbuild_cppo.cmt \
 41 ocamlbuild_cppo.cmti ocamlbuild_cppo.mli \
 42 cppo_ocamlbuild.cma; do \
 43 ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/cppo_ocamlbuild/$$i \
 44 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cppo_ocamlbuild; \
 45 done
 46 ${INSTALL_PROGRAM} ${WRKSRC}/_build/install/default/bin/cppo \
 47 ${DESTDIR}${PREFIX}/bin
24.if ${OCAML_USE_OPT_COMPILER} == "yes" 48.if ${OCAML_USE_OPT_COMPILER} == "yes"
25BUILD_TARGET+= opt 49 for i in ocamlbuild_cppo.cmx cppo_ocamlbuild.cmxa cppo_ocamlbuild.a \
26MAKE_ENV+= BEST=.native NATDYNLINK=YES 50 cppo_ocamlbuild.cmxs; do \
27.else 51 ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/cppo_ocamlbuild/$$i \
28MAKE_ENV+= BEST=.byte 52 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cppo_ocamlbuild; \
 53 done
29.endif 54.endif
30 55
31MAKE_ENV+= BINDIR=${DESTDIR}/${PREFIX}/bin DESTDIR=${DESTDIR} OCAML_SITELIBDIR=${OCAML_SITELIBDIR} 
32INSTALLATION_DIRS+= bin ${OCAML_SITELIBDIR}/cppo_ocamlbuild 
33OCAML_FINDLIB_DIRS= cppo_ocamlbuild 
34 
35.include "../../devel/ocamlbuild/buildlink3.mk" 
36.include "../../lang/camlp4/buildlink3.mk" 56.include "../../lang/camlp4/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/ocaml-cppo/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-cppo/PLIST 2017/07/11 10:20:03 1.2
+++ pkgsrc/devel/ocaml-cppo/PLIST 2018/01/10 14:48:49 1.3
@@ -1,9 +1,18 @@ @@ -1,9 +1,18 @@
1@comment $NetBSD: PLIST,v 1.2 2017/07/11 10:20:03 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.3 2018/01/10 14:48:49 jaapb Exp $
2bin/cppo 2bin/cppo
 3${OCAML_SITELIB}/cppo
3${OCAML_SITELIB}/cppo_ocamlbuild/META 4${OCAML_SITELIB}/cppo_ocamlbuild/META
4${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.a 5${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/cppo_ocamlbuild.a
5${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cma 6${OCAML_SITELIB}/cppo_ocamlbuild/cppo_ocamlbuild.cma
 7${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/cppo_ocamlbuild.cmxa
 8${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/cppo_ocamlbuild.cmxs
6${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmi 9${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmi
 10${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmt
 11${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmti
7${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmx 12${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmx
8${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmxa 13${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.mli
9${PLIST.ocaml-opt}${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.cmxs 14${OCAML_SITELIB}/cppo_ocamlbuild/opam
 15share/doc/ocaml-cppo/LICENSE.md
 16share/doc/ocaml-cppo/README.md
 17share/doc/ocaml-cppo_ocamlbuild/LICENSE.md
 18share/doc/ocaml-cppo_ocamlbuild/README.md
cvs diff -r1.2 -r1.3 pkgsrc/devel/ocaml-cppo/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-cppo/buildlink3.mk 2017/07/11 10:20:03 1.2
+++ pkgsrc/devel/ocaml-cppo/buildlink3.mk 2018/01/10 14:48:49 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.2 2017/07/11 10:20:03 jaapb Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2018/01/10 14:48:49 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocaml-cppo 3BUILDLINK_TREE+= ocaml-cppo
4 4
5.if !defined(OCAML_CPPO_BUILDLINK3_MK) 5.if !defined(OCAML_CPPO_BUILDLINK3_MK)
6OCAML_CPPO_BUILDLINK3_MK:= 6OCAML_CPPO_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocaml-cppo+= ocaml-cppo>=1.3.1 8BUILDLINK_API_DEPENDS.ocaml-cppo+= ocaml-cppo>=1.3.1
9BUILDLINK_ABI_DEPENDS.ocaml-cppo+= ocaml-cppo>=1.5.0 9BUILDLINK_ABI_DEPENDS.ocaml-cppo+= ocaml-cppo>=1.6.0
10BUILDLINK_PKGSRCDIR.ocaml-cppo?= ../../devel/ocaml-cppo 10BUILDLINK_PKGSRCDIR.ocaml-cppo?= ../../devel/ocaml-cppo
11.endif # OCAML_CPPO_BUILDLINK3_MK 11.endif # OCAML_CPPO_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -ocaml-cppo 13BUILDLINK_TREE+= -ocaml-cppo
cvs diff -r1.5 -r1.6 pkgsrc/devel/ocaml-cppo/distinfo (expand / switch to unified diff)

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