Update to 2.5.4.

3 files changed, 22 insertions, 20 deletions

diff --git a/misc/openhab2/Makefile b/misc/openhab2/Makefile
index e01774d8bf7a..40b7a58b5b9d 100644
--- a/misc/openhab2/Makefile
+++ b/misc/openhab2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openhab2
-PORTVERSION=	2.5.3
+PORTVERSION=	2.5.4
 #PORTREVISION=	3
 CATEGORIES=	misc java
 MASTER_SITES=	https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F${PORTVERSION}/
@@ -25,6 +25,8 @@ NO_ARCH=	yes
 USERS=	openhab
 GROUPS=	openhab
 
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
 post-patch:
 	@${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/runtime/bin/setenv
 
@@ -65,7 +67,7 @@ do-install:
 	(cd ${WRKSRC}/userdata && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/${PORTNAME})
 
 gen-plist:
-	${FIND} ${STAGEDIR} -type f | sed -e "s:${STAGEDIR}${PREFIX}/::g" | sort -u | grep libexec/ >pkg-plist.new
+	${FIND} ${STAGEDIR} -type f | sed -e "s:${STAGEDIR}${PREFIX}/::g ; s:${PORTVERSION}:%%PORTVERSION%%:g" | sort -u | grep libexec/ >pkg-plist.new
 	egrep '^(@|#|%)' pkg-plist >>pkg-plist.new
 
 .include <bsd.port.mk>
diff --git a/misc/openhab2/distinfo b/misc/openhab2/distinfo
index da60598f1d17..edc8cf022fa2 100644
--- a/misc/openhab2/distinfo
+++ b/misc/openhab2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584633935
-SHA256 (openhab-2.5.3.tar.gz) = 3016286ec6df5a00fdc0e84affaacb16b02afd3d898d6b580ae1a23e1feb361a
-SIZE (openhab-2.5.3.tar.gz) = 83105659
+TIMESTAMP = 1587381388
+SHA256 (openhab-2.5.4.tar.gz) = b234e934e0e5d6b8c0121af1683ccd76d8236be9057a48ff4da521d4a13e689b
+SIZE (openhab-2.5.4.tar.gz) = 83124465
diff --git a/misc/openhab2/pkg-plist b/misc/openhab2/pkg-plist
index eb1538378e5a..6f2a88b1fb8f 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.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/distro/distro-kar/%%PORTVERSION%%/distro-kar-%%PORTVERSION%%-features.xml
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-automation-js.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-items.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-persistence-rrd4j.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-rules.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-scripts.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-services-basicui.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-services-classicui.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-services-logging.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-sitemaps.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-things.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro-resources/%%PORTVERSION%%/distro-resources-%%PORTVERSION%%-transform-en.cfg
+libexec/openhab2/runtime/system/org/openhab/distro/distro/%%PORTVERSION%%/distro-%%PORTVERSION%%-features.xml
+libexec/openhab2/runtime/system/org/openhab/distro/openhab-addons/%%PORTVERSION%%/openhab-addons-%%PORTVERSION%%-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.3/org.openhab.ui.dashboard-2.5.3.jar
+libexec/openhab2/runtime/system/org/openhab/ui/bundles/org.openhab.ui.dashboard/%%PORTVERSION%%/org.openhab.ui.dashboard-%%PORTVERSION%%.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