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

Conflicts:
	community/collectd/PKGBUILD
	community/exim/PKGBUILD
	community/nsd/PKGBUILD
	extra/phonon-vlc/PKGBUILD

1 files changed, 28 insertions, 28 deletions

diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index d0dcb993b..9793f1d6c 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 64321 2012-02-11 23:20:47Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 71941 2012-06-03 21:58:45Z lfleischer $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
 pkgname=exim
-pkgver=4.77
-pkgrel=3
+pkgver=4.80
+pkgrel=1
 pkgdesc="Message Transfer Agent"
-arch=(i686 x86_64 'mips64el')
-url="http://www.exim.org/"
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.exim.org/'
 license=('GPL')
-backup=(etc/mail/aliases etc/mail/exim.conf \
-        etc/logrotate.d/exim etc/conf.d/exim)
+backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim etc/conf.d/exim)
 install=exim.install
-changelog=ChangeLog
 depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
 provides=('smtp-server')
 conflicts=('smtp-server')
@@ -22,7 +22,7 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         exim.logrotate
         exim.conf.d
         exim.Makefile)
-sha256sums=('0ccc13cf2f052b1163fcdf71c55a3578765050848ba413a6473d3ab5d20b1475'
+sha256sums=('787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984'
             '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
             '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
             '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
@@ -39,29 +39,31 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  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
+  install -Dm0644 ../exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
+  install -Dm0644 ../exim.conf.d "${pkgdir}/etc/conf.d/exim"
+  install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8"
+  install -Dm0755 ../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"
+
   cd build-Linux-*
-  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock\
-          exim_tidydb exipick exiqsumm exigrep exim_dbmbuild exim\
-          exim_fixdb eximstats exinext exiqgrep exiwhat; do
-          install -m 0755 "$i" "$pkgdir/usr/sbin"
+  for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb exipick exiqsumm exigrep \
+    exim_dbmbuild exim exim_fixdb eximstats exinext exiqgrep exiwhat; do
+    install -m0755 "$i" "$pkgdir/usr/sbin"
   done
 
   cd "$srcdir/exim-$pkgver/src"
-  sed -e "s|/etc/aliases|/etc/mail/aliases|g" \
-      -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" configure.default \
-      >"$pkgdir/etc/mail/exim.conf"
+  sed -e "s|/etc/aliases|/etc/mail/aliases|g" -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
+    configure.default > "$pkgdir/etc/mail/exim.conf"
 
   cp "$srcdir/aliases" "$pkgdir/etc/mail"
+
   cd "$pkgdir/usr/sbin"
   for i in mailq rmail rsmtp runq sendmail; do
-      ln -s exim "$i"
+    ln -s exim "$i"
   done
   # fhs compliancy
   ln -s ../sbin/exim ../lib/sendmail
@@ -69,5 +71,3 @@ package() {
   mkdir -p "$pkgdir/etc/rc.d"
   cp "$srcdir/exim" "$pkgdir/etc/rc.d"
 }
-
-# vim:set ts=2 sw=2 et: