diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/lua/Makefile | 7 | ||||
| -rw-r--r-- | lang/lua/PLIST | 3 | ||||
| -rw-r--r-- | lang/lua/distinfo | 12 | ||||
| -rw-r--r-- | lang/lua/patches/patch-ab | 8 | ||||
| -rw-r--r-- | lang/lua/patches/patch-ac | 4 | ||||
| -rw-r--r-- | lang/lua/version.mk | 4 |
6 files changed, 17 insertions, 21 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile index 96cdd620fe4..cede4832fbc 100644 --- a/lang/lua/Makefile +++ b/lang/lua/Makefile @@ -1,12 +1,9 @@ -# $NetBSD: Makefile,v 1.47 2011/10/03 04:29:24 dholland Exp $ +# $NetBSD: Makefile,v 1.48 2012/03/12 15:49:27 wiz Exp $ DISTNAME= lua-${LUA_VERSION} -PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ \ - ftp://ftp.gwdg.de/pub/languages/lua/ \ - http://www.tecgraf.puc-rio.br/lua/ftp/ \ - http://ftp.gwdg.de/pub/languages/lua/ + http://www.tecgraf.puc-rio.br/lua/ftp/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.lua.org/ diff --git a/lang/lua/PLIST b/lang/lua/PLIST index 9d62206b5c3..b8267b5329d 100644 --- a/lang/lua/PLIST +++ b/lang/lua/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2009/06/14 20:34:14 joerg Exp $ +@comment $NetBSD: PLIST,v 1.13 2012/03/12 15:49:27 wiz Exp $ bin/lua bin/luac include/lauxlib.h @@ -13,7 +13,6 @@ man/man1/luac.1 share/doc/lua/COPYRIGHT share/doc/lua/HISTORY share/doc/lua/README -share/doc/lua/amazon.gif share/doc/lua/contents.html share/doc/lua/logo.gif share/doc/lua/lua.html diff --git a/lang/lua/distinfo b/lang/lua/distinfo index ea1858110b6..d29bfc68e50 100644 --- a/lang/lua/distinfo +++ b/lang/lua/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.27 2011/01/19 13:46:13 adam Exp $ +$NetBSD: distinfo,v 1.28 2012/03/12 15:49:27 wiz Exp $ -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 (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) = b1a68274b67d985dd23d9eb031a7f36acefe6adf -SHA1 (patch-ac) = a7cd4d0cce86b511481a6ef681aec64d97e3414e +SHA1 (patch-ab) = 6f0964957112afbbc77648c86ae2a6ddd20c3389 +SHA1 (patch-ac) = bd2348dcb273de09ddc09da906c93de6cc209c5c diff --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab index 2ccebf58ba4..a5b6f44be5b 100644 --- a/lang/lua/patches/patch-ab +++ b/lang/lua/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.13 2011/01/19 13:46:14 adam Exp $ +$NetBSD: patch-ab,v 1.14 2012/03/12 15:49:27 wiz Exp $ ---- src/Makefile.orig 2008-01-19 19:37:58.000000000 +0000 -+++ src/Makefile 2009-12-17 16:36:51.000000000 +0000 +--- src/Makefile.orig 2012-02-13 20:41:22.000000000 +0000 ++++ src/Makefile @@ -7,8 +7,8 @@ # Your platform. See PLATS for possible values. PLAT= none @@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.13 2011/01/19 13:46:14 adam Exp $ a: $(ALL_A) $(LUA_A): $(CORE_O) $(LIB_O) -- $(AR) $@ $? +- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files - $(RANLIB) $@ + ${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} -o $@ ${CORE_O} ${LIB_O} -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS} diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac index b95c6984cad..a453bee3095 100644 --- a/lang/lua/patches/patch-ac +++ b/lang/lua/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.8 2010/05/28 05:35:50 dholland Exp $ +$NetBSD: patch-ac,v 1.9 2012/03/12 15:49:27 wiz Exp $ - allow LUA_ROOT to be set by the pkgsrc makefile - solaris fix for PR 43350 @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.8 2010/05/28 05:35:50 dholland Exp $ #elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ - defined(__ELF__) -+ defined(__ELF__) && !defined(__sun__) ++ defined(__ELF__) && !defined(__sun) #define LUAI_FUNC __attribute__((visibility("hidden"))) extern #define LUAI_DATA LUAI_FUNC diff --git a/lang/lua/version.mk b/lang/lua/version.mk index 20bbebe9dc6..d491b69c5b4 100644 --- a/lang/lua/version.mk +++ b/lang/lua/version.mk @@ -1,6 +1,6 @@ -# $NetBSD: version.mk,v 1.1 2009/01/11 23:15:55 minskim Exp $ +# $NetBSD: version.mk,v 1.2 2012/03/12 15:49:27 wiz Exp $ -LUA_VERSION= 5.1.4 +LUA_VERSION= 5.1.5 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/} |