git: 8e83ce77ba66 - main - security/keepassxc: Fix build with KEESHARE=off, cleanup

The branch main has been updated by lwhsu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8e83ce77ba66171e2a4e0c54909bd41c05a428e3

commit 8e83ce77ba66171e2a4e0c54909bd41c05a428e3
Author:     Anton Saietskii <vsasjason@gmail.com>
AuthorDate: 2025-07-25 11:55:55 +0000
Commit:     Li-Wen Hsu <lwhsu@FreeBSD.org>
CommitDate: 2025-08-09 20:20:54 +0000

    security/keepassxc: Fix build with KEESHARE=off, cleanup
    
    minizip is now required unconditionally. While here, pet
    portlint/portclippy/portfmt and regen patches using 'makepatch'
    target.
    
    PR:             288418
---
 security/keepassxc/Makefile                        | 52 ++++++++++++----------
 security/keepassxc/files/patch-CMakeLists.txt      | 12 +++--
 .../patch-src_thirdparty_ykcore_CMakeLists.txt     |  8 ++--
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/security/keepassxc/Makefile b/security/keepassxc/Makefile
index 1cd13b8eb820..a9974bd60ec9 100644
--- a/security/keepassxc/Makefile
+++ b/security/keepassxc/Makefile
@@ -13,54 +13,58 @@ LICENSE=	APACHE20 BSD3CLAUSE CC0-1.0 GPLv2 GPLv3 LGPL21 LGPL3 MIT \
 LICENSE_COMB=	multi
 LICENSE_NAME_NOKIA-LGPL-EXCEPTION=	Nokia Qt LGPL Exception version 1.1
 LICENSE_FILE_NOKIA-LGPL-EXCEPTION=	${WRKSRC}/LICENSE.NOKIA-LGPL-EXCEPTION
-LICENSE_PERMS_NOKIA-LGPL-EXCEPTION=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_NOKIA-LGPL-EXCEPTION=	dist-mirror dist-sell pkg-mirror \
+					pkg-sell auto-accept
 
 BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
-		libqrencode.so:graphics/libqrencode \
-		libbotan-3.so:security/botan3
+		libbotan-3.so:security/botan3 \
+		libqrencode.so:graphics/libqrencode
 
-USES=		cmake compiler:c++17-lang desktop-file-utils pkgconfig qt:5 \
-		readline shared-mime-info tar:xz xorg
-USE_QT=		concurrent core dbus gui network svg widgets buildtools:build \
-		linguisttools:build qmake:build testlib:build x11extras
+USES=		cmake compiler:c++17-lang desktop-file-utils minizip \
+		pkgconfig qt:5 readline shared-mime-info tar:xz xorg
+
+USE_QT=		concurrent core dbus gui network svg widgets x11extras \
+		buildtools:build linguisttools:build qmake:build testlib:build
 USE_XORG=	x11
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CMAKE_OFF=	WITH_XC_UPDATECHECK
 
-CONFLICTS_INSTALL=	keepassx-0.* keepassx2 keepassx keepassxc276
+CONFLICTS_INSTALL=	keepassx keepassx-0.* keepassx2 keepassxc276
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
-OPTIONS_DEFINE=		AUTOTYPE BROWSER FDOSECRETS KEESHARE NETWORKING SSHAGENT YUBIKEY TEST
-OPTIONS_DEFAULT=	AUTOTYPE BROWSER FDOSECRETS KEESHARE NETWORKING SSHAGENT YUBIKEY
+OPTIONS_DEFINE=		AUTOTYPE BROWSER FDOSECRETS KEESHARE NETWORKING \
+			SSHAGENT TEST YUBIKEY
+OPTIONS_DEFAULT=	AUTOTYPE BROWSER FDOSECRETS KEESHARE NETWORKING \
+			SSHAGENT YUBIKEY
 OPTIONS_SUB=		yes
 
-AUTOTYPE_CMAKE_BOOL=	WITH_XC_AUTOTYPE
 AUTOTYPE_DESC=		Auto-type passwords in input fields
+BROWSER_DESC=		Browser integration with KeePassXC-Browser
+FDOSECRETS_DESC=	freedesktop.org secrets service support
+KEESHARE_DESC=		Sharing integration with KeeShare
+NETWORKING_DESC=	Networking support (e.g. for downloading website icons)
+SSHAGENT_DESC=		SSH agent support
+YUBIKEY_DESC=		YubiKey support
+
 AUTOTYPE_USE=		XORG=xi,xtst
+AUTOTYPE_CMAKE_BOOL=	WITH_XC_AUTOTYPE
 
 BROWSER_CMAKE_BOOL=	WITH_XC_BROWSER
-BROWSER_DESC=		Browser integration with KeePassXC-Browser
 
 FDOSECRETS_CMAKE_BOOL=	WITH_XC_FDOSECRETS
-FDOSECRETS_DESC=	freedesktop.org secrets service support
 
 KEESHARE_CMAKE_BOOL=	WITH_XC_KEESHARE
-KEESHARE_DESC=		Sharing integration with KeeShare
-KEESHARE_USES=		minizip
 
-# Legacy/Deprecated.
 NETWORKING_CMAKE_BOOL=	WITH_XC_NETWORKING
-NETWORKING_DESC=	Networking support (e.g. for downloading website icons)
 
 SSHAGENT_CMAKE_BOOL=	WITH_XC_SSHAGENT
-SSHAGENT_DESC=		SSH agent support
-
-YUBIKEY_CMAKE_BOOL=	WITH_XC_YUBIKEY
-YUBIKEY_DESC=		YubiKey support
-YUBIKEY_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
 
-TEST_CMAKE_BOOL=	WITH_TESTS WITH_GUI_TESTS
+TEST_CMAKE_BOOL=	WITH_GUI_TESTS WITH_TESTS
 TEST_TEST_TARGET=	test
 
+YUBIKEY_LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
+YUBIKEY_CMAKE_BOOL=	WITH_XC_YUBIKEY
+
 .include <bsd.port.mk>
diff --git a/security/keepassxc/files/patch-CMakeLists.txt b/security/keepassxc/files/patch-CMakeLists.txt
index 38c92ebea387..2b8b5fb5c912 100644
--- a/security/keepassxc/files/patch-CMakeLists.txt
+++ b/security/keepassxc/files/patch-CMakeLists.txt
@@ -1,13 +1,11 @@
---- CMakeLists.txt.orig	2024-06-19 14:32:55.000000000 -0700
-+++ CMakeLists.txt	2024-06-20 07:26:46.907481000 -0700
-@@ -575,8 +575,8 @@
+--- CMakeLists.txt.orig	2025-07-25 11:50:52 UTC
++++ CMakeLists.txt
+@@ -575,7 +575,7 @@ if(WITH_XC_YUBIKEY)
      include_directories(SYSTEM ${PCSC_INCLUDE_DIRS})
  
      if(UNIX AND NOT APPLE)
 -        find_library(LIBUSB_LIBRARIES NAMES usb-1.0 REQUIRED)
--        find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb" REQUIRED)
-+        find_library(LIBUSB_LIBRARIES NAMES usb REQUIRED)
-+        find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb" "libusb" REQUIRED)
++        find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb REQUIRED)
+         find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb" REQUIRED)
          include_directories(SYSTEM ${LIBUSB_INCLUDE_DIR})
      endif()
- endif()
diff --git a/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt b/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt
index af4cb68d5d09..28106f838730 100644
--- a/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt
+++ b/security/keepassxc/files/patch-src_thirdparty_ykcore_CMakeLists.txt
@@ -1,8 +1,8 @@
---- src/thirdparty/ykcore/CMakeLists.txt.orig	2022-03-21 22:47:20 UTC
+--- src/thirdparty/ykcore/CMakeLists.txt.orig	2025-03-02 22:31:21 UTC
 +++ src/thirdparty/ykcore/CMakeLists.txt
-@@ -27,7 +27,7 @@ elseif(UNIX AND NOT APPLE)
- elseif(UNIX AND NOT APPLE)
-     target_sources(ykcore PRIVATE ykcore_libusb-1.0.c)
+@@ -29,7 +29,7 @@ elseif(UNIX AND NOT APPLE)
+ 
+     find_package(Threads REQUIRED)
  
 -    find_library(LIBUSB_LIBRARY NAMES usb-1.0)
 +    find_library(LIBUSB_LIBRARY NAMES usb-1.0 usb)