Update from 2.0.0-beta11 to 2.0.0-rc1.

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

Feature safe:	yes

4 files changed, 30 insertions, 32 deletions

diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index 93e5596fca75..25e961ec54ae 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	luajit
-DISTVERSION=	2.0.0-beta11
+DISTVERSION=	2.0.0-rc1
 CATEGORIES=	lang
 MASTER_SITES=	http://luajit.org/download/
 DISTNAME=	LuaJIT-${DISTVERSION}
@@ -14,7 +14,7 @@ DISTNAME=	LuaJIT-${DISTVERSION}
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	A Just-In-Time Compiler for Lua
 
-WRKSRC=		${WRKDIR}/LuaJIT-${DISTVERSION}
+WRKSRC=		${WRKDIR}/LuaJIT-${DISTVERSION:C/-rc1//}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
@@ -23,7 +23,7 @@ MAN1=		luajit.1
 .endif
 
 post-install:
-	${LN} -sf ${PREFIX}/bin/${PORTNAME}-${DISTVERSION} \
+	${LN} -sf ${PREFIX}/bin/${PORTNAME}-${DISTVERSION:C/-rc1//} \
 		${PREFIX}/bin/${PORTNAME}
 .if !defined(NO_INSTALL_MANPAGES)
 	@${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${MAN1PREFIX}/man/man1
diff --git a/lang/luajit/distinfo b/lang/luajit/distinfo
index ad31da4ef2bb..6684673d36b2 100644
--- a/lang/luajit/distinfo
+++ b/lang/luajit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (LuaJIT-2.0.0-beta11.tar.gz) = 1e9e1d657774b33f287ac08310c0de1e89ff7b8f89ee7dc31eefb86ead9814de
-SIZE (LuaJIT-2.0.0-beta11.tar.gz) = 836244
+SHA256 (LuaJIT-2.0.0-rc1.tar.gz) = cd6e4c4ce666ffd8b4cd64111dd33eb44d6ea6e26f64a01f308033e5ad555862
+SIZE (LuaJIT-2.0.0-rc1.tar.gz) = 836181
diff --git a/lang/luajit/files/patch-Makefile b/lang/luajit/files/patch-Makefile
index 84d04f4335f4..6828db0f7596 100644
--- a/lang/luajit/files/patch-Makefile
+++ b/lang/luajit/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2012-10-16 22:30:00.000000000 +0400
-+++ Makefile	2012-10-18 22:11:09.000000000 +0400
-@@ -25,14 +25,16 @@
+--- Makefile.orig	2012-11-01 22:39:35.000000000 +0400
++++ Makefile	2012-11-01 22:42:58.000000000 +0400
+@@ -24,14 +24,16 @@
  # Change the installation path as needed. This automatically adjusts
  # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
  #
@@ -18,7 +18,7 @@
  
  INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
  INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
-@@ -40,14 +42,13 @@
+@@ -39,14 +41,13 @@
  INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
  INSTALL_CMODD= $(INSTALL_LIB)/lua
  INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
@@ -35,21 +35,19 @@
  INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
  INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
  INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
-@@ -61,10 +62,8 @@
+@@ -60,8 +61,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)
+ UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
+   $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
  
- RM= rm -f
- MKDIR= mkdir -p
-@@ -111,10 +110,8 @@
- 	$(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
+@@ -110,10 +111,8 @@
+ 	$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
  	cd src && test -f $(FILE_SO) && \
  	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
 -	  $(LDCONFIG) $(INSTALL_LIB) && \
@@ -59,11 +57,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 @@
+@@ -131,7 +130,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/pkg-plist b/lang/luajit/pkg-plist
index ec94fb4d8879..546efeaa7e24 100644
--- a/lang/luajit/pkg-plist
+++ b/lang/luajit/pkg-plist
@@ -1,5 +1,5 @@
 bin/luajit
-bin/luajit-2.0.0-beta11
+bin/luajit-2.0.0
 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-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
+share/luajit-2.0.0/jit/bc.lua
+share/luajit-2.0.0/jit/bcsave.lua
+share/luajit-2.0.0/jit/dis_arm.lua
+share/luajit-2.0.0/jit/dis_mips.lua
+share/luajit-2.0.0/jit/dis_mipsel.lua
+share/luajit-2.0.0/jit/dis_x64.lua
+share/luajit-2.0.0/jit/dis_x86.lua
+share/luajit-2.0.0/jit/dis_ppc.lua
+share/luajit-2.0.0/jit/dump.lua
+share/luajit-2.0.0/jit/v.lua
+share/luajit-2.0.0/jit/vmdef.lua
+@dirrm share/luajit-2.0.0/jit
+@dirrm share/luajit-2.0.0
 @dirrm include/luajit-2.0