[arch-commits] CVS update of extra/devel/subversion (PKGBUILD)

[Kevin Piche]

    Date: Wednesday, January 30, 2008 @ 22:33:47
  Author: kevin
    Path: /home/cvs-extra/extra/devel/subversion

Modified: PKGBUILD (1.81 -> 1.82)

upgpkg: subversion 1.4.5-3
Updated for new perl policy, added license


----------+
 PKGBUILD |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


Index: extra/devel/subversion/PKGBUILD
diff -u extra/devel/subversion/PKGBUILD:1.81 extra/devel/subversion/PKGBUILD:1.82
--- extra/devel/subversion/PKGBUILD:1.81	Sat Sep 29 11:45:22 2007
+++ extra/devel/subversion/PKGBUILD	Wed Jan 30 22:33:47 2008
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD,v 1.81 2007/09/29 15:45:22 andyrtr Exp $
+# $Id: PKGBUILD,v 1.82 2008/01/31 03:33:47 kevin Exp $
 # Contributer: Jason Chu <jason at archlinux.org>
 # Maintainer: Jason Chu <jason at archlinux.org>
 pkgname=subversion
 pkgver=1.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 arch=(i686 x86_64)
+license=('APACHE' 'BSD')
 depends=('neon>=0.27.0-2' 'apr-util>=1.2.7-2')
 makedepends=('heimdal>=1.0.1' 'db>=4.6' 'apache' 'python>=2.5'
-             'perl>=5.8.8-1' 'swig>=1.3.27' 'jdk' 'jre' 'ruby'
+             'perl>=5.10.0' 'swig>=1.3.27' 'jdk' 'jre' 'ruby'
              'autoconf')
 source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
         svnserve svn svnserve.conf subversion-neon.patch)
@@ -65,12 +66,9 @@
    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 || return 1
-   
-# TODO: FIXME: is it necessary to move site_perl/5.7.8 to current, pacman complaint
-# for me if I didn't
-   /bin/rm -r $startdir/pkg/usr/lib/perl5/?.?.?
-   /bin/mv $startdir/pkg/usr/lib/perl5/site_perl/?.?.? $startdir/pkg/usr/lib/perl5/site_perl/current
+   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
@@ -86,6 +84,8 @@
    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.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/apache -name '*.la' -exec rm {} \;
    find ${startdir}/pkg/usr/lib/ruby -name '*.la' -exec rm {} \;