From nobody Mon May 9 10:24:39 2022 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 561471ABFE39; Mon, 9 May 2022 10:24:40 +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 4Kxcjh192Bz4vC9; Mon, 9 May 2022 10:24:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652091880; 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=uHeYscLZc3vt5NHRutX6BIjQW8e75TL5eHzlpuvs158=; b=ZlaAMpTzQhGy6zALRPb1KtkO+OnMuvIQe8T3TVo2S1FwoqTTgEwfZUpYJTezc0G8sK28tg 8/Bqts+6ooZHSxTRZhHcS5U7sMjN5vF2gEpzgBqo7EE1wOG3VN6ecJN5eUmk19kKQwnty4 TUgKHLUC/6VJ4qHY+eiHL7ChJY6Ao4Gu4b6ks1wz089rk49khhr/cXudjvQVGJKJBjnZot 8qv26UHvPDLT18Mx6Nck19SRhUgUjZFc8brh4m5uGEvCEiNKZx7T0FIH0MLm8fNkc1C1KY WcWtE/SPkb45iBkd2Sek5GQFmszHtXyISLcMRK3nV51eDLLIv5ThZuu8V2gcdQ== 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 F25F37507; Mon, 9 May 2022 10:24:39 +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 249AOdif056364; Mon, 9 May 2022 10:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249AOdD7056363; Mon, 9 May 2022 10:24:39 GMT (envelope-from git) Date: Mon, 9 May 2022 10:24:39 GMT Message-Id: <202205091024.249AOdD7056363@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ffb9e31366f3 - main - devel/fccf: update to 0.6.0 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: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ffb9e31366f33a736803a7d5b5703d09981e6a20 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652091880; 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=uHeYscLZc3vt5NHRutX6BIjQW8e75TL5eHzlpuvs158=; b=L2E3Ug7JOldMifYBmiULF4NiX8AV/NJI13BNdMMa1d2lEX3O5cfniukxDbNEMwohN2bQ5Q 7nABYJsjQjcXCwgBsJnVs04sXIsfNE8Lay8e+ijF6EODLtcgK4NkKebD8FasDwAvZVHtku 37sy2bO/hwMmPTFBXW84JPdIsmHb7XmNbnHoXRbEZUWb5W02AoQfvhUQ9lpQVFCKLRgmMi N5Elez9J30Zy3gWus6kPMs/nbjekkM6fNv99fKHCo5g4o1O2zCo8HJ16o39rD4k5vaeOyO aWq2f3z9B3cvWywKBJtxu4JzK0mQ3UFwMAwBWuNX2SBXR+KvYOcWW/HzNSOcrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652091880; a=rsa-sha256; cv=none; b=igYLoL9U+j4vNEIuyuKyTi89n1+cG3xm2mAAcunOhHwQ+5xYc/a5oVUBmymIpIG8QQB9QS DPQjil76u/BlfNhb8iyRjuJD8OtYlZi+yKoXopNVTO96xpDJvTJrnUFAwNXDrsomtd+a8w v8VlvwJGlS0IKrjDj1G1WIPRII9ZEob8FhPb6Uw7nsx7W1UsMCun68Fj2R+0VV/KE/3ltT 09ma+EwUc1EHNn4HmK6VM7NzvPcbIJdWYI5Nlj3GFWYqN/OF8GWs8krvWOXPg9pYa8oVYp 86xBZSIIlO3w+jh8Ng6yM0hHgzf5Dnv966sumfQwiV4gO8ieiO32Wv3ekJ/ZGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ffb9e31366f33a736803a7d5b5703d09981e6a20 commit ffb9e31366f33a736803a7d5b5703d09981e6a20 Author: Baptiste Daroussin AuthorDate: 2022-05-09 10:20:26 +0000 Commit: Baptiste Daroussin CommitDate: 2022-05-09 10:24:35 +0000 devel/fccf: update to 0.6.0 Unbundle argparse (actually this fixes package building) Unbundle libgmt (also fixes package building) --- devel/fccf/Makefile | 9 +++- devel/fccf/distinfo | 6 +-- devel/fccf/files/patch-CMakeLists.txt | 54 +++++++++++++++++++++++ devel/fccf/files/patch-cmake_install-script.cmake | 11 ----- devel/fccf/pkg-plist | 5 +-- 5 files changed, 65 insertions(+), 20 deletions(-) diff --git a/devel/fccf/Makefile b/devel/fccf/Makefile index 2df369481794..55d9286ac3f4 100644 --- a/devel/fccf/Makefile +++ b/devel/fccf/Makefile @@ -1,5 +1,5 @@ PORTNAME= fccf -PORTVERSION= 0.5.0 +PORTVERSION= 0.6.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -8,13 +8,18 @@ COMMENT= Command-line tool that quickly searches through C/C++ LICENSE= MIT -BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} +BUILD_DEPENDS= argparse>0:devel/argparse \ + llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} +LIB_DEPENDS= libfmt.so:devel/libfmt +RUN_DEPENDS= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} USES= cmake USE_GITHUB= yes GH_ACCOUNT= p-ranav +CXXFLAGS+= -I${LOCALBASE}/include/argparse + post-patch: ${REINPLACE_CMD} "s/llvm-config/llvm-config${LLVM_DEFAULT}/g" ${WRKSRC}/CMakeLists.txt diff --git a/devel/fccf/distinfo b/devel/fccf/distinfo index 6500fe78bdc4..87da22e7c9f2 100644 --- a/devel/fccf/distinfo +++ b/devel/fccf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1651214882 -SHA256 (p-ranav-fccf-v0.5.0_GH0.tar.gz) = 8c4949f5cd8fc4be9858aa680c8304ceeac6dc4740fdf82e776ff66b05434bf9 -SIZE (p-ranav-fccf-v0.5.0_GH0.tar.gz) = 38074 +TIMESTAMP = 1652086245 +SHA256 (p-ranav-fccf-v0.6.0_GH0.tar.gz) = 684403084fb2838338e8dc8792e16d85e744a3b7fe0b15765266fb801a25af65 +SIZE (p-ranav-fccf-v0.6.0_GH0.tar.gz) = 38126 diff --git a/devel/fccf/files/patch-CMakeLists.txt b/devel/fccf/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..60a94ebfdcbe --- /dev/null +++ b/devel/fccf/files/patch-CMakeLists.txt @@ -0,0 +1,54 @@ +--- CMakeLists.txt.orig 2022-05-02 12:24:57 UTC ++++ CMakeLists.txt +@@ -22,29 +22,32 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native" + set(CMAKE_CXX_FLAGS_RELEASE "-O3") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + +-# ---- Argparse ------------- + +-set(CMAKE_MODULE_PATH "") +-set(CMAKE_LIBRARY_ARCHITECTURE "") ++## ---- Argparse ------------- ++# ++#set(CMAKE_MODULE_PATH "") ++#set(CMAKE_LIBRARY_ARCHITECTURE "") ++# ++#include(FetchContent) ++# ++#FetchContent_Declare(argparse ++# GIT_REPOSITORY https://github.com/p-ranav/argparse.git ++# GIT_TAG master ++#) ++#FetchContent_MakeAvailable(argparse) ++find_package(argparse) ++find_package(fmt) + +-include(FetchContent) +- +-FetchContent_Declare(argparse +- GIT_REPOSITORY https://github.com/p-ranav/argparse.git +- GIT_TAG master +-) +-FetchContent_MakeAvailable(argparse) +- + # ---- Fmt ---------------- ++# ++#set(FMT_HEADERS "") ++# ++#FetchContent_Declare(fmt ++# GIT_REPOSITORY https://github.com/fmtlib/fmt.git ++# GIT_TAG master ++#) ++#FetchContent_MakeAvailable(fmt) + +-set(FMT_HEADERS "") +- +-FetchContent_Declare(fmt +- GIT_REPOSITORY https://github.com/fmtlib/fmt.git +- GIT_TAG master +-) +-FetchContent_MakeAvailable(fmt) +- + # ---- LLVM --------------- + + find_package(LLVM REQUIRED CONFIG) diff --git a/devel/fccf/files/patch-cmake_install-script.cmake b/devel/fccf/files/patch-cmake_install-script.cmake deleted file mode 100644 index 320cd3d96984..000000000000 --- a/devel/fccf/files/patch-cmake_install-script.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake/install-script.cmake.orig 2022-04-29 07:09:29 UTC -+++ cmake/install-script.cmake -@@ -5,7 +5,7 @@ get_filename_component(prefix "${CMAKE_INSTALL_PREFIX} - ) - - get_filename_component(prefix "${CMAKE_INSTALL_PREFIX}" ABSOLUTE) --set(config_dir "${prefix}/${fccf_INSTALL_CMAKEDIR}") -+set(config_dir "\$ENV{DESTDIR}${prefix}/${fccf_INSTALL_CMAKEDIR}") - set(config_file "${config_dir}/fccfConfig.cmake") - - message(STATUS "Installing: ${config_file}") diff --git a/devel/fccf/pkg-plist b/devel/fccf/pkg-plist index 213689a6e94e..09aa64878f94 100644 --- a/devel/fccf/pkg-plist +++ b/devel/fccf/pkg-plist @@ -1,6 +1,3 @@ bin/fccf -include/argparse/argparse.hpp -lib/cmake/argparse/argparseConfig-version.cmake -lib/cmake/argparse/argparseConfig.cmake -libdata/pkgconfig/argparse.pc +%%DATADIR%%/fccfConfig.cmake %%DATADIR%%/fccfConfigVersion.cmake