math/pdal: Update to 2.1.0

 - Update to 2.1.0
 - Remove Sqlite and Python (removed upstream)
 - Remove patch for LASZip (fixed in archivers/laszip)
 - Reoreder options
 - Add lazperf option

Changelog:
 - https://github.com/PDAL/PDAL/releases/tag/2.1.0

Approved by:	tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D25863

4 files changed, 133 insertions, 129 deletions

diff --git a/math/pdal/Makefile b/math/pdal/Makefile
index 81e6a872d15d..0afe471097a9 100644
--- a/math/pdal/Makefile
+++ b/math/pdal/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pdal
-DISTVERSION=	2.0.1
-PORTREVISION=	2
+DISTVERSION=	2.1.0
 CATEGORIES=	math databases graphics
 
 MAINTAINER=	lbartoletti@FreeBSD.org
@@ -20,9 +19,10 @@ LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeotiff.so:graphics/libgeotiff \
 		libxml2.so:textproc/libxml2 \
 		liblaszip.so:archivers/laszip \
-		libzstd.so:archivers/zstd
+		libzstd.so:archivers/zstd \
+		libunwind.so:devel/libunwind
 
-USES=		cmake compiler:c++11-lib pathfix pkgconfig
+USES=		cmake compiler:c++11-lib pathfix pkgconfig ssl
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
@@ -31,50 +31,37 @@ GH_PROJECT=	${GH_ACCOUNT}
 CMAKE_ON=	WITH_LASZIP #LASZIP is recommended
 
 OPTIONS_DEFINE=	BASH \
-		ICEBRIDGE PGPOINTCLOUD SQLITE MBIO \
-		PYTHON TESTS
-OPTIONS_DEFAULT=	PYTHON PGPOINTCLOUD SQLITE
-#Option without port
-#lazperf
+		ICEBRIDGE PGPOINTCLOUD LAZPERF MBIO \
+		TESTS
+#OPTIONS_DEFAULT=	PGPOINTCLOUD LAZPERF
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 #Plugins with lib not in port:
 #RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro)
 OPTIONS_SUB=	yes
 
+BASH_DESC=		BASH completion
+ICEBRIDGE_DESC=		Enable Icebridge plugin
+LAZPERF_DESC=		Enable LAZPerf plugin
+MBIO_DESC=		Enable MBIO plugin
 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
+TESTS_DESC=		Enable Tests
 
-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
+BASH_CMAKE_BOOL=	WITH_COMPLETION
+BASH_RUN_DEPENDS=	bash:shells/bash
 
-ICEBRIDGE_DESC=	Enable Icebridge plugin
+ICEBRIDGE_CMAKE_BOOL=	BUILD_PLUGIN_ICEBRIDGE
 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
+LAZPERF_CMAKE_BOOL=	WITH_LAZPERF
+LAZPERF_BUILD_DEPENDS=	${LOCALBASE}/include/laz-perf/las.hpp:archivers/lazperf
 
-BASH_DESC=	BASH completion
-BASH_CMAKE_ON=	-DWITH_COMPLETION:BOOL=TRUE
-BASH_RUN_DEPENDS=	bash:shells/bash
-BASH_CMAKE_OFF=	-DWITH_COMPLETION:BOOL=FALSE
+MBIO_CMAKE_BOOL=	BUILD_PLUGIN_MBIO
+
+PGPOINTCLOUD_CMAKE_BOOL=	BUILD_PLUGIN_PGPOINTCLOUD
+PGPOINTCLOUD_USES=	pgsql
+
+TESTS_CMAKE_BOOL=	BUILD_PLUGIN_TESTS
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
diff --git a/math/pdal/distinfo b/math/pdal/distinfo
index f644097a730a..fc01c29bf169 100644
--- a/math/pdal/distinfo
+++ b/math/pdal/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568356237
-SHA256 (PDAL-PDAL-2.0.1_GH0.tar.gz) = bf85c0d826c644a2c52791c62227a5fbfeae845dd9d2c8bdad2d002035673e21
-SIZE (PDAL-PDAL-2.0.1_GH0.tar.gz) = 100076022
+TIMESTAMP = 1595938896
+SHA256 (PDAL-PDAL-2.1.0_GH0.tar.gz) = 43ed8ba8ef143e1ded67e96ef72bb73ee133723da0320c3e4f2f87d9bfc3737c
+SIZE (PDAL-PDAL-2.1.0_GH0.tar.gz) = 103060109
diff --git a/math/pdal/files/patch-cmake_modules_FindLASzip.cmake b/math/pdal/files/patch-cmake_modules_FindLASzip.cmake
deleted file mode 100644
index 0a388385ae21..000000000000
--- a/math/pdal/files/patch-cmake_modules_FindLASzip.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/modules/FindLASzip.cmake.orig	2018-05-22 16:04:04 UTC
-+++ cmake/modules/FindLASzip.cmake
-@@ -53,7 +53,7 @@ FIND_LIBRARY(LASZIP_LIBRARY
-   ${OSGEO4W_ROOT_DIR}/lib)
- 
- # Comment out laszip.hpp version info
--SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip/laszip_api_version.h")
-+SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip_api_version.h")
- IF(LASZIP_INCLUDE_DIR AND EXISTS ${LASZIP_VERSION_H})
-   SET(LASZIP_VERSION 0)
- 
diff --git a/math/pdal/pkg-plist b/math/pdal/pkg-plist
index 9e56bf5e29df..c606aec13b66 100644
--- a/math/pdal/pkg-plist
+++ b/math/pdal/pkg-plist
@@ -2,56 +2,104 @@ bin/pdal
 bin/pdal-config
 include/pdal/Artifact.hpp
 include/pdal/ArtifactManager.hpp
-include/pdal/compression/Compression.hpp
-include/pdal/compression/DeflateCompression.hpp
-include/pdal/compression/ZstdCompression.hpp
 include/pdal/DbReader.hpp
 include/pdal/DbWriter.hpp
 include/pdal/DimDetail.hpp
-include/pdal/Dimension.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/Geometry.hpp
+include/pdal/JsonFwd.hpp
+include/pdal/KDIndex.hpp
+include/pdal/Kernel.hpp
+include/pdal/Log.hpp
+include/pdal/Mesh.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/PluginDirectory.hpp
+include/pdal/PluginHelper.hpp
+include/pdal/PluginInfo.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/Polygon.hpp
+include/pdal/QuadIndex.hpp
+include/pdal/QuickInfo.hpp
+include/pdal/Reader.hpp
+include/pdal/Scaling.hpp
+include/pdal/SpatialReference.hpp
+include/pdal/SrsBounds.hpp
+include/pdal/Stage.hpp
+include/pdal/StageExtensions.hpp
+include/pdal/StageFactory.hpp
+include/pdal/StageWrapper.hpp
+include/pdal/Streamable.hpp
+include/pdal/SubcommandKernel.hpp
+include/pdal/Writer.hpp
+include/pdal/XMLSchema.hpp
+include/pdal/compression/Compression.hpp
+include/pdal/compression/DeflateCompression.hpp
+include/pdal/compression/LazPerfCompression.hpp
+include/pdal/compression/LazPerfVlrCompression.hpp
+include/pdal/compression/LzmaCompression.hpp
+include/pdal/compression/ZstdCompression.hpp
 include/pdal/filters/ApproximateCoplanarFilter.hpp
 include/pdal/filters/AssignFilter.hpp
+include/pdal/filters/CSFilter.hpp
 include/pdal/filters/ChipperFilter.hpp
 include/pdal/filters/ClusterFilter.hpp
-include/pdal/filters/ColorinterpFilter.hpp
 include/pdal/filters/ColorInterpRamps.hpp
+include/pdal/filters/ColorinterpFilter.hpp
 include/pdal/filters/ColorizationFilter.hpp
 include/pdal/filters/CovarianceFeaturesFilter.hpp
 include/pdal/filters/CropFilter.hpp
+include/pdal/filters/DBSCANFilter.hpp
+include/pdal/filters/DEMFilter.hpp
 include/pdal/filters/DecimationFilter.hpp
 include/pdal/filters/DelaunayFilter.hpp
-include/pdal/filters/DEMFilter.hpp
 include/pdal/filters/DividerFilter.hpp
-include/pdal/filters/EigenvaluesFilter.hpp
 include/pdal/filters/ELMFilter.hpp
+include/pdal/filters/EigenvaluesFilter.hpp
 include/pdal/filters/EstimateRankFilter.hpp
+include/pdal/filters/FarthestPointSamplingFilter.hpp
 include/pdal/filters/FerryFilter.hpp
 include/pdal/filters/GreedyProjection.hpp
 include/pdal/filters/GroupByFilter.hpp
 include/pdal/filters/HAGFilter.hpp
+include/pdal/filters/HagDelaunayFilter.hpp
+include/pdal/filters/HagDemFilter.hpp
+include/pdal/filters/HagNnFilter.hpp
 include/pdal/filters/HeadFilter.hpp
 include/pdal/filters/HexBinFilter.hpp
-include/pdal/filters/InfoFilter.hpp
 include/pdal/filters/IQRFilter.hpp
+include/pdal/filters/InfoFilter.hpp
 include/pdal/filters/IterativeClosestPoint.hpp
-include/pdal/filters/LocateFilter.hpp
 include/pdal/filters/LOFFilter.hpp
+include/pdal/filters/LocateFilter.hpp
 include/pdal/filters/MADFilter.hpp
 include/pdal/filters/MergeFilter.hpp
 include/pdal/filters/MiniballFilter.hpp
 include/pdal/filters/MongoExpressionFilter.hpp
 include/pdal/filters/MortonOrderFilter.hpp
-include/pdal/filters/NeighborClassifierFilter.hpp
 include/pdal/filters/NNDistanceFilter.hpp
+include/pdal/filters/NeighborClassifierFilter.hpp
 include/pdal/filters/NormalFilter.hpp
 include/pdal/filters/OutlierFilter.hpp
 include/pdal/filters/OverlayFilter.hpp
-include/pdal/filters/PlaneFitFilter.hpp
 include/pdal/filters/PMFFilter.hpp
+include/pdal/filters/PlaneFitFilter.hpp
 include/pdal/filters/PoissonFilter.hpp
 include/pdal/filters/ProjPipelineFilter.hpp
 include/pdal/filters/RadialDensityFilter.hpp
@@ -60,9 +108,11 @@ include/pdal/filters/RangeFilter.hpp
 include/pdal/filters/ReciprocityFilter.hpp
 include/pdal/filters/ReprojectionFilter.hpp
 include/pdal/filters/ReturnsFilter.hpp
+include/pdal/filters/SMRFilter.hpp
 include/pdal/filters/SampleFilter.hpp
+include/pdal/filters/SeparateScanLineFilter.hpp
 include/pdal/filters/ShellFilter.hpp
-include/pdal/filters/SMRFilter.hpp
+include/pdal/filters/SkewnessBalancingFilter.hpp
 include/pdal/filters/SortFilter.hpp
 include/pdal/filters/SplitterFilter.hpp
 include/pdal/filters/StatsFilter.hpp
@@ -71,9 +121,28 @@ include/pdal/filters/TailFilter.hpp
 include/pdal/filters/TransformationFilter.hpp
 include/pdal/filters/VoxelCenterNearestNeighborFilter.hpp
 include/pdal/filters/VoxelCentroidNearestNeighborFilter.hpp
-include/pdal/FlexWriter.hpp
-include/pdal/GDALUtils.hpp
-include/pdal/Geometry.hpp
+include/pdal/filters/VoxelDownsizeFilter.hpp
+include/pdal/filters/private/DimRange.hpp
+include/pdal/filters/private/Point.hpp
+include/pdal/filters/private/Segmentation.hpp
+include/pdal/filters/private/delaunator.hpp
+include/pdal/filters/private/hexer/HexGrid.hpp
+include/pdal/filters/private/hexer/HexInfo.hpp
+include/pdal/filters/private/hexer/HexIter.hpp
+include/pdal/filters/private/hexer/Hexagon.hpp
+include/pdal/filters/private/hexer/Mathpair.hpp
+include/pdal/filters/private/hexer/Path.hpp
+include/pdal/filters/private/hexer/Processor.hpp
+include/pdal/filters/private/hexer/Segment.hpp
+include/pdal/filters/private/hexer/exception.hpp
+include/pdal/filters/private/mongoexpression/Comparison.hpp
+include/pdal/filters/private/mongoexpression/Expression.hpp
+include/pdal/filters/private/mongoexpression/LogicGate.hpp
+include/pdal/filters/private/mongoexpression/Support.hpp
+include/pdal/filters/private/pnp/Comparison.hpp
+include/pdal/filters/private/pnp/Grid.hpp
+include/pdal/filters/private/pnp/GridPnp.hpp
+include/pdal/filters/private/pnp/VoxelRayTrace.hpp
 include/pdal/gitsha.h
 include/pdal/io/BpfCompressor.hpp
 include/pdal/io/BpfHeader.hpp
@@ -108,19 +177,18 @@ include/pdal/io/PcdReader.hpp
 include/pdal/io/PcdWriter.hpp
 include/pdal/io/PlyReader.hpp
 include/pdal/io/PlyWriter.hpp
-include/pdal/io/point_types.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/io/TIndexReader.hpp
-include/pdal/JsonFwd.hpp
-include/pdal/KDIndex.hpp
-include/pdal/Kernel.hpp
+include/pdal/io/point_types.hpp
+include/pdal/io/private/EptSupport.hpp
+include/pdal/io/private/GDALGrid.hpp
 include/pdal/kernels/DeltaKernel.hpp
 include/pdal/kernels/DensityKernel.hpp
 include/pdal/kernels/GroundKernel.hpp
@@ -131,48 +199,20 @@ include/pdal/kernels/PipelineKernel.hpp
 include/pdal/kernels/RandomKernel.hpp
 include/pdal/kernels/SortKernel.hpp
 include/pdal/kernels/SplitKernel.hpp
-include/pdal/kernels/TileKernel.hpp
 include/pdal/kernels/TIndexKernel.hpp
+include/pdal/kernels/TileKernel.hpp
 include/pdal/kernels/TranslateKernel.hpp
-include/pdal/Log.hpp
-include/pdal/Mesh.hpp
-include/pdal/Metadata.hpp
-include/pdal/Options.hpp
+include/pdal/kernels/private/density/OGR.hpp
+include/pdal/pdal.hpp
 include/pdal/pdal_config.hpp
 include/pdal/pdal_export.hpp
 include/pdal/pdal_features.hpp
 include/pdal/pdal_internal.hpp
 include/pdal/pdal_test_main.hpp
 include/pdal/pdal_types.hpp
-include/pdal/pdal.hpp
-include/pdal/PDALUtils.hpp
-include/pdal/PipelineExecutor.hpp
-include/pdal/PipelineManager.hpp
-include/pdal/PipelineReaderJSON.hpp
-include/pdal/PipelineWriter.hpp
-include/pdal/PluginDirectory.hpp
-include/pdal/PluginHelper.hpp
-include/pdal/PluginInfo.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/SpatialReference.hpp
-include/pdal/SrsBounds.hpp
-include/pdal/Stage.hpp
-include/pdal/StageExtensions.hpp
-include/pdal/StageFactory.hpp
-include/pdal/StageWrapper.hpp
-include/pdal/Streamable.hpp
-include/pdal/SubcommandKernel.hpp
+include/pdal/private/DynamicLibrary.hpp
+include/pdal/private/SrsTransform.hpp
+include/pdal/private/StageRunner.hpp
 include/pdal/util/Algorithm.hpp
 include/pdal/util/Backtrace.hpp
 include/pdal/util/Bounds.hpp
@@ -180,52 +220,40 @@ include/pdal/util/Charbuf.hpp
 include/pdal/util/Extractor.hpp
 include/pdal/util/FileUtils.hpp
 include/pdal/util/Georeference.hpp
-include/pdal/util/Inserter.hpp
 include/pdal/util/IStream.hpp
+include/pdal/util/Inserter.hpp
 include/pdal/util/NullOStream.hpp
 include/pdal/util/OStream.hpp
-include/pdal/util/pdal_util_export.hpp
-include/pdal/util/portable_endian.hpp
 include/pdal/util/ProgramArgs.hpp
 include/pdal/util/Utils.hpp
 include/pdal/util/Uuid.hpp
-include/pdal/Writer.hpp
-include/pdal/XMLSchema.hpp
+include/pdal/util/pdal_util_export.hpp
+include/pdal/util/portable_endian.hpp
+include/pdal/util/private/BacktraceImpl.hpp
+@dir include/pdal/filters/private/csf
+@dir include/pdal/filters/private/miniball
 lib/cmake/PDAL/PDALConfig.cmake
 lib/cmake/PDAL/PDALConfigVersion.cmake
 lib/cmake/PDAL/PDALTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/PDAL/PDALTargets.cmake
 lib/libpdal_base.so
-lib/libpdal_base.so.9
 lib/libpdal_base.so.10
+lib/libpdal_base.so.11
 lib/libpdal_util.so
-lib/libpdal_util.so.9
 lib/libpdal_util.so.10
+lib/libpdal_util.so.11
 lib/libpdalcpp.so
 libdata/pkgconfig/pdal.pc
 %%BASH%%share/bash-completion/completions/pdal
 %%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so
-%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.9
 %%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.10
+%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.11
 %%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so
-%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.9
 %%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.10
+%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.11
 %%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so
-%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.9
 %%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.10
-%%PYTHON%%include/pdal/io/NumpyReader.hpp
-%%PYTHON%%lib/libpdal_plugin_filter_python.so
-%%PYTHON%%lib/libpdal_plugin_filter_python.so.9
-%%PYTHON%%lib/libpdal_plugin_filter_python.so.10
-%%PYTHON%%lib/libpdal_plugin_reader_numpy.so
-%%PYTHON%%lib/libpdal_plugin_reader_numpy.so.9
-%%PYTHON%%lib/libpdal_plugin_reader_numpy.so.10
-%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so
-%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.9
-%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.10
-%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so
-%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.9
-%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.10
+%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.11
 lib/libpdal_plugin_kernel_fauxplugin.so
-lib/libpdal_plugin_kernel_fauxplugin.so.9
 lib/libpdal_plugin_kernel_fauxplugin.so.10
+lib/libpdal_plugin_kernel_fauxplugin.so.11