Adapt package to new packaging standards

2 files changed, 18 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0013871e7553..089f68ea7f64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = flightgear-git
 	pkgdesc = An open-source, multi-platform flight simulator
-	pkgver = 20150613
-	pkgrel = 3
+	pkgver = 20150829
+	pkgrel = 1
 	url = http://flightgear.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = git
 	makedepends = boost
 	depends = simgear-git
 	depends = libxmu
@@ -16,6 +15,8 @@ pkgbase = flightgear-git
 	depends = openscenegraph-git
 	provides = flightgear-git
 	conflicts = flightgear
+	source = git://git.code.sf.net/p/flightgear/flightgear
+	md5sums = SKIP
 
 pkgname = flightgear-git
 
diff --git a/PKGBUILD b/PKGBUILD
index bd7dc30d0076..b7ef5c6f3b19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,32 @@
 # Contributor: Pascal Groschwitz <p.groschwitz@googlemail.com>
 # Contributor: jmf <jmf at mesecons dot net>
 pkgname=flightgear-git
-pkgver=20150613
-pkgrel=3
+pkgver=20150829
+pkgrel=1
+_gitname=flightgear
 pkgdesc="An open-source, multi-platform flight simulator"
 arch=('i686' 'x86_64')
 url="http://flightgear.org/"
 license=('GPL')
 depends=('simgear-git' 'libxmu' 'libxi' 'zlib' 'fgdata-git' 'openscenegraph-git')
 optdepends=()
-makedepends=('git' 'boost')
+makedepends=('boost')
 provides=('flightgear-git')
 conflicts=('flightgear')
-
-_gitroot="git://git.code.sf.net/p/flightgear/flightgear"
-_gitname="flightgear"
+source=(git://git.code.sf.net/p/flightgear/flightgear)
+md5sums=('SKIP')
 
 build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    git checkout next
-    msg "The local files are updated."
-  else
-    git clone $_gitroot $_gitname
-    git checkout next
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
-  cmake ../flightgear -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_QT=0 -DFG_DATA_DIR:STRING="/usr/share/flightgear" -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_BUILD_TYPE=Debug
-
-  make -j8 || return 1
+  cd ${srcdir}/${_gitname}
+  git checkout next
+  mkdir ${srcdir}/${_gitname}-build/
+  cd "${srcdir}/${_gitname}-build/"
+  cmake ../${_gitname} -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_QT=1 -DFG_DATA_DIR:STRING="/usr/share/flightgear" -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_BUILD_TYPE=Debug
+  make || return 1
 }
 
 package(){
-  cd "$srcdir/$_gitname-build"
-  make DESTDIR="$pkgdir/" install
+  cd "$srcdir/${_gitname}-build"
+  make DESTDIR="${pkgdir}/" install
 }