From owner-svn-ports-head@FreeBSD.ORG Sat Nov 2 14:48:01 2013 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 ESMTP id 52429EBC; Sat, 2 Nov 2013 14:48:01 +0000 (UTC) (envelope-from wg@FreeBSD.org) 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 2F8AE287C; Sat, 2 Nov 2013 14:48: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 rA2Em1bW014496; Sat, 2 Nov 2013 14:48:01 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA2Em0bo014491; Sat, 2 Nov 2013 14:48:00 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201311021448.rA2Em0bo014491@svn.freebsd.org> From: William Grzybowski Date: Sat, 2 Nov 2013 14:48:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332491 - head/math/labplot 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.14 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: Sat, 02 Nov 2013 14:48:01 -0000 Author: wg Date: Sat Nov 2 14:48:00 2013 New Revision: 332491 URL: http://svnweb.freebsd.org/changeset/ports/332491 Log: math/labplot: update to 2.0.0.beta1 - Update to 2.0.0.beta1 - Allow staging - Convert lib depends to new format PR: ports/183564 Submitted by: KATO Tsuguru Modified: head/math/labplot/Makefile head/math/labplot/distinfo head/math/labplot/pkg-plist Modified: head/math/labplot/Makefile ============================================================================== --- head/math/labplot/Makefile Sat Nov 2 14:31:27 2013 (r332490) +++ head/math/labplot/Makefile Sat Nov 2 14:48:00 2013 (r332491) @@ -2,17 +2,16 @@ # $FreeBSD$ PORTNAME= labplot -DISTVERSION= 2.0.0.alpha3 -PORTREVISION= 1 +DISTVERSION= 2.0.0.beta1 CATEGORIES= math kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= Data plotting and function analysis tool for KDE -LICENSE= GPLv2 +LICENCE= GPLv2 -LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl +LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl OPTIONS_DEFINE= CDF HDF5 NETCDF CDF_DESC= CDF data support @@ -20,29 +19,29 @@ HDF5_DESC= HDF5 data support NETCDF_DESC= NetCDF data support USE_BZIP2= yes +USES= cmake USE_XORG= xft xpm +USE_GCC= yes USE_KDE4= automoc4 kdelibs kdeprefix USE_QT4= moc_build qmake_build rcc_build uic_build -USES= cmake CMAKE_ARGS= -DOPJ_LIBRARY:STRING="" -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCDF} -LIB_DEPENDS+= cdf:${PORTSDIR}/science/cdf +LIB_DEPENDS+= libcdf.so:${PORTSDIR}/science/cdf .else CMAKE_ARGS+= -DCDF_LIBRARY:STRING="" .endif .if ${PORT_OPTIONS:MHDF5} -LIB_DEPENDS+= hdf5:${PORTSDIR}/science/hdf5 +LIB_DEPENDS+= libhdf5.so:${PORTSDIR}/science/hdf5 .else CMAKE_ARGS+= -DHDF5_LIBRARY:STRING="" .endif .if ${PORT_OPTIONS:MNETCDF} -LIB_DEPENDS+= netcdf:${PORTSDIR}/science/netcdf +LIB_DEPENDS+= libnetcdf.so:${PORTSDIR}/science/netcdf .else CMAKE_ARGS+= -DNETCDF_LIBRARY:STRING="" .endif @@ -53,5 +52,8 @@ post-patch: @${REINPLACE_CMD} -e \ 's|i->\(children\)|\1|' \ ${WRKSRC}/src/backend/core/AbstractAspect.h + @${REINPLACE_CMD} -e \ + 's|!isnan|!std::isnan|' \ + ${WRKSRC}/src/backend/worksheet/plots/cartesian/CartesianCoordinateSystem.cpp .include Modified: head/math/labplot/distinfo ============================================================================== --- head/math/labplot/distinfo Sat Nov 2 14:31:27 2013 (r332490) +++ head/math/labplot/distinfo Sat Nov 2 14:48:00 2013 (r332491) @@ -1,2 +1,2 @@ -SHA256 (labplot-2.0.0.alpha3.tar.bz2) = 881c0a36378a6ad406d2c1102a58a32c038a6fb1e9fd97565da7b7aa95767227 -SIZE (labplot-2.0.0.alpha3.tar.bz2) = 1280273 +SHA256 (labplot-2.0.0.beta1.tar.bz2) = 3e68b7a8036a51670a2011c671a7163dd49ddec79b77c80df1cabbbc019e4221 +SIZE (labplot-2.0.0.beta1.tar.bz2) = 1290084 Modified: head/math/labplot/pkg-plist ============================================================================== --- head/math/labplot/pkg-plist Sat Nov 2 14:31:27 2013 (r332490) +++ head/math/labplot/pkg-plist Sat Nov 2 14:48:00 2013 (r332491) @@ -1,8 +1,4 @@ bin/labplot2 -bin/opj2dat -lib/liblabplot_origin.so -lib/liblabplot_origin.so.0 -lib/liblabplot_origin.so.0.0.4 share/apps/LabPlot/LabPlotui.rc share/apps/LabPlot/labplot.png share/apps/LabPlot/pics/auto-scale-all.png