Fixes as per bug #58222 (missing README.1ST and bug #47947 (virtual/os-headers dependancy, init.d script improvements)

2 files changed, 15 insertions, 2 deletions

diff --git a/net-dialup/slmodem/files/slmodem-2.9.conf b/net-dialup/slmodem/files/slmodem-2.9.conf
index 659e8748cbd9..0fb40baca7a8 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.conf
+++ b/net-dialup/slmodem/files/slmodem-2.9.conf
@@ -1,13 +1,22 @@
 # Config file for /etc/init.d/slmodemd
 
+# The following sets the ALSA init script to
+# be a dependancy of the slmodem one. It does not
+# provide ALSA support.
+ALSA=no
+
 MODULE=slamr
 # or MODULE=slusb
 
 # Raise priority to reduce modem dropouts
 NICE=-6
 
+# for ALSA users, use the following:
+# DEV=/dev/ttySL0
+# else:
+# DEV=/dev/slamr0
+# DEV=/dev/slusb0
 
-DEV=/dev/slamr0
 LN_DEV=/dev/modem
 #MODEM_DAEMON=/usr/sbin/slmodemd
 COUNTRY=THAILAND
diff --git a/net-dialup/slmodem/files/slmodem-2.9.init b/net-dialup/slmodem/files/slmodem-2.9.init
index 97f3283a6a37..ef7604f38a91 100644
--- a/net-dialup/slmodem/files/slmodem-2.9.init
+++ b/net-dialup/slmodem/files/slmodem-2.9.init
@@ -1,10 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.5 2004/07/14 23:10:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/slmodem/files/slmodem-2.9.init,v 1.6 2004/07/25 00:04:48 dragonheart Exp $
 
 depend() {
 	need logger
+	if [ "${ALSA}" = "yes" ]
+	then
+		need alsa-sound
+	fi
 }