Date: Sat, 21 Apr 2018 08:20:49 +0000 (UTC) From: Wen Heping <wen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467861 - in head/devel/liblas12: . files Message-ID: <201804210820.w3L8Knvs090848@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wen Date: Sat Apr 21 08:20:49 2018 New Revision: 467861 URL: https://svnweb.freebsd.org/changeset/ports/467861 Log: - Change naming scheme to solve conflict with devel/liblas - Bump PORTREVISION - Remove CONFLICTS= liblas-1.8* - Order USES= before other USE cases - Patch several source files PR: 225281 Submitted by: rhurlin@gwdg.de(maintainer) Added: head/devel/liblas12/files/patch-CMakeLists.txt (contents, props changed) head/devel/liblas12/files/patch-apps_CMakeLists.txt (contents, props changed) head/devel/liblas12/files/patch-apps_Makefile.am (contents, props changed) head/devel/liblas12/files/patch-apps_las2las12.c (contents, props changed) head/devel/liblas12/files/patch-apps_las2ogr12.cpp (contents, props changed) head/devel/liblas12/files/patch-apps_las2txt12.c (contents, props changed) head/devel/liblas12/files/patch-apps_lasdiff12.c (contents, props changed) head/devel/liblas12/files/patch-apps_lasinfo12.c (contents, props changed) head/devel/liblas12/files/patch-apps_lasmerge12.c (contents, props changed) head/devel/liblas12/files/patch-apps_liblas12-config.in (contents, props changed) head/devel/liblas12/files/patch-apps_txt2las12.c (contents, props changed) head/devel/liblas12/files/patch-configure.ac (contents, props changed) head/devel/liblas12/files/patch-include_Makefile.am (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_capi_liblas.h (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_file.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_reader.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_reader10.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_reader11.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_reader12.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_utility.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_writer.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_writer10.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_writer11.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_detail_writer12.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_guid.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_iterator.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_lascolor.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_lasfile.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_lasheader.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_laspoint.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_lasreader.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_lasspatialreference.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_lasvariablerecord.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_laswriter.hpp (contents, props changed) head/devel/liblas12/files/patch-include_liblas12_liblas.hpp (contents, props changed) head/devel/liblas12/files/patch-python_liblas_core.py (contents, props changed) head/devel/liblas12/files/patch-src_CMakeLists.txt (contents, props changed) head/devel/liblas12/files/patch-src_Makefile.am (contents, props changed) head/devel/liblas12/files/patch-src_detail_file.cpp (contents, props changed) head/devel/liblas12/files/patch-src_detail_reader.cpp (contents, props changed) head/devel/liblas12/files/patch-src_detail_reader10.cpp (contents, props changed) head/devel/liblas12/files/patch-src_detail_reader11.cpp (contents, props changed) head/devel/liblas12/files/patch-src_detail_reader12.cpp (contents, props changed) head/devel/liblas12/files/patch-src_detail_writer.cpp (contents, props changed) head/devel/liblas12/files/patch-src_detail_writer10.cpp (contents, props changed) head/devel/liblas12/files/patch-src_detail_writer11.cpp (contents, props changed) head/devel/liblas12/files/patch-src_detail_writer12.cpp (contents, props changed) head/devel/liblas12/files/patch-src_lascolor.cpp (contents, props changed) head/devel/liblas12/files/patch-src_laserror.cpp (contents, props changed) head/devel/liblas12/files/patch-src_lasfile.cpp (contents, props changed) head/devel/liblas12/files/patch-src_lasheader.cpp (contents, props changed) head/devel/liblas12/files/patch-src_laspoint.cpp (contents, props changed) head/devel/liblas12/files/patch-src_lasreader.cpp (contents, props changed) head/devel/liblas12/files/patch-src_lasspatialreference.cpp (contents, props changed) head/devel/liblas12/files/patch-src_lasvariablerecord.cpp (contents, props changed) head/devel/liblas12/files/patch-src_laswriter.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_Makefile.am (contents, props changed) head/devel/liblas12/files/patch-test_unit_common.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_common.hpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_guid__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_laserror__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_lasfile__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_lasheader__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_laspoint__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_lasreader__iterator__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_lasreader__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_lasspatialreference__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_lasvariablerecord__test.cpp (contents, props changed) head/devel/liblas12/files/patch-test_unit_laswriter__test.cpp (contents, props changed) Modified: head/devel/liblas12/Makefile head/devel/liblas12/distinfo head/devel/liblas12/files/patch-src_las__c__api.cpp head/devel/liblas12/pkg-plist Modified: head/devel/liblas12/Makefile ============================================================================== --- head/devel/liblas12/Makefile Sat Apr 21 08:08:27 2018 (r467860) +++ head/devel/liblas12/Makefile Sat Apr 21 08:20:49 2018 (r467861) @@ -3,6 +3,7 @@ PORTNAME= liblas12 PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= rhurlin@gwdg.de @@ -10,14 +11,23 @@ COMMENT= Library For Reading And Writing LAS-Format Da LICENSE= BSD2CLAUSE -CONFLICTS= liblas-1.8* +USES= autoreconf dos2unix gmake libtool +GNU_CONFIGURE= yes +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= libLAS GH_PROJECT= libLAS -USES= autoreconf gmake libtool -GNU_CONFIGURE= yes -USE_LDCONFIG= yes +pre-patch: + ${MV} ${WRKSRC}/include/liblas ${WRKSRC}/include/liblas12 + ${MV} ${WRKSRC}/apps/las2las.c ${WRKSRC}/apps/las2las12.c + ${MV} ${WRKSRC}/apps/las2ogr.cpp ${WRKSRC}/apps/las2ogr12.cpp + ${MV} ${WRKSRC}/apps/las2txt.c ${WRKSRC}/apps/las2txt12.c + ${MV} ${WRKSRC}/apps/lasdiff.c ${WRKSRC}/apps/lasdiff12.c + ${MV} ${WRKSRC}/apps/lasinfo.c ${WRKSRC}/apps/lasinfo12.c + ${MV} ${WRKSRC}/apps/lasmerge.c ${WRKSRC}/apps/lasmerge12.c + ${MV} ${WRKSRC}/apps/liblas-config.in ${WRKSRC}/apps/liblas12-config.in + ${MV} ${WRKSRC}/apps/txt2las.c ${WRKSRC}/apps/txt2las12.c .include <bsd.port.mk> Modified: head/devel/liblas12/distinfo ============================================================================== --- head/devel/liblas12/distinfo Sat Apr 21 08:08:27 2018 (r467860) +++ head/devel/liblas12/distinfo Sat Apr 21 08:20:49 2018 (r467861) @@ -1,2 +1,3 @@ +TIMESTAMP = 1524295718 SHA256 (libLAS-libLAS-1.2.1_GH0.tar.gz) = ad9fbc55d8a56cc3f5eec2a59dd1057ffbae02d8ec476e6fb9c94476c73b3440 SIZE (libLAS-libLAS-1.2.1_GH0.tar.gz) = 2327333 Added: head/devel/liblas12/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-CMakeLists.txt Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2018-04-21 08:12:47 UTC ++++ CMakeLists.txt +@@ -8,8 +8,8 @@ + # + PROJECT( libLAS ) + +-SET( LIBLAS_LIB_NAME liblas ) +-SET( LIBLAS_C_LIB_NAME liblas_c ) ++SET( LIBLAS_LIB_NAME liblas12 ) ++SET( LIBLAS_C_LIB_NAME liblas12_c ) + + ############################################################# + # CMake settings Added: head/devel/liblas12/files/patch-apps_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_CMakeLists.txt Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,36 @@ +--- apps/CMakeLists.txt.orig 2018-04-21 08:11:37 UTC ++++ apps/CMakeLists.txt +@@ -5,7 +5,7 @@ + INCLUDE_DIRECTORIES( + . + ../include +- ../include/liblas/capi ++ ../include/liblas12/capi + ) + + SET( LASINFO lasinfo ) +@@ -20,14 +20,14 @@ SET( LAS2TXT_SRC lascommon.c ${LAS2TXT}.c) + SET( TXT2LAS_SRC lascommon.c ${TXT2LAS}.c ) + SET( LASMERGE_SRC lascommon.c ${LASMERGE}.c ) + +-ADD_EXECUTABLE( ${LASINFO} ${LASINFO_SRC} ) +-ADD_EXECUTABLE( ${LAS2LAS} ${LAS2LAS_SRC} ) +-ADD_EXECUTABLE( ${LAS2TXT} ${LAS2TXT_SRC} ) +-ADD_EXECUTABLE( ${TXT2LAS} ${TXT2LAS_SRC} ) +-ADD_EXECUTABLE( ${LASMERGE} ${LASMERGE_SRC} ) ++ADD_EXECUTABLE( ${LASINFO}12 ${LASINFO_SRC} ) ++ADD_EXECUTABLE( ${LAS2LAS}12 ${LAS2LAS_SRC} ) ++ADD_EXECUTABLE( ${LAS2TXT}12 ${LAS2TXT_SRC} ) ++ADD_EXECUTABLE( ${TXT2LAS}12 ${TXT2LAS_SRC} ) ++ADD_EXECUTABLE( ${LASMERGE}12 ${LASMERGE_SRC} ) + +-TARGET_LINK_LIBRARIES( ${LASINFO} ${LIBLAS_C_LIB_NAME} ) +-TARGET_LINK_LIBRARIES( ${LAS2LAS} ${LIBLAS_C_LIB_NAME} ) +-TARGET_LINK_LIBRARIES( ${LAS2TXT} ${LIBLAS_C_LIB_NAME} ) +-TARGET_LINK_LIBRARIES( ${TXT2LAS} ${LIBLAS_C_LIB_NAME} ) +-TARGET_LINK_LIBRARIES( ${LASMERGE} ${LIBLAS_C_LIB_NAME} ) ++TARGET_LINK_LIBRARIES( ${LASINFO}12 ${LIBLAS_C_LIB_NAME} ) ++TARGET_LINK_LIBRARIES( ${LAS2LAS}12 ${LIBLAS_C_LIB_NAME} ) ++TARGET_LINK_LIBRARIES( ${LAS2TXT}12 ${LIBLAS_C_LIB_NAME} ) ++TARGET_LINK_LIBRARIES( ${TXT2LAS}12 ${LIBLAS_C_LIB_NAME} ) ++TARGET_LINK_LIBRARIES( ${LASMERGE}12 ${LIBLAS_C_LIB_NAME} ) Added: head/devel/liblas12/files/patch-apps_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_Makefile.am Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,36 @@ +--- apps/Makefile.am.orig 2009-10-02 17:48:41 UTC ++++ apps/Makefile.am +@@ -6,22 +6,22 @@ if GEOTIFF_IS_CONFIG + GEOTIFF_CPPFLAGS = @GEOTIFF_INC@ -DHAVE_LIBGEOTIFF=1 + endif + +-AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include/liblas/capi -I../include ++AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include/liblas12/capi -I../include + +-lasinfo_SOURCES = lasinfo.c lascommon.c +-las2las_SOURCES = las2las.c lascommon.c +-lasmerge_SOURCES = lasmerge.c lascommon.c +-las2txt_SOURCES = las2txt.c lascommon.c +-txt2las_SOURCES = txt2las.c ++lasinfo12_SOURCES = lasinfo12.c lascommon.c ++las2las12_SOURCES = las2las12.c lascommon.c ++lasmerge12_SOURCES = lasmerge12.c lascommon.c ++las2txt12_SOURCES = las2txt12.c lascommon.c ++txt2las12_SOURCES = txt2las12.c + + +-bin_PROGRAMS = lasinfo las2las lasmerge las2txt txt2las ++bin_PROGRAMS = lasinfo12 las2las12 lasmerge12 las2txt12 txt2las12 + +-bin_SCRIPTS = liblas-config ++bin_SCRIPTS = liblas12-config + + if GDAL_IS_CONFIG +-las2ogr_SOURCES = las2ogr.cpp +-bin_PROGRAMS += las2ogr ++las2ogr12_SOURCES = las2ogr12.cpp ++bin_PROGRAMS += las2ogr12 + endif + +-LDADD = ../src/liblas.la ++LDADD = ../src/liblas12.la Added: head/devel/liblas12/files/patch-apps_las2las12.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_las2las12.c Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,57 @@ +--- apps/las2las12.c.orig 2009-10-02 17:48:41 UTC ++++ apps/las2las12.c +@@ -32,44 +32,44 @@ void repair_header(FILE *file, LASHeaderH header, LASP + void usage() + { + fprintf(stderr,"----------------------------------------------------------\n"); +- fprintf(stderr," las2las (version %s) usage:\n", LAS_GetVersion()); ++ fprintf(stderr," las2las12 (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Clip las file to a bounding box, throwing out points that have invalid data:\n"); +- fprintf(stderr," las2las -i in.las -clip 63000000 483450000 63050000 483500000 -o out.las --skip_invalid\n"); ++ fprintf(stderr," las2las12 -i in.las -clip 63000000 483450000 63050000 483500000 -o out.las --skip_invalid\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Read from stdin, eliminate intensities below 2000, and write to stdout:\n"); +- fprintf(stderr," las2las --eliminate_intensity_below 2000 --stdin --stdout < in.las > out.las \n"); ++ fprintf(stderr," las2las12 --eliminate_intensity_below 2000 --stdin --stdout < in.las > out.las \n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Eliminate return number two:\n"); +- fprintf(stderr," las2las -i in.las -eliminate_return 2 -o out.las\n"); ++ fprintf(stderr," las2las12 -i in.las -eliminate_return 2 -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Eliminate scan angles above 15:\n"); +- fprintf(stderr," las2las -i in.las -eliminate_scan_angle_above 15 -o out.las\n"); ++ fprintf(stderr," las2las12 -i in.las -eliminate_scan_angle_above 15 -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Eliminate intensities below 1000:\n"); +- fprintf(stderr," las2las -i in.las -eliminate_intensity_below 1000 --stdout > out.las\n"); ++ fprintf(stderr," las2las12 -i in.las -eliminate_intensity_below 1000 --stdout > out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Eliminate intensities below 1000 and classifications that equal 2 (ground):\n"); +- fprintf(stderr," las2las -i in.las --eliminate_class 2 --out out.las\n"); ++ fprintf(stderr," las2las12 -i in.las --eliminate_class 2 --out out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Capture only first returns and clip to bounding box:\n"); +- fprintf(stderr," las2las -i in.las -first_only -clip 63000000 483450000 63050000 483500000 -o out.las\n"); ++ fprintf(stderr," las2las12 -i in.las -first_only -clip 63000000 483450000 63050000 483500000 -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Capture only last returns, eliminate intensities below 2000, and write to stdout:\n"); +- fprintf(stderr," las2las --input in.las --last_only --eliminate_intensity_below 2000 --stdout > out.las\n"); ++ fprintf(stderr," las2las12 --input in.las --last_only --eliminate_intensity_below 2000 --stdout > out.las\n"); + fprintf(stderr,"\n"); + + +- fprintf(stderr, "\nFor more information, see the full documentation for las2las at:\n" ++ fprintf(stderr, "\nFor more information, see the full documentation for las2las12 at:\n" + " http://liblas.org/browser/trunk/doc/las2las.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + Added: head/devel/liblas12/files/patch-apps_las2ogr12.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_las2ogr12.cpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,26 @@ +--- apps/las2ogr12.cpp.orig 2009-10-02 17:48:41 UTC ++++ apps/las2ogr12.cpp +@@ -14,10 +14,10 @@ + #include <vld.h> + #endif + // liblas +-#include <liblas/liblas.hpp> +-#include <liblas/laspoint.hpp> +-#include <liblas/lasreader.hpp> +-#include <liblas/cstdint.hpp> ++#include <liblas12/liblas.hpp> ++#include <liblas12/laspoint.hpp> ++#include <liblas12/lasreader.hpp> ++#include <liblas12/cstdint.hpp> + // ogr + #include <ogr_api.h> + //std +@@ -208,7 +208,7 @@ void report_ogr_formats(std::ostream& os) + + void usage() + { +- std::cerr << "Usage: las2ogr OPTIONS\nOptions are:\n" ++ std::cerr << "Usage: las2ogr12 OPTIONS\nOptions are:\n" + << "\t-h print this message\n" + << "\t-i <infile>\tinput ASPRS LAS file\n" + << "\t-o <outfile>\toutput file\n" Added: head/devel/liblas12/files/patch-apps_las2txt12.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_las2txt12.c Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,36 @@ +--- apps/las2txt12.c.orig 2009-10-02 17:48:41 UTC ++++ apps/las2txt12.c +@@ -23,20 +23,20 @@ void print_header(FILE *file, LASHeaderH header, const + void usage() + { + fprintf(stderr,"----------------------------------------------------------\n"); +- fprintf(stderr," las2txt (version %s) usage:\n", LAS_GetVersion()); ++ fprintf(stderr," las2txt12 (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Convert a las file to text on stdout:\n"); +- fprintf(stderr," las2txt lidar.las\n"); ++ fprintf(stderr," las2txt12 lidar.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Convert using stdin and stdout:\n"); +- fprintf(stderr," las2txt --stdin --stdout < lidar.las > lidar.txt\n"); ++ fprintf(stderr," las2txt12 --stdin --stdout < lidar.las > lidar.txt\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Convert to text with a specified format :\n"); +- fprintf(stderr," las2txt --parse xyziar lidar.las lidar.txt\n"); ++ fprintf(stderr," las2txt12 --parse xyziar lidar.las lidar.txt\n"); + fprintf(stderr,"\n"); + + +@@ -73,7 +73,7 @@ void usage() + fprintf(stderr," possible are 'percent', 'dollar', 'semicolon', 'komma',\n"); + fprintf(stderr," 'star', 'colon', or 'semicolon' as that special character.\n"); + +- fprintf(stderr, "\nFor more information, see the full documentation for las2txt at:\n" ++ fprintf(stderr, "\nFor more information, see the full documentation for las2txt12 at:\n" + " http://liblas.org/browser/trunk/doc/las2txt.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + Added: head/devel/liblas12/files/patch-apps_lasdiff12.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_lasdiff12.c Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,24 @@ +--- apps/lasdiff12.c.orig 2009-10-02 17:48:41 UTC ++++ apps/lasdiff12.c +@@ -26,15 +26,15 @@ + void usage() + { + fprintf(stderr,"----------------------------------------------------------\n"); +- fprintf(stderr," lasdiff (version %s) usage:\n", LAS_GetVersion()); ++ fprintf(stderr," lasdiff12 (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + +- fprintf(stderr,"lasdiff lidar1.las lidar2.las\n"); +- fprintf(stderr,"lasdiff lidar1.las lidar1.las.lz\n"); +- fprintf(stderr,"lasdiff -i lidar1.las -i lidar1.laz\n"); +- fprintf(stderr,"lasdiff -h\n"); +- fprintf(stderr, "\nFor more information, see the full documentation for lasdiff at:\n" ++ fprintf(stderr,"lasdiff12 lidar1.las lidar2.las\n"); ++ fprintf(stderr,"lasdiff12 lidar1.las lidar1.las.lz\n"); ++ fprintf(stderr,"lasdiff12 -i lidar1.las -i lidar1.laz\n"); ++ fprintf(stderr,"lasdiff12 -h\n"); ++ fprintf(stderr, "\nFor more information, see the full documentation for lasdiff12 at:\n" + " http://liblas.org/browser/trunk/doc/lasdiff.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + } Added: head/devel/liblas12/files/patch-apps_lasinfo12.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_lasinfo12.c Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,52 @@ +--- apps/lasinfo12.c.orig 2009-10-02 17:48:41 UTC ++++ apps/lasinfo12.c +@@ -31,40 +31,40 @@ void print_header(FILE *file, LASHeaderH header, const + void usage() + { + fprintf(stderr,"----------------------------------------------------------\n"); +- fprintf(stderr," lasinfo (version %s) usage:\n", LAS_GetVersion()); ++ fprintf(stderr," lasinfo12 (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Printing simple header info:\n"); +- fprintf(stderr," lasinfo lidar.las\n"); ++ fprintf(stderr," lasinfo12 lidar.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Checking point information:\n"); +- fprintf(stderr," lasinfo --input lidar.las --check\n"); ++ fprintf(stderr," lasinfo12 --input lidar.las --check\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Print header info and point summary and redirect output to a file:\n"); +- fprintf(stderr," lasinfo --check --input lidar.las 2> output.txt\n"); ++ fprintf(stderr," lasinfo12 --check --input lidar.las 2> output.txt\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Read from stdin, scan the points, and skip printing VLR info:\n"); +- fprintf(stderr," lasinfo --stdin --check --skip_vlr < lidar.las\n"); ++ fprintf(stderr," lasinfo12 --stdin --check --skip_vlr < lidar.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Repairing header info to reflect point data:\n"); +- fprintf(stderr," lasinfo -i lidar.las --repair\n"); ++ fprintf(stderr," lasinfo12 -i lidar.las --repair\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Altering header info:\n"); +- fprintf(stderr, " lasinfo -i lidar.las --system_identifier \"hello world!\" " ++ fprintf(stderr, " lasinfo12 -i lidar.las --system_identifier \"hello world!\" " + "--generating_software \"this is a test (-:\" --file_creation 8 2007\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Print this output:\n"); +- fprintf(stderr, " lasinfo --help\n"); ++ fprintf(stderr, " lasinfo12 --help\n"); + fprintf(stderr,"\n"); + +- fprintf(stderr, "\nFor more information, see the full documentation for lasinfo at:\n" ++ fprintf(stderr, "\nFor more information, see the full documentation for lasinfo12 at:\n" + " http://liblas.org/browser/trunk/doc/lasinfo.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + Added: head/devel/liblas12/files/patch-apps_lasmerge12.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_lasmerge12.c Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,51 @@ +--- apps/lasmerge12.c.orig 2009-10-02 17:48:41 UTC ++++ apps/lasmerge12.c +@@ -27,39 +27,39 @@ void usage() + { + + fprintf(stderr,"----------------------------------------------------------\n"); +- fprintf(stderr," lasmerge (version %s) usage:\n", LAS_GetVersion()); ++ fprintf(stderr," lasmerge12 (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge using a list of files:\n"); +- fprintf(stderr," lasmerge -i lasfiles.txt -o out.las\n"); ++ fprintf(stderr," lasmerge12 -i lasfiles.txt -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Manually list files to merge:\n"); +- fprintf(stderr," lasmerge -i file1.las -i file2.las -i file3.las -o out.las\n"); ++ fprintf(stderr," lasmerge12 -i file1.las -i file2.las -i file3.las -o out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge to stdout:\n"); +- fprintf(stderr," lasmerge -i file1.las -i file2.las --stdout\n"); ++ fprintf(stderr," lasmerge12 -i file1.las -i file2.las --stdout\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge and set scale:\n"); +- fprintf(stderr, " lasmerge --input lasfiles.txt --scale 0.01 --output out.las\n"); ++ fprintf(stderr, " lasmerge12 --input lasfiles.txt --scale 0.01 --output out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge and set scale individually:\n"); +- fprintf(stderr, " lasmerge --input lasfiles.txt --xyz_scale 0.01 0.01 0.1 --output out.las\n"); ++ fprintf(stderr, " lasmerge12 --input lasfiles.txt --xyz_scale 0.01 0.01 0.1 --output out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Merge and set offset individually:\n"); +- fprintf(stderr, " lasmerge --input lasfiles.txt --xyz_offset 0.01 0.01 0.1 --output out.las\n"); ++ fprintf(stderr, " lasmerge12 --input lasfiles.txt --xyz_offset 0.01 0.01 0.1 --output out.las\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Print this output:\n"); +- fprintf(stderr, " lasmerge --help\n"); ++ fprintf(stderr, " lasmerge12 --help\n"); + fprintf(stderr,"\n"); + +- fprintf(stderr, "For more information, see the full documentation for lasmerge at:\n" ++ fprintf(stderr, "For more information, see the full documentation for lasmerge12 at:\n" + " http://liblas.org/browser/trunk/doc/lasmerge.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + Added: head/devel/liblas12/files/patch-apps_liblas12-config.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_liblas12-config.in Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,11 @@ +--- apps/liblas12-config.in.orig 2009-10-02 17:48:41 UTC ++++ apps/liblas12-config.in +@@ -5,7 +5,7 @@ + usage() + { + cat <<EOF +-Usage: liblas-config [OPTIONS] ++Usage: liblas12-config [OPTIONS] + Options: + [--libs] + [--cflags] Added: head/devel/liblas12/files/patch-apps_txt2las12.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-apps_txt2las12.c Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,36 @@ +--- apps/txt2las12.c.orig 2009-10-02 17:48:41 UTC ++++ apps/txt2las12.c +@@ -24,20 +24,20 @@ void usage() + { + + fprintf(stderr,"----------------------------------------------------------\n"); +- fprintf(stderr," txt2las (version %s) usage:\n", LAS_GetVersion()); ++ fprintf(stderr," txt2las12 (version %s) usage:\n", LAS_GetVersion()); + fprintf(stderr,"----------------------------------------------------------\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Parse a text file with a given format:\n"); +- fprintf(stderr," txt2las -parse tsxyz lidar.txt\n"); ++ fprintf(stderr," txt2las12 -parse tsxyz lidar.txt\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Set the scale:\n"); +- fprintf(stderr," txt2las --parse xyz --scale 0.02 -i lidar.txt -o lidar.laz\n"); ++ fprintf(stderr," txt2las12 --parse xyz --scale 0.02 -i lidar.txt -o lidar.laz\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"Set the xyz scale:\n"); +- fprintf(stderr," txt2las --parse xsysz --verbose --xyz_scale 0.02 0.02 0.01 lidar.txt\n"); ++ fprintf(stderr," txt2las12 --parse xsysz --verbose --xyz_scale 0.02 0.02 0.01 lidar.txt\n"); + fprintf(stderr,"\n"); + + fprintf(stderr,"----------------------------------------------------------\n"); +@@ -74,7 +74,7 @@ void usage() + fprintf(stderr," or '-system_identifier \"Airborne One Leica 50,000 Hz\"'\n"); + fprintf(stderr," or '-generating_software \"TerraScan\"' are available too.\n"); + +- fprintf(stderr, "For more information, see the full documentation for txt2las at:\n" ++ fprintf(stderr, "For more information, see the full documentation for txt2las12 at:\n" + " http://liblas.org/browser/trunk/doc/txt2las.txt\n"); + fprintf(stderr,"----------------------------------------------------------\n"); + Added: head/devel/liblas12/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-configure.ac Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,11 @@ +--- configure.ac.orig 2009-10-02 17:48:41 UTC ++++ configure.ac +@@ -246,7 +246,7 @@ AC_CONFIG_FILES([ + include/Makefile + src/Makefile + apps/Makefile +- apps/liblas-config ++ apps/liblas12-config + test/Makefile + test/unit/Makefile + ]) Added: head/devel/liblas12/files/patch-include_Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_Makefile.am Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,70 @@ +--- include/Makefile.am.orig 2009-10-02 17:48:41 UTC ++++ include/Makefile.am +@@ -1,34 +1,34 @@ + lasdir = $(includedir) + +-nobase_las_HEADERS = liblas/cstdint.hpp \ +- liblas/exception.hpp \ +- liblas/guid.hpp \ +- liblas/iterator.hpp \ +- liblas/lascolor.hpp \ +- liblas/laserror.hpp \ +- liblas/lasfile.hpp \ +- liblas/lasheader.hpp \ +- liblas/laspoint.hpp \ +- liblas/lasreader.hpp \ +- liblas/lasvariablerecord.hpp \ +- liblas/lasspatialreference.hpp \ +- liblas/laswriter.hpp \ +- liblas/liblas.hpp \ +- liblas/capi/liblas.h \ +- liblas/capi/las_version.h \ +- liblas/capi/las_config.h \ +- liblas/detail/endian.hpp \ +- liblas/detail/file.hpp \ +- liblas/detail/fwd.hpp \ +- liblas/detail/reader.hpp \ +- liblas/detail/reader10.hpp \ +- liblas/detail/reader11.hpp \ +- liblas/detail/reader12.hpp \ +- liblas/detail/sha1.hpp \ +- liblas/detail/sharedptr.hpp \ +- liblas/detail/timer.hpp \ +- liblas/detail/utility.hpp \ +- liblas/detail/writer.hpp \ +- liblas/detail/writer10.hpp \ +- liblas/detail/writer11.hpp \ +- liblas/detail/writer12.hpp +\ No newline at end of file ++nobase_las_HEADERS = liblas12/cstdint.hpp \ ++ liblas12/exception.hpp \ ++ liblas12/guid.hpp \ ++ liblas12/iterator.hpp \ ++ liblas12/lascolor.hpp \ ++ liblas12/laserror.hpp \ ++ liblas12/lasfile.hpp \ ++ liblas12/lasheader.hpp \ ++ liblas12/laspoint.hpp \ ++ liblas12/lasreader.hpp \ ++ liblas12/lasvariablerecord.hpp \ ++ liblas12/lasspatialreference.hpp \ ++ liblas12/laswriter.hpp \ ++ liblas12/liblas.hpp \ ++ liblas12/capi/liblas.h \ ++ liblas12/capi/las_version.h \ ++ liblas12/capi/las_config.h \ ++ liblas12/detail/endian.hpp \ ++ liblas12/detail/file.hpp \ ++ liblas12/detail/fwd.hpp \ ++ liblas12/detail/reader.hpp \ ++ liblas12/detail/reader10.hpp \ ++ liblas12/detail/reader11.hpp \ ++ liblas12/detail/reader12.hpp \ ++ liblas12/detail/sha1.hpp \ ++ liblas12/detail/sharedptr.hpp \ ++ liblas12/detail/timer.hpp \ ++ liblas12/detail/utility.hpp \ ++ liblas12/detail/writer.hpp \ ++ liblas12/detail/writer10.hpp \ ++ liblas12/detail/writer11.hpp \ ++ liblas12/detail/writer12.hpp Added: head/devel/liblas12/files/patch-include_liblas12_capi_liblas.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_capi_liblas.h Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,11 @@ +--- include/liblas12/capi/liblas.h.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/capi/liblas.h +@@ -50,7 +50,7 @@ + #include "las_config.h" + + +-#include <liblas/cstdint.hpp> ++#include <liblas12/cstdint.hpp> + + + typedef struct LASWriterHS *LASWriterH; Added: head/devel/liblas12/files/patch-include_liblas12_detail_file.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_file.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,13 @@ +--- include/liblas12/detail/file.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/file.hpp +@@ -43,8 +43,8 @@ + #ifndef LIBLAS_DETAIL_FILE_HPP_INCLUDED + #define LIBLAS_DETAIL_FILE_HPP_INCLUDED + +-#include <liblas/lasreader.hpp> +-#include <liblas/laswriter.hpp> ++#include <liblas12/lasreader.hpp> ++#include <liblas12/laswriter.hpp> + #include <memory> + #include <string> + #include <fstream> Added: head/devel/liblas12/files/patch-include_liblas12_detail_reader.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_reader.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,15 @@ +--- include/liblas12/detail/reader.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/reader.hpp +@@ -42,9 +42,9 @@ + #ifndef LIBLAS_DETAIL_READER_HPP_INCLUDED + #define LIBLAS_DETAIL_READER_HPP_INCLUDED + +-#include <liblas/cstdint.hpp> +-#include <liblas/lasspatialreference.hpp> +-#include <liblas/detail/fwd.hpp> ++#include <liblas12/cstdint.hpp> ++#include <liblas12/lasspatialreference.hpp> ++#include <liblas12/detail/fwd.hpp> + + #ifndef HAVE_GDAL + typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH; Added: head/devel/liblas12/files/patch-include_liblas12_detail_reader10.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_reader10.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,13 @@ +--- include/liblas12/detail/reader10.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/reader10.hpp +@@ -42,8 +42,8 @@ + #ifndef LIBLAS_DETAIL_READER10_HPP_INCLUDED + #define LIBLAS_DETAIL_READER10_HPP_INCLUDED + +-#include <liblas/detail/reader.hpp> +-#include <liblas/detail/fwd.hpp> ++#include <liblas12/detail/reader.hpp> ++#include <liblas12/detail/fwd.hpp> + // std + #include <iosfwd> + Added: head/devel/liblas12/files/patch-include_liblas12_detail_reader11.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_reader11.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,13 @@ +--- include/liblas12/detail/reader11.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/reader11.hpp +@@ -42,8 +42,8 @@ + #ifndef LIBLAS_DETAIL_READER11_HPP_INCLUDED + #define LIBLAS_DETAIL_READER11_HPP_INCLUDED + +-#include <liblas/detail/reader.hpp> +-#include <liblas/detail/fwd.hpp> ++#include <liblas12/detail/reader.hpp> ++#include <liblas12/detail/fwd.hpp> + // std + #include <iosfwd> + Added: head/devel/liblas12/files/patch-include_liblas12_detail_reader12.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_reader12.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,13 @@ +--- include/liblas12/detail/reader12.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/reader12.hpp +@@ -42,8 +42,8 @@ + #ifndef LIBLAS_DETAIL_READER12_HPP_INCLUDED + #define LIBLAS_DETAIL_READER12_HPP_INCLUDED + +-#include <liblas/detail/reader.hpp> +-#include <liblas/detail/fwd.hpp> ++#include <liblas12/detail/reader.hpp> ++#include <liblas12/detail/fwd.hpp> + // std + #include <iosfwd> + Added: head/devel/liblas12/files/patch-include_liblas12_detail_utility.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_utility.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,13 @@ +--- include/liblas12/detail/utility.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/utility.hpp +@@ -42,8 +42,8 @@ + #ifndef LIBLAS_DETAIL_UTILITY_HPP_INCLUDED + #define LIBLAS_DETAIL_UTILITY_HPP_INCLUDED + +-#include <liblas/cstdint.hpp> +-#include <liblas/detail/endian.hpp> ++#include <liblas12/cstdint.hpp> ++#include <liblas12/detail/endian.hpp> + #include <algorithm> + #include <limits> + #include <sstream> Added: head/devel/liblas12/files/patch-include_liblas12_detail_writer.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_writer.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,15 @@ +--- include/liblas12/detail/writer.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/writer.hpp +@@ -42,9 +42,9 @@ + #ifndef LIBLAS_DETAIL_WRITER_HPP_INCLUDED + #define LIBLAS_DETAIL_WRITER_HPP_INCLUDED + +-#include <liblas/lasspatialreference.hpp> +-#include <liblas/detail/fwd.hpp> +-#include <liblas/detail/utility.hpp> ++#include <liblas12/lasspatialreference.hpp> ++#include <liblas12/detail/fwd.hpp> ++#include <liblas12/detail/utility.hpp> + + #ifndef HAVE_GDAL + typedef struct OGRCoordinateTransformationHS *OGRCoordinateTransformationH; Added: head/devel/liblas12/files/patch-include_liblas12_detail_writer10.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_writer10.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,15 @@ +--- include/liblas12/detail/writer10.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/writer10.hpp +@@ -42,9 +42,9 @@ + #ifndef LIBLAS_DETAIL_WRITER10_HPP_INCLUDED + #define LIBLAS_DETAIL_WRITER10_HPP_INCLUDED + +-#include <liblas/detail/writer.hpp> +-#include <liblas/detail/fwd.hpp> +-#include <liblas/cstdint.hpp> ++#include <liblas12/detail/writer.hpp> ++#include <liblas12/detail/fwd.hpp> ++#include <liblas12/cstdint.hpp> + // std + #include <iosfwd> + Added: head/devel/liblas12/files/patch-include_liblas12_detail_writer11.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_writer11.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,15 @@ +--- include/liblas12/detail/writer11.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/writer11.hpp +@@ -42,9 +42,9 @@ + #ifndef LIBLAS_DETAIL_WRITER11_HPP_INCLUDED + #define LIBLAS_DETAIL_WRITER11_HPP_INCLUDED + +-#include <liblas/detail/writer.hpp> +-#include <liblas/detail/fwd.hpp> +-#include <liblas/cstdint.hpp> ++#include <liblas12/detail/writer.hpp> ++#include <liblas12/detail/fwd.hpp> ++#include <liblas12/cstdint.hpp> + // std + #include <iosfwd> + Added: head/devel/liblas12/files/patch-include_liblas12_detail_writer12.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_detail_writer12.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,15 @@ +--- include/liblas12/detail/writer12.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/detail/writer12.hpp +@@ -42,9 +42,9 @@ + #ifndef LIBLAS_DETAIL_WRITER12_HPP_INCLUDED + #define LIBLAS_DETAIL_WRITER12_HPP_INCLUDED + +-#include <liblas/detail/writer.hpp> +-#include <liblas/detail/fwd.hpp> +-#include <liblas/cstdint.hpp> ++#include <liblas12/detail/writer.hpp> ++#include <liblas12/detail/fwd.hpp> ++#include <liblas12/cstdint.hpp> + // std + #include <iosfwd> + Added: head/devel/liblas12/files/patch-include_liblas12_guid.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_guid.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,15 @@ +--- include/liblas12/guid.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/guid.hpp +@@ -59,9 +59,9 @@ + #ifndef LIBLAS_GUID_HPP_INCLUDED + #define LIBLAS_GUID_HPP_INCLUDED + +-#include <liblas/cstdint.hpp> +-#include <liblas/detail/sha1.hpp> +-#include <liblas/detail/utility.hpp> ++#include <liblas12/cstdint.hpp> ++#include <liblas12/detail/sha1.hpp> ++#include <liblas12/detail/utility.hpp> + #include <iosfwd> + #include <iomanip> + #include <algorithm> Added: head/devel/liblas12/files/patch-include_liblas12_iterator.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_iterator.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,13 @@ +--- include/liblas12/iterator.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/iterator.hpp +@@ -42,8 +42,8 @@ + #ifndef LIBLAS_ITERATOR_HPP_INCLUDED + #define LIBLAS_ITERATOR_HPP_INCLUDED + +-#include <liblas/lasreader.hpp> +-#include <liblas/laswriter.hpp> ++#include <liblas12/lasreader.hpp> ++#include <liblas12/laswriter.hpp> + #include <iterator> + #include <cassert> + Added: head/devel/liblas12/files/patch-include_liblas12_lascolor.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_lascolor.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,15 @@ +--- include/liblas12/lascolor.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/lascolor.hpp +@@ -42,9 +42,9 @@ + #ifndef LIBLAS_LASCOLOR_HPP_INCLUDED + #define LIBLAS_LASCOLOR_HPP_INCLUDED + +-#include <liblas/cstdint.hpp> +-#include <liblas/detail/fwd.hpp> +-#include <liblas/detail/utility.hpp> ++#include <liblas12/cstdint.hpp> ++#include <liblas12/detail/fwd.hpp> ++#include <liblas12/detail/utility.hpp> + // std + #include <stdexcept> // std::out_of_range + #include <cstdlib> // std::size_t Added: head/devel/liblas12/files/patch-include_liblas12_lasfile.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_lasfile.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,13 @@ +--- include/liblas12/lasfile.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/lasfile.hpp +@@ -43,8 +43,8 @@ + #ifndef LIBLAS_LASFILE_HPP_INCLUDED + #define LIBLAS_LASFILE_HPP_INCLUDED + +-#include <liblas/detail/file.hpp> // complete type required +-#include <liblas/detail/sharedptr.hpp> ++#include <liblas12/detail/file.hpp> // complete type required ++#include <liblas12/detail/sharedptr.hpp> + #include <string> + #include <cassert> + Added: head/devel/liblas12/files/patch-include_liblas12_lasheader.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_lasheader.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,21 @@ +--- include/liblas12/lasheader.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/lasheader.hpp +@@ -43,12 +43,12 @@ + #ifndef LIBLAS_LASHEADER_HPP_INCLUDED + #define LIBLAS_LASHEADER_HPP_INCLUDED + +-#include <liblas/lasvariablerecord.hpp> +-#include <liblas/lasspatialreference.hpp> +-#include <liblas/cstdint.hpp> +-#include <liblas/guid.hpp> +-#include <liblas/detail/utility.hpp> +-#include <liblas/detail/fwd.hpp> ++#include <liblas12/lasvariablerecord.hpp> ++#include <liblas12/lasspatialreference.hpp> ++#include <liblas12/cstdint.hpp> ++#include <liblas12/guid.hpp> ++#include <liblas12/detail/utility.hpp> ++#include <liblas12/detail/fwd.hpp> + + //std + #include <string> Added: head/devel/liblas12/files/patch-include_liblas12_laspoint.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_laspoint.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,17 @@ +--- include/liblas12/laspoint.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/laspoint.hpp +@@ -42,10 +42,10 @@ + #ifndef LIBLAS_LASPOINT_HPP_INCLUDED + #define LIBLAS_LASPOINT_HPP_INCLUDED + +-#include <liblas/cstdint.hpp> +-#include <liblas/detail/fwd.hpp> +-#include <liblas/detail/utility.hpp> +-#include <liblas/lascolor.hpp> ++#include <liblas12/cstdint.hpp> ++#include <liblas12/detail/fwd.hpp> ++#include <liblas12/detail/utility.hpp> ++#include <liblas12/lascolor.hpp> + // std + #include <stdexcept> // std::out_of_range + #include <cstdlib> // std::size_t Added: head/devel/liblas12/files/patch-include_liblas12_lasreader.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_lasreader.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,19 @@ +--- include/liblas12/lasreader.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/lasreader.hpp +@@ -43,11 +43,11 @@ + #ifndef LIBLAS_LASREADER_HPP_INCLUDED + #define LIBLAS_LASREADER_HPP_INCLUDED + +-#include <liblas/lasheader.hpp> +-#include <liblas/laspoint.hpp> +-#include <liblas/lasvariablerecord.hpp> +-#include <liblas/lasspatialreference.hpp> +-#include <liblas/detail/fwd.hpp> ++#include <liblas12/lasheader.hpp> ++#include <liblas12/laspoint.hpp> ++#include <liblas12/lasvariablerecord.hpp> ++#include <liblas12/lasspatialreference.hpp> ++#include <liblas12/detail/fwd.hpp> + // std + #include <iosfwd> + #include <string> Added: head/devel/liblas12/files/patch-include_liblas12_lasspatialreference.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_lasspatialreference.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,21 @@ +--- include/liblas12/lasspatialreference.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/lasspatialreference.hpp +@@ -42,12 +42,12 @@ + #ifndef LIBLAS_LASSPATIALREFERENCE_HPP_INCLUDED + #define LIBLAS_LASSPATIALREFERENCE_HPP_INCLUDED + +-#include <liblas/lasvariablerecord.hpp> +-#include <liblas/cstdint.hpp> +-#include <liblas/detail/fwd.hpp> +-#include <liblas/detail/utility.hpp> +-#include <liblas/exception.hpp> +-#include <liblas/capi/las_config.h> ++#include <liblas12/lasvariablerecord.hpp> ++#include <liblas12/cstdint.hpp> ++#include <liblas12/detail/fwd.hpp> ++#include <liblas12/detail/utility.hpp> ++#include <liblas12/exception.hpp> ++#include <liblas12/capi/las_config.h> + + // GDAL OSR + #ifdef HAVE_GDAL Added: head/devel/liblas12/files/patch-include_liblas12_lasvariablerecord.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_lasvariablerecord.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,11 @@ +--- include/liblas12/lasvariablerecord.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/lasvariablerecord.hpp +@@ -43,7 +43,7 @@ + #ifndef LIBLAS_LASVARIABLERECORD_HPP_INCLUDED + #define LIBLAS_LASVARIABLERECORD_HPP_INCLUDED + +-#include <liblas/cstdint.hpp> ++#include <liblas12/cstdint.hpp> + // std + #include <string> + #include <vector> Added: head/devel/liblas12/files/patch-include_liblas12_laswriter.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_laswriter.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,15 @@ +--- include/liblas12/laswriter.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/laswriter.hpp +@@ -42,9 +42,9 @@ + #ifndef LIBLAS_LASWRITER_HPP_INCLUDED + #define LIBLAS_LASWRITER_HPP_INCLUDED + +-#include <liblas/lasheader.hpp> +-#include <liblas/laspoint.hpp> +-#include <liblas/detail/fwd.hpp> ++#include <liblas12/lasheader.hpp> ++#include <liblas12/laspoint.hpp> ++#include <liblas12/detail/fwd.hpp> + // std + #include <iosfwd> // std::ostream + #include <string> Added: head/devel/liblas12/files/patch-include_liblas12_liblas.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-include_liblas12_liblas.hpp Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,11 @@ +--- include/liblas12/liblas.hpp.orig 2009-10-02 17:48:41 UTC ++++ include/liblas12/liblas.hpp +@@ -45,7 +45,7 @@ + #ifndef LIBLAS_HPP_INCLUDED + #define LIBLAS_HPP_INCLUDED + +-#include <liblas/cstdint.hpp> ++#include <liblas12/cstdint.hpp> + #include <fstream> + #include <string> + Added: head/devel/liblas12/files/patch-python_liblas_core.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-python_liblas_core.py Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,11 @@ +--- python/liblas/core.py.orig 2009-10-02 17:48:41 UTC ++++ python/liblas/core.py +@@ -131,7 +131,7 @@ elif os.name == 'posix': + lib_name = 'liblas.dylib' + free = ctypes.CDLL(find_library('libc')).free + else: +- lib_name = 'liblas.so' ++ lib_name = 'liblas12.so' + free = ctypes.CDLL(find_library('libc.so.6')).free + las = ctypes.CDLL(lib_name) + else: Added: head/devel/liblas12/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblas12/files/patch-src_CMakeLists.txt Sat Apr 21 08:20:49 2018 (r467861) @@ -0,0 +1,85 @@ +--- src/CMakeLists.txt.orig 2018-04-21 08:08:39 UTC ++++ src/CMakeLists.txt +@@ -3,40 +3,40 @@ + # Build the libLAS library subproject + # + +-SET( LIBLAS_INCLUDE_DIR ../include/liblas ) ++SET( LIBLAS_INCLUDE_DIR ../include/liblas12 ) + + SET( LIBLAS_HPP +- ../include/liblas/cstdint.hpp +- ../include/liblas/guid.hpp +- ../include/liblas/iterator.hpp +- ../include/liblas/laserror.hpp +- ../include/liblas/lasfile.hpp +- ../include/liblas/lasheader.hpp +- ../include/liblas/laspoint.hpp +- ../include/liblas/lasvariablerecord.hpp +- ../include/liblas/lasreader.hpp +- ../include/liblas/lasvariablerecord.hpp +- ../include/liblas/laswriter.hpp +- ../include/liblas/liblas.hpp +- ../include/liblas/lasspatialreference.hpp ++ ../include/liblas12/cstdint.hpp ++ ../include/liblas12/guid.hpp ++ ../include/liblas12/iterator.hpp ++ ../include/liblas12/laserror.hpp ++ ../include/liblas12/lasfile.hpp ++ ../include/liblas12/lasheader.hpp ++ ../include/liblas12/laspoint.hpp ++ ../include/liblas12/lasvariablerecord.hpp ++ ../include/liblas12/lasreader.hpp ++ ../include/liblas12/lasvariablerecord.hpp ++ ../include/liblas12/laswriter.hpp ++ ../include/liblas12/liblas.hpp ++ ../include/liblas12/lasspatialreference.hpp + ) + + SET( LIBLAS_DETAIL_HPP +- ../include/liblas/detail/endian.hpp +- ../include/liblas/detail/file.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/sha1.hpp +- ../include/liblas/detail/sharedptr.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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804210820.w3L8Knvs090848>