CVS commit: pkgsrc/devel/ocaml-re

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Mar  5 16:50:45 UTC 2019

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

Log Message:
Updated devel/ocaml-re for dune compatibility.

Package now compatible with dune 1.7; revbump.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/ocaml-re/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-re/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/ocaml-re/buildlink3.mk

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-re/Makefile
diff -u pkgsrc/devel/ocaml-re/Makefile:1.18 pkgsrc/devel/ocaml-re/Makefile:1.19
--- pkgsrc/devel/ocaml-re/Makefile:1.18 Tue Nov 27 16:07:28 2018
+++ pkgsrc/devel/ocaml-re/Makefile      Tue Mar  5 16:50:45 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2018/11/27 16:07:28 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2019/03/05 16:50:45 jaapb Exp $
 
 VERSION=       1.8.0
 GITHUB_PROJECT=        ocaml-re
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml/}
 

Index: pkgsrc/devel/ocaml-re/PLIST
diff -u pkgsrc/devel/ocaml-re/PLIST:1.5 pkgsrc/devel/ocaml-re/PLIST:1.6
--- pkgsrc/devel/ocaml-re/PLIST:1.5     Tue Nov 27 16:07:28 2018
+++ pkgsrc/devel/ocaml-re/PLIST Tue Mar  5 16:50:45 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/11/27 16:07:28 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/03/05 16:50:45 jaapb Exp $
 ${OCAML_SITELIB}/re/META
 ${OCAML_SITELIB}/re/automata.ml
 ${OCAML_SITELIB}/re/automata.mli
@@ -8,9 +8,9 @@ ${OCAML_SITELIB}/re/core.ml
 ${OCAML_SITELIB}/re/core.mli
 ${OCAML_SITELIB}/re/cset.ml
 ${OCAML_SITELIB}/re/cset.mli
+${OCAML_SITELIB}/re/dune-package
 ${OCAML_SITELIB}/re/emacs.ml
 ${OCAML_SITELIB}/re/emacs.mli
-${OCAML_SITELIB}/re/emacs/re.emacs.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/emacs/re_emacs.a
 ${OCAML_SITELIB}/re/emacs/re_emacs.cma
 ${OCAML_SITELIB}/re/emacs/re_emacs.cmi
@@ -22,7 +22,6 @@ ${OCAML_SITELIB}/re/emacs/re_emacs.ml
 ${OCAML_SITELIB}/re/fmt.ml
 ${OCAML_SITELIB}/re/glob.ml
 ${OCAML_SITELIB}/re/glob.mli
-${OCAML_SITELIB}/re/glob/re.glob.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/glob/re_glob.a
 ${OCAML_SITELIB}/re/glob/re_glob.cma
 ${OCAML_SITELIB}/re/glob/re_glob.cmi
@@ -34,7 +33,6 @@ ${OCAML_SITELIB}/re/glob/re_glob.ml
 ${OCAML_SITELIB}/re/opam
 ${OCAML_SITELIB}/re/pcre.ml
 ${OCAML_SITELIB}/re/pcre.mli
-${OCAML_SITELIB}/re/pcre/re.pcre.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pcre/re_pcre.a
 ${OCAML_SITELIB}/re/pcre/re_pcre.cma
 ${OCAML_SITELIB}/re/pcre/re_pcre.cmi
@@ -45,7 +43,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/pc
 ${OCAML_SITELIB}/re/pcre/re_pcre.ml
 ${OCAML_SITELIB}/re/perl.ml
 ${OCAML_SITELIB}/re/perl.mli
-${OCAML_SITELIB}/re/perl/re.perl.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/perl/re_perl.a
 ${OCAML_SITELIB}/re/perl/re_perl.cma
 ${OCAML_SITELIB}/re/perl/re_perl.cmi
@@ -58,7 +55,6 @@ ${OCAML_SITELIB}/re/pmark.ml
 ${OCAML_SITELIB}/re/pmark.mli
 ${OCAML_SITELIB}/re/posix.ml
 ${OCAML_SITELIB}/re/posix.mli
-${OCAML_SITELIB}/re/posix/re.posix.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/posix/re_posix.a
 ${OCAML_SITELIB}/re/posix/re_posix.cma
 ${OCAML_SITELIB}/re/posix/re_posix.cmi
@@ -74,7 +70,6 @@ ${OCAML_SITELIB}/re/re.cmt
 ${PLIST.ocaml-opt}${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re.cmxs
-${OCAML_SITELIB}/re/re.dune
 ${OCAML_SITELIB}/re/re.ml
 ${OCAML_SITELIB}/re/re__.cmi
 ${OCAML_SITELIB}/re/re__.cmt
@@ -129,7 +124,6 @@ ${OCAML_SITELIB}/re/re__Str.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/re__Str.cmx
 ${OCAML_SITELIB}/re/str.ml
 ${OCAML_SITELIB}/re/str.mli
-${OCAML_SITELIB}/re/str/re.str.dune
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/re/str/re_str.a
 ${OCAML_SITELIB}/re/str/re_str.cma
 ${OCAML_SITELIB}/re/str/re_str.cmi

Index: pkgsrc/devel/ocaml-re/buildlink3.mk
diff -u pkgsrc/devel/ocaml-re/buildlink3.mk:1.9 pkgsrc/devel/ocaml-re/buildlink3.mk:1.10
--- pkgsrc/devel/ocaml-re/buildlink3.mk:1.9     Tue Nov 27 16:07:28 2018
+++ pkgsrc/devel/ocaml-re/buildlink3.mk Tue Mar  5 16:50:45 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/11/27 16:07:28 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2019/03/05 16:50:45 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-re
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-re
 OCAML_RE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-re+=       ocaml-re>=1.6.0
-BUILDLINK_ABI_DEPENDS.ocaml-re+=       ocaml-re>=1.8.0
+BUILDLINK_ABI_DEPENDS.ocaml-re+=       ocaml-re>=1.8.0nb1
 BUILDLINK_PKGSRCDIR.ocaml-re?= ../../devel/ocaml-re
 .endif # OCAML_RE_BUILDLINK3_MK