git: a011d7aaa587 - main - databases/sqldeveloper: make depends from java/openjfx14 mandatory

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a011d7aaa58773f86fce4c71aa9d918816f6498f

commit a011d7aaa58773f86fce4c71aa9d918816f6498f
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2024-01-12 16:28:50 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-01-12 17:17:51 +0000

    databases/sqldeveloper: make depends from java/openjfx14 mandatory
    
    The SQLDeveloper distribution has built-in OpenJFX for other OSes,
    and it can work with it on FreeBSD (by forcing the path to one of them),
    but not all functions work.
    We have very little reason to keep this option, then we have a fully
    functional port java/openjfx14.
    
    Approved by:    arrowd (mentor)
---
 databases/sqldeveloper/Makefile | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index 818e0d260857..f08fb29748fa 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	sqldeveloper
 DISTVERSION=	23.1.1.345.2114
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=	-no-jre
 CATEGORIES=	databases java
 # https://www.oracle.com/tools/downloads/sqldev-downloads.html
@@ -15,7 +15,8 @@ WWW=		https://www.oracle.com/database/technologies/appdev/sqldeveloper-landing.h
 LICENSE_NAME=	OTN
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror
 
-RUN_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	openjfx14>=0:java/openjfx14 \
+		bash:shells/bash
 
 USES=		gnome zip
 USE_JAVA=	yes
@@ -30,18 +31,7 @@ SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS_DEFINE=		OPENJFX14
-OPTIONS_DEFAULT=	OPENJFX14
-OPENJFX14_DESC=		Use JavaFX 14 (can work without it with some limitations)
-OPENJFX14_RUN_DEPENDS=	openjfx14>=0:java/openjfx14
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENJFX14}
-OPENJFX14_JVM_OPTIONS=	-J--module-path=${LOCALBASE}/openjfx14/lib \
-			-J--add-modules=javafx.swing,javafx.web
-.endif
-SUB_LIST+=		OPENJFX14_JVM_OPTIONS="${OPENJFX14_JVM_OPTIONS}"
+SUB_LIST+=	OPENJFX14_JVM_OPTIONS="-J--module-path=${LOCALBASE}/openjfx14/lib -J--add-modules=javafx.swing,javafx.web"
 
 .include <bsd.port.pre.mk>