Received: by mail.netbsd.org (Postfix, from userid 605) id 4092784E6F; Wed, 19 Aug 2020 22:09:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B921284D64 for ; Wed, 19 Aug 2020 22:09:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id hNWh0Lnjm5aQ for ; Wed, 19 Aug 2020 22:09:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1025984D3F for ; Wed, 19 Aug 2020 22:09:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 093E8FB28; Wed, 19 Aug 2020 22:09:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1597874956285230" MIME-Version: 1.0 Date: Wed, 19 Aug 2020 22:09:16 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/graphics/gnuplot To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20200819220916.093E8FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1597874956285230 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Wed Aug 19 22:09:15 UTC 2020 Modified Files: pkgsrc/graphics/gnuplot: options.mk Log Message: gnuplot: remove pdf option Map it to 'cairo' option which provides PDF output. No change to defaults, so no PKGREVISION bump. Addresses PR 55590 by Joern Clausen. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/gnuplot/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1597874956285230 Content-Disposition: inline Content-Length: 1151 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/gnuplot/options.mk diff -u pkgsrc/graphics/gnuplot/options.mk:1.16 pkgsrc/graphics/gnuplot/options.mk:1.17 --- pkgsrc/graphics/gnuplot/options.mk:1.16 Mon Dec 9 12:57:22 2019 +++ pkgsrc/graphics/gnuplot/options.mk Wed Aug 19 22:09:15 2020 @@ -1,9 +1,11 @@ -# $NetBSD: options.mk,v 1.16 2019/12/09 12:57:22 rin Exp $ +# $NetBSD: options.mk,v 1.17 2020/08/19 22:09:15 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot -PKG_SUPPORTED_OPTIONS= cairo cerf gd gnuplot-pdf-doc lua pdf qt5 wxwidgets x11 +PKG_SUPPORTED_OPTIONS= cairo cerf gd gnuplot-pdf-doc lua qt5 wxwidgets x11 PKG_SUGGESTED_OPTIONS= cairo cerf gd x11 +# remove after pkgsrc-2020Q3 +PKG_OPTIONS_LEGACY_OPTS+= pdf:cairo .include "../../mk/bsd.options.mk" PLIST_VARS+= gnuplot-pdf-doc qt x11 @@ -29,12 +31,6 @@ CONFIGURE_ARGS+= --without-cairo CONFIGURE_ARGS+= --without-lua .endif -# PDF output is also provided by cairo -.if !empty(PKG_OPTIONS:Mpdf) -CONFIGURE_ARGS+= --with-pdf -.include "../../print/pdflib-lite/buildlink3.mk" -.endif - # to build doc/gnuplot.pdf .if !empty(PKG_OPTIONS:Mgnuplot-pdf-doc) PLIST.gnuplot-pdf-doc= yes --_----------=_1597874956285230--