diff --git a/databases/jetbrains-datagrip/Makefile b/databases/jetbrains-datagrip/Makefile
index 109ac4784e7bc..7ececa1a56665 100644
--- a/databases/jetbrains-datagrip/Makefile
+++ b/databases/jetbrains-datagrip/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	datagrip
-DISTVERSION=	2022.3.3
+DISTVERSION=	2023.1.2
 CATEGORIES=	databases java
 MASTER_SITES=	https://download-cf.jetbrains.com/datagrip/
 PKGNAMEPREFIX=	jetbrains-
@@ -14,21 +14,25 @@ LICENSE_NAME=	Subscription license agreement for business and organizations
 LICENSE_TEXT=	See: https://www.jetbrains.com/store/license.html
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
+BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
+		jetbrains-pty4j>=0.12.10:devel/jetbrains-pty4j \
 		lsof:sysutils/lsof
 
-USES=		python:run shebangfix
+USES=		desktop-file-utils python:run shebangfix ssl
 
 USE_JAVA=	yes
-JAVA_VERSION=	11+
+JAVA_VERSION=	17+
 
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	bin/restart.py
 
 NO_ARCH=	yes
+NO_ARCH_IGNORE=	libjnidispatch.so
 NO_BUILD=	yes
 SUB_FILES=	${PORTNAME} ${PORTNAME}.desktop pkg-message
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 WRKSRC=		${WRKDIR}/DataGrip-${PORTVERSION}
 
@@ -48,13 +52,27 @@ do-install:
 		${WRKSRC}/plugins/cwm-plugin/quiche-native \
 		${WRKSRC}/plugins/performanceTesting/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
-		"! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
-	@(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh")
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	@(cd ${WRKSRC} && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
+	@(cd ${WRKSRC} && \
+		${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh")
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 \
+		${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/
 # Use fsnotifier replacement provided by java/intellij-fsnotifier
-	${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
+	${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" \
+		>> ${STAGEDIR}${DATADIR}/bin/idea.properties
+# Install FreeBSD native lib provided by devel/jna
+	@${MKDIR} ${WRKDIR}/jna
+	@(cd ${WRKDIR}/jna && \
+		${JAR} xf ${JAVAJARDIR}/jna.jar com/sun/jna/freebsd-x86-64/libjnidispatch.so)
+	${MKDIR} ${STAGEDIR}${DATADIR}/lib/jna/amd64
+	${INSTALL_LIB} ${WRKDIR}/jna/com/sun/jna/freebsd-x86-64/libjnidispatch.so \
+		${STAGEDIR}${DATADIR}/lib/jna/amd64/
+# Use pty4j replacement provided by devel/jetbrains-pty4j
+	${LN} -sf ../../../lib/pty4j ${STAGEDIR}${DATADIR}/lib/pty4j
 
 .include <bsd.port.mk>
diff --git a/databases/jetbrains-datagrip/distinfo b/databases/jetbrains-datagrip/distinfo
index 0d12d42202352..633483abd8d53 100644
--- a/databases/jetbrains-datagrip/distinfo
+++ b/databases/jetbrains-datagrip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674318335
-SHA256 (jetbrains/datagrip-2022.3.3.tar.gz) = a5575ff7e80dd4e9390eb64fc54ed4a924403950da0c38da548de3c4bd97b34b
-SIZE (jetbrains/datagrip-2022.3.3.tar.gz) = 569259324
+TIMESTAMP = 1686547442
+SHA256 (jetbrains/datagrip-2023.1.2.tar.gz) = 57e8a79d69d9f34957fe7fa1307296396ab7c2b84bacffb6d86616cbcd596edd
+SIZE (jetbrains/datagrip-2023.1.2.tar.gz) = 568353216
diff --git a/databases/jetbrains-datagrip/files/datagrip.desktop.in b/databases/jetbrains-datagrip/files/datagrip.desktop.in
index 8befcc74e2fb9..82b6e8c330306 100644
--- a/databases/jetbrains-datagrip/files/datagrip.desktop.in
+++ b/databases/jetbrains-datagrip/files/datagrip.desktop.in
@@ -6,7 +6,7 @@ Name=DataGrip
 GenericName=DataGrip
 Comment=DataGrip Integrated Development Environment
 Icon=%%DATADIR%%/bin/datagrip.png
-Exec=%%DATADIR%%/bin/datagrip.sh
+Exec=%%PREFIX%%/bin/datagrip
 Terminal=false
 StartupNotify=true
 Categories=Application;Development;
diff --git a/databases/jetbrains-datagrip/files/datagrip.in b/databases/jetbrains-datagrip/files/datagrip.in
index 227adaf3e9bbc..5ec79e7d38d67 100644
--- a/databases/jetbrains-datagrip/files/datagrip.in
+++ b/databases/jetbrains-datagrip/files/datagrip.in
@@ -1,3 +1,5 @@
 #!/bin/sh
-export JAVA_HOME="${JAVA_HOME:=/usr/local/openjdk11}"
+export JAVA_HOME="${JAVA_HOME:-"%%JAVA_HOME%%"}"
+export SHELL="/bin/sh"
+
 exec "%%DATADIR%%/bin/datagrip.sh" "$@"
diff --git a/databases/jetbrains-datagrip/pkg-plist b/databases/jetbrains-datagrip/pkg-plist
index fbc84263f00ae..cdcff388abcad 100644
--- a/databases/jetbrains-datagrip/pkg-plist
+++ b/databases/jetbrains-datagrip/pkg-plist
@@ -1,21 +1,23 @@
 @dir %%DATADIR%%/lib/jna/amd64
+@dir %%DATADIR%%/lib/native/linux-x86_64
 @dir %%DATADIR%%/lib/pty4j/linux/x86-64
+@dir %%DATADIR%%/plugins/performanceTesting-yourkit/bin
 %%DATADIR%%/bin/brokenPlugins.db
 %%DATADIR%%/bin/datagrip.png
 %%DATADIR%%/bin/datagrip.sh
 %%DATADIR%%/bin/datagrip.svg
 %%DATADIR%%/bin/datagrip64.vmoptions
 %%DATADIR%%/bin/format.sh
-%%DATADIR%%/bin/icons/icons-v2-1.0-d.db
-%%DATADIR%%/bin/icons/icons-v2-1.0.db
-%%DATADIR%%/bin/icons/icons-v2-1.25-d.db
-%%DATADIR%%/bin/icons/icons-v2-1.25.db
-%%DATADIR%%/bin/icons/icons-v2-1.5-d.db
-%%DATADIR%%/bin/icons/icons-v2-1.5.db
-%%DATADIR%%/bin/icons/icons-v2-2.0-d.db
-%%DATADIR%%/bin/icons/icons-v2-2.0.db
-%%DATADIR%%/bin/icons/icons-v2-2.5-d.db
-%%DATADIR%%/bin/icons/icons-v2-2.5.db
+%%DATADIR%%/bin/icons/icon-v4-1.0-d.db
+%%DATADIR%%/bin/icons/icon-v4-1.0.db
+%%DATADIR%%/bin/icons/icon-v4-1.25-d.db
+%%DATADIR%%/bin/icons/icon-v4-1.25.db
+%%DATADIR%%/bin/icons/icon-v4-1.5-d.db
+%%DATADIR%%/bin/icons/icon-v4-1.5.db
+%%DATADIR%%/bin/icons/icon-v4-2.0-d.db
+%%DATADIR%%/bin/icons/icon-v4-2.0.db
+%%DATADIR%%/bin/icons/icon-v4-2.5-d.db
+%%DATADIR%%/bin/icons/icon-v4-2.5.db
 %%DATADIR%%/bin/idea.properties
 %%DATADIR%%/bin/inspect.sh
 %%DATADIR%%/bin/ltedit.sh
@@ -24,13 +26,12 @@
 %%DATADIR%%/bin/restart.py
 %%DATADIR%%/build.txt
 %%DATADIR%%/Install-Linux-tar.txt
-%%DATADIR%%/lib/3rd-party-native.jar
 %%DATADIR%%/lib/3rd-party-rt.jar
 %%DATADIR%%/lib/annotations-java5.jar
 %%DATADIR%%/lib/app.jar
 %%DATADIR%%/lib/async-profiler-windows.jar
 %%DATADIR%%/lib/async-profiler.jar
-%%DATADIR%%/lib/build-marker-DB-223.8617.3
+%%DATADIR%%/lib/build-marker-DB-231.9011.35
 %%DATADIR%%/lib/byte-buddy-agent.jar
 %%DATADIR%%/lib/cds/classesLogAgent.jar
 %%DATADIR%%/lib/error-prone-annotations.jar
@@ -38,17 +39,18 @@
 %%DATADIR%%/lib/externalProcess-rt.jar
 %%DATADIR%%/lib/forms_rt.jar
 %%DATADIR%%/lib/groovy.jar
-%%DATADIR%%/lib/intellij-coverage-agent-1.0.682.jar
+%%DATADIR%%/lib/intellij-coverage-agent-1.0.706.jar
 %%DATADIR%%/lib/intellij-test-discovery.jar
 %%DATADIR%%/lib/jetbrains-annotations.jar
+%%DATADIR%%/lib/jna/amd64/libjnidispatch.so
 %%DATADIR%%/lib/jps-model.jar
 %%DATADIR%%/lib/jsch-agent.jar
-%%DATADIR%%/lib/platform-objectSerializer-annotations.jar
-%%DATADIR%%/lib/platform-statistics-devkit.jar
 %%DATADIR%%/lib/protobuf.jar
+%%DATADIR%%/lib/pty4j/pty4j
 %%DATADIR%%/lib/rd.jar
 %%DATADIR%%/lib/stats.jar
 %%DATADIR%%/lib/util_rt.jar
+%%DATADIR%%/lib/util-8.jar
 %%DATADIR%%/lib/util.jar
 %%DATADIR%%/license/javahelp_license.txt
 %%DATADIR%%/license/javolution_license.txt
@@ -73,15 +75,15 @@
 %%DATADIR%%/plugins/grid-core-impl/lib/grid-core.jar
 %%DATADIR%%/plugins/grid-core-impl/lib/jdbc-console-types.jar
 %%DATADIR%%/plugins/grid-impl/lib/grid.jar
+%%DATADIR%%/plugins/performanceTesting-async/lib/performanceTesting-async.jar
+%%DATADIR%%/plugins/performanceTesting-yourkit/lib/performanceTesting-yourkit.jar
+%%DATADIR%%/plugins/performanceTesting-yourkit/lib/yjp-controller-api-redist.jar
 %%DATADIR%%/plugins/performanceTesting/lib/performanceTesting.jar
-%%DATADIR%%/plugins/performanceTesting/lib/yjp-controller-api-redist.jar
 %%DATADIR%%/plugins/platform-images/lib/platform-images.jar
 %%DATADIR%%/plugins/platform-langInjection/lib/IntelliLang.jar
 %%DATADIR%%/plugins/platform-langInjection/lib/java-langInjection-jps.jar
 %%DATADIR%%/plugins/platform-langInjection/lib/platform-langInjection.jar
 %%DATADIR%%/plugins/remote-dev-server/bin/launcher.sh
-%%DATADIR%%/plugins/remote-dev-server/bin/xplat-launcher-third-party-licenses-x86_64-linux.html
-%%DATADIR%%/plugins/remote-dev-server/bin/xplat-launcher-x86_64-linux
 %%DATADIR%%/plugins/remote-dev-server/lib/remote-dev-server.jar
 %%DATADIR%%/plugins/remote-dev-server/selfcontained/bin/xkbcomp
 %%DATADIR%%/plugins/remote-dev-server/selfcontained/bin/Xvfb
@@ -567,6 +569,7 @@
 %%DATADIR%%/plugins/textmate/lib/bundles/html/language-configuration.json
 %%DATADIR%%/plugins/textmate/lib/bundles/html/package.json
 %%DATADIR%%/plugins/textmate/lib/bundles/html/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/html/snippets/html.code-snippets
 %%DATADIR%%/plugins/textmate/lib/bundles/html/syntaxes/html-derivative.tmLanguage.json
 %%DATADIR%%/plugins/textmate/lib/bundles/html/syntaxes/html.tmLanguage.json
 %%DATADIR%%/plugins/textmate/lib/bundles/ini/.vscodeignore
@@ -613,7 +616,6 @@
 %%DATADIR%%/plugins/textmate/lib/bundles/julia/package.nls.json
 %%DATADIR%%/plugins/textmate/lib/bundles/julia/syntaxes/julia.tmLanguage.json
 %%DATADIR%%/plugins/textmate/lib/bundles/kotlin/info.plist
-%%DATADIR%%/plugins/textmate/lib/bundles/kotlin/package.json
 %%DATADIR%%/plugins/textmate/lib/bundles/kotlin/snippets/class.tmSnippet
 %%DATADIR%%/plugins/textmate/lib/bundles/kotlin/snippets/println.tmSnippet
 %%DATADIR%%/plugins/textmate/lib/bundles/kotlin/syntaxes/Kotlin.tmLanguage