Date: Sat, 2 Jun 2007 03:28:53 GMT From: Bartosz Fabianowski<freebsd@chillt.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/113243: [MAINTAINER] games/widelands: fix build and packaging Message-ID: <200706020328.l523Sr49079948@www.freebsd.org> Resent-Message-ID: <200706020330.l523U4e9029499@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113243
>Category: ports
>Synopsis: [MAINTAINER] games/widelands: fix build and packaging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 02 03:30:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Bartosz Fabianowski
>Release: 6-STABLE
>Organization:
>Environment:
>Description:
The attached patch fixes two problems in games/widelands:
* Fix build with x11-toolkits/qt33 installed
* Do not create .sconsign files in system directories
Since the fixes affect build and packaging only, no portrevision bump is necessary.
>How-To-Repeat:
>Fix:
cd /usr/ports/games
patch -p0 < patch-1.diff
Patch attached with submission follows:
diff -ruN widelands.orig/Makefile widelands/Makefile
--- widelands.orig/Makefile Sat May 19 21:07:49 2007
+++ widelands/Makefile Sat Jun 2 03:50:18 2007
@@ -31,8 +31,6 @@
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 -ruN widelands.orig/files/patch-SConstruct widelands/files/patch-SConstruct
--- widelands.orig/files/patch-SConstruct Thu Jan 1 01:00:00 1970
+++ widelands/files/patch-SConstruct Sat Jun 2 03:49:57 2007
@@ -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 -ruN widelands.orig/files/patch-src_SConscript widelands/files/patch-src_SConscript
--- widelands.orig/files/patch-src_SConscript Thu Jan 1 01:00:00 1970
+++ widelands/files/patch-src_SConscript Sat Jun 2 02:48:41 2007
@@ -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')
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706020328.l523Sr49079948>