svn commit: r361672 - in head/sysutils/cbsd: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Sun Jul 13 11:38:47 2014
New Revision: 361672
URL: http://svnweb.freebsd.org/changeset/ports/361672
QAT: https://qat.redports.org/buildarchive/r361672/

Log:
  Update to 10.0.6.
  
  Changes for 10.0.6:
   cbsd taskd: daemon for internal tasks
   bconstruct-tui: menubox for vm_os_type and get_vm_profiles
   bhyve: add support for install FreeBSD guest from ISO
   bhyve: implement other method for POPCNT checking
   repo: newjname as argument for alternative name of stored jail
  
  PR:		191844
  Submitted by:	olevole at olevole.ru (maintainer)

Added:
  head/sysutils/cbsd/pkg-plist-chunk   (contents, props changed)
Modified:
  head/sysutils/cbsd/Makefile
  head/sysutils/cbsd/distinfo
  head/sysutils/cbsd/files/cbsdd.in

Modified: head/sysutils/cbsd/Makefile
==============================================================================
--- head/sysutils/cbsd/Makefile	Sun Jul 13 11:27:44 2014	(r361671)
+++ head/sysutils/cbsd/Makefile	Sun Jul 13 11:38:47 2014	(r361672)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cbsd
-PORTVERSION=	10.0.5
-PORTREVISION=	2
+PORTVERSION=	10.0.6
 CATEGORIES=	sysutils
 
 MAINTAINER=	olevole at olevole.ru
@@ -18,7 +17,7 @@ LIB_DEPENDS=	libssh2.so:${PORTSDIR}/secu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	olevole
-GH_COMMIT=	01f481c
+GH_COMMIT=	cac57bb
 
 USE_RC_SUBR=	cbsdd cbsdrsyncd
 
@@ -40,7 +39,15 @@ IGNORE=	does not support FreeBSD version
 RUN_DEPENDS+=	sysrc:${PORTSDIR}/sysutils/sysrc
 .endif
 
+do-install:
+	@${ECHO} "Installing in ${CBSD_HOME}"
+	${MKDIR} ${STAGEDIR}${CBSD_HOME}
+	${CP} -R ${WRKSRC}/* ${STAGEDIR}${CBSD_HOME}
+	@${INSTALL_MAN} ${WRKSRC}/man/cbsd.8 ${STAGEDIR}${PREFIX}/man/man8/cbsd.8
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/cbsdsh/cbsd ${STAGEDIR}${PREFIX}/bin
+
 post-install:
+	${CAT} ${PKGDIR}/pkg-plist-chunk > ${TMPPLIST} ;
 	@${FIND} -s ${STAGEDIR}${CBSD_HOME} -not -type d | ${SORT} | \
 	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${CBSD_HOME} -type d | ${SORT} -r | \

Modified: head/sysutils/cbsd/distinfo
==============================================================================
--- head/sysutils/cbsd/distinfo	Sun Jul 13 11:27:44 2014	(r361671)
+++ head/sysutils/cbsd/distinfo	Sun Jul 13 11:38:47 2014	(r361672)
@@ -1,2 +1,2 @@
-SHA256 (cbsd-10.0.5.tar.gz) = d34b61ed9056ce8df6db6f283c6a78185f41ce25bde8d3f7321a12de9a041676
-SIZE (cbsd-10.0.5.tar.gz) = 358951
+SHA256 (cbsd-10.0.6.tar.gz) = 378a0f04abb562eb21b985034f4b74d0ff2e57161800b3c9e748e0ff4633736a
+SIZE (cbsd-10.0.6.tar.gz) = 383249

Modified: head/sysutils/cbsd/files/cbsdd.in
==============================================================================
--- head/sysutils/cbsd/files/cbsdd.in	Sun Jul 13 11:27:44 2014	(r361671)
+++ head/sysutils/cbsd/files/cbsdd.in	Sun Jul 13 11:38:47 2014	(r361672)
@@ -20,28 +20,28 @@ export NO_CBSD_HISTORY=yes
 globalconf=${cbsd_globalconf:-"${workdir}/cbsd.conf"}
 
 if [ ! -f ${globalconf} ]; then
-    echo "cbsd: no such ${globalconf}";
-    exit 1
+	echo "cbsd: no such ${globalconf}";
+	exit 1
 fi
 
 if [ ! -f ${inventory} ]; then
-    echo "cbsd: no such ${inventory}";
-    exit 1
+	echo "cbsd: no such ${inventory}";
+	exit 1
 fi
 
 if [ ! -f ${mdtools} ]; then
-    echo "cbsd: no such ${mdtools}";
-    exit 1
+	echo "cbsd: no such ${mdtools}";
+	exit 1
 fi
 
 if [ ! -f ${subr} ]; then
-    echo "cbsd: no such ${subr}";
-    exit 1
+	echo "cbsd: no such ${subr}";
+	exit 1
 fi
 
 if [ ! -f ${localcbsdconf} ]; then
-    echo "cbsd: no such ${localcbsdconf}";
-    exit 1
+	echo "cbsd: no such ${localcbsdconf}";
+	exit 1
 fi
 
 . ${globalconf}
@@ -53,25 +53,32 @@ fi
 
 start_precmd=${name}_prestart
 stop_precmd=${name}_prestop
+stop_cmd=${name}_stop
 
-command="${sbindir}/cbsdd"
+command="${toolsdir}/cbsdd"
 pidfile="/var/run/$name.pid"
+command_args="&"
 
 cbsdd_prestart() {
-    find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
-    %%PREFIX%%/bin/cbsd sysinv mode=update
-    %%PREFIX%%/bin/cbsd netinv
+	/usr/bin/find ${ftmpdir} -depth 1 -maxdepth 1 -type f -exec rm -f {} \;
+	%%PREFIX%%/bin/cbsd sysinv mode=update
+	%%PREFIX%%/bin/cbsd netinv
 
-    . ${inventory}
+	. ${inventory}
 
-    [ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
-    /usr/sbin/daemon ${rcddir}/jails-astart start
+	[ -n "$nat_enable" ] && %%PREFIX%%/bin/cbsd naton
+	/usr/sbin/daemon ${rcddir}/jails-astart start
 }
 
 cbsdd_prestop()
 {
-    ${rcddir}/jails-astart stop
-    [ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
+	${rcddir}/jails-astart stop
+	[ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff
+}
+
+cbsdd_stop()
+{
+	[ -f "${pidfile}" ] && kill -9 $( cat ${pidfile} )
 }
 
 run_rc_command "$1"

Added: head/sysutils/cbsd/pkg-plist-chunk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/cbsd/pkg-plist-chunk	Sun Jul 13 11:38:47 2014	(r361672)
@@ -0,0 +1,8 @@
+ at mode 500
+ at group cbsd
+ at owner cbsd
+bin/cbsd
+ at owner
+ at group
+ at mode
+man/man8/cbsd.8.gz