diff --git a/misc/openhab-addons/Makefile b/misc/openhab-addons/Makefile index 664ac5e9d4e2..9ed85ea38551 100644 --- a/misc/openhab-addons/Makefile +++ b/misc/openhab-addons/Makefile @@ -1,32 +1,35 @@ PORTNAME= openhab-addons -PORTVERSION= 3.1.0 +PORTVERSION= 3.2.0 CATEGORIES= misc java MASTER_SITES= https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab-addons/${PORTVERSION}/ DISTNAME= openhab-addons-${PORTVERSION} EXTRACT_SUFX= .kar MAINTAINER= netchild@FreeBSD.org COMMENT= Addons for openhab LICENSE= EPL RUN_DEPENDS= ${LOCALBASE}/libexec/openhab/addons/README:misc/openhab +USES= cpe zip + USERS= openhab GROUPS= openhab -USES= zip NO_WRKSUBDIR= yes NO_BUILD= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS="-v" EXTRACT_AFTER_ARGS="${EXTRACT_WRKDIR}" +CPE_PRODUCT= openhab + PLIST_FILES= libexec/openhab/addons/openhab-addons-${PORTVERSION}.kar do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openhab ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openhab/addons (cd ${WRKSRC} && ${INSTALL_DATA} ${DISTNAME}${EXTRACT_SUFX} ${STAGEDIR}${PREFIX}/libexec/openhab/addons/) .include diff --git a/misc/openhab-addons/distinfo b/misc/openhab-addons/distinfo index 734242143dce..e8fa21d6b476 100644 --- a/misc/openhab-addons/distinfo +++ b/misc/openhab-addons/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624869020 -SHA256 (openhab-addons-3.1.0.kar) = 692bb54f536119bd5c04c0e77ded524eabeb11dc50d013035ba31cd8e27a260b -SIZE (openhab-addons-3.1.0.kar) = 241979494 +TIMESTAMP = 1640072371 +SHA256 (openhab-addons-3.2.0.kar) = 543d3bfa6dce921fb9fcfb97105846da4aa2d5cacdad6be910a340c5c30007ac +SIZE (openhab-addons-3.2.0.kar) = 283512900 diff --git a/misc/openhab/Makefile b/misc/openhab/Makefile index 81470c5bd001..c0439b617a29 100644 --- a/misc/openhab/Makefile +++ b/misc/openhab/Makefile @@ -1,77 +1,77 @@ PORTNAME= openhab -PORTVERSION= 3.1.1 +PORTVERSION= 3.2.0 PORTREVISION= 0 CATEGORIES= misc java MASTER_SITES= https://openhab.jfrog.io/artifactory/libs-release-local/org/openhab/distro/openhab/${PORTVERSION}/ DISTNAME= openhab-${PORTVERSION} MAINTAINER= netchild@FreeBSD.org COMMENT= Vendor and technology agnostic open source smart-home software LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE.TXT USES= cpe zip USE_JAVA= yes JAVA_VERSION= 11 JAVA_RUN= yes USE_RC_SUBR= openhab SUB_FILES= pkg-message NO_WRKSUBDIR= yes NO_ARCH= yes USERS= openhab GROUPS= openhab PLIST_SUB= PORTVERSION=${PORTVERSION} post-patch: @${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${WRKSRC}/runtime/bin/setenv do-build: .for conf in services/runtime.cfg services/addons.cfg html/index.html transform/en.map transform/de.map ${MV} ${WRKSRC}/conf/${conf} ${WRKSRC}/conf/${conf}.sample .endfor ${RM} -r ${WRKSRC}/runtime/bin/contrib ${RM} ${WRKSRC}/*.ps1 ${WRKSRC}/*.bat ${WRKSRC}/runtime/bin/*.ps1 ${WRKSRC}/runtime/bin/*.bat \ ${WRKSRC}/runtime/bin/*.psm1 \ ${WRKSRC}/runtime/bin/setenv.bak \ ${WRKSRC}/runtime/bin/setenv.orig do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} ${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME} ${MKDIR} ${STAGEDIR}/var/log/${PORTNAME} ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME} ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/home ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/persistence ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/persistence/db4o ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/persistence/rrd4j ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/persistence/mapdb ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/backups ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/userdata ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/userdata/etc ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/userdata/etc/scripts ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}/userdata/tmp ${MKDIR} ${STAGEDIR}/var/run/${PORTNAME} (cd ${WRKSRC}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc/${PORTNAME}) (cd ${WRKSRC} && ${COPYTREE_BIN} runtime ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}) (cd ${WRKSRC} && ${COPYTREE_BIN} addons ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}) .for script in start.sh start_debug.sh ${INSTALL_SCRIPT} ${WRKSRC}/${script} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/ .endfor (cd ${WRKSRC}/userdata && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/${PORTNAME}) gen-plist: ${FIND} ${STAGEDIR} -type f | sed -e "s:${STAGEDIR}${PREFIX}/::g ; s:${PORTVERSION}:%%PORTVERSION%%:g" | sort -u | grep libexec/ >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/openhab/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 diff --git a/misc/openhab/distinfo b/misc/openhab/distinfo index c18c37e32a73..cdb15875fa7a 100644 --- a/misc/openhab/distinfo +++ b/misc/openhab/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639381765 -SHA256 (openhab-3.1.1.zip) = 31290f483402548065752683004ebd8cb53482ae14f049d70a03683d3ac23049 -SIZE (openhab-3.1.1.zip) = 99213841 +TIMESTAMP = 1640069209 +SHA256 (openhab-3.2.0.zip) = 5ba8fdcd0cd6065c9d5589f6f498947d7b4afe16a81e65cd3885b65ef7827af8 +SIZE (openhab-3.2.0.zip) = 99044071 diff --git a/misc/openhab/files/pkg-message.in b/misc/openhab/files/pkg-message.in index d33488eb7d75..1547c76480af 100644 --- a/misc/openhab/files/pkg-message.in +++ b/misc/openhab/files/pkg-message.in @@ -1,34 +1,61 @@ [ { type: install message: <