Revision: 105528 https://trac.macports.org/changeset/105528 Author: and.damore@macports.org Date: 2013-04-23 14:09:14 -0700 (Tue, 23 Apr 2013) Log Message: ----------- port luarocks: update to 2.0.13; renaming patchfile Modified Paths: -------------- trunk/dports/devel/luarocks/Portfile Added Paths: ----------- trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.diff Removed Paths: ------------- trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.lua.diff Modified: trunk/dports/devel/luarocks/Portfile =================================================================== --- trunk/dports/devel/luarocks/Portfile 2013-04-23 19:55:15 UTC (rev 105527) +++ trunk/dports/devel/luarocks/Portfile 2013-04-23 21:09:14 UTC (rev 105528) @@ -1,7 +1,7 @@ # $Id$ PortSystem 1.0 name luarocks -version 2.0.10 +version 2.0.13 license MIT categories devel platforms darwin @@ -20,13 +20,13 @@ master_sites http://luarocks.org/releases/ depends_run port:lua -checksums rmd160 42fa03274a56fdc93bfb25cf6e9631e0d310485e \ - sha256 11731dfe6e210a962cb2a857b8b2f14a9ab1043e13af09a1b9455b486401b46e +checksums rmd160 9e119eb45b15a30ffb5cd1e341bdc87570543ae7 \ + sha256 5eac098dcde65ca417930be42ccbd1a1cd151d5aebd8cc17898231de8289edb2 configure.args --with-lua=${prefix} \ --rocks-tree=${prefix}/share/${name} -patchfiles patch-src_luarocks_cfg.lua.diff +patchfiles patch-src_luarocks_cfg.diff post-patch { reinplace "s|%PREFIX%|${prefix}|g" ${worksrcpath}/src/luarocks/cfg.lua reinplace "s|%COMPILER%|${configure.cc}|g" ${worksrcpath}/src/luarocks/cfg.lua Added: trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.diff =================================================================== --- trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.diff (rev 0) +++ trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.diff 2013-04-23 21:09:14 UTC (rev 105528) @@ -0,0 +1,35 @@ +--- src/luarocks/cfg.lua.orig 2013-04-23 22:57:39.000000000 +0200 ++++ src/luarocks/cfg.lua 2013-04-23 23:00:52.000000000 +0200 +@@ -321,15 +321,15 @@ + defaults.lib_extension = "so" + defaults.external_lib_extension = "so" + defaults.obj_extension = "o" +- defaults.external_deps_dirs = { "/usr/local", "/usr" } +- defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin" +- defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include" +- defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib" ++ defaults.external_deps_dirs = { "%PREFIX%" } ++ defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "%PREFIX%/bin" ++ defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "%PREFIX%/include" ++ defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "%PREFIX%/lib" + defaults.variables.CFLAGS = "-O2" + defaults.cmake_generator = "Unix Makefiles" + defaults.platforms = { "unix" } +- defaults.variables.CC = "gcc" +- defaults.variables.LD = "gcc" ++ defaults.variables.CC = "%COMPILER%" ++ defaults.variables.LD = "%COMPILER%" + defaults.gcc_rpath = true + defaults.variables.LIBFLAG = "-shared" + defaults.external_deps_patterns = { +@@ -381,8 +381,8 @@ + else + defaults.gcc_rpath = false + end +- defaults.variables.CC = "export MACOSX_DEPLOYMENT_TARGET=10."..version.."; gcc" +- defaults.variables.LD = "export MACOSX_DEPLOYMENT_TARGET=10."..version.."; gcc" ++ defaults.variables.CC = "export MACOSX_DEPLOYMENT_TARGET=10."..version.."; %COMPILER%" ++ defaults.variables.LD = "export MACOSX_DEPLOYMENT_TARGET=10."..version.."; %COMPILER%" + end + + if detected.linux then Deleted: trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.lua.diff =================================================================== --- trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.lua.diff 2013-04-23 19:55:15 UTC (rev 105527) +++ trunk/dports/devel/luarocks/files/patch-src_luarocks_cfg.lua.diff 2013-04-23 21:09:14 UTC (rev 105528) @@ -1,28 +0,0 @@ ---- src/luarocks/cfg.lua.orig 2012-02-15 14:48:44.000000000 +0100 -+++ src/luarocks/cfg.lua 2012-02-15 14:53:14.000000000 +0100 -@@ -308,10 +308,10 @@ - defaults.lib_extension = "so" - defaults.external_lib_extension = "so" - defaults.obj_extension = "o" -- defaults.external_deps_dirs = { "/usr/local", "/usr" } -- defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "/usr/local/bin" -- defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "/usr/local/include" -- defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "/usr/local/lib" -+ defaults.external_deps_dirs = { "%PREFIX%", "/usr/local", "/usr" } -+ defaults.variables.LUA_BINDIR = site_config.LUA_BINDIR or "%PREFIX%/bin" -+ defaults.variables.LUA_INCDIR = site_config.LUA_INCDIR or "%PREFIX%/include" -+ defaults.variables.LUA_LIBDIR = site_config.LUA_LIBDIR or "%PREFIX%/lib" - defaults.variables.CFLAGS = "-O2" - defaults.cmake_generator = "Unix Makefiles" - defaults.platforms = { "unix" } -@@ -352,8 +352,8 @@ - defaults.external_lib_extension = "dylib" - defaults.arch = "macosx-"..proc - defaults.platforms = {"unix", "bsd", "macosx"} -- defaults.variables.CC = "export MACOSX_DEPLOYMENT_TARGET=10.3; gcc" -- defaults.variables.LD = "export MACOSX_DEPLOYMENT_TARGET=10.3; gcc" -+ defaults.variables.CC = "export MACOSX_DEPLOYMENT_TARGET=10.5; %COMPILER%" -+ defaults.variables.LD = "export MACOSX_DEPLOYMENT_TARGET=10.5; %COMPILER%" - defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" - end -