devel/geany: Update to 2.0

- Add new dependency on iconv
- Add missing dpendency on gdkpixbuf2
- Reformat Makefile

3 files changed, 28 insertions, 22 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index d57ef90a2263..866f6a64d8be 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	geany
-PORTVERSION=	1.38
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	devel editors
-MASTER_SITES=	https://download.geany.org/ SF
+MASTER_SITES=	https://download.geany.org/ \
+		SF
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Fast and lightweight GTK IDE
@@ -14,29 +14,30 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
 USES=		compiler:c++11-lang desktop-file-utils gettext-tools gmake \
-		gnome libtool localbase pathfix pkgconfig python:build \
+		gnome iconv libtool localbase pathfix pkgconfig python:build \
 		shebangfix tar:bzip2
-USE_GNOME=	cairo gtk30 intltool
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
 USE_LDCONFIG=	yes
 
+SHEBANG_FILES=	scripts/gen-api-gtkdoc.py
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-SHEBANG_FILES=	scripts/gen-api-gtkdoc.py
 
-OPTIONS_DEFINE=	DOCS NLS THEMES VTE
+OPTIONS_DEFINE=		DOCS NLS THEMES VTE
 OPTIONS_DEFAULT=	VTE
-OPTIONS_SUB=	yes
-
-NLS_USES=	gettext-runtime
-NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_SUB=		yes
 
+THEMES_DESC=	Additional color schemes
 VTE_DESC=	Embedded virtual terminal
-VTE_CONFIGURE_ENABLE=	vte
-VTE_USE=	GNOME=vte3
 
-THEMES_DESC=	Additional color schemes
+NLS_USES=		gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+
 THEMES_RUN_DEPENDS=	${LOCALBASE}/share/geany/colorschemes/bespin.conf:devel/geany-themes
 
+VTE_USE=		GNOME=vte3
+VTE_CONFIGURE_ENABLE=	vte
+
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index d35fff609b56..b7ba9f8a572f 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633817038
-SHA256 (geany-1.38.tar.bz2) = abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546
-SIZE (geany-1.38.tar.bz2) = 4860717
+TIMESTAMP = 1697734446
+SHA256 (geany-2.0.tar.bz2) = 565b4cd2f0311c1e3a167ec71c4a32dba642e0fe554ae5bb6b8177b7a74ccc92
+SIZE (geany-2.0.tar.bz2) = 6836300
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index 0d8915023af6..75671ab2f43a 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -19,7 +19,6 @@ include/geany/plugindata.h
 include/geany/pluginutils.h
 include/geany/prefs.h
 include/geany/project.h
-include/geany/scintilla/Compat.h
 include/geany/scintilla/SciLexer.h
 include/geany/scintilla/Sci_Position.h
 include/geany/scintilla/Scintilla.h
@@ -54,12 +53,14 @@ share/applications/geany.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/LexillaLicense.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/html/images/build_menu_commands_dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/edit_change_history.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_in_files_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/main_window.png
@@ -80,11 +81,13 @@ share/applications/geany.desktop
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_various.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/replace_dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/sidebar_documents_only.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/sidebar_show_paths.png
+%%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%%/filetype_extensions.conf
 %%DATADIR%%/filedefs/filetypes.Arduino.conf
 %%DATADIR%%/filedefs/filetypes.CUDA.conf
 %%DATADIR%%/filedefs/filetypes.Clojure.conf
@@ -105,6 +108,7 @@ share/applications/geany.desktop
 %%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
@@ -122,10 +126,10 @@ share/applications/geany.desktop
 %%DATADIR%%/filedefs/filetypes.docbook
 %%DATADIR%%/filedefs/filetypes.erlang
 %%DATADIR%%/filedefs/filetypes.f77
-%%DATADIR%%/filedefs/filetypes.ferite
 %%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
@@ -163,8 +167,7 @@ share/applications/geany.desktop
 %%DATADIR%%/filedefs/filetypes.xml
 %%DATADIR%%/filedefs/filetypes.yaml
 %%DATADIR%%/filedefs/filetypes.zephir
-%%DATADIR%%/geany-3.0.css
-%%DATADIR%%/geany-3.20.css
+%%DATADIR%%/filetype_extensions.conf
 %%DATADIR%%/geany.css
 %%DATADIR%%/geany.glade
 %%DATADIR%%/snippets.conf
@@ -185,6 +188,7 @@ share/applications/geany.desktop
 %%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
@@ -212,6 +216,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