- Update to 1.26.b5

- Describe atop rc script variables
- Fix install message
- Fix rc script regression caused by last commit (atop_pid escaping)

PR:		ports/158659
Submitted by:	Alex Samorukov <samm at os2.kiev.ua> (maintainer)

4 files changed, 19 insertions, 7 deletions

diff --git a/sysutils/atop/Makefile b/sysutils/atop/Makefile
index 10ed6863fc53..65c9f97c7c77 100644
--- a/sysutils/atop/Makefile
+++ b/sysutils/atop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	atop
-PORTVERSION=	1.26.b4
-PORTREVISION=	1
+PORTVERSION=	1.26.b5
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=atop-freebsd
diff --git a/sysutils/atop/distinfo b/sysutils/atop/distinfo
index d898d029e4fb..52d49d289cf0 100644
--- a/sysutils/atop/distinfo
+++ b/sysutils/atop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (atop-1.26.fbsd.beta4.tar.bz2) = 1ac8ebc8ed47c2789f2eb22b4a84e3b2e624b6c55cc6c827026e3821e861fbb0
-SIZE (atop-1.26.fbsd.beta4.tar.bz2) = 130254
+SHA256 (atop-1.26.fbsd.beta5.tar.bz2) = 7c28d0ebe4473c0041c8a392ee91e1869853674b3577a4287a3d32f759aeac65
+SIZE (atop-1.26.fbsd.beta5.tar.bz2) = 130289
diff --git a/sysutils/atop/files/atop.in b/sysutils/atop/files/atop.in
index 3b7aeca851ba..0b0e872b8492 100644
--- a/sysutils/atop/files/atop.in
+++ b/sysutils/atop/files/atop.in
@@ -11,6 +11,20 @@
 #       /etc/rc.conf.local
 #       /etc/rc.conf.d/atop
 #
+# Add the following lines to /etc/rc.conf to enable atop in daemon mode:
+# atop_enable (bool):         Set to "NO" by default.
+#                             Set it to "YES" to enable atop in daemon mode
+# atop_interval (str):        Set to 10 by default
+#                             Interval for data capture.
+# atop_logdir (str):          Set to "%%LOGDIR%%".
+#                             Directory to store atop binary logs
+# atop_keepdays (str):        Set to 30 by default.
+#                             Number of days to keep the logs when "rotate"
+#                             command is running.
+# atop_flags (str):           Set to "" by default.
+#                             Extra flags passed to start command.
+#
+#
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 
 . /etc/rc.subr
@@ -25,7 +39,7 @@ load_rc_config $name
 : ${atop_interval=10}
 : ${atop_keepdays=30}
 
-pidfile="${atop_pidfile:-'/var/run/atop.pid'}"
+pidfile=${atop_pidfile:-'/var/run/atop.pid'}
 
 command="%%PREFIX%%/bin/atop"
 extra_commands="rotate"
@@ -45,7 +59,6 @@ atop_start()
 
 atop_rotate()
 {
-    
     echo "Rotating logfile (${name})."
     # write final sample and stop
     sig_stop=SIGUSR2
diff --git a/sysutils/atop/files/pkg-message.in b/sysutils/atop/files/pkg-message.in
index fc098e7495e4..a81833321777 100644
--- a/sysutils/atop/files/pkg-message.in
+++ b/sysutils/atop/files/pkg-message.in
@@ -10,7 +10,7 @@ in your /etc/rc.conf.
 
 You will also need to add "rotate" command to the system crontab:
 
-0 0 * * *		%%PREFIX%%/etc/rc.d/atop rotate
+0 0 * * *		%%PREFIX%%/etc/rc.d/atop rotate >dev/null
 
 To change number of days to keep the logs (default - 30) use atop_keepdays
 variable in your /etc/rc.conf file.