changes on Ryzom and Yate PKGBUIDLs

4 files changed, 104 insertions, 67 deletions

diff --git a/pcr/minetest/PKGBUILD b/pcr/minetest/PKGBUILD
index 8d11e3747..18546b470 100755
--- a/pcr/minetest/PKGBUILD
+++ b/pcr/minetest/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=minetest-git
-pkgver=20120409
-pkgrel=1
+pkgver=20120918
+pkgrel=2
 pkgdesc="An Infiniminer/Minecraft inspired game, git version."
 arch=('i686' 'x86_64')
 url="http://celeron.55.lt/~celeron55/minetest/"
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
index dbcd531f4..fce700054 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')
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')
diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD
index 01428fa27..e668cd3ae 100755..100644
--- a/pcr/yate/PKGBUILD
+++ b/pcr/yate/PKGBUILD
@@ -2,20 +2,21 @@
     # Contributor: Yejun Yang <yejunx AT gmail DOT com>
     # Contributor: Biru Ionut <ionut@archlinux.ro>
     pkgname=yate
-    pkgver=4.1.0
+    pkgver=4.2.0
     pkgrel=1
     pkgdesc="next-generation telephony engine"
     arch=('i686' 'x86_64')
     url="http://yate.null.ro"
     license=('GPL')
     depends=('speex' 'gsm' 'postgresql-libs' 'libmysqlclient' \
-             'alsa-lib')
+             'alsa-lib' 'qt')
     makedepends=('pkgconfig')
-    source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-1.tar.gz yate.init)
+    source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-2.tar.gz yate.init)
     options=(!makeflags)
     
-    md5sums=('06adaa9b8dc4f18908b35e9659ab9ad5'
-         'c0d344607046c47c1d75ac23d323817a')
+    md5sums=('e6fd37f26ff5c50aa3fa16f6b2803d68'
+	     'c0d344607046c47c1d75ac23d323817a')
+
          
     build() {
       cd $srcdir/${pkgname}