CVS commit: pkgsrc/archivers/zziplib

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Feb 28 17:58:00 UTC 2024

Modified Files:
        pkgsrc/archivers/zziplib: Makefile PLIST distinfo
        pkgsrc/archivers/zziplib/patches: patch-zzip_mmapped.c
Removed Files:
        pkgsrc/archivers/zziplib/patches: patch-zzip_CMakeLists.txt
            patch-zzipwrap_CMakeLists.txt

Log Message:
zziplib: updated to 0.13.73

release 0.13.73
* fixed last cmake bug - parallel builds can lead to race condition
* abolished centos8 testbuilds and prepared ubuntu24
* integrated some github patches
* prepare autoformat with clang-format (not yet enforced)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/archivers/zziplib/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/zziplib/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/archivers/zziplib/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/archivers/zziplib/patches/patch-zzip_CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/archivers/zziplib/patches/patch-zzipwrap_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/zziplib/Makefile
diff -u pkgsrc/archivers/zziplib/Makefile:1.35 pkgsrc/archivers/zziplib/Makefile:1.36
--- pkgsrc/archivers/zziplib/Makefile:1.35      Mon Jan  1 22:18:12 2024
+++ pkgsrc/archivers/zziplib/Makefile   Wed Feb 28 17:58:00 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2024/01/01 22:18:12 nros Exp $
+# $NetBSD: Makefile,v 1.36 2024/02/28 17:58:00 adam Exp $
 
-DISTNAME=      zziplib-0.13.72
-PKGREVISION=   3
+DISTNAME=      zziplib-0.13.73
 CATEGORIES=    archivers
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gdraheim/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -25,9 +24,7 @@ PKGCONFIG_OVERRIDE_STAGE=     post-build
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=   dylib
 .if ${SHLIB_TYPE} == "dylib"
-PLIST.dylib=   yes
 PLIST_SUBST+=  SOEXT=dylib
 .else
 PLIST_SUBST+=  SOEXT=so

Index: pkgsrc/archivers/zziplib/PLIST
diff -u pkgsrc/archivers/zziplib/PLIST:1.11 pkgsrc/archivers/zziplib/PLIST:1.12
--- pkgsrc/archivers/zziplib/PLIST:1.11 Fri Jan 15 07:15:12 2021
+++ pkgsrc/archivers/zziplib/PLIST      Wed Feb 28 17:58:00 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2021/01/15 07:15:12 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.12 2024/02/28 17:58:00 adam Exp $
 bin/unzip-mem
 bin/unzzip
 bin/unzzip-big
@@ -31,29 +31,26 @@ include/zzip/write.h
 include/zzip/zzip.h
 include/zzip/zzip32.h
 include/zziplib.h
-${PLIST.dylib}lib/libzzip-0.13.0.72.dylib
-lib/libzzip-0.so
 lib/libzzip-0.${SOEXT}.10
 lib/libzzip-0.${SOEXT}.11
 lib/libzzip-0.${SOEXT}.12
+lib/libzzip-0.so
 lib/libzzip-0.so.13
-lib/libzzip-0.${SOEXT}.13.0.72
+lib/libzzip-0.so.13.0.72
 lib/libzzip.so
-${PLIST.dylib}lib/libzzipfseeko-0.13.0.72.dylib
-lib/libzzipfseeko-0.so
 lib/libzzipfseeko-0.${SOEXT}.10
 lib/libzzipfseeko-0.${SOEXT}.11
 lib/libzzipfseeko-0.${SOEXT}.12
+lib/libzzipfseeko-0.so
 lib/libzzipfseeko-0.so.13
-lib/libzzipfseeko-0.${SOEXT}.13.0.72
+lib/libzzipfseeko-0.so.13.0.72
 lib/libzzipfseeko.so
-${PLIST.dylib}lib/libzzipmmapped-0.13.0.72.dylib
-lib/libzzipmmapped-0.so
 lib/libzzipmmapped-0.${SOEXT}.10
 lib/libzzipmmapped-0.${SOEXT}.11
 lib/libzzipmmapped-0.${SOEXT}.12
+lib/libzzipmmapped-0.so
 lib/libzzipmmapped-0.so.13
-lib/libzzipmmapped-0.${SOEXT}.13.0.72
+lib/libzzipmmapped-0.so.13.0.72
 lib/libzzipmmapped.so
 lib/libzzipwrap-0.so
 lib/libzzipwrap-0.so.13
@@ -154,3 +151,6 @@ man/man3/zzip_tell32.3
 man/man3/zzip_telldir.3
 man/man3/zzip_telldir32.3
 share/aclocal/zziplib.m4
+share/zziplib/zziplib-config.cmake
+share/zziplib/zziplibTargets-release.cmake
+share/zziplib/zziplibTargets.cmake

Index: pkgsrc/archivers/zziplib/distinfo
diff -u pkgsrc/archivers/zziplib/distinfo:1.25 pkgsrc/archivers/zziplib/distinfo:1.26
--- pkgsrc/archivers/zziplib/distinfo:1.25      Fri Nov 17 15:25:13 2023
+++ pkgsrc/archivers/zziplib/distinfo   Wed Feb 28 17:58:00 2024
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.25 2023/11/17 15:25:13 schmonz Exp $
+$NetBSD: distinfo,v 1.26 2024/02/28 17:58:00 adam Exp $
 
-BLAKE2s (zziplib-0.13.72.tar.gz) = 6eed02a909c501f6b36043e49986cf8517459adc158f59e2e6c65b25239c6afd
-SHA512 (zziplib-0.13.72.tar.gz) = 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
-Size (zziplib-0.13.72.tar.gz) = 1162175 bytes
-SHA1 (patch-zzip_CMakeLists.txt) = 3ffad6de6dcb48189880d972052d917653f138aa
-SHA1 (patch-zzip_mmapped.c) = 70efa0b817f36a462d250ed8b1d5f86cd7357188
-SHA1 (patch-zzipwrap_CMakeLists.txt) = be632707cecafcdae76a7633d60cac6261f720d8
+BLAKE2s (zziplib-0.13.73.tar.gz) = 66058d8a8109faaf1134c418ab6d308dd343387ed94617fd9dfa090efc6751b5
+SHA512 (zziplib-0.13.73.tar.gz) = 95557147d374d0e9074b83319350db9085b8ae98ff7cf7ab96a3209564597744252504adfaf4d17b0243ffb118adf2afabe7dd736e6514a7e74360cd0955e4f5
+Size (zziplib-0.13.73.tar.gz) = 1175876 bytes
+SHA1 (patch-zzip_mmapped.c) = 04c8db448d1e4154046b40ba98f20ed125b04137

Index: pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c
diff -u pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c:1.1 pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c:1.2
--- pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c:1.1   Fri Nov 17 15:25:13 2023
+++ pkgsrc/archivers/zziplib/patches/patch-zzip_mmapped.c       Wed Feb 28 17:58:00 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-zzip_mmapped.c,v 1.1 2023/11/17 15:25:13 schmonz Exp $
+$NetBSD: patch-zzip_mmapped.c,v 1.2 2024/02/28 17:58:00 adam Exp $
 
 Fix clang 15 build with patch from FreeBSD Ports.
 
---- zzip/mmapped.c.orig        2021-01-04 23:05:08.000000000 +0000
+--- zzip/mmapped.c.orig        2024-02-28 10:42:45.000000000 +0000
 +++ zzip/mmapped.c
-@@ -661,7 +661,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk, ZZIP_DISK_ENTR
+@@ -662,7 +662,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk,
  
      ___ /* a ZIP64 extended block may follow. */
      size_t csize = zzip_file_header_csize(header);
@@ -12,8 +12,8 @@ Fix clang 15 build with patch from FreeB
 +    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
+          (struct zzip_extra_zip64*)zzip_file_header_to_extras(header);
+@@ -683,7 +683,7 @@ zzip_disk_entry_fopen(ZZIP_DISK * disk,
      file->zlib.zalloc = Z_NULL;
      file->zlib.zfree = Z_NULL;
      file->zlib.avail_in = csize;