diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 414fb365bea4..ecc16a8fab5f 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -1,68 +1,66 @@
 # Created by: ejc@bazzle.com
 
 PORTNAME=	omniORB
 DISTVERSION=	4.2.4
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${DISTVERSION:S/-2//}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Robust high performance CORBA ORB for C++ and Python
 
 LICENSE=	GPLv2
 
-BROKEN_FreeBSD_13=	posix.cc:605:15: error: no matching function for call to 'pthread_detach'
-BROKEN_FreeBSD_14=	posix.cc:605:15: error: no matching function for call to 'pthread_detach'
 BROKEN_SSL=	openssl
 BROKEN_SSL_REASON_openssl=	member access into incomplete type 'DH' (aka 'dh_st')
 
 USES=		compiler:c++11-lang gmake pkgconfig python tar:bzip2 \
 		shebangfix ssl
 
 CONFLICTS=	omniORB41-4.1.*
 SONUM=		4
 PLIST_SUB+=	SONUM=${SONUM}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	py3kplist
 MAKEFILE=	GNUmakefile
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 CONFIGURE_ARGS=	--datadir=${DATADIR} --with-openssl=${OPENSSLBASE} \
 		--with-omniORB-config=${PREFIX}/etc/omniORB.cfg \
 		--with-omniNames-logdir=/var/log
 OPTIONS_DEFINE=	DOCS STATIC
 OPTIONS_DEFAULT=	STATIC
 OPTIONS_SUB=	yes
 STATIC_CONFIGURE_OFF=	--disable-static
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-2//}
 SHEBANG_FILES=	src/tool/omniidl/python/scripts/omniidlrun.py \
 		src/tool/omniidl/python3/scripts/omniidlrun.py
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in
-	@${REINPLACE_CMD} -e 's#%%STAGEDIR%%%%PREFIX%%#${STAGEDIR}${PREFIX}#g' \
+	@${REINPLACE_CMD} -e 's#$$(INSTALLLIBDIR)/pkgconfig#${STAGEDIR}${PREFIX}/libdata/pkgconfig#g' \
 		${WRKSRC}/contrib/pkgconfig/GNUmakefile.in
 
 post-install:
 	@${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl')"
 	@${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be')"
 	${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${PREFIX}/etc/omniORB.cfg.sample
 	@cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 .for i in catior convertior omniMapper omniNames omnicpp nameclt omkdepend genior
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 .for i in libomniDynamic4.so.2.${SONUM} libomnisslTP4.so.2.${SONUM} libCOS4.so.2.${SONUM} \
 	libomniCodeSets4.so.2.${SONUM} libomniZIOPDynamic4.so.2.${SONUM} libomniZIOP4.so.2.${SONUM} \
 	libomniConnectionMgmt4.so.2.${SONUM} libomniORB4.so.2.${SONUM} libCOSDynamic4.so.2.${SONUM} \
 	libomnithread.so.4.1
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i}
 .endfor
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix.txt \
 	 ReleaseNotes.txt ${STAGEDIR}${DOCSDIR}
 	@${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${STAGEDIR}${DOCSDIR} -
 
 .include <bsd.port.mk>
diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure
index bfe1f08d292a..c2c8adb5f70d 100644
--- a/devel/omniORB/files/patch-configure
+++ b/devel/omniORB/files/patch-configure
@@ -1,26 +1,28 @@
 --- configure.orig	2020-04-04 14:09:52 UTC
 +++ configure
-@@ -7574,12 +7574,17 @@ case "$host" in
+@@ -7574,12 +7574,19 @@ case "$host" in
    *-*-irix*)     plat_name="IRIX";     plat_def="__irix__";     os_v="6";;
    *-*-aix*)      plat_name="AIX";      plat_def="__aix__";      os_v="4";;
    *-*-darwin*)   plat_name="Darwin";   plat_def="__darwin__";   os_v="1";;
 -  *-*-freebsd3*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="3";;
 -  *-*-freebsd4*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="4";;
 -  *-*-freebsd5*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="5";;
 -  *-*-freebsd6*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="6";;
 -  *-*-freebsd7*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="7";;
 -  *-*-freebsd8*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="8";;
 +  *-*-dragonfly*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="9";;
 +  *-*-freebsd3.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="3";;
 +  *-*-freebsd4.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="4";;
 +  *-*-freebsd5.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="5";;
 +  *-*-freebsd6.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="6";;
 +  *-*-freebsd7.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="7";;
 +  *-*-freebsd8.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="8";;
 +  *-*-freebsd9.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="9";;
 +  *-*-freebsd10.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="10";;
 +  *-*-freebsd11.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="11";;
 +  *-*-freebsd12.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="12";;
++  *-*-freebsd13.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="13";;
++  *-*-freebsd14.*) plat_name="FreeBSD";  plat_def="__freebsd__";  os_v="14";;
    *-*-kfreebsd*) plat_name="kFreeBSD";  plat_def="__FreeBSD_kernel__";  os_v="6";;
    *-*-netbsd*)   plat_name="NetBSD";   plat_def="__netbsd__";   os_v="1";;
    *-*-openbsd*)  plat_name="OpenBSD";  plat_def="__openbsd__";  os_v="3";;
diff --git a/devel/omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in b/devel/omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in
deleted file mode 100644
index cebb37383f0b..000000000000
--- a/devel/omniORB/files/patch-contrib_pkgconfig_GNUmakefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/pkgconfig/GNUmakefile.in.orig	2014-03-25 15:18:18 UTC
-+++ contrib/pkgconfig/GNUmakefile.in
-@@ -4,7 +4,7 @@ BASE_OMNI_TREE=@top_srcdir@
- VPATH=@srcdir@
- INSTALL=@INSTALL@
- 
--INSTALLDIR = $(INSTALLLIBDIR)/pkgconfig
-+INSTALLDIR = %%STAGEDIR%%%%PREFIX%%/libdata/pkgconfig
- 
- PKGFILES = omnithread3.pc omniORB4.pc omniDynamic4.pc \
-            omniCOS4.pc omniCOSDynamic4.pc omniConnectionMgmt4.pc \