[pkgsrc/trunk]: pkgsrc/lang/lua Update to 5.1.4:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f49983f8c3a9
branches:  trunk
changeset: 546750:f49983f8c3a9
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Sep 07 14:03:42 2008 +0000

description:
Update to 5.1.4:
Bugfix release.

diffstat:

 lang/lua/Makefile         |   5 ++---
 lang/lua/PLIST            |   8 +++++++-
 lang/lua/distinfo         |  10 +++++-----
 lang/lua/patches/patch-aa |  38 +++++++++++++++++++-------------------
 4 files changed, 33 insertions(+), 28 deletions(-)

diffs (118 lines):

diff -r f12b5daeffb8 -r f49983f8c3a9 lang/lua/Makefile
--- a/lang/lua/Makefile Sun Sep 07 13:54:57 2008 +0000
+++ b/lang/lua/Makefile Sun Sep 07 14:03:42 2008 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2008/02/27 18:52:16 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2008/09/07 14:03:42 wiz Exp $
 
-DISTNAME=      lua-5.1.3
-PKGREVISION=   1
+DISTNAME=      lua-5.1.4
 CATEGORIES=    lang
 MASTER_SITES=  ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
                ftp://ftp.gwdg.de/pub/languages/lua/ \
diff -r f12b5daeffb8 -r f49983f8c3a9 lang/lua/PLIST
--- a/lang/lua/PLIST    Sun Sep 07 13:54:57 2008 +0000
+++ b/lang/lua/PLIST    Sun Sep 07 14:03:42 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/06/15 17:45:37 obache Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/09/07 14:03:42 wiz Exp $
 bin/lua
 bin/luac
 include/lauxlib.h
@@ -46,6 +46,12 @@
 share/examples/lua/trace-calls.lua
 share/examples/lua/trace-globals.lua
 share/examples/lua/xd.lua
+@exec ${MKDIR} %D/share/lua/5.1
+@dirrm share/lua/5.1
+@dirrm share/lua
 @dirrm share/examples/lua/etc
 @dirrm share/examples/lua
 @dirrm share/doc/lua
+@exec ${MKDIR} %D/lib/lua/5.1
+@dirrm lib/lua/5.1
+@dirrm lib/lua
diff -r f12b5daeffb8 -r f49983f8c3a9 lang/lua/distinfo
--- a/lang/lua/distinfo Sun Sep 07 13:54:57 2008 +0000
+++ b/lang/lua/distinfo Sun Sep 07 14:03:42 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2008/02/11 19:54:55 adam Exp $
+$NetBSD: distinfo,v 1.22 2008/09/07 14:03:42 wiz Exp $
 
-SHA1 (lua-5.1.3.tar.gz) = 89bc9f5a351402565b8077e8123327e7cd15f004
-RMD160 (lua-5.1.3.tar.gz) = 1c5979dd4986057fef325aa2af0c872bbecab92e
-Size (lua-5.1.3.tar.gz) = 215817 bytes
-SHA1 (patch-aa) = 69ea99c9c51cba00b1c01dc587fce355928ade9d
+SHA1 (lua-5.1.4.tar.gz) = 2b11c8e60306efb7f0734b747588f57995493db7
+RMD160 (lua-5.1.4.tar.gz) = c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef
+Size (lua-5.1.4.tar.gz) = 216679 bytes
+SHA1 (patch-aa) = e1ae20d568097f2694abb2d2366082c829195ba8
 SHA1 (patch-ab) = 3c7a47f9e513b46003d1a05dd3bb99d42070885c
 SHA1 (patch-ac) = 9e882a3fd420a45ab4ac0dca55d1b2fac46eb7de
diff -r f12b5daeffb8 -r f49983f8c3a9 lang/lua/patches/patch-aa
--- a/lang/lua/patches/patch-aa Sun Sep 07 13:54:57 2008 +0000
+++ b/lang/lua/patches/patch-aa Sun Sep 07 14:03:42 2008 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.16 2008/02/11 19:54:55 adam Exp $
+$NetBSD: patch-aa,v 1.17 2008/09/07 14:03:42 wiz Exp $
 
---- Makefile.orig      2008-01-17 18:53:37.000000000 +0100
+--- Makefile.orig      2008-08-12 02:40:48.000000000 +0200
 +++ Makefile
-@@ -12,11 +12,11 @@ PLAT= none
- # doc directory.) You may want to make these paths consistent with LUA_ROOT,
- # LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
- #
+@@ -9,11 +9,11 @@ PLAT= none
+ 
+ # Where to install. The installation starts in the src and doc directories,
+ # so take care if INSTALL_TOP is not an absolute path.
 -INSTALL_TOP= /usr/local
 +INSTALL_TOP= ${PREFIX}
  INSTALL_BIN= $(INSTALL_TOP)/bin
@@ -13,10 +13,10 @@
  INSTALL_LIB= $(INSTALL_TOP)/lib
 -INSTALL_MAN= $(INSTALL_TOP)/man/man1
 +INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1
- INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
- INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
- 
-@@ -38,7 +38,7 @@ PLATS= aix ansi bsd freebsd generic linu
+ #
+ # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
+@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu
  # What to install.
  TO_BIN= lua luac
  TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
@@ -25,20 +25,20 @@
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -54,11 +54,11 @@ test:      dummy
+@@ -59,11 +59,11 @@ test:      dummy
        src/lua test/hello.lua
  
  install: dummy
--      cd src && $(MKDIR) -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+-      cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
 -      cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
 -      cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
 -      cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
 -      cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-+      cd src && $(MKDIR) -p ${DESTDIR}$(INSTALL_BIN) ${DESTDIR}$(INSTALL_INC) ${DESTDIR}$(INSTALL_LIB) ${DESTDIR}$(INSTALL_MAN) ${DESTDIR}$(INSTALL_LMOD) ${DESTDIR}$(INSTALL_CMOD)
-+      cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) ${DESTDIR}$(INSTALL_BIN)
-+      cd src && $(BSD_INSTALL_DATA) $(TO_INC) ${DESTDIR}$(INSTALL_INC)
-+      cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) ${DESTDIR}$(INSTALL_LIB)
-+      cd doc && $(BSD_INSTALL_MAN) $(TO_MAN) ${DESTDIR}$(INSTALL_MAN)
++      cd src && $(MKDIR) $(DESTDIR)$(INSTALL_BIN) $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_MAN) $(DESTDIR)$(INSTALL_LMOD) $(DESTDIR)$(INSTALL_CMOD)
++      cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(DESTDIR)$(INSTALL_BIN)
++      cd src && $(INSTALL_DATA) $(TO_INC) $(DESTDIR)$(INSTALL_INC)
++      cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
++      cd doc && $(INSTALL_DATA) $(TO_MAN) $(DESTDIR)$(INSTALL_MAN)
  
- local:
-       $(MAKE) install INSTALL_TOP=..
+ ranlib:
+       cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)