Index: lua-luarocks/Makefile =================================================================== --- lua-luarocks/Makefile +++ lua-luarocks/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= luarocks -DISTVERSION= 3.0.1 +DISTVERSION= 3.2.1 CATEGORIES= devel MASTER_SITES= https://${PORTNAME}.github.io/${PORTNAME}/releases/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} @@ -12,10 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= zip:archivers/zip \ - curl:ftp/curl +RUN_DEPENDS= curl:ftp/curl -USES= gmake uniquefiles +USES= gmake uniquefiles +#lua:53 NO_ARCH= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ @@ -24,8 +24,21 @@ UNIQUE_SUFFIX= -${LUA_VER} UNIQUE_SUFFIX_FILES= bin/${PORTNAME} bin/${PORTNAME}-admin -OPTIONS_DEFINE= LUAJIT +OPTIONS_SINGLE= LUAVERSIONGRP +OPTIONS_SINGLE_LUAVERSIONGRP= LUA54 LUA53 LUA52 LUA51 LUAJIT + +LUAVERSIONGRP_DESC= Lua implementations by API LUAJIT_DESC= Use LuaJIT instead of Lua +LUA54_DESC= Lua 5.4 (Latest) +LUA53_DESC= Lua 5.3 +LUA52_DESC= Lua 5.2 +LUA51_DESC= Lua 5.1 + +LUA54_USES+= lua:54 +LUA53_USES+= lua:53 +LUA52_USES+= lua:52 +LUA51_USES+= lua:51 + LUAJIT_BUILD_DEPENDS= luajit:lang/luajit LUAJIT_RUN_DEPENDS= luajit:lang/luajit LUAJIT_CONFIGURE_ON= --lua-suffix=jit Index: lua-luarocks/distinfo =================================================================== --- lua-luarocks/distinfo +++ lua-luarocks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534264242 -SHA256 (luarocks-3.0.1.tar.gz) = b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0 -SIZE (luarocks-3.0.1.tar.gz) = 205787 +TIMESTAMP = 1571287712 +SHA256 (luarocks-3.2.1.tar.gz) = f27e20c9cdb3ffb991ccdb85796c36a0690566676f8e1a59b0d0ee6598907d04 +SIZE (luarocks-3.2.1.tar.gz) = 232149 Index: lua-luarocks/files/patch-src_luarocks_core_cfg.lua =================================================================== --- lua-luarocks/files/patch-src_luarocks_core_cfg.lua +++ lua-luarocks/files/patch-src_luarocks_core_cfg.lua @@ -3,9 +3,9 @@ - Prefer system compiler over GCC on BSDs/Solaris - OpenBSD uses Clang by default, so don't pass GCC RPATH ---- src/luarocks/core/cfg.lua.orig 2018-08-14 16:30:42 UTC +--- src/luarocks/core/cfg.lua.orig 2019-09-05 19:23:34 UTC +++ src/luarocks/core/cfg.lua -@@ -35,6 +35,7 @@ local platform_order = { +@@ -36,6 +36,7 @@ local platform_order = { "netbsd", "openbsd", "freebsd", @@ -13,20 +13,26 @@ "linux", "macosx", "cygwin", -@@ -154,6 +155,7 @@ end - local function make_platforms(system) - if system then - if system == "Linux" then return { unix = true, linux = true } -+ elseif system == "DragonFly" then return { unix = true, bsd = true, dragonfly = true } - elseif system == "FreeBSD" then return { unix = true, bsd = true, freebsd = true } - elseif system == "OpenBSD" then return { unix = true, bsd = true, openbsd = true } - elseif system == "NetBSD" then return { unix = true, bsd = true, netbsd = true } -@@ -357,13 +359,13 @@ local function make_defaults(lua_version, target_cpu, - defaults.external_lib_extension = "so" - defaults.obj_extension = "o" - defaults.external_deps_dirs = { "/usr/local", "/usr", "/" } +@@ -158,6 +159,7 @@ end + local platform_sets = { + freebsd = { unix = true, bsd = true, freebsd = true }, + openbsd = { unix = true, bsd = true, openbsd = true }, ++ dragonflybsd = { unix = true, bsd = true, dragonfly = true }, + solaris = { unix = true, solaris = true }, + windows = { windows = true, win32 = true }, + cygwin = { unix = true, cygwin = true }, +@@ -341,7 +343,7 @@ local function make_defaults(lua_version, target_cpu, + defaults.variables.LD = "mingw32-gcc" + defaults.variables.AR = "ar" + defaults.variables.RANLIB = "ranlib" - defaults.variables.CFLAGS = "-O2" + defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" + defaults.variables.LIBFLAG = "-shared" + defaults.makefile = "Makefile" + defaults.external_deps_patterns = { +@@ -367,10 +369,11 @@ local function make_defaults(lua_version, target_cpu, + defaults.external_deps_dirs = { "/usr/local", "/usr", "/" } + defaults.variables.CFLAGS = "-O2" defaults.cmake_generator = "Unix Makefiles" - defaults.variables.CC = "gcc" - defaults.variables.LD = "gcc" @@ -35,12 +41,11 @@ + defaults.variables.LD = os.getenv("CC") or defaults.variables.CC defaults.gcc_rpath = true - defaults.variables.LIBFLAG = "-shared" -- + defaults.variables.LIBFLAG = (os.getenv("LDFLAGS") or "").." -shared" + defaults.variables.TEST = "test" + defaults.external_deps_patterns = { - bin = { "?" }, - lib = { "lib?.a", "lib?.so", "lib?.so.*" }, -@@ -449,15 +451,18 @@ local function make_defaults(lua_version, target_cpu, +@@ -454,15 +457,18 @@ local function make_defaults(lua_version, target_cpu, end end Index: lua-luarocks/pkg-plist =================================================================== --- lua-luarocks/pkg-plist +++ lua-luarocks/pkg-plist @@ -1,6 +1,6 @@ -bin/luarocks -bin/luarocks-admin -@sample %%ETCDIR%%/config-%%LUA_VER%%.lua.sample +bin/luarocks-%%LUA_VER%% +bin/luarocks-admin-%%LUA_VER%% +%%ETCDIR%%/config-%%LUA_VER%%.lua.sample %%LUA_MODSHAREDIR%%/luarocks/admin/cache.lua %%LUA_MODSHAREDIR%%/luarocks/admin/cmd/add.lua %%LUA_MODSHAREDIR%%/luarocks/admin/cmd/make_manifest.lua @@ -7,6 +7,7 @@ %%LUA_MODSHAREDIR%%/luarocks/admin/cmd/refresh_cache.lua %%LUA_MODSHAREDIR%%/luarocks/admin/cmd/remove.lua %%LUA_MODSHAREDIR%%/luarocks/admin/index.lua +%%LUA_MODSHAREDIR%%/luarocks/argparse.lua %%LUA_MODSHAREDIR%%/luarocks/build.lua %%LUA_MODSHAREDIR%%/luarocks/build/builtin.lua %%LUA_MODSHAREDIR%%/luarocks/build/cmake.lua @@ -17,7 +18,6 @@ %%LUA_MODSHAREDIR%%/luarocks/cmd/config.lua %%LUA_MODSHAREDIR%%/luarocks/cmd/doc.lua %%LUA_MODSHAREDIR%%/luarocks/cmd/download.lua -%%LUA_MODSHAREDIR%%/luarocks/cmd/help.lua %%LUA_MODSHAREDIR%%/luarocks/cmd/init.lua %%LUA_MODSHAREDIR%%/luarocks/cmd/install.lua %%LUA_MODSHAREDIR%%/luarocks/cmd/lint.lua @@ -40,6 +40,7 @@ %%LUA_MODSHAREDIR%%/luarocks/core/manif.lua %%LUA_MODSHAREDIR%%/luarocks/core/path.lua %%LUA_MODSHAREDIR%%/luarocks/core/persist.lua +%%LUA_MODSHAREDIR%%/luarocks/core/sysdetect.lua %%LUA_MODSHAREDIR%%/luarocks/core/util.lua %%LUA_MODSHAREDIR%%/luarocks/core/vers.lua %%LUA_MODSHAREDIR%%/luarocks/deps.lua @@ -59,12 +60,14 @@ %%LUA_MODSHAREDIR%%/luarocks/fetch/sscm.lua %%LUA_MODSHAREDIR%%/luarocks/fetch/svn.lua %%LUA_MODSHAREDIR%%/luarocks/fs.lua +%%LUA_MODSHAREDIR%%/luarocks/fs/freebsd.lua +%%LUA_MODSHAREDIR%%/luarocks/fs/linux.lua %%LUA_MODSHAREDIR%%/luarocks/fs/lua.lua +%%LUA_MODSHAREDIR%%/luarocks/fs/macosx.lua %%LUA_MODSHAREDIR%%/luarocks/fs/tools.lua %%LUA_MODSHAREDIR%%/luarocks/fs/unix.lua %%LUA_MODSHAREDIR%%/luarocks/fs/unix/tools.lua %%LUA_MODSHAREDIR%%/luarocks/fs/win32.lua -%%LUA_MODSHAREDIR%%/luarocks/fs/win32/pe-parser.lua %%LUA_MODSHAREDIR%%/luarocks/fs/win32/tools.lua %%LUA_MODSHAREDIR%%/luarocks/fun.lua %%LUA_MODSHAREDIR%%/luarocks/loader.lua @@ -80,6 +83,7 @@ %%LUA_MODSHAREDIR%%/luarocks/results.lua %%LUA_MODSHAREDIR%%/luarocks/rockspecs.lua %%LUA_MODSHAREDIR%%/luarocks/search.lua +%%LUA_MODSHAREDIR%%/luarocks/signing.lua %%LUA_MODSHAREDIR%%/luarocks/test.lua %%LUA_MODSHAREDIR%%/luarocks/test/busted.lua %%LUA_MODSHAREDIR%%/luarocks/test/command.lua