Re: pkg/50363: new options "cairo" and "pdf-doc" for graphics/gnuplot

[Rin Okuyama <okuyama%flex.phys.tohoku.ac.jp@localhost>]

The following reply was made to PR pkg/50363; it has been noted by GNATS.

From: Rin Okuyama <okuyama%flex.phys.tohoku.ac.jp@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/50363: new options "cairo" and "pdf-doc" for graphics/gnuplot
Date: Sat, 24 Oct 2015 15:03:13 +0900

 I've found that gnuplot no longer depends on plotutils.
 You can confirm this by its NEWS file:
 
 > New features, changes and fixes in gnuplot version 4.6
 > ======================================================
 > ...
 > * CHANGE remove obsolete drivers unixplot, gnugraph, and SCO cgi
 > ...
 >
 > [3.8b]
 > ...
 > * UPDATED gnugraph driver now requires plotutils 2.2+
 > ...
 
 I've updated the patch accordingly.
 
 --- graphics/gnuplot/Makefile.orig	2015-10-23 14:18:46.000000000 +0900
 +++ graphics/gnuplot/Makefile	2015-10-24 14:35:07.000000000 +0900
 @@ -1,6 +1,7 @@
   # $NetBSD: Makefile,v 1.101 2015/08/18 07:31:09 wiz Exp $
   
   DISTNAME=	gnuplot-5.0.1
 +PKGREVISION=	1
   API_VERSION=	${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
   CATEGORIES+=	graphics
   MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 @@ -20,17 +21,12 @@
   USE_TOOLS+=		makeinfo pkg-config gmake
   GNU_CONFIGURE=		yes
   #CONFIGURE_ARGS+=	--enable-history-file
 -CONFIGURE_ARGS+=	--with-plot=${PREFIX}
   CONFIGURE_ARGS+=	--without-latex
   CONFIGURE_ARGS+=	--without-lisp-files
   CONFIGURE_ARGS+=	--without-tutorial
   CONFIGURE_ARGS+=	ac_cv_prog_EMACS=
   INFO_FILES=		yes
   
 -# to build doc/gnuplot.pdf
 -BUILD_DEPENDS+=		tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 -BUILD_DEPENDS+=		tex-ucs-[0-9]*:../../print/tex-ucs
 -
   CONFIGURE_ARGS+=	--with-readline=bsd
   .include "../../mk/readline.buildlink3.mk"
   .include "../../mk/curses.buildlink3.mk"
 @@ -45,17 +41,7 @@
   SUBST_FILES.fontpath=	src/variable.c
   SUBST_SED.fontpath=	-e 's,@PKGSRC_PREFIX@,"${PREFIX}",'
   
 -post-build:
 -	(cd ${WRKSRC}/docs; ${GMAKE} gnuplot.pdf)
 -
 -post-install:
 -	(cd ${WRKSRC}/docs; \
 -	${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION})
 -
   .include "options.mk"
   
   .include "../../converters/libiconv/buildlink3.mk"
 -.include "../../devel/pango/buildlink3.mk"
 -.include "../../graphics/cairo/buildlink3.mk"
 -.include "../../graphics/plotutils/buildlink3.mk"
   .include "../../mk/bsd.pkg.mk"
 --- graphics/gnuplot/PLIST.orig	2015-10-23 14:18:46.000000000 +0900
 +++ graphics/gnuplot/PLIST	2015-10-23 18:34:52.000000000 +0900
 @@ -24,7 +24,7 @@
   share/gnuplot/${API_VERSION}/colors_mono.gp
   share/gnuplot/${API_VERSION}/colors_podo.gp
   share/gnuplot/${API_VERSION}/gnuplot.gih
 -share/gnuplot/${API_VERSION}/gnuplot.pdf
 +${PLIST.pdf-doc}share/gnuplot/${API_VERSION}/gnuplot.pdf
   share/gnuplot/${API_VERSION}/gnuplotrc
   share/gnuplot/${API_VERSION}/js/README
   share/gnuplot/${API_VERSION}/js/canvasmath.js
 --- graphics/gnuplot/options.mk.orig	2015-10-23 14:18:46.000000000 +0900
 +++ graphics/gnuplot/options.mk	2015-10-23 18:44:36.000000000 +0900
 @@ -1,12 +1,19 @@
   # $NetBSD: options.mk,v 1.8 2014/05/08 20:48:55 bad Exp $
   
   PKG_OPTIONS_VAR=	PKG_OPTIONS.gnuplot
 -PKG_SUPPORTED_OPTIONS=	gd lua pdf x11 qt4 wxwidgets
 -PKG_SUGGESTED_OPTIONS=	gd x11
 +PKG_SUPPORTED_OPTIONS=	cairo gd lua pdf pdf-doc x11 qt4 wxwidgets
 +PKG_SUGGESTED_OPTIONS=	cairo gd pdf-doc x11
   
   .include "../../mk/bsd.options.mk"
   
 -PLIST_VARS+=	x11 qt4
 +PLIST_VARS+=	pdf-doc x11 qt4
 +
 +.if !empty(PKG_OPTIONS:Mcairo)
 +.include "../../devel/pango/buildlink3.mk"
 +.include "../../graphics/cairo/buildlink3.mk"
 +.else
 +CONFIGURE_ARGS+=	--without-cairo
 +.endif
   
   .if !empty(PKG_OPTIONS:Mgd)
   .include "../../graphics/gd/buildlink3.mk"
 @@ -24,6 +31,18 @@
   .include "../../print/pdflib-lite/buildlink3.mk"
   .endif
   
 +# to build doc/gnuplot.pdf
 +.if !empty(PKG_OPTIONS:Mpdf-doc)
 +PLIST.pdf-doc=	yes
 +BUILD_DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 +BUILD_DEPENDS+=	tex-ucs-[0-9]*:../../print/tex-ucs
 +post-build:
 +	(cd ${WRKSRC}/docs; ${GMAKE} gnuplot.pdf)
 +post-install:
 +	(cd ${WRKSRC}/docs; \
 +	${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION})
 +.endif
 +
   .if !empty(PKG_OPTIONS:Mx11)
   PLIST.x11=	yes
   .include "../../x11/libXaw/buildlink3.mk"
 --- mk/defaults/options.description.orig	2015-10-23 18:33:23.000000000 +0900
 +++ mk/defaults/options.description	2015-10-23 18:36:54.000000000 +0900
 @@ -553,6 +553,7 @@
   pcre			Enable Perl-compatible regular expressions.
   pcsc			Enable PC/SC support.
   pdf			Enable PDF support.
 +pdf-doc			Install PDF document.
   perl			Enable Perl support.
   pgadmin-db-designer	Enable pgAdmin database-designer functionality.
   pgsql			Enable PostgreSQL support.
 @@ -771,6 +772,7 @@
   winbind			Enable name-service switch daemon support using Windows Servers.
   wmf			Enable WMF support.
   wnn4			Use wnn for Kana-to-Kanji conversion.
 +wxwidgets		Enable wxWidgets support.
   x11			Enable X11 support.
   x264			Enable x264 support.
   x265			Enable x265 support.