Date: Sun, 4 Aug 2024 21:18:42 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 30787d9c73a7 - main - textproc/xlsxio: Fix cmake files installation Message-ID: <202408042118.474LIgYO062771@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=30787d9c73a7830315254b519f98cb88b8e0deeb commit 30787d9c73a7830315254b519f98cb88b8e0deeb Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-08-04 21:15:53 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-08-04 21:15:53 +0000 textproc/xlsxio: Fix cmake files installation - Bump PORTREVISION for package change --- textproc/xlsxio/Makefile | 1 + textproc/xlsxio/files/patch-CMakeLists.txt | 11 +++++++++++ textproc/xlsxio/pkg-plist | 8 ++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/textproc/xlsxio/Makefile b/textproc/xlsxio/Makefile index 2b4ad9c33965..4a5d876e1aa7 100644 --- a/textproc/xlsxio/Makefile +++ b/textproc/xlsxio/Makefile @@ -1,5 +1,6 @@ PORTNAME= xlsxio PORTVERSION= 0.2.35 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= https://github.com/brechtsanders/xlsxio/releases/download/${PORTVERSION}/ diff --git a/textproc/xlsxio/files/patch-CMakeLists.txt b/textproc/xlsxio/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..14de994e08c6 --- /dev/null +++ b/textproc/xlsxio/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2023-08-03 09:33:03 UTC ++++ CMakeLists.txt +@@ -275,7 +275,7 @@ MACRO(generate_and_install_config_files _NAME _DESC _L + STRING(REGEX REPLACE "\([^ ]*\)[/\\]lib([^ /\\.]*).[^ ]*" "-L\\1 -l\\2" XLSXIO_LDFLAGS "${XLSXIO_LDFLAGS}") + CONFIGURE_FILE(templateConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}Config.cmake" @ONLY) + CONFIGURE_FILE(templateConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}ConfigVersion.cmake" @ONLY) +- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}ConfigVersion.cmake" DESTINATION cmake) ++ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}ConfigVersion.cmake" DESTINATION lib/cmake/xlsxio) + IF (BUILD_PC_FILES) + CONFIGURE_FILE(template.pc.in "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}.pc" @ONLY) + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}.pc" DESTINATION lib/pkgconfig) diff --git a/textproc/xlsxio/pkg-plist b/textproc/xlsxio/pkg-plist index f7573c7a3912..ce359164a35f 100644 --- a/textproc/xlsxio/pkg-plist +++ b/textproc/xlsxio/pkg-plist @@ -1,15 +1,15 @@ bin/xlsxio_csv2xlsx bin/xlsxio_xlsx2csv -cmake/libxlsxio_readConfig.cmake -cmake/libxlsxio_readConfigVersion.cmake -cmake/libxlsxio_writeConfig.cmake -cmake/libxlsxio_writeConfigVersion.cmake cmake/xlsxio-config.cmake cmake/xlsxioTargets-%%CMAKE_BUILD_TYPE%%.cmake cmake/xlsxioTargets.cmake include/xlsxio_read.h include/xlsxio_version.h include/xlsxio_write.h +lib/cmake/xlsxio/libxlsxio_readConfig.cmake +lib/cmake/xlsxio/libxlsxio_readConfigVersion.cmake +lib/cmake/xlsxio/libxlsxio_writeConfig.cmake +lib/cmake/xlsxio/libxlsxio_writeConfigVersion.cmake lib/libxlsxio_read.a lib/libxlsxio_read.so lib/libxlsxio_write.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408042118.474LIgYO062771>