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

2 files changed, 37 insertions, 21 deletions

diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index b1bedaf9e..353d161fb 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,29 +1,37 @@
-# $Id: PKGBUILD 127222 2011-06-11 09:32:25Z andrea $
+# $Id: PKGBUILD 130071 2011-07-01 21:53:41Z stephane $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
 pkgver=1.6.17
-pkgrel=4
-pkgdesc="Replacement for CVS, another versioning system (SVN)"
+pkgrel=6
+pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64' 'mips64el')
 license=('apache' 'bsd')
 depends=('neon' 'apr-util' 'sqlite3')
+optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
 makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
              'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 [ "$CARCH" = "mips64el" ] && \
 makedepends=('krb5' 'apache' 'python2' 'perl' 'swig'
              'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring') #'java-runtime' 'kdelibs'  'ruby' 
-source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
-        svnserve svn svnserve.conf svnmerge.py
-        subversion.rpath.fix.patch
-        subversion.suppress.deprecation.warnings.patch)
-
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
 provides=('svn')
 options=('!makeflags' '!libtool')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion')
+source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
+        svnserve svn svnserve.conf svnmerge.py
+        subversion.rpath.fix.patch
+        subversion.suppress.deprecation.warnings.patch
+        subversion-perl-bindings.patch)
+md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
+         'a2b029e8385007ffb99b437b30521c90'
+         'a0db6dd43af33952739b6ec089852630'
+         'c459e299192552f61578f3438abf0664'
+         'a6371baeda7e224504629ecdda2749b4'
+         '6b4340ba9d8845cd8497e013ae01be3f'
+         '1166f3b7413d7e7450299b3525680bbe'
+         '0591aa39837931161b4d61ff35c7b147')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -33,13 +41,14 @@ build() {
    # apply patches
    patch -Np0 -i ../subversion.rpath.fix.patch
    patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch
+   patch -Np1 -i ../subversion-perl-bindings.patch
 
    # configure
    autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
-     --with-zlib=/usr --with-neon=/usr --with-apxs \
-     --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.1 \
-     --with-gnome-keyring # --with-kwallet --enable-javahl
+               --with-zlib=/usr --with-neon=/usr --with-apxs \
+               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \
+               --enable-javahl --with-gnome-keyring --with-kwallet
 
    # build
    (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all )
@@ -76,8 +85,10 @@ package() {
    make DESTDIR=${pkgdir} swig-rb
    make install-swig-rb DESTDIR=${pkgdir}
 
-#   make DESTDIR=${pkgdir} javahl
-#   make DESTDIR=${pkgdir} install-javahl
+   if [ "$CARCH" != "mips64el" ]; then
+   make DESTDIR=${pkgdir} javahl
+   make DESTDIR=${pkgdir} install-javahl
+   fi
 
    install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d}
 
@@ -92,10 +103,3 @@ package() {
    install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
                ${pkgdir}/etc/bash_completion.d/subversion
 }
-md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14'
-         'a2b029e8385007ffb99b437b30521c90'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664'
-         'a6371baeda7e224504629ecdda2749b4'
-         '6b4340ba9d8845cd8497e013ae01be3f'
-         '1166f3b7413d7e7450299b3525680bbe')
diff --git a/extra/subversion/subversion-perl-bindings.patch b/extra/subversion/subversion-perl-bindings.patch
new file mode 100644
index 000000000..3c34daa47
--- /dev/null
+++ b/extra/subversion/subversion-perl-bindings.patch
@@ -0,0 +1,12 @@
+diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in
+--- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in	2010-11-24 20:42:16.000000000 +0000
++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in	2011-07-01 20:16:16.520892074 +0000
+@@ -43,7 +43,7 @@
+ my %config = (
+     ABSTRACT => 'Perl bindings for Subversion',
+     DEFINE => $cppflags,
+-    CCFLAGS => $cflags,
++    CCFLAGS => $Config{ccflags},
+     INC  => join(' ',$apr_cflags, $apu_cflags, 
+                  " -I$swig_srcdir/perl/libsvn_swig_perl",
+                  " -I$svnlib_srcdir/include",