4 files changed, 37 insertions, 32 deletions

diff --git a/java/bluej/Makefile b/java/bluej/Makefile
index 9d9010b1163c..04ce82541b0a 100644
--- a/java/bluej/Makefile
+++ b/java/bluej/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bluej
-PORTVERSION=	4.1.1
+PORTVERSION=	4.2.2
 CATEGORIES=	java editors
 MASTER_SITES=	http://www.bluej.org/download/files/
 DISTNAME=	BlueJ-generic-${PORTVERSION:S/.//g}
@@ -14,17 +14,15 @@ COMMENT=	Integrated Java environment designed for introductory teaching
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-DEPRECATED=	depends on expiring java/openjfx8-devel
-EXPIRATION_DATE=	2020-11-30
-
-RUN_DEPENDS=	${JAVA_HOME}/bin/javafxpackager:java/openjfx8-devel
+RUN_DEPENDS=	openjfx14>0:java/openjfx14
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	11+
 SUB_FILES=	bluej
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 DESKTOP_ENTRIES="BlueJ" \
diff --git a/java/bluej/distinfo b/java/bluej/distinfo
index b2ee2066ba33..535d887a205f 100644
--- a/java/bluej/distinfo
+++ b/java/bluej/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508317891
-SHA256 (BlueJ-generic-411.jar) = 6ca5fd0747ebf0372a2cca797205f4aa3f5c47b5dd47e71bfd6d8eecda17793f
-SIZE (BlueJ-generic-411.jar) = 18359424
+TIMESTAMP = 1604169675
+SHA256 (BlueJ-generic-422.jar) = 9a7ab8e97d86ae8ea57de6de43c25766e702e9c11ef3a026ce2d32b502a79ccf
+SIZE (BlueJ-generic-422.jar) = 17601459
diff --git a/java/bluej/files/bluej.in b/java/bluej/files/bluej.in
index 0cdb99d7a7e1..4f0e5717a727 100644
--- a/java/bluej/files/bluej.in
+++ b/java/bluej/files/bluej.in
@@ -1,4 +1,7 @@
 #!/bin/sh
 APPBASE="%%DATADIR%%"
+JAVAPATH="%%JAVA_HOME%%"
+JAVAFXPATH="%%PREFIX%%/openjfx14/"
 CP="$APPBASE/lib/bluej.jar"
-java -Dawt.useSystemAAFontSettings=on -cp "$CP" bluej.Boot  "$@"
+JAVAFX_CP="$JAVAFXPATH/lib/javafx.base.jar:$JAVAFXPATH/lib/javafx.controls.jar:$JAVAFXPATH/lib/javafx.fxml.jar:$JAVAFXPATH/lib/javafx.graphics.jar:$JAVAFXPATH/lib/javafx.media.jar:$JAVAFXPATH/lib/javafx.properties.jar:$JAVAFXPATH/lib/javafx.swing.jar:$JAVAFXPATH/lib/javafx.web.jar"
+"$JAVAPATH/bin/java" -Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -cp "$CP:$JAVAFX_CP" bluej.Boot -javafxpath="$JAVAFXPATH" "$@"
diff --git a/java/bluej/pkg-plist b/java/bluej/pkg-plist
index 4f49029bba49..446ff9881a29 100644
--- a/java/bluej/pkg-plist
+++ b/java/bluej/pkg-plist
@@ -2,16 +2,6 @@ bin/bluej
 %%DATADIR%%/LICENSE.txt
 %%DATADIR%%/README.TXT
 %%DATADIR%%/THIRDPARTYLICENSE.txt
-%%DATADIR%%/examples/LED-Button/Button.ctxt
-%%DATADIR%%/examples/LED-Button/Button.java
-%%DATADIR%%/examples/LED-Button/LED.ctxt
-%%DATADIR%%/examples/LED-Button/LED.java
-%%DATADIR%%/examples/LED-Button/LEDTester.ctxt
-%%DATADIR%%/examples/LED-Button/LEDTester.java
-%%DATADIR%%/examples/LED-Button/README.TXT
-%%DATADIR%%/examples/LED-Button/StringToMorse.ctxt
-%%DATADIR%%/examples/LED-Button/StringToMorse.java
-%%DATADIR%%/examples/LED-Button/package.bluej
 %%DATADIR%%/examples/debugdemo/Car.java
 %%DATADIR%%/examples/debugdemo/Demo.java
 %%DATADIR%%/examples/debugdemo/README.TXT
@@ -57,7 +47,6 @@ bin/bluej
 %%DATADIR%%/icons/bluej-icon-512-embossed.png
 %%DATADIR%%/icons/bluej-vista.ico
 %%DATADIR%%/icons/license.txt
-%%DATADIR%%/lib/AppleJavaExtensions.jar
 %%DATADIR%%/lib/afrikaans/dialogues
 %%DATADIR%%/lib/afrikaans/labels
 %%DATADIR%%/lib/afrikaans/moe.help
@@ -104,8 +93,8 @@ bin/bluej
 %%DATADIR%%/lib/chinese/templates/newclass/stdclass.tmpl
 %%DATADIR%%/lib/chinese/templates/newclass/unittest.tmpl
 %%DATADIR%%/lib/chinese/templates/readme.tmpl
+%%DATADIR%%/lib/classgraph-4.2.6.jar
 %%DATADIR%%/lib/commons-logging-api-1.1.2.jar
-%%DATADIR%%/lib/commons-vfs2-2.0.jar
 %%DATADIR%%/lib/czech/bluejparser.help
 %%DATADIR%%/lib/czech/dialogues
 %%DATADIR%%/lib/czech/frame-labels
@@ -153,6 +142,7 @@ bin/bluej
 %%DATADIR%%/lib/dutch/templates/newclass/stdclass.tmpl
 %%DATADIR%%/lib/dutch/templates/newclass/unittest.tmpl
 %%DATADIR%%/lib/dutch/templates/readme.tmpl
+%%DATADIR%%/lib/eddsa-0.2.0.jar
 %%DATADIR%%/lib/english/bluejparser.help
 %%DATADIR%%/lib/english/dialogues
 %%DATADIR%%/lib/english/frame-labels
@@ -192,7 +182,7 @@ bin/bluej
 %%DATADIR%%/lib/french/templates/newclass/unittest.tmpl
 %%DATADIR%%/lib/french/templates/readme.tmpl
 %%DATADIR%%/lib/german/dialogues
-%%DATADIR%%/lib/german/frame-labels.txt
+%%DATADIR%%/lib/german/frame-labels
 %%DATADIR%%/lib/german/labels
 %%DATADIR%%/lib/german/moe.help
 %%DATADIR%%/lib/german/templates/README
@@ -224,7 +214,6 @@ bin/bluej
 %%DATADIR%%/lib/httpcore-4.1.jar
 %%DATADIR%%/lib/httpmime-4.1.1.jar
 %%DATADIR%%/lib/images/Weather.png
-%%DATADIR%%/lib/images/about-logo.png
 %%DATADIR%%/lib/images/bluej-icon-256.png
 %%DATADIR%%/lib/images/bluej-icon-32.png
 %%DATADIR%%/lib/images/bluej-icon-48.png
@@ -291,7 +280,7 @@ bin/bluej
 %%DATADIR%%/lib/japanese/templates/newclass/stdclass.tmpl
 %%DATADIR%%/lib/japanese/templates/newclass/unittest.tmpl
 %%DATADIR%%/lib/japanese/templates/readme.tmpl
-%%DATADIR%%/lib/javassist-3.18.0.jar
+%%DATADIR%%/lib/jbcrypt-1.0.0.jar
 %%DATADIR%%/lib/jsch-0.1.53.jar
 %%DATADIR%%/lib/junit-4.11.jar
 %%DATADIR%%/lib/korean/dialogues
@@ -310,7 +299,7 @@ bin/bluej
 %%DATADIR%%/lib/lang-stride.jar
 %%DATADIR%%/lib/moe.defs
 %%DATADIR%%/lib/nsmenufx-2.1.4.jar
-%%DATADIR%%/lib/org.eclipse.jgit-4.1.0.jar
+%%DATADIR%%/lib/org.eclipse.jgit-4.9.0.jar
 %%DATADIR%%/lib/polish/frame-labels
 %%DATADIR%%/lib/polish/templates/README
 %%DATADIR%%/lib/polish/templates/method.tmpl
@@ -335,7 +324,7 @@ bin/bluej
 %%DATADIR%%/lib/portuguese/templates/newclass/stdclass.tmpl
 %%DATADIR%%/lib/portuguese/templates/newclass/unittest.tmpl
 %%DATADIR%%/lib/portuguese/templates/readme.tmpl
-%%DATADIR%%/lib/richtextfx-fat-0.7-M5n.jar
+%%DATADIR%%/lib/richtextfx-fat-0.9.0.jar
 %%DATADIR%%/lib/russian/dialogues
 %%DATADIR%%/lib/russian/labels
 %%DATADIR%%/lib/russian/moe.help
@@ -421,11 +410,26 @@ bin/bluej
 %%DATADIR%%/lib/swedish/templates/newclass/stdclass.tmpl
 %%DATADIR%%/lib/swedish/templates/newclass/unittest.tmpl
 %%DATADIR%%/lib/swedish/templates/readme.tmpl
-%%DATADIR%%/lib/trilead.jar
+%%DATADIR%%/lib/trilead-ssh2-build-217-jenkins-11.jar
+%%DATADIR%%/lib/tutorial/Cat.class
+%%DATADIR%%/lib/tutorial/Cat.java
+%%DATADIR%%/lib/tutorial/CatView.class
+%%DATADIR%%/lib/tutorial/CatView.java
+%%DATADIR%%/lib/tutorial/cat1.jpg
+%%DATADIR%%/lib/tutorial/cat2.jpg
+%%DATADIR%%/lib/tutorial/cat3.jpg
+%%DATADIR%%/lib/tutorial/htmlsrc/bluej-icon-256.png
+%%DATADIR%%/lib/tutorial/htmlsrc/tutorial.css
+%%DATADIR%%/lib/tutorial/package.bluej
+%%DATADIR%%/lib/tutorial/part1.html
+%%DATADIR%%/lib/tutorial/part2.html
+%%DATADIR%%/lib/tutorial/part3.html
+%%DATADIR%%/lib/tutorial/part4.html
+%%DATADIR%%/lib/tutorial/part5.html
+%%DATADIR%%/lib/tutorial/part6.html
+%%DATADIR%%/lib/tutorial/part7.html
+%%DATADIR%%/lib/tutorial/part8.html
+%%DATADIR%%/lib/tutorial/tutorial.html
 %%DATADIR%%/lib/userlib/README.TXT
-%%DATADIR%%/lib/userlib/pi4j-core.jar
-%%DATADIR%%/lib/userlib/pi4j-device.jar
-%%DATADIR%%/lib/userlib/pi4j-gpio-extension.jar
-%%DATADIR%%/lib/userlib/pi4j-service.jar
 %%DATADIR%%/lib/windowtofront.js
 %%DATADIR%%/lib/xom-1.2.9.jar