CVS commit: pkgsrc/archivers/minizip-ng

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jun 26 16:16:26 UTC 2024

Modified Files:
        pkgsrc/archivers/minizip-ng: Makefile PLIST distinfo

Log Message:
minizip-ng: updated to 4.0.7

4.0.7

Added definition for zipOpenNewFileInZip64 for backwards compat
Upgrade to GoogleTest Framework v1.13.0.
Rename minizip_cmd project to minizip_cli.
Rename cli instead of lib for VS conflicts to prevent linker error.
Various CI fixes

4.0.6

Fixed zstd master branch no longer working.
Switch to using zlib-ng stable.
Update liblzma repository to GitHub.
Fixed listing empty zip file.
Revert "Add empty directories to zip file.
Bump github/codeql-action from 2 to 3
Bump codecov/codecov-action from 3 to 4
Bump actions/upload-artifact from 3 to 4
Bump actions/checkout from 3 to 4
Bump svenstaro/upload-release-action from 1.pre.release to 2.9.0
Bump actions/checkout from 3 to 4
Bump actions/upload-artifact from 3 to 4
Bump svenstaro/upload-release-action from 1.pre.release to 2.9.0
Bump github/codeql-action from 2 to 3
Bump codecov/codecov-action from 3 to 4


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/minizip-ng/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/archivers/minizip-ng/PLIST \
    pkgsrc/archivers/minizip-ng/distinfo

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

Modified files:

Index: pkgsrc/archivers/minizip-ng/Makefile
diff -u pkgsrc/archivers/minizip-ng/Makefile:1.4 pkgsrc/archivers/minizip-ng/Makefile:1.5
--- pkgsrc/archivers/minizip-ng/Makefile:1.4    Sun Dec 17 09:37:24 2023
+++ pkgsrc/archivers/minizip-ng/Makefile        Wed Jun 26 16:16:26 2024
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2023/12/17 09:37:24 nros Exp $
+# $NetBSD: Makefile,v 1.5 2024/06/26 16:16:26 adam Exp $
 
-DISTNAME=      minizip-ng-4.0.2
+DISTNAME=      minizip-ng-4.0.7
 CATEGORIES=    archivers
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=zlib-ng/}
 GITHUB_PROJECT=        minizip-ng
 GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/zlib-ng/minizip-ng/
+HOMEPAGE=      https://github.com/zlib-ng/minizip-ng
 COMMENT=       Zip manipulation library written in C
 LICENSE=       zlib
 
@@ -17,16 +17,23 @@ USE_TOOLS+= pkg-config
 PKGCONFIG_OVERRIDE=    minizip.pc.cmakein
 
 CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=YES
-CMAKE_CONFIGURE_ARGS+= -DMZ_BZIP2=YES
-CMAKE_CONFIGURE_ARGS+= -DMZ_LZMA=YES
-CMAKE_CONFIGURE_ARGS+= -DMZ_ZSTD=YES
 CMAKE_CONFIGURE_ARGS+= -DMZ_COMPAT=NO
 
+PLIST_VARS+=   libcomp zlib
+
+.include "../../mk/bsd.prefs.mk"
+# On Darwin, libcompression is preferred over zlib, see CMakeLists.txt
+.if ${OPSYS} == "Darwin"
+PLIST.libcomp= yes
+.else
+PLIST.zlib=    yes
+.include "../../archivers/zlib-ng/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.endif
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/archivers/minizip-ng/PLIST
diff -u pkgsrc/archivers/minizip-ng/PLIST:1.2 pkgsrc/archivers/minizip-ng/PLIST:1.3
--- pkgsrc/archivers/minizip-ng/PLIST:1.2       Tue Nov  7 19:50:35 2023
+++ pkgsrc/archivers/minizip-ng/PLIST   Wed Jun 26 16:16:26 2024
@@ -1,17 +1,18 @@
-@comment $NetBSD: PLIST,v 1.2 2023/11/07 19:50:35 nros Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/06/26 16:16:26 adam Exp $
 include/minizip-ng/mz.h
 include/minizip-ng/mz_crypt.h
 include/minizip-ng/mz_os.h
 include/minizip-ng/mz_strm.h
 include/minizip-ng/mz_strm_buf.h
 include/minizip-ng/mz_strm_bzip.h
+${PLIST.libcomp}include/minizip-ng/mz_strm_libcomp.h
 include/minizip-ng/mz_strm_lzma.h
 include/minizip-ng/mz_strm_mem.h
 include/minizip-ng/mz_strm_os.h
 include/minizip-ng/mz_strm_pkcrypt.h
 include/minizip-ng/mz_strm_split.h
 include/minizip-ng/mz_strm_wzaes.h
-include/minizip-ng/mz_strm_zlib.h
+${PLIST.zlib}include/minizip-ng/mz_strm_zlib.h
 include/minizip-ng/mz_strm_zstd.h
 include/minizip-ng/mz_zip.h
 include/minizip-ng/mz_zip_rw.h
@@ -20,6 +21,6 @@ lib/cmake/minizip-ng/minizip-ng-config.c
 lib/cmake/minizip-ng/minizip-ng-noconfig.cmake
 lib/cmake/minizip-ng/minizip-ng.cmake
 lib/libminizip-ng.so
-lib/libminizip-ng.so.4
 lib/libminizip-ng.so.${PKGVERSION}
+lib/libminizip-ng.so.4
 lib/pkgconfig/minizip-ng.pc
Index: pkgsrc/archivers/minizip-ng/distinfo
diff -u pkgsrc/archivers/minizip-ng/distinfo:1.2 pkgsrc/archivers/minizip-ng/distinfo:1.3
--- pkgsrc/archivers/minizip-ng/distinfo:1.2    Tue Nov  7 19:50:35 2023
+++ pkgsrc/archivers/minizip-ng/distinfo        Wed Jun 26 16:16:26 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2023/11/07 19:50:35 nros Exp $
+$NetBSD: distinfo,v 1.3 2024/06/26 16:16:26 adam Exp $
 
-BLAKE2s (minizip-ng-4.0.2.tar.gz) = 4ee7f317fb040f632abdd56b2cad5dc3e4faeb2b8622ee9e38c26c1840d095c6
-SHA512 (minizip-ng-4.0.2.tar.gz) = 4e626a312c35e5f003e4f365261ef3e1bf33488f8698ec31b1b33d32f6a34ed0b54f0e3ffdae658e5b441532dde3cee45c3822532f52e68ea588e809e8f4081c
-Size (minizip-ng-4.0.2.tar.gz) = 769745 bytes
+BLAKE2s (minizip-ng-4.0.7.tar.gz) = 01c3bb7c32816e87535f6f39be5d372c95478e1dde9211841cb98559397cc745
+SHA512 (minizip-ng-4.0.7.tar.gz) = af9c8743d34bbc8f371a018debfab5f857aadb9a1129b048dbce9085122bef209ade34837784f91424c9eba92406d2e222476d9f8038839908679f7b7dc9e3eb
+Size (minizip-ng-4.0.7.tar.gz) = 770098 bytes