ziggi/bsdports
1
0
Fork 0
mirror of https://github.com/beard7n/bsdports.git synced 2026-04-10 02:21:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

work commit

Browse Source
This commit is contained in:
ziggi
2020-07-22 08:05:18 +00:00
parent 5716a55103
commit 33683250b8
29 changed files with 61 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Mk/Uses/lua.mk
View File

@@ -79,13 +79,13 @@ _LUA_WANTED_VERSION:= ${_LUA_HIGHEST_VERSION}
#
LUA_VER_STR= ${_LUA_WANTED_VERSION}
LUA_VER= ${_LUA_WANTED_VERSION:S/5/5./}
LUA_CMD= lua${_LUA_WANTED_VERSION}
LUAC_CMD= luac${_LUA_WANTED_VERSION}
LUA_INCDIR= ${LOCALBASE}/include/lua${_LUA_WANTED_VERSION}
LUA_CMD= lua${LUA_VER}
LUAC_CMD= luac${LUA_VER}
LUA_INCDIR= ${LOCALBASE}/include/lua/${LUA_VER}
LUA_MODLIBDIR= ${LOCALBASE}/lib/lua/${LUA_VER}
LUA_MODSHAREDIR= ${LOCALBASE}/share/lua/${LUA_VER}
LUA_LIBDIR= ${LOCALBASE}/lib
LUA_PKGNAMEPREFIX= lua${LUA_VER_STR}-
LUA_PKGNAMEPREFIX= lua${LUA_VER_STR}
PLIST_SUB+= LUA_MODLIBDIR=${LUA_MODLIBDIR:S,^${LOCALBASE}/,,} \
LUA_MODSHAREDIR=${LUA_MODSHAREDIR:S,^${LOCALBASE}/,,} \
@@ -104,7 +104,7 @@ BUILD_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR}
.elif ${lua_ARGS:Mrun}
RUN_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR}
.else
LIB_DEPENDS+= liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR}
LIB_DEPENDS+= liblua${LUA_VER}.so:lang/lua${LUA_VER_STR}
.endif
.endif

2
Mk/bsd.default-versions.mk
View File

@@ -63,7 +63,7 @@ LINUX_DEFAULT?= c6
# bumping the LLVM version.
LLVM_DEFAULT?= 80
# Possible values: 5.1, 5.2, 5.3
LUA_DEFAULT?= 5.2
LUA_DEFAULT?= 5.3
# Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 10.3m, 5.5p, 5.6p, 5.7p, 5.6w
MYSQL_DEFAULT?= 5.7
# Possible values: 5.26, 5.28, 5.30, devel

2
Mk/bsd.ocaml.mk
View File

@@ -64,7 +64,7 @@ OCAML_SITELIBDIR?= ${OCAML_LIBDIR}/site-lib
#
# OCaml compiler port dependency
#
OCAMLC_PORT?= lang/ocaml
OCAMLC_PORT?= lang/ocaml410
OCAMLC_DEPEND?= ${OCAMLC}:${OCAMLC_PORT}
#