ryzom PKGBUILD works now

3 files changed, 30 insertions, 19 deletions

diff --git a/.hgignore b/.hgignore
index 61ad8d9e3..ba9140764 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,11 +4,12 @@ syntax: glob
 *.log
 *~
 \#*\#
-src/
-pkg/
+src/*
+pkg/*
 *.pkg.tar.*
 *.src.tar.*
 *.log
 *.gz
 *.tar.*
-*/src-libre/*
\ No newline at end of file
+*/src-libre/*
+*/pkg-libre/*
\ No newline at end of file
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 1c48c8176..4146ffdb3 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,21 +1,22 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 # Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
 
-pkgname=('ryzom-nel')
-pkgbase=ryzom
+pkgname=('ryzom-hg-nel' 'ryzom-hg-client')
+pkgbase="ryzom-hg"
 pkgver=20130706
 pkgrel=2
 pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
-groups=('ryzom')
+groups=('ryzom-hg')
 depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql')
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
 # ryzom-20130706-2-any.src.tar.gz
-source=("libre://$pkgbase-$pkgver-${pkgrel}-any.src.tar.gz"
+source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz"
   'ryzom.sh'
   'ryzom.desktop')
+
 mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
 
 _CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client
@@ -35,7 +36,7 @@ _CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_
 #    make -k check
 #  }
 
-package_ryzom-nel() {
+package_ryzom-hg-nel() {
   # options and directives that can be overridden
   #pkgver=20130706
   #pkgrel=0
@@ -53,14 +54,22 @@ package_ryzom-nel() {
   make DESTDIR="$pkgdir/" install
 }
 
-# package_pkg2() {
-#   # options and directives overrides
-#   pkgdesc=""
+package_ryzom-hg-client() {
+  # options and directives overrides
+  pkgdesc="An awesome free software 3D MMORPG game. Game client."
 
-#   cd "$srcdir/$pkgbase-$pkgver"
-#   make DESTDIR="$pkgdir/" install-pkg2
-# }
-#
+  provides=('ryzom-hg-client')
+  conflicts=('ryzom-hg-client')
+  replaces=('ryzom-hg-client')
+  depends=('ryzom-hg-nel')
+
+  mkdir -p "$srcdir/build-client"
+  cd "$srcdir/build-client"
+
+  cmake -b "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -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
+  make DESTDIR="$pkgdir/" install
+}
 sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475'
             'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
             '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
diff --git a/pcr/ryzom-hg/SRCBUILD b/pcr/ryzom-hg/SRCBUILD
index 7758cd518..a04662b0d 100644
--- a/pcr/ryzom-hg/SRCBUILD
+++ b/pcr/ryzom-hg/SRCBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=ryzom
-pkgver=20130706
-pkgrel=2
+pkgname=("ryzom-hg")
+pkgver=20130708
+pkgrel=3
 pkgdesc="An awesome free software 3D MMORPG game"
 arch=(any)
 url="https://www.ryzom.com/"
 license=('AGPL3')
 makedepends=('mercurial')
+
 source=("ryzom.sh"
-    "ryzom.desktop")
+  "ryzom.desktop")
 
 _hgroot='https://bitbucket.org/ryzom/ryzomcore'
 _hgrepo='ryzomcore'