diff --git a/sysutils/hfsexplorer/Makefile b/sysutils/hfsexplorer/Makefile
index edb385b2b60a..60b1f4ab2a35 100644
--- a/sysutils/hfsexplorer/Makefile
+++ b/sysutils/hfsexplorer/Makefile
@@ -1,47 +1,51 @@
 PORTNAME=	hfsexplorer
 DISTVERSIONPREFIX=	${PORTNAME}-
-DISTVERSION=	0.23.1
+DISTVERSION=	2021.10.9
 CATEGORIES=	sysutils java
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HFSExplorer read Mac-formatted harddisks and disk images
 WWW=		https://www.catacombae.org/hfsexplorer/
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	ant:devel/apache-ant
 
-DESKTOP_ENTRIES="hfsexplorer" "reader Mac-formatted harddisk" \
-		"${DATADIR}/res/icon.png" "${PORTNAME}" \
-		"System;Utility;Java;" false
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	unsound
 USE_JAVA=	yes
+
+DESKTOP_ENTRIES=	"hfsexplorer" \
+			"reader Mac-formatted harddisk" \
+			"${DATADIR}/res/icon.png" \
+			"${PORTNAME}" \
+			"System;Utility;Java;" \
+			false
+
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 do-configure:
 	@cd ${WRKSRC}/dist/bin && ${REINPLACE_CMD} -e 's|BASEDIR=".*"|BASEDIR="${DATADIR}/lib"|g' \
-		hfsx.sh resview.sh unhfs.sh
+		hfsx resview unhfs
 	@${REINPLACE_CMD} -e 's|BASEDIR=".*"|BASEDIR="${DATADIR}/lib"|g' \
-		${WRKSRC}/dist/bin/hfsexplorer.sh
+		${WRKSRC}/dist/bin/hfsexplorer
 
 do-build:
-	@cd ${WRKSRC} && ${SH} buildall.sh
+	@cd ${WRKSRC} && ${SH} buildall
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${DATADIR}/res
-.for f in hfsx.sh resview.sh unhfs.sh
+.for f in hfsx resview unhfs
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} dist/bin/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} dist/bin/hfsexplorer.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	cd ${WRKSRC} && ${INSTALL_SCRIPT} dist/bin/hfsexplorer ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	cd ${WRKSRC} && ${INSTALL_DATA} dist/lib/*.jar ${STAGEDIR}${DATADIR}/lib
 	cd ${WRKSRC} && ${INSTALL_DATA} dist/res/icon.png ${STAGEDIR}${DATADIR}/res
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/dist/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/sysutils/hfsexplorer/distinfo b/sysutils/hfsexplorer/distinfo
index 3e0027e997d1..6d63ef3e632c 100644
--- a/sysutils/hfsexplorer/distinfo
+++ b/sysutils/hfsexplorer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519522794
-SHA256 (unsound-hfsexplorer-hfsexplorer-0.23.1_GH0.tar.gz) = dd271dc105476a18ad5e936faa38a4854ceecf3b1f825256cf65dcbda310f4ea
-SIZE (unsound-hfsexplorer-hfsexplorer-0.23.1_GH0.tar.gz) = 1173798
+TIMESTAMP = 1692888874
+SHA256 (unsound-hfsexplorer-hfsexplorer-2021.10.9_GH0.tar.gz) = 99cc26d26fdd9013169cae0b0ae9b845a9edb2ac3f4c9ddf865d6ffbb3669b9c
+SIZE (unsound-hfsexplorer-hfsexplorer-2021.10.9_GH0.tar.gz) = 1403267
diff --git a/sysutils/hfsexplorer/files/patch-build.xml b/sysutils/hfsexplorer/files/patch-build.xml
index 1abdcb0dcdc6..f76cc72470ee 100644
--- a/sysutils/hfsexplorer/files/patch-build.xml
+++ b/sysutils/hfsexplorer/files/patch-build.xml
@@ -1,13 +1,20 @@
---- build.xml.orig	2020-12-29 17:48:35.192124000 -0800
-+++ build.xml	2020-12-29 17:48:46.662256000 -0800
-@@ -3,8 +3,8 @@
+--- build.xml.orig	2023-08-24 16:44:05 UTC
++++ build.xml
+@@ -3,7 +3,7 @@
  <project basedir="." default="all" name="HFSExplorer">
    <property environment="env"/>
    <property name="debuglevel" value="source,lines,vars"/>
--  <property name="java.target.level" value="1.5"/>
--  <property name="java.source.level" value="1.5"/>
-+  <property name="java.target.level" value="6"/>
-+  <property name="java.source.level" value="6"/>
-   <property name="java.source.dir" value="src/java"/>
-   <property name="manifest.source.dir" value="src/META-INF"/>
-   <!--<property name="builddir" value=".build~"/>-->
+-  <condition property="java.target.level" value="1.5">
++  <condition property="java.target.level" value="6">
+     <or>
+       <equals arg1="${ant.java.version}" arg2="1.5"/>
+       <equals arg1="${ant.java.version}" arg2="1.6"/>
+@@ -12,7 +12,7 @@
+     </or>
+   </condition>
+   <property name="java.target.level" value="${ant.java.version}"/>
+-  <condition property="java.source.level" value="1.5">
++  <condition property="java.source.level" value="6">
+     <or>
+       <equals arg1="${ant.java.version}" arg2="1.5"/>
+       <equals arg1="${ant.java.version}" arg2="1.6"/>
diff --git a/sysutils/hfsexplorer/pkg-plist b/sysutils/hfsexplorer/pkg-plist
index 1815f3058998..c61f0354a525 100644
--- a/sysutils/hfsexplorer/pkg-plist
+++ b/sysutils/hfsexplorer/pkg-plist
@@ -1,21 +1,21 @@
 bin/hfsexplorer
-bin/hfsx.sh
-bin/resview.sh
-bin/unhfs.sh
+bin/hfsx
+bin/resview
+bin/unhfs
 %%DATADIR%%/lib/apache-ant-1.7.0-bzip2.jar
 %%DATADIR%%/lib/csframework.jar
 %%DATADIR%%/lib/hfsx.jar
 %%DATADIR%%/lib/hfsx_dmglib.jar
 %%DATADIR%%/lib/iharder-base64.jar
 %%DATADIR%%/lib/swing-layout-1.0.4.jar
 %%DATADIR%%/res/icon.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img/HFSExplorer_logo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/troubleshooting.html
 %%PORTDOCS%%%%DOCSDIR%%/html/usage.html
 @dir %%DATADIR%%/res
 @dir %%DATADIR%%/lib
 @dir %%DATADIR%%
 %%PORTDOCS%%@dir %%DOCSDIR%%/html/img
 %%PORTDOCS%%@dir %%DOCSDIR%%/html
 %%PORTDOCS%%@dir %%DOCSDIR%%