summaryrefslogtreecommitdiff
path: root/staging/subversion
diff options
context:
space:
mode:
authorroot <root@rshg047.dnsready.net>2011-07-02 23:10:09 +0000
committerroot <root@rshg047.dnsready.net>2011-07-02 23:10:09 +0000
commit1732308adb7885b00fc388f978e65b3ad15aa067 (patch)
tree7a26cedab2b721f05a3b57ccf578787217f8a9a7 /staging/subversion
parenta81bc5be2e3672119ca0313a1fde10397a31211e (diff)
Sat Jul 2 23:10:09 UTC 2011
Diffstat (limited to 'staging/subversion')
-rw-r--r--staging/subversion/PKGBUILD34
-rw-r--r--staging/subversion/subversion-perl-bindings.patch12
2 files changed, 30 insertions, 16 deletions
diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD
index 44c626813..8f8e8adbe 100644
--- a/staging/subversion/PKGBUILD
+++ b/staging/subversion/PKGBUILD
@@ -1,26 +1,34 @@
-# $Id: PKGBUILD 129526 2011-06-28 16:08:03Z stephane $
+# $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=5
-pkgdesc="Replacement for CVS, another versioning system (SVN)"
+pkgrel=6
+pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64')
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')
-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}"
@@ -30,6 +38,7 @@ 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
@@ -89,10 +98,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/staging/subversion/subversion-perl-bindings.patch b/staging/subversion/subversion-perl-bindings.patch
new file mode 100644
index 000000000..3c34daa47
--- /dev/null
+++ b/staging/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",