Index: head/devel/libzim/Makefile =================================================================== --- head/devel/libzim/Makefile (revision 544637) +++ head/devel/libzim/Makefile (revision 544638) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= libzim -PORTVERSION= 5.0.0 -PORTREVISION= 4 +PORTVERSION= 6.1.8 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org COMMENT= Reference implementation of the ZIM specification LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libicui18n.so:devel/icu \ - libxapian.so:databases/xapian-core + libxapian.so:databases/xapian-core \ + libzstd.so:archivers/zstd USES= compiler:c++11-lang meson pkgconfig python:3.4+ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= openzim BINARY_ALIAS= python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config -PLIST_SUB= PORTVERSION=${PORTVERSION} +PLIST_SUB= PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//} .include Index: head/devel/libzim/distinfo =================================================================== --- head/devel/libzim/distinfo (revision 544637) +++ head/devel/libzim/distinfo (revision 544638) @@ -1,3 +1,3 @@ -TIMESTAMP = 1559136305 -SHA256 (openzim-libzim-5.0.0_GH0.tar.gz) = dbec0a36155315037a6496a9be5c7ede17171fcde47063c97ce937057b437fdb -SIZE (openzim-libzim-5.0.0_GH0.tar.gz) = 1655189 +TIMESTAMP = 1595027958 +SHA256 (openzim-libzim-6.1.8_GH0.tar.gz) = 1be605b1d22a0a7c225e80eab2cb1a249bf0f1b500ec8ed42e1091fc96c49fb3 +SIZE (openzim-libzim-6.1.8_GH0.tar.gz) = 28589142 Index: head/devel/libzim/files/patch-src_file__compound.h =================================================================== --- head/devel/libzim/files/patch-src_file__compound.h (revision 544637) +++ head/devel/libzim/files/patch-src_file__compound.h (nonexistent) @@ -1,10 +0,0 @@ ---- src/file_compound.h.orig 2018-07-11 01:26:16.144860000 +0000 -+++ src/file_compound.h 2018-07-11 01:26:30.132058000 +0000 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - namespace zim { - Property changes on: head/devel/libzim/files/patch-src_file__compound.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/libzim/files/patch-meson.build =================================================================== --- head/devel/libzim/files/patch-meson.build (revision 544637) +++ head/devel/libzim/files/patch-meson.build (revision 544638) @@ -1,26 +1,23 @@ ---- meson.build.orig 2019-04-15 13:10:25 UTC +--- meson.build.orig 2020-07-15 14:24:54 UTC +++ meson.build -@@ -1,7 +1,7 @@ - project('libzim', ['c', 'cpp'], - version : '4.0.7', - license : 'GPL2', -- default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) -+ default_options : ['c_std=c11', 'cpp_std=c++11']) - - if build_machine.system() != 'windows' +@@ -7,7 +7,8 @@ if build_machine.system() != 'windows' add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp') -@@ -22,6 +22,9 @@ else endif - conf.set('ENABLE_USE_BUFFER_HEADER', get_option('USE_BUFFER_HEADER')) -+cc = meson.get_compiler('c') -+execinfo_dep = cc.find_library('execinfo', required : false) -+ - static_linkage = get_option('static-linkage') - static_linkage = static_linkage or get_option('default_library')=='static' +-sizeof_off_t = meson.get_compiler('cpp').sizeof('off_t') ++cpp = meson.get_compiler('cpp') ++sizeof_off_t = cpp.sizeof('off_t') -@@ -73,3 +76,4 @@ pkg_mod.generate(libraries : libzim, - filebase : 'libzim', - description : 'A Library to zim.', - requires : pkg_requires) + conf = configuration_data() + conf.set('VERSION', '"@0@"'.format(meson.project_version())) +@@ -32,6 +33,10 @@ lzma_dep = dependency('liblzma', static:static_linkage + + zstd_dep = dependency('libzstd', required:false, static:static_linkage) + conf.set('ENABLE_ZSTD', zstd_dep.found()) + ++if target_machine.system() == 'freebsd' ++ execinfo_dep = cpp.find_library('execinfo') ++endif + + xapian_dep = dependency('xapian-core', + required:false, Index: head/devel/libzim/files/patch-src_buffer.cpp =================================================================== --- head/devel/libzim/files/patch-src_buffer.cpp (revision 544637) +++ head/devel/libzim/files/patch-src_buffer.cpp (revision 544638) @@ -1,11 +1,11 @@ ---- src/buffer.cpp.orig 2018-09-04 16:23:32 UTC +--- src/buffer.cpp.orig 2020-07-15 14:24:54 UTC +++ src/buffer.cpp -@@ -49,7 +49,7 @@ MMapBuffer::MMapBuffer(int fd, offset_t offset, zsize_ - #if defined(__APPLE__) +@@ -48,6 +48,8 @@ MMapBuffer::MMapBuffer(int fd, offset_t offset, zsize_ + _offset = offset-pa_offset; + #if defined(__APPLE__) || defined(__OpenBSD__) #define MAP_FLAGS MAP_PRIVATE - #else -- #define MAP_FLAGS MAP_PRIVATE|MAP_POPULATE ++#elif defined(__FreeBSD__) + #define MAP_FLAGS MAP_PRIVATE|MAP_PREFAULT_READ + #else + #define MAP_FLAGS MAP_PRIVATE|MAP_POPULATE #endif - #if !MMAP_SUPPORT_64 - if(pa_offset.v >= INT32_MAX) { Index: head/devel/libzim/files/patch-src_fs__unix.cpp =================================================================== --- head/devel/libzim/files/patch-src_fs__unix.cpp (revision 544637) +++ head/devel/libzim/files/patch-src_fs__unix.cpp (revision 544638) @@ -1,11 +1,11 @@ ---- src/fs_unix.cpp.orig 2018-12-04 23:56:33 UTC +--- src/fs_unix.cpp.orig 2020-07-15 14:24:54 UTC +++ src/fs_unix.cpp @@ -34,7 +34,7 @@ namespace unix { zsize_t FD::readAt(char* dest, zsize_t size, offset_t offset) const { --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) +-#if defined(__APPLE__) || defined(__OpenBSD__) ++#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) # define PREAD pread #else # define PREAD pread64 Index: head/devel/libzim/files/patch-src_meson.build =================================================================== --- head/devel/libzim/files/patch-src_meson.build (revision 544637) +++ head/devel/libzim/files/patch-src_meson.build (revision 544638) @@ -1,13 +1,13 @@ ---- src/meson.build.orig 2018-09-04 16:23:32 UTC +--- src/meson.build.orig 2020-07-15 14:24:54 UTC +++ src/meson.build -@@ -58,6 +58,10 @@ if zlib_dep.found() - deps += [zlib_dep] +@@ -56,6 +56,10 @@ if zstd_dep.found() + deps += [zstd_dep] endif -+if execinfo_dep.found() ++if target_machine.system() == 'freebsd' + deps += [execinfo_dep] +endif + if xapian_dep.found() sources += xapian_sources sources += lib_resources Index: head/devel/libzim/pkg-plist =================================================================== --- head/devel/libzim/pkg-plist (revision 544637) +++ head/devel/libzim/pkg-plist (revision 544638) @@ -1,17 +1,17 @@ include/zim/article.h include/zim/blob.h include/zim/error.h include/zim/file.h include/zim/fileheader.h include/zim/fileiterator.h include/zim/search.h include/zim/search_iterator.h include/zim/uuid.h include/zim/writer/article.h include/zim/writer/creator.h include/zim/writer/url.h include/zim/zim.h lib/libzim.so -lib/libzim.so.5 +lib/libzim.so.%%PORTMAJ%% lib/libzim.so.%%PORTVERSION%% libdata/pkgconfig/libzim.pc