git: dba356ff75ea - main - polish/qnapi: switch from p7zip to 7-zip

From: Max Brazhnikov <makc_at_FreeBSD.org>
Date: Wed, 12 Jan 2022 21:25:24 UTC
The branch main has been updated by makc:

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

commit dba356ff75eae56cb8fdaaedb9e04625f7ba8426
Author:     Max Brazhnikov <makc@FreeBSD.org>
AuthorDate: 2022-01-12 21:24:02 +0000
Commit:     Max Brazhnikov <makc@FreeBSD.org>
CommitDate: 2022-01-12 21:24:02 +0000

    polish/qnapi: switch from p7zip to 7-zip
    
    Migrate to 7-zip [1] and while here:
    - Respect LOCALBASE
    - Don't move around man pages
    
    PR:     260866
---
 polish/qnapi/Makefile                                |  8 +++++---
 .../files/patch-libqnapi_src_config_configreader.cpp | 20 ++++++++++++++++++++
 polish/qnapi/pkg-plist                               |  6 +++---
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index 30fe93aa9ce0..c50be6ed0b07 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qnapi
 PORTVERSION=	0.2.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	polish multimedia
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	qt-maybe>0:devel/qt-maybe \
 		libmaia>0:net/libmaia
 LIB_DEPENDS=	libmediainfo.so:multimedia/libmediainfo \
 		libzen.so:multimedia/libzen
-RUN_DEPENDS=	7z:archivers/p7zip
+RUN_DEPENDS=	7zz:archivers/7-zip
 
 USE_GITHUB=	yes
 
@@ -26,8 +26,10 @@ USE_QT=		buildtools_build core gui network widgets xml
 CXXFLAGS+=	-I${LOCALBASE}/include/maia
 
 post-patch:
-	@${REINPLACE_CMD} 's|/usr|${PREFIX}|; s|share/man|man|' \
+	${REINPLACE_CMD} 's|/usr|${PREFIX}|' \
 		${WRKSRC}/qnapi.pro
+	${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' \
+		${WRKSRC}/libqnapi/src/config/configreader.cpp
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qnapi
diff --git a/polish/qnapi/files/patch-libqnapi_src_config_configreader.cpp b/polish/qnapi/files/patch-libqnapi_src_config_configreader.cpp
new file mode 100644
index 000000000000..e42e41ad39b3
--- /dev/null
+++ b/polish/qnapi/files/patch-libqnapi_src_config_configreader.cpp
@@ -0,0 +1,20 @@
+--- libqnapi/src/config/configreader.cpp.orig	2017-05-19 16:50:58 UTC
++++ libqnapi/src/config/configreader.cpp
+@@ -175,7 +175,7 @@ const GeneralConfig ConfigReader::resolveP7zipPath(
+ 
+     sysPaths << appExecutableDir;
+ 
+-    QStringList p7zipBinaries = {"7z", "7za"};
++    QStringList p7zipBinaries = {"7z", "7zz"};
+ 
+     foreach (const QString sysPath, sysPaths) {
+       foreach (const QString p7zipBinary, p7zipBinaries) {
+@@ -192,7 +192,7 @@ const GeneralConfig ConfigReader::resolveP7zipPath(
+     }
+ 
+     if (p7zipPath.isEmpty()) {
+-      p7zipPath = "7z";
++      p7zipPath = "7zz";
+     }
+ #endif
+ 
diff --git a/polish/qnapi/pkg-plist b/polish/qnapi/pkg-plist
index f06c28215785..dd98a700c31a 100644
--- a/polish/qnapi/pkg-plist
+++ b/polish/qnapi/pkg-plist
@@ -1,7 +1,4 @@
 bin/qnapi
-man/it/man1/qnapi.1.gz
-man/man1/qnapi.1.gz
-man/pl/man1/qnapi.1.gz
 share/applications/qnapi-download.desktop
 share/applications/qnapi-scan.desktop
 share/applications/qnapi.desktop
@@ -11,3 +8,6 @@ share/icons/hicolor/16x16/apps/qnapi.png
 share/icons/hicolor/32x32/apps/qnapi.png
 share/icons/hicolor/48x48/apps/qnapi.png
 share/icons/hicolor/512x512/apps/qnapi.png
+share/man/it/man1/qnapi.1.gz
+share/man/man1/qnapi.1.gz
+share/man/pl/man1/qnapi.1.gz