diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-05-09 10:20:26 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2022-05-09 10:24:35 +0000 |
| commit | ffb9e31366f33a736803a7d5b5703d09981e6a20 (patch) | |
| tree | 9c63fb5ba02acc6bad12d7b433732855a1175aa1 | |
| parent | 5ae9eebd6cc6ceb17deb8d625198adae2ec04eb3 (diff) | |
| download | ports-ffb9e31366f33a736803a7d5b5703d09981e6a20.tar.gz ports-ffb9e31366f33a736803a7d5b5703d09981e6a20.zip | |
devel/fccf: update to 0.6.0
Unbundle argparse (actually this fixes package building)
Unbundle libgmt (also fixes package building)
| -rw-r--r-- | devel/fccf/Makefile | 9 | ||||
| -rw-r--r-- | devel/fccf/distinfo | 6 | ||||
| -rw-r--r-- | devel/fccf/files/patch-CMakeLists.txt | 54 | ||||
| -rw-r--r-- | devel/fccf/files/patch-cmake_install-script.cmake | 11 | ||||
| -rw-r--r-- | 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 |