From 45ab80b9df9f54bd40b1d19e18bb9a3e76a2a33c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Bartoletti?= <lbartoletti@FreeBSD.org>
Date: Tue, 25 Jan 2022 07:33:45 +0100
Subject: archivers/minizip*: Add minizip-ng and zlib-ng and create
 USES=minizip

Import minizip-ng and zlib-ng

Minizip was originally developed in 1998. It was first included in the zlib
distribution as an additional code contribution starting in zlib 1.1.2. Since
that time, it has been continually improved upon and contributed to by many
people.

+ Creating and extracting zip archives.
+ Adding and removing entries from zip archives.
+ Read and write raw zip entry data.
+ Reading and writing zip archives from memory.
+ Zlib, BZIP2, LZMA, and ZSTD compression methods.
+ Password protection through Traditional PKWARE and WinZIP AES encryption.
+ Buffered streaming for improved I/O performance.

some ports bundle it, some ports allow building against a systemwide
one, some ports bundle/rely on an incompatible version - all those will be
fixed in following commits.

Mk/Uses: Introduce USES=minizip[:ng]

To simplify, the LIB_DEPENDS part a new USES tag is added.

USES=minizip will add a LIB_DEPENDS on legacy minizip and
USES=minizip:ng will add a LIB_DEPENDS on minizip-ng.

minizip [1]:

    databases/spatialite
    databases/spatialite-tools
    devel/collada-dom
    games/mrboom
    games/oolite
    graphics/comical
    misc/xiphos
    science/libkml
    textproc/sigil
    www/domoticz
    deskutils/anydesk
    emulators/mupen64plus-core
    multimedia/assimp
    multimedia/vlc
    net-im/psi
    net-im/telegram-desktop

minizip-ng:

    devel/axmldec

[1] Some are known to work with minizip-ng but have to be patched.

Approved by:	tcberner (portmgr)
Differential Revision:	https://reviews.freebsd.org/D33771
---
 devel/axmldec/Makefile                   | 5 ++---
 devel/axmldec/files/patch-CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'devel/axmldec')

diff --git a/devel/axmldec/Makefile b/devel/axmldec/Makefile
index 296c6a698954..1bdd72803e65 100644
--- a/devel/axmldec/Makefile
+++ b/devel/axmldec/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Stand-alone binary AndroidManifest.xml decoder
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-LIB_DEPENDS=	libminizip.so:archivers/minizip \
-		libboost_system.so:devel/boost-libs
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
-USES=		cmake compiler:c++14-lang cpe pkgconfig
+USES=		cmake compiler:c++14-lang cpe minizip:ng pkgconfig
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	ytsutano
diff --git a/devel/axmldec/files/patch-CMakeLists.txt b/devel/axmldec/files/patch-CMakeLists.txt
index 4a5a5a0e1d34..7cc844ff36d5 100644
--- a/devel/axmldec/files/patch-CMakeLists.txt
+++ b/devel/axmldec/files/patch-CMakeLists.txt
@@ -9,7 +9,7 @@
 -
 +    include (FindPkgConfig)
 +    if (PKG_CONFIG_FOUND)
-+        pkg_check_modules(MINIZIP minizip)
++        pkg_check_modules(MINIZIP minizip-ng)
 +    endif()
 +    include_directories(${MINIZIP_INCLUDE_DIRS})
 +    find_library(MINIZIP_FROM_PORTS ${MINIZIP_LIBRARIES}
-- 
cgit v1.2.3