View | Details | Raw Unified | Return to bug 245038 | Differences between
and this patch

Collapse All | Expand All

(-)b/MOVED (+12 lines)
Lines 14503-14505 x11-wm/clementine-wm||2020-03-20|Removed, unmaintained and depends on expired x1 Link Here
14503
net/kdsoap|www/kdsoap|2020-03-21|Already existed in the tree
14503
net/kdsoap|www/kdsoap|2020-03-21|Already existed in the tree
14504
security/openssh-portable@x509||2020-03-23|Has expired: X509 long broken without known users
14504
security/openssh-portable@x509||2020-03-23|Has expired: X509 long broken without known users
14505
devel/py-antlr4-python2-runtime|devel/antlr4-python3-runtime|2020-03-25|Has expired: Uses EoL python27, please use devel/antlr4-python3-runtime instead
14505
devel/py-antlr4-python2-runtime|devel/antlr4-python3-runtime|2020-03-25|Has expired: Uses EoL python27, please use devel/antlr4-python3-runtime instead
14506
archivers/lua51-zlib|archivers/lua-zlib@lua51|2020-03-26|Switched to use flavors
14507
audio/lua51-mpd|audio/lua-mpd@lua51|2020-03-26|Switched to use flavors
14508
converters/lua51-iconv|converters/lua-iconv@lua51|2020-03-26|Switched to use flavors
14509
devel/lua51-bitop|devel/lua-bitop@lua51|2020-03-26|Switched to use flavors
14510
devel/lua51-cjson|devel/lua-cjson@lua51|2020-03-26|Switched to use flavors
14511
devel/lua51-libevent|devel/lua-libevent@lua51|2020-03-26|Switched to use flavors
14512
devel/luafilesystem-51|devel/luafilesystem@lua51|2020-03-26|Switched to use flavors
14513
net/lualdap-51|net/lualdap@lua51|2020-03-26|Switched to use flavors
14514
net/luasocket-51|net/luasocket@lua51|2020-03-26|Switched to use flavors
14515
net/luasocket-53|net/luasocket@lua53|2020-03-26|Switched to use flavors
14516
security/luasec-51|security/luasec@lua51|2020-03-26|Switched to use flavors
14517
textproc/luaexpat-51|textproc/luaexpat@lua51|2020-03-26|Switched to use flavors
(-)b/Mk/Uses/lua.mk (-48 / +208 lines)
Lines 5-20 Link Here
5
# MAINTAINER: ports@FreeBSD.org
5
# MAINTAINER: ports@FreeBSD.org
6
# Usage:
6
# Usage:
7
#
7
#
8
# USES+=	lua[:version]
8
# USES+=	lua[:options,...]
9
#
10
# Options:
11
#
12
#   NN    (e.g. 52)  - specify an allowed Lua version (can use multiple times)
13
#   NN+   (e.g. 52+) - specify a minimum Lua version (discouraged)
14
#   -NN   (e.g. -53) - specify a maximum allowed version
15
#   NN-NN (e.g. 51-53) - specify a range of allowed versions
16
#
17
#   flavors	define FLAVOR / FLAVORS as luaNN from the allowed versions
18
#
19
#   noflavors	don't use flavors
20
#
21
#   module	(implies flavors) specifies that the port is a Lua module
22
#		(i.e. that it installes files in MODLIBDIR etc.)
23
#
24
#   build	add dependency to BUILD_DEPENDS instead of LIB_DEPENDS
25
#   run		add dependency to RUN_DEPENDS instead of LIB_DEPENDS
26
#
27
#   env		define only the LUA_* vars and add them to PLIST_SUB and
28
#		MAKE_ENV, do not add dependencies or other global state
29
#
30
#   core	for building Lua itself
31
#
32
# If more than one version is allowed, then the LUA_DEFAULT version
33
# (as set in DEFAULT_VERSIONS) is chosen if it is allowed, otherwise
34
# the highest allowed version is chosen. But if "flavors" was requested,
35
# and FLAVOR is set, we use that version.
36
#
37
# LUA_FLAVOR is defined to the desired flavor whether or not "flavors" was
38
# selected; ports should use this to specify the flavor of dependencies
39
# which are Lua modules or otherwise Lua-flavored.
40
#
41
# It's not generally expected that applications that embed Lua, or apps
42
# written in Lua, would use USES=lua:flavors. Given that Lua is lightweight
43
# and does not carry around a whole lot of module ecosystem with it, it is
44
# best that application ports simply specify the Lua version or range of
45
# versions that they support, and let the default one or the latest one be
46
# used. However, they should still use LUA_FLAVOR as needed when specifying
47
# dependencies.
9
#
48
#
10
.if !defined(_INCLUDE_USES_LUA_MK)
49
.if !defined(_INCLUDE_USES_LUA_MK)
11
_INCLUDE_USES_LUA_MK=	yes
50
_INCLUDE_USES_LUA_MK=	yes
12
51
13
# When adding a version, please keep the comment in
52
# When adding a version, please keep the comment in
14
# Mk/bsd.default-versions.mk in sync.
53
# Mk/bsd.default-versions.mk in sync.
15
_LUA_VALID_VERSIONS=	53 52 51
54
_LUA_VALID_VERSIONS:=	53 52 51
55
.if defined(_LUA_EXTRA_VER)
56
_LUA_VALID_VERSIONS+= ${_LUA_EXTRA_VER}
57
.endif
58
59
_LUA_DEFAULT_VERSION:=	${LUA_DEFAULT:S/.//}
60
61
# args
62
_LUA_ARG_FLAVORS:=
63
_LUA_ARG_MODULE:=
64
_LUA_ARG_ENV:=
65
_LUA_ARG_CORE:=
66
.if ${lua_ARGS:Mmodule}
67
_LUA_ARG_FLAVORS:=yes
68
_LUA_ARG_MODULE:=yes
69
.endif
70
.if ${lua_ARGS:Mflavors}
71
_LUA_ARG_FLAVORS:=yes
72
.endif
73
.if ${lua_ARGS:Mnoflavors}
74
_LUA_ARG_FLAVORS:=
75
.endif
76
.if ${lua_ARGS:Menv}
77
_LUA_ARG_ENV:=yes
78
.endif
79
.if ${lua_ARGS:Mcore}
80
_LUA_ARG_CORE:=yes
81
_LUA_ARG_ENV:=yes
82
_LUA_ARG_FLAVORS:=
83
_LUA_ARG_MODULE:=
84
.endif
85
86
# core is for building Lua itself, so it overrides all version checks
87
.if ${_LUA_ARG_CORE}
88
89
_LUA_WANTED_VERSION:=${lua_ARGS:M[1-9][0-9]:[1]}
90
91
.  if ${lua_ARGS:M[1-9][0-9]:[#]} != 1
92
IGNORE= USES=lua:core must also specify exactly one version number
93
# set to avoid spurious errors below
94
_LUA_WANTED_VERSION:=${_LUA_DEFAULT_VERSION}
95
.  endif
96
97
_LUA_VALID_VERSIONS:=${_LUA_WANTED_VERSION}
98
_LUA_WANTED_VERSIONS:=${_LUA_WANTED_VERSION}
99
_LUA_DEFAULT_VERSION:=${_LUA_WANTED_VERSION}
100
101
.endif # _LUA_ARG_CORE
16
102
17
_LUA_DEFAULT_VERSION=	${LUA_DEFAULT:S/.//}
18
.if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
103
.if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}}
19
IGNORE=	Invalid lua version ${LUA_DEFAULT}
104
IGNORE=	Invalid lua version ${LUA_DEFAULT}
20
.endif
105
.endif
Lines 22-110 IGNORE= Invalid lua version ${LUA_DEFAULT} Link Here
22
#
107
#
23
# Parse a ver+ argument
108
# Parse a ver+ argument
24
#
109
#
25
.if ${lua_ARGS:M*+}
110
.if ${lua_ARGS:M??+}
26
_LUA_MIN_VERSION:=	${lua_ARGS:M*+:S/+//}
111
_LUA_MIN_VERSION:=	${lua_ARGS:M??+:S/+//}
112
_LUA_MAX_VERSION:=	99
113
.endif
114
27
#
115
#
28
# Resolve minimum versions (ver+). Append anything greater or equal than the
116
# Parse a -ver argument
29
# specified minimum version to the list of wanted versions.
30
#
117
#
31
.  for _v in ${_LUA_VALID_VERSIONS}
118
.if ${lua_ARGS:M-??}
32
.    if ${_LUA_MIN_VERSION} <= ${_v}
119
_LUA_MAX_VERSION:=	${lua_ARGS:M-??:S/-//}
120
_LUA_MIN_VERSION:=	0
121
.endif
122
123
#
124
# Parse a ver-ver argument
125
#
126
.if ${lua_ARGS:M??-??}
127
_LUA_MIN_VERSION:=	${lua_ARGS:M??-??:C/-.*//}
128
_LUA_MAX_VERSION:=	${lua_ARGS:M??-??:C/.*-//}
129
.endif
130
131
#
132
# Parse one or more ver arguments
133
#
134
.if ${lua_ARGS:M[1-9][0-9]}
135
.  for _v in ${lua_ARGS:M[1-9][0-9]}
136
.    if ${_LUA_VALID_VERSIONS:M${_v}}
33
_LUA_WANTED_VERSIONS+=${_v}
137
_LUA_WANTED_VERSIONS+=${_v}
34
.    endif
138
.    endif
35
.  endfor
139
.  endfor
140
.  if empty(_LUA_WANTED_VERSIONS)
141
IGNORE= USES=lua:nn did not find any valid version number
142
.  endif
36
.endif
143
.endif
37
144
38
#
145
#
39
# Parse one or more ver arguments
146
# Resolve version ranges. Append anything within the range to the list of
147
# wanted versions.
40
#
148
#
41
.if ${lua_ARGS:M5[1-3]}
149
.if defined(_LUA_MIN_VERSION) && defined(_LUA_MAX_VERSION)
42
_LUA_WANTED_VERSIONS:=	${lua_ARGS:M5[1-3]}
150
.  for _v in ${_LUA_VALID_VERSIONS}
151
.    if ${_LUA_MIN_VERSION} <= ${_v} && ${_LUA_MAX_VERSION} >= ${_v}
152
_LUA_WANTED_VERSIONS+=${_v}
153
.    endif
154
.  endfor
155
.  if empty(_LUA_WANTED_VERSIONS)
156
IGNORE= USES=lua:xx-yy did not find any valid version
157
.  endif
43
.endif
158
.endif
44
159
45
#
160
#
46
# If no version was specified with any of the ver or ver+ arguments, set the
161
# If no version was specified with any of the ver or ver+ arguments, allow
47
# default version.
162
# all versions.
48
#
163
#
49
.if !defined(_LUA_WANTED_VERSIONS)
164
.if empty(_LUA_WANTED_VERSIONS)
50
_LUA_WANTED_VERSIONS=	${_LUA_DEFAULT_VERSION}
165
_LUA_WANTED_VERSIONS:=	${_LUA_VALID_VERSIONS}
51
.endif
166
.endif
52
167
53
#
168
#
54
# Right now we have built a list of potential versions that we may depend on.
169
# By now, _LUA_WANTED_VERSIONS is the list of valid version numbers that the
55
# Let's sort them and remove any duplicates. We then locate the highest one
170
# caller has allowed through. We want to put the default version, if it's in
56
# already installed, if any.
171
# the list, first, followed by all other versions in desc order; then the
172
# first element is the one we want (or the default flavor in the flavor case)
57
#
173
#
58
.for _v in ${_LUA_WANTED_VERSIONS:O:u}
174
_LUA_WANTED_VERSIONS:= \
59
_LUA_HIGHEST_VERSION:=${_v}
175
	${_LUA_WANTED_VERSIONS:M${_LUA_DEFAULT_VERSION}} \
60
.  if exists(${LOCALBASE}/bin/lua${_v})
176
	${_LUA_WANTED_VERSIONS:N${_LUA_DEFAULT_VERSION}:O:u:[-1..1]}
61
_LUA_HIGHEST_INSTALLED_VERSION:=	${_v}
177
178
.if ${_LUA_ARG_FLAVORS}
179
.  if empty(FLAVORS)
180
FLAVORS= ${_LUA_WANTED_VERSIONS:S/^/lua/}
62
.  endif
181
.  endif
63
.endfor
182
.  if empty(FLAVOR)
183
FLAVOR= ${FLAVORS:[1]}
184
.  endif
185
_LUA_WANTED_VERSION:= ${FLAVOR:S/^lua//}
186
.else
187
_LUA_WANTED_VERSION:= ${_LUA_WANTED_VERSIONS:[1]}
188
.endif
64
189
190
# If we're building Lua itself, everything should be in $PREFIX. If
191
# we're building a module or app, then the stuff we're installing goes
192
# in $PREFIX but references to Lua itself are in $LOCALBASE.
65
#
193
#
66
# Depend on the default version if it fits, or the highest installed version,
194
# The assumption is the LUA_MOD* directories are where we're going to
67
# or the highest version.
195
# install (this is common for both modules and apps), and so we also
68
#
196
# define LUA_REFMOD* relative to LOCALBASE for use when specifying
69
.if ${_LUA_WANTED_VERSIONS:M${_LUA_DEFAULT_VERSION}}
197
# dependencies and so on.
70
_LUA_WANTED_VERSION:=	${_LUA_DEFAULT_VERSION}
198
71
.elif defined(_LUA_HIGHEST_INSTALLED_VERSION)
199
.if ${_LUA_ARG_CORE}
72
_LUA_WANTED_VERSION:=	${_LUA_HIGHEST_INSTALLED_VERSION}
200
LUA_BASE=${PREFIX}
73
.else
201
.else
74
_LUA_WANTED_VERSION:=	${_LUA_HIGHEST_VERSION}
202
LUA_BASE=${LOCALBASE}
75
.endif
203
.endif
76
204
205
LUA_PREFIX=${PREFIX}
206
77
#
207
#
78
# Exported variables
208
# Exported variables
79
#
209
#
80
LUA_VER_STR=		${_LUA_WANTED_VERSION}
210
LUA_VER_STR=		${_LUA_WANTED_VERSION}
81
LUA_VER=		${_LUA_WANTED_VERSION:S/5/5./}
211
LUA_VER=		${_LUA_WANTED_VERSION:S/^5/5./}
82
LUA_CMD=		lua${_LUA_WANTED_VERSION}
212
LUA_FLAVOR=		${_LUA_WANTED_VERSION:S/^/lua/}
83
LUAC_CMD=		luac${_LUA_WANTED_VERSION}
213
84
LUA_INCDIR=		${LOCALBASE}/include/lua${_LUA_WANTED_VERSION}
214
LUA_CMD=		lua${LUA_VER_STR}
85
LUA_MODLIBDIR=		${LOCALBASE}/lib/lua/${LUA_VER}
215
LUAC_CMD=		luac${LUA_VER_STR}
86
LUA_MODSHAREDIR=	${LOCALBASE}/share/lua/${LUA_VER}
87
LUA_LIBDIR=		${LOCALBASE}/lib
88
LUA_PKGNAMEPREFIX=	lua${LUA_VER_STR}-
216
LUA_PKGNAMEPREFIX=	lua${LUA_VER_STR}-
89
217
90
PLIST_SUB+=	LUA_MODLIBDIR=${LUA_MODLIBDIR:S,^${LOCALBASE}/,,} \
218
LUA_LIBDIR=		${LUA_BASE}/lib
91
		LUA_MODSHAREDIR=${LUA_MODSHAREDIR:S,^${LOCALBASE}/,,} \
219
LUA_INCDIR=		${LUA_BASE}/include/lua${LUA_VER_STR}
220
221
LUA_MODLIBDIR=		${LUA_PREFIX}/lib/lua/${LUA_VER}
222
LUA_MODSHAREDIR=	${LUA_PREFIX}/share/lua/${LUA_VER}
223
LUA_MODDOCSDIR=		${LUA_PREFIX}/share/doc/lua${LUA_VER_STR}
224
LUA_MODEXAMPLESDIR=	${LUA_PREFIX}/share/examples/lua${LUA_VER_STR}
225
226
LUA_REFMODLIBDIR=	${LUA_BASE}/lib/lua/${LUA_VER}
227
LUA_REFMODSHAREDIR=	${LUA_BASE}/share/lua/${LUA_VER}
228
229
PLIST_SUB+=	LUA_MODLIBDIR=${LUA_MODLIBDIR:S,^${LUA_PREFIX}/,,} \
230
		LUA_MODSHAREDIR=${LUA_MODSHAREDIR:S,^${LUA_PREFIX}/,,} \
231
		LUA_MODDOCSDIR=${LUA_MODDOCSDIR:S,^${LUA_PREFIX}/,,} \
232
		LUA_INCDIR=${LUA_INCDIR:S,^${LUA_BASE}/,,} \
233
		LUA_LIBDIR=${LUA_LIBDIR:S,^${LUA_BASE}/,,} \
92
		LUA_VER=${LUA_VER} \
234
		LUA_VER=${LUA_VER} \
93
		LUA_INCDIR=${LUA_INCDIR:S,^${LOCALBASE}/,,} \
94
		LUA_LIBDIR=${LUA_LIBDIR:S,^${LOCALBASE}/,,} \
95
		LUA_VER_STR=${LUA_VER_STR}
235
		LUA_VER_STR=${LUA_VER_STR}
96
MAKE_ENV+=	LUA_MODLIBDIR=${LUA_MODLIBDIR} \
236
MAKE_ENV+=	LUA_MODLIBDIR=${LUA_MODLIBDIR} \
97
		LUA_MODSHAREDIR=${LUA_MODSHAREDIR} \
237
		LUA_MODSHAREDIR=${LUA_MODSHAREDIR} \
98
		LUA_VER=${LUA_VER} \
238
		LUA_MODDOCSDIR=${LUA_MODDOCSDIR} \
99
		LUA_INCDIR=${LUA_INCDIR} \
239
		LUA_INCDIR=${LUA_INCDIR} \
100
		LUA_LIBDIR=${LUA_LIBDIR}
240
		LUA_LIBDIR=${LUA_LIBDIR} \
241
		LUA_VER=${LUA_VER} \
242
		LUA_VER_STR=${LUA_VER_STR}
243
244
# if building a module or Lua itself, or if the port defined LUA_DOCSUBDIR,
245
# then define LUA_DOCSDIR and LUA_EXAMPLESDIR too
246
.if ${_LUA_ARG_CORE} || ${_LUA_ARG_MODULE}
247
LUA_DOCSUBDIR?=${PORTNAME}
248
.endif
249
.if !empty(LUA_DOCSUBDIR)
250
LUA_DOCSDIR=	${LUA_MODDOCSDIR}/${LUA_DOCSUBDIR}
251
LUA_EXAMPLESDIR=${LUA_MODEXAMPLESDIR}/${LUA_DOCSUBDIR}
252
PLIST_SUB+=	LUA_DOCSDIR=${LUA_DOCSDIR:S,^${LUA_PREFIX}/,,}
253
PLIST_SUB+=	LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR:S,^${LUA_PREFIX}/,,}
254
MAKE_ENV+=	LUA_DOCSDIR=${LUA_DOCSDIR}
255
MAKE_ENV+=	LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR}
256
.endif
101
257
102
.if ${lua_ARGS:Mbuild}
258
.if empty(_LUA_ARG_ENV)
259
.  if ${lua_ARGS:Mbuild}
103
BUILD_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
260
BUILD_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
104
.elif ${lua_ARGS:Mrun}
261
.  endif
262
.  if ${lua_ARGS:Mrun}
105
RUN_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
263
RUN_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
106
.else
264
.  endif
265
.  if !${lua_ARGS:Mbuild} && !${lua_ARGS:Mrun}
107
LIB_DEPENDS+=	liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR}
266
LIB_DEPENDS+=	liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR}
267
.  endif
108
.endif
268
.endif
109
269
110
.endif
270
.endif
(-)b/archivers/Makefile (-1 / +1 lines)
Lines 70-76 Link Here
70
    SUBDIR += lizard
70
    SUBDIR += lizard
71
    SUBDIR += lrzip
71
    SUBDIR += lrzip
72
    SUBDIR += lua-lzlib
72
    SUBDIR += lua-lzlib
73
    SUBDIR += lua51-zlib
73
    SUBDIR += lua-zlib
74
    SUBDIR += lzfse
74
    SUBDIR += lzfse
75
    SUBDIR += lzip
75
    SUBDIR += lzip
76
    SUBDIR += lziprecover
76
    SUBDIR += lziprecover
(-)b/archivers/lua-lzlib/Makefile (-1 / +2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	lzlib
3
PORTNAME=	lzlib
4
PORTVERSION=	0.4.3
4
PORTVERSION=	0.4.3
5
PORTREVISION=	1
5
CATEGORIES=	archivers
6
CATEGORIES=	archivers
6
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
7
8
Lines 10-16 COMMENT= Lua bindings to the ZLib compression library Link Here
10
11
11
LICENSE=	MIT
12
LICENSE=	MIT
12
13
13
USES=		cmake lua
14
USES=		cmake lua:51-52,module
14
USE_GITHUB=	yes
15
USE_GITHUB=	yes
15
GH_ACCOUNT=	LuaDist
16
GH_ACCOUNT=	LuaDist
16
CMAKE_ARGS=	-DINSTALL_LMOD="${LUA_MODSHAREDIR}" \
17
CMAKE_ARGS=	-DINSTALL_LMOD="${LUA_MODSHAREDIR}" \
(-)b/archivers/lua-zlib/Makefile (-2 / +3 lines)
Lines 3-11 Link Here
3
3
4
PORTNAME=	zlib
4
PORTNAME=	zlib
5
PORTVERSION=	1.2
5
PORTVERSION=	1.2
6
PORTREVISION=	1
6
DISTVERSIONPREFIX=v
7
DISTVERSIONPREFIX=v
7
CATEGORIES=	archivers
8
CATEGORIES=	archivers
8
PKGNAMEPREFIX=	lua51-
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
10
10
MAINTAINER=	sirl33tname@gmail.com
11
MAINTAINER=	sirl33tname@gmail.com
11
COMMENT=	Simple streaming interface to zlib for the Lua Programming Language
12
COMMENT=	Simple streaming interface to zlib for the Lua Programming Language
Lines 16-22 USE_GITHUB= yes Link Here
16
GH_ACCOUNT=	brimworks
17
GH_ACCOUNT=	brimworks
17
GH_PROJECT=	lua-zlib
18
GH_PROJECT=	lua-zlib
18
19
19
USES=		lua:51
20
USES=		lua:51,module
20
21
21
ALL_TARGET=	bsd
22
ALL_TARGET=	bsd
22
MAKE_ENV+=	LUAPATH="${LOCALBASE}"
23
MAKE_ENV+=	LUAPATH="${LOCALBASE}"
(-)b/astro/celestia/Makefile (-1 / +1 lines)
Lines 15-21 LICENSE= GPLv2 Link Here
15
15
16
LIB_DEPENDS=	libpng.so:graphics/png
16
LIB_DEPENDS=	libpng.so:graphics/png
17
17
18
USES=		compiler:c++11-lang gettext gl gmake jpeg libtool lua pkgconfig
18
USES=		compiler:c++11-lang gettext gl gmake jpeg libtool lua:52 pkgconfig
19
USE_GL=		gl
19
USE_GL=		gl
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
EXTRA_PATCHES=	${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \
21
EXTRA_PATCHES=	${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \
(-)b/audio/Makefile (-1 / +1 lines)
Lines 459-465 Link Here
459
    SUBDIR += lollypop
459
    SUBDIR += lollypop
460
    SUBDIR += lpac
460
    SUBDIR += lpac
461
    SUBDIR += lsp-plugins-lv2
461
    SUBDIR += lsp-plugins-lv2
462
    SUBDIR += lua51-mpd
462
    SUBDIR += lua-mpd
463
    SUBDIR += luppp
463
    SUBDIR += luppp
464
    SUBDIR += lv2
464
    SUBDIR += lv2
465
    SUBDIR += lv2file
465
    SUBDIR += lv2file
(-)b/audio/aqualung/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	aqualung
4
PORTNAME=	aqualung
5
PORTVERSION=	1.0
5
PORTVERSION=	1.0
6
PORTREVISION=	13
6
PORTREVISION=	14
7
CATEGORIES=	audio
7
CATEGORIES=	audio
8
MASTER_SITES=	SF
8
MASTER_SITES=	SF
9
9
Lines 30-36 LIB_DEPENDS= libFLAC.so:audio/flac \ Link Here
30
		libcdio_paranoia.so:sysutils/libcdio-paranoia \
30
		libcdio_paranoia.so:sysutils/libcdio-paranoia \
31
		liblrdf.so:textproc/liblrdf
31
		liblrdf.so:textproc/liblrdf
32
32
33
USES=		compiler:c++11-lang gettext gnome localbase lua pkgconfig
33
USES=		compiler:c++11-lang gettext gnome localbase lua:52 pkgconfig
34
USE_GNOME=	gtk20 libxml2 libxslt
34
USE_GNOME=	gtk20 libxml2 libxslt
35
GNU_CONFIGURE=	yes
35
GNU_CONFIGURE=	yes
36
CONFIGURE_ARGS=	--with-ifp=no
36
CONFIGURE_ARGS=	--with-ifp=no
(-)b/audio/lua-mpd/Makefile (-3 / +4 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	mpd
3
PORTNAME=	mpd
4
PORTVERSION=	0.1
4
PORTVERSION=	0.1
5
PORTREVISION=	1
5
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
6
CATEGORIES=	audio
7
CATEGORIES=	audio
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
Lines 9-23 PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} Link Here
9
MAINTAINER=	demelier.david@gmail.com
10
MAINTAINER=	demelier.david@gmail.com
10
COMMENT=	Lua library for musicpd
11
COMMENT=	Lua library for musicpd
11
12
12
RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51
13
RUN_DEPENDS=	${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR}
13
14
14
OPTIONS_DEFINE=	DOCS
15
OPTIONS_DEFINE=	DOCS
15
DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
16
DOCSDIR=	${LUA_DOCSDIR}
16
17
17
GH_ACCOUNT=	silentbicycle
18
GH_ACCOUNT=	silentbicycle
18
GH_PROJECT=	lua-mpd
19
GH_PROJECT=	lua-mpd
19
20
20
USES=		lua:51
21
USES=		lua:51,module
21
USE_GITHUB=	yes
22
USE_GITHUB=	yes
22
NO_BUILD=	yes
23
NO_BUILD=	yes
23
24
(-)b/converters/Makefile (-1 lines)
Lines 49-55 Link Here
49
    SUBDIR += linux-c7-fribidi
49
    SUBDIR += linux-c7-fribidi
50
    SUBDIR += lua-iconv
50
    SUBDIR += lua-iconv
51
    SUBDIR += lua-json
51
    SUBDIR += lua-json
52
    SUBDIR += lua51-iconv
53
    SUBDIR += mimelib
52
    SUBDIR += mimelib
54
    SUBDIR += mmencode
53
    SUBDIR += mmencode
55
    SUBDIR += mpack
54
    SUBDIR += mpack
(-)b/converters/lua-iconv/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	iconv
4
PORTNAME=	iconv
5
PORTVERSION=	7
5
PORTVERSION=	7
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	converters
7
CATEGORIES=	converters
8
MASTER_SITES=	GHC
8
MASTER_SITES=	GHC
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
Lines 17-23 BROKEN= unfetchable Link Here
17
LICENSE=	MIT
17
LICENSE=	MIT
18
LICENSE_FILE=	${WRKSRC}/COPYING
18
LICENSE_FILE=	${WRKSRC}/COPYING
19
19
20
USES=		pkgconfig iconv lua
20
USES=		pkgconfig iconv lua:module
21
21
22
USE_GITHUB=	yes
22
USE_GITHUB=	yes
23
GH_ACCOUNT=	ittner
23
GH_ACCOUNT=	ittner
(-)b/converters/lua-json/Makefile (-2 / +3 lines)
Lines 3-19 Link Here
3
3
4
PORTNAME=	json
4
PORTNAME=	json
5
PORTVERSION=	1.3.4
5
PORTVERSION=	1.3.4
6
PORTREVISION=	1
6
CATEGORIES=	converters
7
CATEGORIES=	converters
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
9
9
MAINTAINER=	sunpoet@FreeBSD.org
10
MAINTAINER=	sunpoet@FreeBSD.org
10
COMMENT=	JSON parser/creator for Lua
11
COMMENT=	JSON parser/creator for Lua
11
12
12
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}lpeg>=0.8.1:devel/lua-lpeg
13
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}lpeg>=0.8.1:devel/lua-lpeg@${LUA_FLAVOR}
13
14
14
MAKE_ARGS=	INSTALL_CMOD=${LUA_MODLIBDIR} INSTALL_LMOD=${LUA_MODSHAREDIR}
15
MAKE_ARGS=	INSTALL_CMOD=${LUA_MODLIBDIR} INSTALL_LMOD=${LUA_MODSHAREDIR}
15
NO_ARCH=	yes
16
NO_ARCH=	yes
16
USES=		lua:run
17
USES=		lua:run,module
17
18
18
GH_ACCOUNT=	harningt
19
GH_ACCOUNT=	harningt
19
GH_PROJECT=	lua${PORTNAME}
20
GH_PROJECT=	lua${PORTNAME}
(-)a/converters/lua51-iconv/Makefile (-35 lines)
Removed Link Here
1
# Created by: vanilla@
2
# $FreeBSD$
3
4
PORTNAME=	iconv
5
PORTVERSION=	7
6
PORTREVISION=	2
7
CATEGORIES=	converters
8
MASTER_SITES=	GHC
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
10
DISTNAME=	lua-${PORTNAME}-${PORTVERSION}
11
12
MAINTAINER=	feld@FreeBSD.org
13
COMMENT=	Iconv binding for Lua 5
14
15
BROKEN=		unfetchable
16
17
USES=		pkgconfig iconv lua:51
18
19
USE_GITHUB=	yes
20
GH_ACCOUNT=	ittner
21
GH_PROJECT=	lua-${PORTNAME}
22
23
PLIST_FILES=	%%LUA_MODLIBDIR%%/iconv.so
24
CFLAGS+=	`pkgconf --cflags lua-${LUA_VER}` -I${LOCALBASE}/include
25
MAKE_ARGS=	LUABIN=${LUA_CMD} CFLAGS="${CFLAGS}"
26
LDFLAGS=	-shared ${ICONV_LIB} -L${LOCALBASE}/lib
27
CFLAGS_aarch64=	-fPIC
28
CFLAGS_amd64=	-fPIC
29
CFLAGS_i386=	-fPIC
30
31
do-install:
32
	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
33
	${INSTALL_LIB} ${WRKSRC}/iconv.so ${STAGEDIR}${LUA_MODLIBDIR}
34
35
.include <bsd.port.mk>
(-)a/converters/lua51-iconv/distinfo (-2 lines)
Removed Link Here
1
SHA256 (lua-iconv-7.tar.gz) = c1db1915c754b5cfe7e45af61467bc6dfa4f0037d281ccbce6b53c974e2faf09
2
SIZE (lua-iconv-7.tar.gz) = 7693
(-)a/converters/lua51-iconv/pkg-descr (-3 lines)
Removed Link Here
1
LuaIconv is a Lua binding to iconv library.
2
3
WWW: http://luaforge.net/projects/lua-iconv/
(-)b/databases/lua-lsqlite3/Makefile (-14 / +5 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	lsqlite3
4
PORTNAME=	lsqlite3
5
PORTVERSION=	0.9.5
5
PORTVERSION=	0.9.5
6
PORTREVISION=	1
6
CATEGORIES=	databases
7
CATEGORIES=	databases
7
MASTER_SITES=	http://Lua.SQLite.org/index.cgi/zip/
8
MASTER_SITES=	http://Lua.SQLite.org/index.cgi/zip/
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
Lines 15-44 LICENSE= MIT Link Here
15
16
16
BUILD_DEPENDS=	${NONEXISTENT}:databases/sqlite3:patch
17
BUILD_DEPENDS=	${NONEXISTENT}:databases/sqlite3:patch
17
18
18
USES=		localbase:ldflags sqlite:3 zip
19
USES=		localbase:ldflags sqlite:3 zip lua:module
19
20
20
OPTIONS_DEFINE=	DOCS EXAMPLES
21
OPTIONS_DEFINE=	DOCS EXAMPLES
21
OPTIONS_SINGLE=	LUA_VERSION
22
OPTIONS_SINGLE_LUA_VERSION=	LUA51 LUA52 LUA53
23
OPTIONS_DEFAULT=LUA${LUA_DEFAULT:S/.//}
24
25
LUA51_DESC=	Build for Lua 5.1 and LuaJIT
26
LUA51_USES=	lua:51
27
LUA52_DESC=	Build for Lua 5.2
28
LUA52_USES=	lua:52
29
LUA53_DESC=	Build for Lua 5.3
30
LUA53_USES=	lua:53
31
22
32
CFLAGS+=	-pedantic -Wall -Qunused-arguments -fPIC -DPIC\
23
CFLAGS+=	-pedantic -Wall -Qunused-arguments -fPIC -DPIC\
33
		-std=c99 -fno-strict-aliasing -I${LUA_INCDIR}\
24
		-std=c99 -fno-strict-aliasing -I${LUA_INCDIR}\
34
		-DLSQLITE_VERSION=\"${PORTVERSION}\"
25
		-DLSQLITE_VERSION=\"${PORTVERSION}\"
35
LDFLAGS+=	-shared -pthread -lm -L${LOCALBASE}/lib
26
LDFLAGS+=	-shared -pthread -lm -L${LOCALBASE}/lib
36
27
37
DOCSDIR=	${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME}
28
DOCSDIR=	${LUA_DOCSDIR}
38
EXAMPLESDIR=	${PREFIX}/share/examples/lua${LUA_VER_STR}/${PORTNAME}
29
EXAMPLESDIR=	${LUA_EXAMPLESDIR}
39
30
40
pre-configure:
31
pre-configure:
41
	@${CP} -p `${MAKE} -V WRKSRC -C ${PORTSDIR}/databases/sqlite3`/sqlite3.[ch] ${WRKSRC}
32
	@${CP} -p `${SETENV} -u FLAVOR ${MAKE} -V WRKSRC -C ${PORTSDIR}/databases/sqlite3`/sqlite3.[ch] ${WRKSRC}
42
33
43
do-build:
34
do-build:
44
	cd ${WRKSRC} &&\
35
	cd ${WRKSRC} &&\
(-)b/databases/lua-xapian/Makefile (-1 / +4 lines)
Lines 4-9 Link Here
4
PORTNAME=	xapian
4
PORTNAME=	xapian
5
PORTVERSION=	1.4.15
5
PORTVERSION=	1.4.15
6
DISTVERSIONPREFIX=	bindings-
6
DISTVERSIONPREFIX=	bindings-
7
PORTREVISION=	1
7
CATEGORIES=	databases
8
CATEGORIES=	databases
8
MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
9
MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
9
		LOCAL/sunpoet
10
		LOCAL/sunpoet
Lines 24-30 OPTIONS_DEFINE= DOCS Link Here
24
25
25
PORTSCOUT=	limitw:1,even
26
PORTSCOUT=	limitw:1,even
26
27
27
USES=		compiler:c++11-lang libtool lua tar:xz
28
USES=		compiler:c++11-lang libtool lua:module tar:xz
29
30
DOCSDIR=	${LUA_DOCSDIR}
28
31
29
CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
32
CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
30
		--docdir=${DOCSDIR} \
33
		--docdir=${DOCSDIR} \
(-)b/databases/luadbi/Makefile (-8 / +3 lines)
Lines 4-9 Link Here
4
PORTNAME=	luadbi
4
PORTNAME=	luadbi
5
PORTVERSION=	0.6
5
PORTVERSION=	0.6
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
PORTREVISION=	1
7
CATEGORIES=	databases
8
CATEGORIES=	databases
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
10
Lines 12-18 COMMENT= LuaDBI driver Link Here
12
13
13
LICENSE=	MIT
14
LICENSE=	MIT
14
15
15
USES=		gmake shebangfix
16
USES=		gmake shebangfix lua:module
16
SHEBANG_FILES=	DBI.lua
17
SHEBANG_FILES=	DBI.lua
17
18
18
USE_GITHUB=	yes
19
USE_GITHUB=	yes
Lines 30-47 MAKE_ENV+= LUA_INC="-I${LUA_INCDIR}" Link Here
30
31
31
MAKE_JOBS_UNSAFE=yes
32
MAKE_JOBS_UNSAFE=yes
32
33
33
OPTIONS_SINGLE=	LUA_VERSION
34
OPTIONS_SINGLE_LUA_VERSION=	LUA51 LUA52 LUA53
35
OPTIONS_MULTI=	DATABASE
34
OPTIONS_MULTI=	DATABASE
36
OPTIONS_MULTI_DATABASE=	MYSQL SQLITE3 PGSQL
35
OPTIONS_MULTI_DATABASE=	MYSQL SQLITE3 PGSQL
37
OPTIONS_DEFAULT=	MYSQL LUA52
36
OPTIONS_DEFAULT=	MYSQL
38
37
39
PLIST_FILES=	%%LUA_MODSHAREDIR%%/DBI.lua
38
PLIST_FILES=	%%LUA_MODSHAREDIR%%/DBI.lua
40
39
41
LUA51_USES=	lua:51
42
LUA52_USES=	lua:52
43
LUA53_USES=	lua:53
44
45
MYSQL_USES=		mysql
40
MYSQL_USES=		mysql
46
MYSQL_ALL_TARGET=	mysql
41
MYSQL_ALL_TARGET=	mysql
47
MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/mysql.so
42
MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/mysql.so
(-)b/databases/luasql-mysql/Makefile (-3 / +4 lines)
Lines 3-10 Link Here
3
3
4
PORTNAME=	luasql
4
PORTNAME=	luasql
5
PORTVERSION=	2.5.0
5
PORTVERSION=	2.5.0
6
PORTREVISION=	1
6
CATEGORIES=	databases
7
CATEGORIES=	databases
7
PKGNAMESUFFIX=	-${LUASQL_DRIVER}
8
PKGNAMESUFFIX=	-${LUASQL_DRIVER}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
10
9
MAINTAINER=	mbeis@xs4all.nl
11
MAINTAINER=	mbeis@xs4all.nl
10
COMMENT=	LuaSQL driver
12
COMMENT=	LuaSQL driver
Lines 14-20 LICENSE= MIT Link Here
14
USE_GITHUB=	yes
16
USE_GITHUB=	yes
15
GH_ACCOUNT=	keplerproject
17
GH_ACCOUNT=	keplerproject
16
18
17
USES=		lua gmake dos2unix
19
USES=		lua:module gmake dos2unix
18
DOS2UNIX_FILES=	src/*.c
20
DOS2UNIX_FILES=	src/*.c
19
ALL_TARGET=	${LUASQL_DRIVER}
21
ALL_TARGET=	${LUASQL_DRIVER}
20
22
Lines 30-37 MAKE_ARGS= LUA_DIR=${LUA_SUBDIR} \ Link Here
30
32
31
CFLAGS+=	-Wno-return-type
33
CFLAGS+=	-Wno-return-type
32
34
33
PLIST_SUB=	LUA_MIDLIBDIR=${LUA_MODLIBDIR} \
35
PLIST_SUB=	LUASQL_DRIVER=${LUASQL_DRIVER}
34
		LUASQL_DRIVER=${LUASQL_DRIVER}
35
36
36
.if ${LUASQL_DRIVER} == "mysql"
37
.if ${LUASQL_DRIVER} == "mysql"
37
COMMENT=	Lua interface to MySQL
38
COMMENT=	Lua interface to MySQL
(-)b/databases/redis-devel/Makefile (-1 / +1 lines)
Lines 31-37 MAKE_ENV= V=yo OPTIMIZATION= Link Here
31
31
32
JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
32
JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
33
33
34
LUA_USE=		lua=51
34
LUA_USES=		lua:51
35
LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
35
LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
36
LUA_VARS=		_addflags=true
36
LUA_VARS=		_addflags=true
37
37
(-)b/databases/xapian-bindings/Makefile (-1 / +1 lines)
Lines 17-23 PORTSCOUT= limitw:1,even Link Here
17
17
18
USES=		metaport
18
USES=		metaport
19
19
20
LUA_RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/lua-xapian
20
LUA_RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/lua-xapian@${LUA_FLAVOR}
21
LUA_USES=		lua:run
21
LUA_USES=		lua:run
22
PERL_RUN_DEPENDS=	p5-Xapian>=${PORTVERSION}:databases/p5-Xapian
22
PERL_RUN_DEPENDS=	p5-Xapian>=${PORTVERSION}:databases/p5-Xapian
23
PHP_RUN_DEPENDS=	php-xapian>=${PORTVERSION}:databases/php-xapian
23
PHP_RUN_DEPENDS=	php-xapian>=${PORTVERSION}:databases/php-xapian
(-)b/devel/Makefile (-4 / +1 lines)
Lines 1456-1461 Link Here
1456
    SUBDIR += lua-cjson
1456
    SUBDIR += lua-cjson
1457
    SUBDIR += lua-gettext
1457
    SUBDIR += lua-gettext
1458
    SUBDIR += lua-lgi
1458
    SUBDIR += lua-lgi
1459
    SUBDIR += lua-libevent
1459
    SUBDIR += lua-lpeg
1460
    SUBDIR += lua-lpeg
1460
    SUBDIR += lua-luacheck
1461
    SUBDIR += lua-luacheck
1461
    SUBDIR += lua-luarocks
1462
    SUBDIR += lua-luarocks
Lines 1468-1479 Link Here
1468
    SUBDIR += lua-stdlib-debug
1469
    SUBDIR += lua-stdlib-debug
1469
    SUBDIR += lua-stdlib-normalize
1470
    SUBDIR += lua-stdlib-normalize
1470
    SUBDIR += lua-sysctl
1471
    SUBDIR += lua-sysctl
1471
    SUBDIR += lua51-bitop
1472
    SUBDIR += lua51-cjson
1473
    SUBDIR += lua51-libevent
1474
    SUBDIR += luabind
1472
    SUBDIR += luabind
1475
    SUBDIR += luafilesystem
1473
    SUBDIR += luafilesystem
1476
    SUBDIR += luafilesystem-51
1477
    SUBDIR += luajava
1474
    SUBDIR += luajava
1478
    SUBDIR += lutok
1475
    SUBDIR += lutok
1479
    SUBDIR += luv
1476
    SUBDIR += luv
(-)b/devel/lua-MessagePack/Makefile (-1 / +2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	MessagePack
3
PORTNAME=	MessagePack
4
PORTVERSION=	0.3.5
4
PORTVERSION=	0.3.5
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
7
8
Lines 13-19 BROKEN= unfetchable Link Here
13
LICENSE=	MIT
14
LICENSE=	MIT
14
LICENSE_FILE=	${WRKSRC}/COPYRIGHT
15
LICENSE_FILE=	${WRKSRC}/COPYRIGHT
15
16
16
USES=		lua
17
USES=		lua:module
17
NO_BUILD=	yes
18
NO_BUILD=	yes
18
NO_ARCH=	yes
19
NO_ARCH=	yes
19
20
(-)b/devel/lua-bitlib/Makefile (-1 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	bitlib
4
PORTNAME=	bitlib
5
PORTVERSION=	24
5
PORTVERSION=	24
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
MASTER_SITES=	http://luaforge.net/frs/download.php/2715/
8
MASTER_SITES=	http://luaforge.net/frs/download.php/2715/
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
Lines 10-16 PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} Link Here
10
MAINTAINER=	ports@FreeBSD.org
11
MAINTAINER=	ports@FreeBSD.org
11
COMMENT=	Tiny library for bitwise operations
12
COMMENT=	Tiny library for bitwise operations
12
13
13
USES=		lua
14
USES=		lua:module
14
15
15
PLIST_FILES=	%%LUA_MODLIBDIR%%/bit.so
16
PLIST_FILES=	%%LUA_MODLIBDIR%%/bit.so
16
17
(-)b/devel/lua-bitop/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	bitop
4
PORTNAME=	bitop
5
PORTVERSION=	1.0.2
5
PORTVERSION=	1.0.2
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	http://bitop.luajit.org/download/ \
8
MASTER_SITES=	http://bitop.luajit.org/download/ \
9
		LOCAL/sunpoet
9
		LOCAL/sunpoet
Lines 18-24 LICENSE= MIT Link Here
18
CFLAGS+=	-I${LUA_INCDIR}
18
CFLAGS+=	-I${LUA_INCDIR}
19
MAKE_ARGS=	CC=${CC} LUA=${LUA_CMD}
19
MAKE_ARGS=	CC=${CC} LUA=${LUA_CMD}
20
TEST_TARGET=	test
20
TEST_TARGET=	test
21
USES?=		gmake lua
21
USES=		gmake lua:module
22
22
23
PLIST_FILES=	${LUA_MODLIBDIR}/bit.so
23
PLIST_FILES=	${LUA_MODLIBDIR}/bit.so
24
24
(-)b/devel/lua-cjson/Makefile (-2 / +3 lines)
Lines 3-20 Link Here
3
3
4
PORTNAME=	cjson
4
PORTNAME=	cjson
5
PORTVERSION=	2.1.0
5
PORTVERSION=	2.1.0
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
MASTER_SITES=	http://www.kyne.com.au/~mark/software/download/
8
MASTER_SITES=	http://www.kyne.com.au/~mark/software/download/
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
DISTNAME=	lua-cjson-${PORTVERSION}
10
DISTNAME=	lua-cjson-${PORTVERSION}
10
11
11
MAINTAINER=	osa@FreeBSD.org
12
MAINTAINER=	osa@FreeBSD.org
12
COMMENT?=	Fast JSON parsing and encoding support for Lua
13
COMMENT=	Fast JSON parsing and encoding support for Lua
13
14
14
LICENSE=	MIT
15
LICENSE=	MIT
15
LICENSE_FILE=	${WRKSRC}/LICENSE
16
LICENSE_FILE=	${WRKSRC}/LICENSE
16
17
17
USES?=		lua
18
USES=		lua:module
18
19
19
MAKE_ARGS=	LUA_VERSION=${LUA_VER}
20
MAKE_ARGS=	LUA_VERSION=${LUA_VER}
20
21
(-)b/devel/lua-gettext/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	gettext
4
PORTNAME=	gettext
5
PORTVERSION=	1.5
5
PORTVERSION=	1.5
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/gettext/ \
8
MASTER_SITES=	https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/gettext/ \
9
		https://BSDforge.com/projects/source/devel/lua-gettext/
9
		https://BSDforge.com/projects/source/devel/lua-gettext/
Lines 14-20 DIST_SUBDIR= lua-${PORTNAME}-${COMMIT} Link Here
14
MAINTAINER=	portmaster@BSDforge.com
14
MAINTAINER=	portmaster@BSDforge.com
15
COMMENT=	Gettext binding for Lua 5
15
COMMENT=	Gettext binding for Lua 5
16
16
17
USES=		gettext lua:51
17
USES=		gettext lua:51,module
18
18
19
CVER=		1.15
19
CVER=		1.15
20
LVER=		${PORTVERSION}
20
LVER=		${PORTVERSION}
(-)b/devel/lua-lgi/Makefile (-2 / +3 lines)
Lines 2-11 Link Here
2
2
3
PORTNAME=	lgi
3
PORTNAME=	lgi
4
PORTVERSION=	0.9.2
4
PORTVERSION=	0.9.2
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
7
8
8
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	andrew@tao11.riddles.org.uk
9
COMMENT=	Lua bindings to libraries using GObject-Introspection
10
COMMENT=	Lua bindings to libraries using GObject-Introspection
10
11
11
LICENSE=	MIT
12
LICENSE=	MIT
Lines 14-20 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
14
USE_GITHUB=	yes
15
USE_GITHUB=	yes
15
GH_ACCOUNT=	pavouk
16
GH_ACCOUNT=	pavouk
16
17
17
USES=		gmake gnome lua pkgconfig
18
USES=		gmake gnome lua:module pkgconfig
18
USE_GNOME=	introspection:build,run
19
USE_GNOME=	introspection:build,run
19
MAKE_ENV=	LUA_CFLAGS="-I${LUA_INCDIR}"
20
MAKE_ENV=	LUA_CFLAGS="-I${LUA_INCDIR}"
20
MAKE_ARGS=	PREFIX="${PREFIX}" LUA_LIBDIR="${LUA_MODLIBDIR}" \
21
MAKE_ARGS=	PREFIX="${PREFIX}" LUA_LIBDIR="${LUA_MODLIBDIR}" \
(-)b/devel/lua-libevent/Makefile (-5 / +5 lines)
Lines 1-12 Link Here
1
# Created by: Sir l33tname <sirl33tname@gmail.com>
1
# Created by: Sir l33tname <sirl33tname@gmail.com>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	lua51
4
PORTNAME=	libevent
5
PORTVERSION=	0.4.6
5
PORTVERSION=	0.4.6
6
DISTVERSIONPREFIX=v
6
DISTVERSIONPREFIX=v
7
PORTREVISION=	1
7
PORTREVISION=	2
8
CATEGORIES=	devel
8
CATEGORIES=	devel
9
PKGNAMESUFFIX=	-libevent
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
10
10
11
MAINTAINER=	sirl33tname@gmail.com
11
MAINTAINER=	sirl33tname@gmail.com
12
COMMENT=	Lua libevent binding
12
COMMENT=	Lua libevent binding
Lines 14-22 COMMENT= Lua libevent binding Link Here
14
LICENSE=	MIT
14
LICENSE=	MIT
15
15
16
LIB_DEPENDS=	libevent.so:devel/libevent
16
LIB_DEPENDS=	libevent.so:devel/libevent
17
RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51
17
RUN_DEPENDS=	${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR}
18
18
19
USES=		gmake pkgconfig lua:51
19
USES=		gmake pkgconfig lua:51,module
20
20
21
USE_GITHUB=	yes
21
USE_GITHUB=	yes
22
GH_ACCOUNT=	harningt
22
GH_ACCOUNT=	harningt
(-)b/devel/lua-lpeg/Makefile (-1 / +2 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	lpeg
3
PORTNAME=	lpeg
4
PORTVERSION=	1.0.2
4
PORTVERSION=	1.0.2
5
PORTREVISION=	1
5
CATEGORIES=	devel
6
CATEGORIES=	devel
6
MASTER_SITES=	http://www.inf.puc-rio.br/~roberto/lpeg/ \
7
MASTER_SITES=	http://www.inf.puc-rio.br/~roberto/lpeg/ \
7
		LOCAL/sunpoet
8
		LOCAL/sunpoet
Lines 12-18 COMMENT= PEG-based pattern-matching library for Lua Link Here
12
13
13
LICENSE=	MIT
14
LICENSE=	MIT
14
15
15
USES=		lua
16
USES=		lua:module
16
17
17
ALL_TARGET=	linux
18
ALL_TARGET=	linux
18
MAKE_ARGS=	CC=${CC} LUADIR=${LUA_INCDIR}
19
MAKE_ARGS=	CC=${CC} LUADIR=${LUA_INCDIR}
(-)b/devel/lua-luacheck/Makefile (-1 / +1 lines)
Lines 11-17 COMMENT= Linter and static analyzer for lua files Link Here
11
LICENSE=	MIT
11
LICENSE=	MIT
12
LICENSE_FILE=	${WRKSRC}/LICENSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
13
14
RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem
14
RUN_DEPENDS=	${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
15
15
16
USES=	lua
16
USES=	lua
17
NO_ARCH=	yes
17
NO_ARCH=	yes
(-)b/devel/lua-posix/Makefile (-2 / +3 lines)
Lines 4-9 Link Here
4
PORTNAME=	posix
4
PORTNAME=	posix
5
PORTVERSION=	34.1.1
5
PORTVERSION=	34.1.1
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
PORTREVISION=	1
7
CATEGORIES=	devel
8
CATEGORIES=	devel
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
10
Lines 13-21 COMMENT= Lua bindings for POSIX APIs Link Here
13
LICENSE=	MIT
14
LICENSE=	MIT
14
LICENSE_FILE=	${WRKSRC}/LICENSE
15
LICENSE_FILE=	${WRKSRC}/LICENSE
15
16
16
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}stdlib-normalize>=0:devel/lua-stdlib-normalize
17
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}stdlib-normalize>=0:devel/lua-stdlib-normalize@${LUA_FLAVOR}
17
18
18
USES=		lua shebangfix
19
USES=		lua:module shebangfix
19
SHEBANG_FILES=	build-aux/luke
20
SHEBANG_FILES=	build-aux/luke
20
21
21
USE_GITHUB=	yes
22
USE_GITHUB=	yes
(-)b/devel/lua-pty/Makefile (-1 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	pty
4
PORTNAME=	pty
5
PORTVERSION=	1.25
5
PORTVERSION=	1.25
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
MASTER_SITES=	https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/pty/ \
8
MASTER_SITES=	https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/pty/ \
8
		https://BSDforge.com/projects/source/devel/lua-pty/
9
		https://BSDforge.com/projects/source/devel/lua-pty/
Lines 13-19 DIST_SUBDIR= lua-${PORTNAME}-${COMMIT} Link Here
13
MAINTAINER=	portmaster@BSDforge.com
14
MAINTAINER=	portmaster@BSDforge.com
14
COMMENT=	Pty (pseudo-terminal) bindings for Lua 5
15
COMMENT=	Pty (pseudo-terminal) bindings for Lua 5
15
16
16
USES=		lua:51
17
USES=		lua:51,module
17
18
18
COMMIT=		8323bb9
19
COMMIT=		8323bb9
19
MAKEFILE=	${FILESDIR}/Makefile
20
MAKEFILE=	${FILESDIR}/Makefile
(-)b/devel/lua-stdlib-debug/Makefile (-2 / +3 lines)
Lines 3-8 Link Here
3
PORTNAME=	stdlib-debug
3
PORTNAME=	stdlib-debug
4
PORTVERSION=	1.0.1
4
PORTVERSION=	1.0.1
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
9
Lines 13-19 LICENSE= MIT Link Here
13
LICENSE_FILE=	${WRKSRC}/LICENSE.md
14
LICENSE_FILE=	${WRKSRC}/LICENSE.md
14
15
15
NO_ARCH=	yes
16
NO_ARCH=	yes
16
USES=		lua
17
USES=		lua:module
17
18
18
USE_GITHUB=	yes
19
USE_GITHUB=	yes
19
GH_ACCOUNT=	lua-stdlib
20
GH_ACCOUNT=	lua-stdlib
Lines 21-27 GH_PROJECT= _debug Link Here
21
22
22
OPTIONS_DEFINE=	DOCS
23
OPTIONS_DEFINE=	DOCS
23
24
24
DOCSDIR=	${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME}
25
DOCSDIR=	${LUA_DOCSDIR}
25
26
26
do-install:
27
do-install:
27
	@${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}/std/_debug
28
	@${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}/std/_debug
(-)b/devel/lua-stdlib-normalize/Makefile (-3 / +4 lines)
Lines 3-8 Link Here
3
PORTNAME=	stdlib-normalize
3
PORTNAME=	stdlib-normalize
4
PORTVERSION=	2.0.2
4
PORTVERSION=	2.0.2
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
9
Lines 12-21 COMMENT= Collection of normalized lua functions Link Here
12
LICENSE=	MIT
13
LICENSE=	MIT
13
LICENSE_FILE=	${WRKSRC}/LICENSE.md
14
LICENSE_FILE=	${WRKSRC}/LICENSE.md
14
15
15
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug
16
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug@${LUA_FLAVOR}
16
17
17
NO_ARCH=	yes
18
NO_ARCH=	yes
18
USES=		lua
19
USES=		lua:module
19
20
20
USE_GITHUB=	yes
21
USE_GITHUB=	yes
21
GH_ACCOUNT=	lua-stdlib
22
GH_ACCOUNT=	lua-stdlib
Lines 23-29 GH_PROJECT= normalize Link Here
23
24
24
OPTIONS_DEFINE=	DOCS
25
OPTIONS_DEFINE=	DOCS
25
26
26
DOCSDIR=	${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME}
27
DOCSDIR=	${LUA_DOCSDIR}
27
28
28
do-install:
29
do-install:
29
	@${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}/std/normalize
30
	@${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}/std/normalize
(-)b/devel/lua-stdlib/Makefile (-4 / +7 lines)
Lines 4-9 Link Here
4
PORTNAME=	stdlib
4
PORTNAME=	stdlib
5
PORTVERSION=	41.2.2
5
PORTVERSION=	41.2.2
6
DISTVERSIONPREFIX=	release-v
6
DISTVERSIONPREFIX=	release-v
7
PORTREVISION=	1
7
CATEGORIES=	devel
8
CATEGORIES=	devel
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
10
Lines 13-26 COMMENT= Standard Lua Libraries Link Here
13
LICENSE=	MIT
14
LICENSE=	MIT
14
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/COPYING
15
16
16
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug \
17
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug@${LUA_FLAVOR} \
17
		${LUA_PKGNAMEPREFIX}stdlib-normalize>=2.0:devel/lua-stdlib-normalize
18
		${LUA_PKGNAMEPREFIX}stdlib-normalize>=2.0:devel/lua-stdlib-normalize@${LUA_FLAVOR}
18
19
19
OPTIONS_DEFINE=	DOCS
20
OPTIONS_DEFINE=	DOCS
20
21
21
USES=		lua
22
USES=		lua:module
22
23
23
CONFIGURE_ARGS=	LUA=${LUA_CMD}
24
CONFIGURE_ARGS=	--docdir=${DOCSDIR} LUA=${LUA_CMD}
24
GNU_CONFIGURE=	yes
25
GNU_CONFIGURE=	yes
25
NO_ARCH=	yes
26
NO_ARCH=	yes
26
27
Lines 28-31 GH_ACCOUNT= lua-stdlib Link Here
28
GH_PROJECT=	lua-stdlib
29
GH_PROJECT=	lua-stdlib
29
USE_GITHUB=	yes
30
USE_GITHUB=	yes
30
31
32
DOCSDIR=	${LUA_DOCSDIR}
33
31
.include <bsd.port.mk>
34
.include <bsd.port.mk>
(-)b/devel/lua-sysctl/Makefile (-4 / +5 lines)
Lines 3-8 Link Here
3
PORTNAME=	sysctl
3
PORTNAME=	sysctl
4
PORTVERSION=	2.0
4
PORTVERSION=	2.0
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
9
Lines 11-28 COMMENT= Small sysctl(3) interface for lua Link Here
11
12
12
LICENSE=	BSD2CLAUSE
13
LICENSE=	BSD2CLAUSE
13
14
14
USES=		lua pkgconfig
15
USES=		lua:52+,module pkgconfig
15
16
16
USE_GITHUB=	yes
17
USE_GITHUB=	yes
17
GH_ACCOUNT=	kAworu
18
GH_ACCOUNT=	kAworu
18
GH_PROJECT=	lua-${PORTNAME}
19
GH_PROJECT=	lua-${PORTNAME}
19
20
20
OPTIONS_DEFINE=	DOCS EXAMPLES
21
OPTIONS_DEFINE=	DOCS EXAMPLES
21
DOCSDIR=	${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME}
22
DOCSDIR=	${LUA_DOCSDIR}
22
EXAMPLESDIR=	${PREFIX}/share/examples/lua${LUA_VER_STR}/${PORTNAME}
23
EXAMPLESDIR=	${LUA_EXAMPLESDIR}
23
24
24
post-patch:
25
post-patch:
25
	@${REINPLACE_CMD} -e "s/5.1/${LUA_VER}/g" ${WRKSRC}/Makefile
26
	@${REINPLACE_CMD} -e "s/5.2/${LUA_VER}/g" ${WRKSRC}/Makefile
26
27
27
do-install:
28
do-install:
28
	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
29
	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
(-)a/devel/lua51-bitop/Makefile (-12 lines)
Removed Link Here
1
# Created by: lx
2
# $FreeBSD$
3
4
COMMENT=	lua-bitop for Lua 5.1
5
6
USES=		gmake lua:51
7
8
MASTERDIR=	${.CURDIR}/../lua-bitop
9
10
PLIST=		${MASTERDIR}/pkg-plist
11
12
.include "${MASTERDIR}/Makefile"
(-)a/devel/lua51-cjson/Makefile (-10 lines)
Removed Link Here
1
# Created by: osa
2
# $FreeBSD$
3
4
COMMENT=	Fast JSON parsing and encoding support for Lua 5.1
5
6
MASTERDIR=	${.CURDIR}/../lua-cjson
7
8
USES=		lua:51
9
10
.include "${MASTERDIR}/Makefile"
(-)a/devel/luafilesystem-51/Makefile (-13 lines)
Removed Link Here
1
# Created by: Nikolai Lifanov
2
# $FreeBSD$
3
4
COMMENT=        LuaFileSystem for Lua 5.1
5
6
SLAVE_PORT=     luafilesystem
7
8
USES=	lua:51
9
10
MASTERDIR=      ${.CURDIR}/../luafilesystem
11
PLIST=          ${MASTERDIR}/pkg-plist
12
13
.include "${MASTERDIR}/Makefile"
(-)b/devel/luafilesystem/Makefile (-1 / +4 lines)
Lines 4-9 Link Here
4
PORTNAME=	luafilesystem
4
PORTNAME=	luafilesystem
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
DISTVERSION=	1_7_0
6
DISTVERSION=	1_7_0
7
PORTREVISION=	1
7
CATEGORIES=	devel
8
CATEGORIES=	devel
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
10
Lines 12-18 COMMENT= Library to access directory structure and file attributes Link Here
12
13
13
LICENSE=	MIT
14
LICENSE=	MIT
14
15
15
USES?=		lua
16
USES=		lua:module
16
17
17
USE_GITHUB=	yes
18
USE_GITHUB=	yes
18
GH_ACCOUNT=	keplerproject
19
GH_ACCOUNT=	keplerproject
Lines 26-31 MAKE_ARGS+= INCS="-I${LUA_INCDIR}" Link Here
26
27
27
OPTIONS_DEFINE=	DOCS
28
OPTIONS_DEFINE=	DOCS
28
29
30
DOCSDIR=	${LUA_DOCSDIR}
31
29
post-patch:
32
post-patch:
30
	${REINPLACE_CMD} -e \
33
	${REINPLACE_CMD} -e \
31
		"s|%%PREFIX%%|${PREFIX}| ; \
34
		"s|%%PREFIX%%|${PREFIX}| ; \
(-)b/devel/swig30/Makefile (-1 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	swig
4
PORTNAME=	swig
5
PORTVERSION=	3.0.12
5
PORTVERSION=	3.0.12
6
PORTREVISION=	1
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8
PKGNAMESUFFIX=	30
9
PKGNAMESUFFIX=	30
Lines 25-31 CONFIGURE_ARGS= --program-suffix=${PORTVERSION:R} \ Link Here
25
		--with-lualib=${LUA_LIBDIR}
26
		--with-lualib=${LUA_LIBDIR}
26
GNU_CONFIGURE=	yes
27
GNU_CONFIGURE=	yes
27
TEST_TARGET=	check
28
TEST_TARGET=	check
28
USES=		gmake lua
29
USES=		gmake lua:build
29
30
30
PLIST_SUB=	PORTVERSION=${PORTVERSION}
31
PLIST_SUB=	PORTVERSION=${PORTVERSION}
31
32
(-)b/dns/knot-resolver/Makefile (-2 / +2 lines)
Lines 96-103 DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ Link Here
96
96
97
TRUSTANCHOR_DESC=		Trust anchor bootstrapping and stats
97
TRUSTANCHOR_DESC=		Trust anchor bootstrapping and stats
98
TRUSTANCHOR_USES=		lua
98
TRUSTANCHOR_USES=		lua
99
TRUSTANCHOR_BUILD_DEPENDS=	${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket \
99
TRUSTANCHOR_BUILD_DEPENDS=	${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket@${LUA_FLAVOR} \
100
				${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec
100
				${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec@${LUA_FLAVOR}
101
101
102
.include <bsd.port.options.mk>
102
.include <bsd.port.options.mk>
103
103
(-)b/editors/fxite/Makefile (-1 / +1 lines)
Lines 16-22 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
16
USE_GITHUB=	yes
16
USE_GITHUB=	yes
17
GH_ACCOUNT=	yetanothergeek
17
GH_ACCOUNT=	yetanothergeek
18
18
19
USES=		autoreconf desktop-file-utils gettext gmake lua pkgconfig
19
USES=		autoreconf desktop-file-utils gettext gmake lua:52 pkgconfig
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
CONFIGURE_ARGS=	--with-system-lua \
21
CONFIGURE_ARGS=	--with-system-lua \
22
		--with-lua-pkg=lua-${LUA_VER}
22
		--with-lua-pkg=lua-${LUA_VER}
(-)b/editors/mle/Makefile (-3 / +2 lines)
Lines 13-27 LICENSE= APACHE20 Link Here
13
LICENSE_FILE=	${WRKSRC}/LICENSE
13
LICENSE_FILE=	${WRKSRC}/LICENSE
14
14
15
BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
15
BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
16
LIB_DEPENDS=	liblua-5.3.so:lang/lua53 \
16
LIB_DEPENDS=	libpcre.so:devel/pcre \
17
		libpcre.so:devel/pcre \
18
		libtermbox.so:devel/termbox
17
		libtermbox.so:devel/termbox
19
TEST_DEPENDS=	${LOCALBASE}/bin/gpaste:sysutils/coreutils \
18
TEST_DEPENDS=	${LOCALBASE}/bin/gpaste:sysutils/coreutils \
20
		${LOCALBASE}/bin/grep:textproc/gnugrep \
19
		${LOCALBASE}/bin/grep:textproc/gnugrep \
21
		bash:shells/bash \
20
		bash:shells/bash \
22
		gfind:misc/findutils
21
		gfind:misc/findutils
23
22
24
USES=		compiler:c11 gmake localbase:ldflags shebangfix
23
USES=		compiler:c11 gmake localbase:ldflags shebangfix lua:53
25
SHEBANG_FILES=	tests/func/*.sh tests/run.sh
24
SHEBANG_FILES=	tests/func/*.sh tests/run.sh
26
USE_GITHUB=	yes
25
USE_GITHUB=	yes
27
GH_ACCOUNT=	adsr
26
GH_ACCOUNT=	adsr
(-)b/editors/neovim/Makefile (-2 / +2 lines)
Lines 12-19 COMMENT= Next-generation Vim Link Here
12
LICENSE=	APACHE20
12
LICENSE=	APACHE20
13
13
14
BUILD_DEPENDS=	gperf:devel/gperf \
14
BUILD_DEPENDS=	gperf:devel/gperf \
15
		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \
15
		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \
16
		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg
16
		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
17
LIB_DEPENDS=	libluv.so:devel/luv \
17
LIB_DEPENDS=	libluv.so:devel/luv \
18
		libmsgpackc.so:devel/msgpack \
18
		libmsgpackc.so:devel/msgpack \
19
		libtermkey.so:devel/libtermkey \
19
		libtermkey.so:devel/libtermkey \
(-)b/editors/wordgrinder/Makefile (-1 / +1 lines)
Lines 8-14 CATEGORIES= editors Link Here
8
MAINTAINER=	vmagerya@gmail.com
8
MAINTAINER=	vmagerya@gmail.com
9
COMMENT=	Simple Unicode-aware console and X11-based word processor
9
COMMENT=	Simple Unicode-aware console and X11-based word processor
10
10
11
RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem
11
RUN_DEPENDS=	${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
12
12
13
USE_GITHUB=	yes
13
USE_GITHUB=	yes
14
GH_ACCOUNT=	davidgiven
14
GH_ACCOUNT=	davidgiven
(-)b/finance/moneymanagerex/Makefile (-1 / +1 lines)
Lines 29-35 GH_TUPLE= Regaddi:Chart.js:f13f99b:chart_js/3rd/Chart.js \ Link Here
29
		moneymanagerex:ctpp:20158e0:ctpp/3rd/ctpp \
29
		moneymanagerex:ctpp:20158e0:ctpp/3rd/ctpp \
30
		moneymanagerex:mongoose:97583a6:mongoose/3rd/mongoose
30
		moneymanagerex:mongoose:97583a6:mongoose/3rd/mongoose
31
31
32
USES=		autoreconf compiler:c++11-lib gettext gmake gnome lua pkgconfig
32
USES=		autoreconf compiler:c++11-lib gettext gmake gnome lua:52 pkgconfig
33
GNU_CONFIGURE=	yes
33
GNU_CONFIGURE=	yes
34
USE_WX=		3.0
34
USE_WX=		3.0
35
WX_CONF_ARGS=	absolute
35
WX_CONF_ARGS=	absolute
(-)b/games/corsix-th/Makefile (-2 / +2 lines)
Lines 13-20 COMMENT= Open source clone of Theme Hospital Link Here
13
LICENSE=	MIT
13
LICENSE=	MIT
14
14
15
LIB_DEPENDS=	libfreetype.so:print/freetype2
15
LIB_DEPENDS=	libfreetype.so:print/freetype2
16
RUN_DEPENDS=	${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem \
16
RUN_DEPENDS=	${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} \
17
		${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg
17
		${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR}
18
18
19
USES=		cmake:insource compiler:c++11-lib desktop-file-utils dos2unix \
19
USES=		cmake:insource compiler:c++11-lib desktop-file-utils dos2unix \
20
		iconv lua pkgconfig sdl
20
		iconv lua pkgconfig sdl
(-)b/graphics/lua-gd/Makefile (-4 / +5 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	lua-gd
4
PORTNAME=	lua-gd
5
PORTVERSION=	2.0.33r2
5
PORTVERSION=	2.0.33r2
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	graphics
7
CATEGORIES=	graphics
8
MASTER_SITES=	http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}forLua5.1/
8
MASTER_SITES=	http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}forLua5.1/
9
9
Lines 16-26 LIB_DEPENDS= libgd.so:graphics/gd Link Here
16
16
17
OPTIONS_DEFINE=	DOCS EXAMPLES
17
OPTIONS_DEFINE=	DOCS EXAMPLES
18
18
19
USES=		lua:51
19
USES=		lua:51,module
20
CFLAGS+=	-I${LUA_INCDIR} -I${LOCALBASE}/include
20
CFLAGS+=	-I${LUA_INCDIR} -I${LOCALBASE}/include
21
LDFLAGS+=	-shared -L${LOCALBASE}/lib -lgd -L${LUA_LIBDIR} -llua-${LUA_VER} -lm
21
LDFLAGS+=	-shared -L${LOCALBASE}/lib -lgd -L${LUA_LIBDIR} -llua-${LUA_VER} -lm
22
GDFEATURES=	`gdlib-config --features |sed -e "s/GD_/-DGD_/g"`
22
GDFEATURES=	`gdlib-config --features |sed -e "s/GD_/-DGD_/g"`
23
23
24
DOCSDIR=	${LUA_DOCSDIR}
25
EXAMPLESDIR=	${LUA_EXAMPLESDIR}
26
24
.include <bsd.port.options.mk>
27
.include <bsd.port.options.mk>
25
28
26
CFLAGS_aarch64+=-fPIC
29
CFLAGS_aarch64+=-fPIC
Lines 30-37 CFLAGS_i386+= -fPIC Link Here
30
do-build:
33
do-build:
31
	${CC} -o ${WRKSRC}/gd.so ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${GDFEATURES} ${WRKSRC}/luagd.c
34
	${CC} -o ${WRKSRC}/gd.so ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${GDFEATURES} ${WRKSRC}/luagd.c
32
35
33
LUA_MODLIBDIR=	${PREFIX}/lib/lua/${LUA_VER}
34
35
do-install:
36
do-install:
36
	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
37
	${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
37
	${INSTALL_PROGRAM} ${WRKSRC}/gd.so ${STAGEDIR}${LUA_MODLIBDIR}
38
	${INSTALL_PROGRAM} ${WRKSRC}/gd.so ${STAGEDIR}${LUA_MODLIBDIR}
(-)b/lang/lua-ada/Makefile (-1 / +1 lines)
Lines 15-21 LICENSE_COMB= multi Link Here
15
15
16
BUILD_DEPENDS=	gprbuild:devel/gprbuild
16
BUILD_DEPENDS=	gprbuild:devel/gprbuild
17
17
18
USES=		ada lua
18
USES=		ada lua:52
19
USE_GITHUB=	yes
19
USE_GITHUB=	yes
20
GH_ACCOUNT=	AdaCore
20
GH_ACCOUNT=	AdaCore
21
GH_PROJECT=	ada-lua
21
GH_PROJECT=	ada-lua
(-)b/lang/lua51/Makefile (-10 / +2 lines)
Lines 13-20 COMMENT= Small, compilable scripting language providing easy access to C code Link Here
13
13
14
LICENSE=	MIT
14
LICENSE=	MIT
15
15
16
USES=		libedit
16
USES=		libedit lua:core,51
17
LUA_VER=	5.1
18
USE_LDCONFIG=	yes
17
USE_LDCONFIG=	yes
19
18
20
# Overriding __MAKE_CONF makes sure that we don't re-parse
19
# Overriding __MAKE_CONF makes sure that we don't re-parse
Lines 24-29 USE_LDCONFIG= yes Link Here
24
# have its settings when we get here.
23
# have its settings when we get here.
25
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
24
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
26
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
25
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
26
27
# liblua.so requires libm, so make sure it has an explicit dependency
27
# liblua.so requires libm, so make sure it has an explicit dependency
28
# so that applications need not second-guess lua's dependencies.
28
# so that applications need not second-guess lua's dependencies.
29
CPPFLAGS+=	-I${LOCALBASE}/include
29
CPPFLAGS+=	-I${LOCALBASE}/include
Lines 44-57 MAKE_ARGS+= MYCFLAGS="${CFLAGS} ${CPPFLAGS} -DLUA_USE_LINUX" \ Link Here
44
		INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua51 \
44
		INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua51 \
45
		INSTALL_EXEC="${INSTALL_PROGRAM}"
45
		INSTALL_EXEC="${INSTALL_PROGRAM}"
46
46
47
# Cope with the lack of support for Lua 5.2 in bsd.lua.mk.  These
48
# overrides, which are required below, should be removed once bsd.lua.mk
49
# understands this lua version.
50
LUA_PREFIX?=	${PREFIX}
51
LUA_SUBDIR?=	lua${PKGNAMESUFFIX}
52
LUA_INCDIR?=	${LUA_PREFIX}/include/${LUA_SUBDIR}
53
LUA_LIBDIR?=	${LUA_PREFIX}/lib
54
55
CFLAGS+=	-fPIC
47
CFLAGS+=	-fPIC
56
48
57
post-patch:
49
post-patch:
(-)b/lang/lua52/Makefile (-10 / +2 lines)
Lines 12-19 COMMENT= Small, compilable scripting language providing easy access to C code Link Here
12
12
13
LICENSE=	MIT
13
LICENSE=	MIT
14
14
15
USES=		libedit
15
USES=		libedit lua:core,52
16
LUA_VER=	5.2
17
USE_LDCONFIG=	yes
16
USE_LDCONFIG=	yes
18
17
19
# Overriding __MAKE_CONF makes sure that we don't re-parse
18
# Overriding __MAKE_CONF makes sure that we don't re-parse
Lines 23-28 USE_LDCONFIG= yes Link Here
23
# have its settings when we get here.
22
# have its settings when we get here.
24
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
23
# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt
25
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
24
MAKE_ARGS=	__MAKE_CONF=${NONEXISTENT}
25
26
# liblua.so requires libm, so make sure it has an explicit dependency
26
# liblua.so requires libm, so make sure it has an explicit dependency
27
# so that applications need not second-guess lua's dependencies.
27
# so that applications need not second-guess lua's dependencies.
28
CPPFLAGS+=	-I${LOCALBASE}/include
28
CPPFLAGS+=	-I${LOCALBASE}/include
Lines 43-56 MAKE_ARGS+= MYCFLAGS="${CFLAGS} ${CPPFLAGS} -DLUA_USE_LINUX" \ Link Here
43
		INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua52 \
43
		INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua52 \
44
		INSTALL_EXEC="${INSTALL_PROGRAM}"
44
		INSTALL_EXEC="${INSTALL_PROGRAM}"
45
45
46
# Cope with the lack of support for Lua 5.2 in bsd.lua.mk.  These
47
# overrides, which are required below, should be removed once bsd.lua.mk
48
# understands this lua version.
49
LUA_PREFIX?=	${PREFIX}
50
LUA_SUBDIR?=	lua${PKGNAMESUFFIX}
51
LUA_INCDIR?=	${LUA_PREFIX}/include/${LUA_SUBDIR}
52
LUA_LIBDIR?=	${LUA_PREFIX}/lib
53
54
SUB_FILES=	lua-${LUA_VER}.pc
46
SUB_FILES=	lua-${LUA_VER}.pc
55
SUB_LIST=	version=${PORTVERSION} \
47
SUB_LIST=	version=${PORTVERSION} \
56
		includedir=${LUA_INCDIR} \
48
		includedir=${LUA_INCDIR} \
(-)b/lang/lua53/Makefile (-10 / +2 lines)
Lines 13-19 COMMENT= Powerful, efficient, lightweight, embeddable scripting language Link Here
13
13
14
LICENSE=	MIT
14
LICENSE=	MIT
15
15
16
LUA_VER=	5.3
16
USES=		lua:core,53
17
USE_LDCONFIG=	yes
17
USE_LDCONFIG=	yes
18
18
19
# Overriding __MAKE_CONF makes sure that we don't re-parse
19
# Overriding __MAKE_CONF makes sure that we don't re-parse
Lines 32-49 BUILD_WRKSRC= ${WRKSRC}/src Link Here
32
# We put the docs for Lua proper in a lua/ subdir of the version subdir
32
# We put the docs for Lua proper in a lua/ subdir of the version subdir
33
# so that ports for Lua modules can use the version subdir too without
33
# so that ports for Lua modules can use the version subdir too without
34
# making a mess.
34
# making a mess.
35
DOCSDIR=	${PREFIX}/share/doc/lua${PKGNAMESUFFIX}/lua
35
DOCSDIR=	${LUA_DOCSDIR}
36
PORTDOCS=	*
36
PORTDOCS=	*
37
BUILD_WRKDOC=	${WRKSRC}/doc
37
BUILD_WRKDOC=	${WRKSRC}/doc
38
38
39
LUA_PREFIX=	${PREFIX}
40
41
# 2018-03-17: AG - These should match lua.mk, but we can't include that here
42
LUA_CMD=	lua${PKGNAMESUFFIX}
43
LUAC_CMD=	luac${PKGNAMESUFFIX}
44
LUA_INCDIR=	${LUA_PREFIX}/include/lua${PKGNAMESUFFIX}
45
LUA_LIBDIR=	${LUA_PREFIX}/lib
46
47
LUA_LIB_STATIC=	liblua-${LUA_VER}.a
39
LUA_LIB_STATIC=	liblua-${LUA_VER}.a
48
LUA_LIB_SHARED=	liblua-${LUA_VER}.so
40
LUA_LIB_SHARED=	liblua-${LUA_VER}.so
49
LUA_PC_FILE=	lua-${LUA_VER}.pc
41
LUA_PC_FILE=	lua-${LUA_VER}.pc
(-)b/math/plplot/Makefile (+2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	plplot
4
PORTNAME=	plplot
5
DISTVERSION=	5.15.0
5
DISTVERSION=	5.15.0
6
PORTREVISION=	1
6
CATEGORIES=	math science
7
CATEGORIES=	math science
7
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
8
9
Lines 73-78 GD_USES= jpeg Link Here
73
GD_CMAKE_BOOL=		PLD_png
74
GD_CMAKE_BOOL=		PLD_png
74
75
75
LUA_USES=		lua
76
LUA_USES=		lua
77
LUA_BUILD_DEPENDS=	swig3.0:devel/swig30
76
LUA_CMAKE_BOOL=		ENABLE_lua
78
LUA_CMAKE_BOOL=		ENABLE_lua
77
LUA_CMAKE_ON=		-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
79
LUA_CMAKE_ON=		-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
78
80
(-)b/multimedia/libquvi-scripts09/Makefile (-4 / +4 lines)
Lines 15-24 COMMENT= Embedded lua scripts for libquvi and utility scripts Link Here
15
LICENSE=	AGPLv3
15
LICENSE=	AGPLv3
16
LICENSE_FILE=	${WRKSRC}/COPYING
16
LICENSE_FILE=	${WRKSRC}/COPYING
17
17
18
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}bitop>=1.0.1:devel/lua-bitop \
18
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}bitop>=1.0.1:devel/lua-bitop@${LUA_FLAVOR} \
19
		${LUA_PKGNAMEPREFIX}luaexpat>=1.2.0:textproc/luaexpat \
19
		${LUA_PKGNAMEPREFIX}luaexpat>=1.2.0:textproc/luaexpat@${LUA_FLAVOR} \
20
		${LUA_PKGNAMEPREFIX}json>=1.1.1:converters/lua-json \
20
		${LUA_PKGNAMEPREFIX}json>=1.1.1:converters/lua-json@${LUA_FLAVOR} \
21
		${LUA_PKGNAMEPREFIX}luasocket>=2.0.2:net/luasocket
21
		${LUA_PKGNAMEPREFIX}luasocket>=2.0.2:net/luasocket@${LUA_FLAVOR}
22
22
23
OPTIONS_DEFINE=	NSFW
23
OPTIONS_DEFINE=	NSFW
24
OPTIONS_SUB=	yes
24
OPTIONS_SUB=	yes
(-)b/net-im/prosody/Makefile (-5 / +5 lines)
Lines 14-24 COMMENT= Simple extensible XMPP server written in Lua Link Here
14
LICENSE=	MIT
14
LICENSE=	MIT
15
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/COPYING
16
16
17
RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:net/luasocket \
17
RUN_DEPENDS=	${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} \
18
		${LUA_MODLIBDIR}/ssl.so:security/luasec \
18
		${LUA_REFMODLIBDIR}/ssl.so:security/luasec@${LUA_FLAVOR} \
19
		${LUA_MODLIBDIR}/lxp.so:textproc/luaexpat \
19
		${LUA_REFMODLIBDIR}/lxp.so:textproc/luaexpat@${LUA_FLAVOR} \
20
		${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem \
20
		${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} \
21
		${LUA_MODLIBDIR}/bit.so:devel/lua-bitop
21
		${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR}
22
LIB_DEPENDS=	libidn.so:dns/libidn
22
LIB_DEPENDS=	libidn.so:dns/libidn
23
23
24
USES=		compiler:c11 cpe gmake lua:52 ssl
24
USES=		compiler:c11 cpe gmake lua:52 ssl
(-)b/net/Makefile (-3 lines)
Lines 425-434 Link Here
425
    SUBDIR += lla
425
    SUBDIR += lla
426
    SUBDIR += ltm
426
    SUBDIR += ltm
427
    SUBDIR += lualdap
427
    SUBDIR += lualdap
428
    SUBDIR += lualdap-51
429
    SUBDIR += luasocket
428
    SUBDIR += luasocket
430
    SUBDIR += luasocket-51
431
    SUBDIR += luasocket-53
432
    SUBDIR += lvwimax
429
    SUBDIR += lvwimax
433
    SUBDIR += mDNSResponder
430
    SUBDIR += mDNSResponder
434
    SUBDIR += macchanger
431
    SUBDIR += macchanger
(-)b/net/freeswitch/Makefile (-1 / +1 lines)
Lines 29-35 LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ Link Here
29
		libjbig.so:graphics/jbigkit \
29
		libjbig.so:graphics/jbigkit \
30
		libtiff.so:graphics/tiff
30
		libtiff.so:graphics/tiff
31
31
32
USES=		gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz
32
USES=		gmake iconv jpeg libedit libtool lua:51-52 perl5 pkgconfig shebangfix ssl tar:xz
33
USE_LDCONFIG=	yes
33
USE_LDCONFIG=	yes
34
USE_RC_SUBR=	freeswitch
34
USE_RC_SUBR=	freeswitch
35
35
(-)a/net/lualdap-51/Makefile (-9 lines)
Removed Link Here
1
# $FreeBSD$
2
3
USES=		gmake lua:51
4
5
MASTERDIR=	${.CURDIR}/../lualdap
6
7
.include "${MASTERDIR}/Makefile"
8
9
COMMENT+=	(version 5.1)
(-)b/net/lualdap/Makefile (-2 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	lualdap
4
PORTNAME=	lualdap
5
PORTVERSION=	1.1.0
5
PORTVERSION=	1.1.0
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	net
7
CATEGORIES=	net
8
MASTER_SITES=	http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/LuaLDAP${PORTVERSION}/
8
MASTER_SITES=	http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/LuaLDAP${PORTVERSION}/
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
Lines 11-17 PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} Link Here
11
MAINTAINER=	pf@itwf.pl
11
MAINTAINER=	pf@itwf.pl
12
COMMENT=	LDAP support for the Lua language
12
COMMENT=	LDAP support for the Lua language
13
13
14
USES?=		gmake lua
14
USES=		gmake lua:-52,module
15
USE_OPENLDAP=	yes
15
USE_OPENLDAP=	yes
16
16
17
# the CPPFLAGS fixes builds where PREFIX != LOCALBASE
17
# the CPPFLAGS fixes builds where PREFIX != LOCALBASE
Lines 26-31 ALL_TARGET= Link Here
26
26
27
OPTIONS_DEFINE=	DOCS
27
OPTIONS_DEFINE=	DOCS
28
28
29
DOCSDIR=	${LUA_DOCSDIR}
30
29
do-install:
31
do-install:
30
	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
32
	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
31
	${INSTALL_PROGRAM} ${WRKSRC}/src/lualdap.so.${PORTVERSION} ${STAGEDIR}${LUA_MODLIBDIR}/${PORTNAME}.so
33
	${INSTALL_PROGRAM} ${WRKSRC}/src/lualdap.so.${PORTVERSION} ${STAGEDIR}${LUA_MODLIBDIR}/${PORTNAME}.so
(-)a/net/luasocket-51/Makefile (-13 lines)
Removed Link Here
1
# Created by: Jan Hornyak <pav@oook.cz>
2
# $FreeBSD$
3
4
SLAVE_PORT=	luasocket
5
6
USES=	gmake lua:51 pkgconfig
7
8
MASTERDIR=	${.CURDIR}/../luasocket
9
PLIST=	${MASTERDIR}/pkg-plist
10
11
.include "${MASTERDIR}/Makefile"
12
13
COMMENT+=	(version 5.1)
(-)a/net/luasocket-53/Makefile (-13 lines)
Removed Link Here
1
# Created by: Jan Hornyak <pav@oook.cz>
2
# $FreeBSD$
3
4
SLAVE_PORT=	luasocket
5
6
USES=	gmake lua:53 pkgconfig
7
8
MASTERDIR=	${.CURDIR}/../luasocket
9
PLIST=	${MASTERDIR}/pkg-plist
10
11
.include "${MASTERDIR}/Makefile"
12
13
COMMENT+=	(version 5.3)
(-)b/net/luasocket/Makefile (-2 / +4 lines)
Lines 4-10 Link Here
4
PORTNAME=	luasocket
4
PORTNAME=	luasocket
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
DISTVERSION=	3.0-rc1
6
DISTVERSION=	3.0-rc1
7
PORTREVISION=	4
7
PORTREVISION=	5
8
PORTEPOCH=	1
8
PORTEPOCH=	1
9
CATEGORIES=	net
9
CATEGORIES=	net
10
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
10
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
Lines 19-25 USE_GITHUB= yes Link Here
19
GH_ACCOUNT=	diegonehab
19
GH_ACCOUNT=	diegonehab
20
20
21
MAKE_ARGS=	LUAV=${LUA_VER}
21
MAKE_ARGS=	LUAV=${LUA_VER}
22
USES?=		gmake lua pkgconfig
22
USES=		gmake lua:module pkgconfig
23
INSTALL_TARGET=	install-unix
23
INSTALL_TARGET=	install-unix
24
24
25
CFLAGS+=	`pkgconf --cflags lua-${LUA_VER}` \
25
CFLAGS+=	`pkgconf --cflags lua-${LUA_VER}` \
Lines 28-33 LDFLAGS+= -shared `pkgconf --libs lua-${LUA_VER}` Link Here
28
28
29
OPTIONS_DEFINE=	DOCS
29
OPTIONS_DEFINE=	DOCS
30
30
31
DOCSDIR=	${LUA_DOCSDIR}
32
31
post-extract:
33
post-extract:
32
	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
34
	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
33
	@${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/Makefile
35
	@${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/Makefile
(-)b/net/wireshark/Makefile (-1 / +1 lines)
Lines 84-90 CISCODUMP_DESC= Build ciscodump extcap tool Link Here
84
GUI_USES=		qt:5
84
GUI_USES=		qt:5
85
GUI_USE=	qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build,qmake_build
85
GUI_USE=	qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build,qmake_build
86
86
87
LUA_USES=		lua:5[1-2]
87
LUA_USES=		lua:51-52
88
GSSAPI_BASE_USES=		gssapi
88
GSSAPI_BASE_USES=		gssapi
89
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
89
GSSAPI_HEIMDAL_USES=	gssapi:heimdal
90
GSSAPI_MIT_USES=		gssapi:mit
90
GSSAPI_MIT_USES=		gssapi:mit
(-)b/security/Makefile (-1 lines)
Lines 334-340 Link Here
334
    SUBDIR += logcheck
334
    SUBDIR += logcheck
335
    SUBDIR += lua-bcrypt
335
    SUBDIR += lua-bcrypt
336
    SUBDIR += luasec
336
    SUBDIR += luasec
337
    SUBDIR += luasec-51
338
    SUBDIR += lxqt-openssh-askpass
337
    SUBDIR += lxqt-openssh-askpass
339
    SUBDIR += lxqt-sudo
338
    SUBDIR += lxqt-sudo
340
    SUBDIR += lynis
339
    SUBDIR += lynis
(-)b/security/cardpeek/Makefile (-1 / +1 lines)
Lines 15-21 LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite \ Link Here
15
		libcurl.so:ftp/curl
15
		libcurl.so:ftp/curl
16
RUN_DEPENDS=	pcscd:devel/pcsc-lite
16
RUN_DEPENDS=	pcscd:devel/pcsc-lite
17
17
18
USES=		gnome iconv localbase lua pkgconfig
18
USES=		gnome iconv localbase lua:52 pkgconfig
19
USE_GNOME=	gtk30
19
USE_GNOME=	gtk30
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
INSTALLS_ICONS=	yes
21
INSTALLS_ICONS=	yes
(-)b/security/lua-bcrypt/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
PORTNAME=	bcrypt
3
PORTNAME=	bcrypt
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	2.1-4
5
DISTVERSION=	2.1-4
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	security
7
CATEGORIES=	security
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
9
Lines 12-18 COMMENT= Library providing OpenBSD's bcrypt hash function for Lua Link Here
12
12
13
LICENSE=	ISCL
13
LICENSE=	ISCL
14
14
15
USES=		compiler:c11 gmake lua
15
USES=		compiler:c11 gmake lua:module
16
16
17
USE_GITHUB=	yes
17
USE_GITHUB=	yes
18
GH_ACCOUNT=	mikejsavage
18
GH_ACCOUNT=	mikejsavage
(-)a/security/luasec-51/Makefile (-13 lines)
Removed Link Here
1
# Created by: Andrew Lewis <freeghb@gmail.com>
2
# $FreeBSD$
3
4
COMMENT=	LuaSec for Lua 5.1
5
6
SLAVE_PORT=	luasec
7
8
USES=	lua:51 ssl
9
10
MASTERDIR=	${.CURDIR}/../luasec
11
PLIST=	${MASTERDIR}/pkg-plist
12
13
.include "${MASTERDIR}/Makefile"
(-)b/security/luasec/Makefile (-1 / +2 lines)
Lines 4-9 Link Here
4
PORTNAME=	luasec
4
PORTNAME=	luasec
5
PORTVERSION=	0.9
5
PORTVERSION=	0.9
6
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
PORTREVISION=	1
7
CATEGORIES=	security
8
CATEGORIES=	security
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
10
Lines 13-19 COMMENT= Lua binding for the OpenSSL library to provide TLS/SSL communication Link Here
13
LICENSE=	MIT
14
LICENSE=	MIT
14
15
15
.if !defined(SLAVE_PORT)
16
.if !defined(SLAVE_PORT)
16
USES=		lua ssl
17
USES=		lua:module ssl
17
.endif
18
.endif
18
19
19
USE_GITHUB=	yes
20
USE_GITHUB=	yes
(-)b/textproc/Makefile (-1 lines)
Lines 415-421 Link Here
415
    SUBDIR += ltxml
415
    SUBDIR += ltxml
416
    SUBDIR += lua-lyaml
416
    SUBDIR += lua-lyaml
417
    SUBDIR += luaexpat
417
    SUBDIR += luaexpat
418
    SUBDIR += luaexpat-51
419
    SUBDIR += lucene
418
    SUBDIR += lucene
420
    SUBDIR += lucene4
419
    SUBDIR += lucene4
421
    SUBDIR += lucene5
420
    SUBDIR += lucene5
(-)b/textproc/lua-lyaml/Makefile (-1 / +2 lines)
Lines 4-9 Link Here
4
PORTNAME=	lyaml
4
PORTNAME=	lyaml
5
PORTVERSION=	6.2.4
5
PORTVERSION=	6.2.4
6
DISTVERSIONPREFIX=v
6
DISTVERSIONPREFIX=v
7
PORTREVISION=	1
7
CATEGORIES=	textproc
8
CATEGORIES=	textproc
8
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
9
10
Lines 15-21 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
15
16
16
LIB_DEPENDS=	libyaml.so:textproc/libyaml
17
LIB_DEPENDS=	libyaml.so:textproc/libyaml
17
18
18
USES=		lua
19
USES=		lua:module
19
20
20
USE_GITHUB=	yes
21
USE_GITHUB=	yes
21
GH_ACCOUNT=	gvvaughan
22
GH_ACCOUNT=	gvvaughan
(-)a/textproc/luaexpat-51/Makefile (-6 lines)
Removed Link Here
1
# $FreeBSD$
2
3
MASTERDIR=	${.CURDIR}/../luaexpat
4
USES=	lua:51
5
6
.include "${MASTERDIR}/Makefile"
(-)b/textproc/luaexpat/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	luaexpat
4
PORTNAME=	luaexpat
5
PORTVERSION=	1.3.0
5
PORTVERSION=	1.3.0
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	textproc
7
CATEGORIES=	textproc
8
MASTER_SITES=	http://matthewwild.co.uk/projects/luaexpat/ \
8
MASTER_SITES=	http://matthewwild.co.uk/projects/luaexpat/ \
9
				http://redundancy.redundancy.org/mirror/
9
				http://redundancy.redundancy.org/mirror/
Lines 16-22 LICENSE= MIT Link Here
16
16
17
LIB_DEPENDS=	libexpat.so:textproc/expat2
17
LIB_DEPENDS=	libexpat.so:textproc/expat2
18
18
19
USES?=		lua
19
USES=		lua:module
20
USES+=		gmake
20
USES+=		gmake
21
ALL_TARGET=	lib
21
ALL_TARGET=	lib
22
22
(-)b/www/luakit/Makefile (-2 / +2 lines)
Lines 16-28 NOT_FOR_ARCHS= sparc64 Link Here
16
NOT_FOR_ARCHS_REASON_sparc64=	Does not install on sparc64
16
NOT_FOR_ARCHS_REASON_sparc64=	Does not install on sparc64
17
17
18
BUILD_DEPENDS=	help2man:misc/help2man \
18
BUILD_DEPENDS=	help2man:misc/help2man \
19
		${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem-51
19
		${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR}
20
LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
20
LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
21
		libsoup-2.4.so:devel/libsoup \
21
		libsoup-2.4.so:devel/libsoup \
22
		libfreetype.so:print/freetype2 \
22
		libfreetype.so:print/freetype2 \
23
		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
23
		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
24
		libfontconfig.so:x11-fonts/fontconfig
24
		libfontconfig.so:x11-fonts/fontconfig
25
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem-51
25
RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem@${LUA_FLAVOR}
26
26
27
USES=		compiler:c++11-lang desktop-file-utils gettext-runtime gmake \
27
USES=		compiler:c++11-lang desktop-file-utils gettext-runtime gmake \
28
		gnome lua:51 pkgconfig sqlite
28
		gnome lua:51 pkgconfig sqlite
(-)b/www/volta/Makefile (-1 / +1 lines)
Lines 15-21 LICENSE= BSD3CLAUSE Link Here
15
15
16
LIB_DEPENDS=	libcdb.so:databases/tinycdb
16
LIB_DEPENDS=	libcdb.so:databases/tinycdb
17
17
18
USES=		gmake pkgconfig lua tar:tgz
18
USES=		gmake pkgconfig lua:52 tar:tgz
19
ALL_TARGET=	${PORTNAME}
19
ALL_TARGET=	${PORTNAME}
20
20
21
CFLAGS+=	-I${PREFIX}/include
21
CFLAGS+=	-I${PREFIX}/include
(-)b/x11-wm/awesome/Makefile (-2 / +2 lines)
Lines 15-22 LICENSE= GPLv2+ Link Here
15
LICENSE_FILE=	${WRKSRC}/LICENSE
15
LICENSE_FILE=	${WRKSRC}/LICENSE
16
16
17
BUILD_DEPENDS=	convert:graphics/ImageMagick6 \
17
BUILD_DEPENDS=	convert:graphics/ImageMagick6 \
18
		${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi
18
		${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR}
19
RUN_DEPENDS=	${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \
19
RUN_DEPENDS=	${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR} \
20
		bash:shells/bash
20
		bash:shells/bash
21
LIB_DEPENDS=	libcairo.so:graphics/cairo \
21
LIB_DEPENDS=	libcairo.so:graphics/cairo \
22
		libstartup-notification-1.so:x11/startup-notification \
22
		libstartup-notification-1.so:x11/startup-notification \

Return to bug 245038