From owner-svn-ports-head@freebsd.org Wed Sep 9 11:34:11 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 11A5C3CCBDF; Wed, 9 Sep 2020 11:34:11 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bmg026hSWz46Z3; Wed, 9 Sep 2020 11:34:10 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C849B20E48; Wed, 9 Sep 2020 11:34:10 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 089BYABB013275; Wed, 9 Sep 2020 11:34:10 GMT (envelope-from netchild@FreeBSD.org) Received: (from netchild@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 089BYA5S013274; Wed, 9 Sep 2020 11:34:10 GMT (envelope-from netchild@FreeBSD.org) Message-Id: <202009091134.089BYA5S013274@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: netchild set sender to netchild@FreeBSD.org using -f From: Alexander Leidinger Date: Wed, 9 Sep 2020 11:34:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548079 - head/misc/openhab2 X-SVN-Group: ports-head X-SVN-Commit-Author: netchild X-SVN-Commit-Paths: head/misc/openhab2 X-SVN-Commit-Revision: 548079 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2020 11:34:11 -0000 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 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 +@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 -@dir /var/run/openhab2 -@dir /var/db/openhab2/home -@dir /var/db/openhab2/persistence/db4o -@dir /var/db/openhab2/persistence/mapdb -@dir /var/db/openhab2/persistence/rrd4j -@dir /var/db/openhab2/persistence -@dir /var/db/openhab2/backups +@dir /var/db/openhab2/userdata/tmp @dir /var/db/openhab2/userdata/etc/scripts @dir /var/db/openhab2/userdata/etc -@dir /var/db/openhab2/userdata/tmp @dir /var/db/openhab2/userdata +@dir /var/db/openhab2/persistence/rrd4j +@dir /var/db/openhab2/persistence/mapdb +@dir /var/db/openhab2/persistence/db4o +@dir /var/db/openhab2/persistence +@dir /var/db/openhab2/home +@dir /var/db/openhab2/backups @dir /var/db/openhab2 @dir /var/log/openhab2 +@dir /var/run/openhab2