Update from 2.0.0-beta10 to 2.0.0-beta11.

Remove needless patch.

ChangeLog:	http://luajit.org/changes.html

Feature safe:	yes

5 files changed, 50 insertions, 38 deletions

diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index 3fe4147b8dee..93e5596fca75 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	luajit
-DISTVERSION=	2.0.0-beta10
+DISTVERSION=	2.0.0-beta11
 CATEGORIES=	lang
 MASTER_SITES=	http://luajit.org/download/
 DISTNAME=	LuaJIT-${DISTVERSION}
diff --git a/lang/luajit/distinfo b/lang/luajit/distinfo
index c9add5ccda6d..ad31da4ef2bb 100644
--- a/lang/luajit/distinfo
+++ b/lang/luajit/distinfo
@@ -1,4 +1,2 @@
-SHA256 (LuaJIT-2.0.0-beta10.tar.gz) = 750e9317ca2c61fa17e739abc582c55c1fe69749ba65442dfd7f04ce20cf9ff6
-SIZE (LuaJIT-2.0.0-beta10.tar.gz) = 890830
-SHA256 (beta9_hotfix1.patch) = 468234a723c3a2bb7fe8caafc3aac0443473df2790b547a166babaf9b58cc671
-SIZE (beta9_hotfix1.patch) = 1823
+SHA256 (LuaJIT-2.0.0-beta11.tar.gz) = 1e9e1d657774b33f287ac08310c0de1e89ff7b8f89ee7dc31eefb86ead9814de
+SIZE (LuaJIT-2.0.0-beta11.tar.gz) = 836244
diff --git a/lang/luajit/files/patch-Makefile b/lang/luajit/files/patch-Makefile
index 995433042e5c..84d04f4335f4 100644
--- a/lang/luajit/files/patch-Makefile
+++ b/lang/luajit/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2011-12-14 18:15:00.000000000 +0400
-+++ Makefile	2012-01-13 09:09:42.000000000 +0400
-@@ -26,26 +26,27 @@
+--- Makefile.orig	2012-10-16 22:30:00.000000000 +0400
++++ Makefile	2012-10-18 22:11:09.000000000 +0400
+@@ -25,14 +25,16 @@
  # Change the installation path as needed. This automatically adjusts
  # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
  #
@@ -16,9 +16,12 @@
  INSTALL_INC=   $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
 +INSTALL_MAN=   $(DPREFIX)/man/man1
  
- INSTALL_JITLIB= $(INSTALL_SHARE)/luajit-$(VERSION)/jit
- INSTALL_LMOD= $(INSTALL_SHARE)/lua/$(ABIVER)
- INSTALL_CMOD= $(INSTALL_LIB)/lua/$(ABIVER)
+ INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
+ INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
+@@ -40,14 +42,13 @@
+ INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
+ INSTALL_CMODD= $(INSTALL_LIB)/lua
+ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
 -INSTALL_MAN= $(INSTALL_SHARE)/man/man1
 -INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
 +INSTALL_PKGCONFIG= $(INSTALL_LIBD)/pkgconfig
@@ -29,21 +32,23 @@
  INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
 -INSTALL_SOSHORT= libluajit-$(ABIVER).so
 +INSTALL_SOSHORT= libluajit-$(ABIVER).so.$(MAJVER)
- INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
- INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib
- INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib
-@@ -59,8 +60,8 @@
+ INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+ INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
+ INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
+@@ -61,10 +62,8 @@
  INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
  INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
  
 -INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
 -  $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
+-UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
+-  $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
 +INSTALL_DIRS= $(INSTALL_INC) \
 +  $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB)
  
  RM= rm -f
  MKDIR= mkdir -p
-@@ -105,10 +106,8 @@
+@@ -111,10 +110,8 @@
  	$(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
  	cd src && test -f $(FILE_SO) && \
  	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
@@ -54,3 +59,11 @@
  	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
  	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
  	  $(RM) $(FILE_PC).tmp
+@@ -137,7 +134,6 @@
+ 	for file in $(FILES_INC); do \
+ 	  $(UNINSTALL) $(INSTALL_INC)/$$file; \
+ 	  done
+-	$(LDCONFIG) $(INSTALL_LIB)
+ 	test -f $(INSTALL_TSYM) || $(UNINSTALL) $(INSTALL_TSYM)
+ 	$(RMDIR) $(UNINSTALL_DIRS) || :
+ 	@echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ===="
diff --git a/lang/luajit/files/patch-src_Makefile b/lang/luajit/files/patch-src_Makefile
index 09c25b53a574..a1054fc97f35 100644
--- a/lang/luajit/files/patch-src_Makefile
+++ b/lang/luajit/files/patch-src_Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2011-12-14 18:15:00.000000000 +0400
-+++ src/Makefile	2012-01-09 19:33:28.000000000 +0400
+--- src/Makefile.orig	2012-10-16 22:30:00.000000000 +0400
++++ src/Makefile	2012-10-18 22:06:48.000000000 +0400
 @@ -25,7 +25,7 @@
  # with "make clean", followed by "make" if you change any options.
  #
@@ -18,12 +18,13 @@
  # Use this if you want to generate a smaller binary (but it's slower):
  #CCOPT= -Os -fomit-frame-pointer
  # Note: it's no longer recommended to use -O3 with GCC 4.x.
-@@ -49,7 +49,7 @@
+@@ -48,7 +48,8 @@
  # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
  # the binaries to a different machine you could also use: -march=native
  #
--CCOPT_X86= -march=i686
-+CCOPT_X86=
- CCOPT_X64=
- CCOPT_ARM=
- CCOPT_PPC=
+-CCOPT_x86= -march=i686
++#CCOPT_x86= -march=i686
++CCOPT_x86=
+ CCOPT_x64=
+ CCOPT_arm=
+ CCOPT_ppc=
diff --git a/lang/luajit/pkg-plist b/lang/luajit/pkg-plist
index 0909890ecb5e..ec94fb4d8879 100644
--- a/lang/luajit/pkg-plist
+++ b/lang/luajit/pkg-plist
@@ -1,5 +1,5 @@
 bin/luajit
-bin/luajit-2.0.0-beta10
+bin/luajit-2.0.0-beta11
 include/luajit-2.0/lua.h
 include/luajit-2.0/luaconf.h
 include/luajit-2.0/luajit.h
@@ -10,17 +10,17 @@ lib/libluajit-5.1.a
 lib/libluajit-5.1.so.2
 lib/libluajit-5.1.so.2.0.0
 libdata/pkgconfig/luajit.pc
-share/luajit-2.0.0-beta10/jit/bc.lua
-share/luajit-2.0.0-beta10/jit/bcsave.lua
-share/luajit-2.0.0-beta10/jit/dis_arm.lua
-share/luajit-2.0.0-beta10/jit/dis_mips.lua
-share/luajit-2.0.0-beta10/jit/dis_mipsel.lua
-share/luajit-2.0.0-beta10/jit/dis_x64.lua
-share/luajit-2.0.0-beta10/jit/dis_x86.lua
-share/luajit-2.0.0-beta10/jit/dis_ppc.lua
-share/luajit-2.0.0-beta10/jit/dump.lua
-share/luajit-2.0.0-beta10/jit/v.lua
-share/luajit-2.0.0-beta10/jit/vmdef.lua
-@dirrm share/luajit-2.0.0-beta10/jit
-@dirrm share/luajit-2.0.0-beta10
+share/luajit-2.0.0-beta11/jit/bc.lua
+share/luajit-2.0.0-beta11/jit/bcsave.lua
+share/luajit-2.0.0-beta11/jit/dis_arm.lua
+share/luajit-2.0.0-beta11/jit/dis_mips.lua
+share/luajit-2.0.0-beta11/jit/dis_mipsel.lua
+share/luajit-2.0.0-beta11/jit/dis_x64.lua
+share/luajit-2.0.0-beta11/jit/dis_x86.lua
+share/luajit-2.0.0-beta11/jit/dis_ppc.lua
+share/luajit-2.0.0-beta11/jit/dump.lua
+share/luajit-2.0.0-beta11/jit/v.lua
+share/luajit-2.0.0-beta11/jit/vmdef.lua
+@dirrm share/luajit-2.0.0-beta11/jit
+@dirrm share/luajit-2.0.0-beta11
 @dirrm include/luajit-2.0