svn commit: r548079 - head/misc/openhab2

[Alexander Leidinger]

Author: netchild
Date: Wed Sep  9 11:34:10 2020
New Revision: 548079
URL: https://svnweb.freebsd.org/changeset/ports/548079

Log:
  Add %%DATADIR%%/etc/org.apache.karaf.features.xml to plist [1]
  by autogenerating all of the plist instead of just a part.
  
  Noticed by:	mfechner	[1]
  PR:		249167		[1]

Modified:
  head/misc/openhab2/Makefile
  head/misc/openhab2/pkg-plist

Modified: head/misc/openhab2/Makefile
==============================================================================
--- head/misc/openhab2/Makefile	Wed Sep  9 11:32:06 2020	(r548078)
+++ head/misc/openhab2/Makefile	Wed Sep  9 11:34:10 2020	(r548079)
@@ -3,7 +3,7 @@
 
 PORTNAME=	openhab2
 PORTVERSION=	2.5.8
-#PORTREVISION=	3
+PORTREVISION=	1
 CATEGORIES=	misc java
 MASTER_SITES=	https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F${PORTVERSION}/
 DISTNAME=	openhab-${PORTVERSION}
@@ -68,6 +68,13 @@ do-install:
 
 gen-plist:
 	${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
+	echo '@owner openhab' >>pkg-plist.new
+	echo '@group openhab' >>pkg-plist.new
+	${FIND} ${STAGEDIR}${DATADIR} -type f | sed -E -e "s:${STAGEDIR}${DATADIR}/(.*):@sample %%DATADIR%%/\\1 /var/db/openhab2/userdata/\\1:g ; s:${PORTVERSION}:%%PORTVERSION%%:g" | sort -u >>pkg-plist.new
+	${FIND} ${STAGEDIR}${ETCDIR} -type d | sort -u | sed -e "s:${STAGEDIR}${ETCDIR}:@dir %%ETCDIR%%:g ; s:${PORTVERSION}:%%PORTVERSION%%:g"  >>pkg-plist.new
+	${FIND} ${STAGEDIR}${ETCDIR} -type f | sort -u | sed -E -e "s:${STAGEDIR}${ETCDIR}/:%%ETCDIR%%/:g ; s:${PORTVERSION}:%%PORTVERSION%%:g ; s:(.*.sample)$:@sample(openhab,openhab,640) \\1:" >>pkg-plist.new
+	${FIND} ${STAGEDIR}/var/db/${PORTNAME} -type d | sort -ru | sed -e "s:${STAGEDIR}:@dir :g" >>pkg-plist.new
+	echo "@dir /var/log/${PORTNAME}" >>pkg-plist.new
+	echo "@dir /var/run/${PORTNAME}" >>pkg-plist.new
 
 .include <bsd.port.mk>

Modified: head/misc/openhab2/pkg-plist
==============================================================================
--- head/misc/openhab2/pkg-plist	Wed Sep  9 11:32:06 2020	(r548078)
+++ head/misc/openhab2/pkg-plist	Wed Sep  9 11:34:10 2020	(r548079)
@@ -405,6 +405,7 @@ libexec/openhab2/start_debug.sh
 @sample %%DATADIR%%/etc/org.apache.karaf.command.acl.system.cfg /var/db/openhab2/userdata/etc/org.apache.karaf.command.acl.system.cfg
 @sample %%DATADIR%%/etc/org.apache.karaf.features.cfg /var/db/openhab2/userdata/etc/org.apache.karaf.features.cfg
 @sample %%DATADIR%%/etc/org.apache.karaf.features.repos.cfg /var/db/openhab2/userdata/etc/org.apache.karaf.features.repos.cfg
+ at sample %%DATADIR%%/etc/org.apache.karaf.features.xml /var/db/openhab2/userdata/etc/org.apache.karaf.features.xml
 @sample %%DATADIR%%/etc/org.apache.karaf.jaas.cfg /var/db/openhab2/userdata/etc/org.apache.karaf.jaas.cfg
 @sample %%DATADIR%%/etc/org.apache.karaf.kar.cfg /var/db/openhab2/userdata/etc/org.apache.karaf.kar.cfg
 @sample %%DATADIR%%/etc/org.apache.karaf.log.cfg /var/db/openhab2/userdata/etc/org.apache.karaf.log.cfg
@@ -455,16 +456,16 @@ libexec/openhab2/start_debug.sh
 @sample(openhab,openhab,640) %%ETCDIR%%/transform/de.map.sample
 @sample(openhab,openhab,640) %%ETCDIR%%/transform/en.map.sample
 %%ETCDIR%%/transform/readme.txt
- at dir /var/run/openhab2
- at dir /var/db/openhab2/home
- at dir /var/db/openhab2/persistence/db4o
- at dir /var/db/openhab2/persistence/mapdb
- at dir /var/db/openhab2/persistence/rrd4j
- at dir /var/db/openhab2/persistence
- at dir /var/db/openhab2/backups
+ at dir /var/db/openhab2/userdata/tmp
 @dir /var/db/openhab2/userdata/etc/scripts
 @dir /var/db/openhab2/userdata/etc
- at dir /var/db/openhab2/userdata/tmp
 @dir /var/db/openhab2/userdata
+ at dir /var/db/openhab2/persistence/rrd4j
+ at dir /var/db/openhab2/persistence/mapdb
+ at dir /var/db/openhab2/persistence/db4o
+ at dir /var/db/openhab2/persistence
+ at dir /var/db/openhab2/home
+ at dir /var/db/openhab2/backups
 @dir /var/db/openhab2
 @dir /var/log/openhab2
+ at dir /var/run/openhab2