nedit-ng: Fix build with c++gsl version 4.0.0, use cmake/build.mk, pkglint fixes

[Niclas Rosenvik <nros%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Wed Dec 13 12:52:55 2023 +0100
Changeset:	26d44f9184424a5a180f92424708505a5e8c0e46

Modified Files:
	nedit-ng/Makefile
	nedit-ng/distinfo
	nedit-ng/patches/patch-Interpreter_interpret.h
	nedit-ng/patches/patch-src_TextArea.cpp
Added Files:
	nedit-ng/patches/patch-Util_Resource.cpp
	nedit-ng/patches/patch-src_RangesetTable.cpp
	nedit-ng/patches/patch-src_Search.cpp
	nedit-ng/patches/patch-src_Tags.cpp
	nedit-ng/patches/patch-src_TextBuffer.h
	nedit-ng/patches/patch-src_shift.cpp

Log Message:
nedit-ng: Fix build with c++gsl version 4.0.0, use cmake/build.mk, pkglint fixes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=26d44f9184424a5a180f92424708505a5e8c0e46

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

diffstat:
 nedit-ng/Makefile                              |  7 ++++---
 nedit-ng/distinfo                              | 10 ++++++++--
 nedit-ng/patches/patch-Interpreter_interpret.h |  8 +++++---
 nedit-ng/patches/patch-Util_Resource.cpp       | 16 ++++++++++++++++
 nedit-ng/patches/patch-src_RangesetTable.cpp   | 15 +++++++++++++++
 nedit-ng/patches/patch-src_Search.cpp          | 16 ++++++++++++++++
 nedit-ng/patches/patch-src_Tags.cpp            | 16 ++++++++++++++++
 nedit-ng/patches/patch-src_TextArea.cpp        | 10 ++++++++++
 nedit-ng/patches/patch-src_TextBuffer.h        | 15 +++++++++++++++
 nedit-ng/patches/patch-src_shift.cpp           | 16 ++++++++++++++++
 10 files changed, 121 insertions(+), 8 deletions(-)

diffs:
diff --git a/nedit-ng/Makefile b/nedit-ng/Makefile
index 63de844018..b02617e8ec 100644
--- a/nedit-ng/Makefile
+++ b/nedit-ng/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	nedit-ng
-GITHUB_TAG=	refs/tags/2020.1
 DISTNAME=	2020.1
 PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=eteran/}
+GITHUB_PROJECT=	nedit-ng
+GITHUB_TAG=	refs/tags/2020.1
 DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -16,9 +16,10 @@ LICENSE=	gnu-gpl-v2
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=	bison
 BISON_REQD=	3.0
-USE_CMAKE=	yes
 USE_LANGUAGES=	c++
 
+.include "../../devel/cmake/build.mk"
+
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/c++gsl/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
diff --git a/nedit-ng/distinfo b/nedit-ng/distinfo
index 38496a13f7..169e91fede 100644
--- a/nedit-ng/distinfo
+++ b/nedit-ng/distinfo
@@ -5,10 +5,16 @@ SHA512 (nedit-ng/2020.1.tar.gz) = 8fea2b669e07c92b800aac81de92d8971c60c4c9138c98
 Size (nedit-ng/2020.1.tar.gz) = 2719729 bytes
 SHA1 (patch-CMakeLists.txt) = 4115b5e2662f68569fa5c4e6cac94db011bb0aac
 SHA1 (patch-Interpreter_CMakeLists.txt) = f250257eab653d9755ef27ac93eb678fab30a402
-SHA1 (patch-Interpreter_interpret.h) = 79ab6d225d1bb377565a985cbd800b8cfa25316e
+SHA1 (patch-Interpreter_interpret.h) = 6235b8d7989372d58574b4b4e4970ea751d0f3e6
 SHA1 (patch-Util_CMakeLists.txt) = cb4fb33f70e35d1d9b1c338ce65bf30fc3f88cf4
+SHA1 (patch-Util_Resource.cpp) = 5be6b53d1591a0d8dcc6ca18b3b3111baca3a450
 SHA1 (patch-cmake_Modules_DetectOS.cmake) = 9d473b80b09b631cc26522e2217dda98763ee8d9
 SHA1 (patch-src_CMakeLists.txt) = f5ad9ad837065583ec66d16d18fb63cb273860e0
-SHA1 (patch-src_TextArea.cpp) = 66b390710a5146df21323c3e6f34ff8b29504ac9
+SHA1 (patch-src_RangesetTable.cpp) = d270788c8c3e2c2a0195e3976771ad37fc83a336
+SHA1 (patch-src_Search.cpp) = 4d6e10fc64544e1b37ea8c963e0b745e1cee67b9
+SHA1 (patch-src_Tags.cpp) = 83e3eea6f28dbd10a9069b0448309f4019cf577e
+SHA1 (patch-src_TextArea.cpp) = 595152f54d2e758ca17d3e2b7e3437933dae747b
+SHA1 (patch-src_TextBuffer.h) = 1e50de3263c96f3fa385a6b393ed44ed8ef1cb6a
 SHA1 (patch-src_macro.cpp) = 57fde11ed47fc27d934f28ea6248bd577580fa78
+SHA1 (patch-src_shift.cpp) = 03fc7233b5c17523bced1461032717836a119ac7
 SHA1 (patch-src_userCmds.cpp) = 32441c405cea5ca4dd2da54f250a819c445b365a
diff --git a/nedit-ng/patches/patch-Interpreter_interpret.h b/nedit-ng/patches/patch-Interpreter_interpret.h
index 9c62d781ab..7bc0589cea 100644
--- a/nedit-ng/patches/patch-Interpreter_interpret.h
+++ b/nedit-ng/patches/patch-Interpreter_interpret.h
@@ -1,14 +1,16 @@
 $NetBSD$
 
-* fix compilation with c++gsl 3.1.0
+* fix compilation with c++gsl 4.0.0
 
 --- Interpreter/interpret.h.orig	2020-02-05 05:36:17.000000000 +0000
 +++ Interpreter/interpret.h
-@@ -6,6 +6,7 @@
+@@ -5,7 +5,9 @@
+ #include "DataValue.h"
  #include "Util/string_view.h"
  
++#include <gsl/narrow>
  #include <gsl/span>
-+#include <gsl/gsl_util>
++#include <gsl/util>
  
  #include <deque>
  #include <memory>
diff --git a/nedit-ng/patches/patch-Util_Resource.cpp b/nedit-ng/patches/patch-Util_Resource.cpp
new file mode 100644
index 0000000000..3e03b0db52
--- /dev/null
+++ b/nedit-ng/patches/patch-Util_Resource.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix build with devel/c++gsl verison 4.0.0
+
+--- Util/Resource.cpp.orig	2020-02-05 05:36:17.000000000 +0000
++++ Util/Resource.cpp
+@@ -1,7 +1,8 @@
+ 
+ #include "Util/Resource.h"
+ 
+-#include <gsl/gsl_util>
++#include <gsl/narrow>
++#include <gsl/util>
+ 
+ #include <QByteArray>
+ #include <QResource>
diff --git a/nedit-ng/patches/patch-src_RangesetTable.cpp b/nedit-ng/patches/patch-src_RangesetTable.cpp
new file mode 100644
index 0000000000..5325e896e4
--- /dev/null
+++ b/nedit-ng/patches/patch-src_RangesetTable.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix deprecation warning
+
+--- src/RangesetTable.cpp.orig	2023-12-13 10:09:15.392317895 +0000
++++ src/RangesetTable.cpp
+@@ -2,7 +2,7 @@
+ #include "RangesetTable.h"
+ #include "TextBuffer.h"
+ #include <array>
+-#include <gsl/gsl_util>
++#include <gsl/util>
+ #include <string>
+ 
+ namespace {
diff --git a/nedit-ng/patches/patch-src_Search.cpp b/nedit-ng/patches/patch-src_Search.cpp
new file mode 100644
index 0000000000..1a9b9965ff
--- /dev/null
+++ b/nedit-ng/patches/patch-src_Search.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix build with devel/c++gsl verison 4.0.0
+
+--- src/Search.cpp.orig	2020-02-05 05:36:17.000000000 +0000
++++ src/Search.cpp
+@@ -13,7 +13,8 @@
+ #include "WrapStyle.h"
+ #include "userCmds.h"
+ 
+-#include <gsl/gsl_util>
++#include <gsl/narrow>
++#include <gsl/util>
+ 
+ #include <algorithm>
+ #include <cctype>
diff --git a/nedit-ng/patches/patch-src_Tags.cpp b/nedit-ng/patches/patch-src_Tags.cpp
new file mode 100644
index 0000000000..23f400342e
--- /dev/null
+++ b/nedit-ng/patches/patch-src_Tags.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix build with devel/c++gsl verison 4.0.0
+
+--- src/Tags.cpp.orig	2020-02-05 05:36:17.000000000 +0000
++++ src/Tags.cpp
+@@ -11,7 +11,8 @@
+ #include "Util/Input.h"
+ #include "Util/User.h"
+ 
+-#include <gsl/gsl_util>
++#include <gsl/narrow>
++#include <gsl/util>
+ 
+ #include <QApplication>
+ #include <QDir>
diff --git a/nedit-ng/patches/patch-src_TextArea.cpp b/nedit-ng/patches/patch-src_TextArea.cpp
index ccb27da390..f35ace0690 100644
--- a/nedit-ng/patches/patch-src_TextArea.cpp
+++ b/nedit-ng/patches/patch-src_TextArea.cpp
@@ -12,3 +12,13 @@ $NetBSD$
  #include <QPoint>
  #include <QResizeEvent>
  #include <QScrollBar>
+@@ -36,7 +37,8 @@
+ #include <QtDebug>
+ #include <QtGlobal>
+ 
+-#include <gsl/gsl_util>
++#include <gsl/narrow>
++#include <gsl/util>
+ #include <memory>
+ 
+ #define EMIT_EVENT_0(name)                                       \
diff --git a/nedit-ng/patches/patch-src_TextBuffer.h b/nedit-ng/patches/patch-src_TextBuffer.h
new file mode 100644
index 0000000000..55db18dd18
--- /dev/null
+++ b/nedit-ng/patches/patch-src_TextBuffer.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix deprecation warning
+
+--- src/TextBuffer.h.orig	2023-12-13 10:11:02.328339019 +0000
++++ src/TextBuffer.h
+@@ -8,7 +8,7 @@
+ #include "Util/string_view.h"
+ #include "gap_buffer.h"
+ 
+-#include <gsl/gsl_util>
++#include <gsl/util>
+ 
+ #include <cstdint>
+ #include <deque>
diff --git a/nedit-ng/patches/patch-src_shift.cpp b/nedit-ng/patches/patch-src_shift.cpp
new file mode 100644
index 0000000000..3c6e5d3357
--- /dev/null
+++ b/nedit-ng/patches/patch-src_shift.cpp
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix build with devel/c++gsl verison 4.0.0
+
+--- src/shift.cpp.orig	2020-02-05 05:36:17.000000000 +0000
++++ src/shift.cpp
+@@ -6,7 +6,8 @@
+ #include "Util/algorithm.h"
+ #include "Util/string_view.h"
+ 
+-#include <gsl/gsl_util>
++#include <gsl/narrow>
++#include <gsl/util>
+ 
+ namespace {
+