diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 586736265dd6..7b4ae20d3e4f 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	eclipse
-DISTVERSION=	4.35
+DISTVERSION=	4.36
 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
 
 .if ${COMPILER_TYPE} == clang
 CFLAGS+=	-Wno-deprecated-non-prototype
 .endif
 
 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
 
 # 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} -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 0a2394b33a62..5408ac479ff0 100644
--- a/java/eclipse/distinfo
+++ b/java/eclipse/distinfo
@@ -1,29 +1,29 @@
-TIMESTAMP = 1743576596
-SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.35-R4_35_maintenance_GH0.tar.gz) = 2fcb4b9958d13e58f758c3c1a0c10b941c0d5a745b128aa93a73a4ae9f67212c
-SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.35-R4_35_maintenance_GH0.tar.gz) = 26236823
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_35_GH0.tar.gz) = 46823539473fd9a4e3f976f14e7bdad3c6730a22163413cae1e0334e68132c84
-SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_35_GH0.tar.gz) = 39729
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_35_GH0.tar.gz) = 8ba8a83865d2922d0f0b86985b34372aa3c3ea6e25f6a0512752ea9ab27b9c07
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_35_GH0.tar.gz) = 15659847
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_35_GH0.tar.gz) = 5d76780c7bde91d35fe13d78c10c0bf47115e9d444389243c8df67e92ba1f569
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_35_GH0.tar.gz) = 34885476
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_35_GH0.tar.gz) = 08162d9029ccbbf61338e1281f3c17e6271ea726e8a1ec0cf71c824bc63b1e27
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_35_GH0.tar.gz) = 2177096
-SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_35_GH0.tar.gz) = 460f3dd79ab48a68c7f91b7633c5d01faa1770741d0cfcc37174a23fdbe5e893
-SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_35_GH0.tar.gz) = 24041044
-SHA256 (eclipse/chirontt-eclipse.pde-R4_35_maintenance_GH0.tar.gz) = be94fb6edd85240c995125ba04c90806e68f13acc86333f3cdd755b11a07d68c
-SIZE (eclipse/chirontt-eclipse.pde-R4_35_maintenance_GH0.tar.gz) = 35112342
-SHA256 (eclipse/chirontt-eclipse.platform-R4_35_maintenance_GH0.tar.gz) = 6f4c89696253e60053b89dfb961f9542d033eef2e62a75869883fbc1867166e5
-SIZE (eclipse/chirontt-eclipse.platform-R4_35_maintenance_GH0.tar.gz) = 16489404
-SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_35_maintenance_GH0.tar.gz) = e390e06d0344899758b02409ba879c889f2ee106a3126f328dbb6a1156d5b872
-SIZE (eclipse/chirontt-eclipse.platform.swt-R4_35_maintenance_GH0.tar.gz) = 9218730
-SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_35_maintenance_GH0.tar.gz) = 65fd3630cf3bc4bc0e6578cc8b253f4a5ff9ccecfaa2ecde2caa21038c83c65d
-SIZE (eclipse/chirontt-eclipse.platform.ui-R4_35_maintenance_GH0.tar.gz) = 15572004
-SHA256 (eclipse/chirontt-equinox-R4_35_maintenance_GH0.tar.gz) = c751ee64dcd8a99ede5683d87227b0aba91cfab75295aaf8eb26ad91c0a42ce6
-SIZE (eclipse/chirontt-equinox-R4_35_maintenance_GH0.tar.gz) = 3593501
-SHA256 (eclipse/chirontt-equinox.binaries-R4_35_maintenance_GH0.tar.gz) = 679126ad2bb35b946a9e02c3e0177db06ea10a248ac58bc4f7f41fe2b9f9e295
-SIZE (eclipse/chirontt-equinox.binaries-R4_35_maintenance_GH0.tar.gz) = 1621098
-SHA256 (eclipse/chirontt-p2-R4_35_maintenance_GH0.tar.gz) = 9df1e4eef2095f0090b373f18a5806b1c947a8412a3f3143436f2d9b07b8dba8
-SIZE (eclipse/chirontt-p2-R4_35_maintenance_GH0.tar.gz) = 53845413
-SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.35_GH0.tar.gz) = 121a6015ee06fbc157afab0f44eb6e4afde98e7a969f91de315c816f4ba87d70
-SIZE (eclipse/NorbertXYZ-eclipse-maven-4.35_GH0.tar.gz) = 495455311
+TIMESTAMP = 1752913239
+SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.36-R4_36_maintenance_GH0.tar.gz) = 58d6734c7dd334d416b7d0255b3d71b11ee20cb7b790c0c7c6679727d0fd3611
+SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.36-R4_36_maintenance_GH0.tar.gz) = 26211750
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_36_GH0.tar.gz) = d537c10f1f7bd9159e1877c6fe8ebeafea7132e98ff5ebe6b9b09717203c5677
+SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_36_GH0.tar.gz) = 39974
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_36_GH0.tar.gz) = c2e292fd897bf6987c2f5828b3efd6a61634837f7c973842bf6fb8c11acee28f
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_36_GH0.tar.gz) = 15673901
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_36_GH0.tar.gz) = c191bc12667e600f63844dea12b01f821094773e8bf02e5eb0ec981aaf97c2bc
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_36_GH0.tar.gz) = 34885784
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_36_GH0.tar.gz) = 705d965e1941593f58eb03bf4287f220a285ff7d6f9edc2d0d7e033f4e314946
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_36_GH0.tar.gz) = 2377734
+SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_36_GH0.tar.gz) = 034ab6325f5d4c30129d89dcb89d1ee3a7a2554a4ad6d5af5a4e7d17d8cc7a7c
+SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_36_GH0.tar.gz) = 25031173
+SHA256 (eclipse/chirontt-eclipse.pde-R4_36_maintenance_GH0.tar.gz) = f0bd123252afe25b730d1cd56a5e2e134914b2199846cb9f10402a5e0a373fef
+SIZE (eclipse/chirontt-eclipse.pde-R4_36_maintenance_GH0.tar.gz) = 36060538
+SHA256 (eclipse/chirontt-eclipse.platform-R4_36_maintenance_GH0.tar.gz) = 582f5eb27de0316b228fc3fa0d962a18ed2c2cd320644a575e95139f63de9a35
+SIZE (eclipse/chirontt-eclipse.platform-R4_36_maintenance_GH0.tar.gz) = 16630323
+SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_36_maintenance_GH0.tar.gz) = 011eba684af94e73f26dd878c941a59845ab899cdba33f45d2976c2560fd0fb0
+SIZE (eclipse/chirontt-eclipse.platform.swt-R4_36_maintenance_GH0.tar.gz) = 10658980
+SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_36_maintenance_GH0.tar.gz) = c66604fb01f6d5614cb67b201c1f94273e5ea3721fe6e115ba1b24a766bc6477
+SIZE (eclipse/chirontt-eclipse.platform.ui-R4_36_maintenance_GH0.tar.gz) = 16572318
+SHA256 (eclipse/chirontt-equinox-R4_36_maintenance_GH0.tar.gz) = f6f276d6d8d69fa0cc4c9fdd1693d8bb8be98074fc9b8ce86cf2e709ab627118
+SIZE (eclipse/chirontt-equinox-R4_36_maintenance_GH0.tar.gz) = 3634382
+SHA256 (eclipse/chirontt-equinox.binaries-R4_36_maintenance_GH0.tar.gz) = 40d14c0ce3963220c21df37274348dd014973ffd20c4cc1a17ceb2ae9c7990d7
+SIZE (eclipse/chirontt-equinox.binaries-R4_36_maintenance_GH0.tar.gz) = 1620956
+SHA256 (eclipse/chirontt-p2-R4_36_maintenance_GH0.tar.gz) = 74ec993e52abb83641e12e0438bc4a9f0075a2476a17fb1c6bde4f05ff872eac
+SIZE (eclipse/chirontt-p2-R4_36_maintenance_GH0.tar.gz) = 54033925
+SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.36_GH0.tar.gz) = 0d26e1f29db214bcf8f842eca5c352f947ca9cd0906ce6d0df9b0b44bc9f9c7d
+SIZE (eclipse/NorbertXYZ-eclipse-maven-4.36_GH0.tar.gz) = 531877628