4 files changed, 203 insertions, 27 deletions

diff --git a/games/gtkradiant/Makefile b/games/gtkradiant/Makefile
index c50a6ea0e596..98b05076cea5 100644
--- a/games/gtkradiant/Makefile
+++ b/games/gtkradiant/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
 		libmhash.so:security/mhash \
 		libpng.so:graphics/png
 
-USES=		compiler:c++11-lang gnome pkgconfig python:build scons:python2 zip
+USES=		compiler:c++11-lang gnome pkgconfig python:build scons zip
 USE_GNOME=	gtk20 libxml2
 MAKE_ARGS=	${MAKE_ENV} BUILD=release
 SSP_UNSAFE=	yes
diff --git a/games/gtkradiant/files/patch-SConscript b/games/gtkradiant/files/patch-SConscript
index 79fd739f2628..439e0bf2e52f 100644
--- a/games/gtkradiant/files/patch-SConscript
+++ b/games/gtkradiant/files/patch-SConscript
@@ -1,5 +1,11 @@
 --- SConscript.orig	2006-02-10 22:01:20 UTC
 +++ SConscript
+@@ -1,4 +1,4 @@
+-import os, sys, commands, string
++import os, sys, subprocess as commands, string
+ from makeversion import get_version
+ # OS Detection:
+ OS = commands.getoutput('uname')
 @@ -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')
@@ -189,3 +195,44 @@
  if ( OS == 'Darwin' ):
    radiant_env['CXXFLAGS'] += '-fno-common '
    radiant_env['CCFLAGS'] += '-fno-common '
+@@ -597,11 +595,11 @@ class setup_builder:
+   
+   def system(self, cmd):
+     if (self.g_dryrun):
+-      print cmd
++      print(cmd)
+     else:
+       sys.stdout.write(cmd)
+       ret = commands.getstatusoutput(cmd)
+-      print ret[1]
++      print(ret[1])
+       if (ret[0] != 0):
+         raise 'command failed'
+ 
+@@ -807,7 +805,7 @@ class setup_builder:
+     self.system('setup/linux/makeself/makeself.sh ' + self.SETUP_DIR + ' ' + self.SETUP_TARGET + ' "GtkRadiant ' + self.line + ' setup" ./setup.sh')
+     if (self.g_darwin):
+       def build_fink_deb(self):
+-        print "Building installer .deb\n"
++        print("Building installer .deb\n")
+         self.F_REV = '1'
+         self.FINKINFO_DIR = '/sw/fink/10.2/unstable/main/finkinfo/games'
+         self.TARBALL_DIR='radiant-' + self.F_REV + '.' + self.major 
+@@ -833,7 +831,7 @@ class setup_builder:
+     else:
+       self.g_darwin = 0
+     (self.line, self.major, self.minor) = get_version()
+-    print 'Setup: GtkRadiant %s' % self.line  
++    print('Setup: GtkRadiant %s' % self.line)
+     if ( self.g_darwin ):
+       self.SETUP_IMAGE_OS = '../loki_setup/image'
+     else:
+@@ -860,7 +858,7 @@ class setup_builder:
+       self.DO_GAME_ET=0
+       self.DO_GAME_HER2=0
+     # verbose a bit
+-    print 'version: %s major: %s minor: %s\neditor core: %d\nq3: %d\nwolf: %d\net: %d\ndoom3: %d\nq2: %d\nher2: %d' % (self.line, self.major, self.minor, self.DO_CORE, self.DO_GAME_Q3, self.DO_GAME_WOLF, self.DO_GAME_ET, self.DO_GAME_DOOM3, self.DO_GAME_Q2, self.DO_GAME_HER2)
++    print('version: %s major: %s minor: %s\neditor core: %d\nq3: %d\nwolf: %d\net: %d\ndoom3: %d\nq2: %d\nher2: %d' % (self.line, self.major, self.minor, self.DO_CORE, self.DO_GAME_Q3, self.DO_GAME_WOLF, self.DO_GAME_ET, self.DO_GAME_DOOM3, self.DO_GAME_Q2, self.DO_GAME_HER2))
+     if (self.DO_CORE):
+       self.copy_core()
+     if (self.DO_GAME_Q3):
diff --git a/games/gtkradiant/files/patch-SConstruct b/games/gtkradiant/files/patch-SConstruct
index 8673e4f878fc..7484c3a34b55 100644
--- a/games/gtkradiant/files/patch-SConstruct
+++ b/games/gtkradiant/files/patch-SConstruct
@@ -1,8 +1,11 @@
 --- SConstruct.orig	2006-02-10 22:01:20 UTC
 +++ SConstruct
-@@ -3,7 +3,6 @@
+@@ -1,9 +1,8 @@
+ # scons build script
+ # http://scons.sourceforge.net
  
- import commands, re, sys, os, pickle, string, popen2
+-import commands, re, sys, os, pickle, string, popen2
++import subprocess as commands, re, sys, os, pickle, string
  from makeversion import radiant_makeversion, get_version
 -from osx_setup import do_osx_setup
  
@@ -17,7 +20,16 @@
  
  # help -------------------------------------------
  
-@@ -64,14 +63,7 @@ print 'SCons ' + SCons.__version__
+@@ -55,7 +54,7 @@ SETUP
+ #EnsurePythonVersion(2,1)
+ # above 0.90
+ EnsureSConsVersion( 0, 96 )
+-print 'SCons ' + SCons.__version__
++print('SCons ' + SCons.__version__)
+ 
+ # end sanity -------------------------------------
+ 
+@@ -64,18 +63,11 @@ print 'SCons ' + SCons.__version__
  # TODO: detect Darwin / OSX
  
  # CPU type
@@ -33,16 +45,83 @@
  
  # OS
  OS = commands.getoutput('uname')
-@@ -140,7 +132,7 @@ def GetGCCVersion(name):
+-print "OS=\"" + OS + "\""
++print("OS=\"" + OS + "\"")
+ 
+ if (OS == 'Linux'):
+   # libc .. do the little magic!
+@@ -99,13 +91,15 @@ g_build_root = 'build'
+ 
+ site_dict = {}
+ if (os.path.exists(conf_filename)):
+-	site_file = open(conf_filename, 'r')
++	print( conf_filename )
++	site_file = open(conf_filename, 'rb')
+ 	p = pickle.Unpickler(site_file)
+-	site_dict = p.load()
+-	print 'Loading build configuration from ' + conf_filename
++	try: site_dict = p.load()
++	except EOFError: site_dict = {}
++	print('Loading build configuration from ' + conf_filename)
+ 	for k, v in site_dict.items():
+ 		exec_cmd = k + '=\"' + v + '\"'
+-		print exec_cmd
++		print(exec_cmd)
+ 		exec(exec_cmd)
+ 
+ # end site settings ------------------------------
+@@ -113,9 +107,9 @@ if (os.path.exists(conf_filename)):
+ # command line settings --------------------------
+ 
+ for k in serialized:
+-	if (ARGUMENTS.has_key(k)):
++	if (k in ARGUMENTS):
+ 		exec_cmd = k + '=\"' + ARGUMENTS[k] + '\"'
+-		print 'Command line: ' + exec_cmd
++		print('Command line: ' + exec_cmd)
+ 		exec(exec_cmd)
+ 
+ # end command line settings ----------------------
+@@ -123,14 +117,14 @@ for k in serialized:
+ # sanity check -----------------------------------
+ 
+ if (SETUP == '1' and BUILD != 'release' and BUILD != 'info'):
+-  print 'Forcing release build for setup'
++  print('Forcing release build for setup')
+   BUILD = 'release'
+ 
+ def GetGCCVersion(name):
+   ret = commands.getstatusoutput('%s -dumpversion' % name)
+   if ( ret[0] != 0 ):
+     return None
+-  vers = string.split(ret[1], '.')
++  vers = ret[1].split('.')
+   if ( len(vers) == 2 ):
+     return [ vers[0], vers[1], 0 ]
+   elif ( len(vers) == 3 ):
+@@ -140,9 +134,9 @@ def GetGCCVersion(name):
  ver_cc = GetGCCVersion(CC)
  ver_cxx = GetGCCVersion(CXX)
  
 -if ( ver_cc is None or ver_cxx is None or ver_cc[0] < '3' or ver_cxx[0] < '3' or ver_cc != ver_cxx ):
-+if ( ver_cc is None or ver_cxx is None or ver_cc[0] < 3 or ver_cxx[0] < 3 or ver_cc != ver_cxx ):
-   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) )
+-  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) )
++if ( ver_cc is None or ver_cxx is None or int(ver_cc[0]) < 3 or int(ver_cxx[0]) < 3 or ver_cc != ver_cxx ):
++  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 @@ LINK = CXX
+ 
+ # end sanity check -------------------------------
+@@ -153,7 +147,7 @@ for k in serialized:
+ 	exec_cmd = 'site_dict[\'' + k + '\'] = ' + k
+ 	exec(exec_cmd)
+ 
+-site_file = open(conf_filename, 'w')
++site_file = open(conf_filename, 'wb')
+ p = pickle.Pickler(site_file)
+ p.dump(site_dict)
+ site_file.close()
+@@ -172,8 +166,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,15 +132,25 @@
  CPPPATH = []
  if (BUILD == 'debug'):
  	CXXFLAGS += '-g -D_DEBUG '
-@@ -190,7 +182,6 @@ else:
- 	print 'Unknown build configuration ' + BUILD
+@@ -182,15 +176,14 @@ elif (BUILD == 'release'):
+ 	CXXFLAGS += '-O2 '
+ 	CCFLAGS += '-O2 '
+ elif ( BUILD == 'info' ):
+-	print 'Preparing OSX release'
++	print('Preparing OSX release')
+ 	( line, major, minor ) = get_version()
+ 	do_osx_setup( major, minor, 'osx-radiant-%s.run' % line )
+ 	sys.exit( 0 )
+ else:
+-	print 'Unknown build configuration ' + BUILD
++	print('Unknown build configuration ' + BUILD)
  	sys.exit( 0 )
  
 -LINKFLAGS = ''
  if ( OS == 'Linux' ):
  
    # static
-@@ -218,6 +209,11 @@ if ( OS == 'Darwin' ):
+@@ -218,6 +211,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 +162,7 @@
  
  CPPPATH.append('libs')
  
-@@ -248,7 +244,7 @@ class idEnvironment(Environment):
+@@ -248,7 +246,7 @@ class idEnvironment(Environment):
    def useGtk2(self):
      self['CXXFLAGS'] += '`pkg-config gtk+-2.0 --cflags` '
      self['CCFLAGS'] += '`pkg-config gtk+-2.0 --cflags` '
@@ -82,16 +171,45 @@
     
    def useGtkGLExt(self):
      self['CXXFLAGS'] += '`pkg-config gtkglext-1.0 --cflags` '
-@@ -278,7 +274,7 @@ class idEnvironment(Environment):
+@@ -278,18 +276,18 @@ 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
 -    ldd = popen2.Popen3('`which ldd` -r %s' % target[0], 1)
-+    ldd = popen2.Popen3('`which ldd` %s' % target[0], 1)
-     stdout_lines = ldd.fromchild.readlines()
-     stderr_lines = ldd.childerr.readlines()
+-    stdout_lines = ldd.fromchild.readlines()
+-    stderr_lines = ldd.childerr.readlines()
++    ldd = commands.Popen(['ldd', str(file)], 1, stdout=commands.PIPE, stderr=commands.PIPE)
++    stdout_lines = ldd.stdout.readlines()
++    stderr_lines = ldd.stderr.readlines()
      ldd_ret = ldd.wait()
-@@ -317,8 +313,14 @@ g_env = idEnvironment()
+     del ldd
+     have_undef = 0
+     if ( ldd_ret != 0 ):
+-        print "ERROR: ldd command returned with exit code %d" % ldd_ret
++        print("ERROR: ldd command returned with exit code %d" % ldd_ret)
+         os.system('rm %s' % target[0])
+         Exit()
+     for i_line in stderr_lines:
+-        print repr(i_line)
++        print(repr(i_line))
+         regex = re.compile('undefined symbol: (.*)\t\\((.*)\\)\n')
+         if ( regex.match(i_line) ):
+             symbol = regex.sub('\\1', i_line)
+@@ -298,11 +296,11 @@ class idEnvironment(Environment):
+             except:
+                 have_undef = 1
+         else:
+-            print "ERROR: failed to parse ldd stderr line: %s" % i_line
++            print("ERROR: failed to parse ldd stderr line: %s" % i_line)
+             os.system('rm %s' % target[0])
+             Exit(1)
+     if ( have_undef ):
+-        print "ERROR: undefined symbols"
++        print("ERROR: undefined symbols")
+         os.system('rm %s' % target[0])
+         Exit(1)
+   
+@@ -317,8 +315,14 @@ g_env = idEnvironment()
  # export the globals
  GLOBALS = 'g_env INSTALL SETUP g_cpu'
  
@@ -107,7 +225,7 @@
  # end general configuration ----------------------
  
  # targets ----------------------------------------
-@@ -326,7 +328,7 @@ radiant_makeversion('\\ngcc version: %s.%s.%s' % ( ver
+@@ -326,7 +330,7 @@ radiant_makeversion('\\ngcc version: %s.%s.%s' % ( ver
  Default('.')
  
  Export('GLOBALS ' + GLOBALS)
diff --git a/games/gtkradiant/files/patch-makeversion.py b/games/gtkradiant/files/patch-makeversion.py
index 152ca7463f79..cf22a2732881 100644
--- a/games/gtkradiant/files/patch-makeversion.py
+++ b/games/gtkradiant/files/patch-makeversion.py
@@ -1,17 +1,24 @@
---- ./makeversion.py.orig	Sun Feb 12 16:47:01 2006
-+++ ./makeversion.py	Thu Mar 16 16:09:46 2006
-@@ -37,9 +37,7 @@
+--- makeversion.py.orig	2006-02-12 19:47:01 UTC
++++ makeversion.py
+@@ -37,15 +37,13 @@
  # ouput:
  #   include/aboutmsg.h
  
 -import sys, re, string, os
--
--import svn
 +import sys, re, string, os, platform
  
+-import svn
+-
  def get_version():
    # version
-@@ -68,9 +66,6 @@ def radiant_makeversion(append_about):
+   f = open('include/version.default', 'r')
+   buffer = f.read()
+-  line = string.split(buffer, '\n')[0]
++  line = buffer.split('\n')[0]
+   f.close()
+   sys.stdout.write("version: %s\n" % line)
+   exp = re.compile('^1\\.([^\\.]*)\\.([0-9]*)')
+@@ -68,12 +66,9 @@ def radiant_makeversion(append_about):
    f = open('include/RADIANT_MAJOR', 'w')
    f.write(major)
    f.close()
@@ -20,8 +27,12 @@
 -  f.close()
    # aboutmsg
    aboutfile = 'include/aboutmsg.default'
-   if ( os.environ.has_key('RADIANT_ABOUTMSG') ):
-@@ -82,7 +80,7 @@
+-  if ( os.environ.has_key('RADIANT_ABOUTMSG') ):
++  if ( 'RADIANT_ABOUTMSG' in os.environ ):
+     aboutfile = os.environ['RADIANT_ABOUTMSG']
+   line = None
+   if os.path.isfile(aboutfile):
+@@ -82,7 +77,7 @@ def radiant_makeversion(append_about):
      line = f.readline()
      f.close()
    else: