[arch-commits] Commit in watchdog/trunk (PKGBUILD)

[Thomas Bächler]

    Date: Sunday, February 27, 2011 @ 05:22:27
  Author: thomas
Revision: 111485

watchdog: Upstream update 5.6 -> 5.9

Modified:
  watchdog/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-27 10:19:20 UTC (rev 111484)
+++ PKGBUILD	2011-02-27 10:22:27 UTC (rev 111485)
@@ -2,7 +2,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 
 pkgname=watchdog
-pkgver=5.6
+pkgver=5.9
 pkgrel=1
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64)
@@ -15,8 +15,7 @@
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         watchdog.sh
         watchdog.cf)
-        	
-md5sums=('6df285569dd1d85528b983c98c9b2b7c'
+md5sums=('d7cae3c9829f5d9a680764f314234867'
          '854451f554718b55186599faaa8d85f6'
          '01c1e2e13f515131180b4ebe9b8b7cc3')
 
@@ -28,15 +27,18 @@
 	--mandir=/usr/share/man \
 	--sysconfdir=/etc \
 	--localstatedir=/var
-  make || return 1
-  make install DESTDIR=${pkgdir} || return 1
+  make
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make install DESTDIR=${pkgdir}
   for fil in watchdog wd_keepalive ; do
-	install -D -m755 ${srcdir}/watchdog.sh ${pkgdir}/etc/rc.d/${fil} || return 1
-	install -D -m644 ${srcdir}/watchdog.cf ${pkgdir}/etc/conf.d/${fil} || return 1
+	install -D -m755 ${srcdir}/watchdog.sh ${pkgdir}/etc/rc.d/${fil}
+	install -D -m644 ${srcdir}/watchdog.cf ${pkgdir}/etc/conf.d/${fil}
   done
 
-  sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/rc.d/wd_keepalive || return 1
-  sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/conf.d/wd_keepalive || return 1
-  sed -i 's/Watchdog/Simple Watchdog/' ${pkgdir}/etc/rc.d/wd_keepalive || return 1
+  sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/rc.d/wd_keepalive
+  sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/conf.d/wd_keepalive
+  sed -i 's/Watchdog/Simple Watchdog/' ${pkgdir}/etc/rc.d/wd_keepalive
 }