Updated version to 3.0.2.

Also tidy up the initscript to use --make-pidfile and drop in
an /etc/conf.d/apmd file.

6 files changed, 7 insertions, 52 deletions

diff --git a/sys-apps/apmd/files/apmd.confd b/sys-apps/apmd/files/apmd.confd
new file mode 100644
index 000000000000..47b287757ef6
--- /dev/null
+++ b/sys-apps/apmd/files/apmd.confd
@@ -0,0 +1,3 @@
+# Config file for /etc/init.d/apmd
+
+#APMD_OPTS="-P /etc/apm/apmd_proxy"
diff --git a/sys-apps/apmd/files/apmd.rc5 b/sys-apps/apmd/files/apmd.rc5
deleted file mode 100644
index 2f9722a8cc0e..000000000000
--- a/sys-apps/apmd/files/apmd.rc5
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:60:This line is required for script management
-
-# Based on apmd.init by Dirk Eddelbuettel <edd@debian.org> and
-# Avery Pennarun <apenwarr@debian.org>
-# Rewritten for gentoo by Craig Joly <joly@ee.ualberta.ca>
-
-. /etc/rc.d/config/functions
-
-SERVICE="apmd"
-opts="start stop restart"
-
-PIDFILE=/var/run/apmd.pid
-EXEC=/usr/sbin/apmd
-
-# apmd arguments variable.  See the manual page apmd(8) for details.
-APMD=""
-
-check_kernel() {
-	if [ ! -e /proc/apm ]
-	then
-		eerror "APM support has not been compiled into the kernel."
-		exit 1
-	fi
-}
-
-start() {
-	check_kernel
-
-	ebegin "Starting $SERVICE"
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec \
-		$EXEC -- -P /etc/apm/apmd_proxy $APMD
-	eend $? "Started $SERVICE." "Error starting $SERVICE."
-}
-
-stop() {
-	ebegin "Stopping $SERVICE"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXEC
-	eend $? "Stopped $SERVICE." "Error stopping $SERVICE."
-}
-
-restart() {
-	stop
-	start
-}
-
-doservice ${@}
-
diff --git a/sys-apps/apmd/files/apmd.rc6 b/sys-apps/apmd/files/apmd.rc6
index df52e33b5942..8fdd56fdd043 100644
--- a/sys-apps/apmd/files/apmd.rc6
+++ b/sys-apps/apmd/files/apmd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/files/apmd.rc6,v 1.2 2001/12/06 20:17:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/files/apmd.rc6,v 1.3 2002/02/01 01:09:41 woodchip Exp $
 
 depend() {
 	need localmount
@@ -17,7 +17,8 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting apmd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/apmd -- -P /etc/apm/apmd_proxy
+	start-stop-daemon --start --quiet --exec /usr/sbin/apmd \
+		--make-pidfile --pidfile /var/run/apmd.pid -- ${APMD_OPTS}
 	eend $?
 }
 
diff --git a/sys-apps/apmd/files/digest-apmd-3.0.1-r1 b/sys-apps/apmd/files/digest-apmd-3.0.1-r1
deleted file mode 100644
index 17c6cab1af0b..000000000000
--- a/sys-apps/apmd/files/digest-apmd-3.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf3fb2c7165bfa5c963b38fa150527d3 apmd_3.0.1-1.tar.gz 163287
diff --git a/sys-apps/apmd/files/digest-apmd-3.0.1-r6 b/sys-apps/apmd/files/digest-apmd-3.0.1-r6
deleted file mode 100644
index 17c6cab1af0b..000000000000
--- a/sys-apps/apmd/files/digest-apmd-3.0.1-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf3fb2c7165bfa5c963b38fa150527d3 apmd_3.0.1-1.tar.gz 163287
diff --git a/sys-apps/apmd/files/digest-apmd-3.0.2 b/sys-apps/apmd/files/digest-apmd-3.0.2
new file mode 100644
index 000000000000..9a9bc483e68a
--- /dev/null
+++ b/sys-apps/apmd/files/digest-apmd-3.0.2
@@ -0,0 +1 @@
+MD5 23ce275766441c59b6b47c002f9098eb apmd-3.0.2.tar.gz 80489