[arch-commits] Commit in blender/trunk (PKGBUILD)

[Rémy Oudompheng]

    Date: Friday, September 3, 2010 @ 16:35:11
  Author: remy
Revision: 89772

Use $srcdir and $pkgdir

Modified:
  blender/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-03 20:33:58 UTC (rev 89771)
+++ PKGBUILD	2010-09-03 20:35:11 UTC (rev 89772)
@@ -33,7 +33,7 @@
 
 build() {
   if [ $cvs = true ]; then
-    cd $startdir/src/
+    cd $srcdir/
     #cvs -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender login
     cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender checkout $pkgname || return 1
     _cvsrel=$pkgname-$(echo $pkgver | sed 's/\./-/')-release
@@ -41,7 +41,7 @@
     find $pkgname/{bin,release/scripts} -name 'CVS' -exec rm -rf {} \; 2> /dev/null
     cd $pkgname
   else
-    cd $startdir/src/$pkgname-$pkgver
+    cd $srcdir/$pkgname-$pkgver
   fi
 
  rm -f user-def.mk
@@ -91,37 +91,46 @@
  # build
   make || return 1
  ###########################################################################
-#  mkdir -p $startdir/pkg/usr/share/
+}
+
+package() {
+  if [ $cvs = true ]; then
+    cd $srcdir/$pkgname
+  else
+    cd $srcdir/$pkgname-$pkgver
+  fi
+
+#mkdir -p $pkgdir/usr/share/
   cd obj/linux-glibc2*/bin
 
 # common part
 
- mkdir -p $startdir/pkg/usr/share/
+ mkdir -p $pkgdir/usr/share/
 
  # install binaries
- install -Dm755 blender $startdir/pkg/usr/bin/blender
- install -Dm755 blenderplayer $startdir/pkg/usr/bin/blenderplayer
+ install -Dm755 blender $pkgdir/usr/bin/blender
+ install -Dm755 blenderplayer $pkgdir/usr/bin/blenderplayer
 
  # install internationalization support
  cd ../../../bin/.blender
  install -D -m644 .Blanguages \
-   $startdir/pkg/usr/share/$pkgname/.Blanguages
+   $pkgdir/usr/share/$pkgname/.Blanguages
  install -D -m644 .bfont.ttf \
-   $startdir/pkg/usr/share/$pkgname/.bfont.ttf
+   $pkgdir/usr/share/$pkgname/.bfont.ttf
 
- cp -R locale $startdir/pkg/usr/share/
+ cp -R locale $pkgdir/usr/share/
 
  # install scripts
  cd ../../release/
- cp -R scripts $startdir/pkg/usr/share/$pkgname/
+ cp -R scripts $pkgdir/usr/share/$pkgname/
 
  # install all additional stuff
  # install a freedesktop.org compliant menu entry
- install -Dm644 $startdir/src/$pkgname.desktop $startdir/pkg/usr/share/applications/$pkgname.desktop
+ install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
  # install some freedesktop.org compatibility
- install -D -m644 $startdir/src/$pkgname.svg $startdir/pkg/usr/share/pixmaps/$pkgname.svg
+ install -D -m644 $srcdir/$pkgname.svg $pkgdir/usr/share/pixmaps/$pkgname.svg
  # finally we render a png as fallback for not svg aware menu applications
  # Attention: always make sure you check the dimensions of the source-svg,
  # you can read the dimensions via inkscapes export funktion
- rsvg -w 64 -h 64 -f png $startdir/pkg/usr/share/pixmaps/$pkgname.svg $startdir/pkg/usr/share/pixmaps/$pkgname.png
+ rsvg -w 64 -h 64 -f png $pkgdir/usr/share/pixmaps/$pkgname.svg $pkgdir/usr/share/pixmaps/$pkgname.png
 }