head 1.7; access; symbols pkgsrc-2019Q1:1.6.0.2 pkgsrc-2019Q1-base:1.6 pkgsrc-2018Q4:1.5.0.34 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.32 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.30 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.28 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.26 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.24 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.20 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.18 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.16 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.14 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.12 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.10 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.8 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.6 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.4 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.2 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.4.0.16 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.14 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.12 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.10 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.8 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.6 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.4 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.2 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.3.0.2 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.2.0.14 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.12 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.10 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.8 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.6 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.4 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.2 pkgsrc-2011Q1-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2019.05.12.06.17.30; author triaxx; state dead; branches; next 1.6; commitid pxKRB1tRBminBSmB; 1.6 date 2019.01.02.19.16.21; author tnn; state Exp; branches; next 1.5; commitid UslFw1tZlQes5f6B; 1.5 date 2015.01.21.15.19.31; author joerg; state Exp; branches; next 1.4; commitid iSY6tc6JM3e98U6y; 1.4 date 2013.02.16.11.21.25; author wiz; state Exp; branches; next 1.3; 1.3 date 2012.11.23.12.35.01; author joerg; state Exp; branches; next 1.2; 1.2 date 2011.01.20.23.41.02; author wiz; state Exp; branches; next 1.1; 1.1 date 2011.01.19.19.47.59; author kefren; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2011.01.19.19.47.59; author kefren; state Exp; branches; next ; desc @@ 1.7 log @pingus: update to 0.7.6 pkgsrc changes: * Disable configure target (SCons seems not to provide it) * Remove explicit use of SCons: use Makefile instead * Port deprecated Boost.Signals to Boost.Signals2 * Take MAINTENERship Changes: Pingus 0.7.6 (24/Dec/2011) ========================== * added new SVG icons for Pingus * added 10 new xmas themed levels * added ability to sort levelsets by priority Pingus 0.7.5 (25/Oct/2011) ========================== * fixed memory leak in OpenGL renderer * added support for Win32 cross-compilation with mingw32 * added gamespeed adjustments via KPPlus, KPMinus, KPEnter * added single-stepping the game with 'S' * added better application icon * added access to all levelsets in developer-mode (Ctrl-m) * added 10 new Halloween levels Pingus 0.7.4 (10/Oct/2011) ========================== * fixed game not starting when no soundcard is present * all halloween and tutorial levels have been converted to a minimum size of 1920x1200 so they can be played in fullscreen without letterboxing * new --userdir command line switch to set the directory where savegames are saved * menu getting confused by fast succedding clicks fixed * level-demo recording and playback are back (files not compatible between x86 and x86-64) * window resize support throughout the whole game * dirty-rectangles drawing for improved performance with software rendering * OpenGL rendering * new blackboard graphic * Unicode support * two new levelsets, "Desert" and "Factory Campaign", with 27 new levels * added a man-page * deadly fall height has been increased * support for prefab objects and groups in the editor * cleaned up digger, miner and basher paths * added an option menu * lots of minor bug fixes * bitmap fonts have been generated with anti-aliasing @ text @$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 @@@@ -19,7 +19,7 @@@@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -import sys, os +import sys, os, re import SCons.Util pingus_sources = [ @@@@ -348,7 +348,10 @@@@ def DefineOptions(filename, args): opts.Add(BoolVariable('with_xinput', 'Build with Xinput support', False)) opts.Add(BoolVariable('with_linuxusbmouse', 'Build with Linux USB mouse support', True)) - opts.Add(BoolVariable('with_linuxevdev', 'Build with Linux evdev support', True)) + if sys.platform == 'linux': + opts.Add(BoolVariable('with_linuxevdev', 'Build with Linux evdev support', True)) + else: + opts.Add(BoolVariable('with_linuxevdev', 'Build with Linux evdev support', False)) opts.Add(BoolVariable('with_wiimote', 'Build with Wiimote support', False)) opts.Add(BoolVariable('ignore_errors', 'Ignore any fatal configuration errors', False)) opts.Add('optional_sources', 'Additional source files', []) @@@@ -383,7 +386,10 @@@@ int main() { return 0; } """ - config.CheckLibWithHeader('iconv', 'iconv.h', 'c++') # Ok to fail + if re.match("netbsd*", sys.platform): + config.CheckLibWithHeader('iconv_std', 'iconv.h', 'c++') + else: + config.CheckLibWithHeader('iconv', 'iconv.h', 'c++') # Ok to fail context.Message('Check how to call iconv...') for i in ['', 'const']: @@@@ -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) - env = Environment(options = opts) + env = Environment(options = opts, ENV=os.environ) Help(opts.GenerateHelpText(env)) opts.Update(env) - 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/'] + env['CPPPATH'] += '.:src/' config_h_defines = [] @@@@ -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", {}) - env = Environment(options = opts) + env = Environment(options = opts, ENV=os.environ) Help(opts.GenerateHelpText(env)) opts.Update(env) @ 1.6 log @pingus: try to fix build with python-3 not fully tested because it is bombing with an unrelated error: library 'boost_signals' not found @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2015/01/21 15:19:31 joerg Exp $ @ 1.5 log @Simplify scons mangle: fully preserve environment, add CPPPATH/LIBPATH correctly. Fixes build with cwrappers. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2013/02/16 11:21:25 wiz Exp $ d4 1 d41 1 a41 1 @@@@ -408,7 +414,7 @@@@ if ('configure' in COMMAND_LINE_TARGETS) d50 10 a59 2 @@@@ -421,7 +427,7 @@@@ if ('configure' in COMMAND_LINE_TARGETS) if os.environ.has_key('PKG_CONFIG_PATH'): d67 55 a121 1 @@@@ -535,7 +541,7 @@@@ if not ('configure' in COMMAND_LINE_TARG @ 1.4 log @Recursive bump for png-1.6. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2012/11/23 12:35:01 joerg Exp $ d5 2 a6 2 --- SConstruct.orig 2010-03-18 15:34:15.000000000 +0200 +++ SConstruct 2011-01-19 20:02:53.000000000 +0200 d16 1 a16 1 @@@@ -348,7 +348,10 @@@@ d28 1 a28 1 @@@@ -383,7 +386,10 @@@@ d40 6 a45 1 @@@@ -539,7 +545,9 @@@@ d49 4 d54 1 a54 5 + env['CPPPATH'] += ['.', 'src/', 'BUILDLINK_DIR/include'] + env['LIBPATH'] += ['BUILDLINK_DIR/lib', '/usr/lib/i18n'] + env['ENV']['PATH'] = os.environ['PATH'] Default(env.Program('pingus', pingus_sources + env['optional_sources'])) Clean('pingus', ['config.py', 'config.h']) d56 11 @ 1.3 log @Honour buildlink. Request C++11 with clang. Fix C++ usage. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2011/01/20 23:41:02 wiz Exp $ a39 11 @@@@ -478,8 +484,8 @@@@ if not config.CheckLibWithHeader('boost_signals', 'boost/signals.hpp', 'c++'): fatal_error += " * library 'boost_signals' not found\n" - if not config.CheckLibWithHeader('png', 'png.h', 'c++'): - fatal_error += " * library 'png' not found\n" + if not config.CheckLibWithHeader('png15', 'png.h', 'c++'): + fatal_error += " * library 'png15' not found\n" if config.CheckMyProgram('sdl-config'): env.ParseConfig('sdl-config --cflags --libs') @ 1.2 log @Fix build with png-1.5. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1.1.1 2011/01/19 19:47:59 kefren Exp $ d51 1 a51 1 @@@@ -539,7 +545,8 @@@@ d58 1 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d46 2 a47 2 + if not config.CheckLibWithHeader('png14', 'png.h', 'c++'): + fatal_error += " * library 'png14' not found\n" @ 1.1.1.1 log @Initial import of pingus 0.7.3 - a Lemmings(TM) clone @ text @@