Mon Jul 20 11:30:54 2015 UTC ()
Instead of having only lua.pc, provide both the versioned pkg-config file
and the unversioned one.

As discussed on tech-pkg.


(wiz)
diff -r1.17 -r1.18 pkgsrc/lang/lua/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/lang/lua51/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/lang/lua52/buildlink3.mk
diff -r1.1.1.1 -r1.2 pkgsrc/lang/lua53/buildlink3.mk
cvs diff -r1.17 -r1.18 pkgsrc/lang/lua/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua/buildlink3.mk 2013/10/30 06:18:09 1.17
+++ pkgsrc/lang/lua/buildlink3.mk 2015/07/20 11:30:54 1.18
@@ -1,12 +1,21 @@ @@ -1,12 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.17 2013/10/30 06:18:09 dholland Exp $ 1# $NetBSD: buildlink3.mk,v 1.18 2015/07/20 11:30:54 wiz Exp $
2# 2#
3# This is a fake buildlink3.mk file. It figures out the Lua version 3# This is a fake buildlink3.mk file. It figures out the Lua version
4# and then includes the real buildlink3.mk file for that Lua version. 4# and then includes the real buildlink3.mk file for that Lua version.
5# 5#
6# It is intended to be included by packages that embed the Lua 6# It is intended to be included by packages that embed the Lua
7# interpreter and therefore link against Lua. 7# interpreter and therefore link against Lua.
8 8
9.include "../../lang/lua/luaversion.mk" 9.include "../../lang/lua/luaversion.mk"
10.include "${LUA_PKGSRCDIR}/buildlink3.mk" 10.include "${LUA_PKGSRCDIR}/buildlink3.mk"
11 11
12BUILDLINK_PREFIX.lua= ${BUILDLINK_PREFIX.${LUA_PACKAGE}} 12BUILDLINK_PREFIX.lua= ${BUILDLINK_PREFIX.${LUA_PACKAGE}}
 13
 14.if !defined(LUA_BUILDLINK3_MK)
 15LUA_BUILDLINK3_MK:=
 16
 17BUILDLINK_TARGETS+= buildlink-bin-unversioned
 18
 19buildlink-bin-unversioned:
 20 ${LN} -s ${BUILDLINK_DIR}/lib/pkgconfig/lua-${_LUA_DOT_VERSION}.pc ${BUILDLINK_DIR}/lib/pkgconfig/lua.pc
 21.endif # LUA_BUILDLINK3_MK
cvs diff -r1.3 -r1.4 pkgsrc/lang/lua51/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua51/buildlink3.mk 2014/05/03 13:00:44 1.3
+++ pkgsrc/lang/lua51/buildlink3.mk 2015/07/20 11:30:54 1.4
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.3 2014/05/03 13:00:44 alnsn Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $
2 2
3BUILDLINK_TREE+= lua51 3BUILDLINK_TREE+= lua51
4 4
5.if !defined(LUA51_BUILDLINK3_MK) 5.if !defined(LUA51_BUILDLINK3_MK)
6LUA51_BUILDLINK3_MK:= 6LUA51_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.1<5.2 8BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.1<5.2
9BUILDLINK_PKGSRCDIR.lua51?= ../../lang/lua51 9BUILDLINK_PKGSRCDIR.lua51?= ../../lang/lua51
10 10
11.if defined(BUILDLINK_DEPMETHOD.lua) 11.if defined(BUILDLINK_DEPMETHOD.lua)
12BUILDLINK_DEPMETHOD.lua51?= ${BUILDLINK_DEPMETHOD.lua} 12BUILDLINK_DEPMETHOD.lua51?= ${BUILDLINK_DEPMETHOD.lua}
13.endif 13.endif
14 14
15# -llua -> -llua5.1 15# -llua -> -llua5.1
16BUILDLINK_TRANSFORM+= l:lua:lua5.1 16BUILDLINK_TRANSFORM+= l:lua:lua5.1
17BUILDLINK_INCDIRS.lua51+= include/lua-5.1 17BUILDLINK_INCDIRS.lua51+= include/lua-5.1
18 18
19BUILDLINK_FNAME_TRANSFORM.lua51+= -e 's|lib/pkgconfig/lua-5.1.pc|lib/pkgconfig/lua.pc|' 
20 
21.include "../../mk/readline.buildlink3.mk" 19.include "../../mk/readline.buildlink3.mk"
22.endif # LUA51_BUILDLINK3_MK 20.endif # LUA51_BUILDLINK3_MK
23 21
24BUILDLINK_TREE+= -lua51 22BUILDLINK_TREE+= -lua51
cvs diff -r1.3 -r1.4 pkgsrc/lang/lua52/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua52/buildlink3.mk 2014/05/03 13:00:45 1.3
+++ pkgsrc/lang/lua52/buildlink3.mk 2015/07/20 11:30:54 1.4
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.3 2014/05/03 13:00:45 alnsn Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $
2 2
3BUILDLINK_TREE+= lua52 3BUILDLINK_TREE+= lua52
4 4
5.if !defined(LUA52_BUILDLINK3_MK) 5.if !defined(LUA52_BUILDLINK3_MK)
6LUA52_BUILDLINK3_MK:= 6LUA52_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua52+= lua52>=5.2.0<5.3 8BUILDLINK_API_DEPENDS.lua52+= lua52>=5.2.0<5.3
9BUILDLINK_PKGSRCDIR.lua52?= ../../lang/lua52 9BUILDLINK_PKGSRCDIR.lua52?= ../../lang/lua52
10 10
11.if defined(BUILDLINK_DEPMETHOD.lua) 11.if defined(BUILDLINK_DEPMETHOD.lua)
12BUILDLINK_DEPMETHOD.lua52?= ${BUILDLINK_DEPMETHOD.lua} 12BUILDLINK_DEPMETHOD.lua52?= ${BUILDLINK_DEPMETHOD.lua}
13.endif 13.endif
14 14
15# -llua -> -llua5.2 15# -llua -> -llua5.2
16BUILDLINK_TRANSFORM+= l:lua:lua5.2 16BUILDLINK_TRANSFORM+= l:lua:lua5.2
17BUILDLINK_INCDIRS.lua52+= include/lua-5.2 17BUILDLINK_INCDIRS.lua52+= include/lua-5.2
18 18
19BUILDLINK_FNAME_TRANSFORM.lua52+= -e 's|lib/pkgconfig/lua-5.2.pc|lib/pkgconfig/lua.pc|' 
20 
21.include "../../mk/readline.buildlink3.mk" 19.include "../../mk/readline.buildlink3.mk"
22.endif # LUA52_BUILDLINK3_MK 20.endif # LUA52_BUILDLINK3_MK
23 21
24BUILDLINK_TREE+= -lua52 22BUILDLINK_TREE+= -lua52
cvs diff -r1.1.1.1 -r1.2 pkgsrc/lang/lua53/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/lang/lua53/buildlink3.mk 2015/01/17 17:50:23 1.1.1.1
+++ pkgsrc/lang/lua53/buildlink3.mk 2015/07/20 11:30:54 1.2
@@ -1,24 +1,22 @@ @@ -1,24 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.1.1.1 2015/01/17 17:50:23 alnsn Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2015/07/20 11:30:54 wiz Exp $
2 2
3BUILDLINK_TREE+= lua53 3BUILDLINK_TREE+= lua53
4 4
5.if !defined(LUA53_BUILDLINK3_MK) 5.if !defined(LUA53_BUILDLINK3_MK)
6LUA53_BUILDLINK3_MK:= 6LUA53_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lua53+= lua53>=5.3.0<5.4 8BUILDLINK_API_DEPENDS.lua53+= lua53>=5.3.0<5.4
9BUILDLINK_PKGSRCDIR.lua53?= ../../lang/lua53 9BUILDLINK_PKGSRCDIR.lua53?= ../../lang/lua53
10 10
11.if defined(BUILDLINK_DEPMETHOD.lua) 11.if defined(BUILDLINK_DEPMETHOD.lua)
12BUILDLINK_DEPMETHOD.lua53?= ${BUILDLINK_DEPMETHOD.lua} 12BUILDLINK_DEPMETHOD.lua53?= ${BUILDLINK_DEPMETHOD.lua}
13.endif 13.endif
14 14
15# -llua -> -llua5.3 15# -llua -> -llua5.3
16BUILDLINK_TRANSFORM+= l:lua:lua5.3 16BUILDLINK_TRANSFORM+= l:lua:lua5.3
17BUILDLINK_INCDIRS.lua53+= include/lua-5.3 17BUILDLINK_INCDIRS.lua53+= include/lua-5.3
18 18
19BUILDLINK_FNAME_TRANSFORM.lua53+= -e 's|lib/pkgconfig/lua-5.3.pc|lib/pkgconfig/lua.pc|' 
20 
21.include "../../mk/readline.buildlink3.mk" 19.include "../../mk/readline.buildlink3.mk"
22.endif # LUA53_BUILDLINK3_MK 20.endif # LUA53_BUILDLINK3_MK
23 21
24BUILDLINK_TREE+= -lua53 22BUILDLINK_TREE+= -lua53