diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2022-06-21 10:51:04 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-06-21 10:51:04 +0000 |
| commit | 894f1384625af540d0b8b56cf7495f30d35c2606 (patch) | |
| tree | c6b186b3b9db7920cc459df576c3a8764ae24367 | |
| parent | ed74055286fbeb8aaa74b951b1476e7574d939e9 (diff) | |
| download | ports-894f138.tar.gz ports-894f138.zip | |
cleanup: Remove expired ports:
2022-06-20 devel/liblas12: Previously only required by math/saga (now superseeded by math/pdal)
76 files changed, 1 insertions, 1552 deletions
@@ -17204,3 +17204,4 @@ databases/py-arrow|databases/py-apache-arrow|2022-06-12|Rename to avoid conflict science/szip|science/libaec|2022-06-16|Remove obsoleted port. Use science/libaec instead net/pfinger||2022-06-17|Has expired: Unmaintained and dead upstream, consider base fingerd biology/mopac|science/mopac|2022-06-19|Move to a proper category +devel/liblas12||2022-06-21|Has expired: Previously only required by math/saga (now superseeded by math/pdal) diff --git a/devel/Makefile b/devel/Makefile index 837a867a9262..fa7de6c96cef 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1301,7 +1301,6 @@ SUBDIR += libklel SUBDIR += liblangtag SUBDIR += liblas - SUBDIR += liblas12 SUBDIR += liblnk SUBDIR += liblockfile SUBDIR += liblogging diff --git a/devel/liblas12/Makefile b/devel/liblas12/Makefile deleted file mode 100644 index 9b0ec29abf62..000000000000 --- a/devel/liblas12/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# Created by: Wen Heping <wenheping@gmail.com> - -PORTNAME= liblas12 -PORTVERSION= 1.2.1 -PORTREVISION= 2 -CATEGORIES= devel - -MAINTAINER= rhurlin@FreeBSD.org -COMMENT= Library For Reading And Writing LAS-Format Data - -LICENSE= BSD3CLAUSE BSL MIT -LICENSE_COMB= multi -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -DEPRECATED= Previously only required by math/saga (now superseeded by math/pdal) -EXPIRATION_DATE=2022-06-20 - -USES= autoreconf dos2unix gmake libtool -GNU_CONFIGURE= yes -USE_LDCONFIG= yes - -USE_GITHUB= yes -GH_ACCOUNT= libLAS -GH_PROJECT= libLAS - -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> diff --git a/devel/liblas12/distinfo b/devel/liblas12/distinfo deleted file mode 100644 index 504d30b237c0..000000000000 --- a/devel/liblas12/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1524295718 -SHA256 (libLAS-libLAS-1.2.1_GH0.tar.gz) = ad9fbc55d8a56cc3f5eec2a59dd1057ffbae02d8ec476e6fb9c94476c73b3440 -SIZE (libLAS-libLAS-1.2.1_GH0.tar.gz) = 2327333 diff --git a/devel/liblas12/files/patch-CMakeLists.txt b/devel/liblas12/files/patch-CMakeLists.txt deleted file mode 100644 index 041a4a1c0fc4..000000000000 --- a/devel/liblas12/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 diff --git a/devel/liblas12/files/patch-apps_CMakeLists.txt b/devel/liblas12/files/patch-apps_CMakeLists.txt deleted file mode 100644 index a521a9336638..000000000000 --- a/devel/liblas12/files/patch-apps_CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ ---- 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} ) diff --git a/devel/liblas12/files/patch-apps_Makefile.am b/devel/liblas12/files/patch-apps_Makefile.am deleted file mode 100644 index 0eb7c0a8defd..000000000000 --- a/devel/liblas12/files/patch-apps_Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ ---- 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 diff --git a/devel/liblas12/files/patch-apps_las2las12.c b/devel/liblas12/files/patch-apps_las2las12.c deleted file mode 100644 index 43d4f6ad5aa4..000000000000 --- a/devel/liblas12/files/patch-apps_las2las12.c +++ /dev/null @@ -1,57 +0,0 @@ ---- 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"); - diff --git a/devel/liblas12/files/patch-apps_las2ogr12.cpp b/devel/liblas12/files/patch-apps_las2ogr12.cpp deleted file mode 100644 index bfaffc24af3c..000000000000 --- a/devel/liblas12/files/patch-apps_las2ogr12.cpp +++ /dev/null @@ -1,26 +0,0 @@ ---- 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" diff --git a/devel/liblas12/files/patch-apps_las2txt12.c b/devel/liblas12/files/patch-apps_las2txt12.c deleted file mode 100644 index 0c6302576e4f..000000000000 --- a/devel/liblas12/files/patch-apps_las2txt12.c +++ /dev/null @@ -1,36 +0,0 @@ ---- 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"); - diff --git a/devel/liblas12/files/patch-apps_lasdiff12.c b/devel/liblas12/files/patch-apps_lasdiff12.c deleted file mode 100644 index 7bffbc625b7c..000000000000 --- a/devel/liblas12/files/patch-apps_lasdiff12.c +++ /dev/null @@ -1,24 +0,0 @@ ---- 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"); - } diff --git a/devel/liblas12/files/patch-apps_lasinfo12.c b/devel/liblas12/files/patch-apps_lasinfo12.c deleted file mode 100644 index fcbc00c7c43c..000000000000 --- a/devel/liblas12/files/patch-apps_lasinfo12.c +++ /dev/null @@ -1,52 +0,0 @@ ---- 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"); - diff --git a/devel/liblas12/files/patch-apps_lasmerge12.c b/devel/liblas12/files/patch-apps_lasmerge12.c deleted file mode 100644 index 6ca4691631b5..000000000000 --- a/devel/liblas12/files/patch-apps_lasmerge12.c +++ /dev/null @@ -1,51 +0,0 @@ ---- 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"); - diff --git a/devel/liblas12/files/patch-apps_liblas12-config.in b/devel/liblas12/files/patch-apps_liblas12-config.in deleted file mode 100644 index d663cf830046..000000000000 --- a/devel/liblas12/files/patch-apps_liblas12-config.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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] diff --git a/devel/liblas12/files/patch-apps_txt2las12.c b/devel/liblas12/files/patch-apps_txt2las12.c deleted file mode 100644 index 4bf9d81d11d3..000000000000 --- a/devel/liblas12/files/patch-apps_txt2las12.c +++ /dev/null @@ -1,36 +0,0 @@ ---- 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"); - diff --git a/devel/liblas12/files/patch-configure.ac b/devel/liblas12/files/patch-configure.ac deleted file mode 100644 index ce7869307beb..000000000000 --- a/devel/liblas12/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - ]) diff --git a/devel/liblas12/files/patch-include_Makefile.am b/devel/liblas12/files/patch-include_Makefile.am deleted file mode 100644 index 7ec2336ba87d..000000000000 --- a/devel/liblas12/files/patch-include_Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ ---- 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 diff --git a/devel/liblas12/files/patch-include_liblas12_capi_liblas.h b/devel/liblas12/files/patch-include_liblas12_capi_liblas.h deleted file mode 100644 index 04267fa15215..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_capi_liblas.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; diff --git a/devel/liblas12/files/patch-include_liblas12_detail_file.hpp b/devel/liblas12/files/patch-include_liblas12_detail_file.hpp deleted file mode 100644 index c077e7c9e46d..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_file.hpp +++ /dev/null @@ -1,13 +0,0 @@ ---- 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> diff --git a/devel/liblas12/files/patch-include_liblas12_detail_reader.hpp b/devel/liblas12/files/patch-include_liblas12_detail_reader.hpp deleted file mode 100644 index 2208b4188e27..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_reader.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- 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; diff --git a/devel/liblas12/files/patch-include_liblas12_detail_reader10.hpp b/devel/liblas12/files/patch-include_liblas12_detail_reader10.hpp deleted file mode 100644 index 7bcdab494e9c..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_reader10.hpp +++ /dev/null @@ -1,13 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-include_liblas12_detail_reader11.hpp b/devel/liblas12/files/patch-include_liblas12_detail_reader11.hpp deleted file mode 100644 index b93319b0c895..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_reader11.hpp +++ /dev/null @@ -1,13 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-include_liblas12_detail_reader12.hpp b/devel/liblas12/files/patch-include_liblas12_detail_reader12.hpp deleted file mode 100644 index 574d84a6e9b3..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_reader12.hpp +++ /dev/null @@ -1,13 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-include_liblas12_detail_utility.hpp b/devel/liblas12/files/patch-include_liblas12_detail_utility.hpp deleted file mode 100644 index 1e7b06563aac..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_utility.hpp +++ /dev/null @@ -1,13 +0,0 @@ ---- 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> diff --git a/devel/liblas12/files/patch-include_liblas12_detail_writer.hpp b/devel/liblas12/files/patch-include_liblas12_detail_writer.hpp deleted file mode 100644 index 606d03941827..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_writer.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- 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; diff --git a/devel/liblas12/files/patch-include_liblas12_detail_writer10.hpp b/devel/liblas12/files/patch-include_liblas12_detail_writer10.hpp deleted file mode 100644 index 08ce8cec7492..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_writer10.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-include_liblas12_detail_writer11.hpp b/devel/liblas12/files/patch-include_liblas12_detail_writer11.hpp deleted file mode 100644 index a6bed9bea476..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_writer11.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-include_liblas12_detail_writer12.hpp b/devel/liblas12/files/patch-include_liblas12_detail_writer12.hpp deleted file mode 100644 index a52603848af7..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_detail_writer12.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-include_liblas12_guid.hpp b/devel/liblas12/files/patch-include_liblas12_guid.hpp deleted file mode 100644 index fcc9e2c5edd8..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_guid.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- 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> diff --git a/devel/liblas12/files/patch-include_liblas12_iterator.hpp b/devel/liblas12/files/patch-include_liblas12_iterator.hpp deleted file mode 100644 index c0b3cc9b3c41..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_iterator.hpp +++ /dev/null @@ -1,13 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-include_liblas12_lascolor.hpp b/devel/liblas12/files/patch-include_liblas12_lascolor.hpp deleted file mode 100644 index 7d838c6b8eab..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_lascolor.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 diff --git a/devel/liblas12/files/patch-include_liblas12_lasfile.hpp b/devel/liblas12/files/patch-include_liblas12_lasfile.hpp deleted file mode 100644 index fbfd177a3009..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_lasfile.hpp +++ /dev/null @@ -1,13 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-include_liblas12_lasheader.hpp b/devel/liblas12/files/patch-include_liblas12_lasheader.hpp deleted file mode 100644 index 0757e980dfb9..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_lasheader.hpp +++ /dev/null @@ -1,21 +0,0 @@ ---- 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> diff --git a/devel/liblas12/files/patch-include_liblas12_laspoint.hpp b/devel/liblas12/files/patch-include_liblas12_laspoint.hpp deleted file mode 100644 index 811330e25c8b..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_laspoint.hpp +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 diff --git a/devel/liblas12/files/patch-include_liblas12_lasreader.hpp b/devel/liblas12/files/patch-include_liblas12_lasreader.hpp deleted file mode 100644 index df64b462189e..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_lasreader.hpp +++ /dev/null @@ -1,19 +0,0 @@ ---- 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> diff --git a/devel/liblas12/files/patch-include_liblas12_lasspatialreference.hpp b/devel/liblas12/files/patch-include_liblas12_lasspatialreference.hpp deleted file mode 100644 index eb29e3fad715..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_lasspatialreference.hpp +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 diff --git a/devel/liblas12/files/patch-include_liblas12_lasvariablerecord.hpp b/devel/liblas12/files/patch-include_liblas12_lasvariablerecord.hpp deleted file mode 100644 index 39259cef354a..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_lasvariablerecord.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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> diff --git a/devel/liblas12/files/patch-include_liblas12_laswriter.hpp b/devel/liblas12/files/patch-include_liblas12_laswriter.hpp deleted file mode 100644 index eb54cd0e2a00..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_laswriter.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- 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> diff --git a/devel/liblas12/files/patch-include_liblas12_liblas.hpp b/devel/liblas12/files/patch-include_liblas12_liblas.hpp deleted file mode 100644 index 927a0cb81880..000000000000 --- a/devel/liblas12/files/patch-include_liblas12_liblas.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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> - diff --git a/devel/liblas12/files/patch-python_liblas_core.py b/devel/liblas12/files/patch-python_liblas_core.py deleted file mode 100644 index 44fe9ab55180..000000000000 --- a/devel/liblas12/files/patch-python_liblas_core.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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: diff --git a/devel/liblas12/files/patch-src_CMakeLists.txt b/devel/liblas12/files/patch-src_CMakeLists.txt deleted file mode 100644 index f50fcfd01427..000000000000 --- a/devel/liblas12/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,85 +0,0 @@ ---- 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 -- ../include/liblas/detail/writer12.hpp -+ ../include/liblas12/detail/endian.hpp -+ ../include/liblas12/detail/file.hpp -+ ../include/liblas12/detail/fwd.hpp -+ ../include/liblas12/detail/reader.hpp -+ ../include/liblas12/detail/reader10.hpp -+ ../include/liblas12/detail/reader11.hpp -+ ../include/liblas12/detail/reader12.hpp -+ ../include/liblas12/detail/sha1.hpp -+ ../include/liblas12/detail/sharedptr.hpp -+ ../include/liblas12/detail/timer.hpp -+ ../include/liblas12/detail/utility.hpp -+ ../include/liblas12/detail/writer.hpp -+ ../include/liblas12/detail/writer10.hpp -+ ../include/liblas12/detail/writer11.hpp -+ ../include/liblas12/detail/writer12.hpp - ) - - SET( LIBLAS_CPP -@@ -70,9 +70,9 @@ SET( LIBLAS_SOURCES - ) - - SET( LIBLAS_C_SOURCES -- ../include/liblas/capi/las_config.h -- ../include/liblas/capi/las_version.h -- ../include/liblas/capi/liblas.h -+ ../include/liblas12/capi/las_config.h -+ ../include/liblas12/capi/las_version.h -+ ../include/liblas12/capi/liblas.h - las_c_api.cpp - ) - diff --git a/devel/liblas12/files/patch-src_Makefile.am b/devel/liblas12/files/patch-src_Makefile.am deleted file mode 100644 index 32944b80ffd2..000000000000 --- a/devel/liblas12/files/patch-src_Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ ---- src/Makefile.am.orig 2009-10-02 17:48:41 UTC -+++ src/Makefile.am -@@ -11,9 +11,9 @@ endif - - AM_CPPFLAGS = $(GEOTIFF_CPPFLAGS) $(GDAL_CPPFLAGS) -I../include -I../include/detail - --lib_LTLIBRARIES = liblas.la -+lib_LTLIBRARIES = liblas12.la - --liblas_la_SOURCES = \ -+liblas12_la_SOURCES = \ - laserror.cpp \ - laspoint.cpp \ - lasheader.cpp \ -@@ -35,7 +35,7 @@ liblas_la_SOURCES = \ - detail/file.cpp - - if GDAL_IS_CONFIG --liblas_la_SOURCES += gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp -+liblas12_la_SOURCES += gt_wkt_srs.cpp gt_citation.cpp tifvsi.cpp - endif - --liblas_la_LDFLAGS = -version-info 1:0:0 -+liblas12_la_LDFLAGS = -version-info 1:0:0 diff --git a/devel/liblas12/files/patch-src_detail_file.cpp b/devel/liblas12/files/patch-src_detail_file.cpp deleted file mode 100644 index 49958d858db2..000000000000 --- a/devel/liblas12/files/patch-src_detail_file.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- src/detail/file.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/file.cpp -@@ -40,9 +40,9 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/file.hpp> --#include <liblas/lasreader.hpp> --#include <liblas/laswriter.hpp> -+#include <liblas12/detail/file.hpp> -+#include <liblas12/lasreader.hpp> -+#include <liblas12/laswriter.hpp> - #include <string> - #include <iostream> - #include <fstream> diff --git a/devel/liblas12/files/patch-src_detail_reader.cpp b/devel/liblas12/files/patch-src_detail_reader.cpp deleted file mode 100644 index 2ace287bc388..000000000000 --- a/devel/liblas12/files/patch-src_detail_reader.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/detail/reader.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/reader.cpp -@@ -39,12 +39,12 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/reader.hpp> --#include <liblas/detail/reader10.hpp> --#include <liblas/detail/reader11.hpp> --#include <liblas/detail/reader12.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> -+#include <liblas12/detail/reader.hpp> -+#include <liblas12/detail/reader10.hpp> -+#include <liblas12/detail/reader11.hpp> -+#include <liblas12/detail/reader12.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> - // - // // GeoTIFF - // #ifdef HAVE_LIBGEOTIFF diff --git a/devel/liblas12/files/patch-src_detail_reader10.cpp b/devel/liblas12/files/patch-src_detail_reader10.cpp deleted file mode 100644 index d520446383bb..000000000000 --- a/devel/liblas12/files/patch-src_detail_reader10.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/detail/reader10.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/reader10.cpp -@@ -39,12 +39,12 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/reader10.hpp> --#include <liblas/detail/utility.hpp> --#include <liblas/lasvariablerecord.hpp> --#include <liblas/liblas.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> -+#include <liblas12/detail/reader10.hpp> -+#include <liblas12/detail/utility.hpp> -+#include <liblas12/lasvariablerecord.hpp> -+#include <liblas12/liblas.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> - - // std - #include <fstream> diff --git a/devel/liblas12/files/patch-src_detail_reader11.cpp b/devel/liblas12/files/patch-src_detail_reader11.cpp deleted file mode 100644 index 6e20b72885a7..000000000000 --- a/devel/liblas12/files/patch-src_detail_reader11.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- src/detail/reader11.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/reader11.cpp -@@ -39,12 +39,12 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/reader11.hpp> --#include <liblas/detail/utility.hpp> --#include <liblas/liblas.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/lasvariablerecord.hpp> -+#include <liblas12/detail/reader11.hpp> -+#include <liblas12/detail/utility.hpp> -+#include <liblas12/liblas.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/lasvariablerecord.hpp> - - // std - #include <fstream> diff --git a/devel/liblas12/files/patch-src_detail_reader12.cpp b/devel/liblas12/files/patch-src_detail_reader12.cpp deleted file mode 100644 index 7bc1ee9571ad..000000000000 --- a/devel/liblas12/files/patch-src_detail_reader12.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- src/detail/reader12.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/reader12.cpp -@@ -39,13 +39,13 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/reader12.hpp> --#include <liblas/detail/utility.hpp> --#include <liblas/liblas.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/lasvariablerecord.hpp> --#include <liblas/lascolor.hpp> -+#include <liblas12/detail/reader12.hpp> -+#include <liblas12/detail/utility.hpp> -+#include <liblas12/liblas.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/lasvariablerecord.hpp> -+#include <liblas12/lascolor.hpp> - - // std - #include <fstream> diff --git a/devel/liblas12/files/patch-src_detail_writer.cpp b/devel/liblas12/files/patch-src_detail_writer.cpp deleted file mode 100644 index a49ad4676aa4..000000000000 --- a/devel/liblas12/files/patch-src_detail_writer.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- src/detail/writer.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/writer.cpp -@@ -39,13 +39,13 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/writer.hpp> --#include <liblas/detail/writer10.hpp> --#include <liblas/detail/writer11.hpp> --#include <liblas/detail/writer12.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/lasspatialreference.hpp> -+#include <liblas12/detail/writer.hpp> -+#include <liblas12/detail/writer10.hpp> -+#include <liblas12/detail/writer11.hpp> -+#include <liblas12/detail/writer12.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/lasspatialreference.hpp> - - #ifdef HAVE_GDAL - #include <ogr_srs_api.h> diff --git a/devel/liblas12/files/patch-src_detail_writer10.cpp b/devel/liblas12/files/patch-src_detail_writer10.cpp deleted file mode 100644 index 40ca1c32ffd1..000000000000 --- a/devel/liblas12/files/patch-src_detail_writer10.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/detail/writer10.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/writer10.cpp -@@ -39,11 +39,11 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/writer10.hpp> --#include <liblas/detail/utility.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/liblas.hpp> -+#include <liblas12/detail/writer10.hpp> -+#include <liblas12/detail/utility.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/liblas.hpp> - // std - #include <vector> - #include <fstream> diff --git a/devel/liblas12/files/patch-src_detail_writer11.cpp b/devel/liblas12/files/patch-src_detail_writer11.cpp deleted file mode 100644 index abf422603c9c..000000000000 --- a/devel/liblas12/files/patch-src_detail_writer11.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/detail/writer11.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/writer11.cpp -@@ -39,11 +39,11 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/writer11.hpp> --#include <liblas/detail/utility.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/liblas.hpp> -+#include <liblas12/detail/writer11.hpp> -+#include <liblas12/detail/utility.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/liblas.hpp> - // std - #include <vector> - #include <fstream> diff --git a/devel/liblas12/files/patch-src_detail_writer12.cpp b/devel/liblas12/files/patch-src_detail_writer12.cpp deleted file mode 100644 index 44c335945e03..000000000000 --- a/devel/liblas12/files/patch-src_detail_writer12.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/detail/writer12.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/detail/writer12.cpp -@@ -39,11 +39,11 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/detail/writer12.hpp> --#include <liblas/detail/utility.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/liblas.hpp> -+#include <liblas12/detail/writer12.hpp> -+#include <liblas12/detail/utility.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/liblas.hpp> - // std - #include <vector> - #include <fstream> diff --git a/devel/liblas12/files/patch-src_las__c__api.cpp b/devel/liblas12/files/patch-src_las__c__api.cpp deleted file mode 100644 index 94ede3d078e8..000000000000 --- a/devel/liblas12/files/patch-src_las__c__api.cpp +++ /dev/null @@ -1,49 +0,0 @@ ---- src/las_c_api.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/las_c_api.cpp -@@ -41,17 +41,17 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/liblas.hpp> --#include <liblas/lasreader.hpp> --#include <liblas/laserror.hpp> --#include <liblas/laswriter.hpp> --#include <liblas/lasfile.hpp> --#include <liblas/exception.hpp> --#include <liblas/lasvariablerecord.hpp> --#include <liblas/guid.hpp> --#include <liblas/lasspatialreference.hpp> --#include <liblas/capi/las_config.h> --#include <liblas/capi/las_version.h> -+#include <liblas12/liblas.hpp> -+#include <liblas12/lasreader.hpp> -+#include <liblas12/laserror.hpp> -+#include <liblas12/laswriter.hpp> -+#include <liblas12/lasfile.hpp> -+#include <liblas12/exception.hpp> -+#include <liblas12/lasvariablerecord.hpp> -+#include <liblas12/guid.hpp> -+#include <liblas12/lasspatialreference.hpp> -+#include <liblas12/capi/las_config.h> -+#include <liblas12/capi/las_version.h> - - typedef struct LASWriterHS *LASWriterH; - typedef struct LASReaderHS *LASReaderH; -@@ -745,7 +745,7 @@ LAS_DLL LASErrorEnum LASHeader_SetProjectId(LASHeaderH - - 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_CreateFromString(const char* - 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/liblas12/files/patch-src_lascolor.cpp b/devel/liblas12/files/patch-src_lascolor.cpp deleted file mode 100644 index bd2644b44c73..000000000000 --- a/devel/liblas12/files/patch-src_lascolor.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/lascolor.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/lascolor.cpp -@@ -39,8 +39,8 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/lascolor.hpp> --#include <liblas/cstdint.hpp> -+#include <liblas12/lascolor.hpp> -+#include <liblas12/cstdint.hpp> - - // std - #include <cstring> diff --git a/devel/liblas12/files/patch-src_laserror.cpp b/devel/liblas12/files/patch-src_laserror.cpp deleted file mode 100644 index 84091f3b2005..000000000000 --- a/devel/liblas12/files/patch-src_laserror.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/laserror.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/laserror.cpp -@@ -41,8 +41,8 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/laserror.hpp> --#include <liblas/cstdint.hpp> -+#include <liblas12/laserror.hpp> -+#include <liblas12/cstdint.hpp> - //std - #include <string> - diff --git a/devel/liblas12/files/patch-src_lasfile.cpp b/devel/liblas12/files/patch-src_lasfile.cpp deleted file mode 100644 index 27c00f1e2a3c..000000000000 --- a/devel/liblas12/files/patch-src_lasfile.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- src/lasfile.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/lasfile.cpp -@@ -40,9 +40,9 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/lasfile.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/detail/file.hpp> -+#include <liblas12/lasfile.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/detail/file.hpp> - - #include <string> - #include <stdexcept> diff --git a/devel/liblas12/files/patch-src_lasheader.cpp b/devel/liblas12/files/patch-src_lasheader.cpp deleted file mode 100644 index 78c84204507e..000000000000 --- a/devel/liblas12/files/patch-src_lasheader.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/lasheader.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/lasheader.cpp -@@ -40,11 +40,11 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/lasheader.hpp> --#include <liblas/cstdint.hpp> --#include <liblas/guid.hpp> --#include <liblas/detail/utility.hpp> --#include <liblas/lasspatialreference.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/cstdint.hpp> -+#include <liblas12/guid.hpp> -+#include <liblas12/detail/utility.hpp> -+#include <liblas12/lasspatialreference.hpp> - - // GeoTIFF - #ifdef HAVE_LIBGEOTIFF diff --git a/devel/liblas12/files/patch-src_laspoint.cpp b/devel/liblas12/files/patch-src_laspoint.cpp deleted file mode 100644 index ea4c208eeb2b..000000000000 --- a/devel/liblas12/files/patch-src_laspoint.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/laspoint.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/laspoint.cpp -@@ -39,11 +39,11 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/laspoint.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/cstdint.hpp> --#include <liblas/exception.hpp> --#include <liblas/detail/utility.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/cstdint.hpp> -+#include <liblas12/exception.hpp> -+#include <liblas12/detail/utility.hpp> - // std - #include <cstring> - diff --git a/devel/liblas12/files/patch-src_lasreader.cpp b/devel/liblas12/files/patch-src_lasreader.cpp deleted file mode 100644 index 17664d387605..000000000000 --- a/devel/liblas12/files/patch-src_lasreader.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/lasreader.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/lasreader.cpp -@@ -40,8 +40,8 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/lasreader.hpp> --#include <liblas/detail/reader.hpp> -+#include <liblas12/lasreader.hpp> -+#include <liblas12/detail/reader.hpp> - // std - #include <stdexcept> - #include <fstream> diff --git a/devel/liblas12/files/patch-src_lasspatialreference.cpp b/devel/liblas12/files/patch-src_lasspatialreference.cpp deleted file mode 100644 index 1934f96bd3c2..000000000000 --- a/devel/liblas12/files/patch-src_lasspatialreference.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/lasspatialreference.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/lasspatialreference.cpp -@@ -39,8 +39,8 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/lasspatialreference.hpp> --#include <liblas/detail/utility.hpp> -+#include <liblas12/lasspatialreference.hpp> -+#include <liblas12/detail/utility.hpp> - #include <iostream> - - namespace liblas diff --git a/devel/liblas12/files/patch-src_lasvariablerecord.cpp b/devel/liblas12/files/patch-src_lasvariablerecord.cpp deleted file mode 100644 index d70fdcefa31b..000000000000 --- a/devel/liblas12/files/patch-src_lasvariablerecord.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/lasvariablerecord.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/lasvariablerecord.cpp -@@ -41,8 +41,8 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/lasvariablerecord.hpp> --#include <liblas/cstdint.hpp> -+#include <liblas12/lasvariablerecord.hpp> -+#include <liblas12/cstdint.hpp> - // std - #include <algorithm> - #include <stdexcept> diff --git a/devel/liblas12/files/patch-src_laswriter.cpp b/devel/liblas12/files/patch-src_laswriter.cpp deleted file mode 100644 index 49b66a283b85..000000000000 --- a/devel/liblas12/files/patch-src_laswriter.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/laswriter.cpp.orig 2009-10-02 17:48:41 UTC -+++ src/laswriter.cpp -@@ -39,8 +39,8 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include <liblas/laswriter.hpp> --#include <liblas/detail/writer.hpp> -+#include <liblas12/laswriter.hpp> -+#include <liblas12/detail/writer.hpp> - // std - #include <stdexcept> - #include <fstream> diff --git a/devel/liblas12/files/patch-test_unit_Makefile.am b/devel/liblas12/files/patch-test_unit_Makefile.am deleted file mode 100644 index 8b332807068a..000000000000 --- a/devel/liblas12/files/patch-test_unit_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- test/unit/Makefile.am.orig 2009-10-02 17:48:41 UTC -+++ test/unit/Makefile.am -@@ -16,7 +16,7 @@ TESTS = liblas_test - check_PROGRAMS = liblas_test - - liblas_test_LDADD = \ -- $(top_builddir)/src/liblas.la \ -+ $(top_builddir)/src/liblas12.la \ - $(NULL) - - liblas_test_SOURCES = \ diff --git a/devel/liblas12/files/patch-test_unit_common.cpp b/devel/liblas12/files/patch-test_unit_common.cpp deleted file mode 100644 index f187b4ae473c..000000000000 --- a/devel/liblas12/files/patch-test_unit_common.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- test/unit/common.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/common.cpp -@@ -5,9 +5,9 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/lasheader.hpp> --#include <liblas/cstdint.hpp> --#include <liblas/guid.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/cstdint.hpp> -+#include <liblas12/guid.hpp> - #include <tut/tut.hpp> - #include "common.hpp" - diff --git a/devel/liblas12/files/patch-test_unit_common.hpp b/devel/liblas12/files/patch-test_unit_common.hpp deleted file mode 100644 index e690519750f7..000000000000 --- a/devel/liblas12/files/patch-test_unit_common.hpp +++ /dev/null @@ -1,15 +0,0 @@ ---- test/unit/common.hpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/common.hpp -@@ -5,9 +5,9 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/liblas.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/lasheader.hpp> -+#include <liblas12/liblas.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/lasheader.hpp> - - - namespace tut diff --git a/devel/liblas12/files/patch-test_unit_guid__test.cpp b/devel/liblas12/files/patch-test_unit_guid__test.cpp deleted file mode 100644 index a1a7f1c89003..000000000000 --- a/devel/liblas12/files/patch-test_unit_guid__test.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- test/unit/guid_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/guid_test.cpp -@@ -5,8 +5,8 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/guid.hpp> --#include <liblas/cstdint.hpp> -+#include <liblas12/guid.hpp> -+#include <liblas12/cstdint.hpp> - #include <tut/tut.hpp> - #include <string> - #include <algorithm> // std::std::transform diff --git a/devel/liblas12/files/patch-test_unit_laserror__test.cpp b/devel/liblas12/files/patch-test_unit_laserror__test.cpp deleted file mode 100644 index 35738ffef5a1..000000000000 --- a/devel/liblas12/files/patch-test_unit_laserror__test.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- test/unit/laserror_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/laserror_test.cpp -@@ -5,7 +5,7 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/laserror.hpp> -+#include <liblas12/laserror.hpp> - #include <tut/tut.hpp> - #include <string> - diff --git a/devel/liblas12/files/patch-test_unit_lasfile__test.cpp b/devel/liblas12/files/patch-test_unit_lasfile__test.cpp deleted file mode 100644 index 8ea78c8b8bac..000000000000 --- a/devel/liblas12/files/patch-test_unit_lasfile__test.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- test/unit/lasfile_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/lasfile_test.cpp -@@ -5,10 +5,10 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/lasfile.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/lasreader.hpp> --#include <liblas/laswriter.hpp> -+#include <liblas12/lasfile.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/lasreader.hpp> -+#include <liblas12/laswriter.hpp> - #include <tut/tut.hpp> - #include <stdexcept> - #include <string> diff --git a/devel/liblas12/files/patch-test_unit_lasheader__test.cpp b/devel/liblas12/files/patch-test_unit_lasheader__test.cpp deleted file mode 100644 index 46a501a1c0ae..000000000000 --- a/devel/liblas12/files/patch-test_unit_lasheader__test.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- test/unit/lasheader_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/lasheader_test.cpp -@@ -5,10 +5,10 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/lasheader.hpp> --#include <liblas/lasspatialreference.hpp> --#include <liblas/cstdint.hpp> --#include <liblas/guid.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/lasspatialreference.hpp> -+#include <liblas12/cstdint.hpp> -+#include <liblas12/guid.hpp> - #include <tut/tut.hpp> - #include <string> - #include <stdexcept> diff --git a/devel/liblas12/files/patch-test_unit_laspoint__test.cpp b/devel/liblas12/files/patch-test_unit_laspoint__test.cpp deleted file mode 100644 index aef7cd24aed4..000000000000 --- a/devel/liblas12/files/patch-test_unit_laspoint__test.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- test/unit/laspoint_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/laspoint_test.cpp -@@ -5,9 +5,9 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/laspoint.hpp> --#include <liblas/lascolor.hpp> --#include <liblas/exception.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/lascolor.hpp> -+#include <liblas12/exception.hpp> - #include <tut/tut.hpp> - #include <bitset> - #include <stdexcept> diff --git a/devel/liblas12/files/patch-test_unit_lasreader__iterator__test.cpp b/devel/liblas12/files/patch-test_unit_lasreader__iterator__test.cpp deleted file mode 100644 index 3e6305888d0a..000000000000 --- a/devel/liblas12/files/patch-test_unit_lasreader__iterator__test.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- test/unit/lasreader_iterator_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/lasreader_iterator_test.cpp -@@ -5,11 +5,11 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/cstdint.hpp> --#include <liblas/iterator.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/lasreader.hpp> --#include <liblas/detail/utility.hpp> -+#include <liblas12/cstdint.hpp> -+#include <liblas12/iterator.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/lasreader.hpp> -+#include <liblas12/detail/utility.hpp> - #include <tut/tut.hpp> - #include <algorithm> - #include <fstream> diff --git a/devel/liblas12/files/patch-test_unit_lasreader__test.cpp b/devel/liblas12/files/patch-test_unit_lasreader__test.cpp deleted file mode 100644 index 1890c9422f31..000000000000 --- a/devel/liblas12/files/patch-test_unit_lasreader__test.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- test/unit/lasreader_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/lasreader_test.cpp -@@ -5,11 +5,11 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/lasreader.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/cstdint.hpp> --#include <liblas/liblas.hpp> -+#include <liblas12/lasreader.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/cstdint.hpp> -+#include <liblas12/liblas.hpp> - #include <tut/tut.hpp> - #include <fstream> - #include <string> diff --git a/devel/liblas12/files/patch-test_unit_lasspatialreference__test.cpp b/devel/liblas12/files/patch-test_unit_lasspatialreference__test.cpp deleted file mode 100644 index 7276cee5d126..000000000000 --- a/devel/liblas12/files/patch-test_unit_lasspatialreference__test.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- test/unit/lasspatialreference_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/lasspatialreference_test.cpp -@@ -5,9 +5,9 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/lasspatialreference.hpp> --#include <liblas/cstdint.hpp> --#include <liblas/guid.hpp> -+#include <liblas12/lasspatialreference.hpp> -+#include <liblas12/cstdint.hpp> -+#include <liblas12/guid.hpp> - #include <tut/tut.hpp> - #include <string> - #include <stdexcept> diff --git a/devel/liblas12/files/patch-test_unit_lasvariablerecord__test.cpp b/devel/liblas12/files/patch-test_unit_lasvariablerecord__test.cpp deleted file mode 100644 index 40f922c07826..000000000000 --- a/devel/liblas12/files/patch-test_unit_lasvariablerecord__test.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- test/unit/lasvariablerecord_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/lasvariablerecord_test.cpp -@@ -5,8 +5,8 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/lasvariablerecord.hpp> --#include <liblas/cstdint.hpp> -+#include <liblas12/lasvariablerecord.hpp> -+#include <liblas12/cstdint.hpp> - #include <tut/tut.hpp> - #include <string> - diff --git a/devel/liblas12/files/patch-test_unit_laswriter__test.cpp b/devel/liblas12/files/patch-test_unit_laswriter__test.cpp deleted file mode 100644 index b3c3f913a297..000000000000 --- a/devel/liblas12/files/patch-test_unit_laswriter__test.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- test/unit/laswriter_test.cpp.orig 2009-10-02 17:48:41 UTC -+++ test/unit/laswriter_test.cpp -@@ -5,12 +5,12 @@ - // (See accompanying file LICENSE.txt or copy at - // http://www.opensource.org/licenses/bsd-license.php) - // --#include <liblas/laswriter.hpp> --#include <liblas/lasreader.hpp> --#include <liblas/lasheader.hpp> --#include <liblas/laspoint.hpp> --#include <liblas/cstdint.hpp> --#include <liblas/liblas.hpp> -+#include <liblas12/laswriter.hpp> -+#include <liblas12/lasreader.hpp> -+#include <liblas12/lasheader.hpp> -+#include <liblas12/laspoint.hpp> -+#include <liblas12/cstdint.hpp> -+#include <liblas12/liblas.hpp> - #include <tut/tut.hpp> - #include <fstream> - #include <string> diff --git a/devel/liblas12/pkg-descr b/devel/liblas12/pkg-descr deleted file mode 100644 index 5f8ba1a6ff53..000000000000 --- a/devel/liblas12/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -libLAS is a BSD library for reading and writing ASPRS LAS version 1.0, 1.1 and -1.2 data. LAS-formatted data is heavily used in LiDAR processing operations, -and the LAS format is a sequential binary format used to store data from -sensors and as intermediate processing storage by some applications. - -WWW: https://liblas.org/ diff --git a/devel/liblas12/pkg-plist b/devel/liblas12/pkg-plist deleted file mode 100644 index 031d841c6853..000000000000 --- a/devel/liblas12/pkg-plist +++ /dev/null @@ -1,42 +0,0 @@ -bin/las2las12 -bin/las2txt12 -bin/lasinfo12 -bin/lasmerge12 -bin/liblas12-config -bin/txt2las12 -include/liblas12/capi/las_config.h -include/liblas12/capi/las_version.h -include/liblas12/capi/liblas.h -include/liblas12/cstdint.hpp -include/liblas12/detail/endian.hpp -include/liblas12/detail/file.hpp -include/liblas12/detail/fwd.hpp -include/liblas12/detail/reader.hpp -include/liblas12/detail/reader10.hpp -include/liblas12/detail/reader11.hpp -include/liblas12/detail/reader12.hpp -include/liblas12/detail/sha1.hpp -include/liblas12/detail/sharedptr.hpp -include/liblas12/detail/timer.hpp -include/liblas12/detail/utility.hpp -include/liblas12/detail/writer.hpp -include/liblas12/detail/writer10.hpp -include/liblas12/detail/writer11.hpp -include/liblas12/detail/writer12.hpp -include/liblas12/exception.hpp -include/liblas12/guid.hpp -include/liblas12/iterator.hpp -include/liblas12/lascolor.hpp -include/liblas12/laserror.hpp -include/liblas12/lasfile.hpp -include/liblas12/lasheader.hpp -include/liblas12/laspoint.hpp -include/liblas12/lasreader.hpp -include/liblas12/lasspatialreference.hpp -include/liblas12/lasvariablerecord.hpp -include/liblas12/laswriter.hpp -include/liblas12/liblas.hpp -lib/liblas12.a -lib/liblas12.so -lib/liblas12.so.1 -lib/liblas12.so.1.0.0 |