Index: head/devel/libzim/Makefile =================================================================== --- head/devel/libzim/Makefile (revision 486639) +++ head/devel/libzim/Makefile (revision 486640) @@ -1,21 +1,21 @@ # $FreeBSD$ PORTNAME= libzim -PORTVERSION= 4.0.0 -PORTREVISION= 2 +PORTVERSION= 4.0.4 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org COMMENT= Reference implementation of the ZIM specification LIB_DEPENDS= libicui18n.so:devel/icu \ libxapian.so:databases/xapian-core 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} .include Index: head/devel/libzim/distinfo =================================================================== --- head/devel/libzim/distinfo (revision 486639) +++ head/devel/libzim/distinfo (revision 486640) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531269487 -SHA256 (openzim-libzim-4.0.0_GH0.tar.gz) = e195d30ba1b55dd2b6529fdd84fcbed6ec35ed4ddc957ad7725edabd20c3126c -SIZE (openzim-libzim-4.0.0_GH0.tar.gz) = 1649903 +TIMESTAMP = 1543967332 +SHA256 (openzim-libzim-4.0.4_GH0.tar.gz) = 8f56a16d15e810150d3c3ee9acce3606f676c90b72936e11f77f2a2548cd4611 +SIZE (openzim-libzim-4.0.4_GH0.tar.gz) = 1653434 Index: head/devel/libzim/files/patch-src_file__reader.cpp =================================================================== --- head/devel/libzim/files/patch-src_file__reader.cpp (revision 486639) +++ head/devel/libzim/files/patch-src_file__reader.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- src/file_reader.cpp.orig 2018-07-11 01:18:06.970719000 +0000 -+++ src/file_reader.cpp 2018-07-11 01:18:17.646078000 +0000 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #if defined(ENABLE_ZLIB) - #include Property changes on: head/devel/libzim/files/patch-src_file__reader.cpp ___________________________________________________________________ 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 486639) +++ head/devel/libzim/files/patch-meson.build (revision 486640) @@ -1,26 +1,26 @@ ---- meson.build.orig 2018-06-14 22:03:52 UTC +--- meson.build.orig 2018-09-04 16:23:32 UTC +++ meson.build @@ -1,7 +1,7 @@ project('libzim', ['c', 'cpp'], - version : '4.0.0', + version : '4.0.4', license : 'GPL2', - default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) + default_options : ['c_std=c11', 'cpp_std=c++11']) - conf = configuration_data() - conf.set('VERSION', '"@0@"'.format(meson.project_version())) -@@ -9,6 +9,9 @@ conf.set('DIRENT_CACHE_SIZE', get_option('DIRENT_CACHE - conf.set('CLUSTER_CACHE_SIZE', get_option('CLUSTER_CACHE_SIZE')) - conf.set('LZMA_MEMORY_SIZE', get_option('LZMA_MEMORY_SIZE')) + 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) + zlib_dep = dependency('zlib', required:false) conf.set('ENABLE_ZLIB', zlib_dep.found()) -@@ -49,3 +52,4 @@ pkg_mod.generate(libraries : libzim, +@@ -70,3 +73,4 @@ pkg_mod.generate(libraries : libzim, filebase : 'libzim', description : 'A Library to zim.', requires : pkg_requires) + Index: head/devel/libzim/files/patch-src_buffer.cpp =================================================================== --- head/devel/libzim/files/patch-src_buffer.cpp (revision 486639) +++ head/devel/libzim/files/patch-src_buffer.cpp (revision 486640) @@ -1,11 +1,11 @@ ---- src/buffer.cpp.orig 2018-07-11 01:24:59.809896000 +0000 -+++ src/buffer.cpp 2018-07-11 01:25:29.007975000 +0000 -@@ -48,7 +48,7 @@ MMapBuffer::MMapBuffer(int fd, offset_t offset, zsize_ +--- src/buffer.cpp.orig 2018-09-04 16:23:32 UTC ++++ src/buffer.cpp +@@ -49,7 +49,7 @@ MMapBuffer::MMapBuffer(int fd, offset_t offset, zsize_ #if defined(__APPLE__) #define MAP_FLAGS MAP_PRIVATE #else - #define MAP_FLAGS MAP_PRIVATE|MAP_POPULATE + #define MAP_FLAGS MAP_PRIVATE|MAP_PREFAULT_READ #endif - _data = (char*)mmap(NULL, size.v + _offset.v, PROT_READ, MAP_FLAGS, fd, pa_offset.v); - if (_data == MAP_FAILED ) + #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 (nonexistent) +++ head/devel/libzim/files/patch-src_fs__unix.cpp (revision 486640) @@ -0,0 +1,11 @@ +--- src/fs_unix.cpp.orig 2018-12-04 23:56:33 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__) + # define PREAD pread + #else + # define PREAD pread64 Property changes on: head/devel/libzim/files/patch-src_fs__unix.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/libzim/files/patch-src_meson.build =================================================================== --- head/devel/libzim/files/patch-src_meson.build (revision 486639) +++ head/devel/libzim/files/patch-src_meson.build (revision 486640) @@ -1,13 +1,13 @@ ---- src/meson.build.orig 2018-07-11 01:43:01.888587000 +0000 -+++ src/meson.build 2018-07-11 01:43:07.416631000 +0000 -@@ -51,6 +51,10 @@ if zlib_dep.found() +--- src/meson.build.orig 2018-09-04 16:23:32 UTC ++++ src/meson.build +@@ -58,6 +58,10 @@ if zlib_dep.found() deps += [zlib_dep] endif +if execinfo_dep.found() + 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 486639) +++ head/devel/libzim/pkg-plist (revision 486640) @@ -1,16 +1,16 @@ 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/zimcreator.h include/zim/zim.h lib/libzim.so lib/libzim.so.4 -lib/libzim.so.4.0.0 +lib/libzim.so.%%PORTVERSION%% libdata/pkgconfig/libzim.pc