4 files changed, 18 insertions, 15 deletions
diff --git a/abs/core/imap/PKGBUILD b/abs/core/imap/PKGBUILD
index 7e00106..b251daf 100644
--- a/abs/core/imap/PKGBUILD
+++ b/abs/core/imap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 132404 2011-07-24 11:35:43Z pierre $
+# $Id$
 
 pkgname=imap
 pkgver=2007f
-pkgrel=1
+pkgrel=4
 pkgdesc="An IMAP/POP server"
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -12,25 +12,28 @@ provides=('imap-server' 'pop3-server')
 conflicts=('courier-mta' 'courier-imap')
 source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz"
         'imap' 'ipop2' 'ipop3')
+options=('staticlibs')
 backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem)
 md5sums=('2126fd125ea26b73b20f01fcd5940369'
-         'e77dedb80c2fec9bf2ef784ed5f976fb'
-         'cc3eba6453242aa0b1bc8881160b2136'
-         '0a5e27183a9b7e8ec5f6703125371e0a')
+         '3ae5b3b333bc8ea2da106f6a97d7bd8d'
+         '448f988dc5f9bdb2223dcea3abc4f5f1'
+         '1499b13015075f0aafba04324a6f523a')
 
-build() {
+prepare() {
   sed \
     -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
     -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
     -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
     -i $srcdir/$pkgname-$pkgver/src/osdep/unix/Makefile
+}
 
+build() {
   cd $srcdir/$pkgname-$pkgver
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
   if [ "$CARCH" == "x86_64" ]; then
-         yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC" || return 1
-    else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix || return 1
+         yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC"
+    else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix
   fi
 
   # create ssl certs for secure imap
@@ -58,10 +61,10 @@ EOF
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  install -d $pkgdir/usr/sbin
-  install -D -m755 imapd/imapd $pkgdir/usr/sbin/imapd
-  install -D -m755 ipopd/ipop2d $pkgdir/usr/sbin/ipop2d
-  install -D -m755 ipopd/ipop3d $pkgdir/usr/sbin/ipop3d
+  install -d $pkgdir/usr/bin
+  install -D -m755 imapd/imapd $pkgdir/usr/bin/imapd
+  install -D -m755 ipopd/ipop2d $pkgdir/usr/bin/ipop2d
+  install -D -m755 ipopd/ipop3d $pkgdir/usr/bin/ipop3d
   for i in c-client mail imap4r1 rfc822 linkage misc smtp nntp \
     osdep env_unix env fs ftl nl tcp sslio utf8 utf8aux; do
     install -D -m644 c-client/${i}.h $pkgdir/usr/include/imap/${i}.h
diff --git a/abs/core/imap/imap b/abs/core/imap/imap
index da45739..fc83095 100644
--- a/abs/core/imap/imap
+++ b/abs/core/imap/imap
@@ -3,7 +3,7 @@ service imap2
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/imapd
+        server                  = /usr/bin/imapd
         log_on_success  += HOST DURATION
         log_on_failure  += HOST
         disable                 = yes
diff --git a/abs/core/imap/ipop2 b/abs/core/imap/ipop2
index bd74c83..0eee384 100644
--- a/abs/core/imap/ipop2
+++ b/abs/core/imap/ipop2
@@ -3,7 +3,7 @@ service pop2
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/ipop2d
+        server                  = /usr/bin/ipop2d
         log_on_success  += HOST DURATION 
         log_on_failure  += HOST
         disable                 = yes
diff --git a/abs/core/imap/ipop3 b/abs/core/imap/ipop3
index 410a45a..44565b0 100644
--- a/abs/core/imap/ipop3
+++ b/abs/core/imap/ipop3
@@ -3,7 +3,7 @@ service pop3
         socket_type             = stream
         wait                    = no
         user                    = root
-        server                  = /usr/sbin/ipop3d
+        server                  = /usr/bin/ipop3d
         log_on_success  += HOST DURATION
         log_on_failure  += HOST
         disable                 = yes