summaryrefslogtreecommitdiff
path: root/sysutils/cbsd
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/cbsd')
-rw-r--r--sysutils/cbsd/Makefile4
-rw-r--r--sysutils/cbsd/distinfo4
-rw-r--r--sysutils/cbsd/files/cbsdd.in23
-rw-r--r--sysutils/cbsd/files/cbsdrsyncd.in1
4 files changed, 23 insertions, 9 deletions
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index a0248cdcd74a..e71d0011267c 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cbsd
-PORTVERSION= 10.0.2
+PORTVERSION= 10.0.3
CATEGORIES= sysutils
MASTER_SITES= http://www.bsdstore.ru/downloads/ \
GH
@@ -19,7 +19,7 @@ LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2
USE_GITHUB= yes
GH_ACCOUNT= olevole
GH_PROJECT= cbsd
-GH_COMMIT= 6e05bd1
+GH_COMMIT= 2bb261e
USE_RC_SUBR= cbsdd cbsdrsyncd
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index dae289a437f3..4ecd1870707f 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cbsd-10.0.2.tar.gz) = 3cce46368bcd0e9e5c4f8aec8219059fcc71b0709155d5dfb029d7b9a1ed4547
-SIZE (cbsd-10.0.2.tar.gz) = 325560
+SHA256 (cbsd-10.0.3.tar.gz) = 42c51fcfb2144d6bcebb808024908f2aef9fa5d338bdccbe6e27e83fdd89cb1a
+SIZE (cbsd-10.0.3.tar.gz) = 328334
diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in
index 9127d7df9ea1..f1c7c47c443b 100644
--- a/sysutils/cbsd/files/cbsdd.in
+++ b/sysutils/cbsd/files/cbsdd.in
@@ -23,16 +23,31 @@ if [ ! -f ${globalconf} ]; then
exit 1
fi
-. ${globalconf}
-. ${inventory}
-. ${mdtools}
-. ${subr}
+if [ ! -f ${inventory} ]; then
+ echo "cbsd: no such ${inventory}";
+ exit 1
+fi
+
+if [ ! -f ${mdtools} ]; then
+ echo "cbsd: no such ${mdtools}";
+ exit 1
+fi
+
+if [ ! -f ${subr} ]; then
+ echo "cbsd: no such ${subr}";
+ exit 1
+fi
if [ ! -f ${localcbsdconf} ]; then
echo "cbsd: no such ${localcbsdconf}";
exit 1
fi
+. ${globalconf}
+. ${inventory}
+. ${mdtools}
+. ${subr}
+
. ${localcbsdconf}
start_precmd=${name}_prestart
diff --git a/sysutils/cbsd/files/cbsdrsyncd.in b/sysutils/cbsd/files/cbsdrsyncd.in
index 4dabb1ea204e..fe554dd9dbe2 100644
--- a/sysutils/cbsd/files/cbsdrsyncd.in
+++ b/sysutils/cbsd/files/cbsdrsyncd.in
@@ -10,7 +10,6 @@
#
. /etc/rc.subr
-. /etc/rc.conf
name="cbsdrsyncd"
rcvar=cbsdrsyncd_enable