CVS commit: pkgsrc/graphics/gnuplot

["Thomas Klausner" <wiz%netbsd.org@localhost>]

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.

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