[Lunar-commits] <moonbase> exim: Updated dependencies and how crond is handled

[Stefan Wold]

commit 9b79408a3395ef69202c32cc6b44708a8bbc755c
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Tue Feb 16 16:46:09 2010 +0100

    exim: Updated dependencies and how crond is handled
---
 mail/exim/CONFIGURE        |   12 ------------
 mail/exim/DEPENDS          |   17 ++++++-----------
 mail/exim/DETAILS          |    2 +-
 mail/exim/POST_INSTALL     |   13 -------------
 mail/exim/PRE_REMOVE       |   12 ------------
 mail/exim/cron.hourly/exim |    7 +++++++
 6 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/mail/exim/CONFIGURE b/mail/exim/CONFIGURE
index a16fea2..6a0a5ba 100644
--- a/mail/exim/CONFIGURE
+++ b/mail/exim/CONFIGURE
@@ -1,15 +1,3 @@
-if  !  grep  -q  "CRON="  $MODULE_CONFIG;  then
-
-  message  "Exim can use either hc-cron or or fcron"  \
-           "to periodically attempt to resend undelivered mail."
-
-  if    query  "Attempt to resend undelivered via hc-cron?"  y
-  then  echo   "CRON=h"  >>  $MODULE_CONFIG
-  else  echo   "CRON=f"  >>  $MODULE_CONFIG
-  fi
-
-fi
-
 mquery IDENT_QUERIES "enable ident queries? [not recommended]" n
 mquery USE_X11   "Build exim monitor with x11 ?" y
 mquery USE_SCANNING     "Enable content scanning at acl time (clamav support)?" y
diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index 5aaa539..1be7229 100644
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -1,11 +1,6 @@
-depends  db    &&
-depends  gawk  &&
-
-case  $CRON  in
-  f)  depends  fcron    ;;
-  *)  depends  hc-cron  ;;
-esac  &&
-
-optional_depends  tcp_wrappers  ""  ""  "for controlling remote access" &&
-optional_depends  mysql         ""  ""  "for mysql lookup tables" &&
-optional_depends "%X" "" "" "Build exim monitor with x11 support"
+depends db
+depends gawk
+optional_depends %CROND "" "" "to periodically attempt to resend undelivered mail"
+optional_depends tcp_wrappers  ""  ""  "for controlling remote access"
+optional_depends mysql ""  ""  "for mysql lookup tables"
+optional_depends %X "" "" "Build exim monitor with x11 support"
diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index 2452f19..0bf3a3b 100644
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -7,7 +7,7 @@
       SOURCE_VFY=sha1:4b8f853843edcfa4f3bfbb4bef45d8dcff2fc990
         WEB_SITE=http://www.exim.org
          ENTERED=20030923
-         UPDATED=20091125
+         UPDATED=20100216
       MAINTAINER=tchan at lunar-linux.org
            SHORT="Email server"
            PSAFE=no
diff --git a/mail/exim/POST_INSTALL b/mail/exim/POST_INSTALL
deleted file mode 100644
index a0aa044..0000000
--- a/mail/exim/POST_INSTALL
+++ /dev/null
@@ -1,13 +0,0 @@
-EXIM_SCHEDULE="0 * * * * /usr/sbin/exim  -q"
-
-case  $CRON  in
-  f)  echo  -e  "`fcrontab  -l  2>/dev/null  |
-      grep  -v  exim`\n$EXIM_SCHEDULE"       |
-      fcrontab -                2>/dev/null
-      ;;
-  *)  echo  -e  "`crontab  -l           |
-      sed   -n  4~1p                    |
-      grep  -v  exim`\n$EXIM_SCHEDULE"  |
-      crontab -
-      ;;
-esac
diff --git a/mail/exim/PRE_REMOVE b/mail/exim/PRE_REMOVE
deleted file mode 100644
index aad7663..0000000
--- a/mail/exim/PRE_REMOVE
+++ /dev/null
@@ -1,12 +0,0 @@
-if  module_installed  fcron;  then
-  fcrontab  -l  2>/dev/null  |
-  grep  -v  exim             |
-  fcrontab -    2>/dev/null
-fi
-
-if  module_installed  hc-cron;  then
-  crontab   -l    |
-  sed   -n  4~1p  |
-  grep  -v  exim  |
-  crontab -
-fi
diff --git a/mail/exim/cron.hourly/exim b/mail/exim/cron.hourly/exim
new file mode 100755
index 0000000..14e75d9
--- /dev/null
+++ b/mail/exim/cron.hourly/exim
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+/usr/sbin/exim -q &> /dev/null
+EXITVALUE=$?
+if [ $EXITVALUE != 0 ]; then
+    /usr/bin/logger -t exim "ALERT exited abnormally with [$EXITVALUE]"
+fi