Merge branch 'cooking' of github.com:graphitemaster/gmqcc into cooking

diff --git a/.gitignore b/.gitignore
index 596972e8cb5100df4a55eda4523fa440b1a2681d..342039cb75acefa4cecf1becd535a07c01f49b30 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,10 +7,12 @@
 testsuite
 qcvm
 gmqcc
+pak
 
-distro/arch/*
+distro/archlinux/*
+distro/archbsd/*
 !distro/archlinux/git/PKGBUILD
 !distro/archlinux/release/PKGBUILD
 !distro/archbsd/release/PKGBUILD
 !distro/archbsd/git/PKGBUILD
-!distro/arch/this/Makefile
+!distro/archlinux/this/Makefile

diff --git a/distro/archlinux/git/PKGBUILD b/distro/archlinux/git/PKGBUILD
index 4a9127cf37d532173b54cb2a13035c9570c19812..0ac2423a4828eef01a1b67ab0721df58ee3f912d 100644 (file)
--- a/distro/archlinux/git/PKGBUILD
+++ b/distro/archlinux/git/PKGBUILD
@@ -1,7 +1,11 @@
 # Contributor: matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org>
 
 pkgname=gmqcc-git
-pkgver=20130127
+pkgver=0.2.524.gc6bd5e6
+pkgver(){
+    cd gmqcc
+    git describe --tags | sed -e 's/^gmqcc\-//' -e 's/-/./g'
+}
 pkgrel=1
 pkgdesc="An Improved Quake C Compiler"
 arch=('i686' 'x86_64')
@@ -11,40 +15,25 @@ provides=('gmqcc=0.2.4')
 makedepends=('git')
 url="https://github.com/graphitemaster/gmqcc.git"
 license=('MIT')
+source=('gmqcc::git://github.com/graphitemaster/gmqcc.git')
+sha1sums=('SKIP')
 
-_gitroot="git://github.com/graphitemaster/gmqcc.git"
-_gitname="gmqcc"
 
 build() {
-       cd $srcdir
-       msg "Connecting to the GIT server..."
-       if [[ -d $srcdir/$_gitname ]] ; then
-               cd $_gitname
-               msg "Removing build files..."
-               git clean -dfx
-               msg "Updating..."
-               git pull --no-tags
-               msg "The local files are updated."
-       else
-               msg "Cloning..."
-               git clone $_gitroot $_gitname --depth 1
-               msg "Clone done."
-       fi
-
        msg "Starting compilation..."
-       cd "$srcdir"/"$_gitname"
+       cd "$srcdir"/"gmqcc"
 
        msg "Compiling..."
        make
 }
 
 check() {
-       cd "$srcdir"/"$_gitname"
+       cd "$srcdir"/"gmqcc"
        make check
 }
 
 package() {
-       cd "$srcdir"/"$_gitname"
+       cd "$srcdir"/"gmqcc"
        msg "Compiling and installing to pkgdir this time..."
        make install DESTDIR=$pkgdir PREFIX=/usr
        msg "Compiling done."

diff --git a/distro/archlinux/release/PKGBUILD b/distro/archlinux/release/PKGBUILD
index 1f8f66e5b6e8bbbec1e24eabce8610f003d4cecf..ef7de8fea3c2b8a06e5b9ac5dddfaeba7b592ed6 100644 (file)
--- a/distro/archlinux/release/PKGBUILD
+++ b/distro/archlinux/release/PKGBUILD
@@ -9,7 +9,7 @@ depends=('glibc')
 url="https://github.com/graphitemaster/gmqcc.git"
 license=('MIT')
 source=(gmqcc-$pkgver.zip::https://github.com/graphitemaster/gmqcc/zipball/$pkgver)
-sha1sums=('8cd91dc13f70cd9d3767602bf3eb47a1906d9353')
+sha1sums=('e0fe99af9a55d36cd9e0909a96d1b14f2db8b757')
 
 _gitname=graphitemaster-gmqcc-de24486/