Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 6 Sep 2016 08:57:04 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r421411 - in head/devel/godot: . files
Message-ID:  <201609060857.u868v4qm047414@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Sep  6 08:57:04 2016
New Revision: 421411
URL: https://svnweb.freebsd.org/changeset/ports/421411

Log:
  - Pass environment to the compiler, fixing build with ccache
  - Fix WWW:
  - Unsilence installation
  
  Approved by:	portmgr blanket

Modified:
  head/devel/godot/Makefile
  head/devel/godot/files/patch-SConstruct
  head/devel/godot/pkg-descr

Modified: head/devel/godot/Makefile
==============================================================================
--- head/devel/godot/Makefile	Tue Sep  6 08:37:57 2016	(r421410)
+++ head/devel/godot/Makefile	Tue Sep  6 08:57:04 2016	(r421411)
@@ -79,7 +79,7 @@ post-patch:
 # We just want a simple name matching the portname
 # This gives us bin/godot for runtime and bin/godot-tools for the IDE
 do-install:
-	@cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
+	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} godot.x11* \
 		${STAGEDIR}/${PREFIX}/bin/${GODOTFILE}
 
 do-install-EXAMPLES-on:

Modified: head/devel/godot/files/patch-SConstruct
==============================================================================
--- head/devel/godot/files/patch-SConstruct	Tue Sep  6 08:37:57 2016	(r421410)
+++ head/devel/godot/files/patch-SConstruct	Tue Sep  6 08:57:04 2016	(r421411)
@@ -1,5 +1,14 @@
 --- SConstruct.orig	2016-08-09 07:52:15 UTC
 +++ SConstruct
+@@ -63,7 +63,7 @@ elif (os.name=="nt"):
+ 	if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
+ 		custom_tools=['mingw']
+ 
+-env_base=Environment(tools=custom_tools);
++env_base=Environment(tools=custom_tools, ENV = os.environ);
+ env_base.AppendENVPath('PATH', os.getenv('PATH'))
+ env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
+ env_base.global_defaults=global_defaults
 @@ -231,15 +231,17 @@ if selected_platform in platform_list:
  	if env["extra_suffix"] != '' :
  		env.extra_suffix += '.'+env["extra_suffix"]

Modified: head/devel/godot/pkg-descr
==============================================================================
--- head/devel/godot/pkg-descr	Tue Sep  6 08:37:57 2016	(r421410)
+++ head/devel/godot/pkg-descr	Tue Sep  6 08:57:04 2016	(r421411)
@@ -3,4 +3,4 @@ development environment.
 
 Easily deploy your game on IOS, android, OSX, Linux, Steam, Windows or PS3.
 
-WWW: http://www.godotengine.org
+WWW: http://www.godotengine.org/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609060857.u868v4qm047414>