diff -ruN /usr/ports/databases/squirrel-sql/Makefile ./Makefile
--- /usr/ports/databases/squirrel-sql/Makefile	2019-08-02 18:32:26.795041000 +1200
+++ ./Makefile	2020-01-03 10:19:47.976053000 +1300
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	squirrel-sql
-PORTVERSION=	3.9.1
+PORTVERSION=	4.0.0
 CATEGORIES=	databases java
 MASTER_SITES=	SF/${PORTNAME}/1-stable/${PORTVERSION}-plainzip
 DISTNAME=	squirrelsql-${PORTVERSION}-optional
@@ -14,8 +14,7 @@
 
 USES=		zip
 
-USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+USE_JAVA=	8+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
diff -ruN /usr/ports/databases/squirrel-sql/distinfo ./distinfo
--- /usr/ports/databases/squirrel-sql/distinfo	2019-07-23 16:52:46.319403000 +1200
+++ ./distinfo	2020-01-03 10:11:07.653290000 +1300
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551119573
-SHA256 (squirrelsql-3.9.1-optional.zip) = 0a1902d1908ae8832f4ca7f5a74a0b353a84bc3a642484cd727fddf45f84bf93
-SIZE (squirrelsql-3.9.1-optional.zip) = 57129398
+TIMESTAMP = 1577999467
+SHA256 (squirrelsql-4.0.0-optional.zip) = 3487ffe393c9610e69cea8e7c3c6884091f2e2159c6f3254621af401952f1909
+SIZE (squirrelsql-4.0.0-optional.zip) = 59344290
diff -ruN /usr/ports/databases/squirrel-sql/files/squirrel-sql.in ./files/squirrel-sql.in
--- /usr/ports/databases/squirrel-sql/files/squirrel-sql.in	2019-07-23 16:52:46.319464000 +1200
+++ ./files/squirrel-sql.in	2020-01-03 10:22:36.126663000 +1300
@@ -14,4 +14,4 @@
 # Now add the system classpath to the classpath. 
 TMP_CP=$TMP_CP:$CLASSPATH
 
-JAVA_VERSION=%%JAVA_VERSION%% java -Xmx256m -classpath ${TMP_CP} -splash:${SQUIRREL_SQL_HOME}/icons/splash.jpg net.sourceforge.squirrel_sql.client.Main --log-config-file ${SQUIRREL_SQL_HOME}/log4j.properties --squirrel-home ${SQUIRREL_SQL_HOME} $1 $2 $3 $4 $5 $6 $7 $8 $9
+JAVA_VERSION=%%JAVA_VERSION%% java -Xmx256m -classpath ${TMP_CP} -splash:${SQUIRREL_SQL_HOME}/icons/splash.jpg net.sourceforge.squirrel_sql.client.Main --log-config-file ${SQUIRREL_SQL_HOME}/log4j.properties --squirrel-home ${SQUIRREL_SQL_HOME} "$@"
diff -ruN /usr/ports/databases/squirrel-sql/pkg-plist ./pkg-plist
--- /usr/ports/databases/squirrel-sql/pkg-plist	2019-07-23 16:52:46.319623000 +1200
+++ ./pkg-plist	2020-01-03 10:12:53.582080000 +1300
@@ -1,4 +1,80 @@
 bin/squirrel-sql
+%%DATADIR%%/doc/changes.txt
+%%DATADIR%%/doc/images/add_alias_1.png
+%%DATADIR%%/doc/images/add_exc.gif
+%%DATADIR%%/doc/images/alias_properties.png
+%%DATADIR%%/doc/images/alias_properties_button.png
+%%DATADIR%%/doc/images/alias_properties_dialog.png
+%%DATADIR%%/doc/images/alias_properties_dialog2.png
+%%DATADIR%%/doc/images/alias_properties_dialog3.png
+%%DATADIR%%/doc/images/alias_properties_dialog4.png
+%%DATADIR%%/doc/images/alias_properties_dialog5.png
+%%DATADIR%%/doc/images/alias_window_no_tree.png
+%%DATADIR%%/doc/images/alias_window_with_tree.png
+%%DATADIR%%/doc/images/aliases_tool_window_1.png
+%%DATADIR%%/doc/images/chg_driver_1.png
+%%DATADIR%%/doc/images/chg_driver_2.png
+%%DATADIR%%/doc/images/color-properties.png
+%%DATADIR%%/doc/images/connect_window.png
+%%DATADIR%%/doc/images/createresultwindow.gif
+%%DATADIR%%/doc/images/discovery.gif
+%%DATADIR%%/doc/images/drivers_tool_window_1.png
+%%DATADIR%%/doc/images/error_st_obj.gif
+%%DATADIR%%/doc/images/fonts_menus_demo.png
+%%DATADIR%%/doc/images/fonts_other_demo.png
+%%DATADIR%%/doc/images/fonts_static_text_demo.png
+%%DATADIR%%/doc/images/fonts_status_bar_demo.png
+%%DATADIR%%/doc/images/global_bookmarks.png
+%%DATADIR%%/doc/images/global_data_types_part1.png
+%%DATADIR%%/doc/images/global_data_types_part2.png
+%%DATADIR%%/doc/images/global_fonts.png
+%%DATADIR%%/doc/images/global_general.png
+%%DATADIR%%/doc/images/global_laf.png
+%%DATADIR%%/doc/images/global_proxy.png
+%%DATADIR%%/doc/images/global_sql.png
+%%DATADIR%%/doc/images/global_sqlscripts.png
+%%DATADIR%%/doc/images/history_arrow.png
+%%DATADIR%%/doc/images/history_dialog_icon.png
+%%DATADIR%%/doc/images/last_log_entry_dialog.png
+%%DATADIR%%/doc/images/log_messages_status.png
+%%DATADIR%%/doc/images/logo.jpg
+%%DATADIR%%/doc/images/logo_1.jpg
+%%DATADIR%%/doc/images/mdi_session_layout.png
+%%DATADIR%%/doc/images/ok_st_obj.gif
+%%DATADIR%%/doc/images/plugins_1.png
+%%DATADIR%%/doc/images/scrollable_tabs.png
+%%DATADIR%%/doc/images/session_1.png
+%%DATADIR%%/doc/images/session_2.png
+%%DATADIR%%/doc/images/session_background_color_example.png
+%%DATADIR%%/doc/images/session_props_general.png
+%%DATADIR%%/doc/images/session_props_objecttree.png
+%%DATADIR%%/doc/images/session_props_sql.png
+%%DATADIR%%/doc/images/sql_1.png
+%%DATADIR%%/doc/images/sql_2.png
+%%DATADIR%%/doc/images/sql_history_dialog.png
+%%DATADIR%%/doc/images/sql_history_list.png
+%%DATADIR%%/doc/images/stacked_tabs.png
+%%DATADIR%%/doc/images/tabbed_session_layout.png
+%%DATADIR%%/doc/images/toolspopup.jpg
+%%DATADIR%%/doc/images/update-dialog.png
+%%DATADIR%%/doc/images/update-settings.png
+%%DATADIR%%/doc/images/update_download_progress.png
+%%DATADIR%%/doc/images/update_summary.png
+%%DATADIR%%/doc/images/updates-menu.png
+%%DATADIR%%/doc/licences/dean_jones_icons_licence.txt
+%%DATADIR%%/doc/licences/eclipse-icons-licence.html
+%%DATADIR%%/doc/licences/eclipse-icons-licence.txt
+%%DATADIR%%/doc/licences/log4j-licence.txt
+%%DATADIR%%/doc/licences/nano_xml_licence.txt
+%%DATADIR%%/doc/licences/squirrel_licence.txt
+%%DATADIR%%/doc/licences/sun_icons_licence.txt
+%%DATADIR%%/doc/news.txt
+%%DATADIR%%/doc/plugins.html
+%%DATADIR%%/doc/quick_start.html
+%%DATADIR%%/doc/readme.html
+%%DATADIR%%/doc/readme.txt
+%%DATADIR%%/doc/style.css
+%%DATADIR%%/doc/welcome.html
 %%DATADIR%%/icons/acorn.icns
 %%DATADIR%%/icons/acorn.ico
 %%DATADIR%%/icons/acorn.png
@@ -38,6 +114,7 @@
 %%DATADIR%%/lib/jfreechart-1.5.0.jar
 %%DATADIR%%/lib/jide-oss.jar
 %%DATADIR%%/lib/jmeld.jar
+%%DATADIR%%/lib/jsqlparser-2.2-SNAPSHOT.jar
 %%DATADIR%%/lib/log4j.jar
 %%DATADIR%%/lib/markdowngeneratorJava1_6.jar
 %%DATADIR%%/lib/nanoxml.jar
@@ -46,8 +123,8 @@
 %%DATADIR%%/lib/poi-ooxml-schemas.jar
 %%DATADIR%%/lib/poi-ooxml.jar
 %%DATADIR%%/lib/poi.jar
-%%DATADIR%%/lib/rstaui.jar
-%%DATADIR%%/lib/rsyntaxtextarea.jar
+%%DATADIR%%/lib/rstaui-3.0.0.jar
+%%DATADIR%%/lib/rsyntaxtextarea-3.0.3.jar
 %%DATADIR%%/lib/spring-beans.jar
 %%DATADIR%%/lib/spring-context-support.jar
 %%DATADIR%%/lib/spring-context.jar