[arch-commits] Commit in laptop-mode-tools/repos (3 files)

Wed Apr 23 04:19:04 UTC 2008

Date: Wednesday, April 23, 2008 @ 00:19:04
  Author: aaron
Revision: 804

Merged revisions 2-803 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/laptop-mode-tools/trunk

........
  r356 | aaron | 2008-04-18 17:56:27 -0500 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r802 | aaron | 2008-04-22 23:18:07 -0500 (Tue, 22 Apr 2008) | 1 line
  
  upgpkg: laptop-mode-tools 1.41-1
........

Modified:
  laptop-mode-tools/repos/extra-x86_64/	(properties)
  laptop-mode-tools/repos/extra-x86_64/PKGBUILD
  laptop-mode-tools/repos/extra-x86_64/laptop-mode

-------------+
 PKGBUILD    |   83 +++++++++++++++++++++++++++++++++++++++-------------------
 laptop-mode |   20 ++++++++++---
 2 files changed, 71 insertions(+), 32 deletions(-)


Property changes on: laptop-mode-tools/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /laptop-mode-tools/trunk:1
   + /laptop-mode-tools/trunk:1-803

Modified: extra-x86_64/PKGBUILD
===================================================================

--- extra-x86_64/PKGBUILD	2008-04-23 04:18:24 UTC (rev 803)
+++ extra-x86_64/PKGBUILD	2008-04-23 04:19:04 UTC (rev 804)
@@ -3,45 +3,74 @@
 # Contributor: Christopher "nuopus" Cox <nuopus at gmail.com>
 
 pkgname=laptop-mode-tools
-pkgver=1.35
-pkgrel=2
+pkgver=1.41
+pkgrel=1
 pkgdesc="Laptop mode is a kernel mode that allows you to extend the battery life of your laptop"
 arch=(i686 x86_64)
 url="http://www.samwel.tk/laptop_mode/"
 depends=(bash hdparm)
 license=('GPL')
-source=(http://www.samwel.tk/laptop_mode/tools/downloads/laptop-mode-tools_${pkgver}.tar.gz \
-    laptop-mode)
-backup=(etc/laptop-mode/laptop-mode.conf)
-md5sums=('e89dd846e4e88d117fc666842c109221' 'f4c7c6f5541d8e1f896b9ee3f1d65cbb')
+source=(http://www.samwel.tk/laptop_mode/tools/downloads/${pkgname}_${pkgver}.tar.gz \
+laptop-mode)
+#Out of hand? Nah!
+backup=(etc/laptop-mode/conf.d/ac97-powersave.conf
+        etc/laptop-mode/conf.d/auto-hibernate.conf
+        etc/laptop-mode/conf.d/configuration-file-control.conf
+        etc/laptop-mode/conf.d/cpufreq.conf
+        etc/laptop-mode/conf.d/dpms-standby.conf
+        etc/laptop-mode/conf.d/lcd-brightness.conf
+        etc/laptop-mode/conf.d/start-stop-programs.conf
+        etc/laptop-mode/conf.d/terminal-blanking.conf
+        etc/laptop-mode/conf.d/wireless-ipw-power.conf
+        etc/laptop-mode/conf.d/wireless-iwl-power.conf
+        etc/laptop-mode/laptop-mode.conf
+        etc/laptop-mode/lm-profiler.conf)
+md5sums=('b94da139712795910b3dd1783da32459'
+         '241a0e07fc3b340b3381bcde8a74b71d')
 
+#laptop-mode-tools has one of the worst install scripts ever... manual here
 build()
 {
-  cd $startdir/src/$pkgname-$pkgver
+    cd $startdir/src/${pkgname}_${pkgver}
 
-  cp -ra usr $startdir/pkg/
-  cp -ra etc $startdir/pkg/
-  mkdir -p $startdir/pkg/usr/man
-  cp -ra man $startdir/pkg/usr/man/man8
+    #state dir
+    mkdir -p $startdir/pkg/var/run/laptop-mode-tools/
 
-  rm -r $startdir/pkg/etc/init.d
+    #binaries
+    mkdir -p $startdir/pkg/usr/sbin/
+    install -m700 usr/sbin/* $startdir/pkg/usr/sbin/
 
-  mkdir -p $startdir/pkg/etc/rc.d
-  install -m755 $startdir/src/laptop-mode $startdir/pkg/etc/rc.d/
+    #config files
+    mkdir -p $startdir/pkg/etc/laptop-mode/conf.d
+    install -D -m644 etc/laptop-mode/laptop-mode.conf $startdir/pkg/etc/laptop-mode/
+    install -D -m600 etc/laptop-mode/lm-profiler.conf $startdir/pkg/etc/laptop-mode/
+    install -m600 etc/laptop-mode/conf.d/* $startdir/pkg/etc/laptop-mode/conf.d/
 
-  # Bug 5065 : Bad directory permissions
-  find $startdir/pkg -type d -perm 2755 -exec chmod 755 {} \;
+    #modules
+    mkdir -p $startdir/pkg/usr/share/laptop-mode-tools/modules/
+    install -m700 usr/share/laptop-mode-tools/modules/* $startdir/pkg/usr/share/laptop-mode-tools/modules/
 
-  # Fix binary permissions
-  chmod 700 $startdir/pkg/usr/sbin/laptop_mode
-  chmod 744 $startdir/pkg/usr/sbin/lm-profiler
-  chmod 755 $startdir/pkg/usr/sbin/lm-syslog-setup
-  chmod 755 $startdir/pkg/usr/lib/laptop-mode-tools/modules/wireless-ipw-power
-  chmod 755 $startdir/pkg/etc/apm/event.d/laptop-mode
-  chmod 755 $startdir/pkg/etc/power/scripts.d/laptop-mode
-  chmod 755 $startdir/pkg/etc/power/event.d/laptop-mode
-  chmod 755 $startdir/pkg/etc/acpi/actions/*
+    #man pages
+    mkdir -p $startdir/pkg/usr/share/man/man8/
+    install -D -m644 man/* $startdir/pkg/usr/share/man/man8/
 
-  # Our state dir
-  mkdir -p $startdir/pkg/var/run/laptop-mode-tools/
+    #acpi support
+    mkdir -p $startdir/pkg/etc/acpi/actions
+    install -D -m700 etc/acpi/actions/* $startdir/pkg/etc/acpi/actions
+    mkdir -p $startdir/pkg/etc/acpi/events
+    install -D -m600 etc/acpi/events/* $startdir/pkg/etc/acpi/events
+
+    #apm support - TODO still needed?
+    mkdir -p $startdir/pkg/etc/apm/event.d/
+    install -D -m700 etc/apm/event.d/* $startdir/pkg/etc/apm/event.d
+
+    #pm-utils support
+    mkdir -p $startdir/pkg/etc/power/scripts.d/
+    install -D -m700 etc/power/scripts.d/* $startdir/pkg/etc/power/scripts.d
+    mkdir -p $startdir/pkg/etc/power/event.d
+    ln -fs /etc/power/scripts.d/laptop-mode $startdir/pkg/etc/power/event.d
+
+    #arch init script
+    mkdir -p $startdir/pkg/etc/rc.d
+    install -m755 $startdir/src/laptop-mode $startdir/pkg/etc/rc.d/
 }

Modified: extra-x86_64/laptop-mode
===================================================================
--- extra-x86_64/laptop-mode	2008-04-23 04:18:24 UTC (rev 803)
+++ extra-x86_64/laptop-mode	2008-04-23 04:19:04 UTC (rev 804)
@@ -9,7 +9,7 @@
   start)
     stat_busy "Starting laptop-mode"
     touch /var/run/laptop-mode-tools/enabled
-    /usr/sbin/laptop_mode auto init >/dev/null 2>&1
+    /usr/sbin/laptop_mode auto >/dev/null 2>&1
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -20,7 +20,7 @@
   stop)
     stat_busy "Stopping laptop-mode"
     rm -f /var/run/laptop-mode-tools/enabled
-    /usr/sbin/laptop_mode stop init >/dev/null 2>&1
+    /usr/sbin/laptop_mode stop >/dev/null 2>&1
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -30,12 +30,22 @@
     ;;
   restart)
     stat_busy "Restarting laptop-mode"
-    touch /var/run/laptop-mode-tools/enabled
-    /usr/sbin/laptop_mode auto init force >/dev/null 2>&1
+    rm -f /var/run/laptop-mode-tools/enabled
+    /usr/sbin/laptop_mode stop >/dev/null 2>&1
+
     if [ $? -gt 0 ]; then
       stat_fail
+      rm_daemon laptop-mode
     else
-      stat_done
+      rm -f /var/run/laptop-mode-tools/*
+      touch /var/run/laptop-mode-tools/enabled
+      /usr/sbin/laptop_mode auto force >/dev/null 2>&1
+      if [ $? -gt 0 ]; then
+        stat_fail
+        rm_daemon laptop-mode
+      else
+        stat_done
+      fi
     fi
     ;;
   status)



