[pkgsrc/trunk]: pkgsrc/lang/lua Lua 5.2 was released on 16 Dec 2011. Its main...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/lua Lua 5.2 was released on 16 Dec 2011. Its main...
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 14:19:16 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/969fcea9e079
branches:  trunk
changeset: 621122:969fcea9e079
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jul 04 18:04:42 2013 +0000

description:
Lua 5.2 was released on 16 Dec 2011. Its main new features are yieldable pcall and metamethods, new lexical scheme for globals, ephemeron tables, new library for bitwise operations, light C 
functions, emergency garbage collector, goto statement, and finalizers for tables.

diffstat:

 lang/lua/Makefile         |  44 ++++++-------------------
 lang/lua/PLIST            |  40 +++--------------------
 lang/lua/buildlink3.mk    |   6 +-
 lang/lua/distinfo         |  14 ++++----
 lang/lua/files/lua.pc.in  |  21 ++++++++++++
 lang/lua/patches/patch-aa |  38 +++++++++++-----------
 lang/lua/patches/patch-ab |  78 +++++++++++++++++++++-------------------------
 lang/lua/patches/patch-ac |  33 +++++++++----------
 lang/lua/version.mk       |   4 +-
 9 files changed, 120 insertions(+), 158 deletions(-)

diffs (truncated from 432 to 300 lines):

diff -r 1e5e29ebfd7d -r 969fcea9e079 lang/lua/Makefile
--- a/lang/lua/Makefile Thu Jul 04 17:17:37 2013 +0000
+++ b/lang/lua/Makefile Thu Jul 04 18:04:42 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/10/02 20:11:44 asau Exp $
+# $NetBSD: Makefile,v 1.50 2013/07/04 18:04:42 adam Exp $
 
 DISTNAME=      lua-${LUA_VERSION}
 CATEGORIES=    lang
@@ -22,10 +22,8 @@
 MAKE_ENV+=     INSTALL_DATA=${INSTALL_DATA:Q}
 CFLAGS+=       -DLUA_ROOT=\"${PREFIX}/\"
 
-MAKE_FLAGS+=   CC=cc
-
-DOCDIR=                ${PREFIX}/share/doc/lua
-EGDIR=         ${PREFIX}/share/examples/lua
+PKGCONFIG_OVERRIDE=    ${WRKSRC}/lua.pc
+INSTALLATION_DIRS+=    lib/pkgconfig share/doc/lua
 
 .if ${OPSYS} == "FreeBSD"
 BUILD_TARGET=  freebsd
@@ -43,36 +41,16 @@
 BUILD_TARGET=  generic
 .endif
 
-PKGCONFIG_OVERRIDE=    ${WRKSRC}/etc/lua.pc
-
-INSTALLATION_DIRS+=    lib/pkgconfig
-
-SUBST_CLASSES+=                pc-prefix
-SUBST_FILES.pc-prefix+=        ${WRKSRC}/etc/lua.pc
-SUBST_SED.pc-prefix+=  -e "s,/usr/local,${PREFIX},"
-SUBST_STAGE.pc-prefix= post-build
+pre-configure:
+       sed     -e 's,@PREFIX@,${PREFIX},g' \
+               -e 's,@VER@,${PKGVERSION_NOREV:R},g' \
+               -e 's,@REV@,${PKGVERSION_NOREV},g' \
+               ${FILESDIR}/lua.pc.in > ${WRKSRC}/lua.pc
 
 post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-       set -e; \
-       cd ${WRKSRC}; for f in README COPYRIGHT HISTORY; do             \
-               ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR};              \
-       done
-       set -e; \
-       cd ${WRKSRC}/doc; for f in *.html *.gif; do                     \
-               ${INSTALL_DATA} "$$f" ${DESTDIR}${DOCDIR};              \
-       done
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-       set -e; \
-       cd ${WRKSRC}/test; for f in README *.lua; do                    \
-               ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR};               \
-       done
-       ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/etc
-       set -e; \
-       cd ${WRKSRC}/etc; for f in README *.c *.ico *.lua; do \
-               ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR}/etc;           \
-       done
-       ${INSTALL_DATA} ${WRKSRC}/etc/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+       ${INSTALL_DATA} ${WRKSRC}/lua.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.??? ${DESTDIR}${PREFIX}/share/doc/lua
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.???? ${DESTDIR}${PREFIX}/share/doc/lua
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff -r 1e5e29ebfd7d -r 969fcea9e079 lang/lua/PLIST
--- a/lang/lua/PLIST    Thu Jul 04 17:17:37 2013 +0000
+++ b/lang/lua/PLIST    Thu Jul 04 18:04:42 2013 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2012/03/12 15:49:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2013/07/04 18:04:42 adam Exp $
 bin/lua
 bin/luac
 include/lauxlib.h
@@ -10,40 +10,12 @@
 lib/pkgconfig/lua.pc
 man/man1/lua.1
 man/man1/luac.1
-share/doc/lua/COPYRIGHT
-share/doc/lua/HISTORY
-share/doc/lua/README
 share/doc/lua/contents.html
 share/doc/lua/logo.gif
-share/doc/lua/lua.html
-share/doc/lua/luac.html
+share/doc/lua/lua.css
+share/doc/lua/manual.css
 share/doc/lua/manual.html
+share/doc/lua/osi-certified-72x60.png
 share/doc/lua/readme.html
-share/examples/lua/README
-share/examples/lua/bisect.lua
-share/examples/lua/cf.lua
-share/examples/lua/echo.lua
-share/examples/lua/env.lua
-share/examples/lua/etc/README
-share/examples/lua/etc/all.c
-share/examples/lua/etc/lua.ico
-share/examples/lua/etc/min.c
-share/examples/lua/etc/noparser.c
-share/examples/lua/etc/strict.lua
-share/examples/lua/factorial.lua
-share/examples/lua/fib.lua
-share/examples/lua/fibfor.lua
-share/examples/lua/globals.lua
-share/examples/lua/hello.lua
-share/examples/lua/life.lua
-share/examples/lua/luac.lua
-share/examples/lua/printf.lua
-share/examples/lua/readonly.lua
-share/examples/lua/sieve.lua
-share/examples/lua/sort.lua
-share/examples/lua/table.lua
-share/examples/lua/trace-calls.lua
-share/examples/lua/trace-globals.lua
-share/examples/lua/xd.lua
-@pkgdir share/lua/5.1
-@pkgdir lib/lua/5.1
+@pkgdir share/lua/5.2
+@pkgdir lib/lua/5.2
diff -r 1e5e29ebfd7d -r 969fcea9e079 lang/lua/buildlink3.mk
--- a/lang/lua/buildlink3.mk    Thu Jul 04 17:17:37 2013 +0000
+++ b/lang/lua/buildlink3.mk    Thu Jul 04 18:04:42 2013 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.14 2011/01/19 13:46:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2013/07/04 18:04:42 adam Exp $
 
 BUILDLINK_TREE+=       lua
 
 .if !defined(LUA_BUILDLINK3_MK)
 LUA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.lua+=    lua>=5.1.1
-BUILDLINK_ABI_DEPENDS.lua+=    lua>=5.1.4nb1
+BUILDLINK_API_DEPENDS.lua+=    lua>=5.2.0
+BUILDLINK_ABI_DEPENDS.lua+=    lua>=5.2.0
 BUILDLINK_PKGSRCDIR.lua?=      ../../lang/lua
 
 .include "../../devel/readline/buildlink3.mk"
diff -r 1e5e29ebfd7d -r 969fcea9e079 lang/lua/distinfo
--- a/lang/lua/distinfo Thu Jul 04 17:17:37 2013 +0000
+++ b/lang/lua/distinfo Thu Jul 04 18:04:42 2013 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2012/03/12 15:49:27 wiz Exp $
+$NetBSD: distinfo,v 1.29 2013/07/04 18:04:42 adam Exp $
 
-SHA1 (lua-5.1.5.tar.gz) = b3882111ad02ecc6b972f8c1241647905cb2e3fc
-RMD160 (lua-5.1.5.tar.gz) = b0c2234675335a8bf158a125b6778cf800c754a0
-Size (lua-5.1.5.tar.gz) = 221213 bytes
-SHA1 (patch-aa) = 25bcd22d3fc319c51356b7f976d0215eb04900db
-SHA1 (patch-ab) = 6f0964957112afbbc77648c86ae2a6ddd20c3389
-SHA1 (patch-ac) = bd2348dcb273de09ddc09da906c93de6cc209c5c
+SHA1 (lua-5.2.2.tar.gz) = 0857e41e5579726a4cb96732e80d7aa47165eaf5
+RMD160 (lua-5.2.2.tar.gz) = d17967150017e9b25a26c1ad527647cd0b9e598f
+Size (lua-5.2.2.tar.gz) = 251713 bytes
+SHA1 (patch-aa) = 5fa5c7fecc7fd50dc9d88d441ad9373f59ecb841
+SHA1 (patch-ab) = 4f2f05f6a5e4cfffe8f9ef7bf4de6f054074baa4
+SHA1 (patch-ac) = b8b9c0068210795e5eb22512767ac2e98bca8cbc
diff -r 1e5e29ebfd7d -r 969fcea9e079 lang/lua/files/lua.pc.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/lua/files/lua.pc.in  Thu Jul 04 18:04:42 2013 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: lua.pc.in,v 1.1 2013/07/04 18:04:42 adam Exp $
+# lua.pc is not any longer distributed, but is still required by other packages.
+
+prefix= @PREFIX@
+INSTALL_BIN= ${prefix}/bin
+INSTALL_INC= ${prefix}/include
+INSTALL_LIB= ${prefix}/lib
+INSTALL_MAN= ${prefix}/man/man1
+INSTALL_LMOD= ${prefix}/share/lua/@VER@
+INSTALL_CMOD= ${prefix}/lib/lua/@VER@
+
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: @REV@
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
diff -r 1e5e29ebfd7d -r 969fcea9e079 lang/lua/patches/patch-aa
--- a/lang/lua/patches/patch-aa Thu Jul 04 17:17:37 2013 +0000
+++ b/lang/lua/patches/patch-aa Thu Jul 04 18:04:42 2013 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.19 2009/12/17 16:42:46 jmmv Exp $
+$NetBSD: patch-aa,v 1.20 2013/07/04 18:04:42 adam Exp $
 
---- Makefile.orig      2008-08-12 01:40:48.000000000 +0100
-+++ Makefile   2009-12-17 16:36:32.000000000 +0000
-@@ -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.
+--- Makefile.orig      2012-05-17 14:05:54.000000000 +0000
++++ Makefile
+@@ -10,11 +10,11 @@ PLAT= none
+ # so take care if INSTALL_TOP is not an absolute path. See the local target.
+ # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
 -INSTALL_TOP= /usr/local
 +INSTALL_TOP= ${PREFIX}
  INSTALL_BIN= $(INSTALL_TOP)/bin
@@ -13,29 +13,29 @@
  INSTALL_LIB= $(INSTALL_TOP)/lib
 -INSTALL_MAN= $(INSTALL_TOP)/man/man1
 +INSTALL_MAN= $(INSTALL_TOP)/${PKGMANDIR}/man1
- #
- # 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).
-@@ -24,7 +24,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
- # may have to run ranlib on the installed liblua.a (do "make ranlib").
+ INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
+ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+ 
+@@ -22,7 +22,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
+ # you may have to run ranlib on the installed liblua.a.
  INSTALL= install -p
  INSTALL_EXEC= $(INSTALL) -m 0755
 -INSTALL_DATA= $(INSTALL) -m 0644
 +#INSTALL_DATA= $(INSTALL) -m 0644
  #
- # If you don't have install you can use cp instead.
+ # If you don't have "install" you can use "cp" instead.
  # INSTALL= cp -p
-@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu
+@@ -41,7 +41,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
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
 -TO_LIB= liblua.a
 +TO_LIB= liblua.la
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -59,11 +59,11 @@ test:      dummy
-       src/lua test/hello.lua
+@@ -58,11 +58,11 @@ test:      dummy
+       src/lua -v
  
  install: dummy
 -      cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
@@ -49,5 +49,5 @@
 +      cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
 +      cd doc && $(INSTALL_DATA) $(TO_MAN) $(DESTDIR)$(INSTALL_MAN)
  
- ranlib:
-       cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
+ uninstall:
+       cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
diff -r 1e5e29ebfd7d -r 969fcea9e079 lang/lua/patches/patch-ab
--- a/lang/lua/patches/patch-ab Thu Jul 04 17:17:37 2013 +0000
+++ b/lang/lua/patches/patch-ab Thu Jul 04 18:04:42 2013 +0000
@@ -1,80 +1,74 @@
-$NetBSD: patch-ab,v 1.14 2012/03/12 15:49:27 wiz Exp $
+$NetBSD: patch-ab,v 1.15 2013/07/04 18:04:42 adam Exp $
 
---- src/Makefile.orig  2012-02-13 20:41:22.000000000 +0000
+--- src/Makefile.orig  2012-12-27 10:51:43.000000000 +0000
 +++ src/Makefile
-@@ -7,8 +7,8 @@
+@@ -6,8 +6,7 @@
  # Your platform. See PLATS for possible values.
  PLAT= none
  
 -CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
-+CC?= gcc
-+CFLAGS+= -Wall $(MYCFLAGS)
- AR= ar rcu
- RANLIB= ranlib
- RM= rm -f
-@@ -18,22 +18,32 @@ MYCFLAGS=
- MYLDFLAGS=
+-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
++CFLAGS+= -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
+ 
+@@ -24,23 +23,28 @@ MYLDFLAGS=
  MYLIBS=
+ MYOBJS=
  
 +.SUFFIXES:    .lo
 +.c.lo:
 +      $(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $<
-+LV=   5:1
++LV=   5:2
 +
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+ # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
  
  PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
  
 -LUA_A=        liblua.a
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/avahi Fix build on NetBSD 6.99.23.
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/openjdk7 remove pasto
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/avahi Fix build on NetBSD 6.99.23.
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/openjdk7 remove pasto
Indexes:
Home | Main Index | Thread Index | Old Index