diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index e5cc20b04b73..9ae0ad9b5184 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -1,81 +1,66 @@
 PORTNAME=	sqldeveloper
 DISTVERSION=	24.3.1.347.1826
-PORTREVISION=	2
 DISTVERSIONSUFFIX=	-no-jre
+PORTREVISION=	3
 CATEGORIES=	databases java
-# https://www.oracle.com/tools/downloads/sqldev-downloads.html
-MASTER_SITES=
+# https://www.oracle.com/database/sqldeveloper/technologies/download/
+MASTER_SITES=	https://download.oracle.com/otn_software/java/sqldeveloper/
 DIST_SUBDIR=	oracle
 
 MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Graphical tool for database development
 WWW=		https://www.oracle.com/database/technologies/appdev/sqldeveloper-landing.html
 
-LICENSE=	OTN
-LICENSE_NAME=	Oracle Technology Network License Agreement for Business Operations
-LICENSE_TEXT=	https://www.oracle.com/downloads/licenses/sqldev-license.html
-LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror
+LICENSE=	FUTC
+LICENSE_NAME=	Oracle Free Use Terms and Conditions (Oracle Free License)
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 RUN_DEPENDS=	openjfx14>=0:java/openjfx14 \
 		bash:shells/bash
 
 USES=		gnome java zip
 JAVA_VERSION=	17
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${PORTNAME}.desktop ${PORTNAME}.sh
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
-		PORTNAME=${PORTNAME}
+		PORTNAME=${PORTNAME} \
+		OPENJFX14_JVM_OPTIONS="-J--module-path=${LOCALBASE}/openjfx14/lib -J--add-modules=javafx.swing,javafx.web"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-SUB_LIST+=	OPENJFX14_JVM_OPTIONS="-J--module-path=${LOCALBASE}/openjfx14/lib -J--add-modules=javafx.swing,javafx.web"
-
-.include <bsd.port.pre.mk>
-
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=		due to Oracle license restrictions, you must fetch the \
-		source distribution manually. Please access \
-		https://www.oracle.com/tools/downloads/sqldev-downloads.html \
-		with a web browser and follow the link for the ${DISTFILES}. \
-		You will be required to register and log in, but you can \
-		create an account on that page. After registration and \
-		accepting the Oracle License, download the distribution file, \
-		${DISTFILES}, into ${DISTDIR}/${DIST_SUBDIR}/ and then restart \
-		this installation
-.endif
-
 do-install:
 	${ECHO_MSG} -n ">> Installing scripts..."
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 	${ECHO_MSG} " [ DONE ]"
 
 .for d in configuration dataminer dropins equinox \
     external ide javavm jdbc jdev jlib jviews modules \
     netbeans rdbms sleepycat sqldeveloper sqlj svnkit
 	${ECHO_MSG} -n ">> Installing data directory '${d}'..."
 	cd ${WRKSRC} && ${FIND} ${d} -type d \
 		-exec ${MKDIR} ${STAGEDIR}/${DATADIR}/\{} \;
 	cd ${WRKSRC} && ${FIND} ${d} -type f \
 		-not -name "*.exe" \
 		-not -name "*.dll" \
 		-not -name "*.so" \
 		-not -name "*.jnilib" \
 		-exec ${INSTALL_DATA} \{} ${STAGEDIR}/${DATADIR}/\{} \;
 	${ECHO_MSG} " [ DONE ]"
 .endfor
 
 	${RM} -r ${STAGEDIR}/${DATADIR}/modules/javafx
 	${RM} -r ${STAGEDIR}/${DATADIR}/netbeans/platform/modules/lib
 
 	@${ECHO_MSG} ">> Installing icon and desktop file ..."
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/applications/ \
 	    ${STAGEDIR}/${PREFIX}/share/icons/hicolor/32x32/apps/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}/${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}/${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
 
 	${ECHO_MSG} " [ DONE ]"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>