8 files changed, 60 insertions, 81 deletions

diff --git a/sysutils/lcdproc/files/LCDd.in b/sysutils/lcdproc/files/LCDd.in
new file mode 100644
index 000000000000..cc325a0c612b
--- /dev/null
+++ b/sysutils/lcdproc/files/LCDd.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: LCDd
+# REQUIRE: DAEMON
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# SET THEM IN THE /etc/rc.conf FILE
+#
+
+. %%RC_SUBR%%
+
+name="LCDd"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${LCDd_enable="NO"}
+: ${LCDd_conf="%%PREFIX%%/etc/LCDd.conf"}
+: ${LCDd_flags="-c ${LCDd_conf}"}
+
+required_files=${LCDd_conf}
+command="%%PREFIX%%/sbin/LCDd"
+
+run_rc_command "$1"
diff --git a/sysutils/lcdproc/files/LCDd.sh.sample b/sysutils/lcdproc/files/LCDd.sh.sample
deleted file mode 100644
index 553311d6e149..000000000000
--- a/sysutils/lcdproc/files/LCDd.sh.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-	start)		
-		%%PREFIX%%/sbin/LCDd -c %%PREFIX%%/etc/LCDd.conf &
-		echo -n " LCDd"
-		;;
-	stop)
-		killall LCDd
-		echo -n " LDCd"
-		;;
-	*)
-		echo ""
-		echo "Usage: `basename $0` { start | stop }"
-		echo ""
-		exit 64
-		;;
-esac
diff --git a/sysutils/lcdproc/files/lcdproc.in b/sysutils/lcdproc/files/lcdproc.in
new file mode 100644
index 000000000000..994a5c08b288
--- /dev/null
+++ b/sysutils/lcdproc/files/lcdproc.in
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: lcdproc
+# REQUIRE: LCDd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# SET THEM IN THE /etc/rc.conf FILE
+#
+
+. %%RC_SUBR%%
+
+name="lcdproc"
+rcvar=${name}_enable
+
+load_rc_config $name
+
+: ${lcdproc_enable="NO"}
+: ${lcdproc_flags="-d C S M U"}
+
+command="%%PREFIX%%/bin/lcdproc"
+
+run_rc_command "$1"
diff --git a/sysutils/lcdproc/files/patch-chrono.c b/sysutils/lcdproc/files/patch-chrono.c
deleted file mode 100644
index 0ec02a463b4e..000000000000
--- a/sysutils/lcdproc/files/patch-chrono.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- clients/lcdproc/chrono.c.orig	Tue Jan 18 19:57:44 2005
-+++ clients/lcdproc/chrono.c	Tue Jan 18 19:59:30 2005
-@@ -62,6 +62,8 @@
- #include <sys/dkstat.h>
- #endif
- 
-+#include <sys/resource.h>
-+
- #if FREEBSD
- /* definitions for indices in the nlist array */
- /* from /usr/src/src.bin/top/machine.c */
diff --git a/sysutils/lcdproc/files/patch-configure b/sysutils/lcdproc/files/patch-configure
deleted file mode 100644
index fd73d1718646..000000000000
--- a/sysutils/lcdproc/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Tue Jan 18 19:53:03 2005
-+++ configure	Tue Jan 18 19:56:32 2005
-@@ -891,7 +891,7 @@
- if test $debug = "yes"; then
- 	CFLAGS="-g -O"
- else
--	CFLAGS="-O3"
-+	# no default, left for line numbers
- fi
- CFLAGS="-Wall $CFLAGS"
- export CFLAGS
-@@ -1847,7 +1847,7 @@
- fi
- 
- 
--for ac_hdr in sched.h sys/sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h
-+for ac_hdr in sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/sysutils/lcdproc/files/patch-cpu.c b/sysutils/lcdproc/files/patch-cpu.c
deleted file mode 100644
index e9da8cbc3938..000000000000
--- a/sysutils/lcdproc/files/patch-cpu.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- clients/lcdproc/cpu.c.orig	Tue Jan 18 19:58:47 2005
-+++ clients/lcdproc/cpu.c	Tue Jan 18 19:59:52 2005
-@@ -60,6 +60,9 @@
- #include <sys/dkstat.h>
- #endif
- 
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+
- #if FREEBSD
- /* definitions for indices in the nlist array */
- /* from /usr/src/src.bin/top/machine.c */
diff --git a/sysutils/lcdproc/files/patch-port.h b/sysutils/lcdproc/files/patch-port.h
deleted file mode 100644
index 6d90480b6171..000000000000
--- a/sysutils/lcdproc/files/patch-port.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- server/drivers/port.h.orig	Tue Jan 18 20:04:12 2005
-+++ server/drivers/port.h	Tue Jan 18 20:04:29 2005
-@@ -64,7 +64,7 @@
- 
- // Write a byte 'val' to port
- static inline void port_out (unsigned short int port, unsigned char val) {
--	outb(val, port);
-+#	outb(val, port);
- }
- 
- // Get access to a specific port
-@@ -91,7 +91,7 @@
- 
- // Write a byte 'val' to port
- static inline void port_out (unsigned short int port, unsigned char val) {
--	outb(port, val);
-+#	outb(port, val);
- }
- 
- static inline void setaccess(u_long * map, u_int bit, int allow) {
diff --git a/sysutils/lcdproc/files/patch-server__drivers__ms6931.c b/sysutils/lcdproc/files/patch-server__drivers__ms6931.c
new file mode 100644
index 000000000000..26f0b214d538
--- /dev/null
+++ b/sysutils/lcdproc/files/patch-server__drivers__ms6931.c
@@ -0,0 +1,10 @@
+--- ./server/drivers/ms6931.c.orig	Wed May  3 15:54:21 2006
++++ ./server/drivers/ms6931.c	Wed May  3 15:54:32 2006
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <syslog.h>
++#include <sys/time.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"