diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 49922c8e949a..87b7ae8b051b 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -1,86 +1,101 @@
 PORTNAME=	eclipse
-DISTVERSION=	4.38
-PORTREVISION=	1
+DISTVERSION=	4.39
 CATEGORIES=	java devel
 ECLIPSE_TAG=	R${DISTVERSION:S|.|_|g}
 
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ngrundmann@gmx.de
 COMMENT=	Eclipse IDE
 WWW=		https://www.eclipse.org/
 
 LICENSE=	EPL
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 BUILD_DEPENDS=	git:devel/git \
 		mvn:devel/maven39 \
 		zip:archivers/zip
 LIB_DEPENDS=	libsecret-1.so:security/libsecret
 RUN_DEPENDS=	webkit2-gtk_41>=0:www/webkit2-gtk@41
 
 USES=		compiler:c++17-lang gl gmake gnome java pkgconfig
 # The github repositories.  The repository under NorbertXYZ is for a predefined maven
 # download, so the build does not need to download while do-build is running
 USE_GITHUB=	yes
 GH_TUPLE=	chirontt:eclipse.platform.releng.aggregator:${ECLIPSE_TAG}_maintenance \
 		eclipse-jdt:eclipse.jdt:${ECLIPSE_TAG}:a/eclipse.jdt \
 		eclipse-jdt:eclipse.jdt.core:${ECLIPSE_TAG}:b/eclipse.jdt.core \
 		eclipse-jdt:eclipse.jdt.core.binaries:${ECLIPSE_TAG}:c/eclipse.jdt.core.binaries \
 		eclipse-jdt:eclipse.jdt.debug:${ECLIPSE_TAG}:d/eclipse.jdt.debug \
 		eclipse-jdt:eclipse.jdt.ui:${ECLIPSE_TAG}:e/eclipse.jdt.ui \
 		chirontt:eclipse.pde:${ECLIPSE_TAG}_maintenance:f/eclipse.pde \
 		chirontt:eclipse.platform:${ECLIPSE_TAG}_maintenance:g/eclipse.platform \
 		chirontt:eclipse.platform.swt:${ECLIPSE_TAG}_maintenance:i/eclipse.platform.swt \
 		chirontt:eclipse.platform.ui:${ECLIPSE_TAG}_maintenance:j/eclipse.platform.ui \
 		chirontt:equinox:${ECLIPSE_TAG}_maintenance:k/equinox \
 		chirontt:equinox.binaries:${ECLIPSE_TAG}_maintenance:l/equinox.binaries \
 		chirontt:p2:${ECLIPSE_TAG}_maintenance:m/equinox.p2 \
 		NorbertXYZ:eclipse-maven:${DISTVERSION}:n
 USE_GL=		gl glu
 USE_GNOME=	gtk30 gtk40
 JAVA_VERSION=	21+
 
 DESKTOP_ENTRIES=	"Eclipse" \
 			"${COMMENT}" \
 			"${PORTNAME}" \
 			"${PORTNAME}" \
 			"Development;IDE;Java;" \
 			"false"
 PORTSCOUT=	ignore:1
 SUB_FILES=	${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 MAVEN_ENV=	MAVEN_OPTS=-Xmx2048m CC=${CC} CFLAGS="${CFLAGS}" JAVA_HOME=${JAVA_HOME}
 
 # To make the build working, set the (maven) architecture to x86_64 instead of amd64
 # Finally there are problems with amd64
 MAVEN_ARCH=	${ARCH:S|amd64|x86_64|}
 
 MAVEN_PARAMS=	--offline \
 		-Dmaven.repo.local=${WRKDIR}/eclipse-maven-${DISTVERSION} \
 		-Dnative=gtk.freebsd.${MAVEN_ARCH} \
 		-DskipTests clean verify
 
-ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${MAVEN_ARCH}.tar.gz
+ECLIPSE_RESULT=	products/eclipse-sdk/target/products/org.eclipse.sdk.ide-freebsd.gtk.${MAVEN_ARCH}.tar.gz
 
 .if ${COMPILER_TYPE} == clang
 CFLAGS+=	-Wno-deprecated-non-prototype
 .endif
 
+_ICONS_PNG=	16 22 24 32 48 64 128 256 512 1024
+_ICONS_SVG=	16 32 48
+_ICONS_PATH=	${STAGEDIR}${DATADIR}/plugins/org.eclipse.platform_${DISTVERSION}.0.v*
+
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn ${MAVEN_PARAMS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
+	${MKDIR} ${_ICONS_PNG:C|([0-9]*)|${STAGEDIR}${PREFIX}/share/icons/hicolor/\1x\1/apps|}
+.for _ICON in ${_ICONS_PNG}
+	${INSTALL_DATA} \
+		${_ICONS_PATH}/${PORTNAME}${_ICON}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${_ICON}x${_ICON}/apps/${PORTNAME}.png
+.endfor
+.for _ICON in ${_ICONS_SVG}
+	${INSTALL_DATA} \
+		${_ICONS_PATH}/${PORTNAME}${_ICON}.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${_ICON}x${_ICON}/apps/${PORTNAME}.svg
+.endfor
+
 # Generate dynamic plist, to cater for different ARCHS
 post-install:
-	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST}
+	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} share/icons -not -type d >> ${TMPPLIST}
 	cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^,@dir ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo
index 7f7a836f6970..59cef3423c5d 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,29 +1,29 @@
-TIMESTAMP = 1765528395
-SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.38-R4_38_maintenance_GH0.tar.gz) = c0d44900fe9d64af0cb27d1b1fc2445508c8d2af3ff442616f6d1de3e6c252c9
-SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.38-R4_38_maintenance_GH0.tar.gz) = 26111995
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_38_GH0.tar.gz) = d1aa9abe7ed55abcab4933f1d576569d78766c51ddca7fc7dd54bb977d3b0378
-SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_38_GH0.tar.gz) = 40156
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_38_GH0.tar.gz) = d1e600c5f2595fa3838f104f708ed4da785c2677be429a4392013be48dac397c
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_38_GH0.tar.gz) = 15861511
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_38_GH0.tar.gz) = 2e964233cf7c36da9755dd301dc74cd0436588af3377be4ac368954173f37d89
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_38_GH0.tar.gz) = 34885792
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_38_GH0.tar.gz) = a05314680bca99f52cb40cdaddd2c0e6996ef8727d4323b2a42c0d7a7d097881
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_38_GH0.tar.gz) = 2405662
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_38_GH0.tar.gz) = 5beea79773f7fe24fc8a31de796f003777fcc6ff61232c11f668b56af0405a87
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_38_GH0.tar.gz) = 26497055
-SHA256 (eclipse/chirontt-eclipse.pde-R4_38_maintenance_GH0.tar.gz) = 92f9497f1b7fc498f96d5d6236beb09671486c2090883028d98b490383e152d5
-SIZE (eclipse/chirontt-eclipse.pde-R4_38_maintenance_GH0.tar.gz) = 36076831
-SHA256 (eclipse/chirontt-eclipse.platform-R4_38_maintenance_GH0.tar.gz) = 88f086a23d444d416b6c2f688bc7f0f37cd8550729028766dec82c6b3d291cd0
-SIZE (eclipse/chirontt-eclipse.platform-R4_38_maintenance_GH0.tar.gz) = 16956101
-SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_38_maintenance_GH0.tar.gz) = fc7ebf35e9a478a056c9fc8da9801a96df5285e2ecb65f77685d297b5ffdb1da
-SIZE (eclipse/chirontt-eclipse.platform.swt-R4_38_maintenance_GH0.tar.gz) = 11731948
-SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_38_maintenance_GH0.tar.gz) = cbae415598f28bd2e69ba0acb957a857122bffc1b971cefb2e4b9682978b172e
-SIZE (eclipse/chirontt-eclipse.platform.ui-R4_38_maintenance_GH0.tar.gz) = 16537801
-SHA256 (eclipse/chirontt-equinox-R4_38_maintenance_GH0.tar.gz) = 66d2a87afc0c81cc98521cdfd26929c8c548f3dfe9fc4fd8f2572ad18c2a5e7d
-SIZE (eclipse/chirontt-equinox-R4_38_maintenance_GH0.tar.gz) = 4198326
-SHA256 (eclipse/chirontt-equinox.binaries-R4_38_maintenance_GH0.tar.gz) = a3c840b7476eec595c00452ba2742c68636d7961912fb5477d2e4642bcdb4de4
-SIZE (eclipse/chirontt-equinox.binaries-R4_38_maintenance_GH0.tar.gz) = 1611409
-SHA256 (eclipse/chirontt-p2-R4_38_maintenance_GH0.tar.gz) = 8455d7382010d1a1232a0982e9b8323b15c5af62db619118e94df0025f5c3418
-SIZE (eclipse/chirontt-p2-R4_38_maintenance_GH0.tar.gz) = 54032735
-SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.38_GH0.tar.gz) = 3d0cc3dd63062443aac636d55637cdf44858f34198e5541682f32610758118ac
-SIZE (eclipse/NorbertXYZ-eclipse-maven-4.38_GH0.tar.gz) = 519463770
+TIMESTAMP = 1773648540
+SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.39-R4_39_maintenance_GH0.tar.gz) = 378cd7c3037c84f539a1ed634811136da379f6eaac8c3682ccc49b8f2e1a48cc
+SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.39-R4_39_maintenance_GH0.tar.gz) = 25797034
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_39_GH0.tar.gz) = 30c8b70e9fb6fc1f8c0369c61d2c443836900233b3be06dbda17074cb2d45061
+SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_39_GH0.tar.gz) = 40087
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_39_GH0.tar.gz) = 0e63a0efd614be76836baf3629c9098eb1ae33fdd799f444e021be261587b867
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_39_GH0.tar.gz) = 15924834
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_39_GH0.tar.gz) = ad7004e26857197b2007545fc4a57d59db6eebbe7d81d95f30f11280524a5679
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_39_GH0.tar.gz) = 34885788
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_39_GH0.tar.gz) = 0d69392d92abbcbaf913deb63ee07752b20b165d609e4ad502605b55316825f4
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_39_GH0.tar.gz) = 2411125
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_39_GH0.tar.gz) = 3e1cc77e45209db4920d93f41cbd265ab63c32078fa8c48403df8bc65c7f194c
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_39_GH0.tar.gz) = 26528884
+SHA256 (eclipse/chirontt-eclipse.pde-R4_39_maintenance_GH0.tar.gz) = ba86ec9fcf90f595f21fd99574efe7e41673b186f14061d76c2a2f5f313c6fca
+SIZE (eclipse/chirontt-eclipse.pde-R4_39_maintenance_GH0.tar.gz) = 36098532
+SHA256 (eclipse/chirontt-eclipse.platform-R4_39_maintenance_GH0.tar.gz) = 74cdef78e42fb3598329606fef44edadb216cf3102994fbbe83f922e480986f6
+SIZE (eclipse/chirontt-eclipse.platform-R4_39_maintenance_GH0.tar.gz) = 18229588
+SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_39_maintenance_GH0.tar.gz) = edec9d9814ce0147acf0a921fddbc04590233ba14fc01f9ab7c8f3e5a7e41477
+SIZE (eclipse/chirontt-eclipse.platform.swt-R4_39_maintenance_GH0.tar.gz) = 12026213
+SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_39_maintenance_GH0.tar.gz) = 4afb5c8ccf6321eabac09c8efdd3e03d603b5c95d35c2be80229dac55b3a5352
+SIZE (eclipse/chirontt-eclipse.platform.ui-R4_39_maintenance_GH0.tar.gz) = 16530676
+SHA256 (eclipse/chirontt-equinox-R4_39_maintenance_GH0.tar.gz) = e8477d15f42cc47f8d50e8e350acff2ed26ff59faca083304442ed8a2562b8f1
+SIZE (eclipse/chirontt-equinox-R4_39_maintenance_GH0.tar.gz) = 4197745
+SHA256 (eclipse/chirontt-equinox.binaries-R4_39_maintenance_GH0.tar.gz) = 296b289dc17a4daf58902499ab56dfad91fa5723834d61442871c10e8092ace7
+SIZE (eclipse/chirontt-equinox.binaries-R4_39_maintenance_GH0.tar.gz) = 1612884
+SHA256 (eclipse/chirontt-p2-R4_39_maintenance_GH0.tar.gz) = 74026b592a39fbf0d8444be86c0e36b31ff0bd008428c3df3f197323f73b80d2
+SIZE (eclipse/chirontt-p2-R4_39_maintenance_GH0.tar.gz) = 54033896
+SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.39_GH0.tar.gz) = a24d7dd54ce2e2fc9bf32dc0bb894bb7937c6b14a3dead3c84528e105230e923
+SIZE (eclipse/NorbertXYZ-eclipse-maven-4.39_GH0.tar.gz) = 502837774