This diff simply replaces the DISTNAME version and adjust
the few tweaks to build the port:

- remove --enable-gtk3 from CONFIGURE_ARGS as it doesn't
  seem to exist anymore.

- refresh the only patches/ entry (simply c++ namespace change).

- update WANTLIB accrording to what "make port-lib-depends-check"
  suggests. It's unclear to me if the ${COMPILER_LIBCXX} entry
  is new or was missing.

With these minimal changes geany 2.0 builds and runs. Tested on
amd64 only.

Thoughts? OKs?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/geany/Makefile,v
diff -u -p -u -p -r1.71 Makefile
--- Makefile	13 Oct 2023 05:15:01 -0000	1.71
+++ Makefile	6 Feb 2024 11:25:33 -0000
@@ -1,6 +1,6 @@
 COMMENT=	small and lightweight IDE
 
-DISTNAME =	geany-1.38
+DISTNAME =	geany-2.0
 SHARED_LIBS +=  geany                     0.0 # 0.0
 
 CATEGORIES=	devel
@@ -21,21 +21,20 @@ MODULES=	textproc/intltool
 
 USE_GMAKE=	Yes
 
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0
-WANTLIB += c cairo cairo-gobject epoxy expat ffi fontconfig
-WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
-WANTLIB += png pthread ${COMPILER_LIBCXX} xcb xcb-render xcb-shm
-WANTLIB += z fribidi Xau Xdmcp execinfo jpeg
-WANTLIB += atspi dbus-1
+WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage
+WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
+WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 epoll-shim
+WANTLIB += epoxy execinfo expat ffi fontconfig freetype fribidi
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl jpeg
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
+WANTLIB += png wayland-client wayland-cursor wayland-egl xcb xcb-render
+WANTLIB += xcb-shm xkbcommon z
 
 LIB_DEPENDS=	x11/gtk+3
 RUN_DEPENDS=	devel/desktop-file-utils \
 		devel/vte3 \
 		x11/gtk+4,-guic
-
 FAKE_FLAGS=	doc_DATA="${WRKSRC}/README"
 LIBTOOL_FLAGS =	--tag=disable-static
 
@@ -44,7 +43,7 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--enable-html-docs=no \
 		--enable-pdf-docs=no \
 		--enable-api-docs=no \
-		--enable-gtk3=yes
+		--enable-gtkdoc-header=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/geany/distinfo,v
diff -u -p -u -p -r1.21 distinfo
--- distinfo	13 Oct 2023 05:15:01 -0000	1.21
+++ distinfo	6 Feb 2024 11:25:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (geany-1.38.tar.bz2) = q/8Xbk1IvqNe5TA3xJyC+QttTCPmmu1uSlyozNOq1UY=
-SIZE (geany-1.38.tar.bz2) = 4860717
+SHA256 (geany-2.0.tar.bz2) = VltM0vAxHB46Fn7HHEoy26ZC4P5VSuW7a4F3t6dMzJI=
+SIZE (geany-2.0.tar.bz2) = 6836300
Index: patches/patch-scintilla_src_RunStyles_cxx
===================================================================
RCS file: /cvs/ports/devel/geany/patches/patch-scintilla_src_RunStyles_cxx,v
diff -u -p -u -p -r1.2 patch-scintilla_src_RunStyles_cxx
--- patches/patch-scintilla_src_RunStyles_cxx	11 Mar 2022 18:50:04 -0000	1.2
+++ patches/patch-scintilla_src_RunStyles_cxx	6 Feb 2024 11:25:33 -0000
@@ -4,13 +4,13 @@ i386/powerpc fix for
 Index: scintilla/src/RunStyles.cxx
 --- scintilla/src/RunStyles.cxx.orig
 +++ scintilla/src/RunStyles.cxx
-@@ -308,7 +308,8 @@ void RunStyles<DISTANCE, STYLE>::Check() const {
+@@ -307,7 +307,8 @@ void RunStyles<DISTANCE, STYLE>::Check() const {
  
- template class Scintilla::RunStyles<int, int>;
- template class Scintilla::RunStyles<int, char>;
--#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
-+#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU || \
+ template class Scintilla::Internal::RunStyles<int, int>;
+ template class Scintilla::Internal::RunStyles<int, char>;
+-#if (PTRDIFF_MAX != INT_MAX) || defined(__HAIKU__)
++#if (PTRDIFF_MAX != INT_MAX) || defined(__HAIKU__) || \
 +    ( defined(__OpenBSD__) && defined(_ILP32) )
- template class Scintilla::RunStyles<ptrdiff_t, int>;
- template class Scintilla::RunStyles<ptrdiff_t, char>;
+ template class Scintilla::Internal::RunStyles<ptrdiff_t, int>;
+ template class Scintilla::Internal::RunStyles<ptrdiff_t, char>;
  #endif
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/geany/pkg/PLIST,v
diff -u -p -u -p -r1.31 PLIST
--- pkg/PLIST	13 Oct 2023 05:15:01 -0000	1.31
+++ pkg/PLIST	6 Feb 2024 11:25:33 -0000
@@ -22,7 +22,6 @@ include/geany/pluginutils.h
 include/geany/prefs.h
 include/geany/project.h
 include/geany/scintilla/
-include/geany/scintilla/Compat.h
 include/geany/scintilla/SciLexer.h
 include/geany/scintilla/Sci_Position.h
 include/geany/scintilla/Scintilla.h
@@ -56,11 +55,13 @@ lib/pkgconfig/geany.pc
 @man man/man1/geany.1
 share/applications/geany.desktop
 share/doc/geany/
+share/doc/geany/LexillaLicense.txt
 share/doc/geany/README
 share/doc/geany/ScintillaLicense.txt
 share/doc/geany/html/
 share/doc/geany/html/images/
 share/doc/geany/html/images/build_menu_commands_dialog.png
+share/doc/geany/html/images/edit_change_history.png
 share/doc/geany/html/images/find_dialog.png
 share/doc/geany/html/images/find_in_files_dialog.png
 share/doc/geany/html/images/main_window.png
@@ -81,6 +82,9 @@ share/doc/geany/html/images/pref_dialog_
 share/doc/geany/html/images/pref_dialog_various.png
 share/doc/geany/html/images/pref_dialog_vte.png
 share/doc/geany/html/images/replace_dialog.png
+share/doc/geany/html/images/sidebar_documents_only.png
+share/doc/geany/html/images/sidebar_show_paths.png
+share/doc/geany/html/images/sidebar_show_tree.png
 share/doc/geany/html/index.html
 share/doc/geany/manual.txt
 share/geany/
@@ -108,6 +112,7 @@ share/geany/filedefs/filetypes.actionscr
 share/geany/filedefs/filetypes.ada
 share/geany/filedefs/filetypes.asciidoc
 share/geany/filedefs/filetypes.asm
+share/geany/filedefs/filetypes.autoit
 share/geany/filedefs/filetypes.batch
 share/geany/filedefs/filetypes.bibtex
 share/geany/filedefs/filetypes.c
@@ -125,10 +130,10 @@ share/geany/filedefs/filetypes.diff
 share/geany/filedefs/filetypes.docbook
 share/geany/filedefs/filetypes.erlang
 share/geany/filedefs/filetypes.f77
-share/geany/filedefs/filetypes.ferite
 share/geany/filedefs/filetypes.forth
 share/geany/filedefs/filetypes.fortran
 share/geany/filedefs/filetypes.freebasic
+share/geany/filedefs/filetypes.gdscript
 share/geany/filedefs/filetypes.glsl
 share/geany/filedefs/filetypes.go
 share/geany/filedefs/filetypes.haskell
@@ -167,8 +172,6 @@ share/geany/filedefs/filetypes.xml
 share/geany/filedefs/filetypes.yaml
 share/geany/filedefs/filetypes.zephir
 share/geany/filetype_extensions.conf
-share/geany/geany-3.0.css
-share/geany/geany-3.20.css
 share/geany/geany.css
 share/geany/geany.glade
 share/geany/snippets.conf
@@ -192,6 +195,7 @@ share/geany/templates/files/main.c
 share/geany/templates/files/main.cxx
 share/geany/templates/files/main.d
 share/geany/templates/files/main.java
+share/geany/templates/files/main.md
 share/geany/templates/files/main.py
 share/geany/templates/files/main.vala
 share/geany/templates/files/module.erl
@@ -230,6 +234,7 @@ share/icons/hicolor/16x16/apps/geany.png
 share/icons/hicolor/24x24/actions/geany-build.png
 share/icons/hicolor/24x24/actions/geany-close-all.png
 share/icons/hicolor/24x24/actions/geany-save-all.png
+share/icons/hicolor/24x24/apps/geany.png
 share/icons/hicolor/32x32/actions/geany-build.png
 share/icons/hicolor/32x32/actions/geany-close-all.png
 share/icons/hicolor/32x32/actions/geany-save-all.png