Date: Wed, 21 Feb 2024 19:15:45 +0000 From: jbo@insane.engineer To: Po-Chuan Hsieh <sunpoet@FreeBSD.org> Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 09f340011fb3 - main - math/armadillo: Use USES=pathfix Message-ID: <Vw3HQbIytY347nPGg4uTMckHY4vuulwXkxzQnav4gk9g4w1xBBF94yVD8aCoKDJ0QOsbju79T0ef7PyFKCejJCSBD27P-yy1gF12ThTqx8w=@insane.engineer> In-Reply-To: <202402211539.41LFd7Oo090837@gitrepo.freebsd.org> References: <202402211539.41LFd7Oo090837@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wednesday, February 21st, 2024 at 16:39, Po-Chuan Hsieh <sunpoet@FreeBSD= .org> wrote: > The branch main has been updated by sunpoet: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D09f340011fb3eaeacffc9631= 2eeeceab34abe9e5 >=20 > commit 09f340011fb3eaeacffc96312eeeceab34abe9e5 > Author: Po-Chuan Hsieh sunpoet@FreeBSD.org >=20 > AuthorDate: 2024-02-21 15:03:34 +0000 > Commit: Po-Chuan Hsieh sunpoet@FreeBSD.org >=20 > CommitDate: 2024-02-21 15:11:29 +0000 >=20 > math/armadillo: Use USES=3Dpathfix >=20 > The original pkgconfig hack has been split into CMAKE_ARGS and CMakeLists= .txt patch. > --- > math/armadillo/Makefile | 5 ++--- > math/armadillo/files/patch-CMakeLists.txt | 8 -------- > 2 files changed, 2 insertions(+), 11 deletions(-) >=20 > diff --git a/math/armadillo/Makefile b/math/armadillo/Makefile > index 6ea088e1612a..e357e867e343 100644 > --- a/math/armadillo/Makefile > +++ b/math/armadillo/Makefile > @@ -1,5 +1,5 @@ > PORTNAME=3D armadillo > -DISTVERSION=3D 12.6.7 > +PORTVERSION=3D 12.6.7 > PORTREVISION=3D 2 > CATEGORIES=3D math > MASTER_SITES=3D SF/arma > @@ -15,10 +15,9 @@ LIB_DEPENDS=3D libarpack.so:math/arpack-ng \ > liblapack.so:math/lapack \ > libsuperlu.so:math/superlu >=20 > -USES=3D blaslapack:openblas cmake:testing compiler:c++11-lang pkgconfig = tar:xz > +USES=3D blaslapack:openblas cmake:testing compiler:c++11-lang pathfix pk= gconfig tar:xz > USE_LDCONFIG=3D yes >=20 > -CMAKE_ARGS+=3D -DPKG_CONFIG_DIR=3D${LOCALBASE}/libdata/pkgconfig/ > CMAKE_OFF=3D BUILD_SMOKE_TEST > CMAKE_TESTING_ON=3D BUILD_SMOKE_TEST >=20 > diff --git a/math/armadillo/files/patch-CMakeLists.txt b/math/armadillo/f= iles/patch-CMakeLists.txt > deleted file mode 100644 > index 3166b0c89406..000000000000 > --- a/math/armadillo/files/patch-CMakeLists.txt > +++ /dev/null > @@ -1,8 +0,0 @@ > ---- CMakeLists.txt.orig 2017-05-08 13:46:28 UTC > -+++ CMakeLists.txt > -@@ -484,4 +484,4 @@ file(COPY ${PROJECT_SOURCE_DIR}/misc/ DE > - message(STATUS "Generating '${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc= '") > - configure_file(${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc.in "${PROJEC= T_BINARY_DIR}/tmp/misc/armadillo.pc" @ONLY) > - > --install(FILES "${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc" DESTINATION= ${CMAKE_INSTALL_LIBDIR}/pkgconfig) > -+install(FILES "${PROJECT_BINARY_DIR}/tmp/misc/armadillo.pc" DESTINATION= ${PKG_CONFIG_DIR}) Hi, I'm being mentored and try to keep up with changes to gather more experienc= e. I noticed the change from DISTVERSION to PORTVERSION and was wondering if t= his is an unintentional change as it's not mentioned in the commit message and per my understanding the porters ha= ndbook suggests to use PORTVERSION only in specific scenarios. Thank you for your patience teaching the newbies :) Best regards, ~ jbo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Vw3HQbIytY347nPGg4uTMckHY4vuulwXkxzQnav4gk9g4w1xBBF94yVD8aCoKDJ0QOsbju79T0ef7PyFKCejJCSBD27P-yy1gF12ThTqx8w=>