Wed Jul 31 01:58:05 PDT 2013

2 files changed, 30 insertions, 30 deletions

diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD
index 6c13a2e3f..ae98e2068 100644
--- a/community/freeorion/PKGBUILD
+++ b/community/freeorion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87411 2013-03-31 19:18:15Z stephane $
+# $Id: PKGBUILD 94805 2013-07-30 20:37:58Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Elmo Todurov <todurov@gmail.com>
 # Contributor: guini <sidtrun@googlemail.com>
@@ -8,7 +8,7 @@
 
 pkgname=freeorion
 pkgver=0.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
 arch=('x86_64' 'i686')
 url='http://www.freeorion.org/'
@@ -20,41 +20,41 @@ else
   depends=('nvidia-cg-toolkit')
 fi
 depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl')
-makedepends=('boost' 'ogre=1.8.1-4' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl'
+makedepends=('boost' 'ogre=1.8.1' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl'
              'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg')
 options=('!strip' '!emptydirs')
 install=$pkgname.install
 source=("$pkgname.sh"
         "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png"
-        "cmake_python.patch")
-sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf'
+        "cmake_python.patch"
+        "$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/#revision=6142")
+sha256sums=('25b574af5397226373e24510ce59de94c5df5b31d94562fc0de387fd70731707'
             'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f'
-            '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a')
-_svnrepo='https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/'
+            '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a'
+            'SKIP')
 _pyversion=2.7
-_revision=5771
+
+pkgver() {
+  #cd "$pkgname"
+
+  #svnversion | tr -d [A-z]
+  echo "$pkgver"
+}
+
+prepare() {
+  cd "$pkgname"
+
+  svn upgrade
+}
 
 build() {
   cd "$srcdir"
-  gendesk -n
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 
   #msg2 'Looking up revision from version number...'
   #_releaserevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1`
-  #msg2 'The revision for the latest official release is $_releaserevision"
-  ## _revision=$_releaserevision
-  #msg2 "Compiling with revision $_revision"
-
-  msg2 "Checking out svn revision $_revision..."
-  if [[ -d "$pkgname/.svn" ]]; then
-    (cd "$pkgname" && svn up -r "$_revision")
-  else
-    svn co "$_svnrepo" --config-dir ./ -r "$_revision" "$pkgname"
-  fi
 
-  msg2 'Setting up build directory...'
-  rm -rf "$srcdir/$pkgname-build"
-  cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
-  cd "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname"
 
   msg2 'CMake/Python fix...'
   patch -N -p1 -i "$srcdir/cmake_python.patch"
@@ -77,11 +77,11 @@ build() {
 
   msg2 'OGRE fix...'
   sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \
-    "$srcdir/$pkgname-build/ogre_plugins.cfg"
+    "$srcdir/$pkgname/ogre_plugins.cfg"
 }
 
 package() {
-  cd "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname"
 
   msg2 'Packaging documentation...'
   install -Dm644 loki_setup/README.txt \
@@ -111,7 +111,7 @@ package() {
     "$pkgdir/usr/share/applications/freeorion.desktop"
 
   msg2 'Packaging OGRE plugins configuration...'
-  install -Dm 644 "$srcdir/$pkgname-build/ogre_plugins.cfg" \
+  install -Dm 644 "$srcdir/$pkgname/ogre_plugins.cfg" \
     "$pkgdir/usr/share/freeorion/ogre_plugins.cfg"
 
   msg2 'Cleaning up...'
diff --git a/community/freeorion/freeorion.sh b/community/freeorion/freeorion.sh
index d80623ab2..9f35e7032 100644
--- a/community/freeorion/freeorion.sh
+++ b/community/freeorion/freeorion.sh
@@ -54,17 +54,17 @@
 # If this is a symlink, then we
 # need to change into the dir of symlink-target.
 if [ -h $0 ]; then
-  echo "I am Symlink. Following into my targets basedir"
+  #echo "I am Symlink. Following into my targets basedir"
   ME=`readlink $0`
 else
-  echo "Following into my basedir"
+  #echo "Following into my basedir"
   ME=$0
 fi
 
 # This is important! Script won't work outside its installation dir
 ROOT=/usr/share/freeorion
 cd ${ROOT}
-echo -n "CWD: "
+#echo -n "CWD: "
 pwd
 
 
@@ -86,7 +86,7 @@ if [ "$PYTHON_USE_SHIPPED" = "1" ]; then
     export PYTHONPATH=${PYTHONHOME}
     export PYTHONDEBUG=1
     export PYTHONVERBOSE=1
-    echo "PYTHONHOME=${PYTHONHOME}"
+    #echo "PYTHONHOME=${PYTHONHOME}"
     
     export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH}
     export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so