Thu Feb 7 00:08:35 PST 2013

1 files changed, 22 insertions, 17 deletions

diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD
index a9da47161..be9a68f2b 100644
--- a/community/gigi/PKGBUILD
+++ b/community/gigi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83482 2013-02-02 01:35:10Z arodseth $
+# $Id: PKGBUILD 83897 2013-02-06 12:43:24Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: fana-m <geminin@gmx.net>
@@ -7,10 +7,11 @@
 
 pkgname=gigi
 pkgver=0.8.0
-pkgrel=16
-_fixedrevision=5407 # 5208
-pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)"
-url="http://gigi.sourceforge.net/"
+pkgrel=17
+_fixedrevision=5407
+pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)'
+url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/'
+#url='http://gigi.sourceforge.net/'
 arch=('x86_64' 'i686')
 license=('LGPL')
 depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python')
@@ -19,7 +20,7 @@ makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa')
 build() {
   cd "$srcdir"
 
-  msg2 "Fetching files..."
+  msg2 'Fetching files...'
   if [ -d gigi/.svn ]; then
     (cd gigi && svn up -r "$_fixedrevision")
   else
@@ -32,33 +33,37 @@ build() {
   svn export gigi gigi-build
   cd gigi-build
 
-  msg2 "Configuring..."
+  msg2 'Configuring...'
   setconf cmake/GiGiOgre.pc.in prefix /usr
   setconf cmake/GiGi.pc.in prefix /usr
   setconf cmake/GiGiSDL.pc.in prefix /usr
-  cmake \
-    -D CMAKE_INSTALL_PREFIX="$pkgdir"/usr \
+  # It would be better if CMAKE_INSTALL_PREFIX or the resulting Makefiles
+  # could be re-configured in the package() function, but this works too.
+  cmake -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \
     -D BUILD_TUTORIALS=OFF \
     -D CPACK_GENERATOR=GiGiDevel \
-    -D CMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
+    -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \
     .
 
-  msg2 "Building documentation..."
+  msg2 'Building documentation...'
   cd doc
   doxygen
   cd ..
 
-  msg2 "Compiling..."
+  msg2 'Compiling...'
   make -j1
 }
 
 package() {
   cd "$srcdir/gigi-build"
 
-  msg2 "Packaging files..."
+  msg2 'Packaging files...'
   make install
 
-  msg2 "Fixing documentation..."
+  msg2 'Moving files to the right location...'
+  mv -v "$srcdir/pkg/usr" "$pkgdir/"
+
+  msg2 'Fixing documentation...'
   mkdir -p "$pkgdir/usr/share/doc"
   mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname"
 
@@ -66,13 +71,13 @@ package() {
     sed -i "s:$srcdir:/:g" "$f"
   done
 
-  msg2 "Fixing python3 shebang..."
+  msg2 'Python 3 fix...'
   for f in `find "$pkgdir/usr" -name "*.py"`; do
     sed -i "s:/env python:/python3:g" "$f"
   done
 
-  msg2 "Packaging license..."
-  install -Dm 644 COPYING \
+  msg2 'Packaging license...'
+  install -Dm644 COPYING \
     "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }