From nobody Wed Feb 21 19:15:45 2024 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 4Tg5bT5CPRz5B9vS for ; Wed, 21 Feb 2024 19:16:05 +0000 (UTC) (envelope-from jbo@insane.engineer) Received: from mail-40136.proton.ch (mail-40136.proton.ch [185.70.40.136]) (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 "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg5bT2yFWz42LR; Wed, 21 Feb 2024 19:16:05 +0000 (UTC) (envelope-from jbo@insane.engineer) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=insane.engineer; s=protonmail2; t=1708542961; x=1708802161; bh=ElYq0LmQHgvRQmPl3MF9e6w+yXpwuu/rpd/CH/Q/z2Y=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=5CTQL4RWE0kLxDxarTAd7I8czjPx0Vfxo91zSStiYpA8wQenMOFR24OBcU4GV2ZRp oaHXCT/k4xTPHT8NjWP+5JNYJ4WsgXZ3Lcf3bvYmQi5scKw8Sx0u6xAw7qFEJI7BiI OrxMvhV2ddnUGv9TGkTMqLxWuBDQ5Bfp9Kw3JNtOgca8aoCnHckwl5XWqpJeFriwK6 GYk/ScptZm5xN/3p62C9bFk2SYVeS/JUjbzdVGcLzBJEnIxsET6KmvMnRlQ9JhH4Y4 JUItdF9xncCKQAMaGJTm7auXymRmQYZV3AOe9MySdymnImb2JMSSaKzAZeQSa3HDcy FF4YRQyyp2bcg== Date: Wed, 21 Feb 2024 19:15:45 +0000 To: Po-Chuan Hsieh From: jbo@insane.engineer 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: In-Reply-To: <202402211539.41LFd7Oo090837@gitrepo.freebsd.org> References: <202402211539.41LFd7Oo090837@gitrepo.freebsd.org> Feedback-ID: 40997969:user:proton 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: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Tg5bT2yFWz42LR X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.40.0/24, country:CH] On Wednesday, February 21st, 2024 at 16:39, Po-Chuan Hsieh 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