From owner-svn-ports-all@FreeBSD.ORG Thu Jan 16 20:37:10 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65096C56; Thu, 16 Jan 2014 20:37:10 +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 4FE091663; Thu, 16 Jan 2014 20:37:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GKbA8K087749; Thu, 16 Jan 2014 20:37:10 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GKb9WX087743; Thu, 16 Jan 2014 20:37:09 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201401162037.s0GKb9WX087743@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Thu, 16 Jan 2014 20:37:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339981 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 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, 16 Jan 2014 20:37:10 -0000 Author: danilo Date: Thu Jan 16 20:37:09 2014 New Revision: 339981 URL: http://svnweb.freebsd.org/changeset/ports/339981 QAT: https://qat.redports.org/buildarchive/r339981/ Log: - Update from 2.0.0.beta1 to 2.0.0.beta2 while here - Convert "if's" to options helpers PR: ports/185344 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 Thu Jan 16 20:34:06 2014 (r339980) +++ head/math/labplot/Makefile Thu Jan 16 20:37:09 2014 (r339981) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= labplot -DISTVERSION= 2.0.0.beta1 +DISTVERSION= 2.0.0.beta2 CATEGORIES= math kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} @@ -18,33 +18,25 @@ CDF_DESC= CDF data support HDF5_DESC= HDF5 data support NETCDF_DESC= NetCDF data support +WRKSRC= ${WRKDIR}/beta2 + USE_BZIP2= yes USES= cmake USE_XORG= xft xpm USE_GCC= yes -USE_KDE4= automoc4 kdelibs kdeprefix +USE_KDE4= automoc4 kdelibs kdeprefix sharedmime USE_QT4= moc_build qmake_build rcc_build uic_build CMAKE_ARGS= -DOPJ_LIBRARY:STRING="" +INSTALLS_ICONS= yes + +CDF_LIB_DEPENDS= libcdf.so:${PORTSDIR}/science/cdf +CDF_CMAKE_OFF= -DCDF_LIBRARY:STRING="" -.include +HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 +HDF5_CMAKE_OFF= -DHDF5_LIBRARY:STRING="" -.if ${PORT_OPTIONS:MCDF} -LIB_DEPENDS+= libcdf.so:${PORTSDIR}/science/cdf -.else -CMAKE_ARGS+= -DCDF_LIBRARY:STRING="" -.endif - -.if ${PORT_OPTIONS:MHDF5} -LIB_DEPENDS+= libhdf5.so:${PORTSDIR}/science/hdf5 -.else -CMAKE_ARGS+= -DHDF5_LIBRARY:STRING="" -.endif - -.if ${PORT_OPTIONS:MNETCDF} -LIB_DEPENDS+= libnetcdf.so:${PORTSDIR}/science/netcdf -.else -CMAKE_ARGS+= -DNETCDF_LIBRARY:STRING="" -.endif +NETCDF_LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf +NETCDF_CMAKE_OFF= -DNETCDF_LIBRARY:STRING="" post-patch: @${REINPLACE_CMD} -e \ Modified: head/math/labplot/distinfo ============================================================================== --- head/math/labplot/distinfo Thu Jan 16 20:34:06 2014 (r339980) +++ head/math/labplot/distinfo Thu Jan 16 20:37:09 2014 (r339981) @@ -1,2 +1,2 @@ -SHA256 (labplot-2.0.0.beta1.tar.bz2) = 3e68b7a8036a51670a2011c671a7163dd49ddec79b77c80df1cabbbc019e4221 -SIZE (labplot-2.0.0.beta1.tar.bz2) = 1290084 +SHA256 (labplot-2.0.0.beta2.tar.bz2) = 1227fb0e2186bde8a71dba68a12f6793ea784e28937a097a1d9843e9b9c83a60 +SIZE (labplot-2.0.0.beta2.tar.bz2) = 558705 Modified: head/math/labplot/pkg-plist ============================================================================== --- head/math/labplot/pkg-plist Thu Jan 16 20:34:06 2014 (r339980) +++ head/math/labplot/pkg-plist Thu Jan 16 20:37:09 2014 (r339981) @@ -1,27 +1,60 @@ bin/labplot2 -share/apps/LabPlot/LabPlotui.rc -share/apps/LabPlot/labplot.png -share/apps/LabPlot/pics/auto-scale-all.png -share/apps/LabPlot/pics/auto-scale-x.png -share/apps/LabPlot/pics/auto-scale-y.png -share/apps/LabPlot/pics/axis-horizontal.png -share/apps/LabPlot/pics/axis-vertical.png -share/apps/LabPlot/pics/editbreaklayout.png -share/apps/LabPlot/pics/editgrid.png -share/apps/LabPlot/pics/edithlayout.png -share/apps/LabPlot/pics/editvlayout.png -share/apps/LabPlot/pics/shift-down-y.png -share/apps/LabPlot/pics/shift-left-x.png -share/apps/LabPlot/pics/shift-right-x.png -share/apps/LabPlot/pics/shift-up-y.png -share/apps/LabPlot/pics/x-zoom-in.png -share/apps/LabPlot/pics/x-zoom-out.png -share/apps/LabPlot/pics/xy-curve.png -share/apps/LabPlot/pics/y-zoom-in.png -share/apps/LabPlot/pics/y-zoom-out.png -share/apps/LabPlot/pics/zoom-in-x.png -share/apps/LabPlot/pics/zoom-in-y.png -share/apps/LabPlot/pics/zoom-out-x.png -share/apps/LabPlot/pics/zoom-out-y.png -@dirrm share/apps/LabPlot/pics -@dirrm share/apps/LabPlot +share/applications/kde4/LabPlot2.desktop +share/apps/LabPlot2/LabPlot2ui.rc +share/apps/LabPlot2/pics/TeX_logo.png +share/apps/LabPlot2/pics/auto-scale-all.png +share/apps/LabPlot2/pics/auto-scale-x.png +share/apps/LabPlot2/pics/auto-scale-y.png +share/apps/LabPlot2/pics/axis-horizontal.png +share/apps/LabPlot2/pics/axis-vertical.png +share/apps/LabPlot2/pics/editbreaklayout.png +share/apps/LabPlot2/pics/editgrid.png +share/apps/LabPlot2/pics/edithlayout.png +share/apps/LabPlot2/pics/editvlayout.png +share/apps/LabPlot2/pics/shift-down-y.png +share/apps/LabPlot2/pics/shift-left-x.png +share/apps/LabPlot2/pics/shift-right-x.png +share/apps/LabPlot2/pics/shift-up-y.png +share/apps/LabPlot2/pics/x-zoom-in.png +share/apps/LabPlot2/pics/x-zoom-out.png +share/apps/LabPlot2/pics/xy-curve.png +share/apps/LabPlot2/pics/y-zoom-in.png +share/apps/LabPlot2/pics/y-zoom-out.png +share/apps/LabPlot2/pics/zoom-in-x.png +share/apps/LabPlot2/pics/zoom-in-y.png +share/apps/LabPlot2/pics/zoom-out-x.png +share/apps/LabPlot2/pics/zoom-out-y.png +share/apps/LabPlot2/splash.png +share/icons/hicolor/128x128/apps/LabPlot2.png +share/icons/hicolor/22x22/apps/LabPlot2.png +share/icons/hicolor/256x256/apps/LabPlot2.png +share/icons/hicolor/32x32/apps/LabPlot2.png +share/icons/hicolor/48x48/apps/LabPlot2.png +share/icons/hicolor/512x512/apps/LabPlot2.png +share/icons/hicolor/64x64/apps/LabPlot2.png +share/mime/packages/lml.desktop +@dirrmtry share/mime/packages +@dirrmtry share/mime +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/icons/hicolor/512x512/apps +@dirrmtry share/icons/hicolor/512x512 +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/256x256/apps +@dirrmtry share/icons/hicolor/256x256 +@dirrmtry share/icons/hicolor/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/128x128/apps +@dirrmtry share/icons/hicolor/128x128 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/apps/LabPlot2/pics +@dirrmtry share/apps/LabPlot2 +@dirrmtry share/apps +@dirrmtry share/applications/kde4 +@dirrmtry share/applications +@dirrmtry share +@dirrmtry bin