diff -ruN cbsd.bak/Makefile cbsd/Makefile --- cbsd.bak/Makefile 2016-09-19 21:56:00.127204000 +0300 +++ cbsd/Makefile 2016-09-24 18:58:01.871026000 +0300 @@ -1,7 +1,7 @@ # $FreeBSD: head/sysutils/cbsd/Makefile 420052 2016-08-11 06:59:18Z vg $ PORTNAME= cbsd -PORTVERSION= 10.3.3 +PORTVERSION= 11.0.0 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru @@ -35,10 +35,6 @@ 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 -ruN cbsd.bak/distinfo cbsd/distinfo --- cbsd.bak/distinfo 2016-09-19 21:56:00.130837000 +0300 +++ cbsd/distinfo 2016-09-24 18:53:28.433773000 +0300 @@ -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 -ruN cbsd.bak/files/cbsdd.in cbsd/files/cbsdd.in --- cbsd.bak/files/cbsdd.in 2016-09-19 21:56:00.137568000 +0300 +++ cbsd/files/cbsdd.in 2016-09-24 18:52:33.299881000 +0300 @@ -57,11 +57,16 @@ 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_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 }