From nobody Wed Feb 21 15:39:07 2024 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 4Tg0n75wC2z59nZC; Wed, 21 Feb 2024 15:39:07 +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 4Tg0n73y7sz4lW9; Wed, 21 Feb 2024 15:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708529947; 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=WQ/h38dAGA8bj7HMw6l1sDI+qohHAa1Vnkch5j8rT8w=; b=edGyifDNi39wYsB4cyfMaypAddEXqTesQQFqEph8lpUfFh3htNsuxrYTgNhSvjKOF690WI rK2ARQA/PB/8xvWFdx7vXVLtk6E3PeYryk2bgiZ+xUgHY4Ghdgkq6CkjhNpnS9WGduFfrU ZlzDHxGjBblMMK59Naj5reMw+NATwWEr5YaR2i5/v09sXz6w5e0MjNZXitkHM0gWXeHwQA oyIbny61weAurF1rRwmZV/zJFdZYjRJN2kOvJwYBhHWA/QXyStWrMrZmYkPewdUWS4j+Y0 2AWL68Q7xAsFnrjDkPECfV0Xl3p7gt6JjQP3SrlsXJfe6OtACrEVXouS04A6Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708529947; 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=WQ/h38dAGA8bj7HMw6l1sDI+qohHAa1Vnkch5j8rT8w=; b=WWOoWfAmDjhEh5DPOqKY427RSabVQKFSbMXGA9jd9+NhACoNml7noEzSxORZhGo3nZJLFk VysCX9HvU7eFsY8h5VdSMazgLNqqZFB3TwMUIXFRT8Oc4OyCs4XoKGxlheeaokJcx8AffR fYi3h5flvMK/QkyiUVJwl+JH/PsKs4H/k43oBpLaCDA+eFmQ4Uc3xKNEGOHmvaCsOnZEk1 bksEZC6ED5A7lNwG6hDPNINKxV/Sd1j6ZHww711PFIB5Oyy7BEATKPp8cRwK5na/IrA7Dq BC68k84yi1oWJpalFvw/eU/pRIi8EmJhnmORTX0HRgs6at41x3vGWIFwdsgjvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708529947; a=rsa-sha256; cv=none; b=cAnRGrcEv3jcRm6+cE9cuMZKY+lc7eslQ6uUePwD30pmj4b22ruNucqa7IVUYmZyVAOd4s K/ExKJL6dqwZ6wulOgKJJGdTY4MoxjyV0BwxRtxbFbz+21Dz82zqRAbiuQcBwLtJzywCCy HGvf9A22mXr4EJUeC0tiC/bKcttuPXIXo2HOPiOd55/M4r35ILa7YBxZYMNeBoUMxpucit 7oA3d0eAQ0I1tuaXuPRPYLEQfJLeWNw/fdUvSRlbREAv7MYhpgpGHsovEs+YS7UTeP29VG yYFmC7KJZWmsXeCXZslLHCD1I7GC2Q8sYJdsYmn0ypOrfeBcyLyh2z9vbpyhTQ== 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 4Tg0n732B0z17yn; Wed, 21 Feb 2024 15:39:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LFd7dp090840; Wed, 21 Feb 2024 15:39:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFd7Oo090837; Wed, 21 Feb 2024 15:39:07 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:39:07 GMT Message-Id: <202402211539.41LFd7Oo090837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 09f340011fb3 - main - math/armadillo: Use USES=pathfix 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09f340011fb3eaeacffc96312eeeceab34abe9e5 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=09f340011fb3eaeacffc96312eeeceab34abe9e5 commit 09f340011fb3eaeacffc96312eeeceab34abe9e5 Author: Po-Chuan Hsieh AuthorDate: 2024-02-21 15:03:34 +0000 Commit: Po-Chuan Hsieh 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})