From nobody Tue Jun 21 10:51:21 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 64B5E862F3A; Tue, 21 Jun 2022 10:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LS3Gd2G5Cz3NpZ; Tue, 21 Jun 2022 10:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655808681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qe3deA/yY+SR/55rfegXrNiIkvx72f4AOag4hDtncrI=; b=wrqadUVz+lzCR7bii7FduIhs3JrdzGKvnswGlW48D43BaMxvIReOJkoqEmy37w7QRrS/Z+ B7OFbwc0Je0ATWBuIpkzRcIC8DqGl8Hs3xmDqJZztWR1FJc3N9ucEUnf/ZkehK4CpUZjMN jOR5Nt5IxG0fMFUj/OlcAqtP4FL/MGyZCEKYlN3PDK6OIE/N8SwoDbINDpgy9rlbOGVI3W Uk6rYgs+BJVPV91KU9iq7ksL1akHj2khDJrvFel6oWRbJsl9Ngi2ekpbGro7OzaDtyVely FGGIXd+uVJ2/ljeqfbbOfrK2baV2Hv817NOE9qJSEFVgmulFP5A34sPjBIkhmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D76B10900; Tue, 21 Jun 2022 10:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25LApL59093933; Tue, 21 Jun 2022 10:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25LApLxu093932; Tue, 21 Jun 2022 10:51:21 GMT (envelope-from git) Date: Tue, 21 Jun 2022 10:51:21 GMT Message-Id: <202206211051.25LApLxu093932@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 894f1384625a - main - cleanup: Remove expired ports: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 894f1384625af540d0b8b56cf7495f30d35c2606 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655808681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qe3deA/yY+SR/55rfegXrNiIkvx72f4AOag4hDtncrI=; b=XLjGaywLiSCmnMaseN8X5/Nwz5udDxAkY0sJf2MVYE9H5oygtXJdu2MDAuiP05j1PzrQCU d9uX/fg0CrAsByE4MSXQj/hhA3ltO4z0kKjiEqMsiBDkdHpR3l6fpyAdXIFpq0JnaBDJgn 8m8uGSyhW5REtSBh9DWqn2mfAiDLjK8IeBq1RB//njT5ayW4pR7Ic5jOXhPa7//tNNWmsh 993wvwVsPzSaLP/q+1mQtSNzRi0JFUVKn/o+Gcru/SZIOC1T+X9nAe+oMwCWRvA0sKY4s1 V3xppnRkv5oTNqO/zesx0tz4yIJD/wtnYoKjJW+8wxGsR4t6s6OhXFIc08YjjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655808681; a=rsa-sha256; cv=none; b=mV666qkzeL1k+SiAhV+Bwd33VlLkcFYMCtrJNWJ6AjjhAOQ6mOvGGlqcD3MUt5s7S+u096 eRt4qXCs7GrxFBAo68rLvHpBibL0IqDrA8P01zi0D74JUjm9LQrZsbw7F7PvHri2H6jeK4 i6x0HkPyjy9au61Y1SnqO3Bp+dtTu8wnxMJ9VN9yaim8suuhYFotDt336QAazY3WzejTgp XSA+w6U6tfTSanEwdCY7LOy71wEEdGihbeg4PlvL8m9SvTvzZwa/snzR/f0C/MJg1qSgHA 4tCMbhIn/Ui9DQQyUU+d8PAawA/B79d7prFS/4Q/OKTDbvj1+psic/no7birTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=894f1384625af540d0b8b56cf7495f30d35c2606 commit 894f1384625af540d0b8b56cf7495f30d35c2606 Author: Rene Ladan AuthorDate: 2022-06-21 10:51:04 +0000 Commit: Rene Ladan CommitDate: 2022-06-21 10:51:04 +0000 cleanup: Remove expired ports: 2022-06-20 devel/liblas12: Previously only required by math/saga (now superseeded by math/pdal) --- MOVED | 1 + devel/Makefile | 1 - devel/liblas12/Makefile | 37 ---------- devel/liblas12/distinfo | 3 - devel/liblas12/files/patch-CMakeLists.txt | 13 ---- devel/liblas12/files/patch-apps_CMakeLists.txt | 36 --------- devel/liblas12/files/patch-apps_Makefile.am | 36 --------- devel/liblas12/files/patch-apps_las2las12.c | 57 --------------- devel/liblas12/files/patch-apps_las2ogr12.cpp | 26 ------- devel/liblas12/files/patch-apps_las2txt12.c | 36 --------- devel/liblas12/files/patch-apps_lasdiff12.c | 24 ------ devel/liblas12/files/patch-apps_lasinfo12.c | 52 ------------- devel/liblas12/files/patch-apps_lasmerge12.c | 51 ------------- devel/liblas12/files/patch-apps_liblas12-config.in | 11 --- devel/liblas12/files/patch-apps_txt2las12.c | 36 --------- devel/liblas12/files/patch-configure.ac | 11 --- devel/liblas12/files/patch-include_Makefile.am | 70 ------------------ .../files/patch-include_liblas12_capi_liblas.h | 11 --- .../files/patch-include_liblas12_detail_file.hpp | 13 ---- .../files/patch-include_liblas12_detail_reader.hpp | 15 ---- .../patch-include_liblas12_detail_reader10.hpp | 13 ---- .../patch-include_liblas12_detail_reader11.hpp | 13 ---- .../patch-include_liblas12_detail_reader12.hpp | 13 ---- .../patch-include_liblas12_detail_utility.hpp | 13 ---- .../files/patch-include_liblas12_detail_writer.hpp | 15 ---- .../patch-include_liblas12_detail_writer10.hpp | 15 ---- .../patch-include_liblas12_detail_writer11.hpp | 15 ---- .../patch-include_liblas12_detail_writer12.hpp | 15 ---- .../liblas12/files/patch-include_liblas12_guid.hpp | 15 ---- .../files/patch-include_liblas12_iterator.hpp | 13 ---- .../files/patch-include_liblas12_lascolor.hpp | 15 ---- .../files/patch-include_liblas12_lasfile.hpp | 13 ---- .../files/patch-include_liblas12_lasheader.hpp | 21 ------ .../files/patch-include_liblas12_laspoint.hpp | 17 ----- .../files/patch-include_liblas12_lasreader.hpp | 19 ----- .../patch-include_liblas12_lasspatialreference.hpp | 21 ------ .../patch-include_liblas12_lasvariablerecord.hpp | 11 --- .../files/patch-include_liblas12_laswriter.hpp | 15 ---- .../files/patch-include_liblas12_liblas.hpp | 11 --- devel/liblas12/files/patch-python_liblas_core.py | 11 --- devel/liblas12/files/patch-src_CMakeLists.txt | 85 ---------------------- devel/liblas12/files/patch-src_Makefile.am | 24 ------ devel/liblas12/files/patch-src_detail_file.cpp | 15 ---- devel/liblas12/files/patch-src_detail_reader.cpp | 21 ------ devel/liblas12/files/patch-src_detail_reader10.cpp | 21 ------ devel/liblas12/files/patch-src_detail_reader11.cpp | 21 ------ devel/liblas12/files/patch-src_detail_reader12.cpp | 23 ------ devel/liblas12/files/patch-src_detail_writer.cpp | 23 ------ devel/liblas12/files/patch-src_detail_writer10.cpp | 19 ----- devel/liblas12/files/patch-src_detail_writer11.cpp | 19 ----- devel/liblas12/files/patch-src_detail_writer12.cpp | 19 ----- devel/liblas12/files/patch-src_las__c__api.cpp | 49 ------------- devel/liblas12/files/patch-src_lascolor.cpp | 13 ---- devel/liblas12/files/patch-src_laserror.cpp | 13 ---- devel/liblas12/files/patch-src_lasfile.cpp | 15 ---- devel/liblas12/files/patch-src_lasheader.cpp | 19 ----- devel/liblas12/files/patch-src_laspoint.cpp | 19 ----- devel/liblas12/files/patch-src_lasreader.cpp | 13 ---- .../files/patch-src_lasspatialreference.cpp | 13 ---- .../liblas12/files/patch-src_lasvariablerecord.cpp | 13 ---- devel/liblas12/files/patch-src_laswriter.cpp | 13 ---- devel/liblas12/files/patch-test_unit_Makefile.am | 11 --- devel/liblas12/files/patch-test_unit_common.cpp | 15 ---- devel/liblas12/files/patch-test_unit_common.hpp | 15 ---- .../liblas12/files/patch-test_unit_guid__test.cpp | 13 ---- .../files/patch-test_unit_laserror__test.cpp | 11 --- .../files/patch-test_unit_lasfile__test.cpp | 17 ----- .../files/patch-test_unit_lasheader__test.cpp | 17 ----- .../files/patch-test_unit_laspoint__test.cpp | 15 ---- .../patch-test_unit_lasreader__iterator__test.cpp | 19 ----- .../files/patch-test_unit_lasreader__test.cpp | 19 ----- .../patch-test_unit_lasspatialreference__test.cpp | 15 ---- .../patch-test_unit_lasvariablerecord__test.cpp | 13 ---- .../files/patch-test_unit_laswriter__test.cpp | 21 ------ devel/liblas12/pkg-descr | 6 -- devel/liblas12/pkg-plist | 42 ----------- 76 files changed, 1 insertion(+), 1552 deletions(-) diff --git a/MOVED b/MOVED index e94bd2bfecac..967d9f973c2b 100644 --- a/MOVED +++ b/MOVED @@ -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 - -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 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 - #endif - // liblas --#include --#include --#include --#include -+#include -+#include -+#include -+#include - // ogr - #include - //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 \tinput ASPRS LAS file\n" - << "\t-o \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 < -+#include - - - 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 --#include -+#include -+#include - #include - #include - #include 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 --#include --#include -+#include -+#include -+#include - - #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 --#include -+#include -+#include - // std - #include - 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 --#include -+#include -+#include - // std - #include - 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 --#include -+#include -+#include - // std - #include - 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 --#include -+#include -+#include - #include - #include - #include 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 --#include --#include -+#include -+#include -+#include - - #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 --#include --#include -+#include -+#include -+#include - // std - #include - 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 --#include --#include -+#include -+#include -+#include - // std - #include - 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 --#include --#include -+#include -+#include -+#include - // std - #include - 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 --#include --#include -+#include -+#include -+#include - #include - #include - #include 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 --#include -+#include -+#include - #include - #include - 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 --#include --#include -+#include -+#include -+#include - // std - #include // std::out_of_range - #include // 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 *** 1121 LINES SKIPPED ***