5 files changed, 14 insertions, 35 deletions

diff --git a/sysutils/ataidle/Makefile b/sysutils/ataidle/Makefile
index d0517e1fe79e..778579c08956 100644
--- a/sysutils/ataidle/Makefile
+++ b/sysutils/ataidle/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ataidle
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cran.org.uk/bruce/software/
 
@@ -26,7 +26,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/sysutils/ataidle/distinfo b/sysutils/ataidle/distinfo
index a8fd7c02e658..a77ee765ff34 100644
--- a/sysutils/ataidle/distinfo
+++ b/sysutils/ataidle/distinfo
@@ -1,3 +1,2 @@
-MD5 (ataidle-2.4.tar.gz) = 3ee04fd939d134c8ab0e72b8848722d4
-SHA256 (ataidle-2.4.tar.gz) = 58c651eeea1fd9053fefcca5ebef53ddb4af7ad72f68873ca012d033e71fef48
-SIZE (ataidle-2.4.tar.gz) = 11863
+SHA256 (ataidle-2.5.tar.gz) = 7d1803687041a97b26f1a2a5724813e0dd238c2b2594f52be76623822bca447a
+SIZE (ataidle-2.5.tar.gz) = 18985
diff --git a/sysutils/ataidle/files/ataidle.in b/sysutils/ataidle/files/ataidle.in
index 338b499d5e66..6218806b024e 100644
--- a/sysutils/ataidle/files/ataidle.in
+++ b/sysutils/ataidle/files/ataidle.in
@@ -9,18 +9,15 @@
 # ataidle_enable (bool): set to NO by default.
 #         Set to YES to enable ataidle.
 # ataidle_devices: list of devices on which to run ataidle
-# ataidle_adX: parameters to pass to ataidle(8)
+# ataidle_adaX: parameters to pass to ataidle(8)
 
 # Example:
-# Put the disks ad0, ad1 and ad2 into Idle mode after 60
-# minutes and Standby mode after 120 minutes. Also, set the
-# AAM and APM values to their maximum so the drives run at
-# their maximum performance.
+# Put the disks ada0, ada1 and ada2 into Standby mode after 60 minutes:
 #
-# ataidle_devices="ad0 ad1 ad2"
-# ataidle_ad0="-I 60 -S 120 -A 127 -P 254"
-# ataidle_ad1="-I 60 -S 120 -A 127 -P 254"
-# ataidle_ad2="-I 60 -S 120 -A 127 -P 254"
+# ataidle_devices="ada0 ada1 ada2"
+# ataidle_ada0="-S 60"
+# ataidle_ada1="-S 60"
+# ataidle_ada2="-S 60"
 #
 
 . /etc/rc.subr
@@ -28,8 +25,8 @@
 name="ataidle"
 rcvar=${name}_enable
 
-command="%%PREFIX%%/sbin/${name}"
-start_cmd="ataidle_start"
+command=%%PREFIX%%/sbin/${name}
+start_cmd=ataidle_start
 
 load_rc_config $name
 
@@ -45,7 +42,7 @@ ataidle_start()
 	if [ -n "${ataidle_devices}" ]; then
 		for i in ${ataidle_devices}; do
 			eval ataidle_args=\$ataidle_${i}
-			echo "ATAidle: configuring device /dev/${i}"
+			echo "ataidle: configuring device /dev/${i}"
 			${command} ${ataidle_args} /dev/${i}
 		done
 	fi
diff --git a/sysutils/ataidle/pkg-descr b/sysutils/ataidle/pkg-descr
index bbce4814dbc9..b6bd21a64d90 100644
--- a/sysutils/ataidle/pkg-descr
+++ b/sysutils/ataidle/pkg-descr
@@ -1,6 +1,6 @@
 ATAidle is a utility to set the power management features
-of ata hard drives.  This includes idle and standby timeouts,
-APM and acoustic level settings, and it can show details about
+of ata hard drives.  This includes standby timeouts, power (APM) 
+and acoustic (AAM) level settings, and it can show details about
 the installed devices.
 
 Author:	Bruce Cran <bruce@cran.org.uk>
diff --git a/sysutils/ataidle/pkg-message b/sysutils/ataidle/pkg-message
deleted file mode 100644
index 87f090d05124..000000000000
--- a/sysutils/ataidle/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-Note: ataidle options and rc startup settings
-      have changed in version 2.
-
-Add the following lines to /etc/rc.conf to enable ataidle:
-
-ataidle_enable (bool): set to NO by default.
-         Set to YES to enable ataidle.
-ataidle_devices: list of devices on which to run ataidle
-ataidle_adX: parameters to pass to ataidle(8)
-
-Example:
-ataidle_enable="YES"
-ataidle_devices="ad0"
-ataidle_ad0="-I 60 -S 120 -A 127 -P 254"