and here's the fixes for the dependencies:
> find /usr/ports/ -type f -name Makefile -exec grep devel/scons {} +
databases/mongodb
Current version doesn't build with python 3 but I'm gonna deal
with this in a separate thread.
emulators/fceux
I've updated it to a newer version that switches to cmake and
waiting for bentley@ to test it. I'm sending the update for
scons anyway to let people test and review the diff in the
meantime :)
net/serf
Upstream switched newer scons and python 3 but has not yet
released anything. The changes are small and are all backports.
Made a `make test' just in case and the outcome is the same: 51
passes and 15 fails.
games/boswars
2to3 changes plus:
- some love for the makefile (only aesthetic changes)
- drop -fexpensive-optimizations: base clang complained that's a
"optimization flag not supported". Should be a no-op.
games/dangerdeep
2to3 needed. Played for a bit, not my favourite genre but seems
to work.
games/dxx-rebirth
can't do runtime testing but builds fine
games/endless-sky
builds and runs fine
games/godot
builds fine (from the master branch too)
games/pingus
2to3 then runs fine.
games/thedarkmod
breaks because of python3. I've talked with thfr@ and he's OK
with marking it as broken; current version is not playable
anyway because fetches data for a newer release that doesn't
work with our version. The latest version switches to cmake
btw.
The attached diff doesn't touch tdm yet thought.
graphics/mapnik
thanks to kirby@ that committed some tweaks the last month now
it builds fine with scons 4 too :)
misc/gpsd
needed a -fPIC but then builds.
Cheers,
Omar Polo
Index: net/serf/Makefile
===================================================================
RCS file: /home/cvs/ports/net/serf/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- net/serf/Makefile 3 Feb 2021 22:22:42 -0000 1.14
+++ net/serf/Makefile 25 Oct 2021 17:50:59 -0000
@@ -18,11 +18,14 @@ MODULES = devel/scons
LIB_DEPENDS = converters/libiconv \
devel/apr-util
MODSCONS_ENV= CC="${CC}" \
+ CFLAGS="${CFLAGS} -fPIC" \
PREFIX="${PREFIX}" \
DEBUG=0 \
APR=${LOCALBASE}/bin/apr-1-config \
APU=${LOCALBASE}/bin/apu-1-config
TEST_TARGET = check
+
+FIX_CRLF_FILES = build/check.py
# XXX scons doesn't support x.y library versioning scheme, only x.y.z
post-patch:
Index: net/serf/patches/patch-SConstruct
===================================================================
RCS file: net/serf/patches/patch-SConstruct
diff -N net/serf/patches/patch-SConstruct
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/serf/patches/patch-SConstruct 25 Oct 2021 17:53:19 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: SConstruct
+--- SConstruct.orig
++++ SConstruct
+@@ -166,7 +166,7 @@ env.Append(BUILDERS = {
+ match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+ 'SERF_MINOR_VERSION ([0-9]+).*'
+ 'SERF_PATCH_VERSION ([0-9]+)',
+- env.File('serf.h').get_contents(),
++ env.File('serf.h').get_contents().decode('utf-8'),
+ re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+ env.Append(MAJOR=str(MAJOR))
+@@ -183,7 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetO
+
+ unknown = opts.UnknownVariables()
+ if unknown:
+- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++ print('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+
+ apr = str(env['APR'])
+ apu = str(env['APU'])
Index: net/serf/patches/patch-build_check_py
===================================================================
RCS file: net/serf/patches/patch-build_check_py
diff -N net/serf/patches/patch-build_check_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ net/serf/patches/patch-build_check_py 25 Oct 2021 17:52:47 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+
+Index: build/check.py
+--- build/check.py.orig
++++ build/check.py
+@@ -52,16 +52,16 @@ if __name__ == '__main__':
+
+ # Find test responses and run them one by one
+ for case in glob.glob(testdir + "/testcases/*.response"):
+- print "== Testing %s ==" % (case)
++ print("== Testing %s ==" % (case))
+ try:
+ subprocess.check_call([SERF_RESPONSE_EXE, case])
+- except subprocess.CalledProcessError:
+- print "ERROR: test case %s failed" % (case)
++ except subprocess.CalledProcessError as x:
++ print("ERROR: test failed in '%s', exit code=%d" % (x.cmd,
x.returncode))
+ sys.exit(1)
+
+- print "== Running the unit tests =="
++ print("== Running the unit tests ==")
+ try:
+ subprocess.check_call(TEST_ALL_EXE)
+- except subprocess.CalledProcessError:
+- print "ERROR: test(s) failed in test_all"
++ except subprocess.CalledProcessError as x:
++ print("ERROR: test(s) failed in '%s', exit code=%d" % (x.cmd,
x.returncode))
+ sys.exit(1)
Index: games/boswars/Makefile
===================================================================
RCS file: /home/cvs/ports/games/boswars/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- games/boswars/Makefile 17 Oct 2021 12:19:12 -0000 1.27
+++ games/boswars/Makefile 26 Oct 2021 08:05:38 -0000
@@ -14,8 +14,8 @@ HOMEPAGE= http://www.boswars.org/
# GPLv2
PERMIT_PACKAGE= Yes
-WANTLIB += GL SDL X11 c m ogg png pthread ${COMPILER_LIBCXX} theora vorbis
z
-WANTLIB += ${MODLUA_WANTLIB}
+WANTLIB += ${COMPILER_LIBCXX} GL SDL X11 c m ogg png theora vorbis z
+WANTLIB += ${MODLUA_WANTLIB}
COMPILER = base-clang ports-gcc base-gcc
@@ -34,8 +34,11 @@ LIB_DEPENDS= devel/sdl \
NO_TEST= Yes
-DATA_DIR= campaigns graphics intro languages maps patches scripts sounds
units
+DATA_DIR= campaigns graphics intro languages maps patches \
+ scripts sounds units
+# the shipped images are considered broken by newer libpng: use opting
+# to fix them
pre-configure:
@${SUBST_CMD} ${WRKSRC}/SConstruct \
${WRKSRC}/engine/include/stratagus.h
@@ -50,7 +53,8 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/build/boswars-release \
${PREFIX}/bin/boswars
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/boswars/html
- ${INSTALL_DATA} ${WRKSRC}/doc/scripts/{*.html,*.py}
${PREFIX}/share/doc/boswars/html/scripts
+ ${INSTALL_DATA} ${WRKSRC}/doc/scripts/{*.html,*.py} \
+ ${PREFIX}/share/doc/boswars/html/scripts
.for i in ${DATA_DIR}
cp -R ${WRKSRC}/${i} ${PREFIX}/share/boswars
.endfor
Index: games/boswars/patches/patch-SConstruct
===================================================================
RCS file: /home/cvs/ports/games/boswars/patches/patch-SConstruct,v
retrieving revision 1.7
diff -u -p -r1.7 patch-SConstruct
--- games/boswars/patches/patch-SConstruct 24 Sep 2013 04:53:18 -0000
1.7
+++ games/boswars/patches/patch-SConstruct 21 Oct 2021 07:54:12 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-SConstruct,v 1.7 2013/09/24 04:53:18 brad Exp $
---- SConstruct.orig Sun Jun 2 08:41:11 2013
-+++ SConstruct Sat Sep 14 21:46:08 2013
+Index: SConstruct
+--- SConstruct.orig
++++ SConstruct
@@ -32,12 +32,12 @@ SConsignFile()
def DefineOptions(filename, args):
@@ -27,6 +28,15 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
Help(opts.GenerateHelpText(env))
mingw = env.Clone()
optionsChanged = True
+@@ -122,7 +125,7 @@ def ParseConfig(env, command, function=None):
+ flags['LINKFLAGS'].append(arg)
+ else:
+ flags['CCFLAGS'].append(arg)
+- apply(env.Append, (), flags)
++ env.Append(*(), **flags)
+ return static_libs
+
+ if function is None:
@@ -144,6 +147,10 @@ def CheckOpenGL(env, conf):
'LIBS': ['GL'],
'LIBPATH': ['/usr/lib', '/usr/X11R6/lib'],
@@ -47,7 +57,18 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
glconfig = opengl.get(platform, {})
for key in glconfig:
if key != 'LIBS':
-@@ -178,7 +187,7 @@ def CheckLuaLib(env, conf):
+@@ -168,17 +177,12 @@ def CheckOpenGL(env, conf):
+ return True
+
+ def CheckLuaLib(env, conf):
+- if not 'USE_WIN32' in env['CPPDEFINES']:
+- if env.WhereIs('pkg-config'):
+- for packagename in ['lua5.1', 'lua51', 'lua']:
+- exitcode,_ = ParseConfig(env, 'pkg-config --cflags --libs ' +
packagename)
+- if exitcode == 0:
+- break
++ env.ParseConfig('pkg-config --cflags --libs lua51')
+ if conf.CheckLibWithHeader('lua51', 'lua.h', 'c'):
return 1
if conf.CheckLibWithHeader('lua5.1', 'lua.h', 'c'):
return 1
@@ -56,7 +77,7 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
return 0
# make sure we have lualib which is included in lua 5.1
if conf.CheckFunc('luaopen_base'):
-@@ -189,13 +198,13 @@ def AutoConfigure(env):
+@@ -189,30 +193,30 @@ def AutoConfigure(env):
conf = Configure(env)
## check for required libs ##
@@ -64,17 +85,25 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
- print 'Did not find png library or headers, exiting!'
- Exit(1)
if not conf.CheckLibWithHeader('z', 'zlib.h', 'c'):
- print 'Did not find the zlib library or headers, exiting!'
+- print 'Did not find the zlib library or headers, exiting!'
++ print('Did not find the zlib library or headers, exiting!')
Exit(1)
- if not 'USE_WIN32' in env['CPPDEFINES'] and not
sys.platform.startswith('freebsd'):
+ if not conf.CheckLibWithHeader('png', 'png.h', 'c'):
-+ print 'Did not find png library or headers, exiting!'
++ print('Did not find png library or headers, exiting!')
+ Exit(1)
+ if not 'USE_WIN32' in env['CPPDEFINES'] and not
sys.platform.startswith('openbsd'):
if not conf.CheckLib('dl'):
- print 'Did not find dl library or header which is needed on some
systems for lua. Exiting!'
+- print 'Did not find dl library or header which is needed on some
systems for lua. Exiting!'
++ print('Did not find dl library or header which is needed on some
systems for lua. Exiting!')
Exit(1)
-@@ -207,12 +216,12 @@ def AutoConfigure(env):
+ if not CheckLuaLib(env, conf):
+- print 'Did not find required lua library. Exiting!'
++ print('Did not find required lua library. Exiting!')
+ Exit(1)
+ if not CheckOpenGL(env, conf):
+- print 'Did not find required OpenGL library. Exiting!'
++ print('Did not find required OpenGL library. Exiting!')
Exit(1)
# Check for optional libraries #
@@ -89,12 +118,48 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09
# check for optional functions
if conf.CheckFunc('strcasestr'):
-@@ -265,7 +274,7 @@ addBosWarsPaths(env)
+@@ -232,7 +236,7 @@ def AutoConfigure(env):
+ env.ParseConfig('sdl-config --libs')
+ if sys.platform != "darwin" and not '-Dmain=SDL_main' in env['CCFLAGS']:
+ if not conf.CheckLibWithHeader('SDL', 'SDL.h', 'c'):
+- print 'Did not find SDL library or headers, exiting!'
++ print('Did not find SDL library or headers, exiting!')
+ Exit(1)
+
+ env = conf.Finish()
+@@ -245,14 +249,14 @@ def AutoConfigureIfNeeded(env, name):
+ # Remove outdated cache file
+ os.remove(cachename)
+ if optionsChanged or not os.path.exists(cachename):
+- print cachename + " doesn't exist or out of date."
+- print "Generating new build config cache ..."
++ print(cachename + " doesn't exist or out of date.")
++ print("Generating new build config cache ...")
+ cache = DefineOptions(cachename, {})
+ AutoConfigure(env)
+ cache.Save(cachename, env)
+ else:
+ cache = DefineOptions(cachename, {})
+- print "Using " + cachename
++ print("Using " + cachename)
+ cache.Update(env)
+
+ AutoConfigureIfNeeded(env, '')
+@@ -265,7 +269,7 @@ addBosWarsPaths(env)
# define the different build environments (variants)
release = env.Clone()
-release.Append(CCFLAGS = Split('-O2 -pipe -fomit-frame-pointer
-fexpensive-optimizations -ffast-math'))
-+release.Append(CCFLAGS = Split('-fomit-frame-pointer
-fexpensive-optimizations -ffast-math'))
++release.Append(CCFLAGS = Split('-fomit-frame-pointer -ffast-math'))
if mingw['extrapath']:
mingw.Tool('crossmingw', toolpath = ['tools/scons/'])
+@@ -311,7 +315,7 @@ if sys.platform.startswith('linux') or sys.platform.st
+ def DefineVariant(venv, v, vv = None):
+ if vv == None:
+ vv = '-' + v
+- BuildDir('build/' + v, engineSourceDir, duplicate = 0)
++ VariantDir('build/' + v, engineSourceDir, duplicate = 0)
+ r = venv.Program('build/boswars' + vv, buildSourcesList('build/' + v))
+ Alias(v, 'boswars' + vv)
+ return r
Index: games/dangerdeep/patches/patch-SConstruct
===================================================================
RCS file: /home/cvs/ports/games/dangerdeep/patches/patch-SConstruct,v
retrieving revision 1.2
diff -u -p -r1.2 patch-SConstruct
--- games/dangerdeep/patches/patch-SConstruct 12 Jan 2018 20:13:31 -0000
1.2
+++ games/dangerdeep/patches/patch-SConstruct 21 Oct 2021 09:12:50 -0000
@@ -1,6 +1,143 @@
$OpenBSD: patch-SConstruct,v 1.2 2018/01/12 20:13:31 kili Exp $
---- SConstruct.orig Sat May 8 03:41:20 2010
-+++ SConstruct Sat Jun 1 11:12:50 2013
+Index: SConstruct
+--- SConstruct.orig
++++ SConstruct
+@@ -49,7 +49,7 @@ if (env.GetOption('clean') or conf == '0'):
+
+ if sys.platform == 'win32':
+ checkconf = False
+- print "Compiling for Win32 Environment"
++ print("Compiling for Win32 Environment")
+ env = Environment(ENV = os.environ)
+
+ env.Append(CPPDEFINES = ['WIN32','NOMINMAX','DEBUG'])
+@@ -68,7 +68,7 @@ if sys.platform == 'win32':
+ build_dir = 'win32'
+
+ elif sys.platform == 'darwin':
+- print "Compiling for MacOSX"
++ print("Compiling for MacOSX")
+ env = Environment(ENV = os.environ)
+ env.Append(CPPPATH =
['/System/Library/Frameworks/AGL.framework/Headers',
'/System/Library/Frameworks/OpenGL.framework/Headers','/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include'
, './Mac'])
+ libpath = ['/System/Library/Frameworks/OpenGL.framework/Libraries',
'/usr/local/lib', '/usr/lib']
+@@ -79,11 +79,11 @@ elif sys.platform == 'darwin':
+ datadir = './data' # use slashes as separator always. C/C++ want
it so.
+ build_dir = 'macosx'
+ osspecificsrc = Split("""Mac/SDLMain.m""")
+- if (debug == 1):
+- env.Append(CCFLAGS = '-g')
+- env.Append(CPPDEFINES = ['DEBUG'])
++ if (debug == 1):
++ env.Append(CCFLAGS = '-g')
++ env.Append(CPPDEFINES = ['DEBUG'])
+ elif (sys.platform == 'freebsd5') or (sys.platform == 'freebsd6') or
(sys.platform == 'freebsd7'):
+- print "Compiling for FreeBSD Environment"
++ print("Compiling for FreeBSD Environment")
+ env = Environment(ENV = os.environ)
+ LOCALBASE = os.environ['LOCALBASE']
+ X11BASE = os.environ['X11BASE']
+@@ -99,45 +99,45 @@ elif (sys.platform == 'freebsd5') or (sys.platform ==
+ cpuinfol = cpuinfof.readlines()
+ mmxsupported = False
+ ssesupported = False
+- for i in cpuinfol:
++ for i in cpuinfol:
+ if i == '1\n':
+ mmxsupported = True
+ ssesupported = True
+ if (usex86sse == 0) and (mmxsupported and ssesupported):
+- usex86sse = 1
+- if usex86sse >= 1:
++ usex86sse = 1
++ if usex86sse >= 1:
+ env.Append(CCFLAGS = '-msse')
+- env.Append(CPPDEFINES = ['USE_SSE'])
+- osspecificsrc += []
+- print 'Using x86 SSE/MMX optimizations.'
++ env.Append(CPPDEFINES = ['USE_SSE'])
++ osspecificsrc += []
++ print('Using x86 SSE/MMX optimizations.')
+
+- env.Replace(CCFLAGS = os.environ['CFLAGS'])
++ env.Replace(CCFLAGS = os.environ['CFLAGS'])
+ if (debug == 1):
+ env.Append(CCFLAGS = '-g')
+ env.Append(CPPDEFINES = ['DEBUG'])
+- env.Replace(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + '
--cflags`')
+- env.Append(LINKFLAGS = '`' + SDL_CONFIG + ' --libs`')
+- datadir = '/usr/local/share/dangerdeep'
+- build_dir = 'freebsd'
++ env.Replace(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + '
--cflags`')
++ env.Append(LINKFLAGS = '`' + SDL_CONFIG + ' --libs`')
++ datadir = '/usr/local/share/dangerdeep'
++ build_dir = 'freebsd'
+
+- if (checkconf == True and os.system('grep glBindProgram ' + X11BASE +
'/include/GL/gl*.h > /dev/null') == 0):
+- gllibdirs = [X11BASE + '/lib/', '/usr/lib/', LOCALBASE +
'/lib/']
+- gllibdir = ''
+- for i in gllibdirs:
+- if (os.system('test -f '+i+'libGL.so') == 0):
+- gllibdir = i
+- break
+- if (gllibdir == ''):
+- print 'ERROR: no libGL.so detected!'
+- else:
+- print 'Found GL library "'+gllibdir+'libGL.so"'
+- if (os.system('grep glBindProgram '+gllibdir+'libGL.so >
/dev/null') != 0):
+- print 'GL headers declare glBindProgram, but libGL.so
has no such symbol! Ignoring all undefined symbols...'
+- # I'm not sure which option will hopefully fix the
problem... so i use both...
+- env.Append(LINKFLAGS =
'--unresolved-symbols=ignore-all')
+- env.Append(LINKFLAGS = '-Xlinker --unresolved-symbols
-Xlinker ignore-all')
++ if (checkconf == True and os.system('grep glBindProgram ' + X11BASE +
'/include/GL/gl*.h > /dev/null') == 0):
++ gllibdirs = [X11BASE + '/lib/', '/usr/lib/', LOCALBASE +
'/lib/']
++ gllibdir = ''
++ for i in gllibdirs:
++ if (os.system('test -f '+i+'libGL.so') == 0):
++ gllibdir = i
++ break
++ if (gllibdir == ''):
++ print('ERROR: no libGL.so detected!')
++ else:
++ print('Found GL library "'+gllibdir+'libGL.so"')
++ if (os.system('grep glBindProgram '+gllibdir+'libGL.so >
/dev/null') != 0):
++ print('GL headers declare glBindProgram, but libGL.so
has no such symbol! Ignoring all undefined symbols...')
++ # I'm not sure which option will hopefully fix the
problem... so i use both...
++ env.Append(LINKFLAGS =
'--unresolved-symbols=ignore-all')
++ env.Append(LINKFLAGS = '-Xlinker --unresolved-symbols
-Xlinker ignore-all')
+ elif 0 != mingw32:
+- print "Compiling for mingw32 Environment"
++ print("Compiling for mingw32 Environment")
+ env = Environment(ENV = os.environ, tools = ['mingw'])
+
+ env.Append(CPPPATH = [ mingw32root + '/usr/include/', mingw32root +
'/usr/include/GL/', mingw32root + '/usr/include/SDL/' ] )
+@@ -171,12 +171,12 @@ elif 0 != mingw32:
+ osspecificsrc += []
+ env.Append(CCFLAGS = '-msse')
+ env.Append(CPPDEFINES = ['USE_SSE'])
+- print 'Using x86 SSE/MMX optimizations with GCC intrinsics.'
++ print('Using x86 SSE/MMX optimizations with GCC intrinsics.')
+ datadir = './data' # use slashes as separator always. C/C++ want
it so.
+ build_dir = 'mingw32'
+ else:
+ SConsignFile()
+- print "Compiling for GNU/Linux Environment (" + sys.platform + ")"
++ print("Compiling for GNU/Linux Environment (" + sys.platform + ")")
+ env = Environment(ENV = os.environ)
+
+ env.Append(CPPPATH = ['/usr/include/SDL', '/usr/include/GL'])
+@@ -192,10 +192,10 @@ else:
+
+ # allow arch to be over-ridden if need be.
+ if archflag != '':
+- print 'Using architecture: ' + archflag + ' (Changed from ' +
arch + ')'
++ print('Using architecture: ' + archflag + ' (Changed from ' +
arch + ')')
+ arch = archflag
+ else:
+- print 'Using architecture: ' + arch
++ print('Using architecture: ' + arch)
+
+ # Set libpath accordingly
+ if arch == 'x86_64':
@@ -207,8 +207,6 @@ else:
# Set libpath for real
libpath = [archlib, archlib + '/X11', '/usr/X11R6/lib']
@@ -18,7 +155,28 @@ $OpenBSD: patch-SConstruct,v 1.2 2018/01
env.Append(CPPDEFINES = ['DEBUG'])
elif (debug == -1):
ccflags += ' -g -O3 -mfpmath=sse -mmmx -msse -m3dnow'
-@@ -258,18 +255,18 @@ else:
+@@ -239,10 +236,10 @@ else:
+
+ if (useefence >= 1):
+ extralibs += ['efence']
+- print 'Linking to ElectricFence library!'
++ print('Linking to ElectricFence library!')
+ elif (useduma >= 1):
+ extralibs += ['duma']
+- print 'Linking to DUMA (EletricFence successor) library!'
++ print('Linking to DUMA (EletricFence successor) library!')
+ if (cvedit == 1):
+ env.Append(CPPDEFINES = ['CVEDIT'])
+
+@@ -252,25 +249,25 @@ else:
+ osspecificsrc += []
+ if (usex86sse >= 2):
+ env.Append(CPPDEFINES = ['USE_SSE_ALWAYS'])
+- print 'Using x86 SSE/MMX optimizations with GCC
intrinsics ALWAYS WITHOUT DETECTION!'
++ print('Using x86 SSE/MMX optimizations with GCC
intrinsics ALWAYS WITHOUT DETECTION!')
+ else:
+- print 'Using x86 SSE/MMX optimizations with GCC
intrinsics.'
++ print('Using x86 SSE/MMX optimizations with GCC
intrinsics.')
env.Append(CCFLAGS = ccflags)
# check for broken libGL, ignore undefined symbols then
@@ -32,15 +190,28 @@ $OpenBSD: patch-SConstruct,v 1.2 2018/01
gllibdir = i
break
if (gllibdir == ''):
- print 'ERROR: no libGL.so detected!'
+- print 'ERROR: no libGL.so detected!'
++ print('ERROR: no libGL.so detected!')
else:
- print 'Found GL library "'+gllibdir+'libGL.so"'
+- print 'Found GL library "'+gllibdir+'libGL.so"'
- if (os.system('grep glBindProgram '+gllibdir+'libGL.so >
/dev/null') != 0):
+- print 'GL headers declare glBindProgram, but libGL.so
has no such symbol! Ignoring all undefined symbols...'
++ print('Found GL library "'+gllibdir+'libGL.so"')
+ if (os.system('grep glBindProgram '+gllibdir+'libGL.so* >
/dev/null') != 0):
- print 'GL headers declare glBindProgram, but libGL.so
has no such symbol! Ignoring all undefined symbols...'
++ print('GL headers declare glBindProgram, but libGL.so
has no such symbol! Ignoring all undefined symbols...')
# I'm not sure which option will hopefully fix the
problem... so i use both...
env.Append(LINKFLAGS =
'--unresolved-symbols=ignore-all')
-@@ -289,6 +286,12 @@ target_dir = '#build' + os.sep + build_dir
+ env.Append(LINKFLAGS = '-Xlinker --unresolved-symbols
-Xlinker ignore-all')
+@@ -282,13 +279,19 @@ installbindir = '/usr/local/bin'
+ if ARGUMENTS.get('installbindir', 0):
+ installbindir = ARGUMENTS.get('installbindir', 0)
+
+-print 'Install binary path: ' + installbindir
+-print 'Using data dir: ' + datadir
++print('Install binary path: ' + installbindir)
++print('Using data dir: ' + datadir)
+
+ target_dir = '#build' + os.sep + build_dir
source_base_dir = 'src'
libpath = libpath + [target_dir]
env.Append(LIBPATH = libpath)
@@ -53,3 +224,38 @@ $OpenBSD: patch-SConstruct,v 1.2 2018/01
################ configure
if(checkconf == True):
+@@ -297,20 +300,20 @@ if(checkconf == True):
+ if (devel == 0):
+ for i in ['GL', 'GLU', 'SDL', 'SDL_image', 'SDL_mixer',
'fftw3', 'bz2']:
+ if not conf.CheckLib(i):
+- print 'Library ' + i + ' is missing, it must be
installed!'
++ print('Library ' + i + ' is missing, it must be
installed!')
+ Exit(1)
+ for i in ['gl.h', 'glu.h', 'SDL.h', 'SDL_image.h',
'SDL_mixer.h', 'fftw3.h', 'bzlib.h']:
+ if not conf.CheckHeader(i):
+- print 'Include file ' + i + ' is missing,
install matching development library!'
++ print('Include file ' + i + ' is missing,
install matching development library!')
+ Exit(1)
+ if conf.CheckLibWithHeader('fftw3f', 'fftw3.h', 'C'):
+- print 'fftw3 library supports float type. Using it...'
++ print('fftw3 library supports float type. Using it...')
+ fftwlib = 'fftw3f'
+ conf.env.Append(CPPDEFINES = ['WITH_FLOAT_FFTW'])
+ else:
+- print 'fftw3 library does not support float type.'
++ print('fftw3 library does not support float type.')
+ if conf.CheckLibWithHeader('avutil',
'ffmpeg/libavutil/avutil.h', 'C'):
+- print 'libavutil found...'
++ print('libavutil found...')
+ ffmpeg_available = True
+ else:
+ fftwlib = 'fftw3f'
+@@ -347,7 +350,7 @@ Export('env', 'gfxlibs', 'alllibs', 'installbindir', '
+
+ SConscript(source_base_dir + os.sep + 'SConscript', build_dir = target_dir,
duplicate = 0)
+
+-BuildDir(target_dir, source_base_dir, duplicate=0)
++VariantDir(target_dir, source_base_dir, duplicate=0)
+
+ ############### Helper functions
+ def findSVN(basedir):
Index: games/pingus/patches/patch-SConscript
===================================================================
RCS file: /home/cvs/ports/games/pingus/patches/patch-SConscript,v
retrieving revision 1.3
diff -u -p -r1.3 patch-SConscript
--- games/pingus/patches/patch-SConscript 21 Oct 2020 00:05:36 -0000
1.3
+++ games/pingus/patches/patch-SConscript 24 Aug 2021 19:00:42 -0000
@@ -13,6 +13,23 @@ Index: SConscript
self.opts.Add('LINKFLAGS', 'Linker Compiler flags', [])
self.opts.Add(BoolVariable('with_opengl', 'Build with OpenGL
support', True))
+@@ -126,12 +125,12 @@ class Project:
+ def configure_end(self):
+ self.env = self.conf.Finish()
+
+- print "Reports:"
+- print self.reports
++ print("Reports:")
++ print(self.reports)
+
+ if not self.fatal_error == "":
+- print "Fatal Errors:"
+- print self.fatal_error
++ print("Fatal Errors:")
++ print(self.fatal_error)
+ Exit(1)
+
+ def configure_gxx(self):
@@ -182,14 +181,13 @@ class Project:
else:
self.reports += " * XInput support: yes\n"
Index: misc/gpsd/Makefile
===================================================================
RCS file: /home/cvs/ports/misc/gpsd/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- misc/gpsd/Makefile 7 Aug 2021 12:41:15 -0000 1.84
+++ misc/gpsd/Makefile 25 Oct 2021 18:41:38 -0000
@@ -58,6 +58,8 @@ RUN_DEPENDS-x11 = ${BASE_PKGPATH} \
devel/desktop-file-utils \
x11/gtk+3
+CFLAGS += -fPIC
+
# the php display script doesn't depend on having any of gpsd around,
# it just sits there and looks pretty.
PKG_ARCH-php= *
