luajit2.diff

diff --git a/lang/LuaJIT2/Makefile b/lang/LuaJIT2/Makefile
index 5360fac..fba9069 100644
--- a/lang/LuaJIT2/Makefile
+++ b/lang/LuaJIT2/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=      LuaJIT-2.0.4
 PKGNAME=       ${DISTNAME:S/LuaJIT/LuaJIT2/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  http://luajit.org/download/
 
diff --git a/lang/LuaJIT2/distinfo b/lang/LuaJIT2/distinfo
index 7fb9f34..0d08290 100644
--- a/lang/LuaJIT2/distinfo
+++ b/lang/LuaJIT2/distinfo
@@ -4,5 +4,5 @@ SHA1 (LuaJIT-2.0.4.tar.gz) = 6e533675180300e85d12c4bbeea2d0e41ad21172
 RMD160 (LuaJIT-2.0.4.tar.gz) = ef9ec596ebf81e3871f060c40303bcd2002474c4
 SHA512 (LuaJIT-2.0.4.tar.gz) = a72957bd85d8f457269e78bf08c19b28c5707df5d19920d61918f8a6913f55913ce13037fb9a6463c04cefde0c6644739f390e09d656e4bbc2c236927aa3f8f9
 Size (LuaJIT-2.0.4.tar.gz) = 847615 bytes
-SHA1 (patch-Makefile) = 4dc6b2fd4f155700aa92e81bf2e10ce2e7990f16
-SHA1 (patch-src_Makefile) = 29426c80f12d34d69eff2dfae1da786827069163
+SHA1 (patch-Makefile) = 33f97177f6deac3c3920eef4a8f71e7b7625ae76
+SHA1 (patch-src_Makefile) = f9dfc1620c144dc3903ab6a0c8d500e9d3eb0bf4
diff --git a/lang/LuaJIT2/patches/patch-Makefile b/lang/LuaJIT2/patches/patch-Makefile
index e47a522..ff1386e 100644
--- a/lang/LuaJIT2/patches/patch-Makefile
+++ b/lang/LuaJIT2/patches/patch-Makefile
@@ -2,7 +2,7 @@ $NetBSD: patch-Makefile,v 1.5 2016/04/01 11:22:36 jperkin Exp $
 
 Fix installation.
 
---- Makefile.orig      2014-03-12 12:10:00.000000000 +0000
+--- Makefile.orig      2015-05-14 18:30:00.000000000 +0000
 +++ Makefile
 @@ -24,7 +24,6 @@ ABIVER=  5.1
  # Change the installation path as needed. This automatically adjusts
diff --git a/lang/LuaJIT2/patches/patch-src_Makefile b/lang/LuaJIT2/patches/patch-src_Makefile
index bbfd1b8..72fee1a 100644
--- a/lang/LuaJIT2/patches/patch-src_Makefile
+++ b/lang/LuaJIT2/patches/patch-src_Makefile
@@ -14,3 +14,23 @@ Fix building on OS X.
    TARGET_STRIP+= -x
    TARGET_AR+= 2>/dev/null
    TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
+@@ -515,9 +512,6 @@ endif
+ ifeq (iOS,$(TARGET_SYS))
+   LJVM_MODE= machasm
+ endif
+-ifeq (SunOS,$(TARGET_SYS))
+-  BUILDMODE= static
+-endif
+ ifeq (PS3,$(TARGET_SYS))
+   BUILDMODE= static
+ endif
+@@ -612,6 +606,9 @@ $(BUILDVM_T): $(BUILDVM_O)
+ $(LJVM_BOUT): $(BUILDVM_T)
+       $(E) "BUILDVM   $@"
+       $(Q)$(BUILDVM_X) -m $(LJVM_MODE) -o $@
++      test -f lj_vm.s && \
++      sed -e 's/\(long lj_[^-]*\)/\1@PLT/' lj_vm.s > lj_vm.s.fixed && \
++      mv lj_vm.s.fixed lj_vm.s
+ 
+ lj_bcdef.h: $(BUILDVM_T) $(LJLIB_C)
+       $(E) "BUILDVM   $@"