Attachment 151052 Details for Bug 196304 – Updated patch with no sanity-checking at all

[patch] Updated patch with no sanity-checking at all

patch-0ad-new.diff (text/plain), 1.81 KB, created by Kevin Zheng on 2014-12-28 22:55:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2014-12-28 22:55:42 UTC

Size: 1.81 KB

patch

obsolete

>diff --git a/games/0ad/Makefile b/games/0ad/Makefile
>index bef1d63..6527586 100644
>--- a/games/0ad/Makefile
>+++ b/games/0ad/Makefile
>@@ -41,6 +41,13 @@ WX_COMPS=	wx:lib
> WX_UNICODE=	yes
> MAKE_ENV+=	JOBS=${_MAKE_JOBS}
> 
>+OPTIONS_DEFINE=	SPIDERMONKEY
>+OPTIONS_SUB=	yes
>+
>+SPIDERMONKEY_DESC=	Use lang/spidermonkey24 instead of bundled version
>+SPIDERMONKEY_CONFIGURE_WITH=	system-mozjs24
>+SPIDERMONKEY_LIB_DEPENDS=	libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24
>+
> MANUAL_PACKAGE_BUILD=	huge
> 
> PORTDATA=	*
>@@ -62,7 +69,10 @@ do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/build/resources/0ad.sh ${STAGEDIR}${PREFIX}/bin/0ad
> 	${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/ActorEditor ${STAGEDIR}${PREFIX}/bin
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
>-	(cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libmozjs24-ps-release.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME})
>+	(cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libAtlasUI.so libCollada.so libnvcore.so libnvimage.so libnvmath.so libnvtt.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME})
>+	.if ${PORT_OPTIONS:MSPIDERMONKEY}
>+	(cd ${WRKSRC}/binaries/system && ${INSTALL_LIB} libmozjs24-ps-release.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME})
>+	.endif
> 	${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.desktop ${STAGEDIR}${PREFIX}/share/applications
> 	${INSTALL_DATA} ${WRKSRC}/build/resources/0ad.png ${STAGEDIR}${PREFIX}/share/pixmaps
> 	${MKDIR} ${STAGEDIR}${DATADIR}
>diff --git a/games/0ad/pkg-plist b/games/0ad/pkg-plist
>index b09f4cd..d147ee3 100644
>--- a/games/0ad/pkg-plist
>+++ b/games/0ad/pkg-plist
>@@ -3,7 +3,7 @@ bin/0ad
> bin/ActorEditor
> lib/0ad/libAtlasUI.so
> lib/0ad/libCollada.so
>-lib/0ad/libmozjs24-ps-release.so
>+%%SPIDERMONKEY%%lib/0ad/libmozjs24-ps-release.so
> lib/0ad/libnvcore.so
> lib/0ad/libnvimage.so
> lib/0ad/libnvmath.so

Actions: View | Diff

Attachments on bug 196304: 150998 | 150999 | 151052 | 151084