Attachment 151084 Details for Bug 196304 – 0ad.diff

[patch] 0ad.diff

0ad.diff (text/plain), 2.66 KB, created by Guido Falsi on 2014-12-29 19:17:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2014-12-29 19:17:56 UTC

Size: 2.66 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 375797)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	0ad
> PORTVERSION=	0.0.17
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	games
> MASTER_SITES=	SF/zero-ad/releases
> DISTFILES=	${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \
>@@ -41,10 +41,22 @@
> WX_UNICODE=	yes
> MAKE_ENV+=	JOBS=${_MAKE_JOBS}
> 
>+OPTIONS_DEFINE=	PORTSSM
>+PORTSSM_DESC=	Use lang/spidermonkey24 instead of bundled one
>+
>+OPTIONS_SUB=	yes
>+PORTSSM_LIB_DEPENDS=	libmozjs-24.so:${PORTSDIR}/lang/spidermonkey24
>+
> MANUAL_PACKAGE_BUILD=	huge
> 
> PORTDATA=	*
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MPORTSSM}
>+SMOPT=		--with-system-mozjs24
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
> 			-e 's|%%CC%%|${CC}|' \
>@@ -55,7 +67,7 @@
> 		${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 ${SMOPT} --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME})
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/binaries/system/pyrogenesis ${STAGEDIR}${PREFIX}/bin
>@@ -62,7 +74,10 @@
> 	${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:MPORTSSM}
>+	(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}
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 375797)
>+++ pkg-plist	(working copy)
>@@ -3,7 +3,7 @@
> bin/ActorEditor
> lib/0ad/libAtlasUI.so
> lib/0ad/libCollada.so
>-lib/0ad/libmozjs24-ps-release.so
>+%%NO_PORTSSM%%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