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

Conflicts:
	community/pbzip2/PKGBUILD
	extra/audacious/PKGBUILD
	extra/stardict/PKGBUILD

2 files changed, 36 insertions, 39 deletions

diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD
index 536afe51d..023f9f86e 100644
--- a/community-testing/exim/PKGBUILD
+++ b/community-testing/exim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 51832 2011-07-16 03:09:57Z angvp $
+# $Id: PKGBUILD 51959 2011-07-18 17:27:22Z dreisner $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=exim
 pkgver=4.76
-pkgrel=3
+pkgrel=4
 pkgdesc="A Message Transfer Agent"
 arch=(i686 x86_64)
 url="http://www.exim.org/"
@@ -16,30 +16,29 @@ 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
-        aliases 
-        exim 
-        exim.logrotate 
+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
-        )
+        exim.Makefile)
 md5sums=('58e784b33c7a2ab335ec6400346d6362'
          '4874006f0585253ddab027d441009757'
          '9aed772e87223213e8da9ca5e7376869'
          'e18a535218718c5eb394ed5c9296fe06'
          'b75fe4c6e960a59a25b5f51e8f61ba3a'
-         '61e76543476f52f136c1d6c80ac1c5a1')
+         '5c2891dc3535c346982fa358fbba6d31')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h
+  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
+  cp "$srcdir/$pkgname.Makefile" Local/Makefile
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  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
@@ -50,25 +49,23 @@ package() {
   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
+          exim_fixdb eximstats exinext exiqgrep exiwhat; do
+          install -m 0755 "$i" "$pkgdir/usr/sbin"
   done
 
-  cd ${srcdir}/exim-${pkgver}/src
-  sed "s|/etc/aliases|/etc/mail/aliases|g" configure.default | \
-    sed "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \
-    >${pkgdir}/etc/mail/exim.conf
+  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"
 
-  cp ${srcdir}/aliases ${pkgdir}/etc/mail
-  cd ${pkgdir}/usr/sbin
-  for i in mailq rmail rsmtp runq sendmail 
-  do
-      ln -s exim $i
+  cp "$srcdir/aliases" "$pkgdir/etc/mail"
+  cd "$pkgdir/usr/sbin"
+  for i in mailq rmail rsmtp runq sendmail; do
+      ln -s exim "$i"
   done
   # fhs compliancy
   ln -s ../sbin/exim ../lib/sendmail
 
-  mkdir -p ${pkgdir}/etc/rc.d
-  cp ${srcdir}/exim ${pkgdir}/etc/rc.d
+  mkdir -p "$pkgdir/etc/rc.d"
+  cp "$srcdir/exim" "$pkgdir/etc/rc.d"
 }
diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile
index 125f87dfb..0a6397318 100644
--- a/community-testing/exim/exim.Makefile
+++ b/community-testing/exim/exim.Makefile
@@ -371,7 +371,7 @@ WITH_CONTENT_SCAN=yes
 
 # If you want to use the deprecated "demime" condition in the DATA ACL,
 # uncomment the line below. Doing so will also explicitly turn on the
-WITH_CONTENT_SCAN=yes
+# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
 # the "demime" condition.
 
 WITH_OLD_DEMIME=yes
@@ -528,7 +528,7 @@ FIXED_NEVER_USERS=root
 #
 # As a strictly transient measure to ease migration to 4.73, the
 # WHITELIST_D_MACROS value definies a colon-separated list of macro-names
-# which are permitted to be overriden from the command-line which will be
+# which are permitted to be overridden from the command-line which will be
 # honoured by the Exim user.  So these are macros that can persist to delivery
 # time.
 # Examples might be -DTLS or -DSPOOL=/some/dir.  The values on the
@@ -658,11 +658,11 @@ HEADERS_CHARSET="ISO-8859-1"
 SUPPORT_TLS=yes
 
 # Uncomment this setting if you are using OpenSSL
-TLS_LIBS=-L/usr/lib -lssl -lcrypto
+TLS_LIBS=-lssl -lcrypto
 
 # Uncomment these settings if you are using GnuTLS
 # USE_GNUTLS=yes
-TLS_LIBS=-L/usr/lib -lssl -lcrypto
+# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
 
 # If you are running Exim as a server, note that just building it with TLS
 # support is not all you need to do. You also need to set up a suitable
@@ -677,17 +677,17 @@ TLS_LIBS=-L/usr/lib -lssl -lcrypto
 # with all your other libraries. If they are in a special directory, you may
 # need something like
 
-TLS_LIBS=-L/usr/lib -lssl -lcrypto
+# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto
 # or
-TLS_LIBS=-L/usr/lib -lssl -lcrypto
+# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt
 
-TLS_LIBS=-L/usr/lib -lssl -lcrypto
+# TLS_LIBS is included only on the command for linking Exim itself, not on any
 # auxiliary programs. If the include files are not in a standard place, you can
 # set TLS_INCLUDE to specify where they are, for example:
 
-TLS_INCLUDE=-I/usr/include/openssl
+# TLS_INCLUDE=-I/usr/local/openssl/include/
 # or
-TLS_INCLUDE=-I/usr/include/openssl
+# TLS_INCLUDE=-I/opt/gnu/include
 
 # You don't need to set TLS_INCLUDE if the relevant directories are already
 # specified in INCLUDE.
@@ -884,12 +884,12 @@ SUPPORT_PAM=yes
 # this setting. See the manual section entitled "Use of tcpwrappers" in the
 # chapter on building and installing Exim.
 #
-USE_TCP_WRAPPERS=yes
+# USE_TCP_WRAPPERS=yes
 #
 # You may well also have to specify a local "include" file and an additional
 # library for TCP wrappers, so you probably need something like this:
 #
-USE_TCP_WRAPPERS=yes
+# USE_TCP_WRAPPERS=yes
 # CFLAGS=-O -I/usr/local/include
 # EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
 #
@@ -1223,5 +1223,5 @@ PID_FILE_PATH=/var/run/exim.pid
 
 HAVE_IPV6=YES
 LOOKUP_LIBS=-lldap
-EXTRALIBS_EXIM=-lwrap -lpam
+EXTRALIBS_EXIM=-lpam
 # End of EDITME for Exim 4.