Revision

72699

Author

jmr@macports.org

Date

2010-10-24 13:03:26 -0700 (Sun, 24 Oct 2010)

Log Message

glob2: add build dep on scons, and make the sconstruct use our PATH (#18565)

Modified Paths

• trunk/dports/games/glob2/Portfile
• trunk/dports/games/glob2/files/patch-SConstruct.diff

Diff

--- trunk/dports/games/glob2/Portfile	2010-10-24 19:17:37 UTC (rev 72698)
+++ trunk/dports/games/glob2/Portfile	2010-10-24 20:03:26 UTC (rev 72699)
@@ -27,6 +27,7 @@
                     sha1 669a43707cf03e4e810e77ef8bef2f46f1116090 \
                     rmd160 266edd6a57f1e8ea8e1effac3871f3c0083fc05f
 
+depends_build       port:scons
 depends_lib         port:boost \
                     port:freetype \
                     port:jpeg \

--- trunk/dports/games/glob2/files/patch-SConstruct.diff	2010-10-24 19:17:37 UTC (rev 72698)
+++ trunk/dports/games/glob2/files/patch-SConstruct.diff	2010-10-24 20:03:26 UTC (rev 72699)
@@ -1,7 +1,5 @@
-Index: SConstruct
-===================================================================
---- SConstruct.orig	2008-04-29 18:25:10.000000000 +0200
-+++ SConstruct	2008-04-29 18:25:53.000000000 +0200
+--- SConstruct.orig	2008-04-08 14:33:15.000000000 +1000
++++ SConstruct	2010-10-25 06:53:52.000000000 +1100
 @@ -48,7 +48,7 @@
      configfile.add("PACKAGE", "Name of package", "\"glob2\"")
      configfile.add("PACKAGE_BUGREPORT", "Define to the address where bug reports for this package should be sent.", "\"glob2-devel@nongnu.org\"")
@@ -11,6 +9,15 @@
      else:
      	configfile.add("PACKAGE_DATA_DIR", "data directory", "\"" + env["DATADIR"] + "\"")
      configfile.add("PACKAGE_SOURCE_DIR", "source directory", "\"" +env.Dir("#").abspath.replace("\\", "\\\\") + "\"")
+@@ -178,7 +178,7 @@
+     conf.Finish()
+ 
+ def main():
+-    env = Environment()
++    env = Environment(ENV = {'PATH' : os.environ['PATH']})
+     try:
+         env.Clone()
+     except AttributeError:
 @@ -235,23 +235,6 @@
  		            env.Tar(target, f)