Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/luajit/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 7 Nov 2016 11:42:55 -0000 1.21
+++ Makefile 2 May 2017 01:40:17 -0000
@@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.21 2016/11/07 11:42:55 naddy Exp $
ONLY_FOR_ARCHS = powerpc i386 amd64
-# arm needs EABI/aapcs
+# arm needs missing EABI symbols
-SHARED_LIBS += luajit-${MODLUA_VERSION} 0.0 # 2.0.4
+SHARED_LIBS += luajit-${MODLUA_VERSION} 0.0 # 2.0.5
COMMENT = just-in-time compiler for Lua
-V = 2.0.4
+V = 2.0.5
DISTNAME = LuaJIT-${V}
PKGNAME = ${DISTNAME:L}
-REVISION = 0
CATEGORIES = lang
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/luajit/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 6 Jun 2015 09:03:16 -0000 1.7
+++ distinfo 2 May 2017 01:38:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (LuaJIT-2.0.4.tar.gz) = Yg+k6xI3UCG+9uTyN8vS3V1J5WvrQUvuBSx0a+7xgH0=
-SIZE (LuaJIT-2.0.4.tar.gz) = 847615
+SHA256 (LuaJIT-2.0.5.tar.gz) = h0sfgpfGl4IfVh+bc7V//UGe2PQnjILgW0iAbTDB6Xk=
+SIZE (LuaJIT-2.0.5.tar.gz) = 849845
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/lang/luajit/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile 6 Jun 2015 09:03:16 -0000 1.5
+++ patches/patch-Makefile 2 May 2017 01:43:54 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile,v 1.5 2015/06/06 09:03:16 dcoppa Exp $
---- Makefile.orig Thu May 14 20:30:00 2015
-+++ Makefile Thu Jun 4 19:20:59 2015
+--- Makefile.orig Tue May 2 04:11:00 2017
++++ Makefile Tue May 2 11:40:27 2017
@@ -17,7 +17,7 @@ MAJVER= 2
MINVER= 0
- RELVER= 4
+ RELVER= 5
VERSION= $(MAJVER).$(MINVER).$(RELVER)
-ABIVER= 5.1
+ABIVER= ${MODLUA_VERSION}
##############################################################################
#
-@@ -111,18 +111,13 @@ install: $(INSTALL_DEP)
+@@ -117,18 +117,13 @@ install: $(INSTALL_DEP)
cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC)
|| :
$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
cd src && test -f $(FILE_SO) && \
Index: patches/patch-etc_luajit_pc
===================================================================
RCS file: /cvs/ports/lang/luajit/patches/patch-etc_luajit_pc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-etc_luajit_pc
--- patches/patch-etc_luajit_pc 6 Jun 2015 09:03:16 -0000 1.1
+++ patches/patch-etc_luajit_pc 2 May 2017 01:43:36 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-etc_luajit_pc,v 1.1 2015/06/06 09:03:16 dcoppa Exp $
---- etc/luajit.pc.orig Thu Jun 4 20:05:32 2015
-+++ etc/luajit.pc Thu Jun 4 20:06:57 2015
+--- etc/luajit.pc.orig Tue May 2 04:11:00 2017
++++ etc/luajit.pc Tue May 2 11:40:27 2017
@@ -3,9 +3,9 @@ majver=2
minver=0
- relver=4
+ relver=5
version=${majver}.${minver}.${relver}
-abiver=5.1
+abiver=${MODLUA_VERSION}
Index: patches/patch-src_Makefile
===================================================================
RCS file: /cvs/ports/lang/luajit/patches/patch-src_Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_Makefile
--- patches/patch-src_Makefile 6 Jun 2015 09:03:16 -0000 1.5
+++ patches/patch-src_Makefile 2 May 2017 01:43:36 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile,v 1.5 2015/06/06 09:03:16 dcoppa Exp $
---- src/Makefile.orig Thu May 14 20:30:00 2015
-+++ src/Makefile Thu Jun 4 19:20:59 2015
-@@ -325,6 +325,10 @@ else
+--- src/Makefile.orig Tue May 2 04:11:00 2017
++++ src/Makefile Tue May 2 11:40:27 2017
+@@ -326,6 +326,10 @@ else
ifeq (GNU/kFreeBSD,$(TARGET_SYS))
TARGET_XLIBS+= -ldl
endif
@@ -12,7 +12,7 @@ $OpenBSD: patch-src_Makefile,v 1.5 2015/
endif
endif
endif
-@@ -557,10 +561,10 @@ endif
+@@ -562,10 +566,10 @@ endif
endif
endif
Index: patches/patch-src_host_buildvm_asm_c
===================================================================
RCS file: /cvs/ports/lang/luajit/patches/patch-src_host_buildvm_asm_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_host_buildvm_asm_c
--- patches/patch-src_host_buildvm_asm_c 6 Jun 2015 09:03:16 -0000
1.3
+++ patches/patch-src_host_buildvm_asm_c 2 May 2017 01:43:36 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-src_host_buildvm_asm_c,v
.gnu_attribute requires binutils 2.18
---- src/host/buildvm_asm.c.orig Thu May 14 20:30:00 2015
-+++ src/host/buildvm_asm.c Thu Jun 4 19:20:59 2015
-@@ -289,12 +289,14 @@ void emit_asm(BuildCtx *ctx)
+--- src/host/buildvm_asm.c.orig Tue May 2 04:11:00 2017
++++ src/host/buildvm_asm.c Tue May 2 11:40:27 2017
+@@ -290,12 +290,14 @@ void emit_asm(BuildCtx *ctx)
#if !(LJ_TARGET_PS3 || LJ_TARGET_PSVITA)
fprintf(ctx->fp, "\t.section .note.GNU-stack,\"\"," ELFASM_PX
"progbits\n");
#endif
Index: patches/patch-src_lj_arch_h
===================================================================
RCS file: /cvs/ports/lang/luajit/patches/patch-src_lj_arch_h,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_lj_arch_h
--- patches/patch-src_lj_arch_h 6 Jun 2015 09:03:16 -0000 1.4
+++ patches/patch-src_lj_arch_h 2 May 2017 01:43:36 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_lj_arch_h,v 1.4 2015/06/06 09:03:16 dcoppa Exp $
---- src/lj_arch.h.orig Thu May 14 20:30:00 2015
-+++ src/lj_arch.h Thu Jun 4 19:20:59 2015
-@@ -332,9 +332,6 @@
+--- src/lj_arch.h.orig Tue May 2 04:11:00 2017
++++ src/lj_arch.h Tue May 2 11:40:27 2017
+@@ -339,9 +339,6 @@
#if defined(_SOFT_FLOAT) || defined(_SOFT_DOUBLE)
#error "No support for PowerPC CPUs without double-precision FPU"
#endif
Index: patches/patch-src_luaconf_h
===================================================================
RCS file: /cvs/ports/lang/luajit/patches/patch-src_luaconf_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_luaconf_h
--- patches/patch-src_luaconf_h 6 Jun 2015 09:03:16 -0000 1.1
+++ patches/patch-src_luaconf_h 2 May 2017 01:43:36 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-src_luaconf_h,v 1.1 2015/06/06 09:03:16 dcoppa Exp $
---- src/luaconf.h.orig Thu Jun 4 21:49:15 2015
-+++ src/luaconf.h Thu Jun 4 21:52:03 2015
+--- src/luaconf.h.orig Tue May 2 04:11:00 2017
++++ src/luaconf.h Tue May 2 11:42:59 2017
@@ -35,9 +35,9 @@
#ifndef LUA_LMULTILIB
#define LUA_LMULTILIB "lib"
#endif
-#define LUA_LROOT "/usr/local"
-#define LUA_LUADIR "/lua/5.1/"
--#define LUA_LJDIR "/luajit-2.0.4/"
+-#define LUA_LJDIR "/luajit-2.0.5/"
+#define LUA_LROOT "${TRUEPREFIX}"
+#define LUA_LUADIR "/lua/${MODLUA_VERSION}/"
+#define LUA_LJDIR "/luajit-2.0/"
