diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk
index b01f35d66d87..a60b620f6a3e 100644
--- a/Mk/Uses/lazarus.mk
+++ b/Mk/Uses/lazarus.mk
@@ -1,135 +1,141 @@
 # Support for Lazarus-based ports.
 #
 # Feature:      lazarus
 # Usage:        USES=lazarus
 # Valid ARGS:   (none), gtk2, qt5, flavors
 #
 # (none)    - This automatically build lazarus-app with gtk2 interface
 #
 # gtk2      - This automatically build lazarus-app with gtk2 interface
 #     
 # qt5       - This automatically build lazarus-app with qt5 interface
 #                
 # flavors   - This automatically build lazarus-app with flavors feature
 #
 # If the port not requires compile lazarus project files automatically, you can
 # defined the following:
 #
 # NO_LAZBUILD=	yes
 #                
 # Variables for ports:
 #
 # LAZARUS_PROJECT_FILES		- List of lpi files. It must not be empty
 #				Default: empty
 # LAZARUS_DIR                   - Path to lazarus installation directory
 #                               Default: ${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 # LAZBUILD_ARGS                 - lazbuild extra args. It could be -d most of cases.
 #                                 See man lazbuild for more information
 #                               Default: empty
 # LAZARUS_NO_FLAVORS		- Do NOT build these lazarus flavors.
 #                                 If LAZARUS_NO_FLAVORS is not define then all
 #                             	  valid lazarus flavors are assumed.
 #
 # Example:
 #        
 #	USES+=	lazarus:flavors
 #	LAZARUS_NO_FLAVORS=qt5
 #
 
 .if !defined(_INCLUDE_USES_LAZARUS_MK)
 
 LAZARUS_Include_MAINTAINER= acm@FreeBSD.org
 
 _INCLUDE_USES_LAZARUS_MK=   yes
 
 .if defined(DEFAULT_LAZARUS_VER)
 WARNING+=	"DEFAULT_LAZARUS_VER is defined, consider using DEFAULT_VERSIONS=lazarus=${DEFAULT_LAZARUS_VER} instead"
 .endif
 
 .if ${lazarus_ARGS:Ngtk2:Nqt5:Nflavors}
 IGNORE=		Unknown argument for USES=lazarus: ${lazarus_ARGS:Ngtk2:Nqt5:Nflavors}
 .endif
 
 .if !empty(LAZARUS_NO_FLAVORS)
 .if ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5}
 IGNORE=         Unknown argument for LAZARUS_NO_FLAVORS: ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt5}
 .endif
 .endif
 
 DEFAULT_LAZARUS_VER=	${LAZARUS_DEFAULT}
 DEFAULT_FPC_VER=	${FPC_DEFAULT}
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
 LAZARUS_VER=		${DEFAULT_LAZARUS_VER}
 FPC_VER=		${DEFAULT_FPC_VER}
 LAZARUS_ARCH=		${ARCH:S/amd64/x86_64/}
 LAZARUS_PROJECT_FILES?=	# empty
 LAZARUS_DIR?=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
 
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
 			fpcres:lang/fpc-utils
 
 BUILDNAME=		${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
 MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
 
 LAZARUS_FLAVORS=	gtk2 qt5
 
 .if ${lazarus_ARGS:Mflavors}
 .	if defined(LAZARUS_NO_FLAVORS)
 .		for flavor in ${LAZARUS_NO_FLAVORS}
 FLAVORS:=	${LAZARUS_FLAVORS:N${flavor}}
 .		endfor
 .	else
 FLAVORS:=	${LAZARUS_FLAVORS}
 .	endif
 
 .	if empty(FLAVOR)
 FLAVOR=		${FLAVORS:[1]}
 .	endif
 .endif
 
 LAZARUS_PKGNAMESUFFIX=	-${FLAVOR}
 
+.if !defined(WANT_LAZARUS_DEVEL)
+LAZARUS_DEVELSUFFIX=	#
+.else
+LAZARUS_DEVELSUFFIX=	-devel
+.endif
+
 .if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
 BUILD_DEPENDS+=	${MKINSTDIR}/gtk2.fpm:x11-toolkits/fpc-gtk2
 LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
 		libgtk-x11-2.0.so:x11-toolkits/gtk20 \
 		libatk-1.0.so:accessibility/atk \
 		libpango-1.0.so:x11-toolkits/pango \
 		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
 LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus${LAZARUS_DEVELSUFFIX}
 .endif
 
 .if ${lazarus_ARGS:Mqt5} || ${FLAVOR} == qt5
 LIB_DEPENDS+=	libQt5Pas.so:x11-toolkits/qt5pas
 LCL_PLATFORM=	qt5
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5${LAZARUS_DEVELSUFFIX}
 .endif
 
 LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild
 LAZBUILD_ARGS?=	# empty
 
 _USES_POST+=	lazarus
 .endif 
 # End of _INCLUDE_USES_LAZARUS_MK
 
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_LAZARUS_POST_MK)
 _INCLUDE_USES_LAZARUS_POST_MK=	yes
 
 .if !defined(NO_LAZBUILD)
 .if !target(do-build)
 do-build:
 .	for PROJECT_FILE in ${LAZARUS_PROJECT_FILES}
 		@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} \
 			${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE})
 .	endfor
 .endif # !target(do-build)
 .endif
 
 .endif
 # End of _INCLUDE_USES_LAZARUS_POST_MK
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 1ee4d5d7bb84..2ab75db248e5 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -1,162 +1,166 @@
 # MAINTAINER:	ports@FreeBSD.org
 #
 # Note: before committing to this file, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 #
 # Provide default versions for ports with multiple versions selectable
 # by the user.
 #
 # Users who want to override these defaults can easily do so by defining
 # DEFAULT_VERSIONS in their make.conf as follows:
 #
 #   DEFAULT_VERSIONS=	perl5=5.20 ruby=2.7
 
 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
 _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 
 LOCALBASE?=	/usr/local
 
 .for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT GL \
 	IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL NINJA PERL5 \
 	PGSQL PHP PYTHON PYTHON2 PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
 .if defined(${lang}_DEFAULT)
 ERROR+=	"The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
 .endif
 #.undef ${lang}_DEFAULT
 .endfor
 
 .for lang in ${DEFAULT_VERSIONS}
 _l=		${lang:C/=.*//g}
 ${_l:tu}_DEFAULT=	${lang:C/.*=//g}
 .endfor
 
 # Possible values: 2.4
 APACHE_DEFAULT?=	2.4
 # Possible values: 5, 6, 18
 BDB_DEFAULT?=		5
 # Possible values: 2, 3
 COROSYNC_DEFAULT?=	2
 # Possible_values: full canna nox devel_full devel_nox
 #EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
 # Possible values: 2.5, 3.0, 4.0
 FIREBIRD_DEFAULT?=	2.5
 # Possible values: flang (experimental), gfortran
 FORTRAN_DEFAULT?=	gfortran
 # Possible values: 3.2.2
 FPC_DEFAULT?=		3.2.2
 # Possible values: 8 (last to support powerpcspe), 9, 10, 11
 # (Any other version is completely unsupported and not meant for general use.)
 .if ${ARCH} == "powerpcspe"
 GCC_DEFAULT?=		8
 .else
 GCC_DEFAULT?=		10
 .endif
 # Possible values: mesa-libs, mesa-devel
 GL_DEFAULT?=		mesa-libs
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
 # Possible values: 6, 6-nox11, 7, 7-nox11
 IMAGEMAGICK_DEFAULT?=	7
 # Possible values: 7, 8, 11, 12, 13, 14, 15, 16
 JAVA_DEFAULT?=		8
-# Possible values: 2.0.12
-LAZARUS_DEFAULT?=	2.0.12
+# Possible values: 2.0.12, 2.3.0
+.if !defined(WANT_LAZARUS_DEVEL)
+LAZARUS_DEFAULT?=       2.0.12
+.else
+LAZARUS_DEFAULT?=       2.3.0
+.endif
 # Possible values: rust, legacy
 .if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le:Npowerpc)
 LIBRSVG2_DEFAULT?=	rust
 .else
 LIBRSVG2_DEFAULT?=	legacy
 .endif
 # Possible values: c7
 LINUX_DEFAULT?=		c7
 # Possible values: 70, 80, 90, 10, 11, 12, 13, -devel (to be used when non-base compiler is required)
 # Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before
 # bumping the LLVM version.
 .if ${ARCH} == powerpc
 LLVM_DEFAULT?=		10
 .else
 LLVM_DEFAULT?=		90
 .endif
 # Possible values: 5.1, 5.2, 5.3, 5.4
 LUA_DEFAULT?=		5.2
 # Possible values: 5.10, 5.20, 6.8
 MONO_DEFAULT=		5.10
 # Possible values: 5.5, 5.6, 5.7, 8.0, 10.3m, 10.4m, 10.5m, 5.5p, 5.6p, 5.7p, 5.6w, 5.7w
 MYSQL_DEFAULT?=		5.7
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
 # Possible values: 5.30, 5.32, 5.34, devel
 .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \
     defined(PACKAGE_BUILDING))
 PERL5_DEFAULT?=		5.32
 .elif !defined(PERL5_DEFAULT)
 # There's no need to replace development versions, like "5.23" with "devel"
 # because 1) nobody is supposed to use it outside of poudriere, and 2) it must
 # be set manually in /etc/make.conf in the first place, and we're never getting
 # in here.
 .if !defined(_PERL5_FROM_BIN)
 _PERL5_FROM_BIN!=	${LOCALBASE}/bin/perl -e 'printf "%vd\n", $$^V;'
 .endif
 _EXPORTED_VARS+=	_PERL5_FROM_BIN
 PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 .endif
 # Possible values: 9.6, 10, 11, 12, 13
 PGSQL_DEFAULT?=		12
 # Possible values: 7.3, 7.4, 8.0
 PHP_DEFAULT?=		7.4
 # Possible values: 2.7, 3.6, 3.7, 3.8, 3.9, 3.10
 PYTHON_DEFAULT?=	3.8
 # Possible values: 2.7
 PYTHON2_DEFAULT?=	2.7
 # Possible values: 3.6, 3.7, 3.8, 3.9, 3.10
 PYTHON3_DEFAULT?=	3.8
 # Possible values: 2.6, 2.7, 3.0
 RUBY_DEFAULT?=		2.7
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
 # Possible values: 4.12, 4.13
 SAMBA_DEFAULT?=		4.12
 # Possible values: base, openssl, libressl, libressl-devel
 .if !defined(SSL_DEFAULT)
 #	If no preference was set, check for an installed base version
 #	but give an installed port preference over it.
 .  if	!defined(SSL_DEFAULT) && \
 	!exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so) && \
 	exists(${DESTDIR}/usr/include/openssl/opensslv.h)
 SSL_DEFAULT=	base
 .  else
 .    if exists(${DESTDIR}/${LOCALBASE}/lib/libcrypto.so)
 .      if defined(PKG_BIN)
 # find installed port and use it for dependency
 .        if !defined(OPENSSL_INSTALLED)
 .          if defined(DESTDIR)
 PKGARGS=	-c ${DESTDIR}
 .          else
 PKGARGS=
 .          endif
 OPENSSL_INSTALLED!=	${PKG_BIN} ${PKGARGS} which -qo ${LOCALBASE}/lib/libcrypto.so || :
 .        endif
 .        if defined(OPENSSL_INSTALLED) && !empty(OPENSSL_INSTALLED)
 SSL_DEFAULT:=		${OPENSSL_INSTALLED:T}
 WARNING+=	"You have ${OPENSSL_INSTALLED} installed but do not have DEFAULT_VERSIONS+=ssl=${SSL_DEFAULT} set in your make.conf"
 .        endif
 .      else
 check-makevars::
 	@${ECHO_MSG} "You have a ${LOCALBASE}/lib/libcrypto.so file installed, but the framework is unable"
 	@${ECHO_MSG} "to determine what port it comes from."
 	@${ECHO_MSG} "Add DEFAULT_VERSIONS+=ssl=<openssl package name> to your /etc/make.conf and try again."
 	@${FALSE}
 .      endif
 .    endif
 .  endif
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .endif
 # Possible values: 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 
 # Possible values: 4, 6
 VARNISH_DEFAULT?=	4
 
 .endif