Attachment 230882 Details for Bug 261091 – fix for liblas-config.cmake build and install

[patch] fix for liblas-config.cmake build and install

patch-misc_lastools-fix_installation_tasks.diff (text/plain), 1.52 KB, created by Rainer Hurling on 2022-01-10 16:01:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2022-01-10 16:01:52 UTC

Size: 1.52 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 261091: 230882