Mon Dec 12 23:14:53 UTC 2011

8 files changed, 270 insertions, 79 deletions

diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 55c6fd5fd..580f01fc9 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 144489 2011-12-06 22:57:33Z dan $
+# $Id: PKGBUILD 144948 2011-12-11 16:47:15Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.7.6
+pkgver=1.7.6.1
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64)
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra')
 source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('79f67eea3d43a5c9964194786d786f37')
-sha1sums=('6c63ece66875c9312b76bfe11d688e1b1ae2e3bb')
+md5sums=('084f1db244b77b3abff335550ef8eec5')
+sha1sums=('6203d4423d12315f1094b56a4d7393347104bc4a')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index daff81008..6d15fa99e 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 143216 2011-11-23 13:53:15Z ibiru $
+# $Id: PKGBUILD 144952 2011-12-11 23:12:10Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=20111123
+pkgver=20111211
 pkgrel=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
 license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm')
+depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvdpau libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
 makedepends=('yasm' 'git')
 #git clone git://git.videolan.org/ffmpeg.git
 source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('8ec30d05efe0f6cc6f702933e6781e8e')
+md5sums=('75d512bf5137d0b055e54313702ef5fc')
 
 build() {
   cd "$srcdir/$pkgname"
@@ -37,6 +37,7 @@ build() {
     --enable-libschroedinger \
     --enable-libopenjpeg \
     --enable-librtmp \
+    --enable-libpulse \
     --enable-gpl \
     --enable-version3 \
     --enable-runtime-cpudetect \
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 424492fe1..f97ac0662 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143841 2011-11-29 20:18:51Z ibiru $
+# $Id: PKGBUILD 144950 2011-12-11 21:22:27Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtk3
 pkgver=3.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="GTK+ is a multi-platform toolkit (v3)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -15,14 +15,17 @@ backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
         settings.ini
-        filechooserdefault_do_not_unref_value_twice.patch)
+        filechooserdefault_do_not_unref_value_twice.patch
+        moveresize.patch)
 sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
             'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6')
+            '0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6'
+            '627f430ccecc95ec61d9a83607469e71e95568c077f7bda849a7fe1c02d0bea7')
 
 build() {
     cd "$srcdir/gtk+-$pkgver"
     patch -Np1 -i "$srcdir/filechooserdefault_do_not_unref_value_twice.patch"
+    patch -Np1 -i "$srcdir/moveresize.patch"
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
diff --git a/extra/gtk3/moveresize.patch b/extra/gtk3/moveresize.patch
new file mode 100644
index 000000000..a2795fcc8
--- /dev/null
+++ b/extra/gtk3/moveresize.patch
@@ -0,0 +1,47 @@
+From 89c90ed193331d2ee96f323e10aaafd4366f4b0e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Sat, 10 Dec 2011 02:21:09 +0000
+Subject: Fix move-resize emulation with XI2
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650943
+---
+diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
+index 1ff816e..d48927f 100644
+--- a/gdk/x11/gdkwindow-x11.c
++++ b/gdk/x11/gdkwindow-x11.c
+@@ -4296,6 +4296,33 @@ _gdk_x11_moveresize_handle_event (XEvent *event)
+       if (event->xbutton.button == mv_resize->moveresize_button)
+         finish_drag (mv_resize);
+       break;
++
++#ifdef HAVE_XGENERICEVENTS
++    case GenericEvent:
++      {
++        /* we just assume this is an XI2 event */
++        XIEvent *ev = (XIEvent *) event->xcookie.data;
++        XIDeviceEvent *xev = (XIDeviceEvent *)ev;
++        gint state;
++        switch (ev->evtype)
++          {
++          case XI_Motion:
++            update_pos (mv_resize, xev->root_x, xev->root_y);
++            state = _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
++            if ((state & button_mask) == 0)
++            finish_drag (mv_resize);
++            break;
++
++          case XI_ButtonRelease:
++            update_pos (mv_resize, xev->root_x, xev->root_y);
++            if (xev->detail == mv_resize->moveresize_button)
++              finish_drag (mv_resize);
++            break;
++          }
++      }
++      break;
++#endif
++
+     }
+   return TRUE;
+ }
+--
+cgit v0.9.0.2
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index b77ab5dd6..9605f2daa 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 128645 2011-06-25 10:59:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 144956 2011-12-12 01:44:18Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
 pkgver=1.2.3
 _pkgver=4.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdelibs' 'boost-libs' 'subversion' 'qjson')
+depends=('kdelibs''subversion' 'qjson')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c8badd157c2477b1b299403d01d40f68a1ba14cd')
+source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'subversion17.patch')
+sha1sums=('c8badd157c2477b1b299403d01d40f68a1ba14cd'
+          '08e2ab2005a7a447f1733e8449a9bc926035fb9e')
 
 build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/subversion17.patch
+
   cd "${srcdir}"
   mkdir build
   cd build 
diff --git a/extra/kdevplatform/subversion17.patch b/extra/kdevplatform/subversion17.patch
new file mode 100644
index 000000000..782ac38ea
--- /dev/null
+++ b/extra/kdevplatform/subversion17.patch
@@ -0,0 +1,127 @@
+commit 74dec52749e3c3af2ac6492f50e2676128f35b27
+Author: Milian Wolff <mail@milianw.de>
+Date:   Fri Nov 18 16:26:06 2011 +0100
+
+    fix svn api usage: use svn_dirent_canonicalize instead of svn_path_internal_style
+    
+    this was suggested by Stephan Sperling
+    
+    CCBUG: 284061
+
+diff --git a/plugins/subversion/kdevsvncpp/path.cpp b/plugins/subversion/kdevsvncpp/path.cpp
+index eaa84c1..4dced08 100644
+--- a/plugins/subversion/kdevsvncpp/path.cpp
++++ b/plugins/subversion/kdevsvncpp/path.cpp
+@@ -24,6 +24,7 @@
+ 
+ // subversion api
+ #include "svn_path.h"
++#include "svn_dirent_uri.h"
+ 
+ // apr api
+ #include "apr_file_io.h"
+@@ -63,8 +64,7 @@ namespace svn
+       m_path = "";
+     else
+     {
+-      const char * int_path =
+-        svn_path_internal_style(path, pool.pool());
++      const char * int_path = svn_dirent_canonicalize(path, pool);
+ 
+       m_path = int_path;
+ 
+commit cc7f0798d314cdac14b90e427abe22e99c6bd591
+Author: Milian Wolff <mail@milianw.de>
+Date:   Fri Nov 18 16:23:36 2011 +0100
+
+    properly initialize client context for compatibility with subversion API
+    
+    this should hopefully fix the crash with svn 1.7 in kdevelop, please test
+    
+    BUG: 284061
+
+diff --git a/plugins/subversion/kdevsvncpp/context.cpp b/plugins/subversion/kdevsvncpp/context.cpp
+index d277591..ddbb657 100644
+--- a/plugins/subversion/kdevsvncpp/context.cpp
++++ b/plugins/subversion/kdevsvncpp/context.cpp
+@@ -65,7 +65,7 @@ public:
+     bool logIsSet;
+     int promptCounter;
+     Pool pool;
+-    svn_client_ctx_t ctx;
++    svn_client_ctx_t * ctx;
+     std::string username;
+     std::string password;
+     std::string logMessage;
+@@ -205,26 +205,26 @@ public:
+       svn_auth_open(&ab, providers, pool);
+ 
+       // initialize ctx structure
+-      memset(&ctx, 0, sizeof(ctx));
++      svn_client_create_context(&ctx, pool);
+ 
+       // get the config based on the configDir passed in
+-      svn_config_get_config(&ctx.config, c_configDir, pool);
++      svn_config_get_config(&ctx->config, c_configDir, pool);
+ 
+       // tell the auth functions where the config is
+       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR,
+                              c_configDir);
+ 
+-      ctx.auth_baton = ab;
+-      ctx.log_msg_func = onLogMsg;
+-      ctx.log_msg_baton = this;
+-      ctx.notify_func = onNotify;
+-      ctx.notify_baton = this;
+-      ctx.cancel_func = onCancel;
+-      ctx.cancel_baton = this;
++      ctx->auth_baton = ab;
++      ctx->log_msg_func = onLogMsg;
++      ctx->log_msg_baton = this;
++      ctx->notify_func = onNotify;
++      ctx->notify_baton = this;
++      ctx->cancel_func = onCancel;
++      ctx->cancel_baton = this;
+ 
+ #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2)
+-      ctx.notify_func2 = onNotify2;
+-      ctx.notify_baton2 = this;
++      ctx->notify_func2 = onNotify2;
++      ctx->notify_baton2 = this;
+ #endif
+     }
+ 
+@@ -234,7 +234,7 @@ public:
+       if (!value)
+         param = (void *)"1";
+ 
+-      svn_auth_set_parameter(ctx.auth_baton,
++      svn_auth_set_parameter(ctx->auth_baton,
+                              SVN_AUTH_PARAM_NO_AUTH_CACHE,
+                              param);
+     }
+@@ -245,7 +245,7 @@ public:
+       username = usr;
+       password = pwd;
+ 
+-      svn_auth_baton_t * ab = ctx.auth_baton;
++      svn_auth_baton_t * ab = ctx->auth_baton;
+       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
+                              username.c_str());
+       svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
+@@ -654,13 +654,13 @@ public:
+ 
+   Context::operator svn_client_ctx_t * ()
+   {
+-    return &(m->ctx);
++    return m->ctx;
+   }
+ 
+   svn_client_ctx_t *
+   Context::ctx()
+   {
+-    return &(m->ctx);
++    return m->ctx;
+   }
+ 
+   void
diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD
new file mode 100644
index 000000000..cad6d04c5
--- /dev/null
+++ b/extra/libbluray/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 144944 2011-12-11 14:37:09Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Andrew Cook <ariscop@gmail.com>
+
+pkgname=libbluray
+pkgver=0.2.1
+pkgrel=1
+pkgdesc="Library to access Blu-Ray disks for video playback"
+arch=('i686' 'x86_64')
+url="http://www.videolan.org/developers/libbluray.html"
+license=('LGPL2.1')
+depends=('libxml2')
+options=(!libtool)
+source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
+sha512sums=('b938ca838d6e4ceaac74ca8850efb9d8c312638b70a9b42ebffd63bf703341eab3ce98b6edeea9b3284ba1d0f8b46fe803db1f668e72752e1e23e96435ac77dc')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 2cd85eb0d..31964707c 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,100 +1,79 @@
-# $Id: PKGBUILD 143824 2011-11-29 13:33:54Z stephane $
+# $Id: PKGBUILD 144954 2011-12-12 00:43:44Z eric $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.6.17
-pkgrel=7
+pkgver=1.7.2
+pkgrel=1
 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' 'java-environment'
+license=('APACHE')
+depends=('neon' 'apr-util' 'sqlite3' 'file')
+optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
+            'python2: for some hook scripts' 'ruby: for some hook scripts')
+makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
              'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
 provides=('svn')
 options=('!makeflags' '!libtool')
-source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
+source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         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')
+        subversion.rpath.fix.patch)
+sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb'
+          '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae'
+          '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
+          '73b36c046c09cec2093354911c89e3ba8056af6c'
+          'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
+          'd240228e5755495c26e89d7ef47a75fb097dd040'
+          '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
-
    export PYTHON=/usr/bin/python2
 
-   # apply patches
-   patch -Np0 -i ../subversion.rpath.fix.patch
-   patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch
-   patch -Np1 -i ../subversion-perl-bindings.patch
+   patch -p0 -i ../subversion.rpath.fix.patch
+   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
 
-   # 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.2 \
                --enable-javahl --with-gnome-keyring --with-kwallet
 
-   # build
-   (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all )
+   make external-all
+   make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
+   make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb
 }
 
 #check() {
 #   cd "${srcdir}/${pkgname}-${pkgver}"
 #   export LANG=C LC_ALL=C
-#   make check check-swig-pl check-swig-py CLEANUP=yes
+#   make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb
 #}
 
 package() {
    cd "${srcdir}/${pkgname}-${pkgver}"
 
-   # install
-   export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH
-   make DESTDIR=${pkgdir} install
-
-   make DESTDIR=${pkgdir} swig-py
-   make install-swig-py DESTDIR=${pkgdir}
-
-   install -d ${pkgdir}/usr/lib/python2.7
-   mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages
-
-   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
-   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
-   make install-swig-rb DESTDIR=${pkgdir}
+   export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH
+   make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
+     swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
+     install install-swig-py install-swig-pl install-javahl # install-swig-rb
 
-   make DESTDIR=${pkgdir} javahl
-   make DESTDIR=${pkgdir} install-javahl
+   install -d "${pkgdir}"/usr/share/subversion
+   cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
+   rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
 
-   install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d}
+   rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
+   rm -rf "${pkgdir}"/usr/lib/perl5/core_perl
 
-   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
+   install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
+   install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
+   install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
+   install -m 755 "${srcdir}"/svnmerge.py "${pkgdir}"/usr/bin/svnmerge
 
    # bash completion
-   install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \
-               ${pkgdir}/etc/bash_completion.d/subversion
+   install -Dm 644 tools/client-side/bash_completion \
+     "${pkgdir}"/etc/bash_completion.d/subversion
 }