From 1025e15bf0f3a21eaf26f84d303bfade064ee1ab Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 26 Jun 2023 22:38:35 +0200 Subject: [PATCH] archivers/libzip: Update to 1.10.0 * Remove Perl dependency * Unit tests relies on unported libraries, disable for now * Disable RPATH via CMAKE_SKIP_RPATH argument instead of patching Changelog: https://github.com/nih-at/libzip/releases/tag/v1.10.0 PR: 272208 Reviewed by: rakuco (maintainer) --- archivers/libzip/Makefile | 10 ++++------ archivers/libzip/distinfo | 6 +++--- archivers/libzip/files/patch-CMakeLists.txt | 12 ------------ archivers/libzip/pkg-plist | 11 ++++++++++- 4 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 archivers/libzip/files/patch-CMakeLists.txt diff --git a/archivers/libzip/Makefile b/archivers/libzip/Makefile index 7f4a0b7db131d..f86ad3633026f 100644 --- a/archivers/libzip/Makefile +++ b/archivers/libzip/Makefile @@ -1,5 +1,5 @@ PORTNAME= libzip -PORTVERSION= 1.9.2 +DISTVERSION= 1.10.0 CATEGORIES= archivers devel MASTER_SITES= https://github.com/nih-at/${PORTNAME}/releases/download/v${DISTVERSION}/ \ https://libzip.org/download/ @@ -13,13 +13,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libzstd.so:archivers/zstd -USES= cmake cpe perl5 ssl tar:xz +USES= cmake cpe pathfix ssl tar:xz CPE_VENDOR= nih USE_LDCONFIG= yes -USE_PERL5= test -TEST_TARGET= test - -CMAKE_OFF= ENABLE_COMMONCRYPTO ENABLE_GNUTLS ENABLE_MBEDTLS +CMAKE_OFF= BUILD_REGRESS ENABLE_COMMONCRYPTO ENABLE_GNUTLS ENABLE_MBEDTLS +CMAKE_ON= CMAKE_SKIP_RPATH .include diff --git a/archivers/libzip/distinfo b/archivers/libzip/distinfo index e27c6facec90a..a807d29d7f07a 100644 --- a/archivers/libzip/distinfo +++ b/archivers/libzip/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657800190 -SHA256 (libzip-1.9.2.tar.xz) = c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 -SIZE (libzip-1.9.2.tar.xz) = 763980 +TIMESTAMP = 1687547011 +SHA256 (libzip-1.10.0.tar.xz) = cd2a7ac9f1fb5bfa6218272d9929955dc7237515bba6e14b5ad0e1d1e2212b43 +SIZE (libzip-1.10.0.tar.xz) = 771676 diff --git a/archivers/libzip/files/patch-CMakeLists.txt b/archivers/libzip/files/patch-CMakeLists.txt deleted file mode 100644 index e61a1ad90aec5..0000000000000 --- a/archivers/libzip/files/patch-CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -Do not set RPATH on FreeBSD either. ---- CMakeLists.txt.orig 2020-07-15 08:02:19 UTC -+++ CMakeLists.txt -@@ -237,7 +237,7 @@ if(WIN32) - endif(WIN32) - - # rpath handling: use rpath in installed binaries --if(NOT CMAKE_SYSTEM_NAME MATCHES Linux) -+if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD|Linux") - set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - endif() diff --git a/archivers/libzip/pkg-plist b/archivers/libzip/pkg-plist index e5713f79a16ce..42714a786d388 100644 --- a/archivers/libzip/pkg-plist +++ b/archivers/libzip/pkg-plist @@ -7,6 +7,9 @@ lib/cmake/libzip/libzip-config-version.cmake lib/cmake/libzip/libzip-config.cmake lib/cmake/libzip/libzip-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libzip/libzip-targets.cmake +lib/cmake/libzip/modules/FindMbedTLS.cmake +lib/cmake/libzip/modules/FindNettle.cmake +lib/cmake/libzip/modules/Findzstd.cmake lib/libzip.so lib/libzip.so.5 lib/libzip.so.5.5 @@ -109,7 +112,10 @@ share/man/man3/zip_source_free.3.gz share/man/man3/zip_source_function.3.gz share/man/man3/zip_source_function_create.3.gz share/man/man3/zip_source_is_deleted.3.gz +share/man/man3/zip_source_is_seekable.3.gz share/man/man3/zip_source_keep.3.gz +share/man/man3/zip_source_layered.3.gz +share/man/man3/zip_source_layered_create.3.gz share/man/man3/zip_source_make_command_bitmap.3.gz share/man/man3/zip_source_open.3.gz share/man/man3/zip_source_read.3.gz @@ -126,9 +132,12 @@ share/man/man3/zip_source_win32handle.3.gz share/man/man3/zip_source_win32handle_create.3.gz share/man/man3/zip_source_win32w.3.gz share/man/man3/zip_source_win32w_create.3.gz -share/man/man3/zip_source_window.3.gz +share/man/man3/zip_source_window_create.3.gz share/man/man3/zip_source_write.3.gz share/man/man3/zip_source_zip.3.gz +share/man/man3/zip_source_zip_create.3.gz +share/man/man3/zip_source_zip_file.3.gz +share/man/man3/zip_source_zip_file_create.3.gz share/man/man3/zip_stat.3.gz share/man/man3/zip_stat_index.3.gz share/man/man3/zip_stat_init.3.gz