[pkgsrc/trunk]: pkgsrc/x11/ocaml-lablgtk3 Updated x11/ocaml-lablgtk3 to versi...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/ocaml-lablgtk3 Updated x11/ocaml-lablgtk3 to versi...
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Mon, 28 Feb 2022 14:13:37 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d72e1d041018
branches:  trunk
changeset: 374836:d72e1d041018
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Mon Feb 28 13:16:24 2022 +0000

description:
Updated x11/ocaml-lablgtk3 to version 3.1.2.

Upstream changes are mostly minor, though this update is needed for
compatibility with OCaml 4.14.

Package options have now been properly integrated.

diffstat:

 x11/ocaml-lablgtk3/Makefile      |    9 +-
 x11/ocaml-lablgtk3/PLIST         |  120 +++++++++++++++++++-------------------
 x11/ocaml-lablgtk3/buildlink3.mk |    8 +-
 x11/ocaml-lablgtk3/distinfo      |    8 +-
 x11/ocaml-lablgtk3/options.mk    |   14 +---
 5 files changed, 74 insertions(+), 85 deletions(-)

diffs (244 lines):

diff -r 6fcffe566c4f -r d72e1d041018 x11/ocaml-lablgtk3/Makefile
--- a/x11/ocaml-lablgtk3/Makefile       Mon Feb 28 12:55:35 2022 +0000
+++ b/x11/ocaml-lablgtk3/Makefile       Mon Feb 28 13:16:24 2022 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2021/12/08 16:02:56 adam Exp $
+# $NetBSD: Makefile,v 1.12 2022/02/28 13:16:24 jaapb Exp $
 
 GITHUB_PROJECT=        lablgtk
 GITHUB_TAG=    ${VERSION}
-VERSION=       3.1.0
+VERSION=       3.1.2
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${GITHUB_PROJECT}3-${VERSION}
-PKGREVISION=   8
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=garrigue/}
 
@@ -18,8 +17,8 @@
 
 OCAML_USE_DUNE=                yes
 OCAML_FINDLIB_DIRS=    lablgtk3
-OPAM_INSTALL_FILES=    lablgtk3
-DUNE_BUILD_PACKAGES=   lablgtk3
+OPAM_INSTALL_FILES=    ${OCAML_FINDLIB_DIRS}
+DUNE_BUILD_PACKAGES=   ${OCAML_FINDLIB_DIRS}
 
 
 .include "../../mk/ocaml.mk"
diff -r 6fcffe566c4f -r d72e1d041018 x11/ocaml-lablgtk3/PLIST
--- a/x11/ocaml-lablgtk3/PLIST  Mon Feb 28 12:55:35 2022 +0000
+++ b/x11/ocaml-lablgtk3/PLIST  Mon Feb 28 13:16:24 2022 +0000
@@ -1,53 +1,53 @@
-@comment $NetBSD: PLIST,v 1.2 2020/01/24 14:50:42 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/02/28 13:16:24 jaapb Exp $
 bin/gdk_pixbuf_mlsource3
 bin/lablgladecc3
-${OCAML_SITELIB}/lablgtk3-gtkspell3/META
-${OCAML_SITELIB}/lablgtk3-gtkspell3/dune-package
-${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmi
-${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmt
-${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmx
-${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.ml
-${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.a
-${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cmxs
-${OCAML_SITELIB}/lablgtk3-gtkspell3/liblablgtk3_gtkspell3_stubs.a
-${OCAML_SITELIB}/lablgtk3-gtkspell3/opam
-${OCAML_SITELIB}/lablgtk3-sourceview3/META
-${OCAML_SITELIB}/lablgtk3-sourceview3/dune-package
-${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmi
-${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmt
-${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmx
-${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.ml
-${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.mli
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmi
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmx
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.ml
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmi
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmx
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.ml
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.cmi
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.cmti
-${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.a
-${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxs
-${OCAML_SITELIB}/lablgtk3-sourceview3/liblablgtk3_sourceview3_stubs.a
-${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmi
-${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmx
-${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.ml
-${OCAML_SITELIB}/lablgtk3-sourceview3/opam
-${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmi
-${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmx
-${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.ml
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/META
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/dune-package
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmi
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmt
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmti
+${PLIST.gtkspell}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.cmx
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.ml
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/gtkSpell.mli
+${PLIST.gtkspell}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.a
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cma
+${PLIST.gtkspell}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cmxa
+${PLIST.gtkspell}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-gtkspell3/lablgtk3_gtkspell3.cmxs
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/liblablgtk3_gtkspell3_stubs.a
+${PLIST.gtkspell}${OCAML_SITELIB}/lablgtk3-gtkspell3/opam
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/META
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/dune-package
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmi
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmt
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmti
+${PLIST.gtksourceview}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.cmx
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.ml
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gSourceView3.mli
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmi
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmt
+${PLIST.gtksourceview}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.cmx
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3.ml
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmi
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmt
+${PLIST.gtksourceview}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.cmx
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3Props.ml
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.cmi
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.cmti
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/gtkSourceView3_types.mli
+${PLIST.gtksourceview}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.a
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cma
+${PLIST.gtksourceview}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxa
+${PLIST.gtksourceview}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxs
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/liblablgtk3_sourceview3_stubs.a
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmi
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmt
+${PLIST.gtksourceview}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.cmx
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/ogtkSourceView3Props.ml
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/opam
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmi
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmt
+${PLIST.gtksourceview}${PLIST.ocaml-opt}${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.cmx
+${PLIST.gtksourceview}${OCAML_SITELIB}/lablgtk3-sourceview3/sourceView3Enums.ml
 ${OCAML_SITELIB}/lablgtk3/META
 ${OCAML_SITELIB}/lablgtk3/cairo_pango.cmi
 ${OCAML_SITELIB}/lablgtk3/cairo_pango.cmt
@@ -481,19 +481,19 @@
 ${OCAML_SITELIB}/lablgtk3/pangoEnums.ml
 ${OCAML_SITELIB}/lablgtk3/pango_tags.h
 ${OCAML_SITELIB}/lablgtk3/wrappers.h
-${OCAML_SITELIB}/stublibs/dlllablgtk3_gtkspell3_stubs.so
-${OCAML_SITELIB}/stublibs/dlllablgtk3_sourceview3_stubs.so
+${PLIST.gtkspell}${OCAML_SITELIB}/stublibs/dlllablgtk3_gtkspell3_stubs.so
+${PLIST.gtksourceview}${OCAML_SITELIB}/stublibs/dlllablgtk3_sourceview3_stubs.so
 ${OCAML_SITELIB}/stublibs/dlllablgtk3_stubs.so
-share/doc/lablgtk3-gtkspell3/CHANGELOG.API
-share/doc/lablgtk3-gtkspell3/CHANGES.md
-share/doc/lablgtk3-gtkspell3/LICENSE
-share/doc/lablgtk3-gtkspell3/README.dune.md
-share/doc/lablgtk3-gtkspell3/README.md
-share/doc/lablgtk3-sourceview3/CHANGELOG.API
-share/doc/lablgtk3-sourceview3/CHANGES.md
-share/doc/lablgtk3-sourceview3/LICENSE
-share/doc/lablgtk3-sourceview3/README.dune.md
-share/doc/lablgtk3-sourceview3/README.md
+${PLIST.gtkspell}share/doc/lablgtk3-gtkspell3/CHANGELOG.API
+${PLIST.gtkspell}share/doc/lablgtk3-gtkspell3/CHANGES.md
+${PLIST.gtkspell}share/doc/lablgtk3-gtkspell3/LICENSE
+${PLIST.gtkspell}share/doc/lablgtk3-gtkspell3/README.dune.md
+${PLIST.gtkspell}share/doc/lablgtk3-gtkspell3/README.md
+${PLIST.gtksourceview}share/doc/lablgtk3-sourceview3/CHANGELOG.API
+${PLIST.gtksourceview}share/doc/lablgtk3-sourceview3/CHANGES.md
+${PLIST.gtksourceview}share/doc/lablgtk3-sourceview3/LICENSE
+${PLIST.gtksourceview}share/doc/lablgtk3-sourceview3/README.dune.md
+${PLIST.gtksourceview}share/doc/lablgtk3-sourceview3/README.md
 share/doc/lablgtk3/CHANGELOG.API
 share/doc/lablgtk3/CHANGES.md
 share/doc/lablgtk3/LICENSE
diff -r 6fcffe566c4f -r d72e1d041018 x11/ocaml-lablgtk3/buildlink3.mk
--- a/x11/ocaml-lablgtk3/buildlink3.mk  Mon Feb 28 12:55:35 2022 +0000
+++ b/x11/ocaml-lablgtk3/buildlink3.mk  Mon Feb 28 13:16:24 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2021/04/21 11:40:49 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2022/02/28 13:16:24 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-lablgtk3
 
@@ -6,18 +6,18 @@
 OCAML_LABLGTK3_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-lablgtk3+= ocaml-lablgtk3>=3.0beta8
-BUILDLINK_ABI_DEPENDS.ocaml-lablgtk3+= ocaml-lablgtk3>=3.1.0nb7
+BUILDLINK_ABI_DEPENDS.ocaml-lablgtk3+= ocaml-lablgtk3>=3.1.2
 BUILDLINK_PKGSRCDIR.ocaml-lablgtk3?=   ../../x11/ocaml-lablgtk3
 
 # options must be exposed if and only if we built with them
 pkgbase := ocaml-lablgtk3
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk3:Mgtkspell)
+.if ${PKG_BUILD_OPTIONS.ocaml-lablgtk3:Mgtkspell}
 .  include "../../textproc/gtkspell3/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ocaml-lablgtk3:Mgtksourceview3)
+.if ${PKG_BUILD_OPTIONS.ocaml-lablgtk3:Mgtksourceview3}
 .  include "../../x11/gtksourceview3/buildlink3.mk"
 .endif
 
diff -r 6fcffe566c4f -r d72e1d041018 x11/ocaml-lablgtk3/distinfo
--- a/x11/ocaml-lablgtk3/distinfo       Mon Feb 28 12:55:35 2022 +0000
+++ b/x11/ocaml-lablgtk3/distinfo       Mon Feb 28 13:16:24 2022 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:34:17 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/28 13:16:24 jaapb Exp $
 
-BLAKE2s (lablgtk-3.1.0.tar.gz) = b40f6aedcefe4fbb89d52bb14ddf3ab1903ceaf190a9740a067c097bf54e694b
-SHA512 (lablgtk-3.1.0.tar.gz) = e78abec3a350842d02619da1b525e278194f1d87699635114223d7b2d85708b2999a8a0ff1530ba7ab7fe048d4d8f3daa0f220fa9a502b0dd83025e4180cd6a5
-Size (lablgtk-3.1.0.tar.gz) = 1031045 bytes
+BLAKE2s (lablgtk-3.1.2.tar.gz) = 35a51b37a2150003dbd77d256ee5883ff53f480dd720a6bf06e18da978a69daa
+SHA512 (lablgtk-3.1.2.tar.gz) = c63a492160f36685f65cb6bc0e72ff4939005acb2c65c56c0d9ba8f2112a618f24db84765e7b4416e49024048a36895028cfc5ef2c3e298dd4a309e902e34af5
+Size (lablgtk-3.1.2.tar.gz) = 1042626 bytes
diff -r 6fcffe566c4f -r d72e1d041018 x11/ocaml-lablgtk3/options.mk
--- a/x11/ocaml-lablgtk3/options.mk     Mon Feb 28 12:55:35 2022 +0000
+++ b/x11/ocaml-lablgtk3/options.mk     Mon Feb 28 13:16:24 2022 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2020/01/24 14:50:42 jaapb Exp $
+# $NetBSD: options.mk,v 1.3 2022/02/28 13:16:24 jaapb Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.lablgtk3
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-lablgtk3
 PKG_SUPPORTED_OPTIONS= gtksourceview3 gtkspell
 PKG_SUGGESTED_OPTIONS= gtksourceview3 gtkspell
 PLIST_VARS+=           gtkspell gtksourceview
@@ -9,22 +9,12 @@
 
 .if !empty(PKG_OPTIONS:Mgtkspell)
 .include "../../textproc/gtkspell3/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-gtkspell
 PLIST.gtkspell=        yes
 OCAML_FINDLIB_DIRS+=   lablgtk3-gtkspell3
-OPAM_INSTALL_FILES+=   lablgtk3-gtkspell3
-DUNE_BUILD_PACKAGES+=  lablgtk3-gtkspell3
-.else
-CONFIGURE_ARGS+=       --without-gtkspell
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtksourceview3)
 .include "../../x11/gtksourceview3/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-gtksourceview3
 PLIST.gtksourceview=   yes
 OCAML_FINDLIB_DIRS+=   lablgtk3-sourceview3
-OPAM_INSTALL_FILES+=   lablgtk3-sourceview3
-DUNE_BUILD_PACKAGES+=  lablgtk3-sourceview3
-.else
-CONFIGURE_ARGS+=       --without-gtksourceview3
 .endif
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/ocaml-lablgtk3 to 3.1.2
Next by Date: [pkgsrc/trunk]: pkgsrc/graphics/ocaml-cairo ocaml-cairo: Add comment about la...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/ocaml-lablgtk3 to 3.1.2
Next by Thread: [pkgsrc/trunk]: pkgsrc/graphics/ocaml-cairo ocaml-cairo: Add comment about la...
Indexes:
Home | Main Index | Thread Index | Old Index