Index: Makefile =================================================================== --- Makefile +++ Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= luarocks -DISTVERSION= 3.0.1 +DISTVERSION= 3.0.4 CATEGORIES= devel MASTER_SITES= https://${PORTNAME}.github.io/${PORTNAME}/releases/ PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX} Index: distinfo =================================================================== --- distinfo +++ distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1534264242 -SHA256 (luarocks-3.0.1.tar.gz) = b989c4b60d6c9edcd65169e5e42fcffbd39cdbebe6b138fa5aea45102f8d9ec0 -SIZE (luarocks-3.0.1.tar.gz) = 205787 +TIMESTAMP = 1541123754 +SHA256 (luarocks-3.0.4.tar.gz) = 1236a307ca5c556c4fed9fdbd35a7e0e80ccf063024becc8c3bf212f37ff0edf +SIZE (luarocks-3.0.4.tar.gz) = 205350 Index: files/patch-src_luarocks_core_cfg.lua =================================================================== --- files/patch-src_luarocks_core_cfg.lua +++ files/patch-src_luarocks_core_cfg.lua @@ -1,63 +0,0 @@ -- Add DragonFly support -- Respect CC/CFLAGS/LD/LDFLAGS -- 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 -@@ -35,6 +35,7 @@ local platform_order = { - "netbsd", - "openbsd", - "freebsd", -+ "dragonfly", - "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", "/" } -- 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.external_deps_patterns = { - bin = { "?" }, - lib = { "lib?.a", "lib?.so", "lib?.so.*" }, -@@ -449,15 +451,18 @@ local function make_defaults(lua_version, target_cpu, - end - end - -+ if platforms.dragonfly then -+ defaults.arch = "dragonfly-"..target_cpu -+ end -+ - if platforms.freebsd then - defaults.arch = "freebsd-"..target_cpu - defaults.gcc_rpath = false -- defaults.variables.CC = "cc" -- defaults.variables.LD = "cc" - end - - if platforms.openbsd then - defaults.arch = "openbsd-"..target_cpu -+ defaults.gcc_rpath = false - end - - if platforms.netbsd then Index: pkg-plist =================================================================== --- pkg-plist +++ 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 @@ -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 @@ -64,7 +65,6 @@ %%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