Date: Thu, 28 Jan 2021 14:39:33 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563139 - in head: . games games/pingus games/pingus/files Message-ID: <202101281439.10SEdXCA012994@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Jan 28 14:39:32 2021 New Revision: 563139 URL: https://svnweb.freebsd.org/changeset/ports/563139 Log: Resurrect games/pingus, fix scons compatibility with python3 Added: head/games/pingus/ - copied from r559941, head/games/pingus/ Modified: head/MOVED head/games/Makefile head/games/pingus/Makefile head/games/pingus/files/patch-SConscript Modified: head/MOVED ============================================================================== --- head/MOVED Thu Jan 28 13:45:27 2021 (r563138) +++ head/MOVED Thu Jan 28 14:39:32 2021 (r563139) @@ -15979,7 +15979,6 @@ games/freera||2021-01-02|Has expired: Uses Python 2.7 games/glob2||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream games/marsnomercy||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream games/netpanzer||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream -games/pingus||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream graphics/goxel||2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream graphics/sk1libs||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream graphics/uniconvertor||2021-01-02|Has expired: Uses deprecated version of python Modified: head/games/Makefile ============================================================================== --- head/games/Makefile Thu Jan 28 13:45:27 2021 (r563138) +++ head/games/Makefile Thu Jan 28 14:39:32 2021 (r563139) @@ -741,6 +741,7 @@ SUBDIR += phlipple SUBDIR += picmi SUBDIR += pinball + SUBDIR += pingus SUBDIR += pink-pony SUBDIR += pioneer SUBDIR += pioneers Modified: head/games/pingus/Makefile ============================================================================== --- head/games/pingus/Makefile Sat Jan 2 13:49:04 2021 (r559941) +++ head/games/pingus/Makefile Thu Jan 28 14:39:32 2021 (r563139) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/boost/signals2.hpp:devel/boost-libs LIB_DEPENDS= libpng.so:graphics/png -USES= compiler:c++11-lib gl iconv scons:python2 sdl tar:bzip2 xorg +USES= compiler:c++11-lib gl iconv scons sdl tar:bzip2 xorg USE_GL= gl USE_SDL= sdl image mixer LIBS+= ${ICONV_LIB} Modified: head/games/pingus/files/patch-SConscript ============================================================================== --- head/games/pingus/files/patch-SConscript Sat Jan 2 13:49:04 2021 (r559941) +++ head/games/pingus/files/patch-SConscript Thu Jan 28 14:39:32 2021 (r563139) @@ -1,13 +1,19 @@ -Properly split multiple arguments passed via CXXFLAGS --- SConscript.orig 2011-12-24 21:46:47 UTC +++ SConscript -@@ -120,6 +120,9 @@ class Project: - 'CheckSDLLib': CheckSDLLib, - 'CheckIconv': CheckIconv, - }) -+ -+ self.env["CXXFLAGS"] = sum(map (lambda x: x.split(" "), self.env["CXXFLAGS"]), []) -+ - self.fatal_error = "" - self.reports = "" +@@ -126,12 +126,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):
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101281439.10SEdXCA012994>