Import of pkgsrc-2016Q3

graphics/gnuplot/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2015/08/18 07:31:09 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2016/08/03 10:22:53 adam Exp $
 
-DISTNAME=	gnuplot-5.0.1
+DISTNAME=	gnuplot-5.0.4
 API_VERSION=	${PKGVERSION_NOREV:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
@@ -20,17 +20,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 +39,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"

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

graphics/gnuplot/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.30 2015/08/01 01:29:00 mef Exp $
+$NetBSD: distinfo,v 1.33 2016/07/24 23:38:10 mef Exp $
 
-SHA1 (gnuplot-5.0.1.tar.gz) = a66f5211d3eb8d382b8dd9bdf320b65cf1315a13
-RMD160 (gnuplot-5.0.1.tar.gz) = cf2b952af27b0c4ce88ce5d796b07e1c6af4b620
-Size (gnuplot-5.0.1.tar.gz) = 4963747 bytes
+SHA1 (gnuplot-5.0.4.tar.gz) = 3a616a1beca8e86662afcc9d368aad6847ed4e0f
+RMD160 (gnuplot-5.0.4.tar.gz) = 077345c360cf4faa34430ffe07e6cefc3d822c3c
+SHA512 (gnuplot-5.0.4.tar.gz) = ebb6bf64cc7f333135d328f6b72d73ef3a3b62f5df28d746efa1589dd9d54fc359306c7c2bc5ad9671b53b0cc945a4388b087abf365dda7417fe21a93ff29dae
+Size (gnuplot-5.0.4.tar.gz) = 5051380 bytes
 SHA1 (patch-aa) = fa5981422c83d1467b0df8a7c36ce7b2439855f2
 SHA1 (patch-ac) = ba7d48926faca78399fe10f44020364a244f87e0
 SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413

graphics/gnuplot/options.mk

@@ -1,12 +1,23 @@
-# $NetBSD: options.mk,v 1.8 2014/05/08 20:48:55 bad Exp $
+# $NetBSD: options.mk,v 1.11 2015/10/28 19:03:17 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 cerf gd lua pdf gnuplot-pdf-doc x11 qt4 wxwidgets
+PKG_SUGGESTED_OPTIONS=	cairo cerf 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:Mcerf)
+.include "../../devel/libcerf/buildlink3.mk"
+.endif
 
 .if !empty(PKG_OPTIONS:Mgd)
 .include "../../graphics/gd/buildlink3.mk"
@@ -24,6 +35,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 +56,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)