From nobody Mon Jan 10 18:08:17 2022 X-Original-To: dev-commits-ports-main@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 A675B1938C89; Mon, 10 Jan 2022 18:08:17 +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 4JXhdY2DGgz4nh5; Mon, 10 Jan 2022 18:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2883E1E08; Mon, 10 Jan 2022 18:08:17 +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 20AI8H5C063272; Mon, 10 Jan 2022 18:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AI8H4n063271; Mon, 10 Jan 2022 18:08:17 GMT (envelope-from git) Date: Mon, 10 Jan 2022 18:08:17 GMT Message-Id: <202201101808.20AI8H4n063271@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e5cc987c91e9 - main - misc/lastools: Fix cmake build for laslib-config.cmake List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5cc987c91e9bbb5ac6d7f5751830ca2971d11e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641838097; 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=FdXVup3S7zmmeKCpQno8ILXfxCDGfbVu6gZXYeyxDHI=; b=CXkYRA1q+Yn5LArCGZ6JVb5oeJzI/+DYDZSgYZW0XNp+OHbDMix8Ib01lbD8SJrL3zVn6T UmLNa2scfPAs23VbYEhB6cjWVua2Q76N8Q53OCjlGjNjHfZ6lAJnUM8vPxAD1Y62w0mWn+ siJ5RccIgwjkx+zoZW7WVxnEAEU16XatMffZmUmvUpE1xNqFt9ZU0rYuy6gpPJhIX6zUVf xSfUQJYkoQCE65JddDSO06XWlN8hi9GjoVw9oVsqtkMpb5/Zb7NWzS8ityy69vOz1wDEf+ to80rN8fNMgs3ipsCLtWKXwg8KlLfhDAVupSt+BzUnFerUTtNW9x3l9ucjE0rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641838097; a=rsa-sha256; cv=none; b=UBgKpZiMSQeAUxyh5K9EsmCftn1vuhuIZvZxhSKaWcAHPGyGxZWWPaex6LvB3627ZKYncj jiQHtgj2eqg+yXhLAfRPr0Q4wwTSYQm5SpKPTA6bW9h3G/R8iVV1ferphMRMEHnA14ESb0 FSki5XOLJogEcETnZ/IKfVRR7koZ/ZCZ2RR7+WYy+hr+cdtEjc/e1zIFeftO7S9XryMVf8 REPS8mShLqL5ijzhHf907KOk7g3gkNwPwrUn7v3b27/gZaB5Ir+gLjAoiWd1SFWpgT4Zle EK1mgodriCoNYSPCs/Fzh7snvQ9Ixi7QmxivGmTryboBdRDpyt3Qzqjx6nf2JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5cc987c91e9bbb5ac6d7f5751830ca2971d11e9 commit e5cc987c91e9bbb5ac6d7f5751830ca2971d11e9 Author: Rainer Hurling AuthorDate: 2022-01-10 18:07:27 +0000 Commit: Yuri Victorovich 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