git: 0def0423c060 - main - devel/zziplib: Update to 0.13.74

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Sat, 09 Mar 2024 14:10:18 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0def0423c06099b1e7ae95667fbf7fba5a4a244f

commit 0def0423c06099b1e7ae95667fbf7fba5a4a244f
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-03-09 13:45:02 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-03-09 14:05:23 +0000

    devel/zziplib: Update to 0.13.74
    
    - Use USES=pathfix to fix .pc installation
    
    Changes:        https://github.com/gdraheim/zziplib/blob/master/ChangeLog
---
 devel/zziplib/Makefile            | 10 +++++-----
 devel/zziplib/distinfo            |  6 +++---
 devel/zziplib/files/patch-clang15 | 20 --------------------
 devel/zziplib/files/patch-clang16 | 23 -----------------------
 devel/zziplib/pkg-plist           | 29 ++++-------------------------
 5 files changed, 12 insertions(+), 76 deletions(-)

diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 5964aa57d556..8a8e52a1b170 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	zziplib
-PORTVERSION=	0.13.72
+PORTVERSION=	0.13.74
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -15,10 +14,10 @@ LICENSE_FILE_MPL11=	${WRKSRC}/docs/COPYING.MPL
 
 BUILD_DEPENDS=	bash:shells/bash
 
-USES=		cmake compiler:c11 cpe
+USES=		cmake compiler:c11 cpe pathfix
 
-CMAKE_OFF=	BUILD_STATIC_LIBS
-CMAKE_ON=	BUILD_SHARED_LIBS ZZIP_LIBTOOL ZZIP_PKGCONFIG ZZIPBINS ZZIPFSEEKO ZZIPMMAPPED ZZIPWRAP
+CMAKE_OFF=	FORTIFY MSVC_STATIC_RUNTIME ZZIP_COMPAT ZZIP_LIBLATEST ZZIP_LIBTOOL
+CMAKE_ON=	BUILD_SHARED_LIBS ZZIP_PKGCONFIG ZZIPBINS ZZIPFSEEKO ZZIPMMAPPED ZZIPWRAP
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
@@ -33,6 +32,7 @@ OPTIONS_DEFINE=	MANPAGES SDL TEST
 OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
+MANPAGES_CMAKE_ARGS=	-DZZIP_HTMLSITE=OFF -DZZIP_HTMPAGES=OFF -DZZIP_MANPAGES=ON
 MANPAGES_CMAKE_BOOL=	ZZIPDOCS
 MANPAGES_USES=		python:build shebangfix
 MANPAGES_VARS=		SHEBANG_GLOB=*.py
diff --git a/devel/zziplib/distinfo b/devel/zziplib/distinfo
index b4d22a605f1c..18649be8527a 100644
--- a/devel/zziplib/distinfo
+++ b/devel/zziplib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614794148
-SHA256 (gdraheim-zziplib-v0.13.72_GH0.tar.gz) = 93ef44bf1f1ea24fc66080426a469df82fa631d13ca3b2e4abaeab89538518dc
-SIZE (gdraheim-zziplib-v0.13.72_GH0.tar.gz) = 1162175
+TIMESTAMP = 1709390384
+SHA256 (gdraheim-zziplib-v0.13.74_GH0.tar.gz) = 319093aa98d39453f3ea2486a86d8a2fab2d5632f6633a2665318723a908eecf
+SIZE (gdraheim-zziplib-v0.13.74_GH0.tar.gz) = 1177162
diff --git a/devel/zziplib/files/patch-clang15 b/devel/zziplib/files/patch-clang15
deleted file mode 100644
index 7685ee124185..000000000000
--- a/devel/zziplib/files/patch-clang15
+++ /dev/null
@@ -1,20 +0,0 @@
---- zzip/mmapped.c.orig	2021-01-04 23:05:08 UTC
-+++ zzip/mmapped.c
-@@ -661,7 +661,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR
- 
-     ___ /* a ZIP64 extended block may follow. */
-     size_t csize = zzip_file_header_csize(header);
--    off_t offset = zzip_file_header_to_data(header);
-+    size_t offset = zzip_file_header_sizeto_end(header);
-     if (csize == 0xFFFFu) {
-         struct zzip_extra_zip64* zip64 =
-            zzip_file_header_to_extras(header);
-@@ -682,7 +682,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR
-     file->zlib.zalloc = Z_NULL;
-     file->zlib.zfree = Z_NULL;
-     file->zlib.avail_in = csize;
--    file->zlib.next_in = offset;
-+    file->zlib.next_in = (Bytef *)header + offset;
-     ____;
- 
-     DBG2("compressed size %i", (int) file->zlib.avail_in);
diff --git a/devel/zziplib/files/patch-clang16 b/devel/zziplib/files/patch-clang16
deleted file mode 100644
index 3168c243c061..000000000000
--- a/devel/zziplib/files/patch-clang16
+++ /dev/null
@@ -1,23 +0,0 @@
---- SDL/SDL_rwops_zzip.c.orig	2021-01-04 23:05:08 UTC
-+++ SDL/SDL_rwops_zzip.c
-@@ -15,17 +15,17 @@
- #define SDL_RWOPS_ZZIP_FILE(_context)  (ZZIP_FILE*) \
-              ((_context)->hidden.unknown.data1)
- 
--static int _zzip_seek(SDL_RWops *context, int offset, int whence)
-+static Sint64 _zzip_seek(SDL_RWops *context, Sint64 offset, int whence)
- {
-     return zzip_seek(SDL_RWOPS_ZZIP_FILE(context), offset, whence);
- }
- 
--static int _zzip_read(SDL_RWops *context, void *ptr, int size, int maxnum)
-+static size_t _zzip_read(SDL_RWops *context, void *ptr, size_t size, size_t maxnum)
- {
-     return zzip_read(SDL_RWOPS_ZZIP_FILE(context), ptr, size*maxnum) / size;
- }
- 
--static int _zzip_write(SDL_RWops *context, const void *ptr, int size, int num)
-+static size_t _zzip_write(SDL_RWops *context, const void *ptr, size_t size, size_t num)
- {
-     return 0; /* ignored */
- }
diff --git a/devel/zziplib/pkg-plist b/devel/zziplib/pkg-plist
index 83ba37df0498..25a03d67e60d 100644
--- a/devel/zziplib/pkg-plist
+++ b/devel/zziplib/pkg-plist
@@ -10,11 +10,8 @@ bin/zzxorcopy
 bin/zzxordir
 %%SDL%%include/SDL_rwops_zzip/SDL_rwops_zzip.c
 %%SDL%%include/SDL_rwops_zzip/SDL_rwops_zzip.h
-include/zzip-io.h
-include/zzip.h
 include/zzip/_config.h
 include/zzip/_msvc.h
-include/zzip/autoconf.h
 include/zzip/conf.h
 include/zzip/fetch.h
 include/zzip/file.h
@@ -31,7 +28,6 @@ include/zzip/wrap.h
 include/zzip/write.h
 include/zzip/zzip.h
 include/zzip/zzip32.h
-include/zziplib.h
 lib/libzzip.so
 lib/libzzip.so.13
 lib/libzzip.so.13.0.72
@@ -49,6 +45,7 @@ libdata/pkgconfig/zzipfseeko.pc
 libdata/pkgconfig/zziplib.pc
 libdata/pkgconfig/zzipmmapped.pc
 libdata/pkgconfig/zzipwrap.pc
+share/aclocal/zziplib.m4
 %%MANPAGES%%share/man/man3/__zzip_fetch_disk_trailer.3.gz
 %%MANPAGES%%share/man/man3/__zzip_parse_root_directory.3.gz
 %%MANPAGES%%share/man/man3/__zzip_try_open.3.gz
@@ -68,26 +65,6 @@ libdata/pkgconfig/zzipwrap.pc
 %%MANPAGES%%share/man/man3/zzip_dir_stat.3.gz
 %%MANPAGES%%share/man/man3/zzip_dirfd.3.gz
 %%MANPAGES%%share/man/man3/zzip_dirhandle.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_buffer.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_close.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_entry_fopen.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_entry_strdup_comment.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_entry_strdup_name.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_entry_to_data.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_entry_to_file_header.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_fclose.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_feof.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_findfile.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_findfirst.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_findmatch.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_findnext.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_fopen.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_fread.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_init.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_mmap.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_munmap.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_new.3.gz
-%%MANPAGES%%share/man/man3/zzip_disk_open.3.gz
 %%MANPAGES%%share/man/man3/zzip_entry_data_offset.3.gz
 %%MANPAGES%%share/man/man3/zzip_entry_fclose.3.gz
 %%MANPAGES%%share/man/man3/zzip_entry_feof.3.gz
@@ -139,4 +116,6 @@ libdata/pkgconfig/zzipwrap.pc
 %%MANPAGES%%share/man/man3/zzip_tell32.3.gz
 %%MANPAGES%%share/man/man3/zzip_telldir.3.gz
 %%MANPAGES%%share/man/man3/zzip_telldir32.3.gz
-share/aclocal/zziplib.m4
+%%DATADIR%%/zziplib-config.cmake
+%%DATADIR%%/zziplibTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/zziplibTargets.cmake