--- premake4/Makefile 2014-06-24 14:20:17.000000000 +0300 +++ premake4/Makefile 2014-06-24 15:59:16.000000000 +0300 @@ -2,21 +2,21 @@ # $FreeBSD: head/devel/premake4/Makefile 347405 2014-03-07 16:49:09Z bapt $ PORTNAME= premake4 -PORTVERSION= 4.3 +PORTVERSION= 4.4.b5 CATEGORIES= devel -MASTER_SITES= SF/premake/Premake/${PORTVERSION} -DISTNAME= premake-${PORTVERSION}-src +MASTER_SITES= SF/premake/Premake/${PORTVERSION:C/.b.+//} +DISTNAME= premake-${PORTVERSION:S/.b/-beta/}-src MAINTAINER= vmagerya@gmail.com COMMENT= Writes build scripts OPTIONS_DEFINE= DOCS -WRKSRC= ${WRKDIR}/premake-${PORTVERSION} +WRKSRC= ${WRKDIR}/premake-${PORTVERSION:S/.b/-beta/} BUILD_WRKSRC= ${WRKSRC}/build/gmake.unix USES= gmake zip -MAKE_ARGS= ARCH="" +MAKE_ARGS= ARCH="" CC="${CC}" CXX="${CXX}" PLIST_FILES= bin/premake4 @@ -24,12 +24,18 @@ post-patch: ${REINPLACE_CMD} -e 's|-ldl||' ${BUILD_WRKSRC}/Premake4.make - ${REINPLACE_CMD} -e 's|debug|release|' ${WRKSRC}/tests/test + ${REINPLACE_CMD} -e 's|debug|release|' \ + ${WRKSRC}/tests/test \ + ${WRKSRC}/tests/base/test_premake_command.lua + ${REINPLACE_CMD} -e 's|io.open(conf_file)|nil|' \ + ${WRKSRC}/src/base/os.lua \ + ${WRKSRC}/src/host/scripts.c do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/release/premake4 ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} \ + ${WRKSRC}/bin/release/premake4 ${STAGEDIR}${PREFIX}/bin regression-test: build cd ${WRKSRC}/tests && ./test --- premake4/distinfo 2014-06-24 14:20:17.000000000 +0300 +++ premake4/distinfo 2014-06-24 14:28:30.000000000 +0300 @@ -1,2 +1,2 @@ -SHA256 (premake-4.3-src.zip) = 36536490f8928d8ecde135da80cd8b751ea5bebe50cabba5c0de49cd41cb2780 -SIZE (premake-4.3-src.zip) = 514366 +SHA256 (premake-4.4-beta5-src.zip) = 0fa1ed02c5229d931e87995123cdb11d44fcc8bd99bba8e8bb1bbc0aaa798161 +SIZE (premake-4.4-beta5-src.zip) = 596883 --- premake4/files/patch-src-base-os.lua 2014-06-24 14:20:17.000000000 +0300 +++ premake4/files/patch-src-base-os.lua 1970-01-01 03:00:00.000000000 +0300 @@ -1,17 +0,0 @@ ---- src/base/os.lua.orig 2012-01-31 15:40:25.000000000 +0200 -+++ src/base/os.lua 2012-01-31 15:42:16.000000000 +0200 -@@ -33,14 +33,6 @@ - else - formats = { "lib%s.so", "%s.so" } - path = os.getenv("LD_LIBRARY_PATH") or "" -- -- io.input("/etc/ld.so.conf") -- if io.input() then -- for line in io.lines() do -- path = path .. ":" .. line -- end -- io.input():close() -- end - end - - table.insert(formats, "%s") --- premake4/files/patch-src-host-scripts.c 2014-06-24 14:20:17.000000000 +0300 +++ premake4/files/patch-src-host-scripts.c 1970-01-01 03:00:00.000000000 +0300 @@ -1,5 +0,0 @@ ---- src/host/scripts.c.orig 2010-11-16 13:29:13.000000000 +0200 -+++ src/host/scripts.c 2012-01-31 16:05:26.000000000 +0200 -@@ -7 +7 @@ -- "function os.executef(cmd, ...)\ncmd = string.format(cmd, unpack(arg))\nreturn os.execute(cmd)\nend\nfunction os.findlib(libname)\nlocal path, formats\nif os.is(\"windows\") then\nformats = { \"%s.dll\", \"%s\" }\npath = os.getenv(\"PATH\")\nelse\nif os.is(\"macosx\") then\nformats = { \"lib%s.dylib\", \"%s.dylib\" }\npath = os.getenv(\"DYLD_LIBRARY_PATH\")\nelse\nformats = { \"lib%s.so\", \"%s.so\" }\npath = os.getenv(\"LD_LIBRARY_PATH\") or \"\"\nio.input(\"/etc/ld.so.conf\")\nif io.input() then\nfor line in io.lines() do\npath = path .. \":\" .. line\nend\nio.input():close()\nend\nend\ntable.insert(formats, \"%s\")\npath = (path or \"\") .. \":/lib:/usr/lib:/usr/local/lib\"\nend\nfor _, fmt in ipairs(formats) do\nlocal name = string.format(fmt, libname)\nlocal result = os.pathsearch(name, path)\nif result then return result end\nend\nend\nfunction os.get()\nreturn _OPTIONS.os or _OS\nend\nfunction os.is(id)\nreturn (os.get():lower() == id:lower())\nend\nlocal function domatch(result, mask, wantfiles)\nif mas" -+ "function os.executef(cmd, ...)\ncmd = string.format(cmd, unpack(arg))\nreturn os.execute(cmd)\nend\nfunction os.findlib(libname)\nlocal path, formats\nif os.is(\"windows\") then\nformats = { \"%s.dll\", \"%s\" }\npath = os.getenv(\"PATH\")\nelse\nif os.is(\"macosx\") then\nformats = { \"lib%s.dylib\", \"%s.dylib\" }\npath = os.getenv(\"DYLD_LIBRARY_PATH\")\nelse\nformats = { \"lib%s.so\", \"%s.so\" }\npath = os.getenv(\"LD_LIBRARY_PATH\") or \"\"\nend\ntable.insert(formats, \"%s\")\npath = (path or \"\") .. \":/lib:/usr/lib:/usr/local/lib\"\nend\nfor _, fmt in ipairs(formats) do\nlocal name = string.format(fmt, libname)\nlocal result = os.pathsearch(name, path)\nif result then return result end\nend\nend\nfunction os.get()\nreturn _OPTIONS.os or _OS\nend\nfunction os.is(id)\nreturn (os.get():lower() == id:lower())\nend\nlocal function domatch(result, mask, wantfiles)\nif mas"