Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/packagekit/PKGBUILD
	community/bird/PKGBUILD
	community/camlp5/PKGBUILD
	community/exim/PKGBUILD
	community/ibus-table-extraphrase/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/torcs/PKGBUILD
	core/db/PKGBUILD
	core/iproute2/PKGBUILD
	core/libsasl/PKGBUILD
	core/openldap/PKGBUILD
	core/pam/PKGBUILD
	core/util-linux/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/php/PKGBUILD
	extra/postfix/PKGBUILD
	extra/python-lxml/PKGBUILD
	extra/rdesktop/PKGBUILD
	extra/redland/PKGBUILD
	extra/subversion/PKGBUILD
	extra/tidyhtml/PKGBUILD
	extra/transmission/PKGBUILD
	extra/windowmaker/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-libdrm/no-pthread-stubs.patch
	multilib/lib32-openssl/PKGBUILD

2 files changed, 19 insertions, 17 deletions

diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index b68675132..2f7851f25 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56931 2011-10-17 02:10:43Z angvp $
+# $Id: PKGBUILD 61949 2012-01-11 15:21:55Z stephane $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=exim
 pkgver=4.77
-pkgrel=1.1
-pkgdesc="A Message Transfer Agent"
+pkgrel=2
+pkgdesc="Message Transfer Agent"
 arch=(i686 x86_64 'mips64el')
 url="http://www.exim.org/"
 license=('GPL')
@@ -16,33 +16,33 @@ depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
 provides=('smtp-server')
 conflicts=('smtp-server')
 options=('!makeflags')
-source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2
+source=("ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2"
         aliases
         exim
         exim.logrotate
         exim.conf.d
         exim.Makefile)
-md5sums=('5d746275f2cc85845567f9d5eb84a57a'
-         '4874006f0585253ddab027d441009757'
-         '9aed772e87223213e8da9ca5e7376869'
-         'e18a535218718c5eb394ed5c9296fe06'
-         'b75fe4c6e960a59a25b5f51e8f61ba3a'
-         '5c2891dc3535c346982fa358fbba6d31')
+sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475'
+            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
+            '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
+            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
+            '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
+            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  #sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h
-  # Make some configuration changes
+
   cp "$srcdir/$pkgname.Makefile" Local/Makefile
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -D -m644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim
-  install -D -m644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim
-  install -D -m644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8
-  install -D -m755 ../exim ${pkgdir}/etc/rc.d/exim
+
+  install -Dm644 ../exim.logrotate ${pkgdir}/etc/logrotate.d/exim
+  install -Dm644 ../exim.conf.d ${pkgdir}/etc/conf.d/exim
+  install -Dm644 doc/exim.8 ${pkgdir}/usr/share/man/man8/exim.8
+  install -Dm755 ../exim ${pkgdir}/etc/rc.d/exim
   mkdir -p ${pkgdir}/var/spool/exim/db ${pkgdir}/etc/mail \
     ${pkgdir}/var/log/exim ${pkgdir}/usr/{lib,sbin}
   chmod 770 ${pkgdir}/var/spool/exim ${pkgdir}/var/spool/exim/db ${pkgdir}/var/log/exim
@@ -69,3 +69,5 @@ package() {
   mkdir -p "$pkgdir/etc/rc.d"
   cp "$srcdir/exim" "$pkgdir/etc/rc.d"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/exim/exim.Makefile b/community/exim/exim.Makefile
index 0a6397318..a304ce829 100644
--- a/community/exim/exim.Makefile
+++ b/community/exim/exim.Makefile
@@ -1222,6 +1222,6 @@ PID_FILE_PATH=/var/run/exim.pid
 # ENABLE_DISABLE_FSYNC=yes
 
 HAVE_IPV6=YES
-LOOKUP_LIBS=-lldap
+LOOKUP_LIBS=-lldap -llber
 EXTRALIBS_EXIM=-lpam
 # End of EDITME for Exim 4.