use proper git source and pkgver function instead of custom cloning code

1 files changed, 15 insertions, 28 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3ee0b6614125..7cd297b4c392 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 # Contributor: Lubosz Sarnecki <lubosz at gmail>
 
 pkgname=arx-git
-pkgver=20111108
+pkgver=1.1.2.r5464.gc87968a
 pkgrel=1
 pkgdesc='Cross-platform port of Arx Fatalis, a first-person fantasy RPG (executables only; Git version)'
+url='http://arx-libertatis.org/'
 arch=('i686' 'x86_64')
-url='https://github.com/arx/ArxLibertatis'
 license=('GPL3')
 depends=('sdl' 'devil' 'openal' 'zlib' 'boost' 'glew' 'mesa' 'libgl')
 optdepends=('arxfatalis-data-gog: game data from GOG.com installer'
@@ -18,35 +18,22 @@ optdepends=('arxfatalis-data-gog: game data from GOG.com installer'
 makedepends=('git' 'cmake')
 provides=('arx')
 conflicts=('arx')
-source=()
 install=arx.install
-md5sums=()
 
-_gitroot="git://github.com/arx/ArxLibertatis.git"
-_gitname="ArxLibertatis"
+_gitname=ArxLibertatis
+source=(git+https://github.com/arx/ArxLibertatis.git)
+md5sums=('SKIP')
 
-build() {
-  cd ${srcdir}/
-
-  msg "Connecting to github...."
-  if [[ -d ${srcdir}/${_gitname} ]] ; then
-    cd ${_gitname}
-    git pull origin
-    msg "The local files are updated..."
-  else
-    git clone ${_gitroot}
-  fi
-
-  msg "git clone done."
-  
-  if [[ -d ${srcdir}/${_gitname}-build ]]; then
-    msg "Cleaning the previous build directory..." 
-    rm -rf ${srcdir}/${_gitname}-build
-  fi
-
-  git clone ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
+pkgver() {
+    cd $_gitname
+    _version=$(git describe --tags $(git rev-list --tags --max-count=1))
+    _commits=$(git log 1.1.2..master --pretty=oneline | wc -l)
+    _rev=$(git log -1 --format="%h")
+    echo "$_version.r$_commits.g$_rev"
+}
 
-  cd ${srcdir}/${_gitname}-build
+build() {
+  cd $_gitname
   
   msg "Starting cmake for: ${pkgname}"
   cmake . \
@@ -56,7 +43,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${_gitname}-build
+  cd $_gitname
   make DESTDIR=$pkgdir install || return 1
 }