- Update to build13rc

- Take maintainership
- Use SF macro
- Improve plist generation

PR:		128743
Submitted by:	myself
Approved by:	Bartosz Fabianowski <freebsd at chillt dot de> (maintainer)

3 files changed, 36 insertions, 38 deletions

diff --git a/games/widelands/files/patch-SConstruct b/games/widelands/files/patch-SConstruct
index 8d6d9c45949f..b7660a2ae47b 100644
--- a/games/widelands/files/patch-SConstruct
+++ b/games/widelands/files/patch-SConstruct
@@ -1,23 +1,11 @@
---- SConstruct.orig	Mon Mar 12 21:39:30 2007
-+++ SConstruct	Sat Jun  2 03:49:26 2007
-@@ -122,9 +122,11 @@
- #
- # Create configuration objects
+--- SConstruct.orig	2008-10-06 21:43:03.000000000 +0400
++++ SConstruct	2008-11-09 18:44:06.000000000 +0300
+@@ -101,7 +101,7 @@
  
-+SConsignFile('build/scons-signatures')
-+
  opts=cli_options()
  
 -env=Environment(options=opts)
-+env=Environment(options=opts, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
- env.Help(opts.GenerateHelpText(env))
- 
- conf=env.Configure(conf_dir='#/build/sconf_temp',log_file='#build/config.log',
-@@ -287,7 +289,6 @@
- 
- ################################################################### Build things
- 
--SConsignFile('build/scons-signatures')
- BUILDDIR='build/'+TARGET+'-'+env['build']
- Export('env', 'Glob', 'BUILDDIR', 'PhonyTarget')
- 
++env=Environment(options=opts, ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
+ env.Tool("ctags", toolpath=['build/scons-tools'])
+ env.Tool("PNGShrink", toolpath=['build/scons-tools'])
+ env.Tool("astyle", toolpath=['build/scons-tools'])
diff --git a/games/widelands/files/patch-build-scons-tools-scons_configure.py b/games/widelands/files/patch-build-scons-tools-scons_configure.py
new file mode 100644
index 000000000000..181ec2f82641
--- /dev/null
+++ b/games/widelands/files/patch-build-scons-tools-scons_configure.py
@@ -0,0 +1,29 @@
+--- build/scons-tools/scons_configure.py.orig	2008-10-05 18:59:26.000000000 +0400
++++ build/scons-tools/scons_configure.py	2008-11-10 01:24:38.000000000 +0300
+@@ -439,16 +439,16 @@
+ 	conf.CheckCompilerFlag('-fbounds-check', env)
+ 	conf.CheckCompilerFlag('-pipe', env)
+ 
+-	if env.optimize:
+-		# !!!! -fomit-frame-pointer breaks execeptions !!!!
+-		conf.CheckCompilerFlag('-fexpensive-optimizations', env)
+-		conf.CheckCompilerFlag('-finline-functions', env)
+-		conf.CheckCompilerFlag('-ffast-math', env)
+-		conf.CheckCompilerFlag('-funroll-loops', env)
+-		conf.CheckCompilerFlag('-O3', env)
+-	else:
+-		conf.CheckCompilerFlag('-O0', env)
+-		conf.CheckCompilerFlag('-funit-at-a-time', env)
++#	if env.optimize:
++#		# !!!! -fomit-frame-pointer breaks execeptions !!!!
++#		conf.CheckCompilerFlag('-fexpensive-optimizations', env)
++#		conf.CheckCompilerFlag('-finline-functions', env)
++#		conf.CheckCompilerFlag('-ffast-math', env)
++#		conf.CheckCompilerFlag('-funroll-loops', env)
++#		conf.CheckCompilerFlag('-O3', env)
++#	else:
++#		conf.CheckCompilerFlag('-O0', env)
++#		conf.CheckCompilerFlag('-funit-at-a-time', env)
+ 
+ 	if env.profile:
+ 		conf.CheckCompilerFlag('-pg', env)
diff --git a/games/widelands/files/patch-src_SConscript b/games/widelands/files/patch-src_SConscript
deleted file mode 100644
index 498d10c10c79..000000000000
--- a/games/widelands/files/patch-src_SConscript
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/SConscript.orig	Mon Feb 19 19:33:47 2007
-+++ src/SConscript	Sat Jun  2 02:47:39 2007
-@@ -5,7 +5,7 @@
- 
- SRC=Glob('*.cc')
- 
--srcenv=env.Copy()
-+srcenv=env.Copy(CPPPATH=[], LIBPATH=[])
- 
- srcenv.Append(CPPPATH=[
- 		'#/src',
-@@ -22,6 +22,7 @@
- srcenv.Append(LIBS='editor', LIBPATH='editor')
- srcenv.Append(LIBS='editoruimenus', LIBPATH='editor/ui_menus')
- srcenv.Append(LIBS='editortools', LIBPATH='editor/tools')
-+srcenv.Append(CPPPATH=env['CPPPATH'], LIBPATH=env['LIBPATH'])
- 
- SConscript('editor/SConscript')
- SConscript('ui/ui_basic/SConscript')