CVS commit: pkgsrc/graphics/ocaml-cairo

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Jun 15 11:09:26 UTC 2022

Modified Files:
        pkgsrc/graphics/ocaml-cairo: Makefile options.mk

Log Message:
graphics/ocaml-cairo: Remove gtk and pango from default options

The gtk and pango options depend on ocaml-lablgtk (which is gtk2), but
ocaml-lablgtk3 depends on ocaml-cairo.  For now, don't suggest the
options, as the only pkgsrc user is ocaml-lablgtk3.

Discussed with $MAINTAINER long ago.  Perhaps these need a split
package, and perhaps packages that depend on ocaml-cairo might need
updating -- but gtk2 is obsolete and those packages should be moving
(perhaps upstream) to lablgtk3.

(Committed separately from 0.6.3 update for ease of bisecting and
reverting if necessary.)


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/ocaml-cairo/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/ocaml-cairo/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/graphics/ocaml-cairo/Makefile
diff -u pkgsrc/graphics/ocaml-cairo/Makefile:1.18 pkgsrc/graphics/ocaml-cairo/Makefile:1.19
--- pkgsrc/graphics/ocaml-cairo/Makefile:1.18   Wed Jun 15 10:59:45 2022
+++ pkgsrc/graphics/ocaml-cairo/Makefile        Wed Jun 15 11:09:26 2022
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2022/06/15 10:59:45 gdt Exp $
+# $NetBSD: Makefile,v 1.19 2022/06/15 11:09:26 gdt Exp $
 
 GITHUB_PROJECT=        ocaml-cairo
 DISTNAME=      ${GITHUB_PROJECT}-0.6.3
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Chris00/}
+PKGREVISION=   1
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/Chris00/ocaml-cairo/

Index: pkgsrc/graphics/ocaml-cairo/options.mk
diff -u pkgsrc/graphics/ocaml-cairo/options.mk:1.1 pkgsrc/graphics/ocaml-cairo/options.mk:1.2
--- pkgsrc/graphics/ocaml-cairo/options.mk:1.1  Mon Feb 28 12:55:08 2022
+++ pkgsrc/graphics/ocaml-cairo/options.mk      Wed Jun 15 11:09:26 2022
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2022/02/28 12:55:08 jaapb Exp $
+# $NetBSD: options.mk,v 1.2 2022/06/15 11:09:26 gdt Exp $
 
+# The gtk and pango options depend on ocaml-lablgtk (which is gtk2),
+# but ocaml-lablgtk3 depends on ocaml-cairo.  For now, don't suggest
+# the options, as the only pkgsrc user is ocaml-lablgtk3.
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-cairo
 PKG_SUPPORTED_OPTIONS= gtk pango
-PKG_SUGGESTED_OPTIONS= gtk pango
+PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.prefs.mk"