[arch-commits] Commit in lm_sensors/trunk (4 files)

[Eric Bélanger]

    Date: Thursday, September 23, 2010 @ 21:59:31
  Author: eric
Revision: 91206

Added comment about bepp dependency in healthd.conf (close FS#20802), Cleaned up PKGBUILD

Modified:
  lm_sensors/trunk/ChangeLog
  lm_sensors/trunk/PKGBUILD
  lm_sensors/trunk/daemonarg.patch
  lm_sensors/trunk/healthd.conf

-----------------+
 ChangeLog       |    5 +++++
 PKGBUILD        |   37 +++++++++++++++++++------------------
 daemonarg.patch |    6 +++---
 healthd.conf    |    1 +
 4 files changed, 28 insertions(+), 21 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-09-24 01:57:06 UTC (rev 91205)
+++ ChangeLog	2010-09-24 01:59:31 UTC (rev 91206)
@@ -1,3 +1,8 @@
+2010-09-23  Eric Belanger  <eric at archlinux.org>
+
+	* Added comment about bepp dependency in healthd.conf (close FS#20802)
+	* Cleaned up PKGBUILD
+
 2010-02-02  Eric Belanger  <eric at archlinux.org>
 
 	* lm_sensors 3.1.2-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-24 01:57:06 UTC (rev 91205)
+++ PKGBUILD	2010-09-24 01:59:31 UTC (rev 91206)
@@ -1,6 +1,5 @@
 # $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Aurelien Foret <orelien at chez.com>
 
 pkgname=lm_sensors
 pkgver=3.1.2
@@ -13,35 +12,37 @@
 backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
 options=('!emptydirs')
 install=sensors.install
+changelog=ChangeLog
 source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \
 	sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \
         sensord.conf sensord.rc daemonarg.patch)
 md5sums=('58a9a225808ac4587c4c8cbd12b40b5c' 'c370f5e620bfe41113354a1e22c0c18c'\
          '232bedf043dd5dedde82df1a399c682c' '47c40b381d1f25d6634ae84cecf35f33'\
-         '6549050897c237514aeaa2bb6cfd29ea' 'f649261f52bd4329347bf93f5f83cb0a'\
+         '6549050897c237514aeaa2bb6cfd29ea' 'f8af587038b0e2a89c441f7eeaa5e640'\
          '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7'\
-         '41a5c20854bbff00ea7174bd2276b736' '9e42cc9ccab264b467ed4c843c27d4a3')
+         '41a5c20854bbff00ea7174bd2276b736' '40c8eb16af8249a0f1d851fc1057ea15')
 sha1sums=('4a3b13e4f9c18c29e7f853739bdd88ca7799fcc7' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'\
          'a068ac0a3115a6191a487e11422506baa922b40a' '47095a32a918d6be50bd8daa8aaa9c24940d60e9'\
-         '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' 'c6ddfebc20685ba69700f66038c6b00a7c0bdb80'\
+         '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'\
          'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8'\
-         '72a60251d1d55a67307dab4105d9f3f01a080af4' '54d5f74b5f9dce5205daae702d6c12b34f7305e5')
+         '72a60251d1d55a67307dab4105d9f3f01a080af4' '34241388c4001bfb6e49b7e10da1217e29a258d6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../sensors-detect.patch || return 1
+  patch -p1 < ../sensors-detect.patch
+  patch -p1 < ../daemonarg.patch
+  make
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
-    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install || return 1
-
-  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors" || return 1
-  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" || return 1
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" || return 1
-  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" || return 1
-  install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" || return 1
-  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" || return 1
-  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" || return 1
-
-  cd ${pkgdir}
-  patch -p1 < ${srcdir}/daemonarg.patch || return 1
+    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
+  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
+  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
+  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
+  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd"
+  install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd"
+  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
+  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
 }

Modified: daemonarg.patch
===================================================================
--- daemonarg.patch	2010-09-24 01:57:06 UTC (rev 91205)
+++ daemonarg.patch	2010-09-24 01:59:31 UTC (rev 91206)
@@ -1,6 +1,6 @@
-diff -ru lm_sensors-3.1.2-1/usr/sbin/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
---- lm_sensors-3.1.2-1/usr/sbin/fancontrol	2010-02-03 03:45:15.000000000 +0100
-+++ lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol	2010-03-07 01:37:09.000000000 +0100
+diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
+--- lm_sensors-3.1.2-1/prog/pwm/fancontrol	2010-02-03 03:45:15.000000000 +0100
++++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol	2010-03-07 01:37:09.000000000 +0100
 @@ -5,7 +5,9 @@
  #
  # Version 0.70

Modified: healthd.conf
===================================================================
--- healthd.conf	2010-09-24 01:57:06 UTC (rev 91205)
+++ healthd.conf	2010-09-24 01:59:31 UTC (rev 91206)
@@ -13,4 +13,5 @@
 ALARM_SLEEP=600
 
 # command to run in background on each alarm
+# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
 ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"