svn commit: r407806 - in head/devel/lua-luarocks: . files

[Jan Beich]

Author: jbeich
Date: Tue Feb  2 10:39:21 2016
New Revision: 407806
URL: https://svnweb.freebsd.org/changeset/ports/407806

Log:
  devel/lua-luarocks: update to 2.3.0
  
  Changes:	https://github.com/keplerproject/luarocks/compare/v2.2.2...v2.3.0

Modified:
  head/devel/lua-luarocks/Makefile   (contents, props changed)
  head/devel/lua-luarocks/distinfo   (contents, props changed)
  head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua   (contents, props changed)
  head/devel/lua-luarocks/pkg-plist   (contents, props changed)

Modified: head/devel/lua-luarocks/Makefile
==============================================================================
--- head/devel/lua-luarocks/Makefile	Tue Feb  2 10:38:31 2016	(r407805)
+++ head/devel/lua-luarocks/Makefile	Tue Feb  2 10:39:21 2016	(r407806)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	luarocks
-PORTVERSION=	2.2.2
+PORTVERSION=	2.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 

Modified: head/devel/lua-luarocks/distinfo
==============================================================================
--- head/devel/lua-luarocks/distinfo	Tue Feb  2 10:38:31 2016	(r407805)
+++ head/devel/lua-luarocks/distinfo	Tue Feb  2 10:39:21 2016	(r407806)
@@ -1,2 +1,2 @@
-SHA256 (keplerproject-luarocks-v2.2.2_GH0.tar.gz) = ca3b6927756201f4dfe24812a124d2f77cf624534655baf316bbf2152fa59acc
-SIZE (keplerproject-luarocks-v2.2.2_GH0.tar.gz) = 4008540
+SHA256 (keplerproject-luarocks-v2.3.0_GH0.tar.gz) = 92c014889ec6a09c4bb492df6b7f7be784110d6abe031e16418342781ca5c5ce
+SIZE (keplerproject-luarocks-v2.3.0_GH0.tar.gz) = 4012904

Modified: head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua
==============================================================================
--- head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua	Tue Feb  2 10:38:31 2016	(r407805)
+++ head/devel/lua-luarocks/files/patch-src_luarocks_cfg.lua	Tue Feb  2 10:39:21 2016	(r407806)
@@ -1,23 +1,23 @@
---- src/luarocks/cfg.lua.orig	2015-04-24 18:28:33 UTC
+--- src/luarocks/cfg.lua.orig	2015-12-29 15:50:11 UTC
 +++ src/luarocks/cfg.lua
 @@ -88,7 +88,15 @@ elseif proc:match("Power Macintosh") the
-    proc = "powerpc"
+    cfg.target_cpu = proc
  end
  
 -if system == "FreeBSD" then
 +if system == "Bitrig" then
-+   detected.unix = true
-+   detected.bitrig = true
-+   detected.bsd = true
++   cfg.platforms.unix = true
++   cfg.platforms.bitrig = true
++   cfg.platforms.bsd = true
 +elseif system == "DragonFly" then
-+   detected.unix = true
-+   detected.dragonfly = true
-+   detected.bsd = true
++   cfg.platforms.unix = true
++   cfg.platforms.dragonfly = true
++   cfg.platforms.bsd = true
 +elseif system == "FreeBSD" then
-    detected.unix = true
-    detected.freebsd = true
-    detected.bsd = true
-@@ -397,17 +405,19 @@ if detected.unix then
+    cfg.platforms.unix = true
+    cfg.platforms.freebsd = true
+    cfg.platforms.bsd = true
+@@ -477,16 +485,18 @@ if cfg.platforms.unix then
     defaults.lib_extension = "so"
     defaults.external_lib_extension = "so"
     defaults.obj_extension = "o"
@@ -29,7 +29,6 @@
 -   defaults.variables.CFLAGS = "-O2"
 +   defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2"
     defaults.cmake_generator = "Unix Makefiles"
-    defaults.platforms = { "unix" }
 -   defaults.variables.CC = "gcc"
 -   defaults.variables.LD = "gcc"
 +   defaults.variables.MAKE = os.getenv("MAKE") or defaults.variables.MAKE
@@ -42,26 +41,23 @@
     defaults.external_deps_patterns = {
        bin = { "?" },
        lib = { "lib?.a", "lib?.so", "lib?.so.*" },
-@@ -472,12 +482,20 @@ if detected.linux then
-    defaults.platforms = {"unix", "linux"}
+@@ -548,11 +558,17 @@ if cfg.platforms.linux then
+    defaults.arch = "linux-"..cfg.target_cpu
  end
  
-+if detected.bitrig then
-+   defaults.arch = "bitrig-"..proc
-+   defaults.platforms = {"unix", "bsd", "bitrig"}
++if cfg.platforms.bitrig then
++   defaults.arch = "bitrig-"..cfg.target_cpu
 +end
 +
-+if detected.dragonfly then
-+   defaults.arch = "dragonfly-"..proc
-+   defaults.platforms = {"unix", "bsd", "dragonfly"}
++if cfg.platforms.dragonfly then
++   defaults.arch = "dragonfly-"..cfg.target_cpu
 +end
 +
- if detected.freebsd then
-    defaults.arch = "freebsd-"..proc
-    defaults.platforms = {"unix", "bsd", "freebsd"}
+ if cfg.platforms.freebsd then
+    defaults.arch = "freebsd-"..cfg.target_cpu
     defaults.gcc_rpath = false
 -   defaults.variables.CC = "cc"
 -   defaults.variables.LD = "cc"
  end
  
- if detected.openbsd then
+ if cfg.platforms.openbsd then

Modified: head/devel/lua-luarocks/pkg-plist
==============================================================================
--- head/devel/lua-luarocks/pkg-plist	Tue Feb  2 10:38:31 2016	(r407805)
+++ head/devel/lua-luarocks/pkg-plist	Tue Feb  2 10:39:21 2016	(r407806)
@@ -11,6 +11,7 @@ bin/luarocks-admin-%%LUA_VER%%
 %%LUA_MODSHAREDIR%%/luarocks/cache.lua
 %%LUA_MODSHAREDIR%%/luarocks/cfg.lua
 %%LUA_MODSHAREDIR%%/luarocks/command_line.lua
+%%LUA_MODSHAREDIR%%/luarocks/config_cmd.lua
 %%LUA_MODSHAREDIR%%/luarocks/deps.lua
 %%LUA_MODSHAREDIR%%/luarocks/dir.lua
 %%LUA_MODSHAREDIR%%/luarocks/doc.lua