Date: Sun, 18 Apr 2021 07:09:41 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a4c275e08d4a - main - devel/lua-luarocks: Update to 3.6.0 Message-ID: <202104180709.13I79fpL095121@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4c275e08d4aee8f5ad2d2ea0178157a056d5f16 commit a4c275e08d4aee8f5ad2d2ea0178157a056d5f16 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2021-04-18 04:58:47 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2021-04-18 05:42:20 +0000 devel/lua-luarocks: Update to 3.6.0 Changes: https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md --- devel/lua-luarocks/Makefile | 2 +- devel/lua-luarocks/distinfo | 6 +-- .../files/patch-src_luarocks_core_cfg.lua | 59 ---------------------- devel/lua-luarocks/pkg-plist | 1 + 4 files changed, 5 insertions(+), 63 deletions(-) diff --git a/devel/lua-luarocks/Makefile b/devel/lua-luarocks/Makefile index 614f17d9ac9d..07b84a9c7cca 100644 --- a/devel/lua-luarocks/Makefile +++ b/devel/lua-luarocks/Makefile @@ -1,5 +1,5 @@ PORTNAME= luarocks -PORTVERSION= 3.5.0 +PORTVERSION= 3.6.0 CATEGORIES= devel MASTER_SITES= https://luarocks.org/releases/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} diff --git a/devel/lua-luarocks/distinfo b/devel/lua-luarocks/distinfo index 43d254ea7572..06ab711c24d6 100644 --- a/devel/lua-luarocks/distinfo +++ b/devel/lua-luarocks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607685359 -SHA256 (luarocks-3.5.0.tar.gz) = 701d0cc0c7e97cc2cf2c2f4068fce45e52a8854f5dc6c9e49e2014202eec9a4f -SIZE (luarocks-3.5.0.tar.gz) = 244798 +TIMESTAMP = 1618320004 +SHA256 (luarocks-3.6.0.tar.gz) = b0eaf59e7711ca2a886722c0423dabe22ccbdcdf3a042c3f2615596879f8252f +SIZE (luarocks-3.6.0.tar.gz) = 246728 diff --git a/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua b/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua deleted file mode 100644 index 368025504af3..000000000000 --- a/devel/lua-luarocks/files/patch-src_luarocks_core_cfg.lua +++ /dev/null @@ -1,59 +0,0 @@ -- Add DragonFly support -- Respect CC/CFLAGS/LD/LDFLAGS -- Prefer system compiler over GCC on BSDs/Solaris -- OpenBSD uses Clang by default, so do not pass GCC RPATH - ---- src/luarocks/core/cfg.lua.orig 2020-01-28 15:54:42 UTC -+++ src/luarocks/core/cfg.lua -@@ -36,6 +36,7 @@ local platform_order = { - "netbsd", - "openbsd", - "freebsd", -+ "dragonfly", - "linux", - "macosx", - "cygwin", -@@ -157,6 +158,7 @@ end - - local platform_sets = { - freebsd = { unix = true, bsd = true, freebsd = true }, -+ dragonfly = { unix = true, bsd = true, dragonfly = true }, - openbsd = { unix = true, bsd = true, openbsd = true }, - solaris = { unix = true, solaris = true }, - windows = { windows = true, win32 = true }, -@@ -365,12 +367,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", "/" } -- defaults.variables.CFLAGS = "-O2" -+ defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" - defaults.cmake_generator = "Unix Makefiles" -- defaults.variables.CC = "gcc" -- defaults.variables.LD = "gcc" -+ -- Assume "cc" is a modern GCC-compatible compiler -+ defaults.variables.CC = os.getenv("CC") or defaults.variables.CC -+ 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 = { -@@ -457,12 +460,15 @@ local function make_defaults(lua_version, target_cpu, - if platforms.freebsd then - defaults.arch = "freebsd-"..target_cpu - defaults.gcc_rpath = false -- defaults.variables.CC = "cc" -- defaults.variables.LD = "cc" - end - -+ if platforms.dragonfly then -+ defaults.arch = "dragonfly-"..target_cpu -+ end -+ - if platforms.openbsd then - defaults.arch = "openbsd-"..target_cpu -+ defaults.gcc_rpath = false - end - - if platforms.netbsd then diff --git a/devel/lua-luarocks/pkg-plist b/devel/lua-luarocks/pkg-plist index 7fd49a1703fc..91ba509eaabe 100644 --- a/devel/lua-luarocks/pkg-plist +++ b/devel/lua-luarocks/pkg-plist @@ -65,6 +65,7 @@ bin/luarocks-admin %%LUA_MODSHAREDIR%%/luarocks/fs/linux.lua %%LUA_MODSHAREDIR%%/luarocks/fs/lua.lua %%LUA_MODSHAREDIR%%/luarocks/fs/macosx.lua +%%LUA_MODSHAREDIR%%/luarocks/fs/netbsd.lua %%LUA_MODSHAREDIR%%/luarocks/fs/tools.lua %%LUA_MODSHAREDIR%%/luarocks/fs/unix.lua %%LUA_MODSHAREDIR%%/luarocks/fs/unix/tools.lua
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104180709.13I79fpL095121>