changes on Ryzom and Yate PKGBUIDLs

1 files changed, 51 insertions, 36 deletions

diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
index b45bef098..bc9fa3199 100755
--- a/pcr/ryzom-nel/PKGBUILD
+++ b/pcr/ryzom-nel/PKGBUILD
@@ -1,53 +1,68 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname='ryzom-nel'
-pkgver=0.8.0
-pkgrel=11
+pkgname=ryzom-nel-hg
+pkgver=2687
+pkgrel=3
+pkgdesc='An awesome free software 3D MMORPG game, NeL engine'
 arch=('x86_64' 'i686')
-conflicts=('ryzom-nel')
-groups=('ryzom')
-
-pkgdesc="An awesome free software 3D MMORPG game, NeL engine"
 url="http://www.ryzom.com"
 license=('AGPL3')
-depends=('freetype2'
-         'libx11' 
-         'mesa' 
-         'libxxf86vm' 
-         'openal' 
-         'freealut' 
-         'libogg' 
-         'libvorbis' 
-         'libxml2' 
-         'libjpeg' 
-         'rrdtool' )
-makedepends=('cmake' 'bison' 'kervalasquish-hg')
-
-auser="shackra"
-achangeset="56d1642e24ac"
-
-source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+groups=('ryzom')
+depends=('mercurial' 
+	     'freetype2'
+	     'libx11' 
+	     'mesa-git' 
+	     'libxxf86vm' 
+	     'openal' 
+	     'freealut' 
+	     'libogg' 
+	     'libvorbis' 
+	     'libxml2'
+	     'libjpeg-turbo' 
+	     'rrdtool'
+	     'libgl-git')
+makedepends=('mercurial' 'cmake' 'bison')
+
+conflicts=('ryzom-nel' 'ryzom-nel-hg')
+replaces=('ryzom-nel')
+backup=('etc/nel/build_ig_boxes.cfg'
+	'etc/nel/build_indoor_rbank.cfg'
+	'etc/nel/build_rbank.cfg'
+	'etc/nel/make_sheet_id.cfg'
+	'etc/nel/zviewer.cfg')
+
+_hgroot=http://ryzom.hg.sourceforge.net/hgroot/ryzom/ryzom
+_hgrepo=ryzom
 
 build() {
-  cd "$srcdir/$auser-ryzom-$achangeset/code"
- 
-  if [[ -d $pkgname ]]; then
-     rm -rf $pkgname
-     mkdir $pkgname
+  cd "$srcdir"
+  msg "Connecting to Mercurial server...."
+
+  if [[ -d "$_hgrepo" ]]; then
+    cd "$_hgrepo"
+    hg pull -u
+    msg "The local files are updated."
   else
-     mkdir $pkgname
+    hg clone "$_hgroot" "$_hgrepo"
   fi
 
-  cd $pkgname
+  msg "Mercurial checkout done or server timeout"
+  msg "Starting build..."
 
-  #CMAKE_USE_RELATIVE_PATHS=true
-  cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel
+  rm -rf "$srcdir/$_hgrepo-build"
+  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
+  mkdir "$srcdir/$_hgrepo-build/code/ryzom-nel"
+  cd "$srcdir/$_hgrepo-build/code/ryzom-nel"
 
-  make -j3
+  #
+  # BUILD HERE
+  #
+  cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel
+  
+ make -j3
 }
 
 package() {
-  cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+  cd "$srcdir/$_hgrepo-build/code/ryzom-nel"
   make DESTDIR="$pkgdir" install
 }
 
-sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')