CVS commit: pkgsrc/editors/feathernotes

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

Module Name:    pkgsrc
Committed By:   pin
Date:           Tue Sep  5 20:32:10 UTC 2023

Modified Files:
        pkgsrc/editors/feathernotes: DESCR Makefile
Added Files:
        pkgsrc/editors/feathernotes: options.mk

Log Message:
editors/feathernotes: enable Qt6

... and switch to it as default


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/feathernotes/DESCR
cvs rdiff -u -r1.24 -r1.25 pkgsrc/editors/feathernotes/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/feathernotes/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/editors/feathernotes/DESCR
diff -u pkgsrc/editors/feathernotes/DESCR:1.1 pkgsrc/editors/feathernotes/DESCR:1.2
--- pkgsrc/editors/feathernotes/DESCR:1.1       Thu Feb 13 03:21:54 2020
+++ pkgsrc/editors/feathernotes/DESCR   Tue Sep  5 20:32:10 2023
@@ -1,4 +1,4 @@
-FeatherNotes is a lightweight Qt5 hierarchical notes-manager.
+FeatherNotes is a lightweight Qt5/Qt6 hierarchical notes-manager.
 It is independent of any desktop environment and has:
 
   * Support for rich text formatting, image embedding and inserting

Index: pkgsrc/editors/feathernotes/Makefile
diff -u pkgsrc/editors/feathernotes/Makefile:1.24 pkgsrc/editors/feathernotes/Makefile:1.25
--- pkgsrc/editors/feathernotes/Makefile:1.24   Mon May 22 21:00:22 2023
+++ pkgsrc/editors/feathernotes/Makefile        Tue Sep  5 20:32:10 2023
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.24 2023/05/22 21:00:22 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/09/05 20:32:10 pin Exp $
 
 VERSION=       1.1.0
 DISTNAME=      FeatherNotes-V${VERSION}
 PKGNAME=       feathernotes-${VERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=tsujan/}
 GITHUB_TAG=    V${PKGVERSION_NOREV}
 
 MAINTAINER=    pin%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/tsujan/FeatherNotes/
-COMMENT=       Lightweight Qt5 hierarchical notes-manager
+COMMENT=       Lightweight Qt5/Qt6 hierarchical notes-manager
 LICENSE=       gnu-gpl-v3
 
 WRKSRC=                ${WRKDIR}/FeatherNotes-${VERSION}
@@ -18,21 +18,13 @@ USE_CMAKE=  yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ..
-
 CMAKE_ARGS+=   -DCMAKE_INSTALL_PREFIX=${PREFIX}
 
-pre-configure:
-       ${MKDIR} -p ${WRKSRC}/build
-
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+.include "options.mk"
 
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/editors/feathernotes/options.mk
diff -u /dev/null pkgsrc/editors/feathernotes/options.mk:1.1
--- /dev/null   Tue Sep  5 20:32:10 2023
+++ pkgsrc/editors/feathernotes/options.mk      Tue Sep  5 20:32:10 2023
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2023/09/05 20:32:10 pin Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.feathernotes
+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