yafaray: rebuild pkg

1 files changed, 27 insertions, 24 deletions

diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index e3c0381d8..da46f5bfa 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,27 +1,32 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
-pkgname=(
-  yafaray
-  blender-addon-yafaray
-)
-_pkgname=${pkgname[0]}
-_bldname=${pkgname[1]::7}
+_pkgname=yafaray
+_bldname=blender
 _gitname=Core
 _addname=${_bldname^}-Exporter
 _pkgdate=20130510
-pkgver=1.5.$_pkgdate
-_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
 _bldver=2.67
 _bldep=8
 _pyver=3.3
-pkgrel=1
+
+# Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
+_srcver=44323def5b3866ff601fd401ef2160b80ced8141                                  
+# Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
+_addver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169
+
+pkgname=(
+  $_pkgname
+  $_bldname-addon-$_pkgname
+)
+pkgver=1.5.$_pkgdate
+pkgrel=2
 pkgdesc='A libre software raytracing engine'
 arch=(
   i686
   x86_64
   mips64el
 )
-url="http://www.$_pkgname.org"
+url=http://www.$_pkgname.org
 license=LGPL2.1
 depends=(
   freetype2
@@ -52,34 +57,32 @@ prepare() {
 
   git checkout $_srcver
 
-  [[ -d build ]] && rm -r build
-  mkdir build
+  [[ -d build ]] && rm -vr build
+  mkdir -v build
 }
 
 build() {
   cd $srcdir/$_gitname/build
-
-  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
     -DYAF_PY_VERSION=$_pyver\
     -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-  setarch $CARCH make
+  make
 }
 
 package_yafaray() {
   cd $srcdir/$_gitname/build
-  setarch $CARCH make DESTDIR=$pkgdir install
+  make DESTDIR=$pkgdir install
 }
 
 package_blender-addon-yafaray() {
-  pkgver=$pkgver.v$_bldver
-  _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
   pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
   arch=any
   depends=(
-    ${pkgname:14}=${pkgver%.v$_bldver}
+    $_pkgname=$pkgver
     "$_bldname>=$(($_bldep-1)):$_bldver"
     "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
   )
+  pkgver=$pkgver.v$_bldver
   optdepends=
 
   cd $srcdir/$_addname
@@ -87,13 +90,13 @@ package_blender-addon-yafaray() {
   a=/usr/lib
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
 
-  git checkout $_srcver
+  git checkout $_addver
   git checkout-index -a -f --prefix=${b%bin}
 
-  install -d $b
-  ln -sf $a/lib${_pkgname}core.so   $b/lib${_pkgname}core.so
-  ln -sf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so
-  ln -sf $a/$_pkgname               $b/plugins
+  install -vd $b
+  ln -vsf $a/lib${_pkgname}core.so   $b/lib${_pkgname}core.so
+  ln -vsf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so
+  ln -vsf $a/$_pkgname               $b/plugins
 }
 
 # vim:set ts=2 sw=2 et: