Date: Wed, 2 Oct 2019 19:51:24 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513620 - in head: emulators/nonpareil emulators/nonpareil/files games/glob2/files games/marsnomercy/files lang/tolua++/files x11/ipager x11/ipager/files Message-ID: <201910021951.x92JpOZ0080656@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Wed Oct 2 19:51:23 2019 New Revision: 513620 URL: https://svnweb.freebsd.org/changeset/ports/513620 Log: Fix build with scons 3.1.1 PR: 240584 Exp-run by: antoine Added: head/emulators/nonpareil/files/patch-SConstruct (contents, props changed) head/x11/ipager/files/patch-SConstruct (contents, props changed) Modified: head/emulators/nonpareil/Makefile head/emulators/nonpareil/files/patch-src_SConscript head/emulators/nonpareil/files/patch-src_printer.c head/emulators/nonpareil/files/patch-src_proc.c head/emulators/nonpareil/files/patch-src_util.c head/emulators/nonpareil/files/patch-src_util.h head/games/glob2/files/patch-SConstruct head/games/marsnomercy/files/patch-SConstruct head/lang/tolua++/files/patch-SConstruct head/x11/ipager/Makefile Modified: head/emulators/nonpareil/Makefile ============================================================================== --- head/emulators/nonpareil/Makefile Wed Oct 2 19:51:10 2019 (r513619) +++ head/emulators/nonpareil/Makefile Wed Oct 2 19:51:23 2019 (r513620) @@ -28,7 +28,7 @@ post-patch: 's|%%CFLAGS%%|${CFLAGS}| ; \ s|%%CC%%|${CC}|' ${WRKSRC}/src/SConscript @${REINPLACE_CMD} -E \ - "s|('/usr/local')|\1,PathOption.PathAccept|" ${WRKSRC}/SConstruct + "s|('/usr/local')|\1,PathVariable.PathAccept|" ${WRKSRC}/SConstruct @${REINPLACE_CMD} -e \ 's|<stdint.h>|<inttypes.h>|g' ${WRKSRC}/src/*.[cly] Added: head/emulators/nonpareil/files/patch-SConstruct ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/nonpareil/files/patch-SConstruct Wed Oct 2 19:51:23 2019 (r513620) @@ -0,0 +1,68 @@ +--- SConstruct.orig 2008-08-24 00:37:34 UTC ++++ SConstruct +@@ -24,28 +24,28 @@ release = '0.79' # should get from a fi + conf_file = 'nonpareil.conf' + + #----------------------------------------------------------------------------- +-# Options ++# Variables + #----------------------------------------------------------------------------- + +-opts = Options (conf_file) ++opts = Variables (conf_file) + +-opts.AddOptions (EnumOption ('host', ++opts.AddVariables (EnumVariable ('host', + help = 'host build platform', + allowed_values = ('posix', 'win32'), + default = 'posix', + ignorecase = 1), + +- EnumOption ('target', ++ EnumVariable ('target', + help = 'execution target platform', + allowed_values = ('posix', 'win32'), + default = 'posix', + ignorecase = 1), + +- PathOption ('prefix', ++ PathVariable ('prefix', + 'installation path prefix', + '/usr/local'), + +- # Don't use PathOption for other paths, because we don't ++ # Don't use PathVariable for other paths, because we don't + # require the directories to preexist. + ('bindir', + 'path for executable files (default is $prefix/bin)', +@@ -59,25 +59,25 @@ opts.AddOptions (EnumOption ('host', + 'installation virtual root directory (for packaging)', + ''), + +- BoolOption ('debug', ++ BoolVariable ('debug', + help = 'compile for debugging', + default = 1), + + # Feature switches: + +- BoolOption ('has_debugger_gui', ++ BoolVariable ('has_debugger_gui', + help = 'enable debugger GUI interface', + default = 0), + +- BoolOption ('has_debugger_cli', ++ BoolVariable ('has_debugger_cli', + help = 'enable debugger command-line interface', + default = 0), + +- BoolOption ('use_tcl', ++ BoolVariable ('use_tcl', + help = 'use Tcl as debug command interpreter (only when debugger CLI is enabled)', + default = 1), # only if has_debugger_cli + +- BoolOption ('use_readline', ++ BoolVariable ('use_readline', + help = 'use Readline library for command editing and history (only when debugger CLI is enabled)', + default = 1)) # only if has_debugger_cli + Modified: head/emulators/nonpareil/files/patch-src_SConscript ============================================================================== --- head/emulators/nonpareil/files/patch-src_SConscript Wed Oct 2 19:51:10 2019 (r513619) +++ head/emulators/nonpareil/files/patch-src_SConscript Wed Oct 2 19:51:23 2019 (r513620) @@ -1,6 +1,6 @@ ---- src/SConscript.orig 2008-08-24 09:37:18.000000000 +0900 -+++ src/SConscript 2011-03-20 05:12:10.000000000 +0900 -@@ -41,16 +41,11 @@ +--- src/SConscript.orig 2008-08-24 00:37:18 UTC ++++ src/SConscript +@@ -41,16 +41,11 @@ sdl_pkg_config_cmd = 'sdl-config --cflag build_env.Append (CPPPATH = ['.']) build_env.Append (CPPPATH = ['#/build/common']) # generated includes @@ -19,7 +19,7 @@ build_env.Append (CCFLAGS = ['-mms-bitfields']) build_env.Append (CPPPATH = ['/usr/local/gtkwin/include']) # libpng build_env.Append (CPPPATH = ['/usr/local/gtkwin/SDL-1.2.8/include']) -@@ -286,7 +281,7 @@ +@@ -286,7 +281,7 @@ if (not ming) or (cross and not build_ta csim_env = nonpareil_env.Copy () if not ming: Modified: head/emulators/nonpareil/files/patch-src_printer.c ============================================================================== --- head/emulators/nonpareil/files/patch-src_printer.c Wed Oct 2 19:51:10 2019 (r513619) +++ head/emulators/nonpareil/files/patch-src_printer.c Wed Oct 2 19:51:23 2019 (r513620) @@ -1,6 +1,6 @@ ---- src/printer.c.orig 2012-05-09 13:00:47.000000000 +0200 -+++ src/printer.c 2012-05-09 13:01:08.000000000 +0200 -@@ -29,6 +29,7 @@ +--- src/printer.c.orig 2008-08-24 00:37:18 UTC ++++ src/printer.c +@@ -29,6 +29,7 @@ MA 02111, USA. #include <gtk/gtk.h> #include <png.h> Modified: head/emulators/nonpareil/files/patch-src_proc.c ============================================================================== --- head/emulators/nonpareil/files/patch-src_proc.c Wed Oct 2 19:51:10 2019 (r513619) +++ head/emulators/nonpareil/files/patch-src_proc.c Wed Oct 2 19:51:23 2019 (r513620) @@ -1,7 +1,6 @@ -diff -urN src.orig/proc.c src/proc.c ---- src.orig/proc.c Tue Jul 25 21:29:20 2006 -+++ src/proc.c Tue Jul 25 21:30:08 2006 -@@ -352,7 +352,13 @@ +--- src/proc.c.orig 2008-08-24 00:37:18 UTC ++++ src/proc.c +@@ -352,7 +352,13 @@ bool sim_read_object_file (sim_t *sim, c // Microsoft freopen() isn't compliant with the C standard, which allows // NULL for the filename if you're reopening an existing file handle. #else Modified: head/emulators/nonpareil/files/patch-src_util.c ============================================================================== --- head/emulators/nonpareil/files/patch-src_util.c Wed Oct 2 19:51:10 2019 (r513619) +++ head/emulators/nonpareil/files/patch-src_util.c Wed Oct 2 19:51:23 2019 (r513620) @@ -1,6 +1,6 @@ ---- src.orig/util.c Mon Jul 24 14:32:21 2006 -+++ src/util.c Mon Jul 24 14:34:48 2006 -@@ -130,6 +130,7 @@ +--- src/util.c.orig 2008-08-24 00:37:18 UTC ++++ src/util.c +@@ -130,6 +130,7 @@ void realloc_strcpy (char **dest, char * } @@ -8,7 +8,7 @@ // strlcpy will copy as much of src into dest as it can, up to one less than // the maximum length of dest specified by the argument l. Unlike strncpy(), // strlcpy() will always leave dest NULL-terminated on return. -@@ -139,6 +140,7 @@ +@@ -139,6 +140,7 @@ char *strlcpy (char *dest, const char *s dest [l - 1] = '\0'; return dest; } Modified: head/emulators/nonpareil/files/patch-src_util.h ============================================================================== --- head/emulators/nonpareil/files/patch-src_util.h Wed Oct 2 19:51:10 2019 (r513619) +++ head/emulators/nonpareil/files/patch-src_util.h Wed Oct 2 19:51:23 2019 (r513620) @@ -1,6 +1,6 @@ ---- src.orig/util.h Mon Jul 24 14:32:21 2006 -+++ src/util.h Mon Jul 24 14:33:52 2006 -@@ -56,7 +56,7 @@ +--- src/util.h.orig 2008-08-24 00:37:18 UTC ++++ src/util.h +@@ -56,7 +56,7 @@ void realloc_strcpy (char **dest, char * // strlcpy will copy as much of src into dest as it can, up to one less than // the maximum length of dest specified by the argument l. Unlike strncpy(), // strlcpy() will always leave dest NULL-terminated on return. Modified: head/games/glob2/files/patch-SConstruct ============================================================================== --- head/games/glob2/files/patch-SConstruct Wed Oct 2 19:51:10 2019 (r513619) +++ head/games/glob2/files/patch-SConstruct Wed Oct 2 19:51:23 2019 (r513620) @@ -1,16 +1,20 @@ ---- SConstruct.orig 2009-08-30 21:23:30.000000000 +0200 -+++ SConstruct 2014-06-10 23:51:36.000000000 +0200 -@@ -14,7 +14,9 @@ +--- SConstruct.orig 2009-08-30 19:23:30 UTC ++++ SConstruct +@@ -12,9 +12,11 @@ isLinuxPlatform = sys.platform=='linux2' + isDarwinPlatform = sys.platform=='darwin' - def establish_options(env): - opts = Options('options_cache.py') + +-def establish_options(env): +- opts = Options('options_cache.py') ++def establish_variables(env): ++ opts = Variables('variables_cache.py') + opts.Add("CCFLAGS", "Manually add to the CCFLAGS", "") opts.Add("CXXFLAGS", "Manually add to the CXXFLAGS", "-g") + opts.Add("LIBPATH", "Manually add to the LIBPATH", "") opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "-g") if isDarwinPlatform: opts.Add(PathOption("INSTALLDIR", "Installation Directory", "./")) -@@ -22,10 +24,10 @@ +@@ -22,14 +24,14 @@ def establish_options(env): opts.Add("INSTALLDIR", "Installation Directory", "/usr/local/share") opts.Add("BINDIR", "Binary Installation Directory", "/usr/local/bin") opts.Add("DATADIR", "Directory where data will be put, set to the same as INSTALLDIR", "/usr/local/share") @@ -25,7 +29,12 @@ opts.Add("font", "Build the game using an alternative font placed in the data/font folder", "sans.ttf") Help(opts.GenerateHelpText(env)) opts.Update(env) -@@ -111,14 +113,17 @@ +- opts.Save("options_cache.py", env) ++ opts.Save("variables_cache.py", env) + + + class Configuration: +@@ -111,14 +113,17 @@ def configure(env): missing.append("zlib") boost_thread = '' @@ -43,7 +52,7 @@ boost_date_time = '' if conf.CheckLib("boost_date_time") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"): -@@ -186,7 +191,7 @@ +@@ -186,7 +191,7 @@ def configure(env): env.Append(LIBS=['fribidi']) #Do checks for portaudio @@ -52,7 +61,7 @@ if env['mingw'] or isWindowsPlatform: print "--------" print "NOTE: It appears you are compiling under Windows. At this stage, PortAudio crashes Globulation 2 when voice chat is used." -@@ -194,9 +199,9 @@ +@@ -194,9 +199,9 @@ def configure(env): print "--------" else: if GetOption('portaudio'): @@ -64,3 +73,12 @@ else: print " no portaudio" print " no portaudio - although portaudio was found to be installed, you have " +@@ -236,7 +241,7 @@ def main(): + Exit(1) + + env["VERSION"] = "0.9.4.4" +- establish_options(env) ++ establish_variables(env) + #Add the paths to important mingw libraries + if env['mingw'] or isWindowsPlatform: + env.Append(LIBPATH=["C:/msys/1.0/local/lib", "C:/msys/1.0/lib"]) Modified: head/games/marsnomercy/files/patch-SConstruct ============================================================================== --- head/games/marsnomercy/files/patch-SConstruct Wed Oct 2 19:51:10 2019 (r513619) +++ head/games/marsnomercy/files/patch-SConstruct Wed Oct 2 19:51:23 2019 (r513620) @@ -1,7 +1,65 @@ ---- SConstruct.orig Mon Dec 18 19:56:15 2006 -+++ SConstruct Sun Feb 4 15:22:47 2007 -@@ -57,13 +57,19 @@ +--- SConstruct.orig 2006-12-19 00:56:15 UTC ++++ SConstruct +@@ -1,22 +1,22 @@ + import sys, os +-# create build environment and options ++# create build environment and variables + env = Environment() +-opts = Options() ++opts = Variables() + + # OPTION debug +-opts.Add(BoolOption('debug', 'Set to yes (or 1) to build for debug', 'no')) ++opts.Add(BoolVariable('debug', 'Set to yes (or 1) to build for debug', 'no')) + # OPTION strip +-opts.Add(BoolOption('strip', 'Set to no (or 0) to avoid stripping binaries', 'yes')) ++opts.Add(BoolVariable('strip', 'Set to no (or 0) to avoid stripping binaries', 'yes')) + # OPTION warning +-opts.Add(BoolOption('warnings', 'Set to yes (or 1) to print all warnings', 'yes')) ++opts.Add(BoolVariable('warnings', 'Set to yes (or 1) to print all warnings', 'yes')) + # OPTION with_opengl +-opts.Add(BoolOption('with_opengl', 'Set to no (or 0) if you do not want OpenGL support in the game', 'yes')) ++opts.Add(BoolVariable('with_opengl', 'Set to no (or 0) if you do not want OpenGL support in the game', 'yes')) + # OPTION root & prefix +-opts.Add(PathOption('root', 'Path to the fakeroot directory', '/')) +-opts.Add(PathOption('prefix', 'Path to prefix to default destinations', '/usr/local')) +-# Adding options to the environment +-env = Environment(options = opts) ++opts.Add(PathVariable('root', 'Path to the fakeroot directory', '/')) ++opts.Add(PathVariable('prefix', 'Path to prefix to default destinations', '/usr/local')) ++# Adding variables to the environment ++env = Environment(variables = opts) + + if 'install' in sys.argv: + root = ARGUMENTS.get('root', '/') +@@ -33,17 +33,17 @@ else: + + # OPTION no_mingw + if env['PLATFORM'] == 'cygwin': +- opts.Add(BoolOption('no_mingw', 'Set to yes (or 1) to build without mingw', 'no')) +- env = Environment(options = opts) ++ opts.Add(BoolVariable('no_mingw', 'Set to yes (or 1) to build without mingw', 'no')) ++ env = Environment(variables = opts) + + # PLATFORM mingw under cygwin + if env['PLATFORM'] == 'cygwin' and not int(env['no_mingw']): +- # add mingw specific options +- opts.AddOptions( +- PathOption('mingw_cygdir', 'where your mingw installation is located under cygwin', '/mingw'), +- PathOption('mingw_windir', 'where your mingw installation is located under cygwin', 'F:/Programmi/Dev-Cpp') ++ # add mingw specific variables ++ opts.AddVariables( ++ PathVariable('mingw_cygdir', 'where your mingw installation is located under cygwin', '/mingw'), ++ PathVariable('mingw_windir', 'where your mingw installation is located under cygwin', 'F:/Programmi/Dev-Cpp') + ) +- env = Environment(options = opts) ++ env = Environment(variables = opts) + + mingw_cygdir = env['mingw_cygdir'] + mingw_windir = env['mingw_windir'] +@@ -57,15 +57,21 @@ if env['PLATFORM'] == 'cygwin' and not i + # PLATFORM posix or pure cygwin else: + # Section used for FreeBSD port @@ -23,9 +81,12 @@ + env.Replace(LIBPATH = [LOCALBASE + '/lib',LOCALBASE+ '/lib']) + env.Append(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + ' --cflags`') - # generate help for options +-# generate help for options ++# generate help for variables Help(opts.GenerateHelpText(env)) -@@ -92,16 +98,16 @@ + + # build for debug +@@ -92,16 +98,16 @@ if data_dir != '': # installation requir if not env.GetOption('clean'): print ":: Checking for libs" conf = Configure(env) Modified: head/lang/tolua++/files/patch-SConstruct ============================================================================== --- head/lang/tolua++/files/patch-SConstruct Wed Oct 2 19:51:10 2019 (r513619) +++ head/lang/tolua++/files/patch-SConstruct Wed Oct 2 19:51:23 2019 (r513620) @@ -1,6 +1,26 @@ ---- SConstruct.orig 2006-04-10 13:45:44.000000000 +0400 -+++ SConstruct 2008-08-22 01:43:56.000000000 +0400 -@@ -17,6 +17,7 @@ +--- SConstruct.orig 2008-04-21 00:05:35 UTC ++++ SConstruct +@@ -7,21 +7,22 @@ if os.name == 'nt': + + env = Environment(tools = tools) + +-options_file = None ++variables_file = None + if sys.platform == 'linux2': +- options_file = "linux" ++ variables_file = "linux" + + elif 'msvc' in env['TOOLS']: +- options_file = "msvc" ++ variables_file = "msvc" + else: +- options_file = "posix" ++ variables_file = "posix" + +-opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) ++opts = Variables(["config_"+variables_file+".py", "custom.py", "custom_"+variables_file+".py"], ARGUMENTS) + opts.Add('CC', 'The C compiler.') + opts.Add('CXX', 'The C++ compiler (for the tests)') opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall']) opts.Add('LINK', 'The linker.') opts.Add('LINKFLAGS', 'Linker flags.', []) @@ -8,7 +28,7 @@ opts.Add('no_cygwin', 'Use -mno-cygwin to build using the mingw compiler on cygwin', 0) opts.Add('LIBS', 'libraries', []) opts.Add('LIBPATH', 'library path', []) -@@ -128,7 +129,9 @@ +@@ -145,7 +146,9 @@ Files will be installed on <prefix>/bin, ########### end of helper builders env['CPPPATH'] = '#/include' Modified: head/x11/ipager/Makefile ============================================================================== --- head/x11/ipager/Makefile Wed Oct 2 19:51:10 2019 (r513619) +++ head/x11/ipager/Makefile Wed Oct 2 19:51:23 2019 (r513620) @@ -33,10 +33,6 @@ post-patch: -e "s/\([^-]pthread'\)/\1, 'X11'/" \ ${WRKSRC}/SConstruct -pre-build: - # scons is too stupid to create DESTDIR by itself - @${MKDIR} ${STAGEDIR} - post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} Added: head/x11/ipager/files/patch-SConstruct ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/ipager/files/patch-SConstruct Wed Oct 2 19:51:23 2019 (r513620) @@ -0,0 +1,72 @@ +--- SConstruct.orig 2005-11-06 11:23:24 UTC ++++ SConstruct +@@ -7,15 +7,15 @@ SConsignFile() + ############################################### + # options + ipager_optfile = [ 'scons.opts', 'user.opts' ] +-ipager_options = Options(ipager_optfile) +-ipager_options.AddOptions( +- BoolOption('debug', 'build debug version', 0), +- BoolOption('debug_events', 'debug xserve events', 0), ++ipager_options = Variables(ipager_optfile) ++ipager_options.AddVariables( ++ BoolVariable('debug', 'build debug version', 0), ++ BoolVariable('debug_events', 'debug xserve events', 0), + +- BoolOption('xinerama', 'support xinerama', 0), ++ BoolVariable('xinerama', 'support xinerama', 0), + +- PathOption('PREFIX', 'install-path base', '/usr/local'), +- PathOption('DESTDIR', 'install to $DESTDIR/$PREFIX', '/') ++ PathVariable('PREFIX', 'install-path base', '/usr/local'), ++ PathVariable('DESTDIR', 'install to $DESTDIR/$PREFIX', '/') + ) + + +@@ -73,12 +73,12 @@ if conf.CheckCHeader('sys/time.h'): + + # sys/stat.h + if not conf.CheckCHeader('sys/stat.h'): +- print "missing 'sys/stat.h', install it." ++ print("missing 'sys/stat.h', install it.") + exit(1) + + # sys/types.h + if not conf.CheckCHeader('sys/types.h'): +- print "missing 'sys/types.h', install it." ++ print("missing 'sys/types.h', install it.") + exit(1) + + +@@ -90,7 +90,7 @@ if conf.CheckLibWithHeader('X11', 'X11/X + ipager_env.AppendUnique( + LIBS = ['X11','Xmu','Xext']) + else: +- print "missing x11-dev-stuff, install it." ++ print("missing x11-dev-stuff, install it.") + exit(1) + + +@@ -102,18 +102,18 @@ if conf.env['xinerama'] and conf.CheckLi + + + # imlib2 +-print "Checking for Imlib2... ", ++print("Checking for Imlib2... ") + if not conf.env.WhereIs('imlib2-config'): +- print "cant find 'imlib2-config." ++ print("cant find 'imlib2-config.") + exit(1) + else: + imlib2_env = Environment() + imlib2_env.ParseConfig('imlib2-config --cflags --libs') + if not imlib2_env.Dictionary()['LIBS']: +- print "missing imlib2, install it." ++ print("missing imlib2, install it.") + exit(1) + else: +- print "yes" ++ print("yes") + ipager_env.AppendUnique( + CPPPATH = imlib2_env.Dictionary()['CPPPATH'], + CCFLAGS = imlib2_env.Dictionary()['CCFLAGS'],
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910021951.x92JpOZ0080656>