Index: head/math/pdal/Makefile =================================================================== --- head/math/pdal/Makefile (revision 448267) +++ head/math/pdal/Makefile (revision 448268) @@ -1,78 +1,85 @@ # Created by: bart # $FreeBSD$ PORTNAME= pdal -PORTVERSION= 1.4.0 -PORTREVISION= 3 +PORTVERSION= 1.5.0 CATEGORIES= math databases graphics MAINTAINER= lbartoletti@tuxfamily.org COMMENT= Library for translating and manipulating point cloud data LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libboost_thread.so:devel/boost-libs \ libcurl.so:ftp/curl \ libgeotiff.so:graphics/libgeotiff \ libxml2.so:textproc/libxml2 \ - liblaszip.so:archivers/laszip + liblaszip.so:archivers/laszip \ + libjsoncpp.so:devel/jsoncpp USES= cmake:outsource compiler:c++11-lib pathfix pkgconfig execinfo USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} GH_PROJECT= ${GH_ACCOUNT} # Unhide std::to_string() to fix build with GCC (see ports/193528 for details). CXXFLAGS+= -D_GLIBCXX_USE_C99 CMAKE_ARGS+= -DWITH_LASZIP:BOOL=TRUE #Doesn't build without laszip. LASZIP is recommended OPTIONS_DEFINE= BASH \ - ICEBRIDGE PGPOINTCLOUD SQLITE \ + ICEBRIDGE PGPOINTCLOUD SQLITE MBIO \ PYTHON TESTS -OPTIONS_DEFAULT= PYTHON TESTS +OPTIONS_DEFAULT= PYTHON PGPOINTCLOUD SQLITE +#Option without port +#lazperf #Plugins with lib not in port: -#RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin +#RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro) OPTIONS_SUB= yes PGPOINTCLOUD_DESC= Enable Coherent PostgreSQL Point Cloud plugin PGPOINTCLOUD_CMAKE_ON= -DBUILD_PLUGIN_PGPOINTCLOUD:BOOL=TRUE PGPOINTCLOUD_USES= pgsql PGPOINTCLOUD_CMAKE_OFF= -DBUILD_PLUGIN_PGPOINTCLOUD:BOOL=FALSE SQLITE_DESC= Enable SQLite plugin SQLITE_CMAKE_ON= -DBUILD_PLUGIN_SQLITE:BOOL=TRUE SQLITE_USES= sqlite SQLITE_CMAKE_OFF= -DBUILD_PLUGIN_SQLITE:BOOL=FALSE PYTHON_DESC= Enable Python plugin PYTHON_CMAKE_ON= -DBUILD_PLUGIN_PYTHON:BOOL=TRUE PYTHON_USES= python PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} PYTHON_CMAKE_OFF= -DBUILD_PLUGIN_PYTHON:BOOL=FALSE TESTS_DESC= Enable Tests TESTS_CMAKE_ON= -DBUILD_PLUGIN_TESTS:BOOL=TRUE TESTS_CMAKE_OFF= DBUILD_PLUGIN_TESTS:BOOL=FALSE ICEBRIDGE_DESC= Enable Icebridge plugin -ICEBRIDGE_LIB_DEPENDS= libhdf5.so:science/hdf5 +ICEBRIDGE_LIB_DEPENDS= libhdf5.so:science/hdf5 \ + libsz.so:science/szip ICEBRIDGE_CMAKE_ON= -DBUILD_PLUGIN_ICEBRIDGE:BOOL=TRUE ICEBRIDGE_CMAKE_OFF= -DBUILD_PLUGIN_ICEBRIDGE:BOOL=FALSE + +MBIO_DESC= Enable MBIO plugin +MBIO_CMAKE_ON= -DBUILD_PLUGIN_MBIO:BOOL=TRUE +MBIO_CMAKE_OFF= -DBUILD_PLUGIN_MBIO:BOOL=FALSE BASH_DESC= BASH completion BASH_CMAKE_ON= -DWITH_COMPLETION:BOOL=TRUE BASH_RUN_DEPENDS= bash:shells/bash BASH_CMAKE_OFF= -DWITH_COMPLETION:BOOL=FALSE post-install-BASH-on: ${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions ${INSTALL_DATA} ${WRKSRC}/scripts/bash-completion/pdal \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions .include Index: head/math/pdal/distinfo =================================================================== --- head/math/pdal/distinfo (revision 448267) +++ head/math/pdal/distinfo (revision 448268) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482219332 -SHA256 (PDAL-PDAL-1.4.0_GH0.tar.gz) = 199b34f77d48e468ff2dd2077766b63893d6be99a1db28cadfaee4f92978aed1 -SIZE (PDAL-PDAL-1.4.0_GH0.tar.gz) = 65673606 +TIMESTAMP = 1502432256 +SHA256 (PDAL-PDAL-1.5.0_GH0.tar.gz) = 915e3326a8713982dfdc4a5d9be91fefa6d879615a521669ec2105d9a21b4ead +SIZE (PDAL-PDAL-1.5.0_GH0.tar.gz) = 66066083 Index: head/math/pdal/files/patch-cmake_modules_FindJSONCPP.cmake =================================================================== --- head/math/pdal/files/patch-cmake_modules_FindJSONCPP.cmake (nonexistent) +++ head/math/pdal/files/patch-cmake_modules_FindJSONCPP.cmake (revision 448268) @@ -0,0 +1,18 @@ +--- cmake/modules/FindJSONCPP.cmake.orig 2017-08-11 17:29:28 UTC ++++ cmake/modules/FindJSONCPP.cmake +@@ -77,6 +77,7 @@ find_library(JSONCPP_LIBRARY + PATHS + "${JSONCPP_ROOT_DIR}/libs" + /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} ++ /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} + PATH_SUFFIXES + ${_pathsuffixes}) + +@@ -86,6 +87,7 @@ find_path(JSONCPP_INCLUDE_DIR + PATHS + "${JSONCPP_ROOT_DIR}" + /usr/include/jsoncpp ++ /usr/local/include/jsoncpp + PATH_SUFFIXES + include) + Property changes on: head/math/pdal/files/patch-cmake_modules_FindJSONCPP.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/pdal/pkg-plist =================================================================== --- head/math/pdal/pkg-plist (revision 448267) +++ head/math/pdal/pkg-plist (revision 448268) @@ -1,198 +1,202 @@ bin/pdal bin/pdal-config include/pdal/Compression.hpp include/pdal/DbReader.hpp include/pdal/DbWriter.hpp include/pdal/DimDetail.hpp include/pdal/DimType.hpp include/pdal/DimUtil.hpp include/pdal/Dimension.hpp include/pdal/EigenUtils.hpp include/pdal/Filter.hpp include/pdal/FlexWriter.hpp include/pdal/GDALUtils.hpp include/pdal/GEOSUtils.hpp include/pdal/Geometry.hpp include/pdal/KDIndex.hpp include/pdal/Kernel.hpp include/pdal/KernelFactory.hpp include/pdal/Log.hpp include/pdal/Metadata.hpp include/pdal/Options.hpp include/pdal/PDALUtils.hpp include/pdal/PipelineExecutor.hpp include/pdal/PipelineManager.hpp include/pdal/PipelineReaderJSON.hpp include/pdal/PipelineWriter.hpp include/pdal/PluginManager.hpp include/pdal/PointContainer.hpp include/pdal/PointLayout.hpp include/pdal/PointRef.hpp include/pdal/PointTable.hpp include/pdal/PointView.hpp include/pdal/PointViewIter.hpp include/pdal/Polygon.hpp include/pdal/QuadIndex.hpp include/pdal/QuickInfo.hpp include/pdal/Reader.hpp include/pdal/Scaling.hpp +include/pdal/Segmentation.hpp include/pdal/SpatialReference.hpp include/pdal/Stage.hpp include/pdal/StageFactory.hpp include/pdal/StageWrapper.hpp include/pdal/Writer.hpp include/pdal/XMLSchema.hpp include/pdal/filters/ApproximateCoplanarFilter.hpp -include/pdal/filters/AttributeFilter.hpp +include/pdal/filters/AssignFilter.hpp include/pdal/filters/ChipperFilter.hpp +include/pdal/filters/ClusterFilter.hpp include/pdal/filters/ColorInterpRamps.hpp include/pdal/filters/ColorinterpFilter.hpp include/pdal/filters/ColorizationFilter.hpp include/pdal/filters/ComputeRangeFilter.hpp include/pdal/filters/CropFilter.hpp include/pdal/filters/DecimationFilter.hpp include/pdal/filters/DividerFilter.hpp include/pdal/filters/EigenvaluesFilter.hpp +include/pdal/filters/ELMFilter.hpp include/pdal/filters/EstimateRankFilter.hpp include/pdal/filters/FerryFilter.hpp +include/pdal/filters/GroupByFilter.hpp include/pdal/filters/HAGFilter.hpp include/pdal/filters/IQRFilter.hpp include/pdal/filters/KDistanceFilter.hpp +include/pdal/filters/LocateFilter.hpp include/pdal/filters/LOFFilter.hpp include/pdal/filters/MADFilter.hpp include/pdal/filters/MergeFilter.hpp include/pdal/filters/MongusFilter.hpp include/pdal/filters/MortonOrderFilter.hpp include/pdal/filters/NormalFilter.hpp include/pdal/filters/OutlierFilter.hpp +include/pdal/filters/OverlayFilter.hpp include/pdal/filters/PMFFilter.hpp include/pdal/filters/RadialDensityFilter.hpp include/pdal/filters/RandomizeFilter.hpp include/pdal/filters/RangeFilter.hpp include/pdal/filters/ReprojectionFilter.hpp include/pdal/filters/SMRFilter.hpp include/pdal/filters/SampleFilter.hpp include/pdal/filters/SortFilter.hpp include/pdal/filters/SplitterFilter.hpp include/pdal/filters/StatsFilter.hpp include/pdal/filters/StreamCallbackFilter.hpp include/pdal/filters/TransformationFilter.hpp include/pdal/gitsha.h include/pdal/io/BpfCompressor.hpp include/pdal/io/BpfHeader.hpp include/pdal/io/BpfReader.hpp include/pdal/io/BpfWriter.hpp include/pdal/io/BufferReader.hpp -include/pdal/io/DerivativeWriter.hpp include/pdal/io/FauxReader.hpp include/pdal/io/GDALGrid.hpp include/pdal/io/GDALReader.hpp include/pdal/io/GDALWriter.hpp include/pdal/io/GeotiffSupport.hpp include/pdal/io/HeaderVal.hpp include/pdal/io/Ilvis2MetadataReader.hpp include/pdal/io/Ilvis2Reader.hpp include/pdal/io/LasError.hpp include/pdal/io/LasHeader.hpp include/pdal/io/LasReader.hpp include/pdal/io/LasSummaryData.hpp include/pdal/io/LasUtils.hpp include/pdal/io/LasVLR.hpp include/pdal/io/LasWriter.hpp include/pdal/io/LasZipPoint.hpp include/pdal/io/NullWriter.hpp include/pdal/io/OptechCommon.hpp include/pdal/io/OptechReader.hpp include/pdal/io/OptechRotationMatrix.hpp include/pdal/io/PlyReader.hpp include/pdal/io/PlyWriter.hpp include/pdal/io/PtsReader.hpp include/pdal/io/QfitReader.hpp include/pdal/io/SbetCommon.hpp include/pdal/io/SbetReader.hpp include/pdal/io/SbetWriter.hpp include/pdal/io/TIndexReader.hpp include/pdal/io/TerrasolidReader.hpp include/pdal/io/TextReader.hpp include/pdal/io/TextWriter.hpp include/pdal/kernels/DeltaKernel.hpp include/pdal/kernels/DiffKernel.hpp include/pdal/kernels/GroundKernel.hpp include/pdal/kernels/HausdorffKernel.hpp include/pdal/kernels/InfoKernel.hpp include/pdal/kernels/MergeKernel.hpp include/pdal/kernels/PipelineKernel.hpp include/pdal/kernels/RandomKernel.hpp include/pdal/kernels/SortKernel.hpp include/pdal/kernels/SplitKernel.hpp include/pdal/kernels/TIndexKernel.hpp include/pdal/kernels/TranslateKernel.hpp include/pdal/pdal.hpp include/pdal/pdal_config.hpp include/pdal/pdal_defines.h include/pdal/pdal_export.hpp include/pdal/pdal_internal.hpp include/pdal/pdal_macros.hpp include/pdal/pdal_test_main.hpp include/pdal/pdal_types.hpp include/pdal/plang/Array.hpp -include/pdal/plang/BufferedInvocation.hpp include/pdal/plang/Environment.hpp include/pdal/plang/Invocation.hpp include/pdal/plang/Redirector.hpp include/pdal/plang/Script.hpp include/pdal/plugin.hpp include/pdal/util/Algorithm.hpp include/pdal/util/Bounds.hpp include/pdal/util/Charbuf.hpp include/pdal/util/Extractor.hpp include/pdal/util/FileUtils.hpp include/pdal/util/Georeference.hpp include/pdal/util/IStream.hpp include/pdal/util/Inserter.hpp +include/pdal/util/NullOStream.hpp include/pdal/util/OStream.hpp include/pdal/util/ProgramArgs.hpp include/pdal/util/Utils.hpp include/pdal/util/Uuid.hpp include/pdal/util/pdal_util_export.hpp include/pdal/util/portable_endian.hpp lib/libpdal_arbiter.a lib/libpdal_base.so lib/libpdal_base.so.4 -lib/libpdal_base.so.5.0.0 +lib/libpdal_base.so.5.1.0 lib/libpdal_boost.a -lib/libpdal_jsoncpp.a %%PYTHON%%lib/libpdal_plang.so %%PYTHON%%lib/libpdal_plang.so.4 -%%PYTHON%%lib/libpdal_plang.so.5.0.0 +%%PYTHON%%lib/libpdal_plang.so.5.1.0 %%PYTHON%%lib/libpdal_plugin_filter_predicate.so %%PYTHON%%lib/libpdal_plugin_filter_predicate.so.4 -%%PYTHON%%lib/libpdal_plugin_filter_predicate.so.5.0.0 +%%PYTHON%%lib/libpdal_plugin_filter_predicate.so.5.1.0 %%PYTHON%%lib/libpdal_plugin_filter_programmable.so %%PYTHON%%lib/libpdal_plugin_filter_programmable.so.4 -%%PYTHON%%lib/libpdal_plugin_filter_programmable.so.5.0.0 +%%PYTHON%%lib/libpdal_plugin_filter_programmable.so.5.1.0 %%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so %%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.4 -%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.5.0.0 +%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.5.1.0 %%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so %%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.4 -%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.5.0.0 +%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.5.1.0 %%SQLITE%%lib/libpdal_plugin_reader_sqlite.so %%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.4 -%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.5.0.0 +%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.5.1.0 %%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so %%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.4 -%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.5.0.0 +%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.5.1.0 %%SQLITE%%lib/libpdal_plugin_writer_sqlite.so %%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.4 -%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.5.0.0 +%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.5.1.0 lib/libpdal_util.so lib/libpdal_util.so.4 -lib/libpdal_util.so.5.0.0 +lib/libpdal_util.so.5.1.0 lib/libpdalcpp.so lib/pdal/cmake/PDALConfig.cmake lib/pdal/cmake/PDALConfigVersion.cmake lib/pdal/cmake/PDALTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/pdal/cmake/PDALTargets.cmake libdata/pkgconfig/pdal.pc %%BASH%%share/bash-completion/completions/pdal