diff --git a/databases/firebird40-server/Makefile b/databases/firebird40-server/Makefile
index 7a2b35a41f38..58458196a63d 100644
--- a/databases/firebird40-server/Makefile
+++ b/databases/firebird40-server/Makefile
@@ -1,204 +1,204 @@
 PORTNAME=	firebird
 PORTVERSION=	4.0.0
 CATEGORIES?=	databases
 MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server
 DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.2496-0
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Firebird-4 relational database (server)
 
 LICENSE=	IDPL IPL
 LICENSE_COMB=	multi
 LICENSE_NAME_IDPL=	Initial Developer's Public License
 LICENSE_NAME_IPL=	InterBase Public License
 LICENSE_FILE_IDPL=	${WRKSRC}/builds/install/misc/IDPLicense.txt
 LICENSE_FILE_IPL=	${WRKSRC}/builds/install/misc/IPLicense.txt
 LICENSE_PERMS_IDPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_IPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libtommath.so:math/libtommath \
 		libtomcrypt.so:security/libtomcrypt
 
 CONFLICTS_INSTALL=	firebird25-* firebird30-*
 
 USES=		cpe gmake pkgconfig localbase:ldflags libedit tar:xz
 USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS=	--prefix=${LOCALSTATEDIR} \
 		--exec-prefix=${PREFIX} \
 		--with-fbbin=${PREFIX}/bin \
 		--with-fblib=${PREFIX}/lib \
 		--with-fbconf=${PREFIX}/${CONFDIR} \
 		--with-fbglock=${LOCALSTATEDIR} \
 		--with-fbhelp=${LOCALSTATEDIR}/help \
 		--with-fbintl=${LIBEXECDIR}/intl \
 		--with-fblog=${LOCALSTATEDIR} \
 		--with-fbmsg=${DATADIR} \
 		--with-fbplugins=${LIBEXECDIR}/plugins \
 		--with-fbtzdata=${LIBEXECDIR}/tzdata \
 		--with-fbsbin=${PREFIX}/sbin \
 		--with-fbsecure-db=${LOCALSTATEDIR} \
-		--with-fbsample-db=${EXAMPLESDIR} \
-		--with-fbudf=${LIBEXECDIR}/UDF
+		--with-fbsample-db=${EXAMPLESDIR}
+
 CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread" \
 		ac_cv_header_atomic_ops_h="no" \
 		ac_cv_lib_atomic_ops_main="no"
 
 LOCALSTATEDIR=	/var/db/firebird
 CONFDIR=	etc/firebird
 LIBEXECDIR=	${PREFIX}/libexec/firebird
 PLIST_SUB=	FIREBIRD_VERSION=${PORTVERSION} \
 		LOCALSTATEDIR="var/db/firebird" CONFDIR="${CONFDIR}"
 
 # Don't use ld for linking, use gcc
 LD=	${CC}
 
 # Don't strip binary files
 STRIP=
 
 ONLY_FOR_ARCHS=	i386 amd64
 # sparc64 fails due to lack of valid AtomicCounter implementation in
 # src/common/classes/fb_atomic.h; presumably other tier-2s would as well
 
 INSTALL_FB=	${INSTALL} ${COPY}
 
 .if !defined(CLIENT_ONLY)
 # Server part stuff
 USES+=		firebird:4.0
 
 CONFIGURE_ARGS+=--without-editline
 
 USE_RC_SUBR=	firebird
 SUB_FILES=	pkg-message
 
 UTIL_SBIN=	fbguard firebird
 UTIL_BIN=	fb_lock_print fbsplit fbstat fbsvcmgr fbtracemgr gbak gfix gsec \
 		nbackup
 UDR_SO=		libudf_compat.so
 UDR_SQL=	udf_compat.sql
 PLUGIN_SO=	libChaCha.so libEngine13.so libfbtrace.so libLegacy_Auth.so \
 		libLegacy_UserManager.so libSrp.so libudr_engine.so
 TZDATA_FILES=	ids.dat timezoneTypes.res windowsZones.res zoneinfo64.res \
 		metaZones.res
 
 PKGINSTALL?=	${PKGDIR}/pkg-install-server
 .else
 # Client part stuff
 USES+=		libedit
 
 CONFIGURE_ARGS+=	--with-system-editline
 CONFIGURE_ENV+=	ac_cv_lib_edit_readline="yes"
 
 USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql-fb qli
 CLIENT_HEADER=	extlib/ib_util.h include/ibase.h include/iberror.h yvalve/perf.h
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_PORTDOCS=	*
 
 FB_DOCS_FILES=	WhatsNew README.* Firebird* ambiguity.txt \
 		ods11-index-structure.html
 FB_DOCS_DIRS=	sql.extensions license upgrade
 .endif
 
 MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
 MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}"
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS+=	-DAMD64
 .endif
 
 .if !defined(CLIENT_ONLY)
 USERS=	${PORTNAME}
 GROUPS=	${USERS}
 
 MAKE_ENV+=	IsServer=Y
 .endif
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/builds/install/misc/firebird.conf
 
 pre-build:
 .if !defined(CLIENT_ONLY)
 	@${SETENV} PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
 .endif
 	${MAKE} -C ${WRKSRC}/extern/btyacc
 
 do-install:
 .if !defined(CLIENT_ONLY)
 	${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/Release/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${UTIL_SBIN:S!^!${WRKSRC}/gen/Release/firebird/bin/!} ${STAGEDIR}${PREFIX}/sbin
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR}
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/databases.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/databases.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/fbtrace.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/fbtrace.conf
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/replication.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/replication.conf
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/plugins.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/plugins.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/plugins/udr_engine.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/udr_engine.conf.sample
 
 	${MKDIR} ${STAGEDIR}${LIBEXECDIR}/plugins/udr ${STAGEDIR}${LOCALSTATEDIR}/help ${STAGEDIR}${LIBEXECDIR}/intl \
 		${STAGEDIR}${LIBEXECDIR}/tzdata ${STAGEDIR}${EXAMPLESDIR}
 
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/lib/libib_util.so ${STAGEDIR}${PREFIX}/lib
 
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/intl/fbintl.conf ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.conf
 	${INSTALL_FB} -m 0555 ${UDR_SO:S!^!${WRKSRC}/gen/Release/firebird/plugins/udr/!} ${STAGEDIR}${LIBEXECDIR}/plugins/udr
 	${INSTALL_FB} -m 0444 ${UDR_SQL:S!^!${WRKSRC}/gen/Release/firebird/plugins/udr/!} ${STAGEDIR}${LIBEXECDIR}/plugins/udr
 	${INSTALL_FB} -m 0555 ${PLUGIN_SO:S!^!${WRKSRC}/gen/Release/firebird/plugins/!} ${STAGEDIR}${LIBEXECDIR}/plugins
 	${INSTALL_FB} -m 0444 ${TZDATA_FILES:S!^!${WRKSRC}/gen/Release/firebird/tzdata/!} ${STAGEDIR}${LIBEXECDIR}/tzdata
 
 	${INSTALL_FB} -m 0660 ${WRKSRC}/gen/Release/firebird/security4.fdb ${STAGEDIR}${LOCALSTATEDIR}/security4.fdb.sample
 	${INSTALL_FB} -m 0660 ${WRKSRC}/gen/Release/firebird/examples/empbuild/employee.fdb ${STAGEDIR}${EXAMPLESDIR}/employee.fdb
 	${INSTALL_FB} -m 0660 ${WRKSRC}/gen/Release/firebird/examples/empbuild/employe2.sql ${STAGEDIR}${EXAMPLESDIR}/employe2.sql
 
 	${INSTALL_FB} -m 0440 ${WRKSRC}/gen/Release/firebird/help/help.fdb ${STAGEDIR}${LOCALSTATEDIR}/help
 
 	${INSTALL_FB} -m 0555 ${WRKSRC}/gen/Release/firebird/intl/libfbintl.so ${STAGEDIR}${LIBEXECDIR}/intl/libfbintl.so
 .else
 # defined CLIENT_ONLY
 	${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/Release/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin
 
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/Release/firebird/firebird.conf > ${WRKDIR}/firebird.conf
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR}
 	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/firebird.conf.sample
 
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/lib/libfbclient.so.${PORTVERSION} \
 		${STAGEDIR}${PREFIX}/lib
 
-	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.3
+	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.4
 	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/firebird
 	${INSTALL_DATA} ${CLIENT_HEADER:S!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/include
 
 	@cd ${WRKSRC}/src/include/firebird && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/include/firebird/{}" \;
 
 	@cd ${WRKSRC}/src/include/firebird && \
 		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/include/firebird/{}" \;
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/gen/Release/firebird/*.msg ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!}
 	${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR}
 	${LN} -sf README.user ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${STAGEDIR}${DOCSDIR}/sql.extensions
 	${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license
 	${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v3.0/* ${STAGEDIR}${DOCSDIR}/upgrade
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/firebird40-server/files/patch-builds_posix_make.defaults b/databases/firebird40-server/files/patch-builds_posix_make.defaults
index b30b259a6848..2959d2fa028d 100644
--- a/databases/firebird40-server/files/patch-builds_posix_make.defaults
+++ b/databases/firebird40-server/files/patch-builds_posix_make.defaults
@@ -1,64 +1,64 @@
 --- builds/posix/make.defaults	2020-10-20 03:40:05.000000000 -0500
 +++ builds/posix/make.defaults	2021-06-25 00:23:49.718147000 -0500
 @@ -134,7 +134,7 @@
  MATHLIB=@MATHLIB@
  
  # switch to make sed edit files inplace
 -INLINE_EDIT_SED:= -i
 +INLINE_EDIT_SED:= -i ""
  
  # Default programs and tools to be used in the build process
  
 @@ -144,7 +144,7 @@
  CHMOD=			chmod
  CHMOD_6=		chmod 666
  CHMOD_7=		chmod 777
 -CHMOD_S7=		chmod 06777
 +CHMOD_S7=		chmod 04555
  MV=			mv -f
  TOUCH=			touch
  CP=			cp
 @@ -219,7 +219,7 @@
  #LibraryFileName=libfbclient
  LibraryFileName=libfbclient
  LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion}
 -LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.2
-+LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.3
++LibrarySoName=$(LibraryFileName).${SHRLIB_EXT}.4
  LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT}
  
  LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName)
 @@ -240,7 +240,7 @@
  
  ifeq ($(EDITLINE_FLG),Y)
    ifeq ($(STD_EDITLINE), true)
 -	LIBEDITLINE := -l$(READLINE)
 +	LIBEDITLINE := $(shell pkgconf libedit --libs)
    else
  	LIBEDITLINE := $(LIB)/libedit.a
    endif
 @@ -362,7 +362,7 @@
  GDS_DROP	= $(BIN)/gds_drop$(EXEC_EXT)
  FBSVCMGR	= $(BIN)/fbsvcmgr$(EXEC_EXT)
  FBTRACEMGR	= $(BIN)/fbtracemgr$(EXEC_EXT)
 -GSTAT		= $(BIN)/gstat$(EXEC_EXT)
 +GSTAT		= $(BIN)/fbstat$(EXEC_EXT)
  NBACKUP		= $(BIN)/nbackup$(EXEC_EXT)
  LOCKPRINT	= $(BIN)/fb_lock_print$(EXEC_EXT)
  GSEC		= $(BIN)/gsec$(EXEC_EXT)
 @@ -383,13 +383,13 @@
  QLI            = $(BIN)/qli$(EXEC_EXT)
  
  # From isql
 -ISQL            = $(BIN)/isql$(EXEC_EXT)
 -RUN_ISQL        = $(RBIN)/isql$(EXEC_EXT)
 +ISQL            = $(BIN)/isql-fb$(EXEC_EXT)
 +RUN_ISQL        = $(RBIN)/isql-fb$(EXEC_EXT)
  
  # From burp
  GBAK            = $(BIN)/gbak$(EXEC_EXT)
  RUN_GBAK        = $(RBIN)/gbak$(EXEC_EXT)
 -GSPLIT          = $(BIN)/gsplit$(EXEC_EXT)
 +GSPLIT          = $(BIN)/fbsplit$(EXEC_EXT)
  
  # From gpre
  # (gpre current is a link to one of the others)
diff --git a/databases/firebird40-server/pkg-plist.client b/databases/firebird40-server/pkg-plist.client
index 543e6b40637a..83fe7fc4b3ac 100644
--- a/databases/firebird40-server/pkg-plist.client
+++ b/databases/firebird40-server/pkg-plist.client
@@ -1,49 +1,49 @@
 bin/gpre
 bin/isql-fb
 bin/qli
 %%ETCDIR%%/firebird.conf.sample
 include/firebird/FirebirdInterface.idl
 include/firebird/IdlFbInterfaces.h
 include/firebird/Interface.h
 include/firebird/Message.h
 include/firebird/TimeZones.h
 include/firebird/UdrCppEngine.h
 include/firebird/impl/blr.h
 include/firebird/impl/boost/preprocessor/arithmetic/dec.hpp
 include/firebird/impl/boost/preprocessor/arithmetic/inc.hpp
 include/firebird/impl/boost/preprocessor/cat.hpp
 include/firebird/impl/boost/preprocessor/config/config.hpp
 include/firebird/impl/boost/preprocessor/control/expr_if.hpp
 include/firebird/impl/boost/preprocessor/control/expr_iif.hpp
 include/firebird/impl/boost/preprocessor/control/if.hpp
 include/firebird/impl/boost/preprocessor/control/iif.hpp
 include/firebird/impl/boost/preprocessor/debug/error.hpp
 include/firebird/impl/boost/preprocessor/detail/auto_rec.hpp
 include/firebird/impl/boost/preprocessor/detail/dmc/auto_rec.hpp
 include/firebird/impl/boost/preprocessor/facilities/empty.hpp
 include/firebird/impl/boost/preprocessor/logical/bool.hpp
 include/firebird/impl/boost/preprocessor/repetition/detail/dmc/for.hpp
 include/firebird/impl/boost/preprocessor/repetition/detail/edg/for.hpp
 include/firebird/impl/boost/preprocessor/repetition/detail/for.hpp
 include/firebird/impl/boost/preprocessor/repetition/detail/msvc/for.hpp
 include/firebird/impl/boost/preprocessor/repetition/for.hpp
 include/firebird/impl/boost/preprocessor/seq/elem.hpp
 include/firebird/impl/boost/preprocessor/seq/for_each_i.hpp
 include/firebird/impl/boost/preprocessor/seq/seq.hpp
 include/firebird/impl/boost/preprocessor/seq/size.hpp
 include/firebird/impl/boost/preprocessor/tuple/eat.hpp
 include/firebird/impl/boost/preprocessor/tuple/elem.hpp
 include/firebird/impl/boost/preprocessor/tuple/rem.hpp
 include/firebird/impl/consts_pub.h
 include/firebird/impl/dsc_pub.h
 include/firebird/impl/inf_pub.h
 include/firebird/impl/sqlda_pub.h
 include/firebird/impl/types_pub.h
 include/ib_util.h
 include/ibase.h
 include/iberror.h
 include/perf.h
 lib/libfbclient.so
-lib/libfbclient.so.3
+lib/libfbclient.so.4
 lib/libfbclient.so.%%FIREBIRD_VERSION%%
 %%DATADIR%%/firebird.msg