pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/lua update lua to 5.1.1nb1 - fix build on linux (...
details: https://anonhg.NetBSD.org/pkgsrc/rev/647146a9b5f7
branches: trunk
changeset: 518313:647146a9b5f7
user: abs <abs%pkgsrc.org@localhost>
date: Wed Sep 06 14:58:00 2006 +0000
description:
update lua to 5.1.1nb1 - fix build on linux (and hopefully some others)
diffstat:
lang/lua/Makefile | 11 ++++++++++-
lang/lua/distinfo | 4 ++--
lang/lua/patches/patch-ab | 16 ++++++++--------
3 files changed, 20 insertions(+), 11 deletions(-)
diffs (70 lines):
diff -r 00e134480e1e -r 647146a9b5f7 lang/lua/Makefile
--- a/lang/lua/Makefile Wed Sep 06 14:06:12 2006 +0000
+++ b/lang/lua/Makefile Wed Sep 06 14:58:00 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2006/08/14 22:31:39 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/09/06 14:58:00 abs Exp $
DISTNAME= lua-5.1.1
+PKGREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
ftp://ftp.ntua.gr/pub/lang/lua/ \
@@ -30,7 +31,15 @@
DOCDIR= ${PREFIX}/share/doc/lua
EGDIR= ${PREFIX}/share/examples/lua
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(OPSYS:M*BSD*)
+BUILD_TARGET= bsd
+.elif ${OPSYS} == "Linux"
BUILD_TARGET= linux
+.else
+BUILD_TARGET= generic
+.endif
PKGCONFIG_OVERRIDE= ${WRKSRC}/etc/lua.pc
diff -r 00e134480e1e -r 647146a9b5f7 lang/lua/distinfo
--- a/lang/lua/distinfo Wed Sep 06 14:06:12 2006 +0000
+++ b/lang/lua/distinfo Wed Sep 06 14:58:00 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2006/09/02 19:22:32 rillig Exp $
+$NetBSD: distinfo,v 1.17 2006/09/06 14:58:00 abs Exp $
SHA1 (lua-5.1.1.tar.gz) = be13878ceef8e1ee7a4201261f0adf09f89f1005
RMD160 (lua-5.1.1.tar.gz) = 0b9cc31cca1a0f4c2ebb62f177dc157677953a4c
Size (lua-5.1.1.tar.gz) = 207810 bytes
SHA1 (patch-aa) = 089b2f33ec8263a18ec823fd8d75d6e734003b06
-SHA1 (patch-ab) = 6aaf6f383b10ba4096498a2d8b8f41d4ba9233fd
+SHA1 (patch-ab) = 2ea6ab36420c886b73ce3ad7494b34a2100eee4d
diff -r 00e134480e1e -r 647146a9b5f7 lang/lua/patches/patch-ab
--- a/lang/lua/patches/patch-ab Wed Sep 06 14:06:12 2006 +0000
+++ b/lang/lua/patches/patch-ab Wed Sep 06 14:58:00 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2006/08/14 22:31:39 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2006/09/06 14:58:00 abs Exp $
--- src/Makefile.orig 2006-03-22 00:41:49.000000000 +0000
+++ src/Makefile
@@ -59,12 +59,12 @@
clean:
$(RM) $(ALL_T) $(ALL_O)
-@@ -92,7 +102,7 @@ generic:
- $(MAKE) all MYCFLAGS=
+@@ -86,7 +96,7 @@ ansi:
+ $(MAKE) all MYCFLAGS=-DLUA_ANSI
- linux:
-- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
-+ $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -lreadline -lhistory -lncurses"
+ bsd:
+- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
++ $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -DLUA_USE_READLINE" MYLIBS="-Wl,-E -lreadline -lhistory"
- macosx:
- $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+ generic:
+ $(MAKE) all MYCFLAGS=
Home |
Main Index |
Thread Index |
Old Index