git: e5cc987c91e9 - main - misc/lastools: Fix cmake build for laslib-config.cmake
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 10 Jan 2022 18:08:17 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e5cc987c91e9bbb5ac6d7f5751830ca2971d11e9
commit e5cc987c91e9bbb5ac6d7f5751830ca2971d11e9
Author: Rainer Hurling <rhurlin@FreeBSD.org>
AuthorDate: 2022-01-10 18:07:27 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-01-10 18:08:14 +0000
misc/lastools: Fix cmake build for laslib-config.cmake
PR: 261091
---
misc/lastools/Makefile | 9 ++++++---
misc/lastools/pkg-plist | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/misc/lastools/Makefile b/misc/lastools/Makefile
index acf11a6513ca..b31b5319cce1 100644
--- a/misc/lastools/Makefile
+++ b/misc/lastools/Makefile
@@ -1,5 +1,6 @@
PORTNAME= LAStools
DISTVERSION= 2.0.0
+PORTREVISION= 1
CATEGORIES= misc
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
DISTNAME= ${PORTNAME}
@@ -11,14 +12,16 @@ COMMENT= Efficient tools for LiDAR processing
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.txt
-USES= cmake zip
+USES= cmake:insource zip
CMAKE_ON= BUILD_SHARED_LIBS
+CONFLICTS_INSTALL= liblas
+
EXECUTABLES= lasindex las2txt las2las txt2las lasdiff lasinfo laszip lasmerge lasprecision
-post-configure: # workaround for https://github.com/LAStools/LAStools/issues/108
- @${REINPLACE_CMD} -e '/laslib-config.cmake/,1d' ${BUILD_WRKSRC}/LASlib/src/cmake_install.cmake
+pre-install:
+ ${MV} ${WRKSRC}/LASlib/src/LASlib-config.cmake ${WRKSRC}/LASlib/src/laslib-config.cmake
post-install: # install executables, workaround for https://github.com/LAStools/LAStools/issues/120
.for e in ${EXECUTABLES}
diff --git a/misc/lastools/pkg-plist b/misc/lastools/pkg-plist
index c660fd1bfb54..d27914443675 100644
--- a/misc/lastools/pkg-plist
+++ b/misc/lastools/pkg-plist
@@ -80,5 +80,6 @@ include/LASlib/laszip_common_v3.hpp
include/LASlib/laszip_decompress_selective_v3.hpp
include/LASlib/mydefs.hpp
lib/LASlib/libLASlib.so
+lib/cmake/LASlib/laslib-config.cmake
lib/cmake/LASlib/laslib-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/LASlib/laslib-targets.cmake