From 91e1a125a67e189c0f8f25e3b44ec945ea048c1c Mon Sep 17 00:00:00 2001
From: Mark Pulford <mark@kyne.com.au>
Date: Sat, 3 Mar 2012 13:59:50 +1030
Subject: Fix build on platforms without the "sed -i" option

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7c1cb252..89993210 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,8 @@ check_makefile:
 cleanup_bins:
 	for f in $(BIN_FILES) ;\
 	do \
-	   sed -i.bak "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" src/bin/$$f ;\
+	   mv src/bin/$$f{,.bak} ;\
+	   sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\
 	   rm src/bin/$$f.bak ;\
 	done
 
-- 
cgit v1.2.3-55-g6feb


From aaf92d629ce4bdb903bd5dde14e94f20abf5825a Mon Sep 17 00:00:00 2001
From: Mark Pulford <mark@kyne.com.au>
Date: Sat, 3 Mar 2012 14:05:43 +1030
Subject: Add support for the "solaris" platform

---
 src/luarocks/cfg.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 9628a291..df573c82 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -76,6 +76,9 @@ elseif system == "Darwin" then
 elseif system == "Linux" then
    detected.unix = true
    detected.linux = true
+elseif system == "SunOS" then
+   detected.unix = true
+   detected.solaris = true
 elseif system and system:match("^CYGWIN") then
    detected.unix = true
    detected.cygwin = true
@@ -371,6 +374,14 @@ if detected.openbsd then
    defaults.variables.STATFLAG = "-f '%Op'"
 end
 
+if detected.solaris then
+   defaults.arch = "solaris-"..proc
+   defaults.platforms = {"unix", "solaris"}
+   defaults.variables.MAKE = "gmake"
+   defaults.variables.CC = "gcc"
+   defaults.variables.LD = "gcc"
+end
+
 -- Expose some more values detected by LuaRocks for use by rockspec authors.
 defaults.variables.LUA = defaults.lua_interpreter
 defaults.variables.LIB_EXTENSION = defaults.lib_extension
-- 
cgit v1.2.3-55-g6feb