diff options
author | tnn <tnn@pkgsrc.org> | 2019-01-02 19:16:20 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2019-01-02 19:16:20 +0000 |
commit | 5aea2af4769d167c6aed2e2f9f5fb891c60afab6 (patch) | |
tree | f04f3d3dfb4e8a6f50acfff5fad53880eb09f03e /games/pingus | |
parent | 0639f8878f90d1ab63be193505cf43a7550932fe (diff) | |
download | pkgsrc-5aea2af4769d167c6aed2e2f9f5fb891c60afab6.tar.gz |
pingus: try to fix build with python-3
not fully tested because it is bombing with an unrelated error:
library 'boost_signals' not found
Diffstat (limited to 'games/pingus')
-rw-r--r-- | games/pingus/Makefile | 11 | ||||
-rw-r--r-- | games/pingus/distinfo | 4 | ||||
-rw-r--r-- | games/pingus/patches/patch-aa | 73 |
3 files changed, 75 insertions, 13 deletions
diff --git a/games/pingus/Makefile b/games/pingus/Makefile index 24e9369e59f..8a866e683b3 100644 --- a/games/pingus/Makefile +++ b/games/pingus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2018/12/13 19:51:57 adam Exp $ +# $NetBSD: Makefile,v 1.31 2019/01/02 19:16:20 tnn Exp $ DISTNAME= pingus-0.7.3 PKGREVISION= 22 @@ -10,18 +10,15 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://pingus.seul.org/ COMMENT= Lemmings(TM) Clone -BUILD_DEPENDS+= scons>=0.96:../../devel/scons USE_LANGUAGES= c c++11 -MAKE_JOBS?= 1 - do-configure: cd ${WRKSRC} && \ - ${PKGSRC_SETENV} ${MAKE_ENV} scons configure CXX=${CXX:Q} CPPPATH=${PREFIX}/include LIBPATH=${PREFIX}/lib + ${PKGSRC_SETENV} ${MAKE_ENV} ${SCONSBIN} configure CXX=${CXX:Q} CPPPATH=${PREFIX}/include LIBPATH=${PREFIX}/lib do-build: cd ${WRKSRC} && \ - ${PKGSRC_SETENV} ${MAKE_ENV} scons ${_MAKE_JOBS} + ${PKGSRC_SETENV} ${MAKE_ENV} ${SCONSBIN} -j${MAKE_JOBS:U1} do-install: cd ${WRKSRC} && ./install.sh ${DESTDIR}${PREFIX} @@ -29,6 +26,8 @@ do-install: .include "../../audio/SDL_mixer/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" +PYTHON_FOR_BUILD_ONLY?= yes +.include "../../devel/scons/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/pingus/distinfo b/games/pingus/distinfo index e55565abf36..18a89bb04f3 100644 --- a/games/pingus/distinfo +++ b/games/pingus/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 20:57:01 agc Exp $ +$NetBSD: distinfo,v 1.9 2019/01/02 19:16:20 tnn Exp $ SHA1 (pingus-0.7.3.tar.bz2) = ca7fe5cea65fb3392d1e81056a879831925502f2 RMD160 (pingus-0.7.3.tar.bz2) = 664d259a98a172d10480be9aa4ec87a424ecd6f1 SHA512 (pingus-0.7.3.tar.bz2) = 9992fce8343e44da1b411eeb4468cb44cd42750f222836f51997e10e696bf742e3dbffca4ee063c1795f1350bd2ea81d20afa943dda123c024851e1b8bbd9c29 Size (pingus-0.7.3.tar.bz2) = 11127278 bytes -SHA1 (patch-aa) = ab9b2c2da878ec75ef0db438bdd38dbf40ed0563 +SHA1 (patch-aa) = 0c2c7e599ae3782d45813221f1c31fa5c66514dc SHA1 (patch-ab) = 2f897472e0c006e6fa325c17eda34b05d0ba6a01 SHA1 (patch-ac) = f0c357e4b5d5b71eacac243c15792b3a78a146ec SHA1 (patch-src_font.cpp) = 2bf0b3c31e18aae94269c09c92fa632cbf1c8070 diff --git a/games/pingus/patches/patch-aa b/games/pingus/patches/patch-aa index cfdaaf5dcd5..0a06637a874 100644 --- a/games/pingus/patches/patch-aa +++ b/games/pingus/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2015/01/21 15:19:31 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2019/01/02 19:16:21 tnn Exp $ NetBSD config & path fixes +python 3.x support --- SConstruct.orig 2010-03-18 13:34:15.000000000 +0000 +++ SConstruct @@ -37,7 +38,7 @@ NetBSD config & path fixes context.Message('Check how to call iconv...') for i in ['', 'const']: -@@ -408,7 +414,7 @@ if ('configure' in COMMAND_LINE_TARGETS) +@@ -408,20 +414,20 @@ if ('configure' in COMMAND_LINE_TARGETS) not (os.path.exists('config.py') and os.path.exists('config.h')) and \ not GetOption('clean'): opts = DefineOptions(None, ARGUMENTS) @@ -46,8 +47,16 @@ NetBSD config & path fixes Help(opts.GenerateHelpText(env)) opts.Update(env) -@@ -421,7 +427,7 @@ if ('configure' in COMMAND_LINE_TARGETS) - if os.environ.has_key('PKG_CONFIG_PATH'): + +- if os.environ.has_key('PATH'): ++ if 'PATH' in os.environ: + env['ENV']['PATH'] = os.environ['PATH'] +- if os.environ.has_key('HOME'): ++ if 'HOME' in os.environ: + env['ENV']['HOME'] = os.environ['HOME'] + +- if os.environ.has_key('PKG_CONFIG_PATH'): ++ if 'PKG_CONFIG_PATH' in os.environ: env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH'] - env['CPPPATH'] += ['.', 'src/'] @@ -55,7 +64,61 @@ NetBSD config & path fixes config_h_defines = [] -@@ -535,7 +541,7 @@ if not ('configure' in COMMAND_LINE_TARG +@@ -496,16 +502,16 @@ if ('configure' in COMMAND_LINE_TARGETS) + env = config.Finish() + opts.Save("config.py", env) + +- print "Reports:" +- print reports ++ print("Reports:") ++ print(reports) + + if not fatal_error == "": +- print "Fatal Errors:" +- print fatal_error ++ print("Fatal Errors:") ++ print(fatal_error) + if not env['ignore_errors']: + Exit(1) + else: +- print "\nError are being ignored, the build continues" ++ print("\nError are being ignored, the build continues") + + config_h = open('config.h', 'w') + config_h.write('#define VERSION "0.7.2"\n') +@@ -515,27 +521,27 @@ if ('configure' in COMMAND_LINE_TARGETS) + config_h.write('#define %s %s\n' % (v, k)) + config_h.close() + if ('configure' in COMMAND_LINE_TARGETS): +- print "Configuration written to config.h and config.py, run:" +- print "" +- print " scons" +- print "" +- print "To start the compile" ++ print("Configuration written to config.h and config.py, run:") ++ print("") ++ print(" scons") ++ print("") ++ print("To start the compile") + else: +- print "Configuration written to config.h and config.py" ++ print("Configuration written to config.h and config.py") + ARGUMENTS = {} + + if not ('configure' in COMMAND_LINE_TARGETS): + if ARGUMENTS != {}: +- print "Error: You must not supply arguments to the compile step." +- print "Use:" +- print "" +- print " scons configure [ARGUMENTS]..." +- print "" +- print "If you want to change the build configuration." ++ print("Error: You must not supply arguments to the compile step.") ++ print("Use:") ++ print("") ++ print(" scons configure [ARGUMENTS]...") ++ print("") ++ print("If you want to change the build configuration.") os.sys.exit(1) opts = DefineOptions("config.py", {}) |