From owner-svn-ports-all@FreeBSD.ORG Thu Nov 22 04:02:14 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2EB53FE2; Thu, 22 Nov 2012 04:02:14 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 15EDD8FC15; Thu, 22 Nov 2012 04:02:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAM42DWF088984; Thu, 22 Nov 2012 04:02:13 GMT (envelope-from glewis@svn.freebsd.org) Received: (from glewis@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAM42DH3088983; Thu, 22 Nov 2012 04:02:13 GMT (envelope-from glewis@svn.freebsd.org) Message-Id: <201211220402.qAM42DH3088983@svn.freebsd.org> From: Greg Lewis Date: Thu, 22 Nov 2012 04:02:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307637 - 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2012 04:02:14 -0000 Author: glewis Date: Thu Nov 22 04:02:13 2012 New Revision: 307637 URL: http://svnweb.freebsd.org/changeset/ports/307637 Log: . Update to OptionsNG. Feature safe: yes Modified: head/math/gnuplot/Makefile Modified: head/math/gnuplot/Makefile ============================================================================== --- head/math/gnuplot/Makefile Thu Nov 22 03:47:20 2012 (r307636) +++ head/math/gnuplot/Makefile Thu Nov 22 04:02:13 2012 (r307637) @@ -22,15 +22,18 @@ CONFIGURE_ARGS+=--with-lasergnu \ --with-bitmap-terminals MAKE_JOBS_SAFE= yes -OPTIONS= X11 "Enable X11 support" on \ - GD "Enable GD support" on \ - GRIDBOX "Use the gridbox optimization for hidden3d" off \ - PDF "Enable PDF support" on \ - PLOT "Enable plot support" on \ - TETEX "Search kpsexpand at run-time" on \ - THINSPLINES "Enable thin plate splines for grids in dgrid3d" off \ - WX "Enable WX support" on \ - CAIRO "Enable CAIRO support" on +OPTIONS_DEFINE= CAIRO GD GRIDBOX PDF PLOT TETEX THINSPLINES WX X11 +CAIRO_DESC= Enable CAIRO support +GD_DESC= Enable GD support +GRIDBOX_DESC= Use the gridbox optimization for hidden3d +PDF_DESC= Enable PDF support +PLOT_DESC= Enable plot support +TETEX_DESC= Search kpsexpand at run-time +THINSPLINES_DESC= Enable thin plate splines for grids in dgrid3d +WX_DESC= Enable WX support +X11_DESC= Enable X11 support + +OPTIONS_DEFAULT=CAIRO GD PDF PLOT TETEX WX X11 USE_GCC= any @@ -38,68 +41,68 @@ MAN1= gnuplot.1 lasergnu.1 .include -.if defined(WITHOUT_X11) -CONFIGURE_ARGS+= --without-x -PLIST_SUB+= X11="@comment " +.if ${PORT_OPTIONS:MCAIRO} +LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo +USE_GNOME+= pango .else -USE_XORG= x11 -PLIST_SUB+= X11="" +CONFIGURE_ARGS+= --without-cairo .endif -.if defined(WITHOUT_GD) -CONFIGURE_ARGS+= --without-gd -.else +.if ${PORT_OPTIONS:MGD} LIB_DEPENDS+= gd.4:${PORTSDIR}/graphics/gd CONFIGURE_ARGS+= --with-gd=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-gd .endif -.if !defined(WITHOUT_GRIDBOX) +.if ! ${PORT_OPTIONS:MGRIDBOX} CONFIGURE_ARGS+= --disable-h3d-quadtree --enable-h3d-gridbox .endif -.if defined(WITHOUT_PDF) -CONFIGURE_ARGS+= --without-pdf -.else +.if ${PORT_OPTIONS:MPDF} LIB_DEPENDS+= pdf.6:${PORTSDIR}/print/pdflib CONFIGURE_ARGS+= --with-pdf=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-pdf .endif -.if defined(WITHOUT_PLOT) -CONFIGURE_ARGS+= --without-plot -.else +.if ${PORT_OPTIONS:MPLOT} USE_XORG+= xaw xmu xt xext LIB_DEPENDS+= plot.4:${PORTSDIR}/graphics/plotutils CONFIGURE_ARGS+= --with-plot=${LOCALBASE} +.else +CONFIGURE_ARGS+= --without-plot .endif -.if defined(WITHOUT_TETEX) -PLIST_SUB+= TETEX="@comment " -.else +.if ${PORT_OPTIONS:MTETEX} BUILD_DEPENDS+= kpsexpand:${PORTSDIR}/print/teTeX-base RUN_DEPENDS+= kpsexpand:${PORTSDIR}/print/teTeX-base CONFIGURE_ARGS+= --with-kpsexpand \ --with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot PLIST_SUB+= TETEX="" +.else +PLIST_SUB+= TETEX="@comment " .endif -.if defined(WITHOUT_THINSPLINES) -CONFIGURE_ARGS+= --disable-thin-splines -.else +.if ${PORT_OPTIONS:MTHINSPLINES} CONFIGURE_ARGS+= --enable-thin-splines +.else +CONFIGURE_ARGS+= --disable-thin-splines .endif -.if defined(WITHOUT_WX) -CONFIGURE_ARGS+= --disable-wxwidgets -.else +.if ${PORT_OPTIONS:MWX} USE_WX= 2.5-2.8 WX_CONF_ARGS= absolute +.else +CONFIGURE_ARGS+= --disable-wxwidgets .endif -.if defined(WITHOUT_CAIRO) -CONFIGURE_ARGS+= --without-cairo +.if ${PORT_OPTIONS:MX11} +USE_XORG= x11 +PLIST_SUB+= X11="" .else -LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo -USE_GNOME+= pango +CONFIGURE_ARGS+= --without-x +PLIST_SUB+= X11="@comment " .endif .if !defined(NOPORTDOCS) @@ -110,7 +113,7 @@ PORTEXAMPLES= * .endif post-patch: -.if defined(WITHOUT_TETEX) +.if ! ${PORT_OPTIONS:MTETEX} @${REINPLACE_CMD} -e \ '/^install:/s/install-am//' ${WRKSRC}/share/LaTeX/Makefile.in .endif