cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fallout from scons update, from Omar Polo

Browse Source
This commit is contained in:
sthen 2021-10-31 17:30:22 +00:00
parent 398e409adc
commit 69d5bcb419
7 changed files with 110 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
games/boswars/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2021/10/17 12:19:12 sthen Exp $
# $OpenBSD: Makefile,v 1.28 2021/10/31 17:30:22 sthen Exp $
COMMENT= real-time strategy game
@ -6,16 +6,16 @@ V= 2.7
DISTNAME= boswars-${V}-src
PKGNAME= boswars-${V}
CATEGORIES= games x11
MASTER_SITES= http://www.boswars.org/dist/releases/
REVISION= 2
MASTER_SITES= https://www.boswars.org/dist/releases/
REVISION= 3
HOMEPAGE= http://www.boswars.org/
HOMEPAGE= https://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,14 @@ 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
pre-patch:
2to3 -w ${WRKSRC}/SConstruct
# 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 +56,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

45
games/boswars/patches/patch-SConstruct
View File

@ -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
$OpenBSD: patch-SConstruct,v 1.8 2021/10/31 17:30:22 sthen Exp $
Index: SConstruct
--- SConstruct.orig
+++ SConstruct
@@ -32,12 +32,12 @@ SConsignFile()
def DefineOptions(filename, args):
@ -47,7 +48,18 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09/24 04:53:18 brad Exp $
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,25 +68,25 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09/24 04:53:18 brad Exp $
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,13 +193,13 @@ def AutoConfigure(env):
conf = Configure(env)
## check for required libs ##
- 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 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!')
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!')
Exit(1)
@@ -207,12 +216,12 @@ def AutoConfigure(env):
@@ -207,12 +211,12 @@ def AutoConfigure(env):
Exit(1)
# Check for optional libraries #
@ -89,12 +101,21 @@ $OpenBSD: patch-SConstruct,v 1.7 2013/09/24 04:53:18 brad Exp $
# check for optional functions
if conf.CheckFunc('strcasestr'):
@@ -265,7 +274,7 @@ addBosWarsPaths(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

5
games/pingus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2020/10/21 00:05:36 sthen Exp $
# $OpenBSD: Makefile,v 1.24 2021/10/31 17:30:22 sthen Exp $
COMMENT= free Lemmings-like game
@ -31,6 +31,9 @@ NO_TEST= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/pingus/pingus_main.cpp
pre-patch:
2to3 -w ${WRKSRC}/SConscript
do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} \
${MODSCONS_ENV} \

4
misc/gpsd/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.85 2021/10/28 08:37:13 kirby Exp $
# $OpenBSD: Makefile,v 1.86 2021/10/31 17:30:22 sthen Exp $
COMMENT-main= service daemon that monitors one or more GPSes
COMMENT-x11= GUI test apps using gpsd
@ -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= *

5
net/serf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2021/02/03 22:22:42 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2021/10/31 17:30:22 sthen Exp $
COMMENT = high performance HTTP client library
DISTNAME = serf-1.3.9
@ -18,12 +18,15 @@ 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:
perl -pi -e \

23
net/serf/patches/patch-SConstruct Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-SConstruct,v 1.1 2021/10/31 17:30:22 sthen Exp $
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'])

28
net/serf/patches/patch-build_check_py Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-build_check_py,v 1.1 2021/10/31 17:30:22 sthen Exp $
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)