devel/geany*: Update to 1.38

- Removed flavoring, upstream dropped gtk2 support, so the ports
  are now gtk3 only
- Removed geany-plugin-multiterm that is gtk2 only and cannot work
  with gtk3 only geany
- Use https scheme for main master site

21 files changed, 99 insertions, 164 deletions

diff --git a/MOVED b/MOVED
index f8fce88ca611..1287c0a1a27b 100644
--- a/MOVED
+++ b/MOVED
@@ -16505,3 +16505,44 @@ sysutils/stanchion||2021-10-04|Has expired: dependencies no longer supported ups
 sysutils/riak-cs||2021-10-04|Has expired: dependencies no longer supported upstream
 devel/py-thriftpy|devel/py-thriftpy2|2021-10-04|Remove deprecated port. Use devel/py-thriftpy2 instead
 net/kafkacat|net/kcat|2021-10-06|Renamed
+devel/geany@gtk2|devel/geany|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-addons@gtk2|devel/geany-plugin-addons|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-autoclose@gtk2|devel/geany-plugin-autoclose|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-automark@gtk2|devel/geany-plugin-automark|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-codenav@gtk2|devel/geany-plugin-codenav|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-commander@gtk2|devel/geany-plugin-commander|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-ctags@gtk2|devel/geany-plugin-ctags|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-debugger@gtk2|devel/geany-plugin-debugger|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-defineformat@gtk2|devel/geany-plugin-defineformat|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-doc@gtk2|devel/geany-plugin-doc|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-extrasel@gtk2|devel/geany-plugin-extrasel|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-gendoc@gtk2|devel/geany-plugin-gendoc|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-geniuspaste@gtk2|devel/geany-plugin-geniuspaste|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-git-changebar@gtk2|devel/geany-plugin-git-changebar|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-insertnum@gtk2|devel/geany-plugin-insertnum|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-latex@gtk2|devel/geany-plugin-latex|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-lineoperations@gtk2|devel/geany-plugin-lineoperations|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-lipsum@gtk2|devel/geany-plugin-lipsum|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-lua@gtk2|devel/geany-plugin-lua|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-macro@gtk2|devel/geany-plugin-macro|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-miniscript@gtk2|devel/geany-plugin-miniscript|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-multiterm||2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-numberedbookmarks@gtk2|devel/geany-plugin-numberedbookmarks|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-overview@gtk2|devel/geany-plugin-overview|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-pairtaghighlighter@gtk2|devel/geany-plugin-pairtaghighlighter|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-pg@gtk2|devel/geany-plugin-pg|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-pohelper@gtk2|devel/geany-plugin-pohelper|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-pretty-printer@gtk2|devel/geany-plugin-pretty-printer|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-projectorganizer@gtk2|devel/geany-plugin-projectorganizer|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-prj@gtk2|devel/geany-plugin-prj|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-scope@gtk2|devel/geany-plugin-scope|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-sendmail@gtk2|devel/geany-plugin-sendmail|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-shiftcolumn@gtk2|devel/geany-plugin-shiftcolumn|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-spellcheck@gtk2|devel/geany-plugin-spellcheck|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-tableconvert@gtk2|devel/geany-plugin-tableconvert|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-treebrowser@gtk2|devel/geany-plugin-treebrowser|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-updatechecker@gtk2|devel/geany-plugin-updatechecker|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-vc@gtk2|devel/geany-plugin-vc|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-vimode@gtk2|devel/geany-plugin-vimode|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-workbench@gtk2|devel/geany-plugin-workbench|2021-10-10|Project dropped GTK2 support
+devel/geany-plugin-xmlsnippets@gtk2|devel/geany-plugin-xmlsnippets|2021-10-10|Project dropped GTK2 support
diff --git a/UPDATING b/UPDATING
index 509879b0cdd4..d3b1696e6298 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,28 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20211010:
+  AFFECTS: users of gtk2 flavored devel/geany*
+  AUTHOR: madpilot@FreeBSD.org
+
+  Upstream dropped support for gtk2. Due to this the ports are now
+  unflavored, installing only with gtk3 support.
+
+  If you are already using the default gtk3 flavor will get the new
+  version with a simple "pkg upgrade".
+
+  To upgrade when using the gtk2 flavors you need to use "pkg install"
+  to install the new unflavored gtk3 packages, pkg will automatically
+  uninstall the old gtk2 flavors.
+
+  If using ports, you will need to uninstall all geany packages and
+  its plugins and reinstall from an updated ports tree.
+
+  The "geany-plugin-multiterm" plugin was only available as a gtk2
+  flavor when installing the gtk2 flavor of geany and has not been
+  ported to gtk3, so has been removed from the tree, so the
+  geany-plugin-multiterm-gtk2 package should be removed from the system.
+
 20211007:
   AFFECTS: user of security/clamav
   AUTHOR: yasu@FreeBSD.org
diff --git a/devel/Makefile b/devel/Makefile
index 0692fe98d31e..563c6d4bcc97 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -775,7 +775,6 @@
     SUBDIR += geany-plugin-macro
     SUBDIR += geany-plugin-markdown
     SUBDIR += geany-plugin-miniscript
-    SUBDIR += geany-plugin-multiterm
     SUBDIR += geany-plugin-numberedbookmarks
     SUBDIR += geany-plugin-overview
     SUBDIR += geany-plugin-pairtaghighlighter
diff --git a/devel/geany-plugin-debugger/Makefile b/devel/geany-plugin-debugger/Makefile
index 9bc5abf3550f..b7beb84ac8b6 100644
--- a/devel/geany-plugin-debugger/Makefile
+++ b/devel/geany-plugin-debugger/Makefile
@@ -7,13 +7,7 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
 USES=		gnome xorg
 USE_XORG=	x11 xext
+USE_GNOME=	vte3
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
-
-.if ${FLAVOR} == gtk3
-USE_GNOME+=	vte3
-.else
-USE_GNOME+=	vte
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-git-changebar/Makefile b/devel/geany-plugin-git-changebar/Makefile
index 9ca21f7cb0cf..8cee2434d236 100644
--- a/devel/geany-plugin-git-changebar/Makefile
+++ b/devel/geany-plugin-git-changebar/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	geany-plugin-git-changebar
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/devel/geany-plugin-markdown/Makefile b/devel/geany-plugin-markdown/Makefile
index 875f8ceb2df4..f0ac21f806a6 100644
--- a/devel/geany-plugin-markdown/Makefile
+++ b/devel/geany-plugin-markdown/Makefile
@@ -8,8 +8,6 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
-FLAVORS=	gtk3
-
 OPTIONS_DEFINE=	DOCS
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
diff --git a/devel/geany-plugin-multiterm/Makefile b/devel/geany-plugin-multiterm/Makefile
deleted file mode 100644
index e91f2ccdd180..000000000000
--- a/devel/geany-plugin-multiterm/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-PORTNAME=	geany-plugin-multiterm
-PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
-PKGNAMESUFFIX=	-gtk2
-CATEGORIES=	devel
-
-MAINTAINER=	madpilot@FreeBSD.org
-COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
-
-BUILD_DEPENDS=	valac:lang/vala
-LIB_DEPENDS=	libgeany.so:devel/geany@gtk2
-
-FLAVORS=	# intentionally left empty
-
-USES=		gl xorg
-USE_GL=	gl
-USE_GNOME=	vte
-USE_XORG=	x11 xext
-
-.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
-.include <bsd.port.mk>
diff --git a/devel/geany-plugin-multiterm/pkg-descr b/devel/geany-plugin-multiterm/pkg-descr
deleted file mode 100644
index 47dcd8b3c524..000000000000
--- a/devel/geany-plugin-multiterm/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-MultiTerm is similar to Geany's built-in VTE terminal except that
-it supports multiple terminals in tabs and supports different shells
-in each of the terminal tabs.
-
-WWW: https://plugins.geany.org/multiterm.html
diff --git a/devel/geany-plugin-multiterm/pkg-plist b/devel/geany-plugin-multiterm/pkg-plist
deleted file mode 100644
index 54cac926274b..000000000000
--- a/devel/geany-plugin-multiterm/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/geany/multiterm.so
-%%DOCSDIR%%/multiterm/AUTHORS
-%%DOCSDIR%%/multiterm/COPYING
-%%DOCSDIR%%/multiterm/ChangeLog
-%%DOCSDIR%%/multiterm/NEWS
-%%DOCSDIR%%/multiterm/README
-%%DOCSDIR%%/multiterm/TODO
diff --git a/devel/geany-plugin-scope/Makefile b/devel/geany-plugin-scope/Makefile
index 710b912d1f21..b0e31ba2fb84 100644
--- a/devel/geany-plugin-scope/Makefile
+++ b/devel/geany-plugin-scope/Makefile
@@ -5,19 +5,12 @@ CATEGORIES=	devel
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-gtk3_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
-			libgnutls.so:security/gnutls
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
+		libgnutls.so:security/gnutls
 
 USES=		gnome xorg
-
 USE_XORG=	x11 xext
+USE_GNOME=	vte3
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
-
-.if ${FLAVOR} == gtk3
-USE_GNOME+=	vte3
-.else
-USE_GNOME+=	vte
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-utilslib/Makefile b/devel/geany-plugin-utilslib/Makefile
index ba322da2a2d8..da5bfaea63d3 100644
--- a/devel/geany-plugin-utilslib/Makefile
+++ b/devel/geany-plugin-utilslib/Makefile
@@ -8,11 +8,4 @@ COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 OPTIONS_DEFINE=	DOCS
 
 .include "${.CURDIR}/../geany-plugins/files/Makefile.common"
-
-.if ${FLAVOR} == gtk2
-USES+=		xorg
-USE_GNOME+=	vte
-USE_XORG+=	x11 xext
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/geany-plugin-vc/Makefile b/devel/geany-plugin-vc/Makefile
index 47c597408943..0574e6a01a14 100644
--- a/devel/geany-plugin-vc/Makefile
+++ b/devel/geany-plugin-vc/Makefile
@@ -5,9 +5,8 @@ CATEGORIES=	devel
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
 
-gtk2_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
-gtk3_LIB_DEPENDS=	libgtkspell3-3.so:textproc/gtkspell3 \
-			libenchant-2.so:textproc/enchant2
+LIB_DEPENDS=	libgtkspell3-3.so:textproc/gtkspell3 \
+		libenchant-2.so:textproc/enchant2
 
 OPTIONS_DEFINE=		GTKSPELL
 OPTIONS_DEFAULT=	GTKSPELL
diff --git a/devel/geany-plugin-workbench/Makefile b/devel/geany-plugin-workbench/Makefile
index 6a31a5c9b952..30bdd9dfe921 100644
--- a/devel/geany-plugin-workbench/Makefile
+++ b/devel/geany-plugin-workbench/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	geany-plugin-workbench
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	madpilot@FreeBSD.org
diff --git a/devel/geany-plugins-l10n/pkg-plist b/devel/geany-plugins-l10n/pkg-plist
index c85eb47cc5a1..976cb0a4be60 100644
--- a/devel/geany-plugins-l10n/pkg-plist
+++ b/devel/geany-plugins-l10n/pkg-plist
@@ -14,4 +14,5 @@ share/locale/pt/LC_MESSAGES/geany-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/geany-plugins.mo
 share/locale/ru/LC_MESSAGES/geany-plugins.mo
 share/locale/tr/LC_MESSAGES/geany-plugins.mo
+share/locale/uk/LC_MESSAGES/geany-plugins.mo
 share/locale/zh_CN/LC_MESSAGES/geany-plugins.mo
diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile
index 3851b8da71e0..477c349640d2 100644
--- a/devel/geany-plugins/Makefile
+++ b/devel/geany-plugins/Makefile
@@ -8,50 +8,19 @@ DISTFILES=	# none
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Geany plugins (meta port)
 
-FLAVORS=	gtk3 gtk2
-FLAVOR?=	${FLAVORS:[1]}
-
-gtk2_CONFLICTS_INSTALL=	geany-plugins
-gtk2_PKGNAMESUFFIX=	-gtk2
-
-gtk3_CONFLICTS_INSTALL=	geany-plugins-gtk2
-
 USES=		metaport
 
-OPTIONS_DEFINE=		NLS
-OPTIONS_GROUP=		GTK2 GTK3 ALL
-OPTIONS_GROUP_GTK2=	${GEANY_PLUGINS_GTK2:tu}
-OPTIONS_GROUP_GTK3=	${GEANY_PLUGINS_GTK3:tu}
-OPTIONS_GROUP_ALL=	${GEANY_PLUGINS_ALL:tu}
-OPTIONS_DEFAULT=	${GEANY_PLUGINS_ALL:tu} ${GEANY_PLUGINS_GTK2:tu} ${GEANY_PLUGINS_GTK3:tu}
+OPTIONS_DEFINE=		NLS ${GEANY_PLUGINS:tu}
+OPTIONS_DEFAULT=	${GEANY_PLUGINS:tu}
 NO_OPTIONS_SORT=	yes
 
-GTK2_DESC=		Available only for GTK2
-GTK3_DESC=		Available only for GTK3
-ALL_DESC=		Available for both GTK2 and GTK3
-
 .include "${.CURDIR}/files/bsd.geany-plugins.mk"
 
-.for plugin in ${GEANY_PLUGINS_ALL} ${GEANY_PLUGINS_GTK2} ${GEANY_PLUGINS_GTK3}
-${plugin:tu}_DESC=	${${plugin}_DESC}
+.for plugin in ${GEANY_PLUGINS}
+${plugin:tu}_DESC=		${${plugin}_DESC}
+${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}
 .endfor
 
-.if ${FLAVOR} == gtk2
-.for plugin in ${GEANY_PLUGINS_ALL}
-${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}-gtk2>=0:devel/geany-plugin-${plugin}@gtk2
-.endfor
-.for plugin in ${GEANY_PLUGINS_GTK2}
-${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}-gtk2>=0:devel/geany-plugin-${plugin}
-.endfor
-NLS_RUN_DEPENDS=	geany-plugins-l10n-gtk2>=0:devel/geany-plugins-l10n@gtk2
-.elif ${FLAVOR} == gtk3
-.for plugin in ${GEANY_PLUGINS_ALL}
-${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}@gtk3
-.endfor
-.for plugin in ${GEANY_PLUGINS_GTK3}
-${plugin:tu}_RUN_DEPENDS=       geany-plugin-${plugin}>=0:devel/geany-plugin-${plugin}
-.endfor
-NLS_RUN_DEPENDS=	geany-plugins-l10n>=0:devel/geany-plugins-l10n@gtk3
-.endif
+NLS_RUN_DEPENDS=	geany-plugins-l10n>=0:devel/geany-plugins-l10n
 
 .include <bsd.port.mk>
diff --git a/devel/geany-plugins/distinfo b/devel/geany-plugins/distinfo
index 4484edd1f4b6..d98c08523b83 100644
--- a/devel/geany-plugins/distinfo
+++ b/devel/geany-plugins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603653497
-SHA256 (geany-plugins-1.37.tar.bz2) = c98f9b1303f4ab9bed7587e749cd0b5594d9136a1bf8ba110900d46a17fa9cd8
-SIZE (geany-plugins-1.37.tar.bz2) = 3385143
+TIMESTAMP = 1633817856
+SHA256 (geany-plugins-1.38.tar.bz2) = 1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586
+SIZE (geany-plugins-1.38.tar.bz2) = 3414888
diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common
index 1c0a85503f72..7c7211aa0fd6 100644
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@@ -6,17 +6,10 @@ DISTINFO_FILE=	${.CURDIR}/../../devel/geany-plugins/distinfo
 
 GNU_CONFIGURE=	yes
 USES+=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2
-USE_GNOME+=	intltool
+USE_GNOME+=	gtk30 intltool
 
-FLAVORS?=	gtk3 gtk2
-FLAVOR?=	${FLAVORS:[1]}
-
-gtk2_CONFLICTS_INSTALL=	geany-plugin-${GEANY_PLUGIN}
-gtk2_PKGNAMESUFFIX=	-gtk2
-gtk2_LIB_DEPENDS+=	libgeany.so:devel/geany@gtk2
-
-gtk3_CONFLICTS_INSTALL=	geany-plugin-${GEANY_PLUGIN}-gtk2
-gtk3_LIB_DEPENDS+=	libgeany.so:devel/geany@gtk3
+LIB_DEPENDS+=	libgeany.so:devel/geany \
+		libharfbuzz.so:print/harfbuzz
 
 # geany-plugins-l10n is not a plugin, thus special treatment
 .if ${PORTNAME} == "geany-plugins-l10n"
@@ -30,16 +23,6 @@ USES+=		compiler:c++11-lang
 .endif
 INSTALL_TARGET=	install-strip
 USE_GNOME+=	cairo gdkpixbuf2
-
-.if ${FLAVOR} == gtk3
-CONFIGURE_ARGS+=	--enable-gtk3
-USE_GNOME+=	gtk30
-.else
-LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2
-CONFIGURE_ARGS+=	--disable-gtk3
-USE_GNOME+=	gtk20
-.endif
 .endif
 
 GEANY_PLUGIN?=			${PORTNAME:S,geany-plugin-,,}
@@ -56,8 +39,7 @@ DOCSDIR=	share/doc/geany-plugins
 
 .if ${GEANY_UTIL:M${GEANY_PLUGIN}}
 
-gtk2_LIB_DEPENDS+=	libgeanypluginutils.so:devel/geany-plugin-utilslib@gtk2
-gtk3_LIB_DEPENDS+=	libgeanypluginutils.so:devel/geany-plugin-utilslib@gtk3
+LIB_DEPENDS+=		libgeanypluginutils.so:devel/geany-plugin-utilslib
 CONFIGURE_ARGS+=	--enable-utilslib
 
 pre-build:
diff --git a/devel/geany-plugins/files/bsd.geany-plugins.mk b/devel/geany-plugins/files/bsd.geany-plugins.mk
index 80f49ab70f21..3235d7247e42 100644
--- a/devel/geany-plugins/files/bsd.geany-plugins.mk
+++ b/devel/geany-plugins/files/bsd.geany-plugins.mk
@@ -1,9 +1,6 @@
-GEANY_VER=		1.37
-GEANY_PLUGINS_GTK2=	multiterm
+GEANY_VER=		1.38
 
-GEANY_PLUGINS_GTK3=	markdown
-
-GEANY_PLUGINS_ALL=	addons \
+GEANY_PLUGINS=		addons \
 			autoclose \
 			automark \
 			codenav \
@@ -22,6 +19,7 @@ GEANY_PLUGINS_ALL=	addons \
 			lipsum \
 			lua \
 			macro \
+			markdown \
 			miniscript \
 			numberedbookmarks \
 			overview \
@@ -64,7 +62,6 @@ lua_DESC=		Lua scripting
 macro_DESC=		user defined macros
 markdown_DESC=		real-time preview of rendered Markdown
 miniscript_DESC=	pipe text/documents via script (shell, perl, awk, etc.)
-multiterm_DESC=		multi-tabbed virtual terminals emulator
 numberedbookmarks_DESC=	additional numbered bookmarks
 overview_DESC=		zoomed-out view of open files
 pairtaghighlighter_DESC=	highlight matching opening/closing HTML tags
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index a6cae0d13f5f..a563293eabae 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,9 +1,9 @@
 # Created by: Remington Lang <MrL0Lz@gmail.com>
 
 PORTNAME=	geany
-PORTVERSION=	1.37.1
+PORTVERSION=	1.38
 CATEGORIES=	devel editors
-MASTER_SITES=	http://download.geany.org/ SF
+MASTER_SITES=	https://download.geany.org/ SF
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Fast and lightweight GTK+ IDE
@@ -11,20 +11,12 @@ COMMENT=	Fast and lightweight GTK+ IDE
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-FLAVORS=	gtk3 gtk2
-FLAVOR?=	${FLAVORS:[1]}
-
-gtk2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-			libfreetype.so:print/freetype2
-gtk2_CONFLICTS_INSTALL=	geany
-gtk2_PKGNAMESUFFIX=	-gtk2
-
-gtk3_CONFLICTS_INSTALL=	geany-gtk2
+LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
 USES=		compiler:c++11-lang desktop-file-utils gettext-tools gmake \
 		gnome libtool localbase pathfix pkgconfig python:build \
 		shebangfix tar:bzip2
-USE_GNOME=	cairo intltool
+USE_GNOME=	cairo gtk30 intltool
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
@@ -41,22 +33,11 @@ NLS_CONFIGURE_ENABLE=	nls
 
 VTE_DESC=	Embedded virtual terminal
 VTE_CONFIGURE_ENABLE=	vte
+VTE_USE=	GNOME=vte3
 
 THEMES_DESC=	Additional color schemes
 THEMES_RUN_DEPENDS=	${LOCALBASE}/share/geany/colorschemes/bespin.conf:devel/geany-themes
 
-.if ${FLAVOR} == gtk2
-USE_GNOME+=	gtk20
-VTE_USE=	GNOME=vte
-CONFIGURE_ARGS+=	--enable-gtk2
-PLIST_SUB+=	GTK2="" GTK3="@comment "
-.elif ${FLAVOR} == gtk3
-USE_GNOME+=	gtk30
-VTE_USE=	GNOME=vte3
-CONFIGURE_ARGS+=	--disable-gtk2
-PLIST_SUB+=	GTK2="@comment " GTK3=""
-.endif
-
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index c32aeac5ddc1..d35fff609b56 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604857049
-SHA256 (geany-1.37.1.tar.bz2) = 18c5756444c1d8bcd737c8ecfd4ef0b3607c924fc02560d4e8b78f6121531a18
-SIZE (geany-1.37.1.tar.bz2) = 4689173
+TIMESTAMP = 1633817038
+SHA256 (geany-1.38.tar.bz2) = abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546
+SIZE (geany-1.38.tar.bz2) = 4860717
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index 875301e93b2e..0d8915023af6 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -94,6 +94,7 @@ share/applications/geany.desktop
 %%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
@@ -132,6 +133,7 @@ share/applications/geany.desktop
 %%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
@@ -161,11 +163,10 @@ share/applications/geany.desktop
 %%DATADIR%%/filedefs/filetypes.xml
 %%DATADIR%%/filedefs/filetypes.yaml
 %%DATADIR%%/filedefs/filetypes.zephir
-%%GTK3%%%%DATADIR%%/geany-3.0.css
-%%GTK3%%%%DATADIR%%/geany-3.20.css
-%%GTK3%%%%DATADIR%%/geany.css
+%%DATADIR%%/geany-3.0.css
+%%DATADIR%%/geany-3.20.css
+%%DATADIR%%/geany.css
 %%DATADIR%%/geany.glade
-%%GTK2%%%%DATADIR%%/geany.gtkrc
 %%DATADIR%%/snippets.conf
 %%DATADIR%%/tags/entities.html.tags
 %%DATADIR%%/tags/std.pas.tags