diff --git a/archivers/zchunk/Makefile b/archivers/zchunk/Makefile index 9c5901ec9e39..f25458a11b7c 100644 --- a/archivers/zchunk/Makefile +++ b/archivers/zchunk/Makefile @@ -1,32 +1,32 @@ PORTNAME= zchunk -DISTVERSION= 1.1.16 +DISTVERSION= 1.2.0 CATEGORIES= archivers MAINTAINER= yuri@FreeBSD.org COMMENT= Compressed file format that splits the file into independent chunks 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 815d076c2326..74406b8d1c6d 100644 --- a/archivers/zchunk/distinfo +++ b/archivers/zchunk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1623781309 -SHA256 (zchunk-zchunk-1.1.16_GH0.tar.gz) = 33934adecddc50c64615dd8cdfe52a79df674a5bb1d5e83a9c09e1d1e6e9b92c -SIZE (zchunk-zchunk-1.1.16_GH0.tar.gz) = 1452197 +TIMESTAMP = 1645979328 +SHA256 (zchunk-zchunk-1.2.0_GH0.tar.gz) = 8c9eca82845b656ccae5c0e9dc097cd7a6830981e2529677ce9a5617a1f50321 +SIZE (zchunk-zchunk-1.2.0_GH0.tar.gz) = 1508213 diff --git a/archivers/zchunk/files/patch-meson.build b/archivers/zchunk/files/patch-meson.build index aad04c686dbe..7a5a07726815 100644 --- a/archivers/zchunk/files/patch-meson.build +++ b/archivers/zchunk/files/patch-meson.build @@ -1,22 +1,23 @@ ---- meson.build.orig 2020-03-14 23:03:28 UTC +--- meson.build.orig 2022-02-20 17:07:24 UTC +++ meson.build -@@ -31,9 +31,18 @@ endif - if get_option('with-openssl') == 'disabled' - openssl_dep = dependency('', required : false) +@@ -43,10 +43,19 @@ 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') == 'enabled') -+ openssl_dep = dependency('openssl', required: false) - if openssl_dep.found() - add_project_arguments('-DZCHUNK_OPENSSL', language : 'c') -+ else -+ openssl_dep = [ -+ cc.find_library('ssl', required: get_option('with-openssl') == 'enabled'), -+ cc.find_library('crypto', required: get_option('with-openssl') == 'enabled') -+ ] -+ openssl_dep = openssl_dep[0] -+ if openssl_dep.found() -+ add_project_arguments('-DZCHUNK_OPENSSL', language : 'c') -+ endif - endif +- 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') ++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 + # includes diff --git a/archivers/zchunk/pkg-plist b/archivers/zchunk/pkg-plist index a6b202bb6157..8fc7ea572222 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.1.16 +lib/libzck.so.1.2.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