Index: head/sysutils/hfsexplorer/Makefile
===================================================================
--- head/sysutils/hfsexplorer/Makefile	(revision 392682)
+++ head/sysutils/hfsexplorer/Makefile	(revision 392683)
@@ -1,55 +1,57 @@
 # Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	hfsexplorer
-PORTVERSION=	0.22.1
+PORTVERSION=	0.23
 CATEGORIES=	sysutils java
-MASTER_SITES=	SF/catacombae/HFSExplorer/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-0_21-src
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	HFSExplorer read Mac-formatted harddisks and disk images
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	ant:${PORTSDIR}/devel/apache-ant
 
 DESKTOP_ENTRIES="hfsexplorer" "reader Mac-formatted harddisk" \
 		"${DATADIR}/res/icon.png" "${PORTNAME}" \
 		"System;Utility;Java;" false
 
-USES=		zip
+USE_GITHUB=	yes
+GH_PROJECT=	${PORTNAME}
+GH_ACCOUNT=	unsound
+GH_TAGNAME=	${PORTNAME}-${PORTVERSION}
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 OPTIONS_DEFINE= DOCS
 NO_ARCH=	yes
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}-${DISTVERSION}
 
 .include <bsd.port.options.mk>
 
 do-configure:
-	@cd ${WRKSRC}/dist && ${REINPLACE_CMD} -e 's|lib/|${DATADIR}/lib/|g' \
+	@cd ${WRKSRC}/dist/bin && ${REINPLACE_CMD} -e 's|BASEDIR=".*"|BASEDIR="${DATADIR}/lib"|g' \
 		hfsx.sh resview.sh unhfs.sh
-	@${REINPLACE_CMD} -e 's|lib|${DATADIR}/lib|g' \
-		${WRKSRC}/dist/runfsb.sh
+	@${REINPLACE_CMD} -e 's|BASEDIR=".*"|BASEDIR="${DATADIR}/lib"|g' \
+		${WRKSRC}/dist/bin/hfsexplorer.sh
 
 do-build:
 	@cd ${WRKSRC} && ${SH} buildall.sh
 
 do-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/dist/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}/
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${DATADIR}/res
 .for f in hfsx.sh resview.sh unhfs.sh
-	@cd ${WRKSRC} && ${INSTALL_SCRIPT} dist/${f} ${STAGEDIR}${PREFIX}/bin
+	@cd ${WRKSRC} && ${INSTALL_SCRIPT} dist/bin/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	@cd ${WRKSRC} && ${INSTALL_SCRIPT} dist/runfsb.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@cd ${WRKSRC} && ${INSTALL_SCRIPT} dist/bin/hfsexplorer.sh ${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
 
 .include <bsd.port.mk>
Index: head/sysutils/hfsexplorer/distinfo
===================================================================
--- head/sysutils/hfsexplorer/distinfo	(revision 392682)
+++ head/sysutils/hfsexplorer/distinfo	(revision 392683)
@@ -1,2 +1,2 @@
-SHA256 (hfsexplorer-0_21-src.zip) = e7323180df5d468e31a5053411c4f811b15a7ad140802c2f6a60b16f0534e0f9
-SIZE (hfsexplorer-0_21-src.zip) = 2290547
+SHA256 (unsound-hfsexplorer-0.23-hfsexplorer-0.23_GH0.tar.gz) = 0fe0278114be05500b5c3d8334f7609f8b727f64d55b5b02158cfbb9ec0c5130
+SIZE (unsound-hfsexplorer-0.23-hfsexplorer-0.23_GH0.tar.gz) = 1143663