Attachment 210343 Details for Bug 242997 – Proposed patch (since 520894 revision)

[patch] Proposed patch (since 520894 revision)

oolite.diff (text/plain), 2.32 KB, created by lightside on 2019-12-31 00:49:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2019-12-31 00:49:41 UTC

Size: 2.32 KB

patch

obsolete

>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:2.7+,build sdl \
> 			tar:bzip2 xorg
> USE_CXXSTD=		gnu++98
> USE_GL=			gl glu
>@@ -34,6 +31,7 @@
> 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}
>@@ -61,6 +59,8 @@
> BROKEN_armv6=		fails to compile: your compiler does not follow the C++ specification for temporary object destruction order
> BROKEN_armv7=		fails to compile: your compiler does not follow the C++ specification for temporary object destruction order
> 
>+.include <bsd.port.pre.mk>
>+
> post-patch: .SILENT
> 	${REINPLACE_CMD} -e 's/GNUSTEP_USER_ROOT/GNUSTEP_LOCAL_ROOT/ ; \
> 		s/sdl-config/$${SDL_CONFIG}/ ; \
>@@ -75,6 +75,15 @@
> 	${REINPLACE_CMD} -e 's|oolite-saves|\.oolite-saves|' \
> 		${WRKSRC}/src/Core/NSFileManagerOOExtensions.h
> 
>+.if ${PYTHON_VER} >= 3.0
>+pre-configure:
>+	@${REINPLACE_CMD} -i '.2to3.bak' -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)
>+.endif
>+
> do-install:
> 	(cd ${RELEASEDIR} && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
> 	${INSTALL_SCRIPT} ${WRKDIR}/oolite ${STAGEDIR}${PREFIX}/bin
>@@ -85,4 +94,4 @@
> 		${STAGEDIR}${PREFIX}/share/pixmaps
> 	(cd ${WRKSRC}/Doc && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 242997: 210342 | 210343 | 210354 | 210814 | 211114 | 211118