Sat Aug 27 23:14:39 UTC 2011

7 files changed, 15 insertions, 15 deletions

diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD
index 2ddfbbda1..400ed830f 100644
--- a/community/courier-imap/PKGBUILD
+++ b/community/courier-imap/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 49375 2011-06-15 09:29:55Z svenstaro $
+# $Id: PKGBUILD 54864 2011-08-26 22:00:47Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: tobias <tobias@archlinux.org>
 # Committer: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=courier-imap
 pkgver=4.9.3
-pkgrel=2
+pkgrel=4
 pkgdesc="IMAP(s)/POP3(s) Server"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.courier-mta.org/imap/"
-depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'fam' 'gdbm' 'openssl')
+depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'gamin' 'gdbm' 'openssl')
 backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \
         'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \
         'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\
@@ -18,6 +18,7 @@ backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \
 conflicts=('courier-mta')
 provides=('imap-server' 'pop3-server')
 options=('!libtool')
+install=$pkgname.install
 source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2
         courier-imap.conf.d
 		courier-imap.rc.d
@@ -27,12 +28,11 @@ source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgnam
         pop3d-ssl.rc.d)
 md5sums=('703ddbb090569436dbda61d0d62b1eb8'
          '3e08f017f6c5a52dea28f6f0dbd50b86'
-         '3e4910c5a34af68dfdeed932e573a9f9'
-         'ca799c7014d002fb9f8ff671610337bd'
-         '268693ccf3f081897b78490a70cf3211'
-         'c2e65d9b136f59eb0cf5377e7c46de88'
-         'e07c43fdf2e5ae6d73fc3281f6332b62')
-install=$pkgname.install
+         '500c37831974f4676b67e650c67a59f6'
+         '6574c8046e44698efa7452c4b445d88e'
+         '437167a58efddc523f25180df284da20'
+         '1be23fb224bde93b23da6e771bd1cf01'
+         'a326309b02fed3d7226d9aac88add7f2')
 
 # MIGRATION NOTE:
 # In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed.
diff --git a/community/courier-imap/courier-imap.install b/community/courier-imap/courier-imap.install
index cf73119e2..9046777a7 100644
--- a/community/courier-imap/courier-imap.install
+++ b/community/courier-imap/courier-imap.install
@@ -8,7 +8,7 @@ post_upgrade() {
   echo "Example prior to this change:"
   echo "    DAEMONS=( ... courier-imap ...)"
   echo "Example after this change:"
-  echo "    DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl .. )"
+  echo "    DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl ... )"
   echo "This allows better control over the daemons and will generate"
   echo "correct entries in /run/daemons"
   echo "An old configuration will keep working but please do migrate in time"
diff --git a/community/courier-imap/courier-imap.rc.d b/community/courier-imap/courier-imap.rc.d
index 1389221f8..8876fe401 100644
--- a/community/courier-imap/courier-imap.rc.d
+++ b/community/courier-imap/courier-imap.rc.d
@@ -18,7 +18,7 @@ case "$1" in
       /etc/rc.d/authdaemond start
       sleep ${AUTO_AUTHDAEMON_LAG}
     fi
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-imap/imapd-ssl.rc.d b/community/courier-imap/imapd-ssl.rc.d
index 3430bd73e..6730d452c 100644
--- a/community/courier-imap/imapd-ssl.rc.d
+++ b/community/courier-imap/imapd-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
 
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-imap/imapd.rc.d b/community/courier-imap/imapd.rc.d
index ec4df03f5..867b52b78 100644
--- a/community/courier-imap/imapd.rc.d
+++ b/community/courier-imap/imapd.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
 
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-imap/pop3d-ssl.rc.d b/community/courier-imap/pop3d-ssl.rc.d
index 8b147ff32..aab0f6a95 100644
--- a/community/courier-imap/pop3d-ssl.rc.d
+++ b/community/courier-imap/pop3d-ssl.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
 
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1
diff --git a/community/courier-imap/pop3d.rc.d b/community/courier-imap/pop3d.rc.d
index 6a2c66ad0..7b73c5a7a 100644
--- a/community/courier-imap/pop3d.rc.d
+++ b/community/courier-imap/pop3d.rc.d
@@ -9,7 +9,7 @@ case "$1" in
     [ -d /var/run/courier ] || mkdir -p /var/run/courier
 	chown courier:courier /var/run/courier
 
-    if [ ! -f /var/run/daemons/authdaemond ]; then
+    if ck_daemon authdaemond; then
       echo "ERROR: authdaemond is not running"
       stat_fail
       exit 1