Received: by mail.netbsd.org (Postfix, from userid 605) id 239FC84F43; Wed, 15 Jun 2022 11:07:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5190A84F42 for ; Wed, 15 Jun 2022 11:07:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id reZEr0pmdZPM for ; Wed, 15 Jun 2022 11:07:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BDB0484D36 for ; Wed, 15 Jun 2022 11:07:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C9A8BFB1A; Wed, 15 Jun 2022 11:09:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165529136632130" MIME-Version: 1.0 Date: Wed, 15 Jun 2022 11:09:26 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/graphics/ocaml-cairo To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20220615110926.C9A8BFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165529136632130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_165529136632130 Content-Disposition: inline Content-Length: 1449 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 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" --_----------=_165529136632130--