[arch-commits] Commit in smartmontools/repos (5 files)

[Giovanni Scafora]

    Date: Tuesday, October 27, 2009 @ 17:52:37
  Author: giovanni
Revision: 56783

Merged revisions 56779,56781 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/smartmontools/trunk

........
  r56779 | giovanni | 2009-10-27 14:46:46 -0700 (mar, 27 ott 2009) | 2 lines
  
  upgpkg: smartmontools 5.38-2
      Fixed FS16861
........
  r56781 | giovanni | 2009-10-27 14:51:07 -0700 (mar, 27 ott 2009) | 1 line
........

Added:
  smartmontools/repos/extra-i686/smartd.conf
    (from rev 56781, smartmontools/trunk/smartd.conf)
  smartmontools/repos/extra-i686/smartd.rc
    (from rev 56781, smartmontools/trunk/smartd.rc)
Modified:
  smartmontools/repos/extra-i686/	(properties)
  smartmontools/repos/extra-i686/PKGBUILD
Deleted:
  smartmontools/repos/extra-i686/smartd

-------------+
 PKGBUILD    |   25 ++++++++++++++++---------
 smartd      |   35 -----------------------------------
 smartd.conf |    1 +
 smartd.rc   |   39 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 44 deletions(-)


Property changes on: smartmontools/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /smartmontools/trunk:1-6700
   + /smartmontools/trunk:1-56782

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-27 21:51:50 UTC (rev 56782)
+++ extra-i686/PKGBUILD	2009-10-27 21:52:37 UTC (rev 56783)
@@ -2,26 +2,33 @@
 # Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: Jeff Mickey <jeff at archlinux.org>
 # Contributor: Jani Talikka <jani.talikka at gmail.com>
+# Contributor: Ralf Barth <archlinux.org at haggy.org>
 
 pkgname=smartmontools
 pkgver=5.38
-pkgrel=1
+pkgrel=2
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
 url="http://smartmontools.sourceforge.net"
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('gcc-libs')
-backup=('etc/smartd.conf')
+backup=('etc/smartd.conf'
+        'etc/conf.d/smartd')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \
-        smartd)
+        smartd.conf
+        smartd.rc)
+md5sums=('a282846532ecbd6b4a28072373b3a70b'
+         '28c1b80c41dac52d433961dcfb4f70e0'
+         'fb30e07f87f2c1d99532e018291ad3e8')
 
 build()
 {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  rm -rf ${startdir}/pkg/etc/rc.d
-  install -D -m 755 ../smartd ${startdir}/pkg/etc/rc.d/smartd
+  make DESTDIR=${pkgdir}/ install
+  rm -rf ${pkgdir}/etc/rc.d
+  install -Dm755 ${srcdir}/smartd.rc ${pkgdir}/etc/rc.d/smartd
+  install -Dm644 ${srcdir}/smartd.conf ${pkgdir}/etc/conf.d/smartd
 }
-md5sums=('a282846532ecbd6b4a28072373b3a70b' '850f98b6792b7642ff193a49a2f1139d')

Deleted: extra-i686/smartd
===================================================================
--- extra-i686/smartd	2009-10-27 21:51:50 UTC (rev 56782)
+++ extra-i686/smartd	2009-10-27 21:52:37 UTC (rev 56783)
@@ -1,35 +0,0 @@
-#!/bin/bash
-
- . /etc/rc.conf
- . /etc/rc.d/functions
-
- case "$1" in
-
-   start)
-     stat_busy "Starting smartd"
-     /usr/sbin/smartd &>/dev/null
-     if [ $? -ne 0 ]; then
-       stat_fail
-     else
-       add_daemon smartd
-       stat_done
-     fi
-   ;;
-
-   stop)
-     stat_busy "Stopping smartd"
-     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
-     rm_daemon smartd
-     stat_done
-   ;;
-
-   restart)
-     stat_busy "Restarting smartd ..."
-     $0 stop
-     $0 start
-     stat_done
-   ;;
-
-   *)
-     echo "usage: $0 {start|stop|restart}"
- esac

Copied: smartmontools/repos/extra-i686/smartd.conf (from rev 56781, smartmontools/trunk/smartd.conf)
===================================================================
--- extra-i686/smartd.conf	                        (rev 0)
+++ extra-i686/smartd.conf	2009-10-27 21:52:37 UTC (rev 56783)
@@ -0,0 +1 @@
+SMARTD_ARGS=""

Copied: smartmontools/repos/extra-i686/smartd.rc (from rev 56781, smartmontools/trunk/smartd.rc)
===================================================================
--- extra-i686/smartd.rc	                        (rev 0)
+++ extra-i686/smartd.rc	2009-10-27 21:52:37 UTC (rev 56783)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# source application-specific settings
+SMARTD_ARGS=
+[ -f /etc/conf.d/smartd ] && . /etc/conf.d/smartd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+
+   start)
+     stat_busy "Starting smartd"
+     /usr/sbin/smartd ${SMARTD_ARGS} &>/dev/null
+     if [ $? -ne 0 ]; then
+       stat_fail
+     else
+       add_daemon smartd
+       stat_done
+     fi
+   ;;
+
+   stop)
+     stat_busy "Stopping smartd"
+     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
+     rm_daemon smartd
+     stat_done
+   ;;
+
+   restart)
+     stat_busy "Restarting smartd ..."
+     $0 stop
+     $0 start
+     stat_done
+   ;;
+
+   *)
+     echo "usage: $0 {start|stop|restart}"
+esac