Index: games/oolite/Makefile =================================================================== --- games/oolite/Makefile (revision 520894) +++ games/oolite/Makefile (working copy) @@ -12,9 +12,6 @@ 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,7 +24,7 @@ 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 @@ -34,6 +31,8 @@ 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} @@ -75,6 +74,13 @@ ${REINPLACE_CMD} -e 's|oolite-saves|\.oolite-saves|' \ ${WRKSRC}/src/Core/NSFileManagerOOExtensions.h +pre-configure: + @${REINPLACE_CMD} -e "s| but not 3\.x|| ; \ + s| or sys\.version\[:2\] != '2\.'||" \ + ${WRKSRC}/deps/mozilla/js/src/configure + @(cd ${WRKSRC}/deps/mozilla/js/src && ${LOCALBASE}/bin/2to3-${PYTHON_VER} \ + -wn --no-diffs imacro_asm.py build/cl.py) + do-install: (cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}) ${INSTALL_SCRIPT} ${WRKDIR}/oolite ${STAGEDIR}${PREFIX}/bin