Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 45 insertions, 24 deletions

diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
index dbcd531f4..fce700054 100644..100755
--- a/pcr/ryzom-client/PKGBUILD
+++ b/pcr/ryzom-client/PKGBUILD
@@ -1,42 +1,63 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=('ryzom-client')
-pkgver=0.8.0
-pkgrel=7
+pkgname=ryzom-client-hg
+pkgver=2691
+pkgrel=3
+pkgdesc='An awesome free software 3D MMORPG game'
 arch=('x86_64' 'i686')
 url="http://www.ryzom.com"
 license=('AGPL3')
-pkgdesc="An awesome free software 3D MMORPG game"
-depends=('ryzom-data' 'ryzom-nel' 'luabind')
-conflicts=('ryzom-client')
 groups=('ryzom')
+depends=('ryzom-data' 'ryzom-nel-hg' 'luabind')
+makedepends=('mercurial' 'kervalasquish-hg'
+             'cmake' 'bison' 'lua' 'luabind'
+	     'curl' 'libpng' 'libwww'
+	     'boost' 'ryzom-nel-hg')
 
-makedepends=('kervalasquish-hg' 'cmake' 'bison'  
-             'lua' 'luabind' 'curl' 'libpng' 'libwww'
-             'boost' 'ryzom-nel')
+conflicts=('ryzom-client' 'ryzom-client-hg')
+replaces=('ryzom-client')
+backup=('etc/client_default.cfg')
+source=('ftp://ftp.ryzom.com/1210062202_client_default.cfg')
+noextract=()
 
-auser="shackra"
-achangeset="56d1642e24ac"
-
-source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+_hgroot=http://ryzom.hg.sourceforge.net:8000/hgroot/ryzom/ryzom
+_hgrepo=ryzom
 
 build() {
-  cd "$srcdir/$auser-ryzom-$achangeset/code"
-  if [[ -d "ryzom-client" ]]; then
-     rm -rf "ryzom-client"
-     mkdir "ryzom-client"
+  cd "$srcdir"
+  msg "Connecting to Mercurial server...."
+
+  if [[ -d "$_hgrepo" ]]; then
+    cd "$_hgrepo"
+    hg pull -u
+    msg "The local files are updated."
   else
-     mkdir "ryzom-client"
+    hg clone "$_hgroot" "$_hgrepo"
   fi
-  
-  cd "ryzom-client"
-  cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
 
-  make -j3
+  msg "Mercurial checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$_hgrepo-build"
+  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
+  mkdir "$srcdir/$_hgrepo-build/code/ryzom-client"
+  cd "$srcdir/$_hgrepo-build/code/ryzom-client"
+
+  #
+  # BUILD HERE
+  #
+  cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc -DRYZOM_GAMES_PREFIX=bin
+  
+ make -j3
+ 
+ # Replacing client_default.cfg file
+ cp "$srcdir/1210062202_client_default.cfg" "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
+ sed -i s/"data"/"\/usr\/share\/ryzom\/data"/ "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
+ sed -i 's/= 1\.33333;/= 1\.7777;/' "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
 }
 
 package() {
-  cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+  cd "$srcdir/$_hgrepo-build/code/ryzom-client"
   make DESTDIR="$pkgdir" install
 }
 
-sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
+sha256sums=('0753c04dd7d61c43ec88d59428752b609d65f439eb1de9018bf922294e65966f')