Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/luaposix/PKGBUILD
	extra/mesa/PKGBUILD

1 files changed, 23 insertions, 16 deletions

diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
index c25ee30e0..bb1990f2a 100644
--- a/community/luaposix/PKGBUILD
+++ b/community/luaposix/PKGBUILD
@@ -1,36 +1,43 @@
-# $Id: PKGBUILD 81399 2012-12-19 13:39:36Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 93034 2013-06-22 17:02:30Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Laszlo Papp <djszapi at archlinux us>
 # Contributor: Donald Ephraim Curtis <dcurtis@gmail.com>
 
 pkgbase=luaposix
 pkgname=('lua-posix' 'lua51-posix')
-pkgver=5.1.23
-pkgrel=2
+pkgver=5.1.28
+pkgrel=1
 pkgdesc='A POSIX library for Lua programming language'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://luaforge.net/projects/luaposix/'
+url='https://github.com/luaposix/luaposix'
 license=('GPL' 'LGPL')
-makedepends=('lua' 'lua51' 'lua51-bitop')
+makedepends=('lua' 'lua51' 'lua51-bitop' 'git')
 options=('!libtool')
-source=("https://github.com/downloads/$pkgbase/$pkgbase/$pkgbase-$pkgver.tar.gz")
-md5sums=('ebe7d335741ca736e003a6844a0fbf92')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/v$pkgver.tar.gz")
+md5sums=('0ea20ea21bd9f92b79041beb6d41393e')
+
+prepare() {
+  # do bootstrap in prepare, as it clone external git
+  (cd $pkgbase-$pkgver && ./bootstrap)
+  cp -r $pkgbase-$pkgver $pkgbase-$pkgver-51
+}
 
 build() {
-  cd $pkgbase-$pkgver
-  mkdir build_51 build_52
   msg2 'Build with lua 5.2'
-  cd build_52
-  ../configure \
+  cd $pkgbase-$pkgver
+  ./configure \
+      LUA=/usr/bin/lua \
       --prefix=/usr \
       --libdir=/usr/lib/lua/5.2 \
       --datadir=/usr/share/lua/5.2 \
       --docdir=/usr/share/doc/lua-posix
   make
   msg2 'Build with lua 5.1'
-  cd ../build_51
-  ../configure CFLAGS=-I/usr/include/lua5.1 \
+  cd "$srcdir/$pkgbase-$pkgver-51"
+  ./configure \
+      LUA=/usr/bin/lua5.1 \
+      LUA_INCLUDE=-I/usr/include/lua5.1 \
       --prefix=/usr \
       --libdir=/usr/lib/lua/5.1 \
       --datadir=/usr/share/lua/5.1 \
@@ -41,7 +48,7 @@ build() {
 package_lua-posix() {
   depends=('lua')
 
-  cd $pkgbase-$pkgver/build_52
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir/" install
 }
 
@@ -50,7 +57,7 @@ package_lua51-posix() {
   conflicts=('luaposix')
   replaces=('luaposix')
 
-  cd $pkgbase-$pkgver/build_51
+  cd $pkgbase-$pkgver-51
   make DESTDIR="$pkgdir/" install
 }