diff options
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/cbsd/Makefile | 6 | ||||
-rw-r--r-- | sysutils/cbsd/distinfo | 6 | ||||
-rw-r--r-- | sysutils/cbsd/files/cbsdd.in | 13 |
3 files changed, 13 insertions, 12 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 53c662db6ca3..da57d2cd8365 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cbsd -PORTVERSION= 10.3.3 +PORTVERSION= 11.0.0 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru @@ -35,10 +35,6 @@ GROUPS= ${PORTNAME} IGNORE= does not support FreeBSD versions < 10.0 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000 -LIB_DEPENDS+= libxo.so:devel/libxo -.endif - do-install: @${ECHO} "Installing in ${CBSD_HOME}" ${MKDIR} ${STAGEDIR}${CBSD_HOME} diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo index 1895ee5b2338..9632411115c4 100644 --- a/sysutils/cbsd/distinfo +++ b/sysutils/cbsd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470864569 -SHA256 (olevole-cbsd-10.3.3_GH0.tar.gz) = 71574cb7aa234d1a49d4b9ae2182446855a745bddcff877b6bfc56b6bc45aa46 -SIZE (olevole-cbsd-10.3.3_GH0.tar.gz) = 2246656 +TIMESTAMP = 1474732408 +SHA256 (olevole-cbsd-11.0.0_GH0.tar.gz) = 4b0a062e7612116ac5b890cf03298380681aaee540741cddd4ad200096859c0a +SIZE (olevole-cbsd-11.0.0_GH0.tar.gz) = 2344726 diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in index 8c8bbc94da67..d4aa6072b702 100644 --- a/sysutils/cbsd/files/cbsdd.in +++ b/sysutils/cbsd/files/cbsdd.in @@ -57,11 +57,16 @@ command_args="&" cbsdd_prestart() { %%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1 - %%PREFIX%%/bin/cbsd sysinv mode=update - %%PREFIX%%/bin/cbsd netinv + . ${distdir}/initenv.subr . ${inventory} + %%PREFIX%%/bin/cbsd sysinv mode=update + %%PREFIX%%/bin/cbsd netinv + update_hwinfo + update_netinfo + env sqlcolnames="1" ${miscdir}/sqlcli ${dbdir}/local.sqlite "SELECT * FROM local" > ${inventory} + [ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton /usr/sbin/daemon -f ${rcddir}/jails-astart start } @@ -74,12 +79,12 @@ cbsdd_prestop() cbsdd_stop() { - [ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} ) + [ -f "${pidfile}" ] && kill -9 $( /bin/cat ${pidfile} ) } cbsdd_reload() { - [ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} ) > /dev/null 2>&1 + [ -f "${pidfile}" ] && kill -9 $( /bin/cat ${pidfile} ) > /dev/null 2>&1 run_rc_command "start" exit 0 } |