Attachment 150998 Details for Bug 196304 – Patch to use system spidermonkey24

[patch] Patch to use system spidermonkey24

patch-0ad.diff (text/plain), 2.44 KB, created by Kevin Zheng on 2014-12-27 19:09:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Zheng

Created: 2014-12-27 19:09:24 UTC

Size: 2.44 KB

patch

obsolete

>diff --git a/games/0ad/Makefile b/games/0ad/Makefile
>index f18f85c..9469247 100644
>--- a/games/0ad/Makefile
>+++ b/games/0ad/Makefile
>@@ -11,6 +11,8 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
> MAINTAINER=	madpilot@FreeBSD.org
> COMMENT=	Real-time strategy (RTS) game of ancient warfare
> 
>+LICENSE=	GPLv2
>+
> BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
> 		cmake:${PORTSDIR}/devel/cmake
> LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
>@@ -22,6 +24,7 @@ LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
> 		libgamin-1.so:${PORTSDIR}/devel/gamin \
> 		libgloox.so:${PORTSDIR}/net-im/gloox \
> 		libminiupnpc.so:${PORTSDIR}/net/miniupnpc \
>+		libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24 \
> 		libnspr4.so:${PORTSDIR}/devel/nspr \
> 		libenet.so:${PORTSDIR}/net/enet
> 
>@@ -55,14 +58,14 @@ post-patch:
> 		${WRKSRC}/build/resources/0ad.sh
> 
> pre-build:
>-	(cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-miniupnpc --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME})
>+	(cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --with-system-miniupnpc --with-system-mozjs24 --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME})
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin
> 	${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})
> 	${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..b45a20d 100644
>--- a/games/0ad/pkg-plist
>+++ b/games/0ad/pkg-plist
>@@ -3,7 +3,6 @@ bin/0ad
> bin/ActorEditor
> lib/0ad/libAtlasUI.so
> lib/0ad/libCollada.so
>-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