CVS commit: pkgsrc/textproc/ocaml-markup

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/ocaml-markup
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Tue, 27 Nov 2018 17:20:09 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Nov 27 17:20:09 UTC 2018

Modified Files:
        pkgsrc/textproc/ocaml-markup: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/textproc/ocaml-markup: options.mk

Log Message:
Updated textproc/ocaml-markup to version 0.8.0.

This package does away with the configure script and spins the lwt
parts off into a new markup-lwt library (which is now optional).

Some upstream bugfixes as well.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/ocaml-markup/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/ocaml-markup/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/ocaml-markup/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/ocaml-markup/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/ocaml-markup/options.mk

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

Modified files:

Index: pkgsrc/textproc/ocaml-markup/Makefile
diff -u pkgsrc/textproc/ocaml-markup/Makefile:1.8 pkgsrc/textproc/ocaml-markup/Makefile:1.9
--- pkgsrc/textproc/ocaml-markup/Makefile:1.8   Mon Nov 12 16:10:27 2018
+++ pkgsrc/textproc/ocaml-markup/Makefile       Tue Nov 27 17:20:09 2018
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2018/11/12 16:10:27 jaapb Exp $
+# $NetBSD: Makefile,v 1.9 2018/11/27 17:20:09 jaapb Exp $
 
 GITHUB_PROJECT=        markup.ml
 GITHUB_TAG=    ${PKGVERSION_NOREV}
-DISTNAME=      markup-0.7.6
+DISTNAME=      markup-0.8.0
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   2
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=aantron/}
 
@@ -13,15 +12,17 @@ HOMEPAGE=   https://github.com/aantron/mar
 COMMENT=       Error-recovering streaming HTML5 and XML parsers for OCaml
 LICENSE=       2-clause-bsd
 
-HAS_CONFIGURE= yes
+#HAS_CONFIGURE=        yes
 USE_LANGUAGES= # none
 
-OCAML_USE_JBUILDER=    yes
+OCAML_USE_DUNE=        yes
+DUNE_BUILD_PACKAGES=   markup
+OPAM_INSTALL_FILES=    markup
 
-do-configure:
-       ${RUN} cd ${WRKSRC} && ocaml src/configure.ml
+#do-configure:
+#      ${RUN} cd ${WRKSRC} && ocaml src/configure.ml
 
-.include "../../devel/ocaml-lwt/buildlink3.mk"
+.include "options.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../textproc/ocaml-uutf/buildlink3.mk"
 .include "../../mk/ocaml.mk"

Index: pkgsrc/textproc/ocaml-markup/PLIST
diff -u pkgsrc/textproc/ocaml-markup/PLIST:1.3 pkgsrc/textproc/ocaml-markup/PLIST:1.4
--- pkgsrc/textproc/ocaml-markup/PLIST:1.3      Fri Apr 13 12:44:51 2018
+++ pkgsrc/textproc/ocaml-markup/PLIST  Tue Nov 27 17:20:09 2018
@@ -1,4 +1,28 @@
-@comment $NetBSD: PLIST,v 1.3 2018/04/13 12:44:51 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/11/27 17:20:09 jaapb Exp $
+${OCAML_SITELIB}/markup-lwt/META
+${OCAML_SITELIB}/markup-lwt/markup-lwt.dune
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/markup_lwt.a
+${OCAML_SITELIB}/markup-lwt/markup_lwt.cma
+${OCAML_SITELIB}/markup-lwt/markup_lwt.cmi
+${OCAML_SITELIB}/markup-lwt/markup_lwt.cmt
+${OCAML_SITELIB}/markup-lwt/markup_lwt.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/markup_lwt.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/markup_lwt.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/markup_lwt.cmxs
+${OCAML_SITELIB}/markup-lwt/markup_lwt.ml
+${OCAML_SITELIB}/markup-lwt/markup_lwt.mli
+${OCAML_SITELIB}/markup-lwt/opam
+${OCAML_SITELIB}/markup-lwt/unix/markup-lwt.unix.dune
+${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cma
+${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmi
+${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmt
+${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.cmxs
+${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.ml
+${OCAML_SITELIB}/markup-lwt/unix/markup_lwt_unix.mli
 ${OCAML_SITELIB}/markup/META
 ${OCAML_SITELIB}/markup/common.ml
 ${OCAML_SITELIB}/markup/detect.ml
@@ -16,28 +40,6 @@ ${OCAML_SITELIB}/markup/input.ml
 ${OCAML_SITELIB}/markup/input.mli
 ${OCAML_SITELIB}/markup/kstream.ml
 ${OCAML_SITELIB}/markup/kstream.mli
-${OCAML_SITELIB}/markup/lwt/markup.lwt.dune
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.a
-${OCAML_SITELIB}/markup/lwt/markup_lwt.cma
-${OCAML_SITELIB}/markup/lwt/markup_lwt.cmi
-${OCAML_SITELIB}/markup/lwt/markup_lwt.cmt
-${OCAML_SITELIB}/markup/lwt/markup_lwt.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/markup_lwt.cmxs
-${OCAML_SITELIB}/markup/lwt/markup_lwt.ml
-${OCAML_SITELIB}/markup/lwt/markup_lwt.mli
-${OCAML_SITELIB}/markup/lwt/unix/markup.lwt.unix.dune
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.a
-${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cma
-${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmi
-${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmt
-${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.cmxs
-${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.ml
-${OCAML_SITELIB}/markup/lwt/unix/markup_lwt_unix.mli
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup.a
 ${OCAML_SITELIB}/markup/markup.cma
 ${OCAML_SITELIB}/markup/markup.cmi
@@ -52,7 +54,7 @@ ${OCAML_SITELIB}/markup/markup.mli
 ${OCAML_SITELIB}/markup/markup__.cmi
 ${OCAML_SITELIB}/markup/markup__.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__.cmx
-${OCAML_SITELIB}/markup/markup__.ml-gen
+${OCAML_SITELIB}/markup/markup__.ml
 ${OCAML_SITELIB}/markup/markup__Common.cmi
 ${OCAML_SITELIB}/markup/markup__Common.cmt
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/markup/markup__Common.cmx
@@ -130,5 +132,7 @@ ${OCAML_SITELIB}/markup/xml_tokenizer.ml
 ${OCAML_SITELIB}/markup/xml_tokenizer.mli
 ${OCAML_SITELIB}/markup/xml_writer.ml
 ${OCAML_SITELIB}/markup/xml_writer.mli
+share/doc/markup-lwt/LICENSE.md
+share/doc/markup-lwt/README.md
 share/doc/markup/LICENSE.md
 share/doc/markup/README.md

Index: pkgsrc/textproc/ocaml-markup/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-markup/buildlink3.mk:1.5 pkgsrc/textproc/ocaml-markup/buildlink3.mk:1.6
--- pkgsrc/textproc/ocaml-markup/buildlink3.mk:1.5      Thu Jul 19 15:15:29 2018
+++ pkgsrc/textproc/ocaml-markup/buildlink3.mk  Tue Nov 27 17:20:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/07/19 15:15:29 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/11/27 17:20:09 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-markup
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-markup
 OCAML_MARKUP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-markup+=   ocaml-markup>=0.7.2
-BUILDLINK_ABI_DEPENDS.ocaml-markup+=   ocaml-markup>=0.7.6nb1
+BUILDLINK_ABI_DEPENDS.ocaml-markup+=   ocaml-markup>=0.8.0
 BUILDLINK_PKGSRCDIR.ocaml-markup?=     ../../textproc/ocaml-markup
 
 .endif # OCAML_MARKUP_BUILDLINK3_MK

Index: pkgsrc/textproc/ocaml-markup/distinfo
diff -u pkgsrc/textproc/ocaml-markup/distinfo:1.4 pkgsrc/textproc/ocaml-markup/distinfo:1.5
--- pkgsrc/textproc/ocaml-markup/distinfo:1.4   Fri Apr 13 12:44:51 2018
+++ pkgsrc/textproc/ocaml-markup/distinfo       Tue Nov 27 17:20:09 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2018/04/13 12:44:51 jaapb Exp $
+$NetBSD: distinfo,v 1.5 2018/11/27 17:20:09 jaapb Exp $
 
-SHA1 (markup-0.7.6.tar.gz) = ea5c5146723d642a3094cbb7c7cf612d6f1a5c5e
-RMD160 (markup-0.7.6.tar.gz) = b865e82717a8ec96d60de2c0b9c601ce9443bafd
-SHA512 (markup-0.7.6.tar.gz) = dcb06d0d271677842f76f3eabd64ac4aefbd8c8194c0ca8732d32120b4f1026378f989c2979706f752d3df45f878194283bd2754023033b61063878de4deb319
-Size (markup-0.7.6.tar.gz) = 279370 bytes
+SHA1 (markup-0.8.0.tar.gz) = 74cc130b8959693592aa181d1164400c9eccde2f
+RMD160 (markup-0.8.0.tar.gz) = 242c0eb71b9923241930f9a8e476980c2db930c9
+SHA512 (markup-0.8.0.tar.gz) = f28b7f5cf9d1e4a86e240c7b9f5d62ccd0444142af3ba2ef1fb8906ea233ff9408d91aea4c66ba4c9a8163135efe87c59b9f9c23068710d6b2d54d38515b505a
+Size (markup-0.8.0.tar.gz) = 280344 bytes

Added files:

Index: pkgsrc/textproc/ocaml-markup/options.mk
diff -u /dev/null pkgsrc/textproc/ocaml-markup/options.mk:1.1
--- /dev/null   Tue Nov 27 17:20:09 2018
+++ pkgsrc/textproc/ocaml-markup/options.mk     Tue Nov 27 17:20:09 2018
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2018/11/27 17:20:09 jaapb Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-markup
+PKG_SUPPORTED_OPTIONS= lwt
+PKG_SUGGESTED_OPTIONS= # empty
+PLIST_VARS+=   lwt
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Camlp4 support
+###
+.if !empty(PKG_OPTIONS:Mlwt)
+.include "../../devel/ocaml-lwt/buildlink3.mk"
+PLIST.lwt=     yes
+DUNE_BUILD_PACKAGES+=  markup-lwt
+OPAM_INSTALL_FILES+=   markup-lwt
+.else
+.endif

Prev by Date: CVS commit: pkgsrc/devel/ocaml-lwt
Next by Date: Re: CVS commit: pkgsrc/x11/xinit
Previous by Thread: CVS commit: pkgsrc/devel/ocaml-lwt
Next by Thread: CVS commit: pkgsrc/devel/ocaml-lwt_log
Indexes:

Home | Main Index | Thread Index | Old Index