Page MenuHomeFreeBSD
Files F149211209

D17814.id53364.diff
No OneTemporary
Actions

D17814.id53364.diff
View Options

Index: lua-luarocks/Makefile
===================================================================
--- lua-luarocks/Makefile
+++ lua-luarocks/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: 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 = 1541123754
+SHA256 (luarocks-3.0.4.tar.gz) = 1236a307ca5c556c4fed9fdbd35a7e0e80ccf063024becc8c3bf212f37ff0edf
+SIZE (luarocks-3.0.4.tar.gz) = 205350
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 2018-10-30 17:31:40 UTC
+++ src/luarocks/core/cfg.lua
-@@ -35,6 +35,7 @@ local platform_order = {
+@@ -36,6 +36,7 @@ local platform_order = {
"netbsd",
"openbsd",
"freebsd",
@@ -13,15 +13,15 @@
"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,
+@@ -153,6 +154,7 @@ do
+ end
+
+ local platform_sets = {
++ dragonfly = { unix = true, bsd = true, dragonfly = true },
+ freebsd = { unix = true, bsd = true, freebsd = true },
+ openbsd = { unix = true, bsd = true, openbsd = true },
+ solaris = { unix = true, solaris = true },
+@@ -359,13 +361,13 @@ local function make_defaults(lua_version
defaults.external_lib_extension = "so"
defaults.obj_extension = "o"
defaults.external_deps_dirs = { "/usr/local", "/usr", "/" }
@@ -40,7 +40,7 @@
defaults.external_deps_patterns = {
bin = { "?" },
lib = { "lib?.a", "lib?.so", "lib?.so.*" },
-@@ -449,15 +451,18 @@ local function make_defaults(lua_version, target_cpu,
+@@ -451,15 +453,18 @@ local function make_defaults(lua_version
end
end
Index: lua-luarocks/files/patch-src_luarocks_fs_unix_tools.lua
===================================================================
--- lua-luarocks/files/patch-src_luarocks_fs_unix_tools.lua
+++ lua-luarocks/files/patch-src_luarocks_fs_unix_tools.lua
@@ -0,0 +1,15 @@
+- Remove use of unsupported unzip option to check for existance of unzip.
+
+--- src/luarocks/fs/unix/tools.lua.orig 2019-01-29 05:05:00 UTC
++++ src/luarocks/fs/unix/tools.lua
+@@ -141,10 +141,6 @@ end
+ -- @return boolean: true on success, nil and error message on failure.
+ function tools.unzip(zipfile)
+ assert(zipfile)
+- local ok, err = fs.is_tool_available(vars.UNZIP, "unzip", "-h")
+- if not ok then
+- return nil, err
+- end
+ if fs.execute_quiet(vars.UNZIP, zipfile) then
+ return true
+ else
Index: lua-luarocks/pkg-plist
===================================================================
--- lua-luarocks/pkg-plist
+++ lua-luarocks/pkg-plist
@@ -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

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 24, 12:59 AM (15 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30217422
Default Alt Text
D17814.id53364.diff (4 KB)

Event Timeline