Skip to content

Commit 0af0578

Browse files
committed
lang/luajit: update to v2.1
Disconnect lang/luajit-devel from the build, will be removed soon. Bump PORTREVISIONs for the consumers. Discussed with: adamw PR: 225342
1 parent 73f619f commit 0af0578

File tree

56 files changed

+168
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+168
-110
lines changed

‎Mk/Uses/luajit.mk‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# LUAJIT_VER: The selected luajit version
88
# LUAJIT_INCDIR: The path to luajit's header files
99
# LUAJIT_LUAVER: Which luajit spec version is selected
10-
# (2.0 for luajit, else 2.1)
10+
# (always 2.1)
1111

1212
.if !defined(_INCLUDE_USES_LUAJIT_MK)
1313
_INCLUDE_USES_LUAJIT_MK=yes
@@ -28,11 +28,7 @@ IGNORE= Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${V
2828
IGNORE= Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_VER}
2929
.endif
3030

31-
.if ${LUAJIT_VER} == luajit
32-
LUAJIT_LUAVER= 2.0
33-
.else
3431
LUAJIT_LUAVER= 2.1
35-
.endif
3632

3733
LIB_DEPENDS+= libluajit-5.1.so:lang/${LUAJIT_VER}
3834
LUAJIT_INCDIR= ${LOCALBASE}/include/luajit-${LUAJIT_LUAVER}

‎Mk/bsd.default-versions.mk‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,7 @@ LLVM_DEFAULT?= 19
9898
# Possible values: 5.1, 5.2, 5.3, 5.4
9999
LUA_DEFAULT?= 5.4
100100
# Possible values: luajit, luajit-devel, luajit-openresty
101-
. if ${ARCH:Mpowerpc64*}
102-
LUAJIT_DEFAULT?= luajit-openresty
103-
. else
104-
LUAJIT_DEFAULT?= luajit-devel
105-
. endif
101+
LUAJIT_DEFAULT?= luajit
106102
# Possible values: 5.10, 5.20, 6.8
107103
MONO_DEFAULT?= 5.20
108104
# Possible values: 8.0, 8.4, 9.1, 10.5m, 10.6m, 10.11m, 11.4m

‎audio/csound/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= csound
22
DISTVERSION= 6.15.0
3-
PORTREVISION= 10
3+
PORTREVISION= 11
44
CATEGORIES= audio lang
55

66
MAINTAINER= yuri@FreeBSD.org

‎benchmarks/sysbench/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= sysbench
22
PORTVERSION= 1.0.20
3-
PORTREVISION= 1
3+
PORTREVISION= 2
44
CATEGORIES= benchmarks databases
55

66
MAINTAINER= sunpoet@FreeBSD.org

‎benchmarks/wrk/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= wrk
22
PORTVERSION= 4.2.0
3-
PORTREVISION= 1
3+
PORTREVISION= 2
44
CATEGORIES= benchmarks www
55

66
MAINTAINER= osa@FreeBSD.org
@@ -26,7 +26,7 @@ USE_CSTD= c99
2626
LLD_UNSAFE= yes
2727
.if ${FLAVOR} == luajit
2828
CFLAGS+= -I${LOCALBASE}/include/luajit-2.1
29-
LIB_DEPENDS= libluajit-5.1.so:lang/luajit-devel
29+
LIB_DEPENDS= libluajit-5.1.so:lang/luajit
3030
.else
3131
CFLAGS+= -I${LOCALBASE}/include/luajit-2.1
3232
LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty

‎converters/osm2pgsql/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
PORTNAME= osm2pgsql
22
PORTVERSION= 2.1.1
3+
PORTREVISION= 1
34
CATEGORIES= converters geography
45

56
MAINTAINER= amdmi3@FreeBSD.org

‎devel/efl/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= efl
22
DISTVERSION= 1.28.1
3-
PORTREVISION= 2
3+
PORTREVISION= 3
44
CATEGORIES= devel enlightenment
55
MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/
66
DIST_SUBDIR= enlightenment

‎devel/love/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
PORTNAME= love
22
PORTVERSION= 11.5
3+
PORTREVISION= 1
34
CATEGORIES= devel games
45
MASTER_SITES= https://github.com/love2d/love/releases/download/${PORTVERSION}/
56
DISTNAME= ${PORTNAME}-${PORTVERSION}-linux-src

‎devel/love10/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PORTNAME= love
22
PORTVERSION= 0.10.2
3-
PORTREVISION= 5
3+
PORTREVISION= 6
44
CATEGORIES= devel games
55
MASTER_SITES= https://bitbucket.org/rude/love/downloads/ \
66
https://mirror.amdmi3.ru/distfiles/

‎devel/lua-luarocks/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
PORTNAME= luarocks
22
PORTVERSION= 3.12.2
3+
PORTREVISION= 1
34
CATEGORIES= devel
45
MASTER_SITES= https://luarocks.org/releases/
56
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}

0 commit comments

Comments
 (0)