[arch-commits] Commit in luaexpat/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Thursday, April 3, 2014 @ 18:52:18
  Author: spupykin
Revision: 108780

upgpkg: luaexpat 1.3.0-1

upd

Modified:
  luaexpat/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-03 16:28:13 UTC (rev 108779)
+++ PKGBUILD	2014-04-03 16:52:18 UTC (rev 108780)
@@ -4,8 +4,8 @@
 
 pkgbase=luaexpat
 pkgname=(lua-expat lua51-expat)
-pkgver=1.2.0
-pkgrel=4
+pkgver=1.3.0
+pkgrel=1
 pkgdesc='SAX XML parser based on the Expat library'
 arch=('i686' 'x86_64')
 url='http://matthewwild.co.uk/projects/luaexpat/'
@@ -13,12 +13,10 @@
 makedepends=('gcc' 'lua' 'lua51' 'expat')
 source=("http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz"
 	    'config.51'
-	    'config.52'
-	    'lua52.patch')
-md5sums=('03efe50c7f30a34580701e6527d7bfee'
+	    'config.52')
+md5sums=('3c20b5795e7107f847f8da844fbfe2da'
          '64abbf5b602e0e31b68db2925a5e6b2f'
-         '60ae0633ac6f829cc3359f3533252eb0'
-         '21da93cbf0d3cef80d00e2380b7c2679')
+         '60ae0633ac6f829cc3359f3533252eb0')
 
 build() {
   # 5.1
@@ -26,13 +24,12 @@
   cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51
   cd $pkgbase-$pkgver-51
   cp -L "$srcdir/config.51" config
-  make LUA_INC=/usr/include/lua5.1
+  make LUA_V=5.1
   # 5.2
   msg2 "Building $pkgbase with lua 5.2"
   cd "$srcdir/$pkgbase-$pkgver"
-  patch -p1 < "$srcdir/lua52.patch"
   cp -L "$srcdir/config.52" config
-  make
+  make LUA_V=5.2
 }
 
 package_lua-expat() {
@@ -39,8 +36,7 @@
   depends=('lua' 'expat')
 
   cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir" install
-  mv usr "$pkgdir"
+  make LUA_V=5.2 DESTDIR="$pkgdir" install
   install -Dm0644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
 }
 
@@ -50,7 +46,6 @@
   conflicts=('luaexpat')
 
   cd $pkgbase-$pkgver-51
-  make DESTDIR="$pkgdir" install
-  mv usr "$pkgdir"
+  make LUA_V=5.1 DESTDIR="$pkgdir" install
   install -Dm0644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
 }