Date: Mon, 3 Feb 2020 13:45:49 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525036 - in head/games/oolite: . files Message-ID: <202002031345.013Djnft056307@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Mon Feb 3 13:45:49 2020 New Revision: 525036 URL: https://svnweb.freebsd.org/changeset/ports/525036 Log: games/oolite: build with Python 3.5 or later, undeprecate PR: 242997 Submitted by: lightside Added: head/games/oolite/files/patch-fixup-python (contents, props changed) Deleted: head/games/oolite/files/patch-deps_mozilla_js_src_configure.in Modified: head/games/oolite/Makefile head/games/oolite/files/patch-deps_mozilla_js_src_configure Modified: head/games/oolite/Makefile ============================================================================== --- head/games/oolite/Makefile Mon Feb 3 13:22:28 2020 (r525035) +++ head/games/oolite/Makefile Mon Feb 3 13:45:49 2020 (r525036) @@ -12,9 +12,6 @@ DIST_SUBDIR= oolite MAINTAINER= ports@FreeBSD.org COMMENT= Trade and combat space simulator, clone of Elite -DEPRECATED= Unmaintained, uses EOLed python27 -EXPIRATION_DATE= 2020-01-27 - LICENSE= CC-BY-NC-SA-3.0 GPLv2 ZLIB LICENSE_COMB= multi LICENSE_FILE_CC-BY-NC-SA-3.0= ${WRKSRC}/Doc/LICENSE.TXT @@ -27,13 +24,15 @@ LIB_DEPENDS= libespeak.so:audio/espeak \ libpng.so:graphics/png \ libminizip.so:archivers/minizip -USES= gl gnustep openal:al perl5 python:2.7,build sdl \ +USES= gl gnustep openal:al perl5 python:3.5+,build sdl \ tar:bzip2 xorg USE_CXXSTD= gnu++98 USE_GL= gl glu USE_SDL= sdl USE_XORG= x11 USE_GNUSTEP= base build + +MAKE_ENV= ac_cv_path_PYTHON=${PYTHON_CMD} # Redefine DO_MAKE_BUILD, because current gnustep in USES overrides MAKEFILE # without possibility to change it, as it was done in the previous implementation DO_MAKE_BUILD= ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g} Modified: head/games/oolite/files/patch-deps_mozilla_js_src_configure ============================================================================== --- head/games/oolite/files/patch-deps_mozilla_js_src_configure Mon Feb 3 13:22:28 2020 (r525035) +++ head/games/oolite/files/patch-deps_mozilla_js_src_configure Mon Feb 3 13:45:49 2020 (r525036) @@ -1,6 +1,20 @@ ---- deps/mozilla/js/src/configure.orig 2014-06-30 08:54:39 UTC +--- deps/mozilla/js/src/configure.orig 2014-05-17 17:57:43 UTC +++ deps/mozilla/js/src/configure -@@ -9547,7 +9547,8 @@ +@@ -6490,10 +6490,10 @@ case "$host" in + ;; + esac + +-echo $ac_n "checking for Python version >= $PYTHON_VERSION but not 3.x""... $ac_c" 1>&6 +-echo "configure:6495: checking for Python version >= $PYTHON_VERSION but not 3.x" >&5 ++echo $ac_n "checking for Python version >= $PYTHON_VERSION""... $ac_c" 1>&6 ++echo "configure:6495: checking for Python version >= $PYTHON_VERSION" >&5 + +-$PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1] or sys.version[:2] != '2.')" $PYTHON_VERSION ++$PYTHON -c "import sys; sys.exit(sys.version[:3] < sys.argv[1])" $PYTHON_VERSION + _python_res=$? + + if test "$_python_res" != 0; then +@@ -9547,7 +9547,8 @@ fi echo "$ac_t""$ac_cv_have_visibility_builtin_bug" 1>&6 if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ Added: head/games/oolite/files/patch-fixup-python ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/oolite/files/patch-fixup-python Mon Feb 3 13:45:49 2020 (r525036) @@ -0,0 +1,33 @@ +# Patch for Python 3.x support, created with using 2to3 program. + +--- deps/mozilla/js/src/build/cl.py.orig 2014-05-17 17:57:43 UTC ++++ deps/mozilla/js/src/build/cl.py +@@ -51,7 +51,7 @@ def InvokeClWithDependencyGeneration(cmd + break + + if target == None: +- print >>sys.stderr, "No target set" and sys.exit(1) ++ print("No target set" and sys.exit(1), file=sys.stderr) + + # The deps target lives here + depstarget = os.path.basename(target) + ".pp" +@@ -90,7 +90,7 @@ def InvokeClWithDependencyGeneration(cmd + + f = open(depstarget, "w") + for dep in sorted(deps): +- print >>f, "%s: %s" % (target, dep) ++ print("%s: %s" % (target, dep), file=f) + + if __name__ == "__main__": + InvokeClWithDependencyGeneration(sys.argv[1:]) +--- deps/mozilla/js/src/imacro_asm.py.orig 2014-05-17 17:57:43 UTC ++++ deps/mozilla/js/src/imacro_asm.py +@@ -456,7 +456,7 @@ def assemble(filename, outfile): + if __name__ == '__main__': + import sys + if len(sys.argv) != 3: +- print "usage: python imacro_asm.py infile.jsasm outfile.c.out" ++ print("usage: python imacro_asm.py infile.jsasm outfile.c.out") + sys.exit(1) + + f = open(sys.argv[2], 'w')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002031345.013Djnft056307>