Attachment 177220 Details for Bug 214681 – games/openra followup, v2

[patch] games/openra followup, v2

openra.nuget-simplify.diff (text/plain), 1.97 KB, created by Jan Beich on 2016-11-21 00:19:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-11-21 00:19:33 UTC

Size: 1.97 KB

patch

obsolete

>diff --git a/Mk/Uses/mono.mk b/Mk/Uses/mono.mk
>index 6775a56..d8c335e 100644
>--- a/Mk/Uses/mono.mk
>+++ b/Mk/Uses/mono.mk
>@@ -54,7 +54,7 @@ GACUTIL_INSTALL=${GACUTIL} /i
> GACUTIL_INSTALL_PACKAGE=${GACUTIL} /i /package 1.0 /package 2.0
> 
> .if ${mono_ARGS:Mnuget}
>-NUGET_PACKAGEDIR=	${WRKSRC}/packages
>+NUGET_PACKAGEDIR?=	${WRKSRC}/packages
> 
> .  for depend in ${NUGET_DEPENDS}
> id=		${depend:C/=.*$//}
>diff --git a/games/openra/Makefile b/games/openra/Makefile
>index 229afe9..249344a 100644
>--- a/games/openra/Makefile
>+++ b/games/openra/Makefile
>@@ -44,7 +44,7 @@ NO_ARCH=	yes
> USES=		desktop-file-utils gmake lua:51,run mono:nuget openal:soft \
> 		shared-mime-info shebangfix
> USE_SDL=	sdl2
>-TARGET_ORDER_OVERRIDE=	520:nuget-extract
>+NUGET_PACKAGEDIR=${WRKSRC}/thirdparty/download
> SHEBANG_FILES=	launch-dedicated.sh
> MAKE_ENV=	prefix="${PREFIX}" mandir="${PREFIX}/man"
> MAKE_ARGS=	VERSION="${GH_TAGNAME}"
>@@ -71,25 +71,21 @@ post-extract:
> 	@${MKDIR} ${WRKSRC}/thirdparty/download
> 	@${CP} -v ${DISTFILES:C/:.*//:N*.nupkg:N*.tar*:N*.zip:S,^,${_DISTDIR}/,} \
> 		${WRKSRC}/thirdparty/download
>-	@for f in $$(${SED} -n 's/\.$$//; s,cp \./,,p' \
>-			${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh); do \
>-		${MV} -v ${NUGET_PACKAGEDIR}/$$f ${WRKSRC}/thirdparty/download; \
>-	done
> 
> post-patch:
>+	${REINPLACE_CMD} -e '/[[:<:]]get[[:blank:]]/d' \
>+			${WRKSRC}/thirdparty/fetch-thirdparty-deps.sh
> 	${REINPLACE_CMD} \
>-		-e '\,thirdparty/.*\.sh,d' \
> 		-e '/echo/!s/	@/	/' \
> 		-e '/^mods:/s/$$/ version/' \
> 		-e '/^docs:/s/$$/ all/' \
> 		-e '/^test:/s/$$/ all/' \
> 		${WRKSRC}/Makefile
>-	${REINPLACE_CMD} -e '/linux/{ p; s//${OPSYS:tl}/; }' \
>-		${WRKSRC}/thirdparty/download/*.config \
>-		${WRKSRC}/thirdparty/*.config*
> 	${SED} 's/@LIBLUA51@/liblua-${LUA_VER}.so/' \
> 		${WRKSRC}/thirdparty/Eluant.dll.config.in \
> 		>${WRKSRC}/Eluant.dll.config
>+	${FIND} ${WRKSRC} -name '*.config' -exec ${REINPLACE_CMD} \
>+		-e '/linux/{ p; s//${OPSYS:tl}/; }' {} +
> 
> post-build-DOCS-on:
> 	@${ECHO_MSG} Generating HTML documentation...

Actions: View | Diff

Attachments on bug 214681: 177196 | 177219 | 177220 | 177261 | 177365 | 177366 | 177367