4 files changed, 22 insertions, 20 deletions

diff --git a/misc/openhab2/Makefile b/misc/openhab2/Makefile
index 78f73f9a954a..e01774d8bf7a 100644
--- a/misc/openhab2/Makefile
+++ b/misc/openhab2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openhab2
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.3
 #PORTREVISION=	3
 CATEGORIES=	misc java
 MASTER_SITES=	https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F${PORTVERSION}/
diff --git a/misc/openhab2/distinfo b/misc/openhab2/distinfo
index 3640aab28a77..da60598f1d17 100644
--- a/misc/openhab2/distinfo
+++ b/misc/openhab2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579349106
-SHA256 (openhab-2.5.1.tar.gz) = 79907c05d1fa2b64a843dc1e2f7f46a8f3248f1d2d583604e3538ae5af7202de
-SIZE (openhab-2.5.1.tar.gz) = 83134957
+TIMESTAMP = 1584633935
+SHA256 (openhab-2.5.3.tar.gz) = 3016286ec6df5a00fdc0e84affaacb16b02afd3d898d6b580ae1a23e1feb361a
+SIZE (openhab-2.5.3.tar.gz) = 83105659
diff --git a/misc/openhab2/files/openhab2.in b/misc/openhab2/files/openhab2.in
index 9d6ec1ae43ad..e7351ed5d3ea 100644
--- a/misc/openhab2/files/openhab2.in
+++ b/misc/openhab2/files/openhab2.in
@@ -52,12 +52,14 @@ export OPENHAB_HTTP_PORT="${openhab2_http_port}"
 export OPENHAB_HTTPS_PORT="${openhab2_https_port}"
 export OPENHAB_HTTP_ADDRESS="${openhab2_listen_address}"
 export OPENHAB_BACKUPS="${openhab2_backup_dir}"
-export EXTRA_JAVA_OPTS="${openhab2_java_opts}"
+export EXTRA_JAVA_OPTS="-Dsun.nio.fs.watchservice=polling ${openhab2_java_opts}"
 export OPENHAB_HOME="${openhab2_home_dir}"
 export OPENHAB_CONF="${openhab2_conf_dir}"
 export OPENHAB_RUNTIME="${openhab2_runtime_dir}"
 export OPENHAB_USERDATA="${openhab2_userdata_dir}"
 export OPENHAB_LOGDIR="${openhab2_log_dir}"
+# for UTF-8 encoding, language can be set inside openhab:
+export LC_ALL=en_US.UTF-8
 
 #command=${OPENHAB_HOME}/start.sh
 #command_args="server"
diff --git a/misc/openhab2/pkg-plist b/misc/openhab2/pkg-plist
index d6cc7d4d8b9b..eb1538378e5a 100644
--- a/misc/openhab2/pkg-plist
+++ b/misc/openhab2/pkg-plist
@@ -328,24 +328,24 @@ libexec/openhab2/runtime/system/org/openhab/core/bundles/org.openhab.core.ui.ico
 libexec/openhab2/runtime/system/org/openhab/core/bundles/org.openhab.core.ui/2.5.0/org.openhab.core.ui-2.5.0.jar
 libexec/openhab2/runtime/system/org/openhab/core/bundles/org.openhab.core.voice/2.5.0/org.openhab.core.voice-2.5.0.jar
 libexec/openhab2/runtime/system/org/openhab/core/bundles/org.openhab.core/2.5.0/org.openhab.core-2.5.0.jar
-libexec/openhab2/runtime/system/org/openhab/distro/distro-kar/2.5.1/distro-kar-2.5.1-features.xml
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-automation-js.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-items.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-persistence-rrd4j.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-rules.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-scripts.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-services-basicui.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-services-classicui.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-services-logging.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-sitemaps.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-things.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.1/distro-resources-2.5.1-transform-en.cfg
-libexec/openhab2/runtime/system/org/openhab/distro/distro/2.5.1/distro-2.5.1-features.xml
-libexec/openhab2/runtime/system/org/openhab/distro/openhab-addons/2.5.1/openhab-addons-2.5.1-features.xml
+libexec/openhab2/runtime/system/org/openhab/distro/distro-kar/2.5.3/distro-kar-2.5.3-features.xml
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-automation-js.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-items.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-persistence-rrd4j.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-rules.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-scripts.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-services-basicui.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-services-classicui.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-services-logging.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-sitemaps.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-things.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/2.5.3/distro-resources-2.5.3-transform-en.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro/2.5.3/distro-2.5.3-features.xml
+libexec/openhab2/runtime/system/org/openhab/distro/openhab-addons/2.5.3/openhab-addons-2.5.3-features.xml
 libexec/openhab2/runtime/system/org/openhab/nrjavaserial/3.15.0.OH2/nrjavaserial-3.15.0.OH2.jar
 libexec/openhab2/runtime/system/org/openhab/osgiify/com.google.dagger/2.20/com.google.dagger-2.20.jar
 libexec/openhab2/runtime/system/org/openhab/osgiify/com.igormaznitsa.jbbp/1.4.1/com.igormaznitsa.jbbp-1.4.1.jar
-libexec/openhab2/runtime/system/org/openhab/ui/bundles/org.openhab.ui.dashboard/2.5.1/org.openhab.ui.dashboard-2.5.1.jar
+libexec/openhab2/runtime/system/org/openhab/ui/bundles/org.openhab.ui.dashboard/2.5.3/org.openhab.ui.dashboard-2.5.3.jar
 libexec/openhab2/runtime/system/org/ops4j/pax/logging/pax-logging-api/1.11.2/pax-logging-api-1.11.2.jar
 libexec/openhab2/runtime/system/org/ops4j/pax/logging/pax-logging-log4j2/1.11.2/pax-logging-log4j2-1.11.2.jar
 libexec/openhab2/runtime/system/org/ops4j/pax/logging/pax-logging-logback/1.11.2/pax-logging-logback-1.11.2.jar