diff options
| -rw-r--r-- | doc/CHANGES-2014 | 3 | ||||
| -rw-r--r-- | lang/LuaJIT2/Makefile | 4 | ||||
| -rw-r--r-- | lang/LuaJIT2/patches/patch-Makefile | 12 | ||||
| -rw-r--r-- | lang/LuaJIT2/patches/patch-src_lj__alloc.c | 15 |
4 files changed, 10 insertions, 24 deletions
diff --git a/doc/CHANGES-2014 b/doc/CHANGES-2014 index c237e7635bf..75977fd2670 100644 --- a/doc/CHANGES-2014 +++ b/doc/CHANGES-2014 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2014,v 1.1031 2014/03/12 21:30:43 gdt Exp $ +$NetBSD: CHANGES-2014,v 1.1032 2014/03/12 22:49:14 justin Exp $ Changes to the packages collection and infrastructure in 2014: @@ -1562,3 +1562,4 @@ Changes to the packages collection and infrastructure in 2014: Updated pkgtools/pkgdiff to 1.5 [asau 2014-03-12] Added security/libglobalplatform version 6.0.0 [gdt 2014-03-12] Added security/gpshell version 1.4.4 [gdt 2014-03-12] + Updated lang/LuaJIT2 to 2.0.3 [justin 2014-03-12] diff --git a/lang/LuaJIT2/Makefile b/lang/LuaJIT2/Makefile index bfb3a2afddf..9dc9502a896 100644 --- a/lang/LuaJIT2/Makefile +++ b/lang/LuaJIT2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2013/07/14 21:42:00 alnsn Exp $ +# $NetBSD: Makefile,v 1.2 2014/03/12 22:49:14 justin Exp $ # -DISTNAME= LuaJIT-2.0.2 +DISTNAME= LuaJIT-2.0.3 PKGNAME= ${DISTNAME:S/LuaJIT/LuaJIT2/} CATEGORIES= lang MASTER_SITES= http://luajit.org/download/ diff --git a/lang/LuaJIT2/patches/patch-Makefile b/lang/LuaJIT2/patches/patch-Makefile index ee608e80b42..45b72b24725 100644 --- a/lang/LuaJIT2/patches/patch-Makefile +++ b/lang/LuaJIT2/patches/patch-Makefile @@ -1,18 +1,18 @@ -$NetBSD: patch-Makefile,v 1.1.1.1 2013/07/14 21:42:00 alnsn Exp $ +$NetBSD: patch-Makefile,v 1.2 2014/03/12 22:49:14 justin Exp $ Fix installation. ---- Makefile.orig 2013-06-03 19:00:00.000000000 +0000 -+++ Makefile -@@ -24,7 +24,6 @@ ABIVER= 5.1 +--- Makefile.orig 2014-03-12 22:10:30.000000000 +0000 ++++ Makefile 2014-03-12 22:11:12.000000000 +0000 +@@ -24,7 +24,6 @@ # Change the installation path as needed. This automatically adjusts # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path! # -export PREFIX= /usr/local + export MULTILIB= lib ############################################################################## - DPREFIX= $(DESTDIR)$(PREFIX) -@@ -39,7 +38,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua +@@ -40,7 +39,7 @@ INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) INSTALL_CMODD= $(INSTALL_LIB)/lua INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) diff --git a/lang/LuaJIT2/patches/patch-src_lj__alloc.c b/lang/LuaJIT2/patches/patch-src_lj__alloc.c deleted file mode 100644 index 47644b02e0b..00000000000 --- a/lang/LuaJIT2/patches/patch-src_lj__alloc.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_lj__alloc.c,v 1.1.1.1 2013/07/14 21:42:00 alnsn Exp $ - -Add NetBSD to a list of "naive" platforms. - ---- src/lj_alloc.c.orig 2013-06-03 19:00:00.000000000 +0000 -+++ src/lj_alloc.c -@@ -188,7 +188,7 @@ static LJ_AINLINE void *CALL_MMAP(size_t - return ptr; - } - --#elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__sun__) -+#elif LJ_TARGET_OSX || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__sun__) || defined(__NetBSD__) - - /* OSX and FreeBSD mmap() use a naive first-fit linear search. - ** That's perfect for us. Except that -pagezero_size must be set for OSX, |