View | Details | Raw Unified | Return to bug 192004
Collapse All | Expand All

(-)premake4/Makefile (-7 / +13 lines)
Lines 2-22 Link Here
2
# $FreeBSD: head/devel/premake4/Makefile 347405 2014-03-07 16:49:09Z bapt $
2
# $FreeBSD: head/devel/premake4/Makefile 347405 2014-03-07 16:49:09Z bapt $
3
3
4
PORTNAME=	premake4
4
PORTNAME=	premake4
5
PORTVERSION=	4.3
5
PORTVERSION=	4.4.b5
6
CATEGORIES=	devel
6
CATEGORIES=	devel
7
MASTER_SITES=	SF/premake/Premake/${PORTVERSION}
7
MASTER_SITES=	SF/premake/Premake/${PORTVERSION:C/.b.+//}
8
DISTNAME=	premake-${PORTVERSION}-src
8
DISTNAME=	premake-${PORTVERSION:S/.b/-beta/}-src
9
9
10
MAINTAINER=	vmagerya@gmail.com
10
MAINTAINER=	vmagerya@gmail.com
11
COMMENT=	Writes build scripts
11
COMMENT=	Writes build scripts
12
12
13
OPTIONS_DEFINE=	DOCS
13
OPTIONS_DEFINE=	DOCS
14
14
15
WRKSRC=		${WRKDIR}/premake-${PORTVERSION}
15
WRKSRC=		${WRKDIR}/premake-${PORTVERSION:S/.b/-beta/}
16
BUILD_WRKSRC=	${WRKSRC}/build/gmake.unix
16
BUILD_WRKSRC=	${WRKSRC}/build/gmake.unix
17
17
18
USES=		gmake zip
18
USES=		gmake zip
19
MAKE_ARGS=	ARCH=""
19
MAKE_ARGS=	ARCH="" CC="${CC}" CXX="${CXX}"
20
20
21
PLIST_FILES=	bin/premake4
21
PLIST_FILES=	bin/premake4
22
22
Lines 24-35 Link Here
24
24
25
post-patch:
25
post-patch:
26
	${REINPLACE_CMD} -e 's|-ldl||' ${BUILD_WRKSRC}/Premake4.make
26
	${REINPLACE_CMD} -e 's|-ldl||' ${BUILD_WRKSRC}/Premake4.make
27
	${REINPLACE_CMD} -e 's|debug|release|' ${WRKSRC}/tests/test
27
	${REINPLACE_CMD} -e 's|debug|release|' \
28
		${WRKSRC}/tests/test \
29
		${WRKSRC}/tests/base/test_premake_command.lua
30
	${REINPLACE_CMD} -e 's|io.open(conf_file)|nil|' \
31
		${WRKSRC}/src/base/os.lua \
32
		${WRKSRC}/src/host/scripts.c
28
33
29
do-install:
34
do-install:
30
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
35
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
31
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
36
	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
32
	${INSTALL_PROGRAM} ${WRKSRC}/bin/release/premake4 ${STAGEDIR}${PREFIX}/bin
37
	${INSTALL_PROGRAM} \
38
		${WRKSRC}/bin/release/premake4 ${STAGEDIR}${PREFIX}/bin
33
39
34
regression-test: build
40
regression-test: build
35
	cd ${WRKSRC}/tests && ./test
41
	cd ${WRKSRC}/tests && ./test
(-)premake4/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (premake-4.3-src.zip) = 36536490f8928d8ecde135da80cd8b751ea5bebe50cabba5c0de49cd41cb2780
1
SHA256 (premake-4.4-beta5-src.zip) = 0fa1ed02c5229d931e87995123cdb11d44fcc8bd99bba8e8bb1bbc0aaa798161
2
SIZE (premake-4.3-src.zip) = 514366
2
SIZE (premake-4.4-beta5-src.zip) = 596883
(-)premake4/files/patch-src-base-os.lua (-17 lines)
Lines 1-17 Link Here
1
--- src/base/os.lua.orig	2012-01-31 15:40:25.000000000 +0200
2
+++ src/base/os.lua	2012-01-31 15:42:16.000000000 +0200
3
@@ -33,14 +33,6 @@
4
 			else
5
 				formats = { "lib%s.so", "%s.so" }
6
 				path = os.getenv("LD_LIBRARY_PATH") or ""
7
-	
8
-				io.input("/etc/ld.so.conf")
9
-				if io.input() then
10
-					for line in io.lines() do
11
-						path = path .. ":" .. line
12
-					end
13
-					io.input():close()
14
-				end
15
 			end
16
 			
17
 			table.insert(formats, "%s")	
(-)premake4/files/patch-src-host-scripts.c (-5 lines)
Lines 1-5 Link Here
1
--- src/host/scripts.c.orig	2010-11-16 13:29:13.000000000 +0200
2
+++ src/host/scripts.c	2012-01-31 16:05:26.000000000 +0200
3
@@ -7 +7 @@
4
-	"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"
5
+	"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"

Return to bug 192004