From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 13:39:02 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0E4E8951; Tue, 28 Jan 2014 13:39:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E28921E56; Tue, 28 Jan 2014 13:39:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SDd1Mp091016; Tue, 28 Jan 2014 13:39:01 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SDd10q091012; Tue, 28 Jan 2014 13:39:01 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401281339.s0SDd10q091012@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 28 Jan 2014 13:39:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341561 - head/math/gnuplot X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 13:39:02 -0000 Author: bapt Date: Tue Jan 28 13:39:01 2014 New Revision: 341561 URL: http://svnweb.freebsd.org/changeset/ports/341561 QAT: https://qat.redports.org/buildarchive/r341561/ Log: Support stage Use options helpers Modernize lib_depends Modified: head/math/gnuplot/Makefile head/math/gnuplot/pkg-plist Modified: head/math/gnuplot/Makefile ============================================================================== --- head/math/gnuplot/Makefile Tue Jan 28 13:37:53 2014 (r341560) +++ head/math/gnuplot/Makefile Tue Jan 28 13:39:01 2014 (r341561) @@ -18,6 +18,8 @@ CONFIGURE_ARGS+=--with-lasergnu \ --without-lisp-files \ --without-tutorial \ --with-bitmap-terminals +PORTDOCS= * +PORTEXAMPLES= * OPTIONS_DEFINE= CAIRO DOCS EXAMPLES GD GRIDBOX PDF PLOT TEX THINSPLINES WX X11 GRIDBOX_DESC= Use the gridbox optimization for hidden3d @@ -27,59 +29,37 @@ THINSPLINES_DESC= Enable thin plate spli WX_DESC= wxWidgets (formerly wxWindows) support OPTIONS_DEFAULT=CAIRO GD PLOT TEX WX X11 +OPTIONS_SUB= yes -MAN1= gnuplot.1 lasergnu.1 +CAIRO_LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo +CAIRO_USE= GNOME=pango +CAIRO_CONFIGURE_WITH= cairo -NO_STAGE= yes -.include +GD_LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd +GD_CONFIGURE_ON= --with-gd=${LOCALBASE} +GD_CONFIGURE_OFF+= --without-gd -.if ${PORT_OPTIONS:MCAIRO} -LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo -USE_GNOME+= pango -.else -CONFIGURE_ARGS+= --without-cairo -.endif +GRIDBOX_CONFIGURE_OFF= --disable-h3d-quadtree --enable-h3d-gridbox -.if ${PORT_OPTIONS:MGD} -LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd -CONFIGURE_ARGS+= --with-gd=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-gd -.endif +PDF_LIB_DEPENDS= libpdf.so:${PORTSDIR}/print/pdflib +PDF_CONFIGURE_ON= --with-pdf=${LOCALBASE} +PDF_CONFIGURE_OFF= --without-pdf -.if ! ${PORT_OPTIONS:MGRIDBOX} -CONFIGURE_ARGS+= --disable-h3d-quadtree --enable-h3d-gridbox -.endif +PLOT_USE= XORG=xaw,xmu,xt,xext +PLOT_LIB_DEPENDS= libplot.so:${PORTSDIR}/graphics/plotutils +PLOT_CONFIGURE_ON= --with-plot=${LOCALBASE} +PLOT_CONFIGURE_OFF= --without-plot -.if ${PORT_OPTIONS:MPDF} -LIB_DEPENDS+= pdf:${PORTSDIR}/print/pdflib -CONFIGURE_ARGS+= --with-pdf=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-pdf -.endif +TEX_USE= TEX=base,texmf,latex +TEX_CONFIGURE_ON= --with-kpsexpand \ + --with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot +TEX_CONFIGURE_OFF= --without-kpexpand -.if ${PORT_OPTIONS:MPLOT} -USE_XORG+= xaw xmu xt xext -LIB_DEPENDS+= plot:${PORTSDIR}/graphics/plotutils -CONFIGURE_ARGS+= --with-plot=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-plot -.endif +THINSPLINES_CONFIGURE_ENABLE= thin-splines -.if ${PORT_OPTIONS:MTEX} -USE_TEX= base texmf latex -CONFIGURE_ARGS+= --with-kpsexpand \ - --with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot -PLIST_SUB+= TEX="" -.else -PLIST_SUB+= TEX="@comment " -.endif +X11_USE= XORG=x11 -.if ${PORT_OPTIONS:MTHINSPLINES} -CONFIGURE_ARGS+= --enable-thin-splines -.else -CONFIGURE_ARGS+= --disable-thin-splines -.endif +.include .if ${PORT_OPTIONS:MWX} USE_WX= 2.5-2.8 @@ -88,21 +68,6 @@ WX_CONF_ARGS= absolute CONFIGURE_ARGS+= --disable-wxwidgets .endif -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 -PLIST_SUB+= X11="" -.else -CONFIGURE_ARGS+= --without-x -PLIST_SUB+= X11="@comment " -.endif - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -.endif -.if ${PORT_OPTIONS:MEXAMPLES} -PORTEXAMPLES= * -.endif - post-patch: .if ! ${PORT_OPTIONS:MTEX} @${REINPLACE_CMD} -e \ @@ -118,19 +83,13 @@ post-build: .endif post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/demo && ${FIND} . \ - | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} -.endif - -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/psdoc + ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/psdoc cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.dvi \ - gnuplot.ps ${DOCSDIR} - cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${DOCSDIR}/psdoc -.endif + gnuplot.ps ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${STAGEDIR}${DOCSDIR}/psdoc check test: build @( cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} check ; ) Modified: head/math/gnuplot/pkg-plist ============================================================================== --- head/math/gnuplot/pkg-plist Tue Jan 28 13:37:53 2014 (r341560) +++ head/math/gnuplot/pkg-plist Tue Jan 28 13:39:01 2014 (r341561) @@ -1,6 +1,8 @@ bin/gnuplot bin/lasergnu %%X11%%libexec/gnuplot/4.6/gnuplot_x11 +man/man1/gnuplot.1.gz +man/man1/lasergnu.1.gz %%DATADIR%%/4.6/PostScript/8859-1.ps %%DATADIR%%/4.6/PostScript/8859-15.ps %%DATADIR%%/4.6/PostScript/8859-2.ps