Attachment #238760 for bug #268358

Lines 1-5 Link Here

(-)b/devel/jetbrains-clion/Makefile (+5 lines)
1	PORTNAME= clion	1	PORTNAME= clion
2	PORTVERSION= 2022.3	2	PORTVERSION= 2022.3
		3	PORTREVISION= 1
3	CATEGORIES= devel java	4	CATEGORIES= devel java
4	MASTER_SITES= https://download-cdn.jetbrains.com/cpp/	5	MASTER_SITES= https://download-cdn.jetbrains.com/cpp/
5	PKGNAMEPREFIX= jetbrains-	6	PKGNAMEPREFIX= jetbrains-
Lines 37-42 SUB_FILES= ${PORTNAME} ${PORTNAME}.desktop pkg-message Link Here
37		38
38	WRKSRC= ${WRKDIR}/clion-${PORTVERSION}	39	WRKSRC= ${WRKDIR}/clion-${PORTVERSION}
39		40
		41	post-patch:
		42	${REINPLACE_CMD} -e 's\|%%PORTS_CLION_JDK%%\|${JAVA_HOME}\|g' \
		43	${WRKSRC}/bin/clion.sh
		44
40	do-install:	45	do-install:
41	# Linux/Windows/OS X only so remove them	46	# Linux/Windows/OS X only so remove them
42	@${RM} -r \	47	@${RM} -r \




--- bin/clion.sh.orig	1970-01-20 07:47:33 UTC
+++ bin/clion.sh
@@ -50,6 +50,12 @@ JRE=""
 JRE=""
 
 # shellcheck disable=SC2154
+# Set the default JDK version to the one defined in the FreeBSD port.
+# Allow the user to override it still by using CLION_JDK.
+if [ -z "${CLION_JDK}" ] ; then
+CLION_JDK="%%PORTS_CLION_JDK%%"
+fi
+
 if [ -n "$CLION_JDK" ] && [ -x "$CLION_JDK/bin/java" ]; then
   JRE="$CLION_JDK"
 fi

Return to bug 268358

Added Link Here

(-)b/devel/jetbrains-clion/files/patch-bin_clion.sh (-1 / +15 lines)
0	-	1	--- bin/clion.sh.orig 1970-01-20 07:47:33 UTC
		2	+++ bin/clion.sh
		3	@@ -50,6 +50,12 @@ JRE=""
		4	JRE=""
		5
		6	# shellcheck disable=SC2154
		7	+# Set the default JDK version to the one defined in the FreeBSD port.
		8	+# Allow the user to override it still by using CLION_JDK.
		9	+if [ -z "${CLION_JDK}" ] ; then
		10	+CLION_JDK="%%PORTS_CLION_JDK%%"
		11	+fi
		12	+
		13	if [ -n "$CLION_JDK" ] && [ -x "$CLION_JDK/bin/java" ]; then
		14	JRE="$CLION_JDK"
		15	fi