Updated graphics/ocaml-cairo to version 0.6.2 and added options.

Changes to the previous version are relatively small (though we do need
this version to compile with the upcoming ocaml 4.14).

I've also added options to not compile the gtk and pango packages, which
means the package can be used on headless setups.
This commit is contained in:
jaapb 2022-02-28 12:55:08 +00:00
parent 3e4256dc15
commit 5b37488d11
5 changed files with 77 additions and 50 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.12 2021/12/08 16:05:02 adam Exp $
# $NetBSD: Makefile,v 1.13 2022/02/28 12:55:08 jaapb Exp $
GITHUB_PROJECT= ocaml-cairo
DISTNAME= ${GITHUB_PROJECT}-0.6.1
PKGREVISION= 9
DISTNAME= ${GITHUB_PROJECT}-0.6.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GITHUB:=Chris00/}
@ -11,15 +10,13 @@ HOMEPAGE= https://github.com/Chris00/ocaml-cairo/
COMMENT= Bindings for OCaml to the cairo library
LICENSE= gnu-lgpl-v3
USE_TOOLS+= pkg-config
OCAML_USE_DUNE= yes
OCAML_FINDLIB_DIRS= cairo2 cairo2-gtk cairo2-pango
OCAML_FINDLIB_DIRS= cairo2
OPAM_INSTALL_FILES= ${OCAML_FINDLIB_DIRS}
DUNE_BUILD_PACKAGES= ${OCAML_FINDLIB_DIRS}
.include "options.mk"
.include "../../mk/ocaml.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../devel/ocaml-dune-configurator/buildlink3.mk"
.include "../../x11/ocaml-lablgtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,32 +1,32 @@
@comment $NetBSD: PLIST,v 1.1 2020/01/24 12:57:08 jaapb Exp $
${OCAML_SITELIB}/cairo2-gtk/META
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.a
${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cma
${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmi
${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmt
${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmxs
${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.ml
${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.mli
${OCAML_SITELIB}/cairo2-gtk/dune-package
${OCAML_SITELIB}/cairo2-gtk/libcairo_gtk_stubs.a
${OCAML_SITELIB}/cairo2-gtk/opam
${OCAML_SITELIB}/cairo2-pango/META
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-pango/cairo_pango.a
${OCAML_SITELIB}/cairo2-pango/cairo_pango.cma
${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmi
${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmt
${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmx
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmxs
${OCAML_SITELIB}/cairo2-pango/cairo_pango.ml
${OCAML_SITELIB}/cairo2-pango/cairo_pango.mli
${OCAML_SITELIB}/cairo2-pango/dune-package
${OCAML_SITELIB}/cairo2-pango/libcairo_pango_stubs.a
${OCAML_SITELIB}/cairo2-pango/opam
@comment $NetBSD: PLIST,v 1.2 2022/02/28 12:55:08 jaapb Exp $
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/META
${PLIST.gtk}${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.a
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cma
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmi
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmt
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmti
${PLIST.gtk}${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmx
${PLIST.gtk}${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmxa
${PLIST.gtk}${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.cmxs
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.ml
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/cairo_gtk.mli
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/dune-package
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/libcairo_gtk_stubs.a
${PLIST.gtk}${OCAML_SITELIB}/cairo2-gtk/opam
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/META
${PLIST.pango}${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-pango/cairo_pango.a
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cma
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmi
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmt
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmti
${PLIST.pango}${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmx
${PLIST.pango}${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmxa
${PLIST.pango}${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2-pango/cairo_pango.cmxs
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/cairo_pango.ml
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/cairo_pango.mli
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/dune-package
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/libcairo_pango_stubs.a
${PLIST.pango}${OCAML_SITELIB}/cairo2-pango/opam
${OCAML_SITELIB}/cairo2/META
${PLIST.ocaml-opt}${OCAML_SITELIB}/cairo2/cairo.a
${OCAML_SITELIB}/cairo2/cairo.cma
@ -42,15 +42,15 @@ ${OCAML_SITELIB}/cairo2/cairo_ocaml.h
${OCAML_SITELIB}/cairo2/dune-package
${OCAML_SITELIB}/cairo2/libcairo_stubs.a
${OCAML_SITELIB}/cairo2/opam
${OCAML_SITELIB}/stublibs/dllcairo_gtk_stubs.so
${OCAML_SITELIB}/stublibs/dllcairo_pango_stubs.so
${PLIST.gtk}${OCAML_SITELIB}/stublibs/dllcairo_gtk_stubs.so
${PLIST.pango}${OCAML_SITELIB}/stublibs/dllcairo_pango_stubs.so
${OCAML_SITELIB}/stublibs/dllcairo_stubs.so
share/doc/cairo2-gtk/CHANGES.md
share/doc/cairo2-gtk/LICENSE.md
share/doc/cairo2-gtk/README.md
share/doc/cairo2-pango/CHANGES.md
share/doc/cairo2-pango/LICENSE.md
share/doc/cairo2-pango/README.md
${PLIST.gtk}share/doc/cairo2-gtk/CHANGES.md
${PLIST.gtk}share/doc/cairo2-gtk/LICENSE.md
${PLIST.gtk}share/doc/cairo2-gtk/README.md
${PLIST.pango}share/doc/cairo2-pango/CHANGES.md
${PLIST.pango}share/doc/cairo2-pango/LICENSE.md
${PLIST.pango}share/doc/cairo2-pango/README.md
share/doc/cairo2/CHANGES.md
share/doc/cairo2/LICENSE.md
share/doc/cairo2/README.md

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.2 2020/08/17 20:17:31 leot Exp $
# $NetBSD: buildlink3.mk,v 1.3 2022/02/28 12:55:08 jaapb Exp $
BUILDLINK_TREE+= ocaml-cairo
@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-cairo
OCAML_CAIRO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-cairo+= ocaml-cairo>=0.6.1
BUILDLINK_ABI_DEPENDS.ocaml-cairo?= ocaml-cairo>=0.6.1nb5
BUILDLINK_ABI_DEPENDS.ocaml-cairo?= ocaml-cairo>=0.6.2
BUILDLINK_PKGSRCDIR.ocaml-cairo?= ../../graphics/ocaml-cairo
.include "../../graphics/cairo/buildlink3.mk"

View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.3 2021/10/26 10:46:34 nia Exp $
$NetBSD: distinfo,v 1.4 2022/02/28 12:55:08 jaapb Exp $
BLAKE2s (ocaml-cairo-0.6.1.tar.gz) = 8ca95ba3389ca829b4ad6bdfb62447dd247aa988b51f18efbeb2069f32b85576
SHA512 (ocaml-cairo-0.6.1.tar.gz) = d1dcc8cb1e46d3d954cca7aaede9390f2dcc883597970b2610f3f285c922302b6da275aebe144c08dcf969d7f49588488b94cfaf6ac869f56dbe0df9e7279445
Size (ocaml-cairo-0.6.1.tar.gz) = 109786 bytes
BLAKE2s (ocaml-cairo-0.6.2.tar.gz) = 43b19925d5bf224cb5d2660d75f0d50f4669ed441ba1ea092e1b6d0a5b9bad0f
SHA512 (ocaml-cairo-0.6.2.tar.gz) = 9ec0b857f8e14e94cd3cef5736919e0da2fa2e174b30d7c366453025295b945880178d3c2e3e161ad4baa517594ba3bd996867116c623d1df357fe79e7d576cb
Size (ocaml-cairo-0.6.2.tar.gz) = 109948 bytes

View file

@ -0,0 +1,30 @@
# $NetBSD: options.mk,v 1.1 2022/02/28 12:55:08 jaapb Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml-cairo
PKG_SUPPORTED_OPTIONS= gtk pango
PKG_SUGGESTED_OPTIONS= gtk pango
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"
PLIST_VARS+= gtk pango
###
### gtk support
###
.if !empty(PKG_OPTIONS:Mgtk)
.include "../../x11/ocaml-lablgtk/buildlink3.mk"
PLIST.gtk= yes
OCAML_FINDLIB_DIRS+= cairo2-gtk
USE_TOOLS+= pkg-config
.endif
###
### pango support
###
.if !empty(PKG_OPTIONS:Mpango)
.include "../../x11/ocaml-lablgtk/buildlink3.mk"
PLIST.pango= yes
OCAML_FINDLIB_DIRS+= cairo2-pango
.endif