diff options
| author | vanilla <vanilla@FreeBSD.org> | 2007-06-17 11:50:22 +0800 |
|---|---|---|
| committer | vanilla <vanilla@FreeBSD.org> | 2007-06-17 11:50:22 +0800 |
| commit | 6000e9e5dbbf40077d3bfca733282294e11b24c2 (patch) | |
| tree | fb514939f6ca89bd3bfe51aeee548c2b1175f798 /games/widelands | |
| parent | 06b5b5532a4b511a6fe81ed5bdc0792276e5ea17 (diff) | |
| download | freebsd-ports-gnome-6000e9e5dbbf40077d3bfca733282294e11b24c2.tar.gz freebsd-ports-gnome-6000e9e5dbbf40077d3bfca733282294e11b24c2.tar.zst freebsd-ports-gnome-6000e9e5dbbf40077d3bfca733282294e11b24c2.zip | |
1: Fix build with x11-toolkits/qt33 installed
2: Do not create .sconsign files in system directories
PR: ports/113243
Submitted by: maintainer
Diffstat (limited to 'games/widelands')
| -rw-r--r-- | games/widelands/Makefile | 2 | ||||
| -rw-r--r-- | games/widelands/files/patch-SConstruct | 23 | ||||
| -rw-r--r-- | games/widelands/files/patch-src_SConscript | 19 |
3 files changed, 42 insertions, 2 deletions
diff --git a/games/widelands/Makefile b/games/widelands/Makefile index 5dca9e802e30..f8ca1004cee8 100644 --- a/games/widelands/Makefile +++ b/games/widelands/Makefile @@ -31,8 +31,6 @@ SCONS_ARGS= CXXFLAGS="${CXXFLAGS}" LINKFLAGS="${LDFLAGS}" \ install_prefix=${PREFIX} bindir=bin datadir=share/widelands post-patch: - @${REINPLACE_CMD} -e 's|options=opts|options=opts, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems())|' \ - ${WRKSRC}/SConstruct @${REINPLACE_CMD} -e 's|, True||' ${WRKSRC}/worlds/SConscript @${RM} -f ${WRKSRC}/worlds/SConscript.bak diff --git a/games/widelands/files/patch-SConstruct b/games/widelands/files/patch-SConstruct new file mode 100644 index 000000000000..8d6d9c45949f --- /dev/null +++ b/games/widelands/files/patch-SConstruct @@ -0,0 +1,23 @@ +--- SConstruct.orig Mon Mar 12 21:39:30 2007 ++++ SConstruct Sat Jun 2 03:49:26 2007 +@@ -122,9 +122,11 @@ + # + # Create configuration objects + ++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') + diff --git a/games/widelands/files/patch-src_SConscript b/games/widelands/files/patch-src_SConscript new file mode 100644 index 000000000000..9112e596d900 --- /dev/null +++ b/games/widelands/files/patch-src_SConscript @@ -0,0 +1,19 @@ +--- 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(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(LIBPATH=env['LIBPATH']) + + SConscript('editor/SConscript') + SConscript('ui/ui_basic/SConscript') |