diff --git a/archivers/zchunk/Makefile b/archivers/zchunk/Makefile index 1e412b018c55..6cbe415099cd 100644 --- a/archivers/zchunk/Makefile +++ b/archivers/zchunk/Makefile @@ -1,33 +1,33 @@ PORTNAME= zchunk -DISTVERSION= 1.3.2 +DISTVERSION= 1.4.0 CATEGORIES= archivers MAINTAINER= yuri@FreeBSD.org COMMENT= Compressed file format that splits the file into independent chunks WWW= https://github.com/zchunk/zchunk LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libargp.so:devel/argp-standalone \ libcurl.so:ftp/curl USES= localbase:ldflags meson pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes LDFLAGS+= ${LOCALBASE}/lib/libargp.so # workaround for https://github.com/zchunk/zchunk/issues/30 OPTIONS_DEFINE= OPENSSL ZSTD OPTIONS_DEFAULT= OPENSSL ZSTD OPENSSL_MESON_ON= -Dwith-openssl=enabled OPENSSL_MESON_OFF= -Dwith-openssl=disabled OPENSSL_USES= ssl OPENSSL_LDFLAGS= -L${OPENSSLLIB} -lssl -lcrypto # workaround for https://github.com/zchunk/zchunk/issues/31 ZSTD_MESON_ON= -Dwith-zstd=enabled ZSTD_MESON_OFF= -Dwith-zstd=disabled ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include diff --git a/archivers/zchunk/distinfo b/archivers/zchunk/distinfo index f16a711dbc15..2d8c1886b78b 100644 --- a/archivers/zchunk/distinfo +++ b/archivers/zchunk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699200043 -SHA256 (zchunk-zchunk-1.3.2_GH0.tar.gz) = 4d923d32af7db33f3c0a6655b258e857a2ca564912cf85ddce14e9b1b7d495bf -SIZE (zchunk-zchunk-1.3.2_GH0.tar.gz) = 1508683 +TIMESTAMP = 1703049106 +SHA256 (zchunk-zchunk-1.4.0_GH0.tar.gz) = 6def0481935006052774e034a22c18a1b668b8c93510188673138312003890eb +SIZE (zchunk-zchunk-1.4.0_GH0.tar.gz) = 1513670 diff --git a/archivers/zchunk/files/patch-meson.build b/archivers/zchunk/files/patch-meson.build index 7a5a07726815..f3173e00e262 100644 --- a/archivers/zchunk/files/patch-meson.build +++ b/archivers/zchunk/files/patch-meson.build @@ -1,23 +1,25 @@ ---- meson.build.orig 2022-02-20 17:07:24 UTC +--- meson.build.orig 2023-12-19 20:01:52 UTC +++ meson.build -@@ -43,10 +43,19 @@ endif +@@ -43,12 +43,21 @@ endif if build_machine.system() == 'windows' openssl_dep = dependency('openssl', modules : ['OpenSSL::SSL', 'OpenSSL::Crypto'], required : get_option('with-openssl')) else - openssl_dep = dependency('openssl', required : get_option('with-openssl')) + openssl_dep = dependency('openssl', required : false) endif if openssl_dep.found() add_project_arguments('-DZCHUNK_OPENSSL', language : 'c') + if openssl_dep.version().version_compare('<3.0.0') + add_project_arguments('-DZCHUNK_OPENSSL_DEPRECATED', language : 'c') ++ endif +else + openssl_dep = [ + cc.find_library('ssl', required: get_option('with-openssl')), + cc.find_library('crypto', required: get_option('with-openssl')) + ] + openssl_dep = openssl_dep[0] + if openssl_dep.found() + add_project_arguments('-DZCHUNK_OPENSSL', language : 'c') -+ endif + endif endif - # includes diff --git a/archivers/zchunk/pkg-plist b/archivers/zchunk/pkg-plist index 53ecbfd29335..74cd98bc0d19 100644 --- a/archivers/zchunk/pkg-plist +++ b/archivers/zchunk/pkg-plist @@ -1,17 +1,17 @@ bin/unzck bin/zck bin/zck_delta_size bin/zck_gen_zdict bin/zck_read_header bin/zckdl include/zck.h lib/libzck.so lib/libzck.so.1 -lib/libzck.so.1.3.2 +lib/libzck.so.1.4.0 libdata/pkgconfig/zck.pc man/man1/unzck.1.gz man/man1/zck.1.gz man/man1/zck_delta_size.1.gz man/man1/zck_gen_zdict.1.gz man/man1/zck_read_header.1.gz man/man1/zckdl.1.gz