CVS commit: pkgsrc/editors

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 14:13:24 UTC 2023

Modified Files:
        pkgsrc/editors/kakoune: Makefile
        pkgsrc/editors/kate: Makefile
        pkgsrc/editors/xournalpp: Makefile

Log Message:
editors: Adapt packages to use USE_(CC|CXX)_FEATURES


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/kakoune/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/editors/kate/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/editors/xournalpp/Makefile

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

Modified files:

Index: pkgsrc/editors/kakoune/Makefile
diff -u pkgsrc/editors/kakoune/Makefile:1.5 pkgsrc/editors/kakoune/Makefile:1.6
--- pkgsrc/editors/kakoune/Makefile:1.5 Sun Mar 22 10:35:44 2020
+++ pkgsrc/editors/kakoune/Makefile     Tue Jul 18 14:13:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/03/22 10:35:44 nia Exp $
+# $NetBSD: Makefile,v 1.6 2023/07/18 14:13:23 nia Exp $
 
 DISTNAME=      kakoune-2020.01.16
 CATEGORIES=    editors
@@ -13,10 +13,9 @@ LICENSE=     unlicense
 
 BUILD_DIRS=    src
 USE_TOOLS+=    gmake pkg-config
-USE_LANGUAGES= c c++17
+USE_LANGUAGES= c c++
 
-# C++17
-GCC_REQD+=     7
+USE_CXX_FEATURES+=     c++17
 
 CXXFLAGS+=     -D'KAK_BIN_PATH="${PREFIX}/bin/kak"'
 MAKE_FLAGS+=   mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1

Index: pkgsrc/editors/kate/Makefile
diff -u pkgsrc/editors/kate/Makefile:1.82 pkgsrc/editors/kate/Makefile:1.83
--- pkgsrc/editors/kate/Makefile:1.82   Mon Jun 26 09:09:46 2023
+++ pkgsrc/editors/kate/Makefile        Tue Jul 18 14:13:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2023/06/26 09:09:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.83 2023/07/18 14:13:23 nia Exp $
 
 DISTNAME=      kate-${KAPPSVER}
 PKGREVISION=   6
@@ -13,7 +13,8 @@ LICENSE=      gnu-gpl-v2 AND gnu-lgpl-v2 AND 
 TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=    msgmerge
-GCC_REQD+=     10      # uses <charconv>
+
+USE_CXX_FEATURES+=     charconv
 
 LDFLAGS.SunOS+=        -lsocket
 

Index: pkgsrc/editors/xournalpp/Makefile
diff -u pkgsrc/editors/xournalpp/Makefile:1.52 pkgsrc/editors/xournalpp/Makefile:1.53
--- pkgsrc/editors/xournalpp/Makefile:1.52      Tue Jun  6 12:41:20 2023
+++ pkgsrc/editors/xournalpp/Makefile   Tue Jul 18 14:13:24 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2023/06/06 12:41:20 riastradh Exp $
+# $NetBSD: Makefile,v 1.53 2023/07/18 14:13:24 nia Exp $
 
 DISTNAME=      xournalpp-1.1.3
 PKGREVISION=   5
@@ -17,17 +17,7 @@ USE_LANGUAGES=       c c++
 
 BUILD_TARGET=  translations xournalpp
 
-# C++17, std::filesystem
-GCC_REQD+=     8
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
-USE_PKGSRC_GCC=                yes
-USE_PKGSRC_GCC_RUNTIME=        yes
-.endif
-
-.include "../../archivers/libarchive/buildlink3.mk"
+USE_CXX_FEATURES+=     c++17 filesystem
 
 TOOL_DEPENDS+= help2man-[0-9]*:../../converters/help2man
 DEPENDS+=      tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts
@@ -42,6 +32,7 @@ post-install:
        ${MV} ${DESTDIR}${PREFIX}/share/man/man1/* ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 || ${TRUE}
 
 .include "../../devel/cmake/build.mk"
+.include "../../archivers/libarchive/buildlink3.mk"
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/portaudio/buildlink3.mk"