Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.

1 files changed, 80 insertions, 76 deletions

diff --git a/abs/extra/subversion/PKGBUILD b/abs/extra/subversion/PKGBUILD
index 4ad7460..dd24fd5 100644
--- a/abs/extra/subversion/PKGBUILD
+++ b/abs/extra/subversion/PKGBUILD
@@ -1,90 +1,94 @@
-# $Id: PKGBUILD 15639 2008-10-16 10:28:54Z douglas $
-# Contributer: Jason Chu <jason@archlinux.org>
-# Maintainer: Jason Chu <jason@archlinux.org>
+# $Id: PKGBUILD 77223 2010-04-11 14:13:33Z pierre $
+# Maintainer: Paul Mattal <paul@archlinux.org>
+# Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.5.3
+pkgver=1.6.9
 pkgrel=5
 pkgdesc="Replacement for CVS, another versioning system (svn)"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('apache' 'bsd')
-depends=('neon>=0.28.2-2' 'apr-util>=1.3.2-2')
-makedepends=('heimdal>=1.2.1' 'db>=4.7' 'python>=2.5.2-4'
-             'perl>=5.10.0-3'  'autoconf')
-source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
-        svnserve svn svnserve.conf)
-
-md5sums=('37533b0435caaa3e4e1be359389fcbb9'
-         'c5a2e490b3e58c6bd2ca3a2e72b71845'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664')
-        
+depends=('neon' 'apr-util')
+makedepends=('heimdal' 'apache' 'python' 'perl' 'swig' 'ruby' 'java-runtime' 
+             'autoconf' 'sqlite3' 'db' 'e2fsprogs' ) 
+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.tigris.org/"
 provides=('svn')
-options=('!makeflags' 'libtool')
-
-md5sums=('6a57efcc9e487e9bffc554931c98d3a0'
-         'c5a2e490b3e58c6bd2ca3a2e72b71845'
-         'a0db6dd43af33952739b6ec089852630'
-         'c459e299192552f61578f3438abf0664')
+options=('!makeflags' '!libtool')
+optdepends=( 'bash-completion: for svn bash completion')
 
 build() {
-   cd $startdir/src/${pkgname}-${pkgver}
-
-
-   #patch -Np1 -i $startdir/src/subversion-neon.patch
+   cd ${srcdir}/${pkgname}-${pkgver} || return 1
 
-   #sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1 0.28.2"/' -i configure.in
+   # apply patches
+   patch -p0 < $srcdir/subversion.rpath.fix.patch || return 1
+   patch -p1 -i $srcdir/subversion.suppress.deprecation.warnings.patch \
+               || return 1
 
-#   libtoolize --force --copy
-#   aclocal -I build/ac-macros
-#   autoconf
-
-   autoreconf
+   # configure
+   autoreconf || return 1
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
-               --with-zlib=/usr --with-neon=/usr --disable-ldap
-
-   (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) || return 1
-
-   export LD_LIBRARY_PATH=$startdir/pkg/usr/lib:$LD_LIBRARY_PATH
-   make DESTDIR=$startdir/pkg install || return 1
-
-#   make DESTDIR=$startdir/pkg swig-py || return 1
-#   make install-swig-py DESTDIR=$startdir/pkg || return 1
-
- #  mkdir -p $startdir/pkg/usr/lib/python2.5
- #  mv $startdir/pkg/usr/lib/svn-python/ $startdir/pkg/usr/lib/python2.5/site-packages
-
-
-   mkdir -p $startdir/pkg/usr/share/subversion
-   install -d -m 755 tools/hook-scripts $startdir/pkg/usr/share/subversion/
-   rm -f $startdir/pkg/usr/share/subversion/hook-scripts/*.in
-
-#   make DESTDIR=$startdir/pkg swig-pl || return 1
-#   make install-swig-pl DESTDIR=$startdir/pkg INSTALLDIRS=vendor || return 1
-   rm -f $startdir/pkg/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
-   rm -rf $startdir/pkg/usr/lib/perl5/core_perl
-
-#   make DESTDIR=$startdir/pkg swig-rb || return 1
-#   make install-swig-rb DESTDIR=$startdir/pkg  || return 1
-
-#   make DESTDIR=$startdir/pkg javahl || return 1
-#   make DESTDIR=$startdir/pkg install-javahl || return 1
-
-   mkdir -p $startdir/pkg/etc/rc.d
-   mkdir -p $startdir/pkg/etc/xinetd.d
-   mkdir -p $startdir/pkg/etc/conf.d
-
-   install -m 755 $startdir/src/svnserve $startdir/pkg/etc/rc.d
-   install -m 644 $startdir/src/svn $startdir/pkg/etc/xinetd.d
-   install -m 644 $startdir/src/svnserve.conf $startdir/pkg/etc/conf.d/svnserve
-   install -m 755 $startdir/src/subversion-$pkgver/contrib/client-side/svnmerge/svnmerge.py $startdir/pkg/usr/bin/svnmerge
-   install -D -m 644 $startdir/src/subversion-$pkgver/COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
-
-   #libtoolslay not all because of kdesdk
-#   find ${startdir}/pkg/usr/lib/httpd/modules -name '*.la' -exec rm {} \;
-#   find ${startdir}/pkg/usr/lib/ruby -name '*.la' -exec rm {} \;
-#   find ${startdir}/pkg/usr/lib/python2.5 -name '*.la' -exec rm {} \;
+               --with-zlib=/usr --with-neon=/usr --with-apxs \
+               --with-sqlite=/usr \
+               --enable-javahl  || return 1
+
+   # build
+   (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) \
+               || return 1
+
+   # install
+   export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
+   make DESTDIR=${pkgdir} install || return 1
+
+   make DESTDIR=${pkgdir} swig-py || return 1
+   make install-swig-py DESTDIR=${pkgdir} || return 1
+
+   mkdir -p ${pkgdir}/usr/lib/python2.6 || return 1
+   mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.6/site-packages \
+               || return 1
+
+   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
+
+   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-rb || return 1
+   make install-swig-rb DESTDIR=${pkgdir}  || return 1
+
+   make DESTDIR=${pkgdir} javahl || return 1
+   make DESTDIR=${pkgdir} install-javahl || return 1
+
+   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 -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 -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \
+               ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
+
+   # bash completion
+   install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
+               ${pkgdir}/etc/bash_completion.d/subversion || return 1
 }
-
+md5sums=('9c30a47b1d48664e7afef68bb4834c53'
+         'a2b029e8385007ffb99b437b30521c90'
+         'a0db6dd43af33952739b6ec089852630'
+         'c459e299192552f61578f3438abf0664'
+         '21bf3aa5b797ce98eba8307f30e9c070'
+         '6b4340ba9d8845cd8497e013ae01be3f'
+         '1166f3b7413d7e7450299b3525680bbe')