- Update to 0.8

PR:		ports/74795
Submitted by:	cperciva (maintainer)

4 files changed, 9 insertions, 23 deletions

diff --git a/sysutils/estctrl/Makefile b/sysutils/estctrl/Makefile
index 7efebce0ccdf..b43e0b980d6a 100644
--- a/sysutils/estctrl/Makefile
+++ b/sysutils/estctrl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	estctrl
-PORTVERSION=	0.7
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.daemonology.net/freebsd-est/
 
@@ -26,12 +25,6 @@ PLIST_FILES=	sbin/estctrl		\
 
 MAKE_ENV=	BINDIR=${PREFIX}/sbin
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500101
-EXTRA_PATCHES=	${FILESDIR}/estctrl.c.diff.fbsd4
-.endif
-
 post-extract:
 	${SED}	${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}	\
 		${FILESDIR}/estctrl.sh > ${WRKDIR}/estctrl.sh
@@ -40,4 +33,4 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/estctrl.sh ${PREFIX}/etc/rc.d/estctrl.sh
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/estctrl/distinfo b/sysutils/estctrl/distinfo
index 3a751b51c897..15ef999a53c9 100644
--- a/sysutils/estctrl/distinfo
+++ b/sysutils/estctrl/distinfo
@@ -1,2 +1,2 @@
-MD5 (estctrl-0.7.tar.gz) = 03dc1b69dd2ee37638eaba85d04655ba
-SIZE (estctrl-0.7.tar.gz) = 2547
+SIZE(estctrl-0.8.tar.gz) = 2991
+MD5 (estctrl-0.8.tar.gz) = d43ed67c75d2763b2ca93653ad4af7aa
diff --git a/sysutils/estctrl/files/estctrl.c.diff.fbsd4 b/sysutils/estctrl/files/estctrl.c.diff.fbsd4
deleted file mode 100644
index 68fbb8a5f2ee..000000000000
--- a/sysutils/estctrl/files/estctrl.c.diff.fbsd4
+++ /dev/null
@@ -1,11 +0,0 @@
---- estctrl.c.orig	Tue Oct 12 17:46:13 2004
-+++ estctrl.c	Tue Oct 12 17:46:21 2004
-@@ -28,7 +28,7 @@
-  */
- 
- #include <sys/types.h>
--#include <sys/resource.h>
-+#include <sys/dkstat.h>
- #include <sys/sysctl.h>
- 
- #include<err.h>
diff --git a/sysutils/estctrl/files/estctrl.sh b/sysutils/estctrl/files/estctrl.sh
index baeec68aac37..fefb794dbbbb 100644
--- a/sysutils/estctrl/files/estctrl.sh
+++ b/sysutils/estctrl/files/estctrl.sh
@@ -17,6 +17,7 @@
 estctrl_enable="NO"
 estctrl_speed_ac="adaptive"
 estctrl_speed_battery="adaptive"
+estctrl_speed_default="adaptive"
 
 . %%RC_SUBR%%
 
@@ -26,6 +27,9 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 command="%%PREFIX%%/sbin/estctrl"
-command_args="-a ${estctrl_speed_ac} -b ${estctrl_speed_battery} &"
+command_args="-a ${estctrl_speed_ac}"
+command_args="${command_args} -b ${estctrl_speed_battery}"
+command_args="${command_args} -d ${estctrl_speed_default}"
+command_args="${command_args &"
 
 run_rc_command "$1"