Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD

1 files changed, 57 insertions, 57 deletions

diff --git a/abs/extra-testing/lm_sensors/sensors-detect.patch b/abs/extra-testing/lm_sensors/sensors-detect.patch
index 981ed3d..1d12a2c 100644
--- a/abs/extra-testing/lm_sensors/sensors-detect.patch
+++ b/abs/extra-testing/lm_sensors/sensors-detect.patch
@@ -1,61 +1,61 @@
---- prog/detect/sensors-detect.orig	2008-02-07 20:59:25.125302226 +0100
-+++ prog/detect/sensors-detect	2008-02-07 21:06:53.821929489 +0100
-@@ -5879,21 +5879,21 @@
-     }
-   }
+diff -Naur lm_sensors-3.1.0/prog/detect/sensors-detect lm_sensors-3.1.0-new/prog/detect/sensors-detect
+--- lm_sensors-3.1.0/prog/detect/sensors-detect	2009-03-03 20:36:33.000000000 -0500
++++ lm_sensors-3.1.0-new/prog/detect/sensors-detect	2009-03-03 20:52:06.000000000 -0500
+@@ -5282,21 +5282,21 @@
+ 		}
+ 	}
  
--  my $have_sysconfig = -d '/etc/sysconfig';
--  printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
--         (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
-+  my $have_sysconfig = -d '/etc/conf.d';
-+  printf "Do you want to \%s /etc/conf.d/lm_sensors? (\%s): ",
-+         (-e '/etc/conf.d/lm_sensors' ? 'overwrite' : 'generate'),
-          ($have_sysconfig ? 'YES/no' : 'yes/NO');
-   $_ = <STDIN>;
-   if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
-     unless ($have_sysconfig) {
--      mkdir '/etc/sysconfig', 0777
--        or die "Sorry, can't create /etc/sysconfig ($!)";
-+      mkdir '/etc/conf.d', 0777
-+        or die "Sorry, can't create /etc/conf.d ($!)";
-     }
--    open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
--      or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
-+    open(local *SYSCONFIG, ">/etc/conf.d/lm_sensors")
-+      or die "Sorry, can't create /etc/conf.d/lm_sensors ($!)";
-     print SYSCONFIG <<'EOT';
--#    /etc/sysconfig/lm_sensors - Defines modules loaded by
--#                                /etc/init.d/lm_sensors
-+#    /etc/conf.d/lm_sensors - Defines modules loaded by
-+#                                /etc/rc.d/sensors
- #    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>
+-	my $have_sysconfig = -d '/etc/sysconfig';
+-	printf "Do you want to \%s /etc/sysconfig/lm_sensors? (\%s): ",
+-	       (-e '/etc/sysconfig/lm_sensors' ? 'overwrite' : 'generate'),
++	my $have_sysconfig = -d '/etc/conf.d';
++	printf "Do you want to \%s /etc/conf.d/lm_sensors? (\%s): ",
++	       (-e '/etc/conf.d/lm_sensors' ? 'overwrite' : 'generate'),
+ 	       ($have_sysconfig ? 'YES/no' : 'yes/NO');
+ 	$_ = <STDIN>;
+ 	if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
+ 		unless ($have_sysconfig) {
+-			mkdir('/etc/sysconfig', 0777)
+-				or die "Sorry, can't create /etc/sysconfig ($!)";
++			mkdir('/etc/conf.d', 0777)
++				or die "Sorry, can't create /etc/conf.d ($!)";
+ 		}
+-		open(local *SYSCONFIG, ">/etc/sysconfig/lm_sensors")
+-			or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)";
++		open(local *SYSCONFIG, ">/etc/conf.d/lm_sensors")
++			or die "Sorry, can't create /etc/conf.d/lm_sensors ($!)";
+ 		print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n";
+ 		print SYSCONFIG <<'EOT';
+-# This file is sourced by /etc/init.d/lm_sensors and defines the modules to
++# This file is sourced by /etc/rc.d/lm_sensors and defines the modules to
+ # be loaded/unloaded.
  #
- #    This program is free software; you can redistribute it and/or modify
-@@ -5914,8 +5914,8 @@
- # See also the lm_sensors homepage at:
- #     http://www.lm-sensors.org/
- #
--# This file is used by /etc/init.d/lm_sensors and defines the modules to
--# be loaded/unloaded. This file is sourced into /etc/init.d/lm_sensors.
-+# This file is used by /etc/rc.d/sensors and defines the modules to
-+# be loaded/unloaded. This file is sourced into /etc/rc.d/sensors.
- #
- # The format of this file is a shell script that simply defines the modules
- # in order as normal variables with the special names:
-@@ -5952,12 +5952,12 @@
-     print SYSCONFIG $sysconfig;
-     close(SYSCONFIG);
+ # The format of this file is a shell script that simply defines variables:
+@@ -5322,13 +5322,13 @@
+ 		}
+ 		close(SYSCONFIG);
+ 
+-		print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
++		print "Copy prog/init/lm_sensors.init to /etc/rc.d/lm_sensors\n".
+ 		      "for initialization at boot time.\n"
+-			unless -f "/etc/init.d/lm_sensors";
++			unless -f "/etc/rc.d/lm_sensors";
  
--    print "Copy prog/init/lm_sensors.init to /etc/init.d/lm_sensors\n".
-+    print "Copy prog/init/lm_sensors.init to /etc/rc.d/sensors\n".
-           "for initialization at boot time.\n"
--      unless -f "/etc/init.d/lm_sensors";
-+      unless -f "/etc/rc.d/sensors";
+-		if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
+-			system("/sbin/insserv", "/etc/init.d/lm_sensors");
+-		} elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
++		if (-x "/sbin/insserv" && -f "/etc/rc.d/lm_sensors") {
++			system("/sbin/insserv", "/etc/rc.d/lm_sensors");
++		} elsif (-x "/sbin/chkconfig" && -f "/etc/rc.d/lm_sensors") {
+ 			system("/sbin/chkconfig", "lm_sensors", "on");
+ 			if (-x "/sbin/service") {
+ 				system("/sbin/service", "lm_sensors", "start");
+@@ -5377,7 +5377,7 @@
+ 		exit -1;
+ 	}
  
--    if (-x "/sbin/insserv" && -f "/etc/init.d/lm_sensors") {
--      system("/sbin/insserv", "/etc/init.d/lm_sensors");
-+    if (-x "/sbin/insserv" && -f "/etc/rc.d/sensors") {
-+      system("/sbin/insserv", "/etc/rc.d/sensors");
-     } elsif (-x "/sbin/chkconfig" && -f "/etc/init.d/lm_sensors") {
-       system("/sbin/chkconfig", "lm_sensors", "on");
-       if (-x "/sbin/service") {
+-	if (-x "/sbin/service" && -f "/etc/init.d/lm_sensors" &&
++	if (-x "/sbin/service" && -f "/etc/rc.d/sensors" &&
+ 	    -f "/var/lock/subsys/lm_sensors") {
+ 		system("/sbin/service", "lm_sensors", "stop");
+ 	}