diff --git a/misc/openhab2-addons/Makefile b/misc/openhab2-addons/Makefile index e348974f7f18..e2698c69520e 100644 --- a/misc/openhab2-addons/Makefile +++ b/misc/openhab2-addons/Makefile @@ -1,33 +1,31 @@ -# Created by: Alexander Leidinger - PORTNAME= openhab2-addons -PORTVERSION= 2.5.11 +PORTVERSION= 2.5.12 CATEGORIES= misc java -MASTER_SITES= https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab-addons%2F${PORTVERSION}/ +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 openhab2 LICENSE= EPL RUN_DEPENDS= ${LOCALBASE}/libexec/openhab2/addons/README:misc/openhab2 USERS= openhab GROUPS= openhab NO_WRKSUBDIR= yes NO_BUILD= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS="-v" EXTRACT_AFTER_ARGS="${EXTRACT_WRKDIR}" PLIST_FILES= libexec/openhab2/addons/openhab-addons-${PORTVERSION}.kar do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openhab2 ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/openhab2/addons (cd ${WRKSRC} && ${INSTALL_DATA} ${DISTNAME}${EXTRACT_SUFX} ${STAGEDIR}${PREFIX}/libexec/openhab2/addons/) .include diff --git a/misc/openhab2-addons/distinfo b/misc/openhab2-addons/distinfo index f04a06509833..54e3ff67c3c4 100644 --- a/misc/openhab2-addons/distinfo +++ b/misc/openhab2-addons/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607929665 -SHA256 (openhab-addons-2.5.11.kar) = 400b1272f7eef2e2c565df6fee7a2fab098dfdfe623c525436b67154a1f07a1c -SIZE (openhab-addons-2.5.11.kar) = 199393963 +TIMESTAMP = 1620371585 +SHA256 (openhab-addons-2.5.12.kar) = 6544a323af11f577dde736f6942c5833879d0b41770700fcc667a188755c6cce +SIZE (openhab-addons-2.5.12.kar) = 199511513 diff --git a/misc/openhab2/Makefile b/misc/openhab2/Makefile index ff3206b66c8f..d822ffa6dff4 100644 --- a/misc/openhab2/Makefile +++ b/misc/openhab2/Makefile @@ -1,79 +1,78 @@ -# Created by: Alexander Leidinger - PORTNAME= openhab2 -PORTVERSION= 2.5.11 -PORTREVISION= 0 +PORTVERSION= 2.5.12 +#PORTREVISION= 0 CATEGORIES= misc java -MASTER_SITES= https://bintray.com/openhab/mvn/download_file?file_path=org%2Fopenhab%2Fdistro%2Fopenhab%2F${PORTVERSION}/ +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= zip USE_JAVA= yes JAVA_VERSION= 1.8 JAVA_RUN= yes USE_RC_SUBR= openhab2 SUB_FILES= pkg-message update.freebsd 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 ${INSTALL_SCRIPT} ${WRKDIR}/update.freebsd ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/runtime/bin/ (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 + ${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/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 + ${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 diff --git a/misc/openhab2/distinfo b/misc/openhab2/distinfo index 7fc4dacf77dd..c7fecde4b081 100644 --- a/misc/openhab2/distinfo +++ b/misc/openhab2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607929490 -SHA256 (openhab-2.5.11.tar.gz) = edff418da20464fc3fbc28f9790b122c53ddb8a53bf4f79041a7645c0ba49ac8 -SIZE (openhab-2.5.11.tar.gz) = 83126702 +TIMESTAMP = 1624176344 +SHA256 (openhab-2.5.12.zip) = 681007f4ddeba4e06c2f83b03dfb0ece5ffa4d35708db965d565b332fae7f1c7 +SIZE (openhab-2.5.12.zip) = 83479526 diff --git a/misc/openhab2/files/openhab2.in b/misc/openhab2/files/openhab2.in index 5cb5b25fc780..60f438f6d00c 100644 --- a/misc/openhab2/files/openhab2.in +++ b/misc/openhab2/files/openhab2.in @@ -1,89 +1,90 @@ #!/bin/sh # PROVIDE: openhab2 # REQUIRE: LOGIN # KEYWORD: shutdown # # Add these lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # openhab2_enable (bool): Set to NO by default. # Set it to YES to enable openhab2. # openhab2_user (username): Set to openhab by default. # openhab2_group (groupname): Set to openhab by default. # openhab2_http_port (port): Set to 8080 by default. # openhab2_https_port (port): Set to 8443 by default. # openhab2_listen_address (IP): Set to 0.0.0.0 for http/https by default. # openhab2_backup_dir (path): Set to /var/db/openhab2/backups by default. # openhab2_java_opts (string): Empty by default. You can add additional java # options like -Duser.timezone=Europe/Berlin and/or # -Dgnu.io.rxtx.SerialPorts=/dev/cuau0 # openhab2_home_dir (path): Set to %%PREFIX%%/libexec/openhab2 by default. # openhab2_conf_dir (path): Set to %%PREFIX%%/etc/openhab2 by default. # openhab2_runtime_dir (path): Set to %%PREFIX%%/libexec/openhab2/runtime by default. # openhab2_userdata_dir (path): Set to /var/db/openhab2/userdata by default. # openhab2_log_dir (path): Set to /var/log/openhab2 by default. . /etc/rc.subr name=openhab2 rcvar=openhab2_enable load_rc_config $name : ${openhab2_enable:="NO"} : ${openhab2_user:="openhab"} : ${openhab2_group:="openhab"} : ${openhab2_http_port:="8080"} : ${openhab2_https_port:="8443"} : ${openhab2_listen_address:="0.0.0.0"} : ${openhab2_backup_dir:="/var/db/openhab2/backups"} : ${openhab2_home_dir:="%%PREFIX%%/libexec/openhab2"} : ${openhab2_conf_dir:="%%PREFIX%%/etc/openhab2"} : ${openhab2_runtime_dir:="%%PREFIX%%/libexec/openhab2/runtime"} : ${openhab2_userdata_dir:="/var/db/openhab2/userdata"} : ${openhab2_log_dir:="/var/log/openhab2"} export OPENHAB_USER="${openhab2_user}" export OPENHAB_GROUP="${openhab2_group}" 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="-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 +export JAVA_VERSION=8 pidfile=/var/run/${name}/${name}.pid command=/usr/sbin/daemon command_args="-p ${pidfile} -t openhab2 ${OPENHAB_HOME}/start.sh server" openhab2_stop() { ${OPENHAB_RUNTIME}/bin/stop if [ -e ${pidfile} ]; then wait_for_pids $(cat ${pidfile}) fi } openhab2_status() { case "$(${OPENHAB_RUNTIME}/bin/status 2>&1)" in "Not Running ...") echo ${name} is not running, ;; "Running ...") echo ${name} is running. ;; esac } stop_cmd="openhab2_stop" status_cmd="openhab2_status" run_rc_command "$1"