. Added buildlink3.mk

. Added symlinking of libluajit-$(ABIVER).so.$(MAJVER)

5 files changed, 47 insertions, 9 deletions

diff --git a/lang/LuaJIT2/Makefile b/lang/LuaJIT2/Makefile
index 9dc9502a896..e519b0b000a 100644
--- a/lang/LuaJIT2/Makefile
+++ b/lang/LuaJIT2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2014/03/12 22:49:14 justin Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/26 13:29:53 imil Exp $
 #
 
 DISTNAME=	LuaJIT-2.0.3
+PKGREVISION=	1
 PKGNAME=	${DISTNAME:S/LuaJIT/LuaJIT2/}
 CATEGORIES=	lang
 MASTER_SITES=	http://luajit.org/download/
diff --git a/lang/LuaJIT2/PLIST b/lang/LuaJIT2/PLIST
index efff71c455c..53af8b04cdc 100644
--- a/lang/LuaJIT2/PLIST
+++ b/lang/LuaJIT2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2013/07/14 21:42:00 alnsn Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/03/26 13:29:53 imil Exp $
 bin/luajit
 bin/luajit-${PKGVERSION}
 include/luajit-2.0/lauxlib.h
@@ -9,6 +9,7 @@ include/luajit-2.0/luajit.h
 include/luajit-2.0/lualib.h
 lib/libluajit-5.1.a
 lib/libluajit-5.1.so
+lib/libluajit-5.1.so.2
 lib/libluajit-5.1.so.${PKGVERSION}
 lib/pkgconfig/luajit.pc
 share/luajit-${PKGVERSION}/jit/bc.lua
diff --git a/lang/LuaJIT2/buildlink3.mk b/lang/LuaJIT2/buildlink3.mk
new file mode 100644
index 00000000000..79a799b70a5
--- /dev/null
+++ b/lang/LuaJIT2/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/03/26 13:29:53 imil Exp $
+
+BUILDLINK_TREE+=	LuaJIT2
+
+.if !defined(LUAJIT2_BUILDLINK3_MK)
+LUAJIT2_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.LuaJIT2+=	LuaJIT2>=2.0.3
+BUILDLINK_PKGSRCDIR.LuaJIT2?=	../../lang/LuaJIT2
+.endif	# LUAJIT2_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-LuaJIT2
diff --git a/lang/LuaJIT2/distinfo b/lang/LuaJIT2/distinfo
index cde9fd5fd4d..4ad192006e1 100644
--- a/lang/LuaJIT2/distinfo
+++ b/lang/LuaJIT2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2014/03/13 08:20:53 justin Exp $
+$NetBSD: distinfo,v 1.3 2014/03/26 13:29:53 imil Exp $
 
 SHA1 (LuaJIT-2.0.3.tar.gz) = 2db39e7d1264918c2266b0436c313fbd12da4ceb
 RMD160 (LuaJIT-2.0.3.tar.gz) = aa5c3fc367871a6ad15c7f9ad3300327c20462ec
 Size (LuaJIT-2.0.3.tar.gz) = 844927 bytes
-SHA1 (patch-Makefile) = 09279eb84c8a624a778778fcda992c3297b056e8
+SHA1 (patch-Makefile) = 6a5bec28895b370b4628c57eb933bb96612c5803
diff --git a/lang/LuaJIT2/patches/patch-Makefile b/lang/LuaJIT2/patches/patch-Makefile
index 45b72b24725..3e5a9228035 100644
--- a/lang/LuaJIT2/patches/patch-Makefile
+++ b/lang/LuaJIT2/patches/patch-Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile,v 1.2 2014/03/12 22:49:14 justin Exp $
+$NetBSD: patch-Makefile,v 1.3 2014/03/26 13:29:53 imil Exp $
 
 Fix installation.
 
---- Makefile.orig	2014-03-12 22:10:30.000000000 +0000
-+++ Makefile	2014-03-12 22:11:12.000000000 +0000
-@@ -24,7 +24,6 @@
+--- Makefile.orig	2014-03-12 12:10:00.000000000 +0000
++++ Makefile
+@@ -24,7 +24,6 @@ ABIVER=  5.1
  # Change the installation path as needed. This automatically adjusts
  # the paths in src/luaconf.h, too. Note: PREFIX must be an absolute path!
  #
@@ -12,7 +12,7 @@ Fix installation.
  export MULTILIB= lib
  ##############################################################################
  
-@@ -40,7 +39,7 @@
+@@ -40,7 +39,7 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
  INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
  INSTALL_CMODD= $(INSTALL_LIB)/lua
  INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
@@ -21,3 +21,27 @@ Fix installation.
  INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
  
  INSTALL_TNAME= luajit-$(VERSION)
+@@ -48,6 +47,7 @@ INSTALL_TSYMNAME= luajit
+ INSTALL_ANAME= libluajit-$(ABIVER).a
+ INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
+ INSTALL_SOSHORT= libluajit-$(ABIVER).so
++INSTALL_SOMAJOR= libluajit-$(ABIVER).so.$(MAJVER)
+ INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+ INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
+ INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
+@@ -57,6 +57,7 @@ INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL
+ INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME)
+ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
+ INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
++INSTALL_MAJOR1= $(INSTALL_LIB)/$(INSTALL_SOMAJOR)
+ INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
+ INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
+ INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
+@@ -113,6 +114,7 @@ install: $(INSTALL_DEP)
+ 	cd src && test -f $(FILE_SO) && \
+ 	  $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
+ 	  $(LDCONFIG) $(INSTALL_LIB) && \
++	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_MAJOR1) && \
+ 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+ 	  $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+ 	cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)