Received: by mail.netbsd.org (Postfix, from userid 605) id 2CBB584DCD; Tue, 27 Nov 2018 15:59:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4309B84DA2 for ; Tue, 27 Nov 2018 15:59:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id DvC1YXoCScSu for ; Tue, 27 Nov 2018 15:59:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2184284CD3 for ; Tue, 27 Nov 2018 15:59:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 19D18FB1F; Tue, 27 Nov 2018 15:59:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154333439515450" MIME-Version: 1.0 Date: Tue, 27 Nov 2018 15:59:55 +0000 From: "Jaap Boender" Subject: CVS commit: pkgsrc/devel/ocaml-cppo To: pkgsrc-changes@NetBSD.org Reply-To: jaapb@netbsd.org X-Mailer: log_accum Message-Id: <20181127155955.19D18FB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154333439515450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jaapb Date: Tue Nov 27 15:59:55 UTC 2018 Modified Files: pkgsrc/devel/ocaml-cppo: Makefile PLIST buildlink3.mk distinfo Log Message: Updated package devel/ocaml-cppo to version 1.6.5. One small bugfix. The package now also uses dune. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/ocaml-cppo/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-cppo/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ocaml-cppo/buildlink3.mk cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-cppo/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154333439515450 Content-Disposition: inline Content-Length: 5864 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ocaml-cppo/Makefile diff -u pkgsrc/devel/ocaml-cppo/Makefile:1.21 pkgsrc/devel/ocaml-cppo/Makefile:1.22 --- pkgsrc/devel/ocaml-cppo/Makefile:1.21 Mon Nov 12 16:10:19 2018 +++ pkgsrc/devel/ocaml-cppo/Makefile Tue Nov 27 15:59:54 2018 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2018/11/12 16:10:19 jaapb Exp $ +# $NetBSD: Makefile,v 1.22 2018/11/27 15:59:54 jaapb Exp $ -DISTNAME= cppo-1.6.4 +DISTNAME= cppo-1.6.5 PKGNAME= ocaml-${DISTNAME} -PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=mjambon/} GITHUB_PROJECT= cppo @@ -14,46 +13,18 @@ COMMENT= C-style preprocessor for OCaml LICENSE= modified-bsd USE_LANGUAGES= # none -USE_TOOLS+= gmake +#USE_TOOLS+= gmake -OCAML_USE_JBUILDER= yes -OCAML_USE_OPAM= no # opam depends on this +OCAML_USE_DUNE= yes INSTALLATION_DIRS+= bin ${OCAML_SITELIBDIR}/cppo_ocamlbuild \ share/doc/ocaml-cppo share/doc/ocaml-cppo_ocamlbuild OCAML_FINDLIB_DIRS+= cppo_ocamlbuild +DUNE_BUILD_PACKAGES= cppo cppo_ocamlbuild +OPAM_INSTALL_FILES= cppo cppo_ocamlbuild .include "../../mk/ocaml.mk" -# 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" - 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 - .include "../../devel/ocamlbuild/buildlink3.mk" BUILDLINK_DEPMETHOD.ocamlbuild?= full .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/ocaml-cppo/PLIST diff -u pkgsrc/devel/ocaml-cppo/PLIST:1.3 pkgsrc/devel/ocaml-cppo/PLIST:1.4 --- pkgsrc/devel/ocaml-cppo/PLIST:1.3 Wed Jan 10 14:48:49 2018 +++ pkgsrc/devel/ocaml-cppo/PLIST Tue Nov 27 15:59:54 2018 @@ -1,18 +1,23 @@ -@comment $NetBSD: PLIST,v 1.3 2018/01/10 14:48:49 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.4 2018/11/27 15:59:54 jaapb Exp $ bin/cppo -${OCAML_SITELIB}/cppo +${OCAML_SITELIB}/cppo/META +${OCAML_SITELIB}/cppo/opam ${OCAML_SITELIB}/cppo_ocamlbuild/META ${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/cppo_ocamlbuild.dune ${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 +${OCAML_SITELIB}/cppo_ocamlbuild/ocamlbuild_cppo.ml ${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 +share/doc/cppo/LICENSE.md +share/doc/cppo/README.md +share/doc/cppo_ocamlbuild/LICENSE.md +share/doc/cppo_ocamlbuild/README.md +@pkgdir share/doc/ocaml-cppo_ocamlbuild +@pkgdir share/doc/ocaml-cppo Index: pkgsrc/devel/ocaml-cppo/buildlink3.mk diff -u pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.6 pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.7 --- pkgsrc/devel/ocaml-cppo/buildlink3.mk:1.6 Thu Jul 19 15:15:22 2018 +++ pkgsrc/devel/ocaml-cppo/buildlink3.mk Tue Nov 27 15:59:54 2018 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2018/07/19 15:15:22 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/11/27 15:59:54 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.6.4nb1 +BUILDLINK_ABI_DEPENDS.ocaml-cppo+= ocaml-cppo>=1.6.5 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.7 pkgsrc/devel/ocaml-cppo/distinfo:1.8 --- pkgsrc/devel/ocaml-cppo/distinfo:1.7 Wed Jun 27 19:29:43 2018 +++ pkgsrc/devel/ocaml-cppo/distinfo Tue Nov 27 15:59:54 2018 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2018/06/27 19:29:43 jaapb Exp $ +$NetBSD: distinfo,v 1.8 2018/11/27 15:59:54 jaapb Exp $ -SHA1 (cppo-1.6.4.tar.gz) = eaf6bc9d3d141d9a3712b99cc0a4ed494c33d8e8 -RMD160 (cppo-1.6.4.tar.gz) = cabd77ece9850fbd57b1bc59e31c41b6d9f35555 -SHA512 (cppo-1.6.4.tar.gz) = 89c6df66d597d929be7532ad82f0206b028bdbd79a0b4b39451bce3fa5bd63a80dce931d575f69bd7066de829347498c736657dfe9610b20700a652b9b542a4d -Size (cppo-1.6.4.tar.gz) = 28068 bytes +SHA1 (cppo-1.6.5.tar.gz) = d033130fa256035192f92d472451fcd477d82be3 +RMD160 (cppo-1.6.5.tar.gz) = 98aacb6ac3e2a38b3782e0ae18e076f970bfdcfc +SHA512 (cppo-1.6.5.tar.gz) = e7955d578c4d3d9b2a2c40691b39912ecaffe5173b90394552978836da79ae963ae202899525e366a599a35913373fd7ab584748d1fcbdc4e53a442b42603061 +Size (cppo-1.6.5.tar.gz) = 28091 bytes --_----------=_154333439515450--