Import of pkgsrc-2016Q3

lang/lua53/DESCR

@@ -1,21 +1,10 @@
-Lua is a powerful, light-weight programming language designed for
-extending applications. Lua is also frequently used as a
-general-purpose, stand-alone language.
+Lua is a powerful, fast, lightweight, embeddable scripting language.
 
-Lua combines simple procedural syntax (similar to Pascal) with
-powerful data description constructs based on associative arrays and
-extensible semantics. Lua is dynamically typed, interpreted from
-bytecodes, and has automatic memory management, making it ideal for
-configuration, scripting, and rapid prototyping.
+Lua combines simple procedural syntax with powerful data description
+constructs based on associative arrays and extensible semantics. Lua is
+dynamically typed, runs by interpreting bytecode for a register-based
+virtual machine, and has automatic memory management with incremental
+garbage collection, making it ideal for configuration, scripting, and
+rapid prototyping.
 
-Lua is a language engine that you can embed into your application.
-This means that, besides syntax and semantics, Lua has an API that
-allows the application to exchange data with Lua programs and also to
-extend Lua with C functions. In this sense, Lua can be regarded as a
-language framework for building domain-specific languages.
-
-Lua is implemented as a small library of C functions, written in ANSI
-C, and compiles unmodified in all known platforms. The implementation
-goals are simplicity, efficiency, portability, and low embedding cost.
-The result is a fast language engine with small footprint, making it
-ideal in embedded systems too.
+This version is a preferred choice for new Lua modules.

lang/lua53/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2015/01/17 17:50:23 alnsn Exp $
+# $NetBSD: Makefile,v 1.2 2015/12/05 22:50:26 alnsn Exp $
 
 DISTNAME=	lua-${LUA_VERSION}
 PKGNAME=	lua53-${LUA_VERSION}
@@ -24,6 +24,16 @@ MAKE_ENV+=	DLLIB=${BUILDLINK_LDADD.dl:Q}
 MAKE_ENV+=	INSTALL_DATA=${INSTALL_DATA:Q}
 CFLAGS+=	-DLUA_ROOT=\"${PREFIX}/\"
 
+# Address pkg/47587 lua not linked to pthread causes issues with modules
+PTHREAD_OPTS+=		native
+
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
+CFLAGS+=	-pthread
+LDFLAGS+=	-pthread
+.endif
+
 PKGCONFIG_OVERRIDE=	${WRKSRC}/lua.pc
 INSTALLATION_DIRS+=	lib/pkgconfig share/doc/lua-5.3
 

lang/lua53/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/06/20 18:22:56 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/12/01 22:20:31 alnsn Exp $
 bin/lua5.3
 bin/luac5.3
 include/lua-5.3/lauxlib.h
@@ -8,8 +8,8 @@ include/lua-5.3/luaconf.h
 include/lua-5.3/lualib.h
 lib/liblua5.3.la
 lib/pkgconfig/lua-5.3.pc
-man/man1/lua${PKGVERSION}
-man/man1/luac${PKGVERSION}
+man/man1/lua5.3.1
+man/man1/luac5.3.1
 share/doc/lua-5.3/contents.html
 share/doc/lua-5.3/index.css
 share/doc/lua-5.3/logo.gif

lang/lua53/distinfo

@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2015/06/20 18:22:56 alnsn Exp $
+$NetBSD: distinfo,v 1.6 2016/06/06 22:18:07 alnsn Exp $
 
-SHA1 (lua-5.3.1.tar.gz) = 1676c6a041d90b6982db8cef1e5fb26000ab6dee
-RMD160 (lua-5.3.1.tar.gz) = 01fcb542ea0a69246c0594bb2578dc108547a49a
-Size (lua-5.3.1.tar.gz) = 282401 bytes
-SHA1 (patch-Makefile) = 44c9a812569c2a0f0221f197c95a672b059af84a
-SHA1 (patch-src_Makefile) = 975b1d4d6907524aad9527ffe18793c6bc93f1b4
-SHA1 (patch-src_luaconf.h) = dc2f535a1d0f407db4f62dab37a2d680ea794264
+SHA1 (lua-5.3.3.tar.gz) = a0341bc3d1415b814cc738b2ec01ae56045d64ef
+RMD160 (lua-5.3.3.tar.gz) = c4989f7ae83c61f745fc174f7953c4c601fdc5de
+SHA512 (lua-5.3.3.tar.gz) = 7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc
+Size (lua-5.3.3.tar.gz) = 294290 bytes
+SHA1 (patch-Makefile) = d7f67017cdd8add3e0ea2d1e857042bc4f130bf5
+SHA1 (patch-src_Makefile) = 2bb9cb27a7da00a62973838ed679e947b27033c0
+SHA1 (patch-src_luaconf.h) = cbe3f9cb9aef10ef52bc26404aa1fc6a960d434d

lang/lua53/patches/patch-Makefile

@@ -1,4 +1,8 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2015/01/17 17:50:23 alnsn Exp $
+$NetBSD: patch-Makefile,v 1.2 2015/12/29 23:34:51 dholland Exp $
+
+Configure for pkgsrc.
+Install by Lua version so multiple versions can coexist.
+DESTDIR support.
 
 --- Makefile.orig	2014-10-29 23:14:41.000000000 +0000
 +++ Makefile

lang/lua53/patches/patch-src_Makefile

@@ -1,4 +1,9 @@
-$NetBSD: patch-src_Makefile,v 1.1.1.1 2015/01/17 17:50:23 alnsn Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2015/12/29 23:34:51 dholland Exp $
+
+Configure for pkgsrc.
+Use libtool.
+Install by Lua version so multiple versions can coexist.
+Use readline.
 
 --- src/Makefile.orig	2015-01-05 16:04:52.000000000 +0000
 +++ src/Makefile

lang/lua53/patches/patch-src_luaconf.h

@@ -1,4 +1,7 @@
-$NetBSD: patch-src_luaconf.h,v 1.1.1.1 2015/01/17 17:50:23 alnsn Exp $
+$NetBSD: patch-src_luaconf.h,v 1.2 2015/12/29 23:34:51 dholland Exp $
+
+- allow LUA_ROOT to be set by the pkgsrc makefile
+- solaris fix for PR 43350
 
 --- src/luaconf.h.orig	2014-12-29 13:27:55.000000000 +0000
 +++ src/luaconf.h

lang/lua53/version.mk

@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.2 2015/06/20 18:22:56 alnsn Exp $
+# $NetBSD: version.mk,v 1.4 2016/06/06 22:18:07 alnsn Exp $
 
-LUA_VERSION=	5.3.1
+LUA_VERSION=	5.3.3
 
 LUA_VERSION_MAJOR=	${LUA_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
 LUA_VERSION_MINOR=	${LUA_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}