Date: Mon, 25 May 2020 18:32:55 +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: r536496 - in head: emulators/nonpareil/files games/dangerdeep/files games/gtkradiant/files lang/tolua++/files multimedia/flvtool++/files Message-ID: <202005251832.04PIWtlL058476@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon May 25 18:32:54 2020 New Revision: 536496 URL: https://svnweb.freebsd.org/changeset/ports/536496 Log: Fix build with scons 3.1.2 Added: head/lang/tolua++/files/patch-src-tests-SCsub (contents, props changed) Modified: head/emulators/nonpareil/files/patch-SConstruct head/emulators/nonpareil/files/patch-src_SConscript head/games/dangerdeep/files/patch-SConstruct head/games/gtkradiant/files/patch-SConscript head/games/gtkradiant/files/patch-SConstruct head/lang/tolua++/files/patch-src-lib-SCsub head/multimedia/flvtool++/files/patch-SConstruct Modified: head/emulators/nonpareil/files/patch-SConstruct ============================================================================== --- head/emulators/nonpareil/files/patch-SConstruct Mon May 25 18:31:40 2020 (r536495) +++ head/emulators/nonpareil/files/patch-SConstruct Mon May 25 18:32:54 2020 (r536496) @@ -1,6 +1,6 @@ --- SConstruct.orig 2008-08-24 00:37:34 UTC +++ SConstruct -@@ -24,28 +24,28 @@ release = '0.79' # should get from a fi +@@ -24,28 +24,28 @@ release = '0.79' # should get from a file, and use on conf_file = 'nonpareil.conf' #----------------------------------------------------------------------------- @@ -66,3 +66,21 @@ help = 'use Readline library for command editing and history (only when debugger CLI is enabled)', default = 1)) # only if has_debugger_cli +@@ -235,7 +235,7 @@ SConscript (['rom/SConscript', + # host platform code + #----------------------------------------------------------------------------- + +-native_env = env.Copy () ++native_env = env.Clone () + native_env ['build_target_only'] = 0 + SConscript ('src/SConscript', + build_dir = 'build/' + env ['host'], +@@ -256,7 +256,7 @@ SConscript ('asm/SConscript', + #----------------------------------------------------------------------------- + + if (env ['host'] != env ['target']): +- cross_build_env = env.Copy () ++ cross_build_env = env.Clone () + cross_build_env ['build_target_only'] = 1 + SConscript ('src/SConscript', + build_dir = 'build/' + env ['target'], Modified: head/emulators/nonpareil/files/patch-src_SConscript ============================================================================== --- head/emulators/nonpareil/files/patch-src_SConscript Mon May 25 18:31:40 2020 (r536495) +++ head/emulators/nonpareil/files/patch-src_SConscript Mon May 25 18:32:54 2020 (r536496) @@ -1,30 +1,114 @@ --- src/SConscript.orig 2008-08-24 00:37:18 UTC +++ src/SConscript -@@ -41,16 +41,11 @@ sdl_pkg_config_cmd = 'sdl-config --cflag +@@ -41,16 +41,11 @@ sdl_pkg_config_cmd = 'sdl-config --cflags --libs' build_env.Append (CPPPATH = ['.']) build_env.Append (CPPPATH = ['#/build/common']) # generated includes -build_env.Append (CCFLAGS = ['-Wall']) +build_env.Append (CCFLAGS = "%%CFLAGS%%") build_env.Append (YACCFLAGS = [ '-d', '-v' ]) -- ++build_env.Replace (CC = '%%CC%%') + -if build_env ['debug'] : - build_env.Append (CCFLAGS = ['-g']) -else: - build_env.Append (CCFLAGS = ['-O2']) -+build_env.Replace (CC = '%%CC%%') - +- if cross and ming and build_target_only: - build_env.Replace (CC = '/usr/local/mingw/bin/i586-mingw32msvc-gcc') 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 @@ if (not ming) or (cross and not build_ta +@@ -79,7 +74,7 @@ state_io_srcs = Split ("""state_write.c state_read.c"" + state_io_objs = [build_env.Object(src) for src in state_io_srcs]; + state_io_packages = "gtk+-2.0 gdk-2.0 gdk-pixbuf-2.0 glib-2.0 libxml-2.0" - csim_env = nonpareil_env.Copy () +-release_env = build_env.Copy (CPPDEFINES = [('NONPAREIL_RELEASE', build_env ['RELEASE'])]) ++release_env = build_env.Clone (CPPDEFINES = [('NONPAREIL_RELEASE', build_env ['RELEASE'])]) + common_objs.append (release_env.Object ('release.c')) + + build_env.ParseConfig(pkg_config_cmd + state_io_packages) +@@ -89,7 +84,7 @@ build_env.ParseConfig(pkg_config_cmd + state_io_packag + #----------------------------------------------------------------------------- + + if build_env ['build_target_only'] == 0: +- str2png_env = build_env.Copy () ++ str2png_env = build_env.Clone () + + str2png_env.Append (CPPDEFINES = [('DEFAULT_PATH', 'image')]) + +@@ -196,7 +191,7 @@ if build_env ['build_target_only'] == 0: + #----------------------------------------------------------------------------- + + if not build_target_only: +- title_env = native_env.Copy (STR2PNG_STRING = 'NONPAREIL', ++ title_env = native_env.Clone (STR2PNG_STRING = 'NONPAREIL', + STR2PNG_OPTS = '-x 40 -y 44 -m 10') + + title_env.STR2PNG (target = 'nonpareil_title', +@@ -205,7 +200,7 @@ if not build_target_only: + native_env.PNG2C (target = '#build/common/nonpareil_title_png.c', + source = 'nonpareil_title.png') + +- rgoose_env = native_env.Copy (STR2PNG_STRING = '.', ++ rgoose_env = native_env.Clone (STR2PNG_STRING = '.', + STR2PNG_OPTS = '-x 40 -y 44') + + rgoose_env.STR2PNG (target = 'rgoose', +@@ -214,7 +209,7 @@ if not build_target_only: + native_env.PNG2C (target = '#build/common/rgoose_png.c', + source = 'rgoose.png') + +- lgoose_env = native_env.Copy (STR2PNG_STRING = ',', ++ lgoose_env = native_env.Clone (STR2PNG_STRING = ',', + STR2PNG_OPTS = '-x 40 -y 44') + + lgoose_env.STR2PNG (target = 'lgoose', +@@ -235,7 +230,7 @@ if not build_target_only: + # nonpareil + #----------------------------------------------------------------------------- + +-nonpareil_env = build_env.Copy () ++nonpareil_env = build_env.Clone () + + nonpareil_srcs = Split ("""proc.c glib_async_queue_source.c + about.c goose.c pixbuf_util.c +@@ -284,9 +279,9 @@ nonpareil_env.ParseConfig (pkg_config_cmd + nonpareil_ + if (not ming) or (cross and not build_target_only): + nonpareil_env.ParseConfig (sdl_pkg_config_cmd) + +-csim_env = nonpareil_env.Copy () ++csim_env = nonpareil_env.Clone () if not ming: - csim_env.Append (CPPDEFINES = [('DEFAULT_PATH', build_env ['libdir'])]) + csim_env.Append (CPPDEFINES = [('DEFAULT_PATH' + build_env ['libdir'])]) if build_env ['target'] == 'win32': csim_env.Append (CPPDEFINES = [('SHAPE_DEFAULT', "false")]) +@@ -296,7 +291,7 @@ if build_env ['has_debugger_gui']: + + if build_env ['has_debugger_cli']: + csim_env.Append (CPPDEFINES = [('HAS_DEBUGGER_CLI', 1)]) +- debugger_cli_env = csim_env.Copy () ++ debugger_cli_env = csim_env.Clone () + if build_env ['use_tcl']: + debugger_cli_env.Append (CPPDEFINES = [('USE_TCL', 1)]) + nonpareil_env.Append (LIBS = 'tcl') +@@ -325,7 +320,7 @@ nonpareil = nonpareil_env.Program (target = 'nonpareil + # udis + #----------------------------------------------------------------------------- + +-udis_env = build_env.Copy () ++udis_env = build_env.Clone () + + udis_srcs = Split ("""dis.c""") + +@@ -336,7 +331,7 @@ udis = udis_env.Program (target = 'udis', + # nsim_conv + #----------------------------------------------------------------------------- + +-nsim_conv_env = build_env.Copy () ++nsim_conv_env = build_env.Clone () + + nsim_conv_srcs = Split ("""nsim_conv.c + state_read_nsim.c state_write_nsim.c""") Modified: head/games/dangerdeep/files/patch-SConstruct ============================================================================== --- head/games/dangerdeep/files/patch-SConstruct Mon May 25 18:31:40 2020 (r536495) +++ head/games/dangerdeep/files/patch-SConstruct Mon May 25 18:32:54 2020 (r536496) @@ -1,6 +1,21 @@ ---- ./SConstruct.orig 2007-06-11 14:29:13.000000000 -0400 -+++ ./SConstruct 2014-08-11 09:56:15.000000000 -0400 -@@ -62,7 +62,7 @@ +--- SConstruct.orig 2007-06-11 18:29:13 UTC ++++ SConstruct +@@ -46,7 +46,7 @@ if sys.platform == 'win32': + env.Append(CPPDEFINES = ['USE_SSE']) + print 'Using x86 SSE/MMX optimizations with GCC intrinsics.' + datadir = './data' # use slashes as separator always. C/C++ want it so. +- build_dir = 'win32' ++ variant_dir = 'win32' + elif sys.platform == 'darwin': + print "Compiling for MacOSX" + env = Environment(ENV = os.environ) +@@ -57,12 +57,12 @@ elif sys.platform == 'darwin': + env.Append(CCFLAGS = '-Wall -g -O2 `sdl-config --cflags`') + env.Append(LINKFLAGS = '-F/System/Library/Frameworks -framework AGL -framework OpenGL -framework GLUT -framework Cocoa -framework SDL -framework SDL_image -framework SDL_mixer -framework SDL_net') + datadir = './data' # use slashes as separator always. C/C++ want it so. +- build_dir = 'macosx' ++ variant_dir = 'macosx' + osspecificsrc = Split("""Mac/SDLMain.m""") if (debug == 1): env.Append(CCFLAGS = '-g') env.Append(CPPDEFINES = ['DEBUG']) @@ -9,7 +24,7 @@ print "Compiling for FreeBSD Environment" env = Environment(ENV = os.environ) LOCALBASE = os.environ['LOCALBASE'] -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ elif (sys.platform == 'freebsd5') or (sys.platform == SDL_CONFIG = os.environ['SDL_CONFIG'] env.Replace(CC = os.environ['CC']) env.Replace(CXX = os.environ['CXX']) @@ -18,7 +33,7 @@ libpath = [LOCALBASE + '/lib', X11BASE + '/lib'] gllibs = ['GL', 'GLU'] sdllibs = ['SDL_image'] -@@ -79,7 +79,7 @@ +@@ -79,7 +79,7 @@ elif (sys.platform == 'freebsd5') or (sys.platform == cpuinfol = cpuinfof.readlines() mmxsupported = False ssesupported = False @@ -27,7 +42,7 @@ if i == '1\n': mmxsupported = True ssesupported = True -@@ -91,14 +91,15 @@ +@@ -91,14 +91,15 @@ elif (sys.platform == 'freebsd5') or (sys.platform == osspecificsrc += [] print 'Using x86 SSE/MMX optimizations.' @@ -44,7 +59,46 @@ + env.Append(LINKFLAGS = '`' + SDL_CONFIG + ' --libs`') + env.Append(LIBPATH = [LOCALBASE + '/lib', X11BASE + '/lib']) + datadir = '/usr/local/share/dangerdeep' -+ build_dir = 'freebsd' ++ variant_dir = 'freebsd' if (os.system('grep glBindProgram ' + X11BASE + '/include/GL/gl*.h > /dev/null') == 0): gllibdirs = [X11BASE + '/lib/', '/usr/lib/', LOCALBASE + '/lib/'] +@@ -179,7 +180,7 @@ else: + print 'Using x86 SSE/MMX optimizations with GCC intrinsics.' + env.Append(CCFLAGS = ccflags) + datadir = '/usr/local/share/dangerdeep' +- build_dir = 'linux' ++ variant_dir = 'linux' + # check for broken libGL, ignore undefined symbols then + if (os.system('grep glBindProgram /usr/include/GL/gl*.h > /dev/null') == 0): + gllibdirs = ['/usr/X11R6/lib/', '/usr/lib/', '/usr/local/lib/'] +@@ -208,7 +209,7 @@ if ARGUMENTS.get('installbindir', 0): + print 'Install binary path: ' + installbindir + print 'Using data dir: ' + datadir + +-target_dir = '#build' + os.sep + build_dir ++target_dir = '#build' + os.sep + variant_dir + source_base_dir = 'src' + + ################ configure +@@ -273,9 +274,9 @@ f.close() + + Export('env', 'gfxlibs', 'alllibs', 'installbindir', 'datadir', 'version', 'osspecificsrc') + +-SConscript(source_base_dir + os.sep + 'SConscript', build_dir = target_dir, duplicate = 0) ++SConscript(source_base_dir + os.sep + 'SConscript', variant_dir = target_dir, duplicate = 0) + +-BuildDir(target_dir, source_base_dir, duplicate=0) ++VariantDir(target_dir, source_base_dir, duplicate=0) + + ############### Helper functions + def findCVS(basedir): +@@ -304,7 +305,7 @@ def findCVS(basedir): + + ############### option so that "scons tarball" builds a tarball of source + # tar building works only on linux +-if (( build_dir == 'linux' ) or ( build_dir == 'freebsd' )) and (os.path.isdir('./CVS')): ++if (( variant_dir == 'linux' ) or ( variant_dir == 'freebsd' )) and (os.path.isdir('./CVS')): + basetarfilename = 'dangerdeep-' + version + os.system('rm -rf ' + basetarfilename) + os.system('ln -s . ' + basetarfilename) Modified: head/games/gtkradiant/files/patch-SConscript ============================================================================== --- head/games/gtkradiant/files/patch-SConscript Mon May 25 18:31:40 2020 (r536495) +++ head/games/gtkradiant/files/patch-SConscript Mon May 25 18:32:54 2020 (r536496) @@ -1,6 +1,77 @@ ---- SConscript.orig 2006-02-11 06:01:20.000000000 +0800 +--- SConscript.orig 2006-02-10 22:01:20 UTC +++ SConscript -@@ -359,8 +359,6 @@ module_env = g_env.Copy() +@@ -23,7 +23,7 @@ md5lib_lib = g_env.StaticLibrary(target='libs/md5lib', + + ddslib_lib = g_env.StaticLibrary(target='libs/ddslib', source='libs/ddslib/ddslib.c') + +-jpeg_env = g_env.Copy() ++jpeg_env = g_env.Clone() + jpeg_env.Prepend(CPPPATH = 'libs/jpeg6') + jpeg_src = 'jcomapi.cpp jdcoefct.cpp jdinput.cpp jdpostct.cpp jfdctflt.cpp jpgload.cpp jdapimin.cpp jdcolor.cpp jdmainct.cpp jdsample.cpp jidctflt.cpp jutils.cpp jdapistd.cpp jddctmgr.cpp jdmarker.cpp jdtrans.cpp jmemmgr.cpp jdatasrc.cpp jdhuff.cpp jdmaster.cpp jerror.cpp jmemnobs.cpp' + jpeg_lib = jpeg_env.StaticLibrary(target='libs/jpeg6', source=build_list('libs/jpeg6', jpeg_src)) +@@ -35,17 +35,17 @@ picomodel_src = 'picointernal.c picomodel.c picomodule + lwo/lwo2.c lwo/lwob.c lwo/pntspols.c lwo/surface.c lwo/vecmath.c lwo/vmap.c' + picomodel_lib = g_env.StaticLibrary(target='libs/picomodel', source=build_list('libs/picomodel', picomodel_src)) + +-#splines_env = g_env.Copy() ++#splines_env = g_env.Clone() + #splines_src = build_list('libs/splines', 'math_angles.cpp math_matrix.cpp math_quaternion.cpp math_vector.cpp q_parse.cpp q_shared.cpp splines.cpp util_str.cpp') + #splines_env['CPPPATH'].append('include') + #splines_lib = splines_env.StaticLibrary(target='libs/splines', source=splines_src) + +-profile_env = g_env.Copy(); ++profile_env = g_env.Clone(); + profile_env['CPPPATH'].append('include') + profile_src = 'profile.cpp file.cpp' + profile_lib = profile_env.StaticLibrary(target='libs/profile', source=build_list('libs/profile', profile_src)) + +-gtkutil_env = g_env.Copy(); ++gtkutil_env = g_env.Clone(); + gtkutil_env['CPPPATH'].append('include') + gtkutil_env.useGlib2() + gtkutil_env.useGtk2() +@@ -83,7 +83,7 @@ gtkutil_lib = gtkutil_env.StaticLibrary(target='libs/g + + # q3map --------------------------------------------------------------------------- + +-q3map_env = g_env.Copy() ++q3map_env = g_env.Clone() + q3map_env['CPPPATH'].append('include') + q3map_env.useXML2() + q3map_env.useGlib2() +@@ -160,7 +160,7 @@ q3map_env.Install(INSTALL, q3map_prog) + + # q3data --------------------------------------------------------------------------- + +-q3data_env = q3map_env.Copy() ++q3data_env = q3map_env.Clone() + + q3data_common_src = [ + 'common/aselib.c', +@@ -200,7 +200,7 @@ q3data_env.Install( INSTALL, q3data_prog ) + + # q2_tools --------------------------------------------------------------------------- + +-q2_tools_env = g_env.Copy() ++q2_tools_env = g_env.Clone() + q2_tools_env['CPPPATH'].append('include') + q2_tools_env.useXML2() + q2_tools_env.usePThread() +@@ -290,7 +290,7 @@ if ( OS != 'Darwin' ): + + # qdata3_heretic2 --------------------------------------------------------------------------- + +-heretic2_tools_env = g_env.Copy() ++heretic2_tools_env = g_env.Clone() + heretic2_tools_env['CPPPATH'].append('include') + heretic2_tools_env.useXML2() + heretic2_tools_env.usePThread() +@@ -355,48 +355,46 @@ if ( OS != 'Darwin' ): + + # radiant, modules and plugins ---------------------------------------------------- + +-module_env = g_env.Copy() ++module_env = g_env.Clone() module_env['CPPPATH'].append('include') if ( OS == 'Darwin' ): module_env['LINKFLAGS'] += '-dynamiclib -ldl ' @@ -9,9 +80,109 @@ module_env['LIBPREFIX'] = '' -@@ -485,7 +483,7 @@ module_env.Install(INSTALL + '/modules', +-vfspk3_env = module_env.Copy() ++vfspk3_env = module_env.Clone() + vfspk3_lst = build_list('plugins/vfspk3', 'vfspk3.cpp vfs.cpp archive.cpp') + vfspk3_env.useGlib2() + vfspk3_lib = vfspk3_env.SharedLibrarySafe(target='vfspk3', source=vfspk3_lst) + vfspk3_env.Install(INSTALL + '/modules', vfspk3_lib) - radiant_env = g_env.Copy() +-archivepak_env = module_env.Copy() ++archivepak_env = module_env.Clone() + archivepak_lst = build_list('plugins/archivepak', 'plugin.cpp archive.cpp pak.cpp') + archivepak_lib = archivepak_env.SharedLibrarySafe(target='archivepak', source=archivepak_lst, LIBS='cmdlib', LIBPATH='libs') + archivepak_env.Depends(archivepak_lib, cmdlib_lib) + archivepak_env.Install(INSTALL + '/modules', archivepak_lib) + +-archivewad_env = module_env.Copy() ++archivewad_env = module_env.Clone() + archivewad_lst = build_list('plugins/archivewad', 'plugin.cpp archive.cpp wad.cpp') + archivewad_lib = archivewad_env.SharedLibrarySafe(target='archivewad', source=archivewad_lst, LIBS='cmdlib', LIBPATH='libs') + archivewad_env.Depends(archivewad_lib, cmdlib_lib) + archivewad_env.Install(INSTALL + '/modules', archivewad_lib) + +-archivezip_env = module_env.Copy() ++archivezip_env = module_env.Clone() + archivezip_lst = build_list('plugins/archivezip', 'plugin.cpp archive.cpp pkzip.cpp zlibstream.cpp') + archivezip_env.useZLib() + archivezip_lib = archivezip_env.SharedLibrarySafe(target='archivezip', source=archivezip_lst, LIBS='cmdlib', LIBPATH='libs') + archivezip_env.Depends(archivezip_lib, cmdlib_lib) + archivezip_env.Install(INSTALL + '/modules', archivezip_lib) + +-shaders_env = module_env.Copy() ++shaders_env = module_env.Clone() + shaders_lst = build_list('plugins/shaders', 'shaders.cpp plugin.cpp') + shaders_env.useGlib2() + shaders_lib = shaders_env.SharedLibrarySafe(target='shaders', source=shaders_lst, LIBS='cmdlib', LIBPATH='libs') + shaders_env.Depends(shaders_lib, cmdlib_lib) + shaders_env.Install(INSTALL + '/modules', shaders_lib) + +-image_env = module_env.Copy() ++image_env = module_env.Clone() + image_lst = build_list('plugins/image', 'bmp.cpp jpeg.cpp image.cpp pcx.cpp tga.cpp dds.cpp') + image_lib = image_env.SharedLibrarySafe(target='image', source=image_lst, LIBS=['jpeg6', 'ddslib'], LIBPATH='libs') + image_env.Depends(image_lib, jpeg_lib) +@@ -411,26 +409,26 @@ imageq2_lst = build_list('plugins/imageq2', 'imageq2.c + imageq2_lib = module_env.SharedLibrarySafe(target='imageq2', source=imageq2_lst) + module_env.Install(INSTALL + '/modules', imageq2_lib) + +-mapq3_env = module_env.Copy() ++mapq3_env = module_env.Clone() + mapq3_lst=build_list('plugins/mapq3', 'plugin.cpp parse.cpp write.cpp') + mapq3_lib = mapq3_env.SharedLibrarySafe(target='mapq3', source=mapq3_lst, LIBS='cmdlib', LIBPATH='libs') + mapq3_env.Depends(mapq3_lib, cmdlib_lib) + mapq3_env.Install(INSTALL + '/modules', mapq3_lib) + +-imagepng_env = module_env.Copy() ++imagepng_env = module_env.Clone() + imagepng_lst = build_list('plugins/imagepng', 'plugin.cpp') + imagepng_env.usePNG() + imagepng_lib = imagepng_env.SharedLibrarySafe(target='imagepng', source=imagepng_lst) + imagepng_env.Install(INSTALL + '/modules', imagepng_lib) + +-mapxml_env = module_env.Copy() ++mapxml_env = module_env.Clone() + mapxml_lst = build_list('plugins/mapxml', 'plugin.cpp xmlparse.cpp xmlwrite.cpp') + mapxml_lib = mapxml_env.SharedLibrarySafe(target='mapxml', source=mapxml_lst) + mapxml_env.useXML2() + mapxml_env.useGlib2() + mapxml_env.Install(INSTALL + '/modules', mapxml_lib) + +-model_env = module_env.Copy() ++model_env = module_env.Clone() + model_lst = build_list('plugins/model', 'plugin.cpp model.cpp') + model_lib = model_env.SharedLibrarySafe(target='model', source=model_lst, LIBS=['mathlib', 'picomodel'], LIBPATH='libs') + model_env.Depends(model_lib, mathlib_lib) +@@ -445,7 +443,7 @@ entity_lst = build_list('plugins/entity', 'plugin.cpp + entity_lib = module_env.SharedLibrarySafe(target='entity', source=entity_lst) + module_env.Install(INSTALL + '/modules', entity_lib) + +-#bob_env = module_env.Copy() ++#bob_env = module_env.Clone() + #bob_env.useGtk2() + #bob_lst = build_list('contrib/bobtoolz/', + #'dialogs/dialogs-gtk.cpp bobToolz-GTK.cpp bsploader.cpp cportals.cpp DBobView.cpp \ +@@ -466,7 +464,7 @@ module_env.Install(INSTALL + '/modules', entity_lib) + + #prtview_lst = build_list('contrib/prtview', + #'AboutDialog.cpp ConfigDialog.cpp LoadPortalFileDialog.cpp portals.cpp prtview.cpp') +-#prtview_env = bob_env.Copy() ++#prtview_env = bob_env.Clone() + #prtview_env['CXXFLAGS'] += '-DGTK_PLUGIN ' + #prtview_env.SharedLibrarySafe(target='prtview', source=prtview_lst) + #prtview_env.Install(INSTALL + '/plugins', 'prtview.so') +@@ -478,14 +476,14 @@ module_env.Install(INSTALL + '/modules', entity_lib) + + #bkgrnd2d_list = build_list( 'contrib/bkgrnd2d', 'bkgrnd2d.cpp plugin.cpp dialog.cpp' ) + #bkgrnd2d_list.append( 'libs/libsynapse.a' ) +-#bkgrnd2d_env = module_env.Copy() ++#bkgrnd2d_env = module_env.Clone() + #bkgrnd2d_env.useGtk2() + #bkgrnd2d_env.SharedLibrarySafe( target='bkgrnd2d', source=bkgrnd2d_list ) + #bkgrnd2d_env.Install( INSTALL + '/plugins', 'bkgrnd2d.so' ) + +-radiant_env = g_env.Copy() ++radiant_env = g_env.Clone() radiant_env['CPPPATH'].append('include') -radiant_env['LINKFLAGS'] += '-ldl -lGL ' +radiant_env['LINKFLAGS'] += '-lX11 -lGL ' Modified: head/games/gtkradiant/files/patch-SConstruct ============================================================================== --- head/games/gtkradiant/files/patch-SConstruct Mon May 25 18:31:40 2020 (r536495) +++ head/games/gtkradiant/files/patch-SConstruct Mon May 25 18:32:54 2020 (r536496) @@ -1,5 +1,5 @@ ---- SConstruct.orig Fri Feb 10 19:01:20 2006 -+++ SConstruct Tue May 30 22:35:47 2006 +--- SConstruct.orig 2006-02-10 22:01:20 UTC ++++ SConstruct @@ -3,7 +3,6 @@ import commands, re, sys, os, pickle, string, popen2 @@ -8,7 +8,7 @@ # to access some internal stuff import SCons -@@ -11,7 +10,7 @@ +@@ -11,7 +10,7 @@ import SCons conf_filename='site.conf' # there is a default hardcoded value, you can override on command line, those are saved between runs # we only handle strings @@ -17,7 +17,7 @@ # help ------------------------------------------- -@@ -64,14 +63,7 @@ +@@ -64,14 +63,7 @@ print 'SCons ' + SCons.__version__ # TODO: detect Darwin / OSX # CPU type @@ -33,7 +33,7 @@ # OS OS = commands.getoutput('uname') -@@ -140,7 +132,7 @@ +@@ -140,7 +132,7 @@ def GetGCCVersion(name): ver_cc = GetGCCVersion(CC) ver_cxx = GetGCCVersion(CXX) @@ -42,7 +42,7 @@ print 'Compiler version check failed - need gcc 3.x or later:' print 'CC: %s %s\nCXX: %s %s' % ( CC, repr(ver_cc), CXX, repr(ver_cxx) ) Exit(1) -@@ -172,8 +164,8 @@ +@@ -172,8 +164,8 @@ LINK = CXX # common flags warningFlags = '-W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter ' warningFlagsCXX = '-Wno-non-virtual-dtor -Wreorder ' # -Wold-style-cast @@ -53,7 +53,7 @@ CPPPATH = [] if (BUILD == 'debug'): CXXFLAGS += '-g -D_DEBUG ' -@@ -190,7 +182,6 @@ +@@ -190,7 +182,6 @@ else: print 'Unknown build configuration ' + BUILD sys.exit( 0 ) @@ -61,7 +61,7 @@ if ( OS == 'Linux' ): # static -@@ -218,6 +209,11 @@ +@@ -218,6 +209,11 @@ if ( OS == 'Darwin' ): CPPPATH.append('/sw/include') CPPPATH.append('/usr/X11R6/include') LINKFLAGS += '-L/sw/lib -L/usr/lib -L/usr/X11R6/lib ' @@ -73,7 +73,7 @@ CPPPATH.append('libs') -@@ -248,7 +244,7 @@ +@@ -248,7 +244,7 @@ class idEnvironment(Environment): def useGtk2(self): self['CXXFLAGS'] += '`pkg-config gtk+-2.0 --cflags` ' self['CCFLAGS'] += '`pkg-config gtk+-2.0 --cflags` ' @@ -82,7 +82,7 @@ def useGtkGLExt(self): self['CXXFLAGS'] += '`pkg-config gtkglext-1.0 --cflags` ' -@@ -278,7 +276,7 @@ +@@ -278,7 +274,7 @@ class idEnvironment(Environment): print('ERROR: CheckLDD: target %s not found\n' % target[0]) Exit(1) # not using os.popen3 as I want to check the return code @@ -91,7 +91,7 @@ stdout_lines = ldd.fromchild.readlines() stderr_lines = ldd.childerr.readlines() ldd_ret = ldd.wait() -@@ -317,7 +313,13 @@ +@@ -317,8 +313,14 @@ g_env = idEnvironment() # export the globals GLOBALS = 'g_env INSTALL SETUP g_cpu' @@ -101,8 +101,18 @@ + if (ret[0] != 0): return None + info = re.search('(gcc|clang) version [0-9.]+', ret[1]) + return info.group(0) if info else None -+ -+radiant_makeversion('\\n%s' % get_compiler_info(CXX)) ++radiant_makeversion('\\n%s' % get_compiler_info(CXX)) ++ # end general configuration ---------------------- + # targets ---------------------------------------- +@@ -326,7 +328,7 @@ radiant_makeversion('\\ngcc version: %s.%s.%s' % ( ver + Default('.') + + Export('GLOBALS ' + GLOBALS) +-BuildDir(g_build, '.', duplicate = 0) ++VariantDir(g_build, '.', duplicate = 0) + SConscript(g_build + '/SConscript') + + # end targets ------------------------------------ Modified: head/lang/tolua++/files/patch-src-lib-SCsub ============================================================================== --- head/lang/tolua++/files/patch-src-lib-SCsub Mon May 25 18:31:40 2020 (r536495) +++ head/lang/tolua++/files/patch-src-lib-SCsub Mon May 25 18:32:54 2020 (r536496) @@ -1,6 +1,6 @@ ---- src/lib/SCsub.orig 2011-01-20 07:48:43.000000000 +0100 -+++ src/lib/SCsub 2011-01-20 07:58:30.000000000 +0100 -@@ -9,10 +9,7 @@ +--- src/lib/SCsub.orig 2008-04-21 00:05:35 UTC ++++ src/lib/SCsub +@@ -9,10 +9,7 @@ sources = [ 'tolua_to.c', ] Added: head/lang/tolua++/files/patch-src-tests-SCsub ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/tolua++/files/patch-src-tests-SCsub Mon May 25 18:32:54 2020 (r536496) @@ -0,0 +1,9 @@ +--- src/tests/SCsub.orig 2006-04-10 09:45:44 UTC ++++ src/tests/SCsub +@@ -1,5 +1,5 @@ + Import('env') +-env_tests = env.Copy() ++env_tests = env.Clone() + + env_tests.LuaBinding('tclassbind.cpp', 'tclass.pkg', 'tclass', use_own=1, use_typeid=1) + Modified: head/multimedia/flvtool++/files/patch-SConstruct ============================================================================== --- head/multimedia/flvtool++/files/patch-SConstruct Mon May 25 18:31:40 2020 (r536495) +++ head/multimedia/flvtool++/files/patch-SConstruct Mon May 25 18:32:54 2020 (r536496) @@ -1,11 +1,12 @@ --- SConstruct.orig 2012-03-09 14:32:30 UTC +++ SConstruct -@@ -1,5 +1,7 @@ +@@ -1,6 +1,7 @@ +import os + libd = '#lib/' -env = Environment(CPPFLAGS='-ggdb -O3 -Wall', LINKFLAGS='-ggdb') +-env.TargetSignatures('content') +env = Environment(CXX=os.environ['CXX'], CXXFLAGS=os.environ['CXXFLAGS'], ENV=os.environ) - env.TargetSignatures('content') Export('env libd') + SConscript('SConscript')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005251832.04PIWtlL058476>