git: 09f340011fb3 - main - math/armadillo: Use USES=pathfix

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09f340011fb3eaeacffc96312eeeceab34abe9e5

commit 09f340011fb3eaeacffc96312eeeceab34abe9e5
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-02-21 15:03:34 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-02-21 15:11:29 +0000

    math/armadillo: Use USES=pathfix
    
    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(-)

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=	armadillo
-DISTVERSION=	12.6.7
+PORTVERSION=	12.6.7
 PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
@@ -15,10 +15,9 @@ LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		liblapack.so:math/lapack \
 		libsuperlu.so:math/superlu
 
-USES=		blaslapack:openblas cmake:testing compiler:c++11-lang pkgconfig tar:xz
+USES=		blaslapack:openblas cmake:testing compiler:c++11-lang pathfix pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS+=	-DPKG_CONFIG_DIR=${LOCALBASE}/libdata/pkgconfig/
 CMAKE_OFF=	BUILD_SMOKE_TEST
 CMAKE_TESTING_ON=	BUILD_SMOKE_TEST
 
diff --git a/math/armadillo/files/patch-CMakeLists.txt b/math/armadillo/files/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 "${PROJECT_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})