Wed Feb 14 15:45:09 2024 UTC (102d)
ocaml-cairo: pkglint cleanup


(wiz)
diff -r1.30 -r1.31 pkgsrc/graphics/ocaml-cairo/Makefile
cvs diff -r1.30 -r1.31 pkgsrc/graphics/ocaml-cairo/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ocaml-cairo/Makefile 2024/02/14 15:44:19 1.30
+++ pkgsrc/graphics/ocaml-cairo/Makefile 2024/02/14 15:45:09 1.31
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.30 2024/02/14 15:44:19 wiz Exp $ 1# $NetBSD: Makefile,v 1.31 2024/02/14 15:45:09 wiz Exp $
2 2
3DISTNAME= ${GITHUB_PROJECT}-0.6.4 3DISTNAME= ${GITHUB_PROJECT}-0.6.4
4PKGREVISION= 9 4PKGREVISION= 9
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GITHUB:=Chris00/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=Chris00/}
7GITHUB_PROJECT= ocaml-cairo 7GITHUB_PROJECT= ocaml-cairo
8 8
9MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= https://github.com/Chris00/ocaml-cairo/ 10HOMEPAGE= https://github.com/Chris00/ocaml-cairo/
11COMMENT= Bindings for OCaml to the cairo library 11COMMENT= Bindings for OCaml to the cairo library
12LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
13 13
14OCAML_USE_DUNE= yes 14OCAML_USE_DUNE= yes
15OCAML_FINDLIB_DIRS= cairo2 15OCAML_FINDLIB_DIRS= cairo2
16OPAM_INSTALL_FILES= ${OCAML_FINDLIB_DIRS} 16OPAM_INSTALL_FILES= ${OCAML_FINDLIB_DIRS}
17DUNE_BUILD_PACKAGES= ${OCAML_FINDLIB_DIRS} 17DUNE_BUILD_PACKAGES= ${OCAML_FINDLIB_DIRS}
18 18
19USE_TOOLS+= pkg-config 19USE_TOOLS+= pkg-config
20# ocaml-cairo doesn't find pkg-config 20# ocaml-cairo doesn't find pkg-config
21# https://github.com/Chris00/ocaml-cairo/issues/35 21# https://github.com/Chris00/ocaml-cairo/issues/35
22# seems related but has not solution 22# seems related but has not solution
23# override detection: 23# override detection:
24CAIRO_CFLAGS!= pkg-config --cflags cairo 24CAIRO_CFLAGS= pkg-config --cflags cairo
25CAIRO_LIBS!= pkg-config --libs cairo 25CAIRO_LIBS= pkg-config --libs cairo
26MAKE_ENV+= CAIRO_CFLAGS=${CAIRO_CFLAGS:Q} 26MAKE_ENV+= CAIRO_CFLAGS=${CAIRO_CFLAGS:sh:Q}
27MAKE_ENV+= CAIRO_LIBS=${CAIRO_LIBS:Q} 27MAKE_ENV+= CAIRO_LIBS=${CAIRO_LIBS:sh:Q}
28# but this isn't enough, because it leads to: 28# but this isn't enough, because it leads to:
29# Error: Rule failed to generate the following targets: 29# Error: Rule failed to generate the following targets:
30# - src/cairo_ocaml.h 30# - src/cairo_ocaml.h
31# so create this file manually and remove the existing logic 31# so create this file manually and remove the existing logic
32# to avoid an error during configure (see patch-src_dune) 32# to avoid an error during configure (see patch-src_dune)
33# 33#
34# TODO: enable freetype2 34# TODO: enable freetype2
35pre-configure: 35pre-configure:
36 cp ${WRKSRC}/src/cairo_ocaml.h.p ${WRKSRC}/src/cairo_ocaml.h 36 cp ${WRKSRC}/src/cairo_ocaml.h.p ${WRKSRC}/src/cairo_ocaml.h
37 37
38# (See options.mk.) Upstream says that lablgtk is required, but it is 38# (See options.mk.) Upstream says that lablgtk is required, but it is
39# not. 39# not.
40# https://github.com/Chris00/ocaml-cairo/issues/29 40# https://github.com/Chris00/ocaml-cairo/issues/29