update to minizip-4.0.0, from Brad

openbsd · Jun 11, 2023 · 739d84f · 739d84f
1 parent 190a8a3
commit 739d84f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 41 deletions.
diff --git a/archivers/minizip/Makefile b/archivers/minizip/Makefile
@@ -2,11 +2,11 @@ COMMENT =	zip manipulation library
 
 GH_ACCOUNT =	zlib-ng
 GH_PROJECT =	minizip-ng
-GH_TAGNAME =	3.0.6
+GH_TAGNAME =	4.0.0
 
 PKGNAME =	minizip-${GH_TAGNAME}
 
-SHARED_LIBS +=	minizip 1.1 # 3
+SHARED_LIBS +=	minizip 2.0 # 4
 
 CATEGORIES =	archivers
 
@@ -26,8 +26,4 @@ LIB_DEPENDS =		archivers/bzip2 \
 			archivers/zstd \
 			converters/libiconv
 
-# For the signing-related tests to succeed, you need to add the contents of
-# test/test.pem to /etc/ssl/cert.pem.
-NO_TEST =		No
-
 .include <bsd.port.mk>
diff --git a/archivers/minizip/distinfo b/archivers/minizip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (minizip-ng-3.0.6.tar.gz) = OD+hvcKMSCgoqKjbU/dY29RCkbZBGCck/aXfW1nM5UM=
-SIZE (minizip-ng-3.0.6.tar.gz) = 642138
+SHA256 (minizip-ng-4.0.0.tar.gz) = +QYuV23gJv1QJtZVl947BSY81NkUAMrNu+Nt+opkL/8=
+SIZE (minizip-ng-4.0.0.tar.gz) = 766989
diff --git a/archivers/minizip/patches/patch-CMakeLists_txt b/archivers/minizip/patches/patch-CMakeLists_txt
@@ -1,22 +1,14 @@
-install headers in include/minizip to avoid conflicts with libzip
+CMake: Fix build with OpenBSD #711
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -86,7 +86,7 @@ include(cmake/clone-repo.cmake)
-
- set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation directory for executables")
- set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation directory for libraries")
--set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation directory for headers")
-+set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip CACHE PATH "Installation directory for headers")
- set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation directory for manual pages")
-
- set(STDLIB_DEF)
-@@ -442,7 +442,6 @@ endif()
-
- # Unix specific
- if(UNIX)
--    list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L)
+@@ -455,7 +455,7 @@ if(WIN32)
+     set(MZ_LIBBSD OFF)
+     set(MZ_ICONV OFF)
+ else()
+-    list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L)
++    list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE)
      list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c)
 
-     if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING)
+     if(MZ_PKCRYPT OR MZ_WZAES)
diff --git a/archivers/minizip/patches/patch-minizip_pc_cmakein b/archivers/minizip/patches/patch-minizip_pc_cmakein
diff --git a/archivers/minizip/pkg/PLIST b/archivers/minizip/pkg/PLIST
@@ -21,10 +21,9 @@ include/minizip/mz_zip_rw.h
 include/minizip/unzip.h
 include/minizip/zip.h
 lib/cmake/
-lib/cmake/minizip/
-lib/cmake/minizip/minizip-config-version.cmake
-lib/cmake/minizip/minizip-config.cmake
-lib/cmake/minizip/minizip${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/minizip/minizip.cmake
+lib/cmake/minizip-config-version.cmake
+lib/cmake/minizip-config.cmake
+lib/cmake/minizip${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/minizip.cmake
 @lib lib/libminizip.so.${LIBminizip_VERSION}
 lib/pkgconfig/minizip.pc