[arch-commits] Commit in subversion/trunk (ChangeLog PKGBUILD)

Andrea Scarpino andrea at archlinux.org
Wed Oct 20 09:10:48 UTC 2010 

    Date: Wednesday, October 20, 2010 @ 05:10:47
  Author: andrea
Revision: 96381

db 5.1 rebuild

Modified:
  subversion/trunk/PKGBUILD
Deleted:
  subversion/trunk/ChangeLog

-----------+
 ChangeLog |   66 ------------------------------------------------------
 PKGBUILD  |   73 ++++++++++++++++++++++++++----------------------------------
 2 files changed, 32 insertions(+), 107 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-10-20 08:18:24 UTC (rev 96380)
+++ ChangeLog	2010-10-20 09:10:47 UTC (rev 96381)
@@ -1,66 +0,0 @@
-2009-12-27  Ionut Biru <ionut at archlinux.ro>
-
-	* subversion 1.6.6-3: adding svn bash completion script
-
-2009-08-07  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated to: 1.6.4
-
-2009-08-02  Eric Belanger  <eric at archlinux.org>
-
-	* subversion 1.6.3-2: Rebuilt against ruby 1.9
-
-2009-06-07  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Now hopefully fixed git issues
-
-2009-05-16  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Fixing wrong link against ruby 1.9
-
-2009-05-11  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 1.6.2
-
-2009-04-17  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Back to use svnmerge.py from trunk
-
-2009-04-11  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Removing libtool files
-
-2009-04-10  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 1.6.1
-	* Added gerardo patch to fix insecure rpaths
-
-2009-03-24  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Added sqlite3 as a dep
-
-2009-03-21  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 1.6.0
-
-2009-02-26  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 1.5.6
-
-2008-10-10  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 1.5.3
-
-2008-09-04  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* 1.5.2: Finally updated for i686 as it does not break the
-	  devtools.
-
-2008-08-13  Douglas Soares de Andrade  <dsa at aur.archlinux.org>
-
-	* Updated for i686: 1.5.1
-
-2008-07-23  Douglas Soares de Andrade  <douglas at archlinux.org>
-
-	* Updated for i686: 1.5.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-20 08:18:24 UTC (rev 96380)
+++ PKGBUILD	2010-10-20 09:10:47 UTC (rev 96381)
@@ -4,14 +4,13 @@
 
 pkgname=subversion
 pkgver=1.6.9
-pkgrel=6
-pkgdesc="Replacement for CVS, another versioning system (svn)"
+pkgrel=7
+pkgdesc="Replacement for CVS, another versioning system (SVN)"
 arch=('i686' 'x86_64')
 license=('apache' 'bsd')
 depends=('neon' 'apr-util')
 makedepends=('heimdal' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
-             'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 
-'kdelibs')
+             'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
         svnserve svn svnserve.conf svnmerge.py
         subversion.rpath.fix.patch
@@ -29,20 +28,18 @@
    export PYTHON=/usr/bin/python2
 
    # apply patches
-   patch -p0 < $srcdir/subversion.rpath.fix.patch || return 1
-   patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch \
-               || return 1
+   patch -p0 < $srcdir/subversion.rpath.fix.patch
+   patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch
 
    # configure
-   autoreconf || return 1
+   autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr \
-               --enable-javahl --with-gnome-keyring --with-kwallet || return 1
+               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.1 \
+               --enable-javahl --with-gnome-keyring --with-kwallet
 
    # build
-   (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) \
-               || return 1
+   (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all )
 }
 
 package() {
@@ -50,47 +47,41 @@
 
    # install
    export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
-   make DESTDIR=${pkgdir} install || return 1
+   make DESTDIR=${pkgdir} install
 
-   make DESTDIR=${pkgdir} swig-py || return 1
-   make install-swig-py DESTDIR=${pkgdir} || return 1
+   make DESTDIR=${pkgdir} swig-py
+   make install-swig-py DESTDIR=${pkgdir}
 
-   mkdir -p ${pkgdir}/usr/lib/python2.7 || return 1
-   mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages \
-               || return 1
+   install -d ${pkgdir}/usr/lib/python2.7
+   mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages
 
-   mkdir -p ${pkgdir}/usr/share/subversion || return 1
-   install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ \
-               || return 1
-   rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in || return 1
+   install -d ${pkgdir}/usr/share/subversion
+   install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/
+   rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in
 
-   make DESTDIR=${pkgdir} swig-pl || return 1
-   make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor || return 1
-   rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist \
-               || return 1
-   rm -rf ${pkgdir}/usr/lib/perl5/core_perl || return 1
+   make DESTDIR=${pkgdir} swig-pl
+   make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor
+   rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+   rm -rf ${pkgdir}/usr/lib/perl5/core_perl
 
-   make DESTDIR=${pkgdir} swig-rb || return 1
-   make install-swig-rb DESTDIR=${pkgdir}  || return 1
+   make DESTDIR=${pkgdir} swig-rb
+   make install-swig-rb DESTDIR=${pkgdir}
 
-   make DESTDIR=${pkgdir} javahl || return 1
-   make DESTDIR=${pkgdir} install-javahl || return 1
+   make DESTDIR=${pkgdir} javahl
+   make DESTDIR=${pkgdir} install-javahl
 
-   mkdir -p ${pkgdir}/etc/rc.d || return 1
-   mkdir -p ${pkgdir}/etc/xinetd.d || return 1
-   mkdir -p ${pkgdir}/etc/conf.d || return 1
+   install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d}
 
-   install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d || return 1
-   install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d || return 1
-   install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve \
-               || return 1
-   install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge || return 1
+   install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d
+   install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d
+   install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve
+   install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge
    install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \
-               ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
+               ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 
    # bash completion
    install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
-               ${pkgdir}/etc/bash_completion.d/subversion || return 1
+               ${pkgdir}/etc/bash_completion.d/subversion
 }
 md5sums=('9c30a47b1d48664e7afef68bb4834c53'
          'a2b029e8385007ffb99b437b30521c90'

More information about the arch-commits mailing list