diff --git a/editors/Makefile b/editors/Makefile
index 944a65c74c22..2edb318879a2 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,299 +1,300 @@
     COMMENT = Editors
 
     SUBDIR += 2bsd-vi
     SUBDIR += abiword
     SUBDIR += abiword-docs
     SUBDIR += ad
     SUBDIR += aee
     SUBDIR += aewan
     SUBDIR += amp
     SUBDIR += apel
     SUBDIR += beav
     SUBDIR += bee-host
     SUBDIR += biew
     SUBDIR += bined
     SUBDIR += bingrok
     SUBDIR += bitedit
     SUBDIR += bless
     SUBDIR += boiling-egg
     SUBDIR += bpatch
     SUBDIR += bvi
     SUBDIR += calligra
     SUBDIR += calligraplan
     SUBDIR += chexedit
     SUBDIR += cooledit
     SUBDIR += cpeditor
     SUBDIR += cream
     SUBDIR += cudatext
     SUBDIR += deforaos-editor
     SUBDIR += dhex
     SUBDIR += diakonos
     SUBDIR += diamond
     SUBDIR += dkns
     SUBDIR += drjava
     SUBDIR += dte
     SUBDIR += e3
     SUBDIR += e93
     SUBDIR += ecce
     SUBDIR += ecrire
     SUBDIR += editorconfig-core-c
     SUBDIR += elementary-code
     SUBDIR += emacs
     SUBDIR += emacs-devel
     SUBDIR += encryptpad
     SUBDIR += featherpad
     SUBDIR += fileobj
     SUBDIR += flim
     SUBDIR += focuswriter
     SUBDIR += fxite
     SUBDIR += gedit
     SUBDIR += gedit-plugins
     SUBDIR += ghex
     SUBDIR += ghostwriter
     SUBDIR += gmanedit
     SUBDIR += gnome-latex
     SUBDIR += gnome-text-editor
     SUBDIR += gobby
     SUBDIR += gomate
     SUBDIR += gummi
     SUBDIR += helix
     SUBDIR += heme
     SUBDIR += hexcurse
     SUBDIR += hexedit
     SUBDIR += hexer
     SUBDIR += hexpert
     SUBDIR += hnb
     SUBDIR += hte
     SUBDIR += imhex
     SUBDIR += jed
     SUBDIR += jedit
     SUBDIR += joe
     SUBDIR += jove
     SUBDIR += jucipp
     SUBDIR += jupp
     SUBDIR += kakoune
     SUBDIR += kakoune-lsp
     SUBDIR += kate
     SUBDIR += kibi
     SUBDIR += kile
     SUBDIR += komodo-edit
     SUBDIR += languageclient-neovim
     SUBDIR += lapce
     SUBDIR += lazarus
     SUBDIR += lazarus-devel
+    SUBDIR += lazarus-gtk3-devel
     SUBDIR += lazarus-qt5
     SUBDIR += lazarus-qt5-devel
     SUBDIR += lazarus-qt6
     SUBDIR += lazarus-qt6-devel
     SUBDIR += le
     SUBDIR += leafpad
     SUBDIR += libreoffice
     SUBDIR += libreoffice-af
     SUBDIR += libreoffice-am
     SUBDIR += libreoffice-as
     SUBDIR += libreoffice-ast
     SUBDIR += libreoffice-be
     SUBDIR += libreoffice-bg
     SUBDIR += libreoffice-bn
     SUBDIR += libreoffice-bn_IN
     SUBDIR += libreoffice-bo
     SUBDIR += libreoffice-br
     SUBDIR += libreoffice-brx
     SUBDIR += libreoffice-bs
     SUBDIR += libreoffice-ca
     SUBDIR += libreoffice-ca_valencia
     SUBDIR += libreoffice-ckb
     SUBDIR += libreoffice-cs
     SUBDIR += libreoffice-cy
     SUBDIR += libreoffice-da
     SUBDIR += libreoffice-dgo
     SUBDIR += libreoffice-dsb
     SUBDIR += libreoffice-dz
     SUBDIR += libreoffice-el
     SUBDIR += libreoffice-en_GB
     SUBDIR += libreoffice-en_ZA
     SUBDIR += libreoffice-eo
     SUBDIR += libreoffice-es
     SUBDIR += libreoffice-et
     SUBDIR += libreoffice-eu
     SUBDIR += libreoffice-fa
     SUBDIR += libreoffice-fi
     SUBDIR += libreoffice-fur
     SUBDIR += libreoffice-fy
     SUBDIR += libreoffice-ga
     SUBDIR += libreoffice-gd
     SUBDIR += libreoffice-gl
     SUBDIR += libreoffice-gu
     SUBDIR += libreoffice-gug
     SUBDIR += libreoffice-hi
     SUBDIR += libreoffice-hr
     SUBDIR += libreoffice-hsb
     SUBDIR += libreoffice-hy
     SUBDIR += libreoffice-i18n
     SUBDIR += libreoffice-id
     SUBDIR += libreoffice-is
     SUBDIR += libreoffice-it
     SUBDIR += libreoffice-ka
     SUBDIR += libreoffice-kab
     SUBDIR += libreoffice-kk
     SUBDIR += libreoffice-km
     SUBDIR += libreoffice-kmr_Latn
     SUBDIR += libreoffice-kn
     SUBDIR += libreoffice-kok
     SUBDIR += libreoffice-ks
     SUBDIR += libreoffice-lb
     SUBDIR += libreoffice-lo
     SUBDIR += libreoffice-lt
     SUBDIR += libreoffice-lv
     SUBDIR += libreoffice-mai
     SUBDIR += libreoffice-mk
     SUBDIR += libreoffice-ml
     SUBDIR += libreoffice-mn
     SUBDIR += libreoffice-mni
     SUBDIR += libreoffice-mr
     SUBDIR += libreoffice-my
     SUBDIR += libreoffice-nb
     SUBDIR += libreoffice-ne
     SUBDIR += libreoffice-nl
     SUBDIR += libreoffice-nn
     SUBDIR += libreoffice-nr
     SUBDIR += libreoffice-nso
     SUBDIR += libreoffice-oc
     SUBDIR += libreoffice-om
     SUBDIR += libreoffice-or
     SUBDIR += libreoffice-pa_IN
     SUBDIR += libreoffice-ro
     SUBDIR += libreoffice-rw
     SUBDIR += libreoffice-sa_IN
     SUBDIR += libreoffice-sat
     SUBDIR += libreoffice-sd
     SUBDIR += libreoffice-si
     SUBDIR += libreoffice-sid
     SUBDIR += libreoffice-sk
     SUBDIR += libreoffice-sl
     SUBDIR += libreoffice-sq
     SUBDIR += libreoffice-sr
     SUBDIR += libreoffice-sr_Latn
     SUBDIR += libreoffice-ss
     SUBDIR += libreoffice-st
     SUBDIR += libreoffice-sv
     SUBDIR += libreoffice-sw_TZ
     SUBDIR += libreoffice-szl
     SUBDIR += libreoffice-ta
     SUBDIR += libreoffice-te
     SUBDIR += libreoffice-tg
     SUBDIR += libreoffice-th
     SUBDIR += libreoffice-tn
     SUBDIR += libreoffice-tr
     SUBDIR += libreoffice-ts
     SUBDIR += libreoffice-tt
     SUBDIR += libreoffice-ug
     SUBDIR += libreoffice-uz
     SUBDIR += libreoffice-ve
     SUBDIR += libreoffice-vec
     SUBDIR += libreoffice-xh
     SUBDIR += libreoffice-zu
     SUBDIR += linux-bcompare
     SUBDIR += linux-r7-office
     SUBDIR += linux-sublime-text4
     SUBDIR += linux-sublime3
     SUBDIR += linux-wps-office
     SUBDIR += lite
     SUBDIR += lite-xl
     SUBDIR += marker
     SUBDIR += mg
     SUBDIR += mickey
     SUBDIR += micro
     SUBDIR += mined
     SUBDIR += mle
     SUBDIR += mousepad
     SUBDIR += mp
     SUBDIR += nano
     SUBDIR += ne
     SUBDIR += nedit
     SUBDIR += neovim
     SUBDIR += neovim-gtk
     SUBDIR += neovim-qt
     SUBDIR += notepadnext
     SUBDIR += notepadnext-devel
     SUBDIR += novelwriter
     SUBDIR += nvi-m17n
     SUBDIR += nvi2
     SUBDIR += omegaT
     SUBDIR += openoffice-4
     SUBDIR += openoffice-devel
     SUBDIR += orbiton
     SUBDIR += ox
     SUBDIR += p5-Proc-InvokeEditor
     SUBDIR += p5-Vimana
     SUBDIR += paredit-mode.el
     SUBDIR += parinfer-rust
     SUBDIR += pico-alpine
     SUBDIR += picpas
     SUBDIR += pluma
     SUBDIR += pluma-plugins
     SUBDIR += poedit
     SUBDIR += poke
     SUBDIR += pragtical
     SUBDIR += psgml
     SUBDIR += puff
     SUBDIR += py-babi
     SUBDIR += py-editorconfig
     SUBDIR += py-pynvim
     SUBDIR += py-vim-bridge
     SUBDIR += quilter
     SUBDIR += rehex
     SUBDIR += retext
     SUBDIR += rubygem-neovim
     SUBDIR += sam
     SUBDIR += scite
     SUBDIR += sciteco
     SUBDIR += se
     SUBDIR += semi
     SUBDIR += setzer
     SUBDIR += shed
     SUBDIR += slime
     SUBDIR += sly
     SUBDIR += sly-asdf
     SUBDIR += sly-named-readtables
     SUBDIR += sly-quicklisp
     SUBDIR += ssed
     SUBDIR += sted
     SUBDIR += tamago
     SUBDIR += tea
     SUBDIR += teco
     SUBDIR += ted
     SUBDIR += tetradraw
     SUBDIR += texmacs
     SUBDIR += texmaker
     SUBDIR += texstudio
     SUBDIR += textadept
     SUBDIR += texworks
     SUBDIR += the
     SUBDIR += treeform
     SUBDIR += turbo
     SUBDIR += tweak
     SUBDIR += uemacs
     SUBDIR += uhex
     SUBDIR += uzap
     SUBDIR += ved
     SUBDIR += vigor
     SUBDIR += vile
     SUBDIR += vim
     SUBDIR += vim-colorschemes-legacy
     SUBDIR += vim-lsp
     SUBDIR += vis
     SUBDIR += vscode
     SUBDIR += web-mode
     SUBDIR += with-editor
     SUBDIR += with-editor-devel
     SUBDIR += wordgrinder
     SUBDIR += wxhexeditor
     SUBDIR += xcoral
     SUBDIR += xed
     SUBDIR += xmlcopyeditor
     SUBDIR += xvile
     SUBDIR += yudit
     SUBDIR += zile
 
 .include <bsd.port.subdir.mk>
diff --git a/editors/lazarus-devel/Makefile b/editors/lazarus-devel/Makefile
index b55b899a9327..58f39216851d 100644
--- a/editors/lazarus-devel/Makefile
+++ b/editors/lazarus-devel/Makefile
@@ -1,180 +1,185 @@
 PORTNAME=	lazarus
 DISTVERSION=	4.99.20250409
 PKGNAMESUFFIX?=  -gtk2-devel
 PORTREVISION?=	0
 CATEGORIES=	editors devel
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler (GTK2 devel)
 WWW=		https://www.lazarus-ide.org/
 
 CONFLICTS?=	lazarus-gtk2 lazarus-qt5 lazarus-qt5-devel lazarus-qt6-devel
 
 BUILD_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
 		gmake:devel/gmake \
 		${LOCALBASE}/share/fpc${FPC_DEVELSUFFIX}-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc${FPC_DEVELSUFFIX}-source
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	freepascal.org/lazarus
 GL_PROJECT=	${PORTNAME}
 GL_COMMIT=	90027a9d870594cdcef8909480eabb5e581669f0
 
 USES=		desktop-file-utils fpc:run gettext gmake iconv shared-mime-info xorg
 USE_XORG=	x11
 WANT_FPC_DEVEL=	yes
 OPT?=		"-Sgic -Ur"
 
 MAKE_ENV=	OPT=${OPT}
 PLIST=		${WRKDIR}/pkg-plist
 #WRKSRC?=	${WRKDIR}/${PORTNAME}
 DATADIR?=	${PREFIX}/share/${PORTNAME}-${LAZARUS_BASE}
 
 OPTIONS_DEFINE=		GDB
 GDB_DESC=		Install a newest version  of gdb
 OPTIONS_DEFAULT=	GDB
 
 .include <bsd.port.options.mk>
 
 LAZARUS_ARCH=	${ARCH:S,amd64,x86_64,}
 LAZARUS_BASE=	4.99
 
 BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_PLATFORM?=	gtk2
 
 MAN1S=		lazarus-ide.1 lazbuild.1 startlazarus.1
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR="${PORTSDIR}"
 
 .if ${PORT_OPTIONS:MGDB}
 RUN_DEPENDS+=	${LOCALBASE}/bin/gdb:devel/gdb
 .endif
 
 .if ${PKGNAMESUFFIX} == "-gtk2-devel"
 USES+=		gnome
 USE_GNOME=	cairo gtk20 gdkpixbuf
 .endif
 
+.if ${PKGNAMESUFFIX} == "-gtk3-devel"
+USES+=		gnome
+USE_GNOME=	cairo glib20 gtk30 pango
+.endif
+
 post-extract:
 	@${MKDIR} ${WRKDIR}/man1
 	@${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/
 	@${MV} ${WRKSRC}/install/man/man1/lazbuild.1 ${WRKDIR}/man1/
 	@${MV} ${WRKSRC}/install/man/man1/startlazarus.1 ${WRKDIR}/man1/
 	@${MV} ${WRKSRC}/examples ${WRKDIR}/examples
 	@${MV} ${WRKSRC}/docs ${WRKDIR}/docs
 	@${RM} ${WRKSRC}/tools/.gitignore
 	@${RM} ${WRKSRC}/Dockerfile.buildenv
 	@${RM} ${WRKSRC}/buildenv.Dockerfile
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's|startlazarus|${PORTNAME}|g' ${WRKSRC}/install/${PORTNAME}.desktop
 
 do-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} bigide LCL_PLATFORM=${LCL_PLATFORM}
 
 post-build:
 	@cd ${WRKSRC} && \
 		${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
 			ide/Makefile*.orig ide/Makefile*.bak lcl/interfaces/qt5/qtobjects.pas.orig \
 			.git*
 	@cd ${WRKSRC} && \
 		${FIND} . -name ".gitignore" -exec ${RM} "{}" \;
 
 pre-install:
 	@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
 	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/lazarus-wrapper
 	@${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper
 
 	@${RM} ${PLIST}
 	@${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS
 
 .	for FILE in bin/lazarus bin/lazbuild
 		@${ECHO_CMD} ${FILE} >> ${PLIST}
 .	endfor
 .	for m in ${MAN1S}
 		@${ECHO_CMD} share/man/man1/${m}.gz >> ${PLIST}
 .	endfor
 
 	@${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST}
 	@cd ${WRKDIR}/docs && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST}
 
 	@${ECHO_CMD} "%%DATADIR%%/examples" >> ${PLIST}
 	@cd ${WRKDIR}/examples && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%EXAMPLESDIR%%/|' >> ${PLIST} && \
 		${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%EXAMPLESDIR%%/|' >> ${PLIST}
 
 	@cd ${WRKSRC} && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 		${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST}
 
 	@${ECHO_CMD} "share/applications/lazarus.desktop" >> ${PLIST}
 
 .	for RESO in 128 16 256 32 48 64
 		@${ECHO_CMD} share/icons/hicolor/${RESO}x${RESO}/apps/lazarus.png >> ${PLIST}
 .	endfor
 
 	@cd ${WRKSRC}/images/mimetypes && \
 		${FIND} * -type f -name "*.png" | ${SORT} | ${SED} -e 's|^|share/icons/hicolor/48x48/mimetypes/|' >> ${PLIST}
 
 	@${ECHO_CMD} "share/icons/hicolor/scalable/apps/lazarus.svg" >> ${PLIST}
 	@${ECHO_CMD} "share/mime/packages/lazarus.xml" >> ${PLIST}
 
 do-install:
 .for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \
 	packager tools units
 		@${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE}
 		@cd ${WRKSRC}/${DIRE} && \
 			${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \
 				${FIND} * -type f -exec ${INSTALL_DATA} -p {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \;
 .endfor
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \
 		${STAGEDIR}${DATADIR}/tools/updatepofiles
 
 .for FILE in lazarus lazbuild startlazarus
 	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR}
 .endfor
 
 	@cd ${WRKDIR}/docs && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \;
 	@${LN} -sf ${DOCSDIR} ${STAGEDIR}${DATADIR}/docs
 
 	@cd ${WRKDIR}/examples && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${EXAMPLESDIR}/{}" \;
 	@${LN} -sf ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
 .for RESO in 128 16 256 32 48 64
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps
 	${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}${RESO}x${RESO}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps/${PORTNAME}.png
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes
 	@cd ${WRKSRC}/images/mimetypes && \
 		${FIND} * -type f -name "*.png" -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes/{} \;
 
 	@${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	@${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 	@${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}-mime.xml ${STAGEDIR}${PREFIX}/share/mime/packages/${PORTNAME}.xml
 
 	${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA}	${WRKSRC}/Makefile* ${WRKSRC}/fpmake*  ${STAGEDIR}${DATADIR}
 .for FILE in ${MAN1S}
 	${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${PREFIX}/share/man/man1
 .endfor
 	${LN} -sf ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild
 
 .include <bsd.port.mk>
diff --git a/editors/lazarus-gtk3-devel/Makefile b/editors/lazarus-gtk3-devel/Makefile
new file mode 100644
index 000000000000..428fc0c9344f
--- /dev/null
+++ b/editors/lazarus-gtk3-devel/Makefile
@@ -0,0 +1,12 @@
+PKGNAMESUFFIX=  -gtk3-devel
+
+COMMENT=	Portable Delphi-like IDE for the FreePascal compiler (Gtk3)
+
+CONFLICTS=	lazarus-gtk2 lazarus-gtk2-devel lazarus-qt5 lazarus-qt5-devel \
+		lazarus-qt6 lazarus-qt6-devel
+
+LCL_PLATFORM=	gtk3
+
+MASTERDIR=	${.CURDIR}/../../editors/lazarus-devel
+
+.include "${MASTERDIR}/Makefile"