Attachment #185509 for bug #221578

View | Details | Raw Unified | Return to bug 221578
Collapse All | Expand All

Lines 2-9 Link Here

(-)math/pdal/Makefile (-7 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pdal	4	PORTNAME= pdal
5	PORTVERSION= 1.4.0	5	PORTVERSION= 1.5.0
6	PORTREVISION= 3
7	CATEGORIES= math databases graphics	6	CATEGORIES= math databases graphics
8		7
9	MAINTAINER= lbartoletti@tuxfamily.org	8	MAINTAINER= lbartoletti@tuxfamily.org
Lines 18-24 Link Here
18	libcurl.so:ftp/curl \	17	libcurl.so:ftp/curl \
19	libgeotiff.so:graphics/libgeotiff \	18	libgeotiff.so:graphics/libgeotiff \
20	libxml2.so:textproc/libxml2 \	19	libxml2.so:textproc/libxml2 \
21	liblaszip.so:archivers/laszip	20	liblaszip.so:archivers/laszip \
		21	libjsoncpp.so:devel/jsoncpp
22		22
23	USES= cmake:outsource compiler:c++11-lib pathfix pkgconfig execinfo	23	USES= cmake:outsource compiler:c++11-lib pathfix pkgconfig execinfo
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
Lines 32-42 Link Here
32	CMAKE_ARGS+= -DWITH_LASZIP:BOOL=TRUE #Doesn't build without laszip. LASZIP is recommended	32	CMAKE_ARGS+= -DWITH_LASZIP:BOOL=TRUE #Doesn't build without laszip. LASZIP is recommended
33		33
34	OPTIONS_DEFINE= BASH \	34	OPTIONS_DEFINE= BASH \
35	ICEBRIDGE PGPOINTCLOUD SQLITE \	35	ICEBRIDGE PGPOINTCLOUD SQLITE MBIO \
36	PYTHON TESTS	36	PYTHON TESTS
37	OPTIONS_DEFAULT= PYTHON TESTS	37	OPTIONS_DEFAULT= PYTHON PGPOINTCLOUD SQLITE
		38	#Option without port
		39	#lazperf
38	#Plugins with lib not in port:	40	#Plugins with lib not in port:
39	#RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin	41	#RivLib, Matlab, MrSID, CPD, GeoWave, GreyHound, HexBin, NITF (nitro)
40	OPTIONS_SUB= yes	42	OPTIONS_SUB= yes
41		43
42	PGPOINTCLOUD_DESC= Enable Coherent PostgreSQL Point Cloud plugin	44	PGPOINTCLOUD_DESC= Enable Coherent PostgreSQL Point Cloud plugin
Lines 61-70 Link Here
61	TESTS_CMAKE_OFF= DBUILD_PLUGIN_TESTS:BOOL=FALSE	63	TESTS_CMAKE_OFF= DBUILD_PLUGIN_TESTS:BOOL=FALSE
62		64
63	ICEBRIDGE_DESC= Enable Icebridge plugin	65	ICEBRIDGE_DESC= Enable Icebridge plugin
64	ICEBRIDGE_LIB_DEPENDS= libhdf5.so:science/hdf5	66	ICEBRIDGE_LIB_DEPENDS= libhdf5.so:science/hdf5 \
		67	libsz.so:science/szip
65	ICEBRIDGE_CMAKE_ON= -DBUILD_PLUGIN_ICEBRIDGE:BOOL=TRUE	68	ICEBRIDGE_CMAKE_ON= -DBUILD_PLUGIN_ICEBRIDGE:BOOL=TRUE
66	ICEBRIDGE_CMAKE_OFF= -DBUILD_PLUGIN_ICEBRIDGE:BOOL=FALSE	69	ICEBRIDGE_CMAKE_OFF= -DBUILD_PLUGIN_ICEBRIDGE:BOOL=FALSE
67		70
		71	MBIO_DESC= Enable MBIO plugin
		72	MBIO_CMAKE_ON= -DBUILD_PLUGIN_MBIO:BOOL=TRUE
		73	MBIO_CMAKE_OFF= -DBUILD_PLUGIN_MBIO:BOOL=FALSE
		74
68	BASH_DESC= BASH completion	75	BASH_DESC= BASH completion
69	BASH_CMAKE_ON= -DWITH_COMPLETION:BOOL=TRUE	76	BASH_CMAKE_ON= -DWITH_COMPLETION:BOOL=TRUE
70	BASH_RUN_DEPENDS= bash:shells/bash	77	BASH_RUN_DEPENDS= bash:shells/bash

Lines 1-3 Link Here

(-)math/pdal/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1482219332	1	TIMESTAMP = 1502432256
2	SHA256 (PDAL-PDAL-1.4.0_GH0.tar.gz) = 199b34f77d48e468ff2dd2077766b63893d6be99a1db28cadfaee4f92978aed1	2	SHA256 (PDAL-PDAL-1.5.0_GH0.tar.gz) = 915e3326a8713982dfdc4a5d9be91fefa6d879615a521669ec2105d9a21b4ead
3	SIZE (PDAL-PDAL-1.4.0_GH0.tar.gz) = 65673606	3	SIZE (PDAL-PDAL-1.5.0_GH0.tar.gz) = 66066083




--- 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)
 




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/Writer.hpp
include/pdal/XMLSchema.hpp
include/pdal/filters/ApproximateCoplanarFilter.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/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/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/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/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/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

lib/libpdal_arbiter.a
lib/libpdal_base.so
lib/libpdal_base.so.4
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.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.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.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.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.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.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.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.1.0
lib/libpdal_util.so
lib/libpdal_util.so.4
lib/libpdal_util.so.5.1.0
lib/libpdalcpp.so
lib/pdal/cmake/PDALConfig.cmake
lib/pdal/cmake/PDALConfigVersion.cmake

Return to bug 221578

Line 0 Link Here

(-)math/pdal/files/patch-cmake_modules_FindJSONCPP.cmake (+18 lines)
	1	--- cmake/modules/FindJSONCPP.cmake.orig 2017-08-11 17:29:28 UTC
	2	+++ cmake/modules/FindJSONCPP.cmake
	3	@@ -77,6 +77,7 @@ find_library(JSONCPP_LIBRARY
	4	PATHS
	5	"${JSONCPP_ROOT_DIR}/libs"
	6	/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
	7	+ /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
	8	PATH_SUFFIXES
	9	${_pathsuffixes})
	10
	11	@@ -86,6 +87,7 @@ find_path(JSONCPP_INCLUDE_DIR
	12	PATHS
	13	"${JSONCPP_ROOT_DIR}"
	14	/usr/include/jsoncpp
	15	+ /usr/local/include/jsoncpp
	16	PATH_SUFFIXES
	17	include)
	18

Lines 36-41 Link Here

(-)math/pdal/pkg-plist (-14 / +18 lines)
36	include/pdal/QuickInfo.hpp	36	include/pdal/QuickInfo.hpp
37	include/pdal/Reader.hpp	37	include/pdal/Reader.hpp
38	include/pdal/Scaling.hpp	38	include/pdal/Scaling.hpp
		39	include/pdal/Segmentation.hpp
39	include/pdal/SpatialReference.hpp	40	include/pdal/SpatialReference.hpp
40	include/pdal/Stage.hpp	41	include/pdal/Stage.hpp
41	include/pdal/StageFactory.hpp	42	include/pdal/StageFactory.hpp
Lines 43-50 Link Here
43	include/pdal/Writer.hpp	44	include/pdal/Writer.hpp
44	include/pdal/XMLSchema.hpp	45	include/pdal/XMLSchema.hpp
45	include/pdal/filters/ApproximateCoplanarFilter.hpp	46	include/pdal/filters/ApproximateCoplanarFilter.hpp
46	include/pdal/filters/AttributeFilter.hpp	47	include/pdal/filters/AssignFilter.hpp
47	include/pdal/filters/ChipperFilter.hpp	48	include/pdal/filters/ChipperFilter.hpp
		49	include/pdal/filters/ClusterFilter.hpp
48	include/pdal/filters/ColorInterpRamps.hpp	50	include/pdal/filters/ColorInterpRamps.hpp
49	include/pdal/filters/ColorinterpFilter.hpp	51	include/pdal/filters/ColorinterpFilter.hpp
50	include/pdal/filters/ColorizationFilter.hpp	52	include/pdal/filters/ColorizationFilter.hpp
Lines 53-63 Link Here
53	include/pdal/filters/DecimationFilter.hpp	55	include/pdal/filters/DecimationFilter.hpp
54	include/pdal/filters/DividerFilter.hpp	56	include/pdal/filters/DividerFilter.hpp
55	include/pdal/filters/EigenvaluesFilter.hpp	57	include/pdal/filters/EigenvaluesFilter.hpp
		58	include/pdal/filters/ELMFilter.hpp
56	include/pdal/filters/EstimateRankFilter.hpp	59	include/pdal/filters/EstimateRankFilter.hpp
57	include/pdal/filters/FerryFilter.hpp	60	include/pdal/filters/FerryFilter.hpp
		61	include/pdal/filters/GroupByFilter.hpp
58	include/pdal/filters/HAGFilter.hpp	62	include/pdal/filters/HAGFilter.hpp
59	include/pdal/filters/IQRFilter.hpp	63	include/pdal/filters/IQRFilter.hpp
60	include/pdal/filters/KDistanceFilter.hpp	64	include/pdal/filters/KDistanceFilter.hpp
		65	include/pdal/filters/LocateFilter.hpp
61	include/pdal/filters/LOFFilter.hpp	66	include/pdal/filters/LOFFilter.hpp
62	include/pdal/filters/MADFilter.hpp	67	include/pdal/filters/MADFilter.hpp
63	include/pdal/filters/MergeFilter.hpp	68	include/pdal/filters/MergeFilter.hpp
Lines 65-70 Link Here
65	include/pdal/filters/MortonOrderFilter.hpp	70	include/pdal/filters/MortonOrderFilter.hpp
66	include/pdal/filters/NormalFilter.hpp	71	include/pdal/filters/NormalFilter.hpp
67	include/pdal/filters/OutlierFilter.hpp	72	include/pdal/filters/OutlierFilter.hpp
		73	include/pdal/filters/OverlayFilter.hpp
68	include/pdal/filters/PMFFilter.hpp	74	include/pdal/filters/PMFFilter.hpp
69	include/pdal/filters/RadialDensityFilter.hpp	75	include/pdal/filters/RadialDensityFilter.hpp
70	include/pdal/filters/RandomizeFilter.hpp	76	include/pdal/filters/RandomizeFilter.hpp
Lines 83-89 Link Here
83	include/pdal/io/BpfReader.hpp	89	include/pdal/io/BpfReader.hpp
84	include/pdal/io/BpfWriter.hpp	90	include/pdal/io/BpfWriter.hpp
85	include/pdal/io/BufferReader.hpp	91	include/pdal/io/BufferReader.hpp
86	include/pdal/io/DerivativeWriter.hpp
87	include/pdal/io/FauxReader.hpp	92	include/pdal/io/FauxReader.hpp
88	include/pdal/io/GDALGrid.hpp	93	include/pdal/io/GDALGrid.hpp
89	include/pdal/io/GDALReader.hpp	94	include/pdal/io/GDALReader.hpp
Lines 136-142 Link Here
136	include/pdal/pdal_test_main.hpp	141	include/pdal/pdal_test_main.hpp
137	include/pdal/pdal_types.hpp	142	include/pdal/pdal_types.hpp
138	include/pdal/plang/Array.hpp	143	include/pdal/plang/Array.hpp
139	include/pdal/plang/BufferedInvocation.hpp
140	include/pdal/plang/Environment.hpp	144	include/pdal/plang/Environment.hpp
141	include/pdal/plang/Invocation.hpp	145	include/pdal/plang/Invocation.hpp
142	include/pdal/plang/Redirector.hpp	146	include/pdal/plang/Redirector.hpp
Lines 150-155 Link Here
150	include/pdal/util/Georeference.hpp	154	include/pdal/util/Georeference.hpp
151	include/pdal/util/IStream.hpp	155	include/pdal/util/IStream.hpp
152	include/pdal/util/Inserter.hpp	156	include/pdal/util/Inserter.hpp
		157	include/pdal/util/NullOStream.hpp
153	include/pdal/util/OStream.hpp	158	include/pdal/util/OStream.hpp
154	include/pdal/util/ProgramArgs.hpp	159	include/pdal/util/ProgramArgs.hpp
155	include/pdal/util/Utils.hpp	160	include/pdal/util/Utils.hpp
Lines 159-194 Link Here
159	lib/libpdal_arbiter.a	164	lib/libpdal_arbiter.a
160	lib/libpdal_base.so	165	lib/libpdal_base.so
161	lib/libpdal_base.so.4	166	lib/libpdal_base.so.4
162	lib/libpdal_base.so.5.0.0	167	lib/libpdal_base.so.5.1.0
163	lib/libpdal_boost.a	168	lib/libpdal_boost.a
164	lib/libpdal_jsoncpp.a
165	%%PYTHON%%lib/libpdal_plang.so	169	%%PYTHON%%lib/libpdal_plang.so
166	%%PYTHON%%lib/libpdal_plang.so.4	170	%%PYTHON%%lib/libpdal_plang.so.4
167	%%PYTHON%%lib/libpdal_plang.so.5.0.0	171	%%PYTHON%%lib/libpdal_plang.so.5.1.0
168	%%PYTHON%%lib/libpdal_plugin_filter_predicate.so	172	%%PYTHON%%lib/libpdal_plugin_filter_predicate.so
169	%%PYTHON%%lib/libpdal_plugin_filter_predicate.so.4	173	%%PYTHON%%lib/libpdal_plugin_filter_predicate.so.4
170	%%PYTHON%%lib/libpdal_plugin_filter_predicate.so.5.0.0	174	%%PYTHON%%lib/libpdal_plugin_filter_predicate.so.5.1.0
171	%%PYTHON%%lib/libpdal_plugin_filter_programmable.so	175	%%PYTHON%%lib/libpdal_plugin_filter_programmable.so
172	%%PYTHON%%lib/libpdal_plugin_filter_programmable.so.4	176	%%PYTHON%%lib/libpdal_plugin_filter_programmable.so.4
173	%%PYTHON%%lib/libpdal_plugin_filter_programmable.so.5.0.0	177	%%PYTHON%%lib/libpdal_plugin_filter_programmable.so.5.1.0
174	%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so	178	%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so
175	%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.4	179	%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.4
176	%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.5.0.0	180	%%ICEBRIDGE%%lib/libpdal_plugin_reader_icebridge.so.5.1.0
177	%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so	181	%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so
178	%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.4	182	%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.4
179	%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.5.0.0	183	%%PGPOINTCLOUD%%lib/libpdal_plugin_reader_pgpointcloud.so.5.1.0
180	%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so	184	%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so
181	%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.4	185	%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.4
182	%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.5.0.0	186	%%SQLITE%%lib/libpdal_plugin_reader_sqlite.so.5.1.0
183	%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so	187	%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so
184	%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.4	188	%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.4
185	%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.5.0.0	189	%%PGPOINTCLOUD%%lib/libpdal_plugin_writer_pgpointcloud.so.5.1.0
186	%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so	190	%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so
187	%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.4	191	%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.4
188	%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.5.0.0	192	%%SQLITE%%lib/libpdal_plugin_writer_sqlite.so.5.1.0
189	lib/libpdal_util.so	193	lib/libpdal_util.so
190	lib/libpdal_util.so.4	194	lib/libpdal_util.so.4
191	lib/libpdal_util.so.5.0.0	195	lib/libpdal_util.so.5.1.0
192	lib/libpdalcpp.so	196	lib/libpdalcpp.so
193	lib/pdal/cmake/PDALConfig.cmake	197	lib/pdal/cmake/PDALConfig.cmake
194	lib/pdal/cmake/PDALConfigVersion.cmake	198	lib/pdal/cmake/PDALConfigVersion.cmake