devel/libzim: update to 4.0.4

8 files changed, 33 insertions, 32 deletions

diff --git a/devel/libzim/Makefile b/devel/libzim/Makefile
index 28c26f7a02a9..a217572005e1 100644
--- a/devel/libzim/Makefile
+++ b/devel/libzim/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libzim
-PORTVERSION=	4.0.0
-PORTREVISION=	2
+PORTVERSION=	4.0.4
 CATEGORIES=	devel
 
 MAINTAINER=	swills@FreeBSD.org
@@ -17,5 +16,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	openzim
 
 BINARY_ALIAS=	python3=python${PYTHON_VER} python3-config=python${PYTHON_VER}-config
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/libzim/distinfo b/devel/libzim/distinfo
index d2cef78ee80e..eeac0e6700a0 100644
--- a/devel/libzim/distinfo
+++ b/devel/libzim/distinfo
@@ -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
diff --git a/devel/libzim/files/patch-meson.build b/devel/libzim/files/patch-meson.build
index 24f075f1a1ee..3e1c2ae6edbd 100644
--- a/devel/libzim/files/patch-meson.build
+++ b/devel/libzim/files/patch-meson.build
@@ -1,17 +1,17 @@
---- 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)
@@ -19,7 +19,7 @@
  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)
diff --git a/devel/libzim/files/patch-src_buffer.cpp b/devel/libzim/files/patch-src_buffer.cpp
index c3745c828bf8..9dd0ddb6ed6e 100644
--- a/devel/libzim/files/patch-src_buffer.cpp
+++ b/devel/libzim/files/patch-src_buffer.cpp
@@ -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) {
diff --git a/devel/libzim/files/patch-src_file__reader.cpp b/devel/libzim/files/patch-src_file__reader.cpp
deleted file mode 100644
index 9a9ca179c0aa..000000000000
--- a/devel/libzim/files/patch-src_file__reader.cpp
+++ /dev/null
@@ -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 <fcntl.h>
- #include <lzma.h>
- #include <pthread.h>
-+#include <unistd.h>
- 
- #if defined(ENABLE_ZLIB)
- #include <zlib.h>
diff --git a/devel/libzim/files/patch-src_fs__unix.cpp b/devel/libzim/files/patch-src_fs__unix.cpp
new file mode 100644
index 000000000000..043db4eca68d
--- /dev/null
+++ b/devel/libzim/files/patch-src_fs__unix.cpp
@@ -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
diff --git a/devel/libzim/files/patch-src_meson.build b/devel/libzim/files/patch-src_meson.build
index 14ded85384a8..e13ad0127d28 100644
--- a/devel/libzim/files/patch-src_meson.build
+++ b/devel/libzim/files/patch-src_meson.build
@@ -1,6 +1,6 @@
---- 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
  
diff --git a/devel/libzim/pkg-plist b/devel/libzim/pkg-plist
index 0410671f0778..3dca3ef97348 100644
--- a/devel/libzim/pkg-plist
+++ b/devel/libzim/pkg-plist
@@ -12,5 +12,5 @@ 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