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

Conflicts:
	community/perl-file-path-expand/PKGBUILD
	community/perl-file-slurp/PKGBUILD
	community/perl-getopt-argvfile/PKGBUILD
	community/perl-graphics-colornames/PKGBUILD
	community/perl-html-tableextract/PKGBUILD
	community/perl-xml-regexp/PKGBUILD
	community/perlio-eol/PKGBUILD
	community/virtualbox/PKGBUILD
	community/xemacs/PKGBUILD
	core/gawk/PKGBUILD
	extra/bogofilter/PKGBUILD
	extra/feh/PKGBUILD
	extra/gnome-phone-manager/PKGBUILD
	extra/redland/PKGBUILD
	extra/ruby/PKGBUILD
	extra/samba/PKGBUILD
	extra/squirrelmail/PKGBUILD
	extra/subversion/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/xawtv/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	testing/mesa/PKGBUILD

12 files changed, 62 insertions, 63 deletions

diff --git a/core/cronie/crontab b/core/cronie/crontab
deleted file mode 100644
index f2ce71030..000000000
--- a/core/cronie/crontab
+++ /dev/null
@@ -1 +0,0 @@
-# without this file, crond disables inotify support at startup
diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD
index 376007190..66b78e4f3 100644
--- a/core/db/PKGBUILD
+++ b/core/db/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 108790 2011-02-03 13:05:02Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 127440 2011-06-15 00:33:22Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=db
-pkgver=5.1.25
-_basever=5.1.25
+pkgver=5.2.28
 pkgrel=1
 pkgdesc="The Berkeley DB embedded database system"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,20 +13,20 @@ license=('custom')
 depends=('gcc-libs' 'sh')
 options=('!libtool')
 install=db.install
-source=(http://download-uk.oracle.com/berkeley-db/db-${_basever}.tar.gz)
-md5sums=('06656429bfc1abb6c0498eaeff70cd04')
+source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
+sha1sums=('e6572e3356cf8bc998da4e889db3b12638833435')
 
 build() {
-  cd ${srcdir}/$pkgname-${_basever}/build_unix
+  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
   ../dist/configure --prefix=/usr --enable-compat185 \
     --enable-shared --enable-static --enable-cxx --enable-dbm
   make LIBSO_LIBS=-lpthread
 }
 
 package() {
-  cd ${srcdir}/$pkgname-${_basever}/build_unix
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/docs
-  install -Dm644 ${srcdir}/${pkgname}-${_basever}/LICENSE \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/docs
+  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD
index 26c039ca7..6782d02f1 100644
--- a/core/gawk/PKGBUILD
+++ b/core/gawk/PKGBUILD
@@ -1,36 +1,41 @@
-# $Id: PKGBUILD 100064 2010-11-20 03:46:49Z allan $
+# $Id: PKGBUILD 130241 2011-07-04 15:07:06Z allan $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gawk
-pkgver=3.1.8
-pkgrel=2
-pkgdesc="Gnu version of awk"
-arch=(i686 x86_64 'mips64el')
+pkgver=4.0.0
+pkgrel=1
+pkgdesc="GNU version of awk"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/directory/GNU/gawk.html"
 license=('GPL')
 groups=('base')
+depends=('sh' 'glibc')
 provides=('awk')
 install=gawk.install
 source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-depends=('sh' 'glibc')
-md5sums=('35937a0f83f0efe7a8c2dee635624784')
+md5sums=('51e417b71287629940051e6f652c6492')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/${pkgname}-${pkgver}
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --libexecdir=/usr/lib
   make 
 }
 
+check() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  make -j1 check
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   make DESTDIR=${pkgdir} install
-  mv ${pkgdir}/usr/libexec ${pkgdir}/usr/lib
-  install -dm755 ${pkgdir}/bin
+
+  install -dm755 ${pkgdir}/bin 
   mv ${pkgdir}/usr/bin/gawk* ${pkgdir}/bin/
-  mv ${pkgdir}/usr/bin/awk ${pkgdir}/bin/
-  cd ${pkgdir}/usr/bin/
-  ln -sf /bin/gawk gawk
+  ln -sf gawk ${pkgdir}/bin/awk
+  ln -sf /bin/gawk ${pkgdir}/usr/bin/
 }
diff --git a/core/gawk/gawk.install b/core/gawk/gawk.install
index 95973e40a..3f7f24cfe 100644
--- a/core/gawk/gawk.install
+++ b/core/gawk/gawk.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(gawk.info.gz gawkinet.info.gz)
 
 post_install() {
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 499584d3f..1dabfd091 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 126335 2011-06-04 22:38:16Z tomegun $
+# $Id: PKGBUILD 127646 2011-06-17 12:59:11Z stephane $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=iproute2
 pkgver=2.6.38
-pkgrel=3
+pkgrel=4
 pkgdesc="IP Routing Utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 6cfa48497..f8300bf83 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $
+# $Id: PKGBUILD 129991 2011-06-30 18:09:30Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://web.mit.edu/kerberos/"
@@ -13,12 +13,12 @@ makedepends=('perl')
 provides=('heimdal')
 replaces=('heimdal')
 conflicts=('heimdal')
-backup=('etc/krb5/krb5.conf' 'etc/krb5/kdc.conf')
+backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
-        kadmind.rc
-        krb5-kdc.rc)
+        krb5-kadmind
+        krb5-kdc)
 sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
-          '640e3046c6558313d2be81cf2252afc8622892b0'
+          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
           '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
 options=('!emptydirs')
 
@@ -29,7 +29,6 @@ build() {
    export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
    export CPPFLAGS+=" -I/usr/include/et"
    ./configure --prefix=/usr \
-               --sysconfdir=/etc/krb5 \
                --mandir=/usr/share/man \
                --localstatedir=/var/lib \
                --enable-shared \
@@ -39,26 +38,24 @@ build() {
                --without-tcl \
                --enable-dns-for-realm \
                --with-ldap
-
    make
 }
 
-check() {
-   # We can't do this in the build directory.
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make -C src check
-}
-
 package() {
    cd "${srcdir}/${pkgname}-${pkgver}/src"
    make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
 
-   install -D -m 644 config-files/kdc.conf "${pkgdir}"/etc/krb5/kdc.conf
-   install -D -m 644 config-files/krb5.conf "${pkgdir}"/etc/krb5/krb5.conf
+   # Sample KDC config file
+   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
+   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
+
+   # Default configuration file
+   install -dm 755 "${pkgdir}"/etc
+   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
 
-   install -d -m 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kdc.rc "${pkgdir}"/etc/rc.d
-   install -m 755 ../../kadmind.rc "${pkgdir}"/etc/rc.d
+   install -dm 755 "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
 
    install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/core/krb5/kadmind.rc b/core/krb5/krb5-kadmind
index 45835e35b..04df0dcff 100644
--- a/core/krb5/kadmind.rc
+++ b/core/krb5/krb5-kadmind
@@ -14,7 +14,7 @@ case "$1" in
         if [ ! -z "$PID" -o $? -gt 0 ]; then
             stat_fail
         else
-            add_daemon kadmind
+            add_daemon krb5-kadmind
             stat_done
         fi
         ;;
@@ -24,7 +24,7 @@ case "$1" in
         if [ $? -gt 0 ]; then
             stat_fail
         else
-            rm_daemon kadmind
+            rm_daemon krb5-kadmind
             stat_done
         fi
         ;;
diff --git a/core/krb5/krb5-kdc.rc b/core/krb5/krb5-kdc
index 05a03411e..05a03411e 100644
--- a/core/krb5/krb5-kdc.rc
+++ b/core/krb5/krb5-kdc
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index 193fc4bb5..ea01c4201 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96213 2010-10-19 11:41:43Z allan $
+# $Id: PKGBUILD 127649 2011-06-17 13:03:28Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=5
+pkgrel=6
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 175275b88..769db7bb1 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104544 2011-01-03 22:58:23Z tpowa $
+# $Id: PKGBUILD 127852 2011-06-18 20:12:05Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 6b24e8eb8..16db02b6f 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 128400 2011-06-23 21:11:34Z angvp $
+# $Id: PKGBUILD 129898 2011-06-29 17:25:10Z foutrelis $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
 pkgver=5.14.1
-pkgrel=1
+pkgrel=3
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'PerlArtistic')
@@ -21,7 +21,7 @@ install=perl.install
 options=('!makeflags' '!purge')
 md5sums=('97cd306a2c22929cc141a09568f43bb0'
          '5ed2542fdb9a60682f215bd33701e61a'
-         'd76445605c49886c77734446247e439d'
+         '1f0cbbee783e8a6d32f01be5118e0d5e'
          'c25d86206d649046538c3daab7874564')
 
 build() {
diff --git a/core/perl/perlbin.csh b/core/perl/perlbin.csh
index cc0d5d553..535f0b18d 100644
--- a/core/perl/perlbin.csh
+++ b/core/perl/perlbin.csh
@@ -4,12 +4,10 @@
 # Remove /usr/lib/perl5/*_perl/bin in next release
 
 [ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH
-${PATH}:/usr/lib/perl5/site_perl/bin
+[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin
 
 [ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH
-${PATH}:/usr/lib/perl5/vendor_perl/bin
+[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin
 
 [ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl