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

[Eric Bélanger]

    Date: Friday, November 18, 2011 @ 23:32:41
  Author: eric
Revision: 142951

upgpkg: lua 5.1.4-9

Update upstream patch, Remove man pages from docs directory, Clean up PKGBUILD

Modified:
  lua/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-19 03:45:48 UTC (rev 142950)
+++ PKGBUILD	2011-11-19 04:32:41 UTC (rev 142951)
@@ -4,27 +4,27 @@
 
 pkgname=lua 
 pkgver=5.1.4
-pkgrel=8
-pkgdesc="A powerful light-weight programming language designed for extending applications." 
+pkgrel=9
+_patchver=5.1.4-4
+pkgdesc="A powerful light-weight programming language designed for extending applications" 
 arch=('i686' 'x86_64')
 url="http://www.lua.org/"
 depends=('readline')
 license=('MIT')
 options=('!makeflags' '!emptydirs')
-source=("http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz"
-        'http://www.lua.org/ftp/patch-lua-5.1.4-3'
-        'lua-arch.patch'
-        'lua-5.1-cflags.diff')
+source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz
+        http://www.lua.org/ftp/patch-lua-${_patchver}
+        lua-arch.patch lua-5.1-cflags.diff)
 md5sums=('d0870f2de55d59c1c8419f36e8fac150'
-         '998ef7886183f61d3a5ca891a9ce6a79'
+         '329d8695e3e6f1267190e220559f7b6c'
          '6c5953f63904bf20a0183cdab05b80de'
          '249582bf1fd861ccf492d2c35a9fe732')
 
 build() { 
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/patch-lua-${_patchver}" -d src
   patch -p1 -i "${srcdir}/lua-arch.patch"
-  patch -i "${srcdir}/patch-lua-5.1.4-3" -d src
-  [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff
+  [ "$CARCH" == "x86_64" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff"
   [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
   make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
     INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
@@ -36,10 +36,10 @@
   make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
     INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
     install
-  install -D -m 644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
+  install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
 
   # Install the documentation
-  mkdir -p "${pkgdir}/usr/share/doc/lua"
-  cp -R doc/* "${pkgdir}/usr/share/doc/lua"
+  install -d "${pkgdir}/usr/share/doc/lua"
+  install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua"
 }