- Update to 1.7.0

- Update my email

5 files changed, 106 insertions, 60 deletions

diff --git a/devel/liblas/Makefile b/devel/liblas/Makefile
index 4fc29a2ad4cb..43c566642c54 100644
--- a/devel/liblas/Makefile
+++ b/devel/liblas/Makefile
@@ -2,19 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	liblas
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.7.0
 CATEGORIES=	devel
-MASTER_SITES=	http://trac.liblas.org/raw-attachment/wiki/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+MASTER_SITES=	https://github.com/libLAS/libLAS/archive/
+DISTNAME=	${PORTVERSION}
 
-MAINTAINER=	wenheping@gmail.com
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Library For Reading And Writing LAS-Format Data
 
-USES=		gmake libtool
+BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs
+
+USES=		cmake libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-WRKSRC=		${WRKDIR}/liblas-src-${PORTVERSION}
+WRKSRC=		${WRKDIR}/libLAS-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/liblas/distinfo b/devel/liblas/distinfo
index 29c2a05a0900..f353c78cabdf 100644
--- a/devel/liblas/distinfo
+++ b/devel/liblas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (liblas-src-1.2.1.tar.gz) = 4ca62a3fb5cd638f8f2e16088e55016394b530af05f75f558d3a678bbb397ab3
-SIZE (liblas-src-1.2.1.tar.gz) = 438263
+SHA256 (1.7.0.tar.gz) = bcd9d326498f0d78d11e0d1abef6254ea21e9e387910df975be63cd866132093
+SIZE (1.7.0.tar.gz) = 10737551
diff --git a/devel/liblas/files/patch-src_las__c__api.cpp b/devel/liblas/files/patch-src_las__c__api.cpp
deleted file mode 100644
index d38933ba9c96..000000000000
--- a/devel/liblas/files/patch-src_las__c__api.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/las_c_api.cpp.orig	2009-10-02 17:01:59.000000000 +0000
-+++ src/las_c_api.cpp
-@@ -745,7 +745,7 @@ LAS_DLL LASErrorEnum LASHeader_SetProjec
- 
-     try {
-         liblas::guid id;
--        id = liblas::guid::guid(value);
-+        id = liblas::guid(value);
-         ((LASHeader*) hHeader)->SetProjectId(id);    
-     } catch (std::exception const& e)
-     {
-@@ -1542,7 +1542,7 @@ LAS_DLL LASGuidH LASGuid_CreateFromStrin
-     VALIDATE_LAS_POINTER1(string, "LASGuid_CreateFromString", NULL);    
-     liblas::guid id;
-     try {
--        id = liblas::guid::guid(string);
-+        id = liblas::guid(string);
-         return (LASGuidH) new liblas::guid(id);
-     }
-     catch (std::exception const& e) {
diff --git a/devel/liblas/pkg-descr b/devel/liblas/pkg-descr
index 17895fa7d78d..a889742242d4 100644
--- a/devel/liblas/pkg-descr
+++ b/devel/liblas/pkg-descr
@@ -3,4 +3,4 @@ libLAS is a BSD library for reading and writing ASPRS LAS version 1.0 and
 and the LAS format is a sequential binary format used to store data from
 sensors and as intermediate processing storage by some applications.
 
-WWW:   http://liblas.org/
+WWW: http://liblas.org/
diff --git a/devel/liblas/pkg-plist b/devel/liblas/pkg-plist
index a6b98c9b4ce0..60a06eba3368 100644
--- a/devel/liblas/pkg-plist
+++ b/devel/liblas/pkg-plist
@@ -1,45 +1,110 @@
 bin/las2las
+bin/las2las-old
 bin/las2txt
+bin/las2txt-old
+bin/lasblock
 bin/lasinfo
+bin/lasinfo-old
 bin/lasmerge
-bin/txt2las
 bin/liblas-config
-include/liblas/capi/liblas.h
-include/liblas/capi/las_version.h
+bin/ts2las
+bin/txt2las
+include/liblas/bounds.hpp
 include/liblas/capi/las_config.h
-include/liblas/cstdint.hpp
+include/liblas/capi/las_version.h
+include/liblas/capi/liblas.h
+include/liblas/chipper.hpp
+include/liblas/classification.hpp
+include/liblas/color.hpp
+include/liblas/compatibility.hpp
+include/liblas/detail/binary.hpp
 include/liblas/detail/endian.hpp
-include/liblas/detail/file.hpp
+include/liblas/detail/file_ptr_stream.hpp
 include/liblas/detail/fwd.hpp
-include/liblas/detail/reader.hpp
-include/liblas/detail/reader10.hpp
-include/liblas/detail/reader11.hpp
-include/liblas/detail/reader12.hpp
+include/liblas/detail/index/indexcell.hpp
+include/liblas/detail/index/indexoutput.hpp
+include/liblas/detail/opt_allocator.hpp
+include/liblas/detail/pointrecord.hpp
+include/liblas/detail/private_utility.hpp
+include/liblas/detail/reader/cachedreader.hpp
+include/liblas/detail/reader/header.hpp
+include/liblas/detail/reader/reader.hpp
+include/liblas/detail/reader/zipreader.hpp
 include/liblas/detail/sha1.hpp
-include/liblas/detail/sharedptr.hpp
+include/liblas/detail/singleton.hpp
 include/liblas/detail/timer.hpp
-include/liblas/detail/utility.hpp
-include/liblas/detail/writer.hpp
-include/liblas/detail/writer10.hpp
-include/liblas/detail/writer11.hpp
-include/liblas/detail/writer12.hpp
+include/liblas/detail/writer/header.hpp
+include/liblas/detail/writer/point.hpp
+include/liblas/detail/writer/writer.hpp
+include/liblas/detail/writer/zipwriter.hpp
+include/liblas/detail/zippoint.hpp
+include/liblas/dimension.hpp
+include/liblas/error.hpp
 include/liblas/exception.hpp
+include/liblas/export.hpp
+include/liblas/external/property_tree/detail/exception_implementation.hpp
+include/liblas/external/property_tree/detail/file_parser_error.hpp
+include/liblas/external/property_tree/detail/info_parser_error.hpp
+include/liblas/external/property_tree/detail/info_parser_read.hpp
+include/liblas/external/property_tree/detail/info_parser_utils.hpp
+include/liblas/external/property_tree/detail/info_parser_write.hpp
+include/liblas/external/property_tree/detail/info_parser_writer_settings.hpp
+include/liblas/external/property_tree/detail/json_parser_error.hpp
+include/liblas/external/property_tree/detail/json_parser_read.hpp
+include/liblas/external/property_tree/detail/json_parser_write.hpp
+include/liblas/external/property_tree/detail/ptree_implementation.hpp
+include/liblas/external/property_tree/detail/ptree_utils.hpp
+include/liblas/external/property_tree/detail/rapidxml.hpp
+include/liblas/external/property_tree/detail/xml_parser_error.hpp
+include/liblas/external/property_tree/detail/xml_parser_flags.hpp
+include/liblas/external/property_tree/detail/xml_parser_read_rapidxml.hpp
+include/liblas/external/property_tree/detail/xml_parser_utils.hpp
+include/liblas/external/property_tree/detail/xml_parser_write.hpp
+include/liblas/external/property_tree/detail/xml_parser_writer_settings.hpp
+include/liblas/external/property_tree/exceptions.hpp
+include/liblas/external/property_tree/id_translator.hpp
+include/liblas/external/property_tree/info_parser.hpp
+include/liblas/external/property_tree/ini_parser.hpp
+include/liblas/external/property_tree/json_parser.hpp
+include/liblas/external/property_tree/ptree.hpp
+include/liblas/external/property_tree/ptree_fwd.hpp
+include/liblas/external/property_tree/ptree_serialization.hpp
+include/liblas/external/property_tree/stream_translator.hpp
+include/liblas/external/property_tree/string_path.hpp
+include/liblas/external/property_tree/xml_parser.hpp
+include/liblas/factory.hpp
+include/liblas/filter.hpp
 include/liblas/guid.hpp
+include/liblas/header.hpp
+include/liblas/index.hpp
 include/liblas/iterator.hpp
-include/liblas/lascolor.hpp
-include/liblas/laserror.hpp
-include/liblas/lasfile.hpp
-include/liblas/lasheader.hpp
-include/liblas/laspoint.hpp
-include/liblas/lasreader.hpp
-include/liblas/lasspatialreference.hpp
-include/liblas/lasvariablerecord.hpp
-include/liblas/laswriter.hpp
 include/liblas/liblas.hpp
-lib/liblas.a
+include/liblas/point.hpp
+include/liblas/reader.hpp
+include/liblas/schema.hpp
+include/liblas/spatialreference.hpp
+include/liblas/transform.hpp
+include/liblas/utility.hpp
+include/liblas/variablerecord.hpp
+include/liblas/version.hpp
+include/liblas/writer.hpp
 lib/liblas.so
-lib/liblas.so.1
-lib/liblas.so.1.0.0
-@dirrm include/liblas/capi
-@dirrm include/liblas/detail
-@dirrm include/liblas
+lib/liblas.so.2.2.0
+lib/liblas_c.so
+lib/liblas_c.so.2.2.0
+%%DATADIR%%/doc/AUTHORS
+%%DATADIR%%/doc/COPYING
+%%DATADIR%%/doc/INSTALL
+%%DATADIR%%/doc/LICENSE.txt
+%%DATADIR%%/doc/README.txt
+@dirrmtry include/liblas/capi
+@dirrmtry include/liblas/detail/index
+@dirrmtry include/liblas/detail/reader
+@dirrmtry include/liblas/detail/writer
+@dirrmtry include/liblas/detail
+@dirrmtry include/liblas/external/property_tree/detail
+@dirrmtry include/liblas/external/property_tree
+@dirrmtry include/liblas/external
+@dirrmtry include/liblas
+@dirrmtry %%DATADIR%%/doc
+@dirrmtry %%DATADIR%%