Import of pkgsrc-2016Q3

lang/lua52/DESCR

@@ -1,21 +1,11 @@
-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 less popular than two other popular Lua versions and
+you should probably consider switching to a newer version.

lang/lua52/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2015/03/08 10:55:19 alnsn Exp $
+# $NetBSD: Makefile,v 1.9 2015/12/06 00:25:26 alnsn Exp $
 
 DISTNAME=	lua-${LUA_VERSION}
 PKGNAME=	lua52-${LUA_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.lua.org/ftp/ \
 		http://www.tecgraf.puc-rio.br/lua/ftp/
@@ -23,6 +24,16 @@ MAKE_ENV+=	DLLIB=${BUILDLINK_LDADD.dl:Q}
 MAKE_ENV+=	INSTALL_DATA=${INSTALL_DATA:Q}
 CFLAGS+=	-DLUA_ROOT=\"${PREFIX}/\"
 
+# 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.2
 

lang/lua52/distinfo

@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.6 2015/03/08 10:55:19 alnsn Exp $
+$NetBSD: distinfo,v 1.9 2015/12/29 23:34:50 dholland Exp $
 
 SHA1 (lua-5.2.4.tar.gz) = ef15259421197e3d85b7d6e4871b8c26fd82c1cf
 RMD160 (lua-5.2.4.tar.gz) = 3bad2da85f354132da6a53b45882006f0a451b5c
+SHA512 (lua-5.2.4.tar.gz) = cd77148aba4b707b6c159758b5e8444e04f968092eb98f6b4c405b2fb647e709370d5a8dcf604176101d3407e196a7433b5dcdce4fe9605c76191d3649d61a8c
 Size (lua-5.2.4.tar.gz) = 252651 bytes
-SHA1 (patch-aa) = ce0763ed1515f670b8a5d543af3753320cf06309
-SHA1 (patch-ab) = 498dac3f444ccf6f6dff22c4644b8123865f3a9d
-SHA1 (patch-ac) = b8b9c0068210795e5eb22512767ac2e98bca8cbc
-SHA1 (patch-src_liolib.c) = e85afa1ab7060be2c027ecd619fd9c9fd721a8b5
-SHA1 (patch-src_lua.c) = 393ef8161b28e201abd5b27d7c4c92b19de4601e
+SHA1 (patch-aa) = abcc38841386df3072dce282a6139d541564c90f
+SHA1 (patch-ab) = 16c84008b67a272c7bb1d90448ffdd0d43f9d0fe
+SHA1 (patch-ac) = 76d0d9d28a8d3c0a26aeabc5459d443e2f984981
+SHA1 (patch-src_liolib.c) = 28de216dec83bfdc94fbd1d2d28fe1159ea009c9
+SHA1 (patch-src_lua.c) = c7954061f0ae6fb70853877851a9a38bf491ed3d

lang/lua52/patches/patch-aa

@@ -1,4 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2014/05/03 13:00:45 alnsn Exp $
+$NetBSD: patch-aa,v 1.3 2015/12/29 23:34:51 dholland Exp $
+
+Configure for pkgsrc.
+Install by Lua version so multiple versions can coexist.
+DESTDIR support.
 
 --- Makefile.orig	2013-11-10 00:49:35.000000000 +0000
 +++ Makefile

lang/lua52/patches/patch-ab

@@ -1,17 +1,24 @@
-$NetBSD: patch-ab,v 1.3 2015/03/05 13:39:20 ryoon Exp $
+$NetBSD: patch-ab,v 1.5 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	2013-11-11 11:45:49.000000000 +0000
 +++ src/Makefile
-@@ -6,8 +6,7 @@
+@@ -6,9 +6,8 @@
  # Your platform. See PLATS for possible values.
  PLAT= none
  
 -CC= gcc
 -CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
 +CFLAGS+= -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
- LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
++LDFLAGS+= $(SYSLDFLAGS) $(MYLDFLAGS)
  LIBS= -lm $(SYSLIBS) $(MYLIBS)
  
+ AR= ar rcu
 @@ -24,23 +23,28 @@ MYLDFLAGS=
  MYLIBS=
  MYOBJS=

lang/lua52/patches/patch-ac

@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2013/10/30 06:18:10 dholland Exp $
+$NetBSD: patch-ac,v 1.2 2015/12/29 23:34:51 dholland Exp $
+
+- allow LUA_ROOT to be set from the pkgsrc makefile
+- solaris fix for PR 43350
 
 --- src/luaconf.h.orig	2013-03-16 21:10:18.000000000 +0000
 +++ src/luaconf.h

lang/lua52/patches/patch-src_liolib.c

@@ -1,4 +1,5 @@
-$NetBSD: patch-src_liolib.c,v 1.1 2015/01/02 15:50:44 alnsn Exp $
+$NetBSD: patch-src_liolib.c,v 1.2 2015/12/29 23:34:51 dholland Exp $
+
 Fix build on Darwin powerpc: pkg/49526.
 
 --- src/liolib.c.orig	2013-04-12 18:48:47.000000000 +0000

lang/lua52/patches/patch-src_lua.c

@@ -1,4 +1,7 @@
-$NetBSD: patch-src_lua.c,v 1.1 2015/03/05 13:39:20 ryoon Exp $
+$NetBSD: patch-src_lua.c,v 1.2 2015/12/29 23:34:51 dholland Exp $
+
+Disable Lua module version check under Cygwin.
+XXX: This workaround should be investigated deeper.
 
 --- src/lua.c.orig	2013-04-12 18:48:47.000000000 +0000
 +++ src/lua.c