# HG changeset patch
# User Dominique Corbex <domcox@users.sourceforge.net>
# Date 1245224984 -7200
# Node ID e5ab27ad8b9e89eff9bed70f19c872887a42791d
# Parent  3ae7a1c63bcd37de9c481237dfe939362dc47fa4
get-softmodem-driver: packages are now saved in tazwok packages_repository

diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/receipt
--- a/get-softmodem-driver/receipt	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/receipt	Wed Jun 17 09:49:44 2009 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="get-softmodem-driver"
-VERSION="0.7"
+VERSION="0.8"
 CATEGORY="non-free"
 SHORT_DESC="Get misc softmodem drivers."
 MAINTAINER="domcox@slitaz.org"
@@ -13,7 +13,7 @@
 {
 	mkdir -p $fs/usr/bin
 	cp stuff/$PACKAGE $fs/usr/bin
-	for i in hsfmodem hcfpcimodem martian; do
+	for i in hsfmodem hcfpcimodem martian slmodem; do
 		ln -s $PACKAGE $fs/usr/bin/get-$i-driver
 	done
 	mkdir -p $fs/usr/share/softmodem
diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/stuff/get-softmodem-driver
--- a/get-softmodem-driver/stuff/get-softmodem-driver	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/stuff/get-softmodem-driver	Wed Jun 17 09:49:44 2009 +0200
@@ -10,7 +10,7 @@
 echo "--------------------------------------------------------"
 echo "Due to a lack of compatible hardware for troubleshooting,"
 echo "this $PACKAGE package has not been tested."
-echo "Please report any bug to help us make a reliable package."
+echo "Please report any bug to SliTaz Labs or SliTaz Forum."
 echo "--------------------------------------------------------"
 sleep 1
 }
@@ -18,16 +18,16 @@
 case "$PACKAGE" in
 hsfmodem)
 	. /usr/share/softmodem/hsfmodem.receipt
-	echo "Support for the Conexant (formerly Rockwell) HSF Softmodem family." ;;
+	echo $SHORT_DESC;;
 hcfpcimodem)
 	. /usr/share/softmodem/hcfpcimodem.receipt
-	echo "Support for the Conexant HCF (controllerless) modem family." ;;
+	echo $SHORT_DESC;;
 martian)
 	. /usr/share/softmodem/martian.receipt
-	echo "Support for the Agere Systems PCI Modem built on DSP 164x (Mars) series." ;;
+	echo $SHORT_DESC;;
 slmodem)
 	. /usr/share/softmodem/slmodem.receipt
-	echo "Support for the SmartLink Softmodem" ;;
+	echo $SHORT_DESC;;
 *)
 	echo "Unknown modem driver. Please run one of the following commands:"
 	for i in $(cd $(dirname $0); ls get-*-driver); do
@@ -177,4 +177,9 @@
 tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
 
 # Clean
+if [ -e /etc/tazwok.conf ]; then
+	. /etc/tazwok.conf
+	mkdir -p $PACKAGES_REPOSITORY
+	cp -a $PACKAGE-$VERSION.tazpkg $PACKAGES_REPOSITORY
+fi
 rm -rf $taz
diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/stuff/hcfpcimodem.receipt
--- a/get-softmodem-driver/stuff/hcfpcimodem.receipt	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/stuff/hcfpcimodem.receipt	Wed Jun 17 09:49:44 2009 +0200
@@ -3,7 +3,7 @@
 PACKAGE="hcfpcimodem"
 VERSION="1.19full"
 CATEGORY="non-free"
-SHORT_DESC="Modem driver for Conexant HCF PCI chipsets."
+SHORT_DESC="Driver for the Conexant HCF (controllerless) Softmodem family."
 MAINTAINER="domcox@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 DEPENDS="module-init-tools linux-source"
@@ -16,3 +16,10 @@
 {
 	/usr/sbin/hcfpciconfig --auto
 }
+
+post_remove()
+{
+    echo -n "Removing modules.."
+    rm -rf /lib/modules/`uname -r`/extra/hcfpci*
+    status
+}
\ No newline at end of file
diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff
--- a/get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/stuff/hsfmodem-7.80.02.04full.diff	Wed Jun 17 09:49:44 2009 +0200
@@ -159,3 +159,12 @@
  	shift
  fi
 
+@@ -3033,0 +3027,0 @@
+
+ if ${do_cfgnewinstance}; then
+  if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then
+-		mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
++		mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $?
+ 		# The purpose of --info here is to ensure module reload:
+ 		(sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) </dev/null >/dev/null 2>&1 &
+ 	fi
diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/stuff/hsfmodem.receipt
--- a/get-softmodem-driver/stuff/hsfmodem.receipt	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/stuff/hsfmodem.receipt	Wed Jun 17 09:49:44 2009 +0200
@@ -3,7 +3,7 @@
 PACKAGE="hsfmodem"
 VERSION="7.80.02.04full"
 CATEGORY="non-free"
-SHORT_DESC="Modem driver for Conexant HSF chipsets."
+SHORT_DESC="Driver for the Conexant (formerly Rockwell) HSF Softmodem family."
 MAINTAINER="domcox@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 DEPENDS="module-init-tools linux-source"
@@ -16,3 +16,10 @@
 {
 	/usr/sbin/hsfconfig --auto
 }
+
+post_remove()
+{
+	echo -n "Removing modules.."
+	rm -rf /lib/modules/`uname -r`/extra/hsf*
+	status
+}
\ No newline at end of file
diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/stuff/martian.init
--- a/get-softmodem-driver/stuff/martian.init	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/stuff/martian.init	Wed Jun 17 09:49:44 2009 +0200
@@ -13,8 +13,9 @@
 DAEMON=/usr/sbin/martian_modem
 OPTIONS="--daemon $MARTIAN_OPTIONS /dev/ttySM0"
 PIDFILE=/var/run/martian.pid
+MODULE="martian_dev"
 
-if [ `/sbin/lsmod | grep -c martian_dev}` -lt "1" ]; then
+if [ `/sbin/lsmod | grep -c ${MODULE}` -lt "1" ]; then
 	echo "kernel module is not loaded!"
 	exit 1
 fi
diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/stuff/martian.receipt
--- a/get-softmodem-driver/stuff/martian.receipt	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/stuff/martian.receipt	Wed Jun 17 09:49:44 2009 +0200
@@ -3,7 +3,7 @@
 PACKAGE="martian"
 VERSION="full-20080617"
 CATEGORY="non-free"
-SHORT_DESC="Modem driver for Agere Systems PCI WinModem."
+SHORT_DESC="Driver for the Agere Systems PCI Modem built on DSP 164x (Mars) series."
 MAINTAINER="domcox@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 DEPENDS="module-init-tools linux-source"
diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/stuff/slmodem.init
--- a/get-softmodem-driver/stuff/slmodem.init	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/stuff/slmodem.init	Wed Jun 17 09:49:44 2009 +0200
@@ -11,10 +11,11 @@
 NAME=Smartlink modem
 DESC="Smart Link Modem deamon"
 DAEMON=/usr/sbin/slmodemd
-OPTIONS=""
+OPTIONS=$SLMODEM_OPTIONS
 PIDFILE=/var/run/slmodemd.pid
+MODULE="slamr"
 
-if [ `/sbin/lsmod | grep -c martian_dev}` -lt "1" ]; then
+if [ `/sbin/lsmod | grep -c ${MODULE}` -lt "1" ]; then
 	echo "kernel module is not loaded!"
 	exit 1
 fi
diff -r 3ae7a1c63bcd -r e5ab27ad8b9e get-softmodem-driver/stuff/slmodem.receipt
--- a/get-softmodem-driver/stuff/slmodem.receipt	Tue Jun 16 23:46:38 2009 +0000
+++ b/get-softmodem-driver/stuff/slmodem.receipt	Wed Jun 17 09:49:44 2009 +0200
@@ -3,7 +3,7 @@
 PACKAGE="slmodem"
 VERSION="2.9.11-20090222"
 CATEGORY="non-free"
-SHORT_DESC="Modem driver for Smartlink Modem."
+SHORT_DESC="Support for the SmartLink Softmodem and ALSA supported chipsets."
 MAINTAINER="domcox@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 DEPENDS="module-init-tools linux-source"