Add options for pdf docs and cairo.

From Rin Okuyama in PR 50363.

While here, clean up some unrecognized configure arguments
and fix the build with the qt4 option.

XXX: this supports qt5 now too, does someone want to add an option for that?

3 files changed, 30 insertions, 25 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 407c47bd477..c236c375eb2 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2015/08/18 07:31:09 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2015/10/25 10:13:53 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,11 @@ USE_LANGUAGES=		c
 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 +40,7 @@ SUBST_MESSAGE.fontpath=	Fixing font path.
 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"
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index a2abaa95784..609362f1804 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2015/03/03 15:22:20 mef Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/10/25 10:13:53 wiz Exp $
 bin/gnuplot
 ${PLIST.qt4}libexec/gnuplot/${API_VERSION}/gnuplot_qt
 ${PLIST.x11}libexec/gnuplot/${API_VERSION}/gnuplot_x11
@@ -24,7 +24,7 @@ share/gnuplot/${API_VERSION}/colors_default.gp
 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.gnuplot-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
diff --git a/graphics/gnuplot/options.mk b/graphics/gnuplot/options.mk
index eeea84e1ba4..99e1a69fc79 100644
--- a/graphics/gnuplot/options.mk
+++ b/graphics/gnuplot/options.mk
@@ -1,12 +1,19 @@
-# $NetBSD: options.mk,v 1.8 2014/05/08 20:48:55 bad Exp $
+# $NetBSD: options.mk,v 1.9 2015/10/25 10:13:53 wiz 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 gnuplot-pdf-doc x11 qt4 wxwidgets
+PKG_SUGGESTED_OPTIONS=	cairo gd gnuplot-pdf-doc x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	x11 qt4
+PLIST_VARS+=	gnuplot-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 @@ 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
+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"
@@ -33,11 +52,12 @@ CONFIGURE_ARGS+=	--without-x
 
 .if !empty(PKG_OPTIONS:Mqt4)
 USE_LANGUAGES+=		c++
-CONFIGURE_ARGS+=	--enable-qt
+CONFIGURE_ARGS+=	--with-qt=qt4
 PLIST.qt4=		yes
 .include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-qt
+CONFIGURE_ARGS+=	--with-qt=no
 .endif
 
 .if !empty(PKG_OPTIONS:Mwxwidgets)