From 38c98059bced2843c17709ff593579870404f7ed Mon Sep 17 00:00:00 2001
From: "Sergey A. Osokin" <osa@FreeBSD.org>
Date: Wed, 10 Jul 2013 17:57:38 +0000
Subject: Update from 2.0.1 to 2.0.2. Install link to shared object.	(*)

PR:	177881	(*)
---
 lang/luajit/Makefile             |  9 ++++-----
 lang/luajit/distinfo             |  6 ++----
 lang/luajit/files/patch-Makefile | 22 +++++++++++++++-------
 lang/luajit/pkg-plist            |  1 +
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index f78556a07814..0182efa57a8f 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	luajit
-DISTVERSION=	2.0.1
-PORTREVISION=	1
+DISTVERSION=	2.0.2
 CATEGORIES=	lang
 MASTER_SITES=	http://luajit.org/download/
 DISTNAME=	LuaJIT-${DISTVERSION}
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	v${PORTVERSION}_hotfix1.patch
-PATCH_DIST_STRIP=	-p1
+#PATCH_SITES=	${MASTER_SITES}
+#PATCHFILES=	v${PORTVERSION}_hotfix1.patch
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	A Just-In-Time Compiler for Lua
diff --git a/lang/luajit/distinfo b/lang/luajit/distinfo
index c8f50bdd5dbe..806758786fe5 100644
--- a/lang/luajit/distinfo
+++ b/lang/luajit/distinfo
@@ -1,4 +1,2 @@
-SHA256 (LuaJIT-2.0.1.tar.gz) = 2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0
-SIZE (LuaJIT-2.0.1.tar.gz) = 841399
-SHA256 (v2.0.1_hotfix1.patch) = 143898de3fe84455684fddb92947d36c1a51c6a6e3884813fe5e025bd4652368
-SIZE (v2.0.1_hotfix1.patch) = 3591
+SHA256 (LuaJIT-2.0.2.tar.gz) = c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38
+SIZE (LuaJIT-2.0.2.tar.gz) = 843031
diff --git a/lang/luajit/files/patch-Makefile b/lang/luajit/files/patch-Makefile
index 6828db0f7596..4160babf0ba0 100644
--- a/lang/luajit/files/patch-Makefile
+++ b/lang/luajit/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2012-11-01 22:39:35.000000000 +0400
-+++ Makefile	2012-11-01 22:42:58.000000000 +0400
+--- Makefile.orig	2013-02-20 00:15:00.000000000 +0400
++++ Makefile	2013-04-16 11:00:30.120967135 +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
-@@ -39,14 +41,13 @@
+@@ -39,14 +41,14 @@
  INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
  INSTALL_CMODD= $(INSTALL_LIB)/lua
  INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
@@ -32,10 +32,16 @@
  INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
 -INSTALL_SOSHORT= libluajit-$(ABIVER).so
 +INSTALL_SOSHORT= libluajit-$(ABIVER).so.$(MAJVER)
++INSTALL_SOSHORT2= libluajit-$(ABIVER).so
  INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
  INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
  INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
-@@ -60,8 +61,8 @@
+@@ -56,12 +58,13 @@
+ INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME)
+ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
+ INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
++INSTALL_SHORT3= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
+ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
  INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
  INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
  
@@ -46,18 +52,20 @@
  UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
    $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
  
-@@ -110,10 +111,8 @@
+@@ -110,10 +113,9 @@
  	$(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
  	cd src && test -f $(FILE_SO) && \
  	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
 -	  $(LDCONFIG) $(INSTALL_LIB) && \
  	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
- 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+-	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
 -	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
++	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) && \
++	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT3) || :
  	cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
  	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
  	  $(RM) $(FILE_PC).tmp
-@@ -131,7 +130,6 @@
+@@ -131,7 +133,6 @@
  	for file in $(FILES_INC); do \
  	  $(UNINSTALL) $(INSTALL_INC)/$$file; \
  	  done
diff --git a/lang/luajit/pkg-plist b/lang/luajit/pkg-plist
index 83dd76ab9b97..8d53cba54f2d 100644
--- a/lang/luajit/pkg-plist
+++ b/lang/luajit/pkg-plist
@@ -7,6 +7,7 @@ include/luajit-2.0/lualib.h
 include/luajit-2.0/lauxlib.h
 include/luajit-2.0/lua.hpp
 lib/libluajit-5.1.a
+lib/libluajit-5.1.so
 lib/libluajit-5.1.so.2
 lib/libluajit-5.1.so.%%VERSION%%
 libdata/pkgconfig/luajit.pc
-- 
cgit v1.2.3