Thu Dec 13 02:27:45 PST 2012

3 files changed, 79 insertions, 9 deletions

diff --git a/community/luaexpat/PKGBUILD b/community/luaexpat/PKGBUILD
index b46e7bc75..1e438dfa9 100644
--- a/community/luaexpat/PKGBUILD
+++ b/community/luaexpat/PKGBUILD
@@ -1,29 +1,39 @@
-# $Id: PKGBUILD 81114 2012-12-12 00:47:39Z eric $
+# $Id: PKGBUILD 81199 2012-12-13 02:04:44Z seblu $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Lucas Hermann Negri <kkndrox@gmail.com>
 
 pkgbase=luaexpat
-pkgname=(lua-expat)
+pkgname=(lua-expat lua51-expat)
 pkgver=1.2.0
-pkgrel=1
+pkgrel=3
 pkgdesc='SAX XML parser based on the Expat library'
 arch=('i686' 'x86_64')
-url='http://code.matthewwild.co.uk/lua-expat'
+url='http://matthewwild.co.uk/projects/luaexpat/'
 license=('MIT')
-makedepends=('gcc' 'lua' 'expat>=2')
+makedepends=('gcc' 'lua' 'lua51' 'expat')
 replaces=(luaexpat)
 conflicts=(luaexpat)
 source=("http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz"
-	'newconfig'
-	'lua52.patch')
+	    'config.51'
+	    'config.52'
+	    'lua52.patch')
 md5sums=('03efe50c7f30a34580701e6527d7bfee'
+         '64abbf5b602e0e31b68db2925a5e6b2f'
          '60ae0633ac6f829cc3359f3533252eb0'
          '21da93cbf0d3cef80d00e2380b7c2679')
 
 build() {
-  cd $pkgbase-$pkgver
+  # 5.1
+  msg2 "Building $pkgbase with lua 5.1"
+  cp -a $pkgbase-$pkgver $pkgbase-$pkgver-51
+  cd $pkgbase-$pkgver-51
+  cp -L "$srcdir/config.51" config
+  make LUA_INC=/usr/include/lua5.1
+  # 5.2
+  msg2 "Building $pkgbase with lua 5.2"
+  cd "$srcdir/$pkgbase-$pkgver"
   patch -p1 < "$srcdir/lua52.patch"
-  cp -L "$srcdir/newconfig" config
+  cp -L "$srcdir/config.52" config
   make
 }
 
@@ -34,3 +44,11 @@ package_lua-expat() {
   mv usr "$pkgdir"
   install -Dm0644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
 }
+
+package_lua51-expat() {
+  depends=('lua51' 'expat')
+  cd $pkgbase-$pkgver-51
+  make DESTDIR="$pkgdir" install
+  mv usr "$pkgdir"
+  install -Dm0644 doc/us/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html"
+}
diff --git a/community/luaexpat/config.51 b/community/luaexpat/config.51
new file mode 100644
index 000000000..64afe1cca
--- /dev/null
+++ b/community/luaexpat/config.51
@@ -0,0 +1,26 @@
+LUA_LIBDIR= usr/lib/lua/5.1
+LUA_DIR= usr/share/lua/5.1
+LUA_INC= /usr/include/lua5.1
+EXPAT_INC= /usr/include
+
+# OS dependent
+LIB_OPTION= -shared
+
+LIBNAME= $T.so.$V
+LUA_VERSION_NUM= 515
+COMPAT_DIR= ../compat/src
+
+# Compilation parameters
+CWARNS = -Wall -pedantic \
+        -Waggregate-return \
+        -Wcast-align \
+        -Wmissing-prototypes \
+        -Wstrict-prototypes \
+        -Wnested-externs \
+        -Wpointer-arith \
+        -Wshadow \
+        -Wwrite-strings
+
+CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
+   -I$(COMPAT_DIR) -I$(EXPAT_INC) -fPIC
+CC = gcc
diff --git a/community/luaexpat/config.52 b/community/luaexpat/config.52
new file mode 100644
index 000000000..bc5b25d8f
--- /dev/null
+++ b/community/luaexpat/config.52
@@ -0,0 +1,26 @@
+LUA_LIBDIR= usr/lib/lua/5.2
+LUA_DIR= usr/share/lua/5.2
+LUA_INC= /usr/include
+EXPAT_INC= /usr/include
+
+# OS dependent
+LIB_OPTION= -shared
+
+LIBNAME= $T.so.$V
+LUA_VERSION_NUM= 521
+COMPAT_DIR= ../compat/src
+
+# Compilation parameters
+CWARNS = -Wall -pedantic \
+        -Waggregate-return \
+        -Wcast-align \
+        -Wmissing-prototypes \
+        -Wstrict-prototypes \
+        -Wnested-externs \
+        -Wpointer-arith \
+        -Wshadow \
+        -Wwrite-strings
+
+CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
+   -I$(COMPAT_DIR) -I$(EXPAT_INC) -fPIC
+CC = gcc