CVS commit: pkgsrc/archivers/arqiver

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Wed Sep  6 11:21:59 UTC 2023

Modified Files:
        pkgsrc/archivers/arqiver: DESCR Makefile
Added Files:
        pkgsrc/archivers/arqiver: options.mk

Log Message:
archivers/arqiver: Add Qt6 support

... and switch to it by default.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/archivers/arqiver/DESCR
cvs rdiff -u -r1.27 -r1.28 pkgsrc/archivers/arqiver/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/arqiver/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/arqiver/DESCR
diff -u pkgsrc/archivers/arqiver/DESCR:1.1 pkgsrc/archivers/arqiver/DESCR:1.2
--- pkgsrc/archivers/arqiver/DESCR:1.1  Thu Feb 13 03:00:16 2020
+++ pkgsrc/archivers/arqiver/DESCR      Wed Sep  6 11:21:59 2023
@@ -1,4 +1,4 @@
-Arqiver is a simple Qt5 archive manager as a front-end for libarchive
+Arqiver is a simple Qt5/Qt6 archive manager as a front-end for libarchive
 (bsdtar), gzip and 7z.
 
        *Arqiver can extract, create and edit archives that are supported by its

Index: pkgsrc/archivers/arqiver/Makefile
diff -u pkgsrc/archivers/arqiver/Makefile:1.27 pkgsrc/archivers/arqiver/Makefile:1.28
--- pkgsrc/archivers/arqiver/Makefile:1.27      Mon May 22 21:00:15 2023
+++ pkgsrc/archivers/arqiver/Makefile   Wed Sep  6 11:21:59 2023
@@ -1,30 +1,23 @@
-# $NetBSD: Makefile,v 1.27 2023/05/22 21:00:15 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2023/09/06 11:21:59 pin Exp $
 
 DISTNAME=      Arqiver-0.11.0
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    archivers
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=tsujan/}
 GITHUB_TAG=    V${PKGVERSION_NOREV}
 
 MAINTAINER=    pin%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/tsujan/Arqiver/
-COMMENT=       Simple Qt5 archive manager
+COMMENT=       Simple Qt5/Qt6 archive manager
 LICENSE=       gnu-gpl-v3
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config bsdtar:run gzip:run 7za:run
 
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ..
-
 CMAKE_ARGS+=   -DCMAKE_INSTALL_PREFIX=${PREFIX}
 
-pre-configure:
-       ${MKDIR} -p ${WRKSRC}/build
-
 SUBST_CLASSES+=                prefix
 SUBST_MESSAGE.prefix=  Fixing paths.
 SUBST_STAGE.prefix=    pre-configure
@@ -37,14 +30,13 @@ SUBST_SED.prefix+=  -e 's,"7z","${TOOLS_P
 # character sequences following the command references.)
 SUBST_SED.prefix+=     -e 's,"xdg-open,"${PREFIX}/bin/xdg-open,g'
 
+.include "options.mk"
+
 # Either needs misc/xdg-utils for xdg-open or devel/glib2 for gio.
 # Upstream prefers glib2, but xdg-utils is a lot smaller, so use
 # that for now.
 DEPENDS+=      xdg-utils-[0-9]*:../../misc/xdg-utils
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/archivers/arqiver/options.mk
diff -u /dev/null pkgsrc/archivers/arqiver/options.mk:1.1
--- /dev/null   Wed Sep  6 11:21:59 2023
+++ pkgsrc/archivers/arqiver/options.mk Wed Sep  6 11:21:59 2023
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2023/09/06 11:21:59 pin Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.arqiver
+PKG_OPTIONS_OPTIONAL_GROUPS=   gui
+PKG_OPTIONS_GROUP.gui=         qt5 qt6
+PKG_SUGGESTED_OPTIONS=         qt6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mqt5)
+TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt6)
+CMAKE_ARGS+=   -DENABLE_QT5=OFF
+TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.endif