From 349b1be20b236da2936e7e4969b79f443b96a75e Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 22 Apr 2010 13:38:52 +0200
Subject: brltty, modif de Pkgfile, md5sum et service

---
 extra/brltty/.footprint  | 18 ++----------------
 extra/brltty/.md5sum     |  4 ++--
 extra/brltty/Pkgfile     | 13 ++-----------
 extra/brltty/brltty      |  8 ++------
 extra/brltty/brltty.conf |  2 +-
 5 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/extra/brltty/.footprint b/extra/brltty/.footprint
index cb432afac..aafef6700 100644
--- a/extra/brltty/.footprint
+++ b/extra/brltty/.footprint
@@ -203,22 +203,8 @@ drwxr-xr-x	root/root	etc/brltty/
 drwxr-xr-x	root/root	etc/conf.d/
 -rw-r--r--	root/root	etc/conf.d/brltty.conf
 drwxr-xr-x	root/root	etc/rc.d/
-drwxr-xr-x	root/root	etc/rc.d/init.d/
--rwxr-xr-x	root/root	etc/rc.d/init.d/brltty
-drwxr-xr-x	root/root	etc/rc.d/rc0.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc0.d/K99brltty -> ../init/brltty
-drwxr-xr-x	root/root	etc/rc.d/rc1.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc1.d/K99brltty -> ../init/brltty
-drwxr-xr-x	root/root	etc/rc.d/rc2.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc2.d/S10brltty -> ../init/brltty
-drwxr-xr-x	root/root	etc/rc.d/rc3.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc3.d/S10brltty -> ../init/brltty
-drwxr-xr-x	root/root	etc/rc.d/rc4.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc4.d/S10brltty -> ../init/brltty
-drwxr-xr-x	root/root	etc/rc.d/rc5.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc5.d/S10brltty -> ../init/brltty
-drwxr-xr-x	root/root	etc/rc.d/rc6.d/
-lrwxrwxrwx	root/root	etc/rc.d/rc6.d/K99brltty -> ../init/brltty
+drwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/
+-rwxr-xr-x	root/root	etc/rc.d/rcsysinit.d/S25brltty
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/brltty
diff --git a/extra/brltty/.md5sum b/extra/brltty/.md5sum
index 64b1084b0..08272f455 100644
--- a/extra/brltty/.md5sum
+++ b/extra/brltty/.md5sum
@@ -1,3 +1,3 @@
-50fddd14d745eb5a816591d4371a61b7  brltty
+fc0d288920d80e09e9a497076bbce18b  brltty
 b3b492240ba33fd3af45a181f5b89e7a  brltty-4.1.tar.gz
-a8ab8b3dd059e96e1734bc9cdcf844fc  brltty.conf
+f6a8781a7ded6b69b02cef5597357d9c  brltty.conf
diff --git a/extra/brltty/Pkgfile b/extra/brltty/Pkgfile
index 72827fb4a..5a211905b 100644
--- a/extra/brltty/Pkgfile
+++ b/extra/brltty/Pkgfile
@@ -23,19 +23,10 @@ build() {
               	--disable-caml-bindings
         make
         make INSTALL_ROOT=$PKG install
-	mkdir -p $PKG/etc/rc.d/init.d
-	install -D -m 755 $SRC/brltty $PKG/etc/rc.d/init.d/brltty
+	mkdir -p $PKG/etc/rc.d/rcsysinit.d
+	install -D -m 755 $SRC/brltty $PKG/etc/rc.d/rcsysinit.d/S25brltty
 	install -D -m 644 $SRC/brltty.conf $PKG/etc/conf.d/brltty.conf
 	install -D -m 644 Documents/brltty.conf $PKG/etc/brltty.conf
-	mkdir -p $PKG/etc/rc.d/rc{0,1,2,3,4,5,6}.d
-	for i in 2 3 4 5;
-	do 
-		ln -s ../init/$name $PKG/etc/rc.d/rc$i.d/S10$name
-	done
-	for i in 0 1 6;
-	do 
-		ln -s ../init/$name $PKG/etc/rc.d/rc$i.d/K99$name
-	done
 
 }
 
diff --git a/extra/brltty/brltty b/extra/brltty/brltty
index 1effd561c..ce2f5b6dc 100644
--- a/extra/brltty/brltty
+++ b/extra/brltty/brltty
@@ -3,17 +3,13 @@
 daemon_name=brltty
 
 . /etc/sysconfig/rc
-. $rc_functions
+. ${rc_functions}
 . /etc/conf.d/$daemon_name.conf
 
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
 case "$1" in
   start)
     boot_mesg "Starting $daemon_name daemon"
-    loadproc /usr/bin/$daemon_name;;
+    loadproc /usr/bin/$daemon_name $brltty_args;;
 
   stop)
     loadproc "Stopping $daemon_name daemon"
diff --git a/extra/brltty/brltty.conf b/extra/brltty/brltty.conf
index 94115e1d5..18df137b7 100644
--- a/extra/brltty/brltty.conf
+++ b/extra/brltty/brltty.conf
@@ -1,2 +1,2 @@
 # Specify any arguments to pass to brltty here.
-brltty_args=""
\ No newline at end of file
+brltty_args=" -B protocol=clio -t fr_FR.ttb -d /dev/ttyS0"
-- 
cgit v1.2.3-70-g09d2