FreeBSD Bugzilla – Attachment 213275 Details for
Bug 245038
Mk/Uses/lua.mk: support FLAVORS
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Lua flavors patch (v5)
lua-flavors5-svnish.patch (text/plain), 72.16 KB, created by
Andrew "RhodiumToad" Gierth
on 2020-04-11 10:26:17 UTC
(
hide
)
Description:
Lua flavors patch (v5)
Filename:
MIME Type:
Creator:
Andrew "RhodiumToad" Gierth
Created:
2020-04-11 10:26:17 UTC
Size:
72.16 KB
patch
obsolete
>diff --git MOVED MOVED >index 4309ae7bc18f..f20ad19fdcc7 100644 >--- MOVED >+++ MOVED >@@ -14517,6 +14517,18 @@ databases/mongodb34-tools|databases/mongodb36-tools|2020-03-31|Removed, part of > databases/py-pypuppetdb03|databases/py-pypuppetdb|2020-04-01|Has expired: Use databases/py-pypuppetdb instead > www/py-puppetboard02|www/py-puppetboard|2020-04-01|Has expired: Use www/py-puppetboard instead > www/py-puppetboard03|www/py-puppetboard|2020-04-01|Has expired: Use www/py-puppetboard instead >+archivers/lua51-zlib|archivers/lua-zlib@lua51|2020-04-01|Switched to use flavors >+audio/lua51-mpd|audio/lua-mpd@lua51|2020-04-01|Switched to use flavors >+converters/lua51-iconv|converters/lua-iconv@lua51|2020-04-01|Switched to use flavors >+devel/lua51-bitop|devel/lua-bitop@lua51|2020-04-01|Switched to use flavors >+devel/lua51-cjson|devel/lua-cjson@lua51|2020-04-01|Switched to use flavors >+devel/lua51-libevent|devel/lua-libevent@lua51|2020-04-01|Switched to use flavors >+devel/luafilesystem-51|devel/luafilesystem@lua51|2020-04-01|Switched to use flavors >+net/lualdap-51|net/lualdap@lua51|2020-04-01|Switched to use flavors >+net/luasocket-51|net/luasocket@lua51|2020-04-01|Switched to use flavors >+net/luasocket-53|net/luasocket@lua53|2020-04-01|Switched to use flavors >+security/luasec-51|security/luasec@lua51|2020-04-01|Switched to use flavors >+textproc/luaexpat-51|textproc/luaexpat@lua51|2020-04-01|Switched to use flavors > net/librsync2|net/librsync|2020-04-02|Remove PKGNAMESUFFIX 3 years after librsync removal > lang/beignet|lang/intel-compute-runtime|2020-04-02|Has expired: Deprecated upstream, use lang/intel-compute-runtime > devel/rubygem-cucumber-tag_expressions|devel/rubygem-cucumber-tag-expressions|2020-04-04|Renamed by upstream >diff --git Mk/Uses/lua.mk Mk/Uses/lua.mk >index 6ea9a0bf7977..5029223ded04 100644 >--- Mk/Uses/lua.mk >+++ Mk/Uses/lua.mk >@@ -5,16 +5,101 @@ > # MAINTAINER: ports@FreeBSD.org > # Usage: > # >-# USES+= lua[:version] >+# USES+= lua[:options,...] >+# >+# Options: >+# >+# NN (e.g. 52) - specify an allowed Lua version (can use multiple times) >+# NN+ (e.g. 52+) - specify a minimum Lua version (discouraged) >+# -NN (e.g. -53) - specify a maximum allowed version >+# NN-NN (e.g. 51-53) - specify a range of allowed versions >+# >+# flavors define FLAVOR / FLAVORS as luaNN from the allowed versions >+# >+# noflavors don't use flavors >+# >+# module (implies flavors) specifies that the port is a Lua module >+# (i.e. that it installes files in MODLIBDIR etc.) >+# >+# build add dependency to BUILD_DEPENDS instead of LIB_DEPENDS >+# run add dependency to RUN_DEPENDS instead of LIB_DEPENDS >+# >+# env define only the LUA_* vars and add them to PLIST_SUB and >+# MAKE_ENV, do not add dependencies or other global state >+# >+# core for building Lua itself >+# >+# If more than one version is allowed, then the LUA_DEFAULT version >+# (as set in DEFAULT_VERSIONS) is chosen if it is allowed, otherwise >+# the highest allowed version is chosen. But if "flavors" was requested, >+# and FLAVOR is set, we use that version. >+# >+# LUA_FLAVOR is defined to the desired flavor whether or not "flavors" was >+# selected; ports should use this to specify the flavor of dependencies >+# which are Lua modules or otherwise Lua-flavored. >+# >+# It's not generally expected that applications that embed Lua, or apps >+# written in Lua, would use USES=lua:flavors. Given that Lua is lightweight >+# and does not carry around a whole lot of module ecosystem with it, it is >+# best that application ports simply specify the Lua version or range of >+# versions that they support, and let the default one or the latest one be >+# used. However, they should still use LUA_FLAVOR as needed when specifying >+# dependencies. > # > .if !defined(_INCLUDE_USES_LUA_MK) > _INCLUDE_USES_LUA_MK= yes > > # When adding a version, please keep the comment in > # Mk/bsd.default-versions.mk in sync. >-_LUA_VALID_VERSIONS= 53 52 51 >+_LUA_VALID_VERSIONS:= 53 52 51 >+.if defined(_LUA_EXTRA_VER) >+_LUA_VALID_VERSIONS+= ${_LUA_EXTRA_VER} >+.endif >+ >+_LUA_DEFAULT_VERSION:= ${LUA_DEFAULT:S/.//} >+ >+# args >+_LUA_ARG_FLAVORS:= >+_LUA_ARG_MODULE:= >+_LUA_ARG_ENV:= >+_LUA_ARG_CORE:= >+.if ${lua_ARGS:Mmodule} >+_LUA_ARG_FLAVORS:=yes >+_LUA_ARG_MODULE:=yes >+.endif >+.if ${lua_ARGS:Mflavors} >+_LUA_ARG_FLAVORS:=yes >+.endif >+.if ${lua_ARGS:Mnoflavors} >+_LUA_ARG_FLAVORS:= >+.endif >+.if ${lua_ARGS:Menv} >+_LUA_ARG_ENV:=yes >+.endif >+.if ${lua_ARGS:Mcore} >+_LUA_ARG_CORE:=yes >+_LUA_ARG_ENV:=yes >+_LUA_ARG_FLAVORS:= >+_LUA_ARG_MODULE:= >+.endif >+ >+# core is for building Lua itself, so it overrides all version checks >+.if ${_LUA_ARG_CORE} >+ >+_LUA_WANTED_VERSION:=${lua_ARGS:M[1-9][0-9]:[1]} >+ >+. if ${lua_ARGS:M[1-9][0-9]:[#]} != 1 >+IGNORE= USES=lua:core must also specify exactly one version number >+# set to avoid spurious errors below >+_LUA_WANTED_VERSION:=${_LUA_DEFAULT_VERSION} >+. endif >+ >+_LUA_VALID_VERSIONS:=${_LUA_WANTED_VERSION} >+_LUA_WANTED_VERSIONS:=${_LUA_WANTED_VERSION} >+_LUA_DEFAULT_VERSION:=${_LUA_WANTED_VERSION} >+ >+.endif # _LUA_ARG_CORE > >-_LUA_DEFAULT_VERSION= ${LUA_DEFAULT:S/.//} > .if ! ${_LUA_VALID_VERSIONS:M${_LUA_DEFAULT_VERSION}} > IGNORE= Invalid lua version ${LUA_DEFAULT} > .endif >@@ -22,89 +107,164 @@ IGNORE= Invalid lua version ${LUA_DEFAULT} > # > # Parse a ver+ argument > # >-.if ${lua_ARGS:M*+} >-_LUA_MIN_VERSION:= ${lua_ARGS:M*+:S/+//} >+.if ${lua_ARGS:M??+} >+_LUA_MIN_VERSION:= ${lua_ARGS:M??+:S/+//} >+_LUA_MAX_VERSION:= 99 >+.endif >+ > # >-# Resolve minimum versions (ver+). Append anything greater or equal than the >-# specified minimum version to the list of wanted versions. >+# Parse a -ver argument > # >-. for _v in ${_LUA_VALID_VERSIONS} >-. if ${_LUA_MIN_VERSION} <= ${_v} >+.if ${lua_ARGS:M-??} >+_LUA_MAX_VERSION:= ${lua_ARGS:M-??:S/-//} >+_LUA_MIN_VERSION:= 0 >+.endif >+ >+# >+# Parse a ver-ver argument >+# >+.if ${lua_ARGS:M??-??} >+_LUA_MIN_VERSION:= ${lua_ARGS:M??-??:C/-.*//} >+_LUA_MAX_VERSION:= ${lua_ARGS:M??-??:C/.*-//} >+.endif >+ >+# >+# Parse one or more ver arguments >+# >+.if ${lua_ARGS:M[1-9][0-9]} >+. for _v in ${lua_ARGS:M[1-9][0-9]} >+. if ${_LUA_VALID_VERSIONS:M${_v}} > _LUA_WANTED_VERSIONS+=${_v} > . endif > . endfor >+. if empty(_LUA_WANTED_VERSIONS) >+IGNORE= USES=lua:nn did not find any valid version number >+. endif > .endif > > # >-# Parse one or more ver arguments >+# Resolve version ranges. Append anything within the range to the list of >+# wanted versions. > # >-.if ${lua_ARGS:M5[1-3]} >-_LUA_WANTED_VERSIONS:= ${lua_ARGS:M5[1-3]} >+.if defined(_LUA_MIN_VERSION) && defined(_LUA_MAX_VERSION) >+. for _v in ${_LUA_VALID_VERSIONS} >+. if ${_LUA_MIN_VERSION} <= ${_v} && ${_LUA_MAX_VERSION} >= ${_v} >+_LUA_WANTED_VERSIONS+=${_v} >+. endif >+. endfor >+. if empty(_LUA_WANTED_VERSIONS) >+IGNORE= USES=lua:xx-yy did not find any valid version >+. endif > .endif > > # >-# If no version was specified with any of the ver or ver+ arguments, set the >-# default version. >+# If no version was specified with any of the ver or ver+ arguments, allow >+# all versions. > # >-.if !defined(_LUA_WANTED_VERSIONS) >-_LUA_WANTED_VERSIONS= ${_LUA_DEFAULT_VERSION} >+.if empty(_LUA_WANTED_VERSIONS) >+_LUA_WANTED_VERSIONS:= ${_LUA_VALID_VERSIONS} > .endif > > # >-# Right now we have built a list of potential versions that we may depend on. >-# Let's sort them and remove any duplicates. We then locate the highest one >-# already installed, if any. >+# By now, _LUA_WANTED_VERSIONS is the list of valid version numbers that the >+# caller has allowed through. We want to put the default version, if it's in >+# the list, first, followed by all other versions in desc order; then the >+# first element is the one we want (or the default flavor in the flavor case) > # >-.for _v in ${_LUA_WANTED_VERSIONS:O:u} >-_LUA_HIGHEST_VERSION:=${_v} >-. if exists(${LOCALBASE}/bin/lua${_v}) >-_LUA_HIGHEST_INSTALLED_VERSION:= ${_v} >+_LUA_WANTED_VERSIONS:= \ >+ ${_LUA_WANTED_VERSIONS:M${_LUA_DEFAULT_VERSION}} \ >+ ${_LUA_WANTED_VERSIONS:N${_LUA_DEFAULT_VERSION}:O:u:[-1..1]} >+ >+.if ${_LUA_ARG_FLAVORS} >+. if empty(FLAVORS) >+FLAVORS= ${_LUA_WANTED_VERSIONS:S/^/lua/} > . endif >-.endfor >+. if empty(FLAVOR) >+FLAVOR= ${FLAVORS:[1]} >+. endif >+_LUA_WANTED_VERSION:= ${FLAVOR:S/^lua//} >+.else >+_LUA_WANTED_VERSION:= ${_LUA_WANTED_VERSIONS:[1]} >+.endif > >+# If we're building Lua itself, everything should be in $PREFIX. If >+# we're building a module or app, then the stuff we're installing goes >+# in $PREFIX but references to Lua itself are in $LOCALBASE. > # >-# Depend on the default version if it fits, or the highest installed version, >-# or the highest version. >-# >-.if ${_LUA_WANTED_VERSIONS:M${_LUA_DEFAULT_VERSION}} >-_LUA_WANTED_VERSION:= ${_LUA_DEFAULT_VERSION} >-.elif defined(_LUA_HIGHEST_INSTALLED_VERSION) >-_LUA_WANTED_VERSION:= ${_LUA_HIGHEST_INSTALLED_VERSION} >+# The assumption is the LUA_MOD* directories are where we're going to >+# install (this is common for both modules and apps), and so we also >+# define LUA_REFMOD* relative to LOCALBASE for use when specifying >+# dependencies and so on. >+ >+.if ${_LUA_ARG_CORE} >+LUA_BASE=${PREFIX} > .else >-_LUA_WANTED_VERSION:= ${_LUA_HIGHEST_VERSION} >+LUA_BASE=${LOCALBASE} > .endif > >+LUA_PREFIX=${PREFIX} >+ > # > # Exported variables > # > 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_MODLIBDIR= ${LOCALBASE}/lib/lua/${LUA_VER} >-LUA_MODSHAREDIR= ${LOCALBASE}/share/lua/${LUA_VER} >-LUA_LIBDIR= ${LOCALBASE}/lib >+LUA_VER= ${_LUA_WANTED_VERSION:S/^5/5./} >+LUA_FLAVOR= ${_LUA_WANTED_VERSION:S/^/lua/} >+ >+LUA_CMD= lua${LUA_VER_STR} >+LUAC_CMD= luac${LUA_VER_STR} > LUA_PKGNAMEPREFIX= lua${LUA_VER_STR}- > >-PLIST_SUB+= LUA_MODLIBDIR=${LUA_MODLIBDIR:S,^${LOCALBASE}/,,} \ >- LUA_MODSHAREDIR=${LUA_MODSHAREDIR:S,^${LOCALBASE}/,,} \ >+LUA_LIBDIR= ${LUA_BASE}/lib >+LUA_INCDIR= ${LUA_BASE}/include/lua${LUA_VER_STR} >+ >+LUA_MODLIBDIR= ${LUA_PREFIX}/lib/lua/${LUA_VER} >+LUA_MODSHAREDIR= ${LUA_PREFIX}/share/lua/${LUA_VER} >+LUA_MODDOCSDIR= ${LUA_PREFIX}/share/doc/lua${LUA_VER_STR} >+LUA_MODEXAMPLESDIR= ${LUA_PREFIX}/share/examples/lua${LUA_VER_STR} >+ >+LUA_REFMODLIBDIR= ${LUA_BASE}/lib/lua/${LUA_VER} >+LUA_REFMODSHAREDIR= ${LUA_BASE}/share/lua/${LUA_VER} >+ >+PLIST_SUB+= LUA_MODLIBDIR=${LUA_MODLIBDIR:S,^${LUA_PREFIX}/,,} \ >+ LUA_MODSHAREDIR=${LUA_MODSHAREDIR:S,^${LUA_PREFIX}/,,} \ >+ LUA_MODDOCSDIR=${LUA_MODDOCSDIR:S,^${LUA_PREFIX}/,,} \ >+ LUA_INCDIR=${LUA_INCDIR:S,^${LUA_BASE}/,,} \ >+ LUA_LIBDIR=${LUA_LIBDIR:S,^${LUA_BASE}/,,} \ > LUA_VER=${LUA_VER} \ >- LUA_INCDIR=${LUA_INCDIR:S,^${LOCALBASE}/,,} \ >- LUA_LIBDIR=${LUA_LIBDIR:S,^${LOCALBASE}/,,} \ > LUA_VER_STR=${LUA_VER_STR} > MAKE_ENV+= LUA_MODLIBDIR=${LUA_MODLIBDIR} \ > LUA_MODSHAREDIR=${LUA_MODSHAREDIR} \ >- LUA_VER=${LUA_VER} \ >+ LUA_MODDOCSDIR=${LUA_MODDOCSDIR} \ > LUA_INCDIR=${LUA_INCDIR} \ >- LUA_LIBDIR=${LUA_LIBDIR} >+ LUA_LIBDIR=${LUA_LIBDIR} \ >+ LUA_VER=${LUA_VER} \ >+ LUA_VER_STR=${LUA_VER_STR} >+ >+# if building a module or Lua itself, or if the port defined LUA_DOCSUBDIR, >+# then define LUA_DOCSDIR and LUA_EXAMPLESDIR too >+.if ${_LUA_ARG_CORE} || ${_LUA_ARG_MODULE} >+LUA_DOCSUBDIR?=${PORTNAME} >+.endif >+.if !empty(LUA_DOCSUBDIR) >+LUA_DOCSDIR= ${LUA_MODDOCSDIR}/${LUA_DOCSUBDIR} >+LUA_EXAMPLESDIR=${LUA_MODEXAMPLESDIR}/${LUA_DOCSUBDIR} >+PLIST_SUB+= LUA_DOCSDIR=${LUA_DOCSDIR:S,^${LUA_PREFIX}/,,} >+PLIST_SUB+= LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR:S,^${LUA_PREFIX}/,,} >+MAKE_ENV+= LUA_DOCSDIR=${LUA_DOCSDIR} >+MAKE_ENV+= LUA_EXAMPLESDIR=${LUA_EXAMPLESDIR} >+.endif > >-.if ${lua_ARGS:Mbuild} >+.if empty(_LUA_ARG_ENV) >+. if ${lua_ARGS:Mbuild} > BUILD_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR} >-.elif ${lua_ARGS:Mrun} >+. endif >+. if ${lua_ARGS:Mrun} > RUN_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR} >-.else >+. endif >+. if !${lua_ARGS:Mbuild} && !${lua_ARGS:Mrun} > LIB_DEPENDS+= liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR} >+. endif > .endif > > .endif >diff --git archivers/Makefile archivers/Makefile >index 1e13f339492d..715f4ce275cc 100644 >--- archivers/Makefile >+++ archivers/Makefile >@@ -71,7 +71,7 @@ > SUBDIR += lizard > SUBDIR += lrzip > SUBDIR += lua-lzlib >- SUBDIR += lua51-zlib >+ SUBDIR += lua-zlib > SUBDIR += lzfse > SUBDIR += lzip > SUBDIR += lziprecover >diff --git archivers/lua-lzlib/Makefile archivers/lua-lzlib/Makefile >index 7cca3695faab..4803b9e3d278 100644 >--- archivers/lua-lzlib/Makefile >+++ archivers/lua-lzlib/Makefile >@@ -2,6 +2,7 @@ > > PORTNAME= lzlib > PORTVERSION= 0.4.3 >+PORTREVISION= 1 > CATEGORIES= archivers > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -10,7 +11,7 @@ COMMENT= Lua bindings to the ZLib compression library > > LICENSE= MIT > >-USES= cmake lua >+USES= cmake lua:51-52,module > USE_GITHUB= yes > GH_ACCOUNT= LuaDist > CMAKE_ARGS= -DINSTALL_LMOD="${LUA_MODSHAREDIR}" \ >diff --git archivers/lua-zlib/Makefile archivers/lua-zlib/Makefile >new file mode 100644 >index 000000000000..1e0e99de95db >--- /dev/null >+++ archivers/lua-zlib/Makefile >@@ -0,0 +1,36 @@ >+# Created by: Sir l33tname <sirl33tname@gmail.com> >+# $FreeBSD$ >+ >+PORTNAME= zlib >+PORTVERSION= 1.2 >+PORTREVISION= 1 >+DISTVERSIONPREFIX=v >+CATEGORIES= archivers >+PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >+ >+MAINTAINER= sirl33tname@gmail.com >+COMMENT= Simple streaming interface to zlib for the Lua Programming Language >+ >+LICENSE= MIT >+ >+USE_GITHUB= yes >+GH_ACCOUNT= brimworks >+GH_PROJECT= lua-zlib >+ >+USES= lua:51,module >+ >+ALL_TARGET= bsd >+MAKE_ENV+= LUAPATH="${LOCALBASE}" >+MAKE_ENV+= LUACPATH="${STAGEDIR}${LUA_MODLIBDIR}" >+MAKE_ENV+= INCDIR="-I${LUA_INCDIR}" >+MAKE_ENV+= LUALIBDIR="-L${LUA_MODLIBDIR}" >+LLD_UNSAFE= yes >+ >+PLIST_FILES= ${LUA_MODLIBDIR}/zlib.so >+ >+DOCSDIR= ${STAGEDIR}/share/doc/${UNIQUENAME} >+ >+pre-install: >+ ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} >+ >+.include <bsd.port.mk> >diff --git archivers/lua-zlib/distinfo archivers/lua-zlib/distinfo >new file mode 100644 >index 000000000000..17289dfc85f4 >--- /dev/null >+++ archivers/lua-zlib/distinfo >@@ -0,0 +1,3 @@ >+TIMESTAMP = 1507829619 >+SHA256 (brimworks-lua-zlib-v1.2_GH0.tar.gz) = 26b813ad39c94fc930b168c3418e2e746af3b2e80b92f94f306f6f954cc31e7d >+SIZE (brimworks-lua-zlib-v1.2_GH0.tar.gz) = 16612 >diff --git archivers/lua-zlib/files/patch-Makefile archivers/lua-zlib/files/patch-Makefile >new file mode 100644 >index 000000000000..d64fd7a671dc >--- /dev/null >+++ archivers/lua-zlib/files/patch-Makefile >@@ -0,0 +1,62 @@ >+--- Makefile.orig 2017-01-03 01:42:12 UTC >++++ Makefile >+@@ -3,7 +3,7 @@ >+ LUAPATH ?= /usr/share/lua/5.1 >+ LUACPATH ?= /usr/lib/lua/5.1 >+ INCDIR ?= -I/usr/include/lua5.1 >+-LIBDIR ?= -L/usr/lib >++LUALIBDIR ?= -L/usr/lib >+ >+ # For Mac OS X: set the system version >+ MACOSX_VERSION = 10.4 >+@@ -11,21 +11,21 @@ MACOSX_VERSION = 10.4 >+ CMOD = zlib.so >+ OBJS = lua_zlib.o >+ >+-LIBS = -lz -llua -lm >++LIBS = -lz -lm >+ WARN = -Wall -pedantic >+ >+ BSD_CFLAGS = -O2 -fPIC $(WARN) $(INCDIR) $(DEFS) >+-BSD_LDFLAGS = -O -shared -fPIC $(LIBDIR) >++BSD_LDFLAGS = -O2 -shared $(LUALIBDIR) >+ >+ LNX_CFLAGS = -O2 -fPIC $(WARN) $(INCDIR) $(DEFS) >+-LNX_LDFLAGS = -O -shared -fPIC $(LIBDIR) >++LNX_LDFLAGS = -O2 -shared -fPIC $(LUALIBDIR) >+ >+ MAC_ENV = env MACOSX_DEPLOYMENT_TARGET='$(MACVER)' >+ MAC_CFLAGS = -O2 -fPIC -fno-common $(WARN) $(INCDIR) $(DEFS) >+-MAC_LDFLAGS = -bundle -undefined dynamic_lookup -fPIC $(LIBDIR) >++MAC_LDFLAGS = -bundle -undefined dynamic_lookup -fPIC $(LUALIBDIR) >+ >+-CC = gcc >+-LD = $(MYENV) gcc >++CC ?= gcc >++LD ?= $(MYENV) gcc >+ CFLAGS = $(MYCFLAGS) >+ LDFLAGS = $(MYLDFLAGS) >+ >+@@ -44,13 +44,13 @@ uninstall: >+ rm $(LUACPATH)/zlib.so >+ >+ linux: >+- @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" >++ @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)" >+ >+ bsd: >+- @$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" >++ @$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)" >+ >+ macosx: >+- @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" >++ @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)" >+ >+ clean: >+ rm -f $(OBJS) $(CMOD) >+@@ -59,4 +59,4 @@ clean: >+ $(CC) -c $(CFLAGS) $(DEFS) $(INCDIR) -o $@ $< >+ >+ $(CMOD): $(OBJS) >+- $(LD) $(LDFLAGS) $(LIBDIR) $(OBJS) $(LIBS) -o $@ >++ $(LD) $(LDFLAGS) $(LUALIBDIR) $(OBJS) $(LIBS) -o $@ >diff --git archivers/lua-zlib/pkg-descr archivers/lua-zlib/pkg-descr >new file mode 100644 >index 000000000000..faaf08391c17 >--- /dev/null >+++ archivers/lua-zlib/pkg-descr >@@ -0,0 +1,6 @@ >+lua-zlib is a simple streaming interface to zlib for the Lua Programming >+Language. It consists of two functions: inflate and deflate. Both functions >+return "stream functions" (takes a buffer of input and returns a buffer >+of output). >+ >+WWW: https://github.com/brimworks/lua-zlib >diff --git archivers/lua51-zlib/Makefile archivers/lua51-zlib/Makefile >deleted file mode 100644 >index a56241fb48cd..000000000000 >--- archivers/lua51-zlib/Makefile >+++ /dev/null >@@ -1,35 +0,0 @@ >-# Created by: Sir l33tname <sirl33tname@gmail.com> >-# $FreeBSD$ >- >-PORTNAME= zlib >-PORTVERSION= 1.2 >-DISTVERSIONPREFIX=v >-CATEGORIES= archivers >-PKGNAMEPREFIX= lua51- >- >-MAINTAINER= sirl33tname@gmail.com >-COMMENT= Simple streaming interface to zlib for the Lua Programming Language >- >-LICENSE= MIT >- >-USE_GITHUB= yes >-GH_ACCOUNT= brimworks >-GH_PROJECT= lua-zlib >- >-USES= lua:51 >- >-ALL_TARGET= bsd >-MAKE_ENV+= LUAPATH="${LOCALBASE}" >-MAKE_ENV+= LUACPATH="${STAGEDIR}${LUA_MODLIBDIR}" >-MAKE_ENV+= INCDIR="-I${LUA_INCDIR}" >-MAKE_ENV+= LUALIBDIR="-L${LUA_MODLIBDIR}" >-LLD_UNSAFE= yes >- >-PLIST_FILES= ${LUA_MODLIBDIR}/zlib.so >- >-DOCSDIR= ${STAGEDIR}/share/doc/${UNIQUENAME} >- >-pre-install: >- ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} >- >-.include <bsd.port.mk> >diff --git archivers/lua51-zlib/distinfo archivers/lua51-zlib/distinfo >deleted file mode 100644 >index 17289dfc85f4..000000000000 >--- archivers/lua51-zlib/distinfo >+++ /dev/null >@@ -1,3 +0,0 @@ >-TIMESTAMP = 1507829619 >-SHA256 (brimworks-lua-zlib-v1.2_GH0.tar.gz) = 26b813ad39c94fc930b168c3418e2e746af3b2e80b92f94f306f6f954cc31e7d >-SIZE (brimworks-lua-zlib-v1.2_GH0.tar.gz) = 16612 >diff --git archivers/lua51-zlib/files/patch-Makefile archivers/lua51-zlib/files/patch-Makefile >deleted file mode 100644 >index d64fd7a671dc..000000000000 >--- archivers/lua51-zlib/files/patch-Makefile >+++ /dev/null >@@ -1,62 +0,0 @@ >---- Makefile.orig 2017-01-03 01:42:12 UTC >-+++ Makefile >-@@ -3,7 +3,7 @@ >- LUAPATH ?= /usr/share/lua/5.1 >- LUACPATH ?= /usr/lib/lua/5.1 >- INCDIR ?= -I/usr/include/lua5.1 >--LIBDIR ?= -L/usr/lib >-+LUALIBDIR ?= -L/usr/lib >- >- # For Mac OS X: set the system version >- MACOSX_VERSION = 10.4 >-@@ -11,21 +11,21 @@ MACOSX_VERSION = 10.4 >- CMOD = zlib.so >- OBJS = lua_zlib.o >- >--LIBS = -lz -llua -lm >-+LIBS = -lz -lm >- WARN = -Wall -pedantic >- >- BSD_CFLAGS = -O2 -fPIC $(WARN) $(INCDIR) $(DEFS) >--BSD_LDFLAGS = -O -shared -fPIC $(LIBDIR) >-+BSD_LDFLAGS = -O2 -shared $(LUALIBDIR) >- >- LNX_CFLAGS = -O2 -fPIC $(WARN) $(INCDIR) $(DEFS) >--LNX_LDFLAGS = -O -shared -fPIC $(LIBDIR) >-+LNX_LDFLAGS = -O2 -shared -fPIC $(LUALIBDIR) >- >- MAC_ENV = env MACOSX_DEPLOYMENT_TARGET='$(MACVER)' >- MAC_CFLAGS = -O2 -fPIC -fno-common $(WARN) $(INCDIR) $(DEFS) >--MAC_LDFLAGS = -bundle -undefined dynamic_lookup -fPIC $(LIBDIR) >-+MAC_LDFLAGS = -bundle -undefined dynamic_lookup -fPIC $(LUALIBDIR) >- >--CC = gcc >--LD = $(MYENV) gcc >-+CC ?= gcc >-+LD ?= $(MYENV) gcc >- CFLAGS = $(MYCFLAGS) >- LDFLAGS = $(MYLDFLAGS) >- >-@@ -44,13 +44,13 @@ uninstall: >- rm $(LUACPATH)/zlib.so >- >- linux: >-- @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" >-+ @$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)" >- >- bsd: >-- @$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" >-+ @$(MAKE) $(CMOD) MYCFLAGS="$(BSD_CFLAGS)" MYLDFLAGS="$(BSD_LDFLAGS)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)" >- >- macosx: >-- @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" INCDIR="$(INCDIR)" LIBDIR="$(LIBDIR)" DEFS="$(DEFS)" >-+ @$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" INCDIR="$(INCDIR)" LUALIBDIR="$(LUALIBDIR)" DEFS="$(DEFS)" >- >- clean: >- rm -f $(OBJS) $(CMOD) >-@@ -59,4 +59,4 @@ clean: >- $(CC) -c $(CFLAGS) $(DEFS) $(INCDIR) -o $@ $< >- >- $(CMOD): $(OBJS) >-- $(LD) $(LDFLAGS) $(LIBDIR) $(OBJS) $(LIBS) -o $@ >-+ $(LD) $(LDFLAGS) $(LUALIBDIR) $(OBJS) $(LIBS) -o $@ >diff --git archivers/lua51-zlib/pkg-descr archivers/lua51-zlib/pkg-descr >deleted file mode 100644 >index faaf08391c17..000000000000 >--- archivers/lua51-zlib/pkg-descr >+++ /dev/null >@@ -1,6 +0,0 @@ >-lua-zlib is a simple streaming interface to zlib for the Lua Programming >-Language. It consists of two functions: inflate and deflate. Both functions >-return "stream functions" (takes a buffer of input and returns a buffer >-of output). >- >-WWW: https://github.com/brimworks/lua-zlib >diff --git astro/celestia/Makefile astro/celestia/Makefile >index 98c368740c60..9ed1bb3bf2f1 100644 >--- astro/celestia/Makefile >+++ astro/celestia/Makefile >@@ -15,7 +15,7 @@ LICENSE= GPLv2 > > LIB_DEPENDS= libpng.so:graphics/png > >-USES= compiler:c++11-lang gettext gl gmake jpeg libtool lua pkgconfig >+USES= compiler:c++11-lang gettext gl gmake jpeg libtool lua:52 pkgconfig > USE_GL= gl > GNU_CONFIGURE= yes > EXTRA_PATCHES= ${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \ >diff --git audio/Makefile audio/Makefile >index 815107071643..0589a536fa42 100644 >--- audio/Makefile >+++ audio/Makefile >@@ -462,7 +462,7 @@ > SUBDIR += lollypop > SUBDIR += lpac > SUBDIR += lsp-plugins-lv2 >- SUBDIR += lua51-mpd >+ SUBDIR += lua-mpd > SUBDIR += luppp > SUBDIR += lv2 > SUBDIR += lv2file >diff --git audio/aqualung/Makefile audio/aqualung/Makefile >index 5f32f4616db4..1eb7f7e055e2 100644 >--- audio/aqualung/Makefile >+++ audio/aqualung/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= aqualung > PORTVERSION= 1.0 >-PORTREVISION= 13 >+PORTREVISION= 14 > CATEGORIES= audio > MASTER_SITES= SF > >@@ -30,7 +30,7 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ > libcdio_paranoia.so:sysutils/libcdio-paranoia \ > liblrdf.so:textproc/liblrdf > >-USES= compiler:c++11-lang gettext gnome localbase lua pkgconfig >+USES= compiler:c++11-lang gettext gnome localbase lua:52 pkgconfig > USE_GNOME= gtk20 libxml2 libxslt > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --with-ifp=no >diff --git audio/lua-mpd/Makefile audio/lua-mpd/Makefile >new file mode 100644 >index 000000000000..a0d3a029bc4b >--- /dev/null >+++ audio/lua-mpd/Makefile >@@ -0,0 +1,34 @@ >+# $FreeBSD$ >+ >+PORTNAME= mpd >+PORTVERSION= 0.1 >+PORTREVISION= 1 >+DISTVERSIONPREFIX= v >+CATEGORIES= audio >+PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >+ >+MAINTAINER= demelier.david@gmail.com >+COMMENT= Lua library for musicpd >+ >+RUN_DEPENDS= ${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} >+ >+OPTIONS_DEFINE= DOCS >+DOCSDIR= ${LUA_DOCSDIR} >+ >+GH_ACCOUNT= silentbicycle >+GH_PROJECT= lua-mpd >+ >+USES= lua:51,module >+USE_GITHUB= yes >+NO_BUILD= yes >+ >+do-install: >+ @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR} >+ ${INSTALL_DATA} ${WRKSRC}/mpd.lua ${STAGEDIR}${LUA_MODSHAREDIR} >+ @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/modules ${STAGEDIR}${DOCSDIR}/files >+ ${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${DOCSDIR} >+ ${INSTALL_DATA} ${WRKSRC}/luadoc.css ${STAGEDIR}${DOCSDIR} >+ ${INSTALL_DATA} ${WRKSRC}/files/mpd.html ${STAGEDIR}${DOCSDIR}/files >+ ${INSTALL_DATA} ${WRKSRC}/modules/mpd.html ${STAGEDIR}${DOCSDIR}/modules >+ >+.include <bsd.port.mk> >diff --git audio/lua-mpd/distinfo audio/lua-mpd/distinfo >new file mode 100644 >index 000000000000..8333aa8c6899 >--- /dev/null >+++ audio/lua-mpd/distinfo >@@ -0,0 +1,2 @@ >+SHA256 (silentbicycle-lua-mpd-v0.1_GH0.tar.gz) = 296f168887e10646624cce98c2f7504b168cb35b5445e2d21ba5fccb50a8f68b >+SIZE (silentbicycle-lua-mpd-v0.1_GH0.tar.gz) = 16351 >diff --git audio/lua-mpd/pkg-descr audio/lua-mpd/pkg-descr >new file mode 100644 >index 000000000000..f0a6a49c5cdc >--- /dev/null >+++ audio/lua-mpd/pkg-descr >@@ -0,0 +1,3 @@ >+This is a Lua client for mpd. >+ >+WWW: https://github.com/silentbicycle/lua-mpd >diff --git audio/lua-mpd/pkg-plist audio/lua-mpd/pkg-plist >new file mode 100644 >index 000000000000..984c9c92b2ed >--- /dev/null >+++ audio/lua-mpd/pkg-plist >@@ -0,0 +1,5 @@ >+%%LUA_MODSHAREDIR%%/mpd.lua >+%%PORTDOCS%%%%DOCSDIR%%/files/mpd.html >+%%PORTDOCS%%%%DOCSDIR%%/index.html >+%%PORTDOCS%%%%DOCSDIR%%/luadoc.css >+%%PORTDOCS%%%%DOCSDIR%%/modules/mpd.html >diff --git audio/lua51-mpd/Makefile audio/lua51-mpd/Makefile >deleted file mode 100644 >index 57779243f92c..000000000000 >--- audio/lua51-mpd/Makefile >+++ /dev/null >@@ -1,33 +0,0 @@ >-# $FreeBSD$ >- >-PORTNAME= mpd >-PORTVERSION= 0.1 >-DISTVERSIONPREFIX= v >-CATEGORIES= audio >-PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >- >-MAINTAINER= demelier.david@gmail.com >-COMMENT= Lua library for musicpd >- >-RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51 >- >-OPTIONS_DEFINE= DOCS >-DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} >- >-GH_ACCOUNT= silentbicycle >-GH_PROJECT= lua-mpd >- >-USES= lua:51 >-USE_GITHUB= yes >-NO_BUILD= yes >- >-do-install: >- @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR} >- ${INSTALL_DATA} ${WRKSRC}/mpd.lua ${STAGEDIR}${LUA_MODSHAREDIR} >- @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/modules ${STAGEDIR}${DOCSDIR}/files >- ${INSTALL_DATA} ${WRKSRC}/index.html ${STAGEDIR}${DOCSDIR} >- ${INSTALL_DATA} ${WRKSRC}/luadoc.css ${STAGEDIR}${DOCSDIR} >- ${INSTALL_DATA} ${WRKSRC}/files/mpd.html ${STAGEDIR}${DOCSDIR}/files >- ${INSTALL_DATA} ${WRKSRC}/modules/mpd.html ${STAGEDIR}${DOCSDIR}/modules >- >-.include <bsd.port.mk> >diff --git audio/lua51-mpd/distinfo audio/lua51-mpd/distinfo >deleted file mode 100644 >index 8333aa8c6899..000000000000 >--- audio/lua51-mpd/distinfo >+++ /dev/null >@@ -1,2 +0,0 @@ >-SHA256 (silentbicycle-lua-mpd-v0.1_GH0.tar.gz) = 296f168887e10646624cce98c2f7504b168cb35b5445e2d21ba5fccb50a8f68b >-SIZE (silentbicycle-lua-mpd-v0.1_GH0.tar.gz) = 16351 >diff --git audio/lua51-mpd/pkg-descr audio/lua51-mpd/pkg-descr >deleted file mode 100644 >index f0a6a49c5cdc..000000000000 >--- audio/lua51-mpd/pkg-descr >+++ /dev/null >@@ -1,3 +0,0 @@ >-This is a Lua client for mpd. >- >-WWW: https://github.com/silentbicycle/lua-mpd >diff --git audio/lua51-mpd/pkg-plist audio/lua51-mpd/pkg-plist >deleted file mode 100644 >index 984c9c92b2ed..000000000000 >--- audio/lua51-mpd/pkg-plist >+++ /dev/null >@@ -1,5 +0,0 @@ >-%%LUA_MODSHAREDIR%%/mpd.lua >-%%PORTDOCS%%%%DOCSDIR%%/files/mpd.html >-%%PORTDOCS%%%%DOCSDIR%%/index.html >-%%PORTDOCS%%%%DOCSDIR%%/luadoc.css >-%%PORTDOCS%%%%DOCSDIR%%/modules/mpd.html >diff --git converters/Makefile converters/Makefile >index 505d19f029a4..5ba0c0c8f6e3 100644 >--- converters/Makefile >+++ converters/Makefile >@@ -49,7 +49,6 @@ > SUBDIR += linux-c7-fribidi > SUBDIR += lua-iconv > SUBDIR += lua-json >- SUBDIR += lua51-iconv > SUBDIR += mimelib > SUBDIR += mmencode > SUBDIR += mpack >diff --git converters/lua-iconv/Makefile converters/lua-iconv/Makefile >index c1248f454de1..80834db15a2b 100644 >--- converters/lua-iconv/Makefile >+++ converters/lua-iconv/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= iconv > PORTVERSION= 7 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= converters > MASTER_SITES= GHC > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >@@ -13,13 +13,11 @@ MAINTAINER= vanilla@FreeBSD.org > COMMENT= Iconv binding for Lua 5 > > BROKEN= unfetchable >-DEPRECATED= Broken for more than 6 months >-EXPIRATION_DATE= 2020-05-05 > > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/COPYING > >-USES= pkgconfig iconv lua >+USES= pkgconfig iconv lua:module > > USE_GITHUB= yes > GH_ACCOUNT= ittner >diff --git converters/lua-json/Makefile converters/lua-json/Makefile >index b6aae5c87861..a881f987fc42 100644 >--- converters/lua-json/Makefile >+++ converters/lua-json/Makefile >@@ -3,17 +3,18 @@ > > PORTNAME= json > PORTVERSION= 1.3.4 >+PORTREVISION= 1 > CATEGORIES= converters > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > > MAINTAINER= sunpoet@FreeBSD.org > COMMENT= JSON parser/creator for Lua > >-RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}lpeg>=0.8.1:devel/lua-lpeg >+RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}lpeg>=0.8.1:devel/lua-lpeg@${LUA_FLAVOR} > > MAKE_ARGS= INSTALL_CMOD=${LUA_MODLIBDIR} INSTALL_LMOD=${LUA_MODSHAREDIR} > NO_ARCH= yes >-USES= lua:run >+USES= lua:run,module > > GH_ACCOUNT= harningt > GH_PROJECT= lua${PORTNAME} >diff --git converters/lua51-iconv/Makefile converters/lua51-iconv/Makefile >deleted file mode 100644 >index 755db5753d1a..000000000000 >--- converters/lua51-iconv/Makefile >+++ /dev/null >@@ -1,37 +0,0 @@ >-# Created by: vanilla@ >-# $FreeBSD$ >- >-PORTNAME= iconv >-PORTVERSION= 7 >-PORTREVISION= 2 >-CATEGORIES= converters >-MASTER_SITES= GHC >-PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >-DISTNAME= lua-${PORTNAME}-${PORTVERSION} >- >-MAINTAINER= feld@FreeBSD.org >-COMMENT= Iconv binding for Lua 5 >- >-BROKEN= unfetchable >-DEPRECATED= Broken for more than 6 months >-EXPIRATION_DATE= 2020-05-05 >- >-USES= pkgconfig iconv lua:51 >- >-USE_GITHUB= yes >-GH_ACCOUNT= ittner >-GH_PROJECT= lua-${PORTNAME} >- >-PLIST_FILES= %%LUA_MODLIBDIR%%/iconv.so >-CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` -I${LOCALBASE}/include >-MAKE_ARGS= LUABIN=${LUA_CMD} CFLAGS="${CFLAGS}" >-LDFLAGS= -shared ${ICONV_LIB} -L${LOCALBASE}/lib >-CFLAGS_aarch64= -fPIC >-CFLAGS_amd64= -fPIC >-CFLAGS_i386= -fPIC >- >-do-install: >- @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} >- ${INSTALL_LIB} ${WRKSRC}/iconv.so ${STAGEDIR}${LUA_MODLIBDIR} >- >-.include <bsd.port.mk> >diff --git converters/lua51-iconv/distinfo converters/lua51-iconv/distinfo >deleted file mode 100644 >index 56330757c184..000000000000 >--- converters/lua51-iconv/distinfo >+++ /dev/null >@@ -1,2 +0,0 @@ >-SHA256 (lua-iconv-7.tar.gz) = c1db1915c754b5cfe7e45af61467bc6dfa4f0037d281ccbce6b53c974e2faf09 >-SIZE (lua-iconv-7.tar.gz) = 7693 >diff --git converters/lua51-iconv/pkg-descr converters/lua51-iconv/pkg-descr >deleted file mode 100644 >index e521ca40c1cc..000000000000 >--- converters/lua51-iconv/pkg-descr >+++ /dev/null >@@ -1,3 +0,0 @@ >-LuaIconv is a Lua binding to iconv library. >- >-WWW: http://luaforge.net/projects/lua-iconv/ >diff --git databases/lua-lsqlite3/Makefile databases/lua-lsqlite3/Makefile >index c676da5f1b43..361a7403b6d2 100644 >--- databases/lua-lsqlite3/Makefile >+++ databases/lua-lsqlite3/Makefile >@@ -3,6 +3,7 @@ > > PORTNAME= lsqlite3 > PORTVERSION= 0.9.5 >+PORTREVISION= 1 > CATEGORIES= databases > MASTER_SITES= http://Lua.SQLite.org/index.cgi/zip/ > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >@@ -15,30 +16,20 @@ LICENSE= MIT > > BUILD_DEPENDS= ${NONEXISTENT}:databases/sqlite3:patch > >-USES= localbase:ldflags sqlite:3 zip >+USES= localbase:ldflags sqlite:3 zip lua:module > > OPTIONS_DEFINE= DOCS EXAMPLES >-OPTIONS_SINGLE= LUA_VERSION >-OPTIONS_SINGLE_LUA_VERSION= LUA51 LUA52 LUA53 >-OPTIONS_DEFAULT=LUA${LUA_DEFAULT:S/.//} >- >-LUA51_DESC= Build for Lua 5.1 and LuaJIT >-LUA51_USES= lua:51 >-LUA52_DESC= Build for Lua 5.2 >-LUA52_USES= lua:52 >-LUA53_DESC= Build for Lua 5.3 >-LUA53_USES= lua:53 > > CFLAGS+= -pedantic -Wall -Qunused-arguments -fPIC -DPIC\ > -std=c99 -fno-strict-aliasing -I${LUA_INCDIR}\ > -DLSQLITE_VERSION=\"${PORTVERSION}\" > LDFLAGS+= -shared -pthread -lm -L${LOCALBASE}/lib > >-DOCSDIR= ${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME} >-EXAMPLESDIR= ${PREFIX}/share/examples/lua${LUA_VER_STR}/${PORTNAME} >+DOCSDIR= ${LUA_DOCSDIR} >+EXAMPLESDIR= ${LUA_EXAMPLESDIR} > > pre-configure: >- @${CP} -p `${MAKE} -V WRKSRC -C ${PORTSDIR}/databases/sqlite3`/sqlite3.[ch] ${WRKSRC} >+ @${CP} -p `${SETENV} -u FLAVOR ${MAKE} -V WRKSRC -C ${PORTSDIR}/databases/sqlite3`/sqlite3.[ch] ${WRKSRC} > > do-build: > cd ${WRKSRC} &&\ >diff --git databases/lua-xapian/Makefile databases/lua-xapian/Makefile >index 14e85c161369..4df723e21b63 100644 >--- databases/lua-xapian/Makefile >+++ databases/lua-xapian/Makefile >@@ -4,6 +4,7 @@ > PORTNAME= xapian > PORTVERSION= 1.4.15 > DISTVERSIONPREFIX= bindings- >+PORTREVISION= 1 > CATEGORIES= databases > MASTER_SITES= https://oligarchy.co.uk/xapian/${PORTVERSION}/ \ > LOCAL/sunpoet >@@ -24,7 +25,9 @@ OPTIONS_DEFINE= DOCS > > PORTSCOUT= limitw:1,even > >-USES= compiler:c++11-lang libtool lua tar:xz >+USES= compiler:c++11-lang libtool lua:module tar:xz >+ >+DOCSDIR= ${LUA_DOCSDIR} > > CONFIGURE_ARGS= --datarootdir=${DATADIR} \ > --docdir=${DOCSDIR} \ >diff --git databases/luadbi/Makefile databases/luadbi/Makefile >index 858146e94466..e5abf6e4a639 100644 >--- databases/luadbi/Makefile >+++ databases/luadbi/Makefile >@@ -4,6 +4,7 @@ > PORTNAME= luadbi > PORTVERSION= 0.6 > DISTVERSIONPREFIX= v >+PORTREVISION= 1 > CATEGORIES= databases > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -12,7 +13,7 @@ COMMENT= LuaDBI driver > > LICENSE= MIT > >-USES= gmake shebangfix >+USES= gmake shebangfix lua:module > SHEBANG_FILES= DBI.lua > > USE_GITHUB= yes >@@ -30,18 +31,12 @@ MAKE_ENV+= LUA_INC="-I${LUA_INCDIR}" > > MAKE_JOBS_UNSAFE=yes > >-OPTIONS_SINGLE= LUA_VERSION >-OPTIONS_SINGLE_LUA_VERSION= LUA51 LUA52 LUA53 > OPTIONS_MULTI= DATABASE > OPTIONS_MULTI_DATABASE= MYSQL SQLITE3 PGSQL >-OPTIONS_DEFAULT= MYSQL LUA52 >+OPTIONS_DEFAULT= MYSQL > > PLIST_FILES= %%LUA_MODSHAREDIR%%/DBI.lua > >-LUA51_USES= lua:51 >-LUA52_USES= lua:52 >-LUA53_USES= lua:53 >- > MYSQL_USES= mysql > MYSQL_ALL_TARGET= mysql > MYSQL_PLIST_FILES= %%LUA_MODLIBDIR%%/dbd/mysql.so >diff --git databases/luasql-mysql/Makefile databases/luasql-mysql/Makefile >index 0ddba7811587..a82fa012f82b 100644 >--- databases/luasql-mysql/Makefile >+++ databases/luasql-mysql/Makefile >@@ -3,8 +3,10 @@ > > PORTNAME= luasql > PORTVERSION= 2.5.0 >+PORTREVISION= 1 > CATEGORIES= databases > PKGNAMESUFFIX= -${LUASQL_DRIVER} >+PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > > MAINTAINER= mbeis@xs4all.nl > COMMENT= LuaSQL driver >@@ -14,7 +16,7 @@ LICENSE= MIT > USE_GITHUB= yes > GH_ACCOUNT= keplerproject > >-USES= lua gmake dos2unix >+USES= lua:module gmake dos2unix > DOS2UNIX_FILES= src/*.c > ALL_TARGET= ${LUASQL_DRIVER} > >@@ -30,8 +32,7 @@ MAKE_ARGS= LUA_DIR=${LUA_SUBDIR} \ > > CFLAGS+= -Wno-return-type > >-PLIST_SUB= LUA_MIDLIBDIR=${LUA_MODLIBDIR} \ >- LUASQL_DRIVER=${LUASQL_DRIVER} >+PLIST_SUB= LUASQL_DRIVER=${LUASQL_DRIVER} > > .if ${LUASQL_DRIVER} == "mysql" > COMMENT= Lua interface to MySQL >diff --git databases/redis-devel/Makefile databases/redis-devel/Makefile >index 7db2a7688e57..f0d8ddd714a1 100644 >--- databases/redis-devel/Makefile >+++ databases/redis-devel/Makefile >@@ -31,7 +31,7 @@ MAKE_ENV= V=yo OPTIMIZATION= > > JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes > >-LUA_USE= lua=51 >+LUA_USES= lua:51 > LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua > LUA_VARS= _addflags=true > >diff --git databases/xapian-bindings/Makefile databases/xapian-bindings/Makefile >index d77f13830098..f0d54013188e 100644 >--- databases/xapian-bindings/Makefile >+++ databases/xapian-bindings/Makefile >@@ -17,7 +17,7 @@ PORTSCOUT= limitw:1,even > > USES= metaport > >-LUA_RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/lua-xapian >+LUA_RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/lua-xapian@${LUA_FLAVOR} > LUA_USES= lua:run > PERL_RUN_DEPENDS= p5-Xapian>=${PORTVERSION}:databases/p5-Xapian > PHP_RUN_DEPENDS= php-xapian>=${PORTVERSION}:databases/php-xapian >diff --git devel/Makefile devel/Makefile >index 3ef26e63569c..1759dd25c566 100644 >--- devel/Makefile >+++ devel/Makefile >@@ -1459,6 +1459,7 @@ > SUBDIR += lua-cjson > SUBDIR += lua-gettext > SUBDIR += lua-lgi >+ SUBDIR += lua-libevent > SUBDIR += lua-lpeg > SUBDIR += lua-luacheck > SUBDIR += lua-luarocks >@@ -1471,12 +1472,8 @@ > SUBDIR += lua-stdlib-debug > SUBDIR += lua-stdlib-normalize > SUBDIR += lua-sysctl >- SUBDIR += lua51-bitop >- SUBDIR += lua51-cjson >- SUBDIR += lua51-libevent > SUBDIR += luabind > SUBDIR += luafilesystem >- SUBDIR += luafilesystem-51 > SUBDIR += luajava > SUBDIR += lutok > SUBDIR += luv >diff --git devel/lua-MessagePack/Makefile devel/lua-MessagePack/Makefile >index 429452d2ad9d..0600d463dc71 100644 >--- devel/lua-MessagePack/Makefile >+++ devel/lua-MessagePack/Makefile >@@ -2,6 +2,7 @@ > > PORTNAME= MessagePack > PORTVERSION= 0.3.5 >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -15,7 +16,7 @@ EXPIRATION_DATE= 2020-05-05 > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/COPYRIGHT > >-USES= lua >+USES= lua:module > NO_BUILD= yes > NO_ARCH= yes > >diff --git devel/lua-bitlib/Makefile devel/lua-bitlib/Makefile >index 5008b9b91ea2..b4fd46f08827 100644 >--- devel/lua-bitlib/Makefile >+++ devel/lua-bitlib/Makefile >@@ -3,6 +3,7 @@ > > PORTNAME= bitlib > PORTVERSION= 24 >+PORTREVISION= 1 > CATEGORIES= devel > MASTER_SITES= http://luaforge.net/frs/download.php/2715/ > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >@@ -10,7 +11,7 @@ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > MAINTAINER= ports@FreeBSD.org > COMMENT= Tiny library for bitwise operations > >-USES= lua >+USES= lua:module > > PLIST_FILES= %%LUA_MODLIBDIR%%/bit.so > >diff --git devel/lua-bitop/Makefile devel/lua-bitop/Makefile >index 547e82a7d932..5a5911f4f3ce 100644 >--- devel/lua-bitop/Makefile >+++ devel/lua-bitop/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= bitop > PORTVERSION= 1.0.2 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= devel > MASTER_SITES= http://bitop.luajit.org/download/ \ > LOCAL/sunpoet >@@ -18,7 +18,7 @@ LICENSE= MIT > CFLAGS+= -I${LUA_INCDIR} > MAKE_ARGS= CC=${CC} LUA=${LUA_CMD} > TEST_TARGET= test >-USES?= gmake lua >+USES= gmake lua:module > > PLIST_FILES= ${LUA_MODLIBDIR}/bit.so > >diff --git devel/lua-cjson/Makefile devel/lua-cjson/Makefile >index 4558c554b616..5a475e0187e9 100644 >--- devel/lua-cjson/Makefile >+++ devel/lua-cjson/Makefile >@@ -3,18 +3,19 @@ > > PORTNAME= cjson > PORTVERSION= 2.1.0 >+PORTREVISION= 1 > CATEGORIES= devel > MASTER_SITES= http://www.kyne.com.au/~mark/software/download/ > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > DISTNAME= lua-cjson-${PORTVERSION} > > MAINTAINER= osa@FreeBSD.org >-COMMENT?= Fast JSON parsing and encoding support for Lua >+COMMENT= Fast JSON parsing and encoding support for Lua > > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-USES?= lua >+USES= lua:module > > MAKE_ARGS= LUA_VERSION=${LUA_VER} > >diff --git devel/lua-gettext/Makefile devel/lua-gettext/Makefile >index 4981a4cf9908..0a329e2f98a7 100644 >--- devel/lua-gettext/Makefile >+++ devel/lua-gettext/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= gettext > PORTVERSION= 1.5 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= devel > MASTER_SITES= https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/gettext/ \ > https://BSDforge.com/projects/source/devel/lua-gettext/ >@@ -14,7 +14,7 @@ DIST_SUBDIR= lua-${PORTNAME}-${COMMIT} > MAINTAINER= portmaster@BSDforge.com > COMMENT= Gettext binding for Lua 5 > >-USES= gettext lua:51 >+USES= gettext lua:51,module > > CVER= 1.15 > LVER= ${PORTVERSION} >diff --git devel/lua-lgi/Makefile devel/lua-lgi/Makefile >index 60e8cc6b9ede..45f55a39f394 100644 >--- devel/lua-lgi/Makefile >+++ devel/lua-lgi/Makefile >@@ -2,10 +2,11 @@ > > PORTNAME= lgi > PORTVERSION= 0.9.2 >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >-MAINTAINER= ports@FreeBSD.org >+MAINTAINER= andrew@tao11.riddles.org.uk > COMMENT= Lua bindings to libraries using GObject-Introspection > > LICENSE= MIT >@@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > USE_GITHUB= yes > GH_ACCOUNT= pavouk > >-USES= gmake gnome lua pkgconfig >+USES= gmake gnome lua:module pkgconfig > USE_GNOME= introspection:build,run > MAKE_ENV= LUA_CFLAGS="-I${LUA_INCDIR}" > MAKE_ARGS= PREFIX="${PREFIX}" LUA_LIBDIR="${LUA_MODLIBDIR}" \ >diff --git devel/lua-libevent/Makefile devel/lua-libevent/Makefile >new file mode 100644 >index 000000000000..279e98df6696 >--- /dev/null >+++ devel/lua-libevent/Makefile >@@ -0,0 +1,45 @@ >+# Created by: Sir l33tname <sirl33tname@gmail.com> >+# $FreeBSD$ >+ >+PORTNAME= libevent >+PORTVERSION= 0.4.6 >+DISTVERSIONPREFIX=v >+PORTREVISION= 2 >+CATEGORIES= devel >+PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >+ >+MAINTAINER= sirl33tname@gmail.com >+COMMENT= Lua libevent binding >+ >+LICENSE= MIT >+ >+LIB_DEPENDS= libevent.so:devel/libevent >+RUN_DEPENDS= ${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} >+ >+USES= gmake pkgconfig lua:51,module >+ >+USE_GITHUB= yes >+GH_ACCOUNT= harningt >+GH_PROJECT= luaevent >+ >+MAKE_ENV+= INSTALL_DIR_LUA=${LUA_MODSHAREDIR} >+MAKE_ENV+= INSTALL_DIR_BIN=${LUA_MODLIBDIR} >+ >+CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` \ >+ `pkgconf --cflags libevent` \ >+ -I${LUA_INCDIR} >+LDFLAGS+= -shared -L${LOCALBASE}/lib \ >+ `pkgconf --libs lua-${LUA_VER}` \ >+ `pkgconf --libs libevent` >+ >+PLIST_FILES= ${LUA_MODLIBDIR}/luaevent/core.so \ >+ ${LUA_MODSHAREDIR}/luaevent.lua >+ >+post-patch: >+ @${REINPLACE_CMD} -e 's/CFLAGS[[:blank:]]*=/CFLAGS\+=/g' ${WRKSRC}/Makefile >+ @${REINPLACE_CMD} -e 's/LDFLAGS[[:blank:]]*=/LDFLAGS\+=/g' ${WRKSRC}/Makefile >+ >+pre-install: >+ ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} >+ >+.include <bsd.port.mk> >diff --git devel/lua-libevent/distinfo devel/lua-libevent/distinfo >new file mode 100644 >index 000000000000..7e93772d6e5a >--- /dev/null >+++ devel/lua-libevent/distinfo >@@ -0,0 +1,3 @@ >+TIMESTAMP = 1546783268 >+SHA256 (harningt-luaevent-v0.4.6_GH0.tar.gz) = dd12babb252115895618c1243557534decde289bf0c255ffebf0dcd14a18705d >+SIZE (harningt-luaevent-v0.4.6_GH0.tar.gz) = 22599 >diff --git devel/lua-libevent/pkg-descr devel/lua-libevent/pkg-descr >new file mode 100644 >index 000000000000..894a8155a802 >--- /dev/null >+++ devel/lua-libevent/pkg-descr >@@ -0,0 +1,5 @@ >+This is a binding of libevent to Lua. It will serve as a drop-in >+replacement for copas, and eventually support more features (async DNS, >+HTTP, RPC...). >+ >+WWW: https://github.com/harningt/luaevent >diff --git devel/lua-lpeg/Makefile devel/lua-lpeg/Makefile >index 0499a3fdb8ca..c4aca9243f9b 100644 >--- devel/lua-lpeg/Makefile >+++ devel/lua-lpeg/Makefile >@@ -2,6 +2,7 @@ > > PORTNAME= lpeg > PORTVERSION= 1.0.2 >+PORTREVISION= 1 > CATEGORIES= devel > MASTER_SITES= http://www.inf.puc-rio.br/~roberto/lpeg/ \ > LOCAL/sunpoet >@@ -12,7 +13,7 @@ COMMENT= PEG-based pattern-matching library for Lua > > LICENSE= MIT > >-USES= lua >+USES= lua:module > > ALL_TARGET= linux > MAKE_ARGS= CC=${CC} LUADIR=${LUA_INCDIR} >diff --git devel/lua-luacheck/Makefile devel/lua-luacheck/Makefile >index 613bba308ad8..ba6b809e3ff7 100644 >--- devel/lua-luacheck/Makefile >+++ devel/lua-luacheck/Makefile >@@ -11,7 +11,7 @@ COMMENT= Linter and static analyzer for lua files > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem >+RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} > > USES= lua > NO_ARCH= yes >diff --git devel/lua-posix/Makefile devel/lua-posix/Makefile >index 9ef85e67ef5c..3c091a405549 100644 >--- devel/lua-posix/Makefile >+++ devel/lua-posix/Makefile >@@ -4,6 +4,7 @@ > PORTNAME= posix > PORTVERSION= 34.1.1 > DISTVERSIONPREFIX= v >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -13,9 +14,9 @@ COMMENT= Lua bindings for POSIX APIs > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > >-RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-normalize>=0:devel/lua-stdlib-normalize >+RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-normalize>=0:devel/lua-stdlib-normalize@${LUA_FLAVOR} > >-USES= lua shebangfix >+USES= lua:module shebangfix > SHEBANG_FILES= build-aux/luke > > USE_GITHUB= yes >diff --git devel/lua-pty/Makefile devel/lua-pty/Makefile >index c5fb2d58e6ee..ab3615a4057c 100644 >--- devel/lua-pty/Makefile >+++ devel/lua-pty/Makefile >@@ -3,6 +3,7 @@ > > PORTNAME= pty > PORTVERSION= 1.25 >+PORTREVISION= 1 > CATEGORIES= devel > MASTER_SITES= https://raw.githubusercontent.com/nuclewall/bsdinstaller/${COMMIT}/src/lib/lua/pty/ \ > https://BSDforge.com/projects/source/devel/lua-pty/ >@@ -13,7 +14,7 @@ DIST_SUBDIR= lua-${PORTNAME}-${COMMIT} > MAINTAINER= portmaster@BSDforge.com > COMMENT= Pty (pseudo-terminal) bindings for Lua 5 > >-USES= lua:51 >+USES= lua:51,module > > COMMIT= 8323bb9 > MAKEFILE= ${FILESDIR}/Makefile >diff --git devel/lua-stdlib-debug/Makefile devel/lua-stdlib-debug/Makefile >index 937ed51c0da2..378b1fe2a5f3 100644 >--- devel/lua-stdlib-debug/Makefile >+++ devel/lua-stdlib-debug/Makefile >@@ -3,6 +3,7 @@ > PORTNAME= stdlib-debug > PORTVERSION= 1.0.1 > DISTVERSIONPREFIX= v >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -13,7 +14,7 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.md > > NO_ARCH= yes >-USES= lua >+USES= lua:module > > USE_GITHUB= yes > GH_ACCOUNT= lua-stdlib >@@ -21,7 +22,7 @@ GH_PROJECT= _debug > > OPTIONS_DEFINE= DOCS > >-DOCSDIR= ${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME} >+DOCSDIR= ${LUA_DOCSDIR} > > do-install: > @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}/std/_debug >diff --git devel/lua-stdlib-normalize/Makefile devel/lua-stdlib-normalize/Makefile >index bdf0cf422d3a..4a58b26e923d 100644 >--- devel/lua-stdlib-normalize/Makefile >+++ devel/lua-stdlib-normalize/Makefile >@@ -3,6 +3,7 @@ > PORTNAME= stdlib-normalize > PORTVERSION= 2.0.2 > DISTVERSIONPREFIX= v >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -12,10 +13,10 @@ COMMENT= Collection of normalized lua functions > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.md > >-RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug >+RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug@${LUA_FLAVOR} > > NO_ARCH= yes >-USES= lua >+USES= lua:module > > USE_GITHUB= yes > GH_ACCOUNT= lua-stdlib >@@ -23,7 +24,7 @@ GH_PROJECT= normalize > > OPTIONS_DEFINE= DOCS > >-DOCSDIR= ${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME} >+DOCSDIR= ${LUA_DOCSDIR} > > do-install: > @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}/std/normalize >diff --git devel/lua-stdlib/Makefile devel/lua-stdlib/Makefile >index dc6111a2a20a..2ae611ec0de9 100644 >--- devel/lua-stdlib/Makefile >+++ devel/lua-stdlib/Makefile >@@ -4,6 +4,7 @@ > PORTNAME= stdlib > PORTVERSION= 41.2.2 > DISTVERSIONPREFIX= release-v >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -13,14 +14,14 @@ COMMENT= Standard Lua Libraries > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/COPYING > >-RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug \ >- ${LUA_PKGNAMEPREFIX}stdlib-normalize>=2.0:devel/lua-stdlib-normalize >+RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}stdlib-debug>=0:devel/lua-stdlib-debug@${LUA_FLAVOR} \ >+ ${LUA_PKGNAMEPREFIX}stdlib-normalize>=2.0:devel/lua-stdlib-normalize@${LUA_FLAVOR} > > OPTIONS_DEFINE= DOCS > >-USES= lua >+USES= lua:module > >-CONFIGURE_ARGS= LUA=${LUA_CMD} >+CONFIGURE_ARGS= --docdir=${DOCSDIR} LUA=${LUA_CMD} > GNU_CONFIGURE= yes > NO_ARCH= yes > >@@ -28,4 +29,6 @@ GH_ACCOUNT= lua-stdlib > GH_PROJECT= lua-stdlib > USE_GITHUB= yes > >+DOCSDIR= ${LUA_DOCSDIR} >+ > .include <bsd.port.mk> >diff --git devel/lua-sysctl/Makefile devel/lua-sysctl/Makefile >index c264ccd95653..3c1b588fee77 100644 >--- devel/lua-sysctl/Makefile >+++ devel/lua-sysctl/Makefile >@@ -3,6 +3,7 @@ > PORTNAME= sysctl > PORTVERSION= 2.0 > DISTVERSIONPREFIX= v >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -11,18 +12,18 @@ COMMENT= Small sysctl(3) interface for lua > > LICENSE= BSD2CLAUSE > >-USES= lua pkgconfig >+USES= lua:52+,module pkgconfig > > USE_GITHUB= yes > GH_ACCOUNT= kAworu > GH_PROJECT= lua-${PORTNAME} > > OPTIONS_DEFINE= DOCS EXAMPLES >-DOCSDIR= ${PREFIX}/share/doc/lua${LUA_VER_STR}/${PORTNAME} >-EXAMPLESDIR= ${PREFIX}/share/examples/lua${LUA_VER_STR}/${PORTNAME} >+DOCSDIR= ${LUA_DOCSDIR} >+EXAMPLESDIR= ${LUA_EXAMPLESDIR} > > post-patch: >- @${REINPLACE_CMD} -e "s/5.1/${LUA_VER}/g" ${WRKSRC}/Makefile >+ @${REINPLACE_CMD} -e "s/5.2/${LUA_VER}/g" ${WRKSRC}/Makefile > > do-install: > @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} >diff --git devel/lua51-bitop/Makefile devel/lua51-bitop/Makefile >deleted file mode 100644 >index 51a5321a1d61..000000000000 >--- devel/lua51-bitop/Makefile >+++ /dev/null >@@ -1,12 +0,0 @@ >-# Created by: lx >-# $FreeBSD$ >- >-COMMENT= lua-bitop for Lua 5.1 >- >-USES= gmake lua:51 >- >-MASTERDIR= ${.CURDIR}/../lua-bitop >- >-PLIST= ${MASTERDIR}/pkg-plist >- >-.include "${MASTERDIR}/Makefile" >diff --git devel/lua51-cjson/Makefile devel/lua51-cjson/Makefile >deleted file mode 100644 >index 4ddab5f192d5..000000000000 >--- devel/lua51-cjson/Makefile >+++ /dev/null >@@ -1,10 +0,0 @@ >-# Created by: osa >-# $FreeBSD$ >- >-COMMENT= Fast JSON parsing and encoding support for Lua 5.1 >- >-MASTERDIR= ${.CURDIR}/../lua-cjson >- >-USES= lua:51 >- >-.include "${MASTERDIR}/Makefile" >diff --git devel/lua51-libevent/Makefile devel/lua51-libevent/Makefile >deleted file mode 100644 >index 52edd60dfb5f..000000000000 >--- devel/lua51-libevent/Makefile >+++ /dev/null >@@ -1,45 +0,0 @@ >-# Created by: Sir l33tname <sirl33tname@gmail.com> >-# $FreeBSD$ >- >-PORTNAME= lua51 >-PORTVERSION= 0.4.6 >-DISTVERSIONPREFIX=v >-PORTREVISION= 1 >-CATEGORIES= devel >-PKGNAMESUFFIX= -libevent >- >-MAINTAINER= sirl33tname@gmail.com >-COMMENT= Lua libevent binding >- >-LICENSE= MIT >- >-LIB_DEPENDS= libevent.so:devel/libevent >-RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51 >- >-USES= gmake pkgconfig lua:51 >- >-USE_GITHUB= yes >-GH_ACCOUNT= harningt >-GH_PROJECT= luaevent >- >-MAKE_ENV+= INSTALL_DIR_LUA=${LUA_MODSHAREDIR} >-MAKE_ENV+= INSTALL_DIR_BIN=${LUA_MODLIBDIR} >- >-CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` \ >- `pkgconf --cflags libevent` \ >- -I${LUA_INCDIR} >-LDFLAGS+= -shared -L${LOCALBASE}/lib \ >- `pkgconf --libs lua-${LUA_VER}` \ >- `pkgconf --libs libevent` >- >-PLIST_FILES= ${LUA_MODLIBDIR}/luaevent/core.so \ >- ${LUA_MODSHAREDIR}/luaevent.lua >- >-post-patch: >- @${REINPLACE_CMD} -e 's/CFLAGS[[:blank:]]*=/CFLAGS\+=/g' ${WRKSRC}/Makefile >- @${REINPLACE_CMD} -e 's/LDFLAGS[[:blank:]]*=/LDFLAGS\+=/g' ${WRKSRC}/Makefile >- >-pre-install: >- ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} >- >-.include <bsd.port.mk> >diff --git devel/lua51-libevent/distinfo devel/lua51-libevent/distinfo >deleted file mode 100644 >index 7e93772d6e5a..000000000000 >--- devel/lua51-libevent/distinfo >+++ /dev/null >@@ -1,3 +0,0 @@ >-TIMESTAMP = 1546783268 >-SHA256 (harningt-luaevent-v0.4.6_GH0.tar.gz) = dd12babb252115895618c1243557534decde289bf0c255ffebf0dcd14a18705d >-SIZE (harningt-luaevent-v0.4.6_GH0.tar.gz) = 22599 >diff --git devel/lua51-libevent/pkg-descr devel/lua51-libevent/pkg-descr >deleted file mode 100644 >index 894a8155a802..000000000000 >--- devel/lua51-libevent/pkg-descr >+++ /dev/null >@@ -1,5 +0,0 @@ >-This is a binding of libevent to Lua. It will serve as a drop-in >-replacement for copas, and eventually support more features (async DNS, >-HTTP, RPC...). >- >-WWW: https://github.com/harningt/luaevent >diff --git devel/luafilesystem-51/Makefile devel/luafilesystem-51/Makefile >deleted file mode 100644 >index dc60e7ed7c81..000000000000 >--- devel/luafilesystem-51/Makefile >+++ /dev/null >@@ -1,13 +0,0 @@ >-# Created by: Nikolai Lifanov >-# $FreeBSD$ >- >-COMMENT= LuaFileSystem for Lua 5.1 >- >-SLAVE_PORT= luafilesystem >- >-USES= lua:51 >- >-MASTERDIR= ${.CURDIR}/../luafilesystem >-PLIST= ${MASTERDIR}/pkg-plist >- >-.include "${MASTERDIR}/Makefile" >diff --git devel/luafilesystem/Makefile devel/luafilesystem/Makefile >index 2306f3d22d74..2e6e5babec81 100644 >--- devel/luafilesystem/Makefile >+++ devel/luafilesystem/Makefile >@@ -4,6 +4,7 @@ > PORTNAME= luafilesystem > DISTVERSIONPREFIX= v > DISTVERSION= 1_7_0 >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -12,7 +13,7 @@ COMMENT= Library to access directory structure and file attributes > > LICENSE= MIT > >-USES?= lua >+USES= lua:module > > USE_GITHUB= yes > GH_ACCOUNT= keplerproject >@@ -26,6 +27,8 @@ MAKE_ARGS+= INCS="-I${LUA_INCDIR}" > > OPTIONS_DEFINE= DOCS > >+DOCSDIR= ${LUA_DOCSDIR} >+ > post-patch: > ${REINPLACE_CMD} -e \ > "s|%%PREFIX%%|${PREFIX}| ; \ >diff --git devel/swig30/Makefile devel/swig30/Makefile >index a964840eb064..eb152d127379 100644 >--- devel/swig30/Makefile >+++ devel/swig30/Makefile >@@ -3,6 +3,7 @@ > > PORTNAME= swig > PORTVERSION= 3.0.12 >+PORTREVISION= 1 > CATEGORIES= devel > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} > PKGNAMESUFFIX= 30 >@@ -25,7 +26,7 @@ CONFIGURE_ARGS= --program-suffix=${PORTVERSION:R} \ > --with-lualib=${LUA_LIBDIR} > GNU_CONFIGURE= yes > TEST_TARGET= check >-USES= gmake lua >+USES= gmake lua:build > > PLIST_SUB= PORTVERSION=${PORTVERSION} > >diff --git dns/knot-resolver/Makefile dns/knot-resolver/Makefile >index ffc1cf877933..6f6a81c04952 100644 >--- dns/knot-resolver/Makefile >+++ dns/knot-resolver/Makefile >@@ -96,8 +96,8 @@ DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ > > TRUSTANCHOR_DESC= Trust anchor bootstrapping and stats > TRUSTANCHOR_USES= lua >-TRUSTANCHOR_BUILD_DEPENDS= ${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket \ >- ${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec >+TRUSTANCHOR_BUILD_DEPENDS= ${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket@${LUA_FLAVOR} \ >+ ${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec@${LUA_FLAVOR} > > .include <bsd.port.options.mk> > >diff --git editors/fxite/Makefile editors/fxite/Makefile >index 1d43994b548a..27e85c0c4e80 100644 >--- editors/fxite/Makefile >+++ editors/fxite/Makefile >@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING > USE_GITHUB= yes > GH_ACCOUNT= yetanothergeek > >-USES= autoreconf desktop-file-utils gettext gmake lua pkgconfig >+USES= autoreconf desktop-file-utils gettext gmake lua:52 pkgconfig > GNU_CONFIGURE= yes > CONFIGURE_ARGS= --with-system-lua \ > --with-lua-pkg=lua-${LUA_VER} >diff --git editors/mle/Makefile editors/mle/Makefile >index 51724702d848..993fba71cef8 100644 >--- editors/mle/Makefile >+++ editors/mle/Makefile >@@ -13,15 +13,14 @@ LICENSE= APACHE20 > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash >-LIB_DEPENDS= liblua-5.3.so:lang/lua53 \ >- libpcre.so:devel/pcre \ >+LIB_DEPENDS= libpcre.so:devel/pcre \ > libtermbox.so:devel/termbox > TEST_DEPENDS= ${LOCALBASE}/bin/gpaste:sysutils/coreutils \ > ${LOCALBASE}/bin/grep:textproc/gnugrep \ > bash:shells/bash \ > gfind:misc/findutils > >-USES= compiler:c11 gmake localbase:ldflags shebangfix >+USES= compiler:c11 gmake localbase:ldflags shebangfix lua:53 > SHEBANG_FILES= tests/func/*.sh tests/run.sh > USE_GITHUB= yes > GH_ACCOUNT= adsr >diff --git editors/neovim/Makefile editors/neovim/Makefile >index 7ff954543b13..6c83414a34a0 100644 >--- editors/neovim/Makefile >+++ editors/neovim/Makefile >@@ -12,8 +12,8 @@ COMMENT= Next-generation Vim > LICENSE= APACHE20 > > BUILD_DEPENDS= gperf:devel/gperf \ >- ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop \ >- ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg >+ ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} \ >+ ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} > LIB_DEPENDS= libluv.so:devel/luv \ > libmsgpackc.so:devel/msgpack \ > libtermkey.so:devel/libtermkey \ >diff --git editors/wordgrinder/Makefile editors/wordgrinder/Makefile >index 254f599dc92c..bf77fee7e0ff 100644 >--- editors/wordgrinder/Makefile >+++ editors/wordgrinder/Makefile >@@ -8,7 +8,7 @@ CATEGORIES= editors > MAINTAINER= vmagerya@gmail.com > COMMENT= Simple Unicode-aware console and X11-based word processor > >-RUN_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem >+RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} > > USE_GITHUB= yes > GH_ACCOUNT= davidgiven >diff --git finance/moneymanagerex/Makefile finance/moneymanagerex/Makefile >index 1046865c7397..885e197870de 100644 >--- finance/moneymanagerex/Makefile >+++ finance/moneymanagerex/Makefile >@@ -29,7 +29,7 @@ GH_TUPLE= Regaddi:Chart.js:f13f99b:chart_js/3rd/Chart.js \ > moneymanagerex:ctpp:20158e0:ctpp/3rd/ctpp \ > moneymanagerex:mongoose:97583a6:mongoose/3rd/mongoose > >-USES= autoreconf compiler:c++11-lib gettext gmake gnome lua pkgconfig >+USES= autoreconf compiler:c++11-lib gettext gmake gnome lua:52 pkgconfig > GNU_CONFIGURE= yes > USE_WX= 3.0 > WX_CONF_ARGS= absolute >diff --git games/corsix-th/Makefile games/corsix-th/Makefile >index 062c1536379e..9db04297dfec 100644 >--- games/corsix-th/Makefile >+++ games/corsix-th/Makefile >@@ -13,8 +13,8 @@ COMMENT= Open source clone of Theme Hospital > LICENSE= MIT > > LIB_DEPENDS= libfreetype.so:print/freetype2 >-RUN_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem \ >- ${LUA_MODLIBDIR}/lpeg.so:devel/lua-lpeg >+RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} \ >+ ${LUA_REFMODLIBDIR}/lpeg.so:devel/lua-lpeg@${LUA_FLAVOR} > > USES= cmake:insource compiler:c++11-lib desktop-file-utils dos2unix \ > iconv lua pkgconfig sdl >diff --git graphics/lua-gd/Makefile graphics/lua-gd/Makefile >index 2ce86afc99c8..6836827fb6da 100644 >--- graphics/lua-gd/Makefile >+++ graphics/lua-gd/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= lua-gd > PORTVERSION= 2.0.33r2 >-PORTREVISION= 3 >+PORTREVISION= 4 > CATEGORIES= graphics > MASTER_SITES= http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}forLua5.1/ > >@@ -16,11 +16,14 @@ LIB_DEPENDS= libgd.so:graphics/gd > > OPTIONS_DEFINE= DOCS EXAMPLES > >-USES= lua:51 >+USES= lua:51,module > CFLAGS+= -I${LUA_INCDIR} -I${LOCALBASE}/include > LDFLAGS+= -shared -L${LOCALBASE}/lib -lgd -L${LUA_LIBDIR} -llua-${LUA_VER} -lm > GDFEATURES= `gdlib-config --features |sed -e "s/GD_/-DGD_/g"` > >+DOCSDIR= ${LUA_DOCSDIR} >+EXAMPLESDIR= ${LUA_EXAMPLESDIR} >+ > .include <bsd.port.options.mk> > > CFLAGS_aarch64+=-fPIC >@@ -30,8 +33,6 @@ CFLAGS_i386+= -fPIC > do-build: > ${CC} -o ${WRKSRC}/gd.so ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${GDFEATURES} ${WRKSRC}/luagd.c > >-LUA_MODLIBDIR= ${PREFIX}/lib/lua/${LUA_VER} >- > do-install: > ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} > ${INSTALL_PROGRAM} ${WRKSRC}/gd.so ${STAGEDIR}${LUA_MODLIBDIR} >diff --git lang/lua-ada/Makefile lang/lua-ada/Makefile >index 8cec85bf80e3..33c3eb7c2473 100644 >--- lang/lua-ada/Makefile >+++ lang/lua-ada/Makefile >@@ -15,7 +15,7 @@ LICENSE_COMB= multi > > BUILD_DEPENDS= gprbuild:devel/gprbuild > >-USES= ada lua >+USES= ada lua:52 > USE_GITHUB= yes > GH_ACCOUNT= AdaCore > GH_PROJECT= ada-lua >diff --git lang/lua51/Makefile lang/lua51/Makefile >index 013892af4dc2..381b22d7906c 100644 >--- lang/lua51/Makefile >+++ lang/lua51/Makefile >@@ -13,8 +13,7 @@ COMMENT= Small, compilable scripting language providing easy access to C code > > LICENSE= MIT > >-USES= libedit >-LUA_VER= 5.1 >+USES= libedit lua:core,51 > USE_LDCONFIG= yes > > # Overriding __MAKE_CONF makes sure that we don't re-parse >@@ -24,6 +23,7 @@ USE_LDCONFIG= yes > # have its settings when we get here. > # See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt > MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} >+ > # liblua.so requires libm, so make sure it has an explicit dependency > # so that applications need not second-guess lua's dependencies. > CPPFLAGS+= -I${LOCALBASE}/include >@@ -44,14 +44,6 @@ MAKE_ARGS+= MYCFLAGS="${CFLAGS} ${CPPFLAGS} -DLUA_USE_LINUX" \ > INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua51 \ > INSTALL_EXEC="${INSTALL_PROGRAM}" > >-# Cope with the lack of support for Lua 5.2 in bsd.lua.mk. These >-# overrides, which are required below, should be removed once bsd.lua.mk >-# understands this lua version. >-LUA_PREFIX?= ${PREFIX} >-LUA_SUBDIR?= lua${PKGNAMESUFFIX} >-LUA_INCDIR?= ${LUA_PREFIX}/include/${LUA_SUBDIR} >-LUA_LIBDIR?= ${LUA_PREFIX}/lib >- > CFLAGS+= -fPIC > > post-patch: >diff --git lang/lua52/Makefile lang/lua52/Makefile >index 8349a4b7f151..7fc3c2b0d589 100644 >--- lang/lua52/Makefile >+++ lang/lua52/Makefile >@@ -12,8 +12,7 @@ COMMENT= Small, compilable scripting language providing easy access to C code > > LICENSE= MIT > >-USES= libedit >-LUA_VER= 5.2 >+USES= libedit lua:core,52 > USE_LDCONFIG= yes > > # Overriding __MAKE_CONF makes sure that we don't re-parse >@@ -23,6 +22,7 @@ USE_LDCONFIG= yes > # have its settings when we get here. > # See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt > MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} >+ > # liblua.so requires libm, so make sure it has an explicit dependency > # so that applications need not second-guess lua's dependencies. > CPPFLAGS+= -I${LOCALBASE}/include >@@ -43,14 +43,6 @@ MAKE_ARGS+= MYCFLAGS="${CFLAGS} ${CPPFLAGS} -DLUA_USE_LINUX" \ > INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua52 \ > INSTALL_EXEC="${INSTALL_PROGRAM}" > >-# Cope with the lack of support for Lua 5.2 in bsd.lua.mk. These >-# overrides, which are required below, should be removed once bsd.lua.mk >-# understands this lua version. >-LUA_PREFIX?= ${PREFIX} >-LUA_SUBDIR?= lua${PKGNAMESUFFIX} >-LUA_INCDIR?= ${LUA_PREFIX}/include/${LUA_SUBDIR} >-LUA_LIBDIR?= ${LUA_PREFIX}/lib >- > SUB_FILES= lua-${LUA_VER}.pc > SUB_LIST= version=${PORTVERSION} \ > includedir=${LUA_INCDIR} \ >diff --git lang/lua53/Makefile lang/lua53/Makefile >index c9761f157d06..059f03f3e5cf 100644 >--- lang/lua53/Makefile >+++ lang/lua53/Makefile >@@ -13,7 +13,7 @@ COMMENT= Powerful, efficient, lightweight, embeddable scripting language > > LICENSE= MIT > >-LUA_VER= 5.3 >+USES= lua:core,53 > USE_LDCONFIG= yes > > # Overriding __MAKE_CONF makes sure that we don't re-parse >@@ -32,18 +32,10 @@ BUILD_WRKSRC= ${WRKSRC}/src > # We put the docs for Lua proper in a lua/ subdir of the version subdir > # so that ports for Lua modules can use the version subdir too without > # making a mess. >-DOCSDIR= ${PREFIX}/share/doc/lua${PKGNAMESUFFIX}/lua >+DOCSDIR= ${LUA_DOCSDIR} > PORTDOCS= * > BUILD_WRKDOC= ${WRKSRC}/doc > >-LUA_PREFIX= ${PREFIX} >- >-# 2018-03-17: AG - These should match lua.mk, but we can't include that here >-LUA_CMD= lua${PKGNAMESUFFIX} >-LUAC_CMD= luac${PKGNAMESUFFIX} >-LUA_INCDIR= ${LUA_PREFIX}/include/lua${PKGNAMESUFFIX} >-LUA_LIBDIR= ${LUA_PREFIX}/lib >- > LUA_LIB_STATIC= liblua-${LUA_VER}.a > LUA_LIB_SHARED= liblua-${LUA_VER}.so > LUA_PC_FILE= lua-${LUA_VER}.pc >diff --git math/plplot/Makefile math/plplot/Makefile >index 9b9c7b2b601c..4b8846886893 100644 >--- math/plplot/Makefile >+++ math/plplot/Makefile >@@ -3,6 +3,7 @@ > > PORTNAME= plplot > DISTVERSION= 5.15.0 >+PORTREVISION= 1 > CATEGORIES= math science > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source > >@@ -73,6 +74,7 @@ GD_USES= jpeg > GD_CMAKE_BOOL= PLD_png > > LUA_USES= lua >+LUA_BUILD_DEPENDS= swig3.0:devel/swig30 > LUA_CMAKE_BOOL= ENABLE_lua > LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" > >diff --git multimedia/libquvi-scripts09/Makefile multimedia/libquvi-scripts09/Makefile >index 3050b1bf5ac0..1943fcac022e 100644 >--- multimedia/libquvi-scripts09/Makefile >+++ multimedia/libquvi-scripts09/Makefile >@@ -15,10 +15,10 @@ COMMENT= Embedded lua scripts for libquvi and utility scripts > LICENSE= AGPLv3 > LICENSE_FILE= ${WRKSRC}/COPYING > >-RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}bitop>=1.0.1:devel/lua-bitop \ >- ${LUA_PKGNAMEPREFIX}luaexpat>=1.2.0:textproc/luaexpat \ >- ${LUA_PKGNAMEPREFIX}json>=1.1.1:converters/lua-json \ >- ${LUA_PKGNAMEPREFIX}luasocket>=2.0.2:net/luasocket >+RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}bitop>=1.0.1:devel/lua-bitop@${LUA_FLAVOR} \ >+ ${LUA_PKGNAMEPREFIX}luaexpat>=1.2.0:textproc/luaexpat@${LUA_FLAVOR} \ >+ ${LUA_PKGNAMEPREFIX}json>=1.1.1:converters/lua-json@${LUA_FLAVOR} \ >+ ${LUA_PKGNAMEPREFIX}luasocket>=2.0.2:net/luasocket@${LUA_FLAVOR} > > OPTIONS_DEFINE= NSFW > OPTIONS_SUB= yes >diff --git net-im/prosody/Makefile net-im/prosody/Makefile >index 204ff2f3d3b4..7bad326ce165 100644 >--- net-im/prosody/Makefile >+++ net-im/prosody/Makefile >@@ -12,11 +12,11 @@ COMMENT= Simple extensible XMPP server written in Lua > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/COPYING > >-RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket \ >- ${LUA_MODLIBDIR}/ssl.so:security/luasec \ >- ${LUA_MODLIBDIR}/lxp.so:textproc/luaexpat \ >- ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem \ >- ${LUA_MODLIBDIR}/bit.so:devel/lua-bitop >+RUN_DEPENDS= ${LUA_REFMODLIBDIR}/socket/core.so:net/luasocket@${LUA_FLAVOR} \ >+ ${LUA_REFMODLIBDIR}/ssl.so:security/luasec@${LUA_FLAVOR} \ >+ ${LUA_REFMODLIBDIR}/lxp.so:textproc/luaexpat@${LUA_FLAVOR} \ >+ ${LUA_REFMODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} \ >+ ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} > LIB_DEPENDS= libidn.so:dns/libidn > > USES= compiler:c11 cpe gmake lua:52 ssl >diff --git net/Makefile net/Makefile >index d21e34437448..b4490832486b 100644 >--- net/Makefile >+++ net/Makefile >@@ -428,10 +428,7 @@ > SUBDIR += lla > SUBDIR += ltm > SUBDIR += lualdap >- SUBDIR += lualdap-51 > SUBDIR += luasocket >- SUBDIR += luasocket-51 >- SUBDIR += luasocket-53 > SUBDIR += lvwimax > SUBDIR += mDNSResponder > SUBDIR += macchanger >diff --git net/freeswitch/Makefile net/freeswitch/Makefile >index 12b1ad52bade..f32433f35388 100644 >--- net/freeswitch/Makefile >+++ net/freeswitch/Makefile >@@ -29,7 +29,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3 \ > libjbig.so:graphics/jbigkit \ > libtiff.so:graphics/tiff > >-USES= gmake iconv jpeg libedit libtool lua perl5 pkgconfig shebangfix ssl tar:xz >+USES= gmake iconv jpeg libedit libtool lua:51-52 perl5 pkgconfig shebangfix ssl tar:xz > USE_LDCONFIG= yes > USE_RC_SUBR= freeswitch > >diff --git net/lualdap-51/Makefile net/lualdap-51/Makefile >deleted file mode 100644 >index 68e74a0e0ee6..000000000000 >--- net/lualdap-51/Makefile >+++ /dev/null >@@ -1,9 +0,0 @@ >-# $FreeBSD$ >- >-USES= gmake lua:51 >- >-MASTERDIR= ${.CURDIR}/../lualdap >- >-.include "${MASTERDIR}/Makefile" >- >-COMMENT+= (version 5.1) >diff --git net/lualdap/Makefile net/lualdap/Makefile >index 99f995a087cf..45169564c410 100644 >--- net/lualdap/Makefile >+++ net/lualdap/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= lualdap > PORTVERSION= 1.1.0 >-PORTREVISION= 2 >+PORTREVISION= 3 > CATEGORIES= net > MASTER_SITES= http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/LuaLDAP${PORTVERSION}/ > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > MAINTAINER= pf@itwf.pl > COMMENT= LDAP support for the Lua language > >-USES?= gmake lua >+USES= gmake lua:-52,module > USE_OPENLDAP= yes > > # the CPPFLAGS fixes builds where PREFIX != LOCALBASE >@@ -26,6 +26,8 @@ ALL_TARGET= > > OPTIONS_DEFINE= DOCS > >+DOCSDIR= ${LUA_DOCSDIR} >+ > do-install: > @${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} > ${INSTALL_PROGRAM} ${WRKSRC}/src/lualdap.so.${PORTVERSION} ${STAGEDIR}${LUA_MODLIBDIR}/${PORTNAME}.so >diff --git net/luasocket-51/Makefile net/luasocket-51/Makefile >deleted file mode 100644 >index 90974322502f..000000000000 >--- net/luasocket-51/Makefile >+++ /dev/null >@@ -1,13 +0,0 @@ >-# Created by: Jan Hornyak <pav@oook.cz> >-# $FreeBSD$ >- >-SLAVE_PORT= luasocket >- >-USES= gmake lua:51 pkgconfig >- >-MASTERDIR= ${.CURDIR}/../luasocket >-PLIST= ${MASTERDIR}/pkg-plist >- >-.include "${MASTERDIR}/Makefile" >- >-COMMENT+= (version 5.1) >diff --git net/luasocket-53/Makefile net/luasocket-53/Makefile >deleted file mode 100644 >index 6024bee98ef2..000000000000 >--- net/luasocket-53/Makefile >+++ /dev/null >@@ -1,13 +0,0 @@ >-# Created by: Jan Hornyak <pav@oook.cz> >-# $FreeBSD$ >- >-SLAVE_PORT= luasocket >- >-USES= gmake lua:53 pkgconfig >- >-MASTERDIR= ${.CURDIR}/../luasocket >-PLIST= ${MASTERDIR}/pkg-plist >- >-.include "${MASTERDIR}/Makefile" >- >-COMMENT+= (version 5.3) >diff --git net/luasocket/Makefile net/luasocket/Makefile >index 8c24a0c54a27..9a6e3a9ebc0c 100644 >--- net/luasocket/Makefile >+++ net/luasocket/Makefile >@@ -4,7 +4,7 @@ > PORTNAME= luasocket > DISTVERSIONPREFIX= v > DISTVERSION= 3.0-rc1 >-PORTREVISION= 4 >+PORTREVISION= 5 > PORTEPOCH= 1 > CATEGORIES= net > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} >@@ -19,7 +19,7 @@ USE_GITHUB= yes > GH_ACCOUNT= diegonehab > > MAKE_ARGS= LUAV=${LUA_VER} >-USES?= gmake lua pkgconfig >+USES= gmake lua:module pkgconfig > INSTALL_TARGET= install-unix > > CFLAGS+= `pkgconf --cflags lua-${LUA_VER}` \ >@@ -28,6 +28,8 @@ LDFLAGS+= -shared `pkgconf --libs lua-${LUA_VER}` > > OPTIONS_DEFINE= DOCS > >+DOCSDIR= ${LUA_DOCSDIR} >+ > post-extract: > @${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile > @${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/Makefile >diff --git net/wireshark/Makefile net/wireshark/Makefile >index e89b12d40da8..54ed66a98923 100644 >--- net/wireshark/Makefile >+++ net/wireshark/Makefile >@@ -84,7 +84,7 @@ CISCODUMP_DESC= Build ciscodump extcap tool > GUI_USES= qt:5 > GUI_USE= qt=core,gui,multimedia,widgets,printsupport,svg,buildtools_build,linguisttools_build,qmake_build > >-LUA_USES= lua:5[1-2] >+LUA_USES= lua:51-52 > GSSAPI_BASE_USES= gssapi > GSSAPI_HEIMDAL_USES= gssapi:heimdal > GSSAPI_MIT_USES= gssapi:mit >diff --git security/Makefile security/Makefile >index c37fa235bded..5f1b99aa89fa 100644 >--- security/Makefile >+++ security/Makefile >@@ -334,7 +334,6 @@ > SUBDIR += logcheck > SUBDIR += lua-bcrypt > SUBDIR += luasec >- SUBDIR += luasec-51 > SUBDIR += lxqt-openssh-askpass > SUBDIR += lxqt-sudo > SUBDIR += lynis >diff --git security/cardpeek/Makefile security/cardpeek/Makefile >index 4395aff15959..396c5df7ec78 100644 >--- security/cardpeek/Makefile >+++ security/cardpeek/Makefile >@@ -15,7 +15,7 @@ LIB_DEPENDS= libpcsclite.so:devel/pcsc-lite \ > libcurl.so:ftp/curl > RUN_DEPENDS= pcscd:devel/pcsc-lite > >-USES= gnome iconv localbase lua pkgconfig >+USES= gnome iconv localbase lua:52 pkgconfig > USE_GNOME= gtk30 > GNU_CONFIGURE= yes > INSTALLS_ICONS= yes >diff --git security/lua-bcrypt/Makefile security/lua-bcrypt/Makefile >index f62cf838140e..2a3aa307f63f 100644 >--- security/lua-bcrypt/Makefile >+++ security/lua-bcrypt/Makefile >@@ -3,7 +3,7 @@ > PORTNAME= bcrypt > DISTVERSIONPREFIX= v > DISTVERSION= 2.1-4 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= security > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -12,7 +12,7 @@ COMMENT= Library providing OpenBSD's bcrypt hash function for Lua > > LICENSE= ISCL > >-USES= compiler:c11 gmake lua >+USES= compiler:c11 gmake lua:module > > USE_GITHUB= yes > GH_ACCOUNT= mikejsavage >diff --git security/luasec-51/Makefile security/luasec-51/Makefile >deleted file mode 100644 >index 89009ec2cdbd..000000000000 >--- security/luasec-51/Makefile >+++ /dev/null >@@ -1,13 +0,0 @@ >-# Created by: Andrew Lewis <freeghb@gmail.com> >-# $FreeBSD$ >- >-COMMENT= LuaSec for Lua 5.1 >- >-SLAVE_PORT= luasec >- >-USES= lua:51 ssl >- >-MASTERDIR= ${.CURDIR}/../luasec >-PLIST= ${MASTERDIR}/pkg-plist >- >-.include "${MASTERDIR}/Makefile" >diff --git security/luasec/Makefile security/luasec/Makefile >index 95744314ea14..d676711a9b12 100644 >--- security/luasec/Makefile >+++ security/luasec/Makefile >@@ -4,6 +4,7 @@ > PORTNAME= luasec > PORTVERSION= 0.9 > DISTVERSIONPREFIX= v >+PORTREVISION= 1 > CATEGORIES= security > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -13,7 +14,7 @@ COMMENT= Lua binding for the OpenSSL library to provide TLS/SSL communication > LICENSE= MIT > > .if !defined(SLAVE_PORT) >-USES= lua ssl >+USES= lua:module ssl > .endif > > USE_GITHUB= yes >diff --git textproc/Makefile textproc/Makefile >index c40462d50cbf..73b819810400 100644 >--- textproc/Makefile >+++ textproc/Makefile >@@ -415,7 +415,6 @@ > SUBDIR += ltxml > SUBDIR += lua-lyaml > SUBDIR += luaexpat >- SUBDIR += luaexpat-51 > SUBDIR += lucene > SUBDIR += lucene4 > SUBDIR += lucene5 >diff --git textproc/lua-lyaml/Makefile textproc/lua-lyaml/Makefile >index 1d8b1bf9184f..4e657cba429c 100644 >--- textproc/lua-lyaml/Makefile >+++ textproc/lua-lyaml/Makefile >@@ -4,6 +4,7 @@ > PORTNAME= lyaml > PORTVERSION= 6.2.4 > DISTVERSIONPREFIX=v >+PORTREVISION= 1 > CATEGORIES= textproc > PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} > >@@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > LIB_DEPENDS= libyaml.so:textproc/libyaml > >-USES= lua >+USES= lua:module > > USE_GITHUB= yes > GH_ACCOUNT= gvvaughan >diff --git textproc/luaexpat-51/Makefile textproc/luaexpat-51/Makefile >deleted file mode 100644 >index 229b4433ea3f..000000000000 >--- textproc/luaexpat-51/Makefile >+++ /dev/null >@@ -1,6 +0,0 @@ >-# $FreeBSD$ >- >-MASTERDIR= ${.CURDIR}/../luaexpat >-USES= lua:51 >- >-.include "${MASTERDIR}/Makefile" >diff --git textproc/luaexpat/Makefile textproc/luaexpat/Makefile >index ee4319ddb1d1..1e9797ef3c95 100644 >--- textproc/luaexpat/Makefile >+++ textproc/luaexpat/Makefile >@@ -3,7 +3,7 @@ > > PORTNAME= luaexpat > PORTVERSION= 1.3.0 >-PORTREVISION= 4 >+PORTREVISION= 5 > CATEGORIES= textproc > MASTER_SITES= http://matthewwild.co.uk/projects/luaexpat/ \ > http://redundancy.redundancy.org/mirror/ >@@ -16,7 +16,7 @@ LICENSE= MIT > > LIB_DEPENDS= libexpat.so:textproc/expat2 > >-USES?= lua >+USES= lua:module > USES+= gmake > ALL_TARGET= lib > >diff --git www/luakit/Makefile www/luakit/Makefile >index df6982f32897..071aa4ac8ea7 100644 >--- www/luakit/Makefile >+++ www/luakit/Makefile >@@ -16,13 +16,13 @@ NOT_FOR_ARCHS= sparc64 > NOT_FOR_ARCHS_REASON_sparc64= Does not install on sparc64 > > BUILD_DEPENDS= help2man:misc/help2man \ >- ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem-51 >+ ${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem@${LUA_FLAVOR} > LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ > libsoup-2.4.so:devel/libsoup \ > libfreetype.so:print/freetype2 \ > libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ > libfontconfig.so:x11-fonts/fontconfig >-RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem-51 >+RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}luafilesystem>=0:devel/luafilesystem@${LUA_FLAVOR} > > USES= compiler:c++11-lang desktop-file-utils gettext-runtime gmake \ > gnome lua:51 pkgconfig sqlite >diff --git www/volta/Makefile www/volta/Makefile >index b7a0633dda4c..4fa87aa83b47 100644 >--- www/volta/Makefile >+++ www/volta/Makefile >@@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE > > LIB_DEPENDS= libcdb.so:databases/tinycdb > >-USES= gmake pkgconfig lua tar:tgz >+USES= gmake pkgconfig lua:52 tar:tgz > ALL_TARGET= ${PORTNAME} > > CFLAGS+= -I${PREFIX}/include >diff --git x11-wm/awesome/Makefile x11-wm/awesome/Makefile >index 6cd740ee1cbc..9d031d287a70 100644 >--- x11-wm/awesome/Makefile >+++ x11-wm/awesome/Makefile >@@ -15,8 +15,8 @@ LICENSE= GPLv2+ > LICENSE_FILE= ${WRKSRC}/LICENSE > > BUILD_DEPENDS= convert:graphics/ImageMagick6 \ >- ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi >-RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \ >+ ${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR} >+RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR} \ > bash:shells/bash > LIB_DEPENDS= libcairo.so:graphics/cairo \ > libstartup-notification-1.so:x11/startup-notification \
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 245038
:
212684
|
212718
|
213083
| 213275