diff --git a/science/orthanc-mysql/Makefile b/science/orthanc-mysql/Makefile
index 60fb30c89935..b65050ff9894 100644
--- a/science/orthanc-mysql/Makefile
+++ b/science/orthanc-mysql/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	orthanc-mysql
 DISTVERSION=	4.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	science
 MASTER_SITES=	https://www.orthanc-server.com/downloads/get.php?path=/plugin-mysql/:main \
 		https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \
 		https://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty
 DISTFILES=	OrthancMySQL-${PORTVERSION}.tar.gz:main \
 		Orthanc-1.9.3.tar.gz:framework \
 		e2fsprogs-1.44.5.tar.gz:thirdparty
 DIST_SUBDIR=	orthanc
 EXTRACT_ONLY=	OrthancMySQL-${PORTVERSION}.tar.gz
 
 MAINTAINER=	maintainer.freebsd@xpoundit.com
 COMMENT=	Orthanc plugin to use MySQL/MariaDB for indexing or storage
 WWW=		https://www.orthanc-server.com/static.php?page=mysql
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCDatabasePlugin.h:science/orthanc
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libgdcmCommon.so:devel/gdcm \
 		libjsoncpp.so:devel/jsoncpp \
 		libpugixml.so:textproc/pugixml
 RUN_DEPENDS=	Orthanc:science/orthanc
 
 USES=		cmake localbase mysql:client python:build ssl
 USE_CXXSTD=	c++14 # googletest 1.13
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/OrthancMySQL-${PORTVERSION}
 
 CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources \
 		-DORTHANC_FRAMEWORK_SOURCE=path
 CMAKE_OFF=	DBUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID
 CMAKE_SOURCE_PATH=	${WRKSRC}/MySQL
 
 CFLAGS+=	-DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG
 CXXFLAGS+=	-I${LOCALBASE}/include -DNDEBUG
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 post-extract:
 		${MKDIR} ${WRKSRC}/MySQL/ThirdPartyDownloads
 		${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads
 		${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.9.3.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads
 		${TAR} -C ${WRKSRC}/MySQL/ThirdPartyDownloads -xf ${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.9.3.tar.gz
 
 .include <bsd.port.mk>
diff --git a/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp
new file mode 100644
index 000000000000..338388756a00
--- /dev/null
+++ b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp
@@ -0,0 +1,11 @@
+--- MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources/SystemToolbox.cpp.orig	2021-05-07 07:22:38 UTC
++++ MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources/SystemToolbox.cpp
+@@ -727,7 +727,7 @@ namespace Orthanc
+ 
+   MimeType SystemToolbox::AutodetectMimeType(const std::string& path)
+   {
+-    std::string extension = boost::filesystem::extension(path);
++    std::string extension = boost::filesystem::path(path).extension().string();
+     Toolbox::ToLowerCase(extension);
+ 
+     // http://en.wikipedia.org/wiki/Mime_types
diff --git a/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp
new file mode 100644
index 000000000000..c739fd182701
--- /dev/null
+++ b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp
@@ -0,0 +1,11 @@
+--- MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Engine/PluginsManager.cpp.orig	2021-05-07 07:22:38 UTC
++++ MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Engine/PluginsManager.cpp
+@@ -303,7 +303,7 @@ namespace Orthanc
+       }
+       else
+       {
+-        std::string extension = boost::filesystem::extension(it->path());
++        std::string extension = it->path().extension().string();
+         Toolbox::ToLowerCase(extension);
+ 
+         if (extension == PLUGIN_EXTENSION)
diff --git a/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp
new file mode 100644
index 000000000000..2c45326a9e12
--- /dev/null
+++ b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp
@@ -0,0 +1,11 @@
+--- MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp.orig	2021-05-07 07:22:38 UTC
++++ MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
+@@ -162,7 +162,7 @@ OrthancPluginErrorCode Callback(OrthancPluginWorklistA
+         if (type == fs::regular_file ||
+             type == fs::reparse_file)   // cf. BitBucket issue #11
+         {
+-          std::string extension = fs::extension(it->path());
++          std::string extension = it->path().extension().string();
+           std::transform(extension.begin(), extension.end(), extension.begin(), tolower);  // Convert to lowercase
+ 
+           if (extension == ".wl")
diff --git a/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp
new file mode 100644
index 000000000000..6ed1b2fd66f7
--- /dev/null
+++ b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp
@@ -0,0 +1,11 @@
+--- MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Sources/OrthancConfiguration.cpp.orig	2021-05-07 07:22:38 UTC
++++ MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Sources/OrthancConfiguration.cpp
+@@ -123,7 +123,7 @@ namespace Orthanc
+     {
+       if (!is_directory(it->status()))
+       {
+-        std::string extension = boost::filesystem::extension(it->path());
++        std::string extension = it->path().extension().string();
+         Toolbox::ToLowerCase(extension);
+ 
+         if (extension == ".json")