diff --git a/archivers/minizip-ng/Makefile b/archivers/minizip-ng/Makefile index f8ee67a7664f..cb9d74014035 100644 --- a/archivers/minizip-ng/Makefile +++ b/archivers/minizip-ng/Makefile @@ -1,44 +1,45 @@ PORTNAME= minizip-ng -DISTVERSION= 4.1.1 +DISTVERSION= 4.1.2 CATEGORIES= archivers MAINTAINER= vvd@FreeBSD.org COMMENT= Fork of the popular minizip found in the zlib distribution WWW= https://github.com/zlib-ng/minizip-ng LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libz-ng.so:archivers/zlib-ng \ libzstd.so:archivers/zstd USES= cmake:testing iconv pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= zlib-ng # CMakeList.txt: clone_repo(ppmd https://github.com/ip7z/7zip "26.00") 7ZIP_VER= 26.00 GH_TUPLE= ip7z:7zip:${7ZIP_VER}:7zip/third_party/ppmd USE_LDCONFIG= yes -CMAKE_ARGS= -DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include/ \ +CMAKE_ARGS= -DCMAKE_INSTALL_INCLUDEDIR=${LOCALBASE}/include \ -DMZ_LIB_SUFFIX=-ng -CMAKE_ON= BUILD_SHARED_LIBS CMAKE_DISABLE_FIND_PACKAGE_ZLIB +CMAKE_ON= BUILD_SHARED_LIBS \ + CMAKE_DISABLE_FIND_PACKAGE_ZLIB \ + CMAKE_POSITION_INDEPENDENT_CODE CMAKE_TESTING_ON= MZ_BUILD_TEST MZ_BUILD_UNIT_TEST EXTRACT_AFTER_ARGS= --exclude 7zip-${7ZIP_VER}/[ABD-Z]* \ --exclude 7zip-${7ZIP_VER}/C/7z[A-SUW-Za-z.]* \ --exclude 7zip-${7ZIP_VER}/C/7zVersion.rc \ --exclude 7zip-${7ZIP_VER}/C/[ABD-OQ-Za-z]* \ --exclude 7zip-${7ZIP_VER}/C/CpuArch.c \ --exclude 7zip-${7ZIP_VER}/C/Ppmd7* \ --exclude 7zip-${7ZIP_VER}/CPP \ --no-same-owner --no-same-permissions PLIST_SUB= VERSION="${DISTVERSION}" post-install: ${INSTALL_DATA} ${FILESDIR}/mz_compat.h \ - ${WRKSRC}/mz_config.h \ - ${STAGEDIR}${PREFIX}/include/minizip-ng/ + ${STAGEDIR}${PREFIX}/include/${PORTNAME} .include diff --git a/archivers/minizip-ng/distinfo b/archivers/minizip-ng/distinfo index 968dc037d4d9..44b1151a717c 100644 --- a/archivers/minizip-ng/distinfo +++ b/archivers/minizip-ng/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1777070707 -SHA256 (zlib-ng-minizip-ng-4.1.1_GH0.tar.gz) = ecc1a514f9e455cb627a768e1219369c576a761bc04196941590906c8b622d7e -SIZE (zlib-ng-minizip-ng-4.1.1_GH0.tar.gz) = 609450 +TIMESTAMP = 1777123456 +SHA256 (zlib-ng-minizip-ng-4.1.2_GH0.tar.gz) = 3738c742c663fda43f1e510b8eeef312917581a712c89cb253f682aaef8c732f +SIZE (zlib-ng-minizip-ng-4.1.2_GH0.tar.gz) = 609448 SHA256 (ip7z-7zip-26.00_GH0.tar.gz) = 07eafed75d661282d402dc2a3edf17e1dbb36fb813f4fbf5a2bad4f6b722aed5 SIZE (ip7z-7zip-26.00_GH0.tar.gz) = 2226105 diff --git a/archivers/minizip-ng/files/patch-CMakeLists.txt b/archivers/minizip-ng/files/patch-CMakeLists.txt deleted file mode 100644 index b605463884ef..000000000000 --- a/archivers/minizip-ng/files/patch-CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- CMakeLists.txt.orig 2026-04-23 04:10:20 UTC -+++ CMakeLists.txt -@@ -381,6 +381,7 @@ if(MZ_PPMD) - ${PPMD_SOURCE_DIR}/C/Precomp.h) - - add_library(ppmd STATIC ${PPMD_SRC} ${PPMD_HDR}) -+ target_compile_options(ppmd PRIVATE -fPIC) - - list(APPEND MINIZIP_DEP ppmd) - list(APPEND MINIZIP_INC ${PPMD_SOURCE_DIR}) diff --git a/archivers/minizip-ng/pkg-plist b/archivers/minizip-ng/pkg-plist index e0ff5b20e8db..137eb64d94f7 100644 --- a/archivers/minizip-ng/pkg-plist +++ b/archivers/minizip-ng/pkg-plist @@ -1,31 +1,32 @@ +include/minizip-ng/crypt.h include/minizip-ng/ioapi.h include/minizip-ng/mz.h include/minizip-ng/mz_compat.h include/minizip-ng/mz_config.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 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_ppmd.h include/minizip-ng/mz_strm_split.h include/minizip-ng/mz_strm_wzaes.h 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 include/minizip-ng/unzip.h include/minizip-ng/zip.h lib/cmake/minizip-ng/minizip-ng-config-version.cmake lib/cmake/minizip-ng/minizip-ng-config.cmake -lib/cmake/minizip-ng/minizip-ng-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/minizip-ng/minizip-ng.cmake +lib/cmake/minizip-ng/minizip-ng-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/minizip-ng/minizip-ng-targets.cmake lib/libminizip-ng.so lib/libminizip-ng.so.1 lib/libminizip-ng.so.%%VERSION%% lib/libppmd.a libdata/pkgconfig/minizip-ng.pc