diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index d022c34b54e6..cddda0aeb66e 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,9 +1,6 @@
PORTNAME= geany
-PORTVERSION= 2.0
-PORTREVISION= 2
+DISTVERSION= 2.0.20250601
CATEGORIES= devel editors
-MASTER_SITES= https://download.geany.org/ \
- SF
MAINTAINER= madpilot@FreeBSD.org
COMMENT= Fast and lightweight GTK IDE
@@ -16,15 +13,18 @@ LIB_DEPENDS= libharfbuzz.so:print/harfbuzz
USES= compiler:c++11-lang desktop-file-utils gettext-tools gmake \
gnome iconv libtool localbase pathfix pkgconfig python:build \
- shebangfix tar:bzip2
+ shebangfix tar:bzip2 autoreconf
+USE_GITHUB= yes
+GH_TAGNAME= d81942f
USE_GNOME= cairo gdkpixbuf gtk30 intltool
USE_LDCONFIG= yes
SHEBANG_FILES= scripts/gen-api-gtkdoc.py
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
INSTALL_TARGET= install-strip
+PORTDATA= *
+
OPTIONS_DEFINE= DOCS NLS THEMES VTE
OPTIONS_DEFAULT= VTE
OPTIONS_SUB= yes
@@ -32,6 +32,7 @@ OPTIONS_SUB= yes
THEMES_DESC= Additional color schemes
VTE_DESC= Embedded virtual terminal
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}
NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index b7ba9f8a572f..3b05469a1417 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1697734446
-SHA256 (geany-2.0.tar.bz2) = 565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92
-SIZE (geany-2.0.tar.bz2) = 6836300
+TIMESTAMP = 1749014703
+SHA256 (geany-geany-2.0.20250601-d81942f_GH0.tar.gz) = 5d0decab98e142b217f50366041428d8f2ce7fa8fbc457e6c9f39b9d0d3a2cb0
+SIZE (geany-geany-2.0.20250601-d81942f_GH0.tar.gz) = 6647132
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index 93a76dd1d7f9..d45434bc0af0 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -16,6 +16,7 @@ include/geany/main.h
include/geany/msgwindow.h
include/geany/navqueue.h
include/geany/plugindata.h
+include/geany/pluginextension.h
include/geany/pluginutils.h
include/geany/prefs.h
include/geany/project.h
@@ -86,116 +87,6 @@ share/applications/geany.desktop
%%PORTDOCS%%%%DOCSDIR%%/html/images/sidebar_show_tree.png
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/manual.txt
-%%DATADIR%%/GPL-2
-%%DATADIR%%/colorschemes/alt.conf
-%%DATADIR%%/filedefs/filetypes.Arduino.conf
-%%DATADIR%%/filedefs/filetypes.CUDA.conf
-%%DATADIR%%/filedefs/filetypes.Clojure.conf
-%%DATADIR%%/filedefs/filetypes.Cython.conf
-%%DATADIR%%/filedefs/filetypes.Genie.conf
-%%DATADIR%%/filedefs/filetypes.Graphviz.conf
-%%DATADIR%%/filedefs/filetypes.Groovy.conf
-%%DATADIR%%/filedefs/filetypes.JSON.conf
-%%DATADIR%%/filedefs/filetypes.Kotlin.conf
-%%DATADIR%%/filedefs/filetypes.Meson.conf
-%%DATADIR%%/filedefs/filetypes.Nim.conf
-%%DATADIR%%/filedefs/filetypes.Scala.conf
-%%DATADIR%%/filedefs/filetypes.Swift.conf
-%%DATADIR%%/filedefs/filetypes.TypeScript.conf
-%%DATADIR%%/filedefs/filetypes.abaqus
-%%DATADIR%%/filedefs/filetypes.abc
-%%DATADIR%%/filedefs/filetypes.actionscript
-%%DATADIR%%/filedefs/filetypes.ada
-%%DATADIR%%/filedefs/filetypes.asciidoc
-%%DATADIR%%/filedefs/filetypes.asm
-%%DATADIR%%/filedefs/filetypes.autoit
-%%DATADIR%%/filedefs/filetypes.batch
-%%DATADIR%%/filedefs/filetypes.bibtex
-%%DATADIR%%/filedefs/filetypes.c
-%%DATADIR%%/filedefs/filetypes.caml
-%%DATADIR%%/filedefs/filetypes.cmake
-%%DATADIR%%/filedefs/filetypes.cobol
-%%DATADIR%%/filedefs/filetypes.coffeescript
-%%DATADIR%%/filedefs/filetypes.common
-%%DATADIR%%/filedefs/filetypes.conf
-%%DATADIR%%/filedefs/filetypes.cpp
-%%DATADIR%%/filedefs/filetypes.cs
-%%DATADIR%%/filedefs/filetypes.css
-%%DATADIR%%/filedefs/filetypes.d
-%%DATADIR%%/filedefs/filetypes.diff
-%%DATADIR%%/filedefs/filetypes.docbook
-%%DATADIR%%/filedefs/filetypes.erlang
-%%DATADIR%%/filedefs/filetypes.f77
-%%DATADIR%%/filedefs/filetypes.forth
-%%DATADIR%%/filedefs/filetypes.fortran
-%%DATADIR%%/filedefs/filetypes.freebasic
-%%DATADIR%%/filedefs/filetypes.gdscript
-%%DATADIR%%/filedefs/filetypes.glsl
-%%DATADIR%%/filedefs/filetypes.go
-%%DATADIR%%/filedefs/filetypes.haskell
-%%DATADIR%%/filedefs/filetypes.haxe
-%%DATADIR%%/filedefs/filetypes.html
-%%DATADIR%%/filedefs/filetypes.java
-%%DATADIR%%/filedefs/filetypes.javascript
-%%DATADIR%%/filedefs/filetypes.julia
-%%DATADIR%%/filedefs/filetypes.latex
-%%DATADIR%%/filedefs/filetypes.lisp
-%%DATADIR%%/filedefs/filetypes.lua
-%%DATADIR%%/filedefs/filetypes.makefile
-%%DATADIR%%/filedefs/filetypes.markdown
-%%DATADIR%%/filedefs/filetypes.matlab
-%%DATADIR%%/filedefs/filetypes.nsis
-%%DATADIR%%/filedefs/filetypes.objectivec
-%%DATADIR%%/filedefs/filetypes.pascal
-%%DATADIR%%/filedefs/filetypes.perl
-%%DATADIR%%/filedefs/filetypes.php
-%%DATADIR%%/filedefs/filetypes.po
-%%DATADIR%%/filedefs/filetypes.powershell
-%%DATADIR%%/filedefs/filetypes.python
-%%DATADIR%%/filedefs/filetypes.r
-%%DATADIR%%/filedefs/filetypes.restructuredtext
-%%DATADIR%%/filedefs/filetypes.ruby
-%%DATADIR%%/filedefs/filetypes.rust
-%%DATADIR%%/filedefs/filetypes.sh
-%%DATADIR%%/filedefs/filetypes.smalltalk
-%%DATADIR%%/filedefs/filetypes.sql
-%%DATADIR%%/filedefs/filetypes.tcl
-%%DATADIR%%/filedefs/filetypes.txt2tags
-%%DATADIR%%/filedefs/filetypes.vala
-%%DATADIR%%/filedefs/filetypes.verilog
-%%DATADIR%%/filedefs/filetypes.vhdl
-%%DATADIR%%/filedefs/filetypes.xml
-%%DATADIR%%/filedefs/filetypes.yaml
-%%DATADIR%%/filedefs/filetypes.zephir
-%%DATADIR%%/filetype_extensions.conf
-%%DATADIR%%/geany.css
-%%DATADIR%%/geany.glade
-%%DATADIR%%/snippets.conf
-%%DATADIR%%/tags/entities.html.tags
-%%DATADIR%%/tags/std.pas.tags
-%%DATADIR%%/tags/std.php.tags
-%%DATADIR%%/tags/std.py.tags
-%%DATADIR%%/tags/std99.c.tags
-%%DATADIR%%/templates/bsd
-%%DATADIR%%/templates/changelog
-%%DATADIR%%/templates/fileheader
-%%DATADIR%%/templates/files/file.html
-%%DATADIR%%/templates/files/file.php
-%%DATADIR%%/templates/files/file.rb
-%%DATADIR%%/templates/files/file.tex
-%%DATADIR%%/templates/files/file_html5.html
-%%DATADIR%%/templates/files/main.c
-%%DATADIR%%/templates/files/main.cxx
-%%DATADIR%%/templates/files/main.d
-%%DATADIR%%/templates/files/main.java
-%%DATADIR%%/templates/files/main.md
-%%DATADIR%%/templates/files/main.py
-%%DATADIR%%/templates/files/main.vala
-%%DATADIR%%/templates/files/module.erl
-%%DATADIR%%/templates/files/program.pas
-%%DATADIR%%/templates/function
-%%DATADIR%%/templates/gpl
-%%DATADIR%%/ui_toolbar.xml
share/icons/Tango/16x16/actions/geany-save-all.png
share/icons/Tango/24x24/actions/geany-save-all.png
share/icons/Tango/32x32/actions/geany-save-all.png