Attachment #244075 for bug #256342

View | Details | Raw Unified | Return to bug 256342
Collapse All | Expand All





.include <bsd.port.pre.mk>

.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
BROKEN=		fails to build with Mono version ${MONO_DEFAULT}: error MSB4184: The expression ""Program.cs".GetPathsOfAllDirectoriesAbove()" cannot be evaluated. Method 'System.String.GetPathsOfAllDirectoriesAbove' not found.
.endif

post-extract:
	${CP} ${_DISTDIR}/${DISTFILES:C/:.*//:MIP2LOCATION-*} ${WRKSRC}


		-e '/echo/!s/	@/	/' \
		-e '/^VERSION/s/=.*/=	${GH_TAGNAME}/' \
		-e '/^all:/s/$$/ version/' \
		-e '/MSBUILD/s/ -p:TargetPlatform/ -p:DiscoverEditorConfigFiles=false&/' \
		${WRKSRC}/Makefile
	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
		-e '/target/s,$${DIR}/,,' \




--- packaging/functions.sh.orig	2023-08-13 22:34:45 UTC
+++ packaging/functions.sh
@@ -33,9 +33,9 @@ install_assemblies_mono() {
 	echo "Building assemblies"
 	ORIG_PWD=$(pwd)
 	cd "${SRC_PATH}" || exit 1
-	msbuild -verbosity:m -nologo -t:Clean
+	msbuild -verbosity:m -nologo -t:Clean -p:DiscoverEditorConfigFiles=false
 	rm -rf "${SRC_PATH:?}/bin"
-	msbuild -verbosity:m -nologo -t:Build -restore -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}"
+	msbuild -verbosity:m -nologo -t:Build -restore -p:DiscoverEditorConfigFiles=false -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}"
 	if [ "${TARGETPLATFORM}" = "unix-generic" ]; then
 		./configure-system-libraries.sh
 	fi
@@ -163,9 +163,9 @@ install_windows_launcher()
 	ICON_PATH="${7}"
 	FAQ_URL="${8}"
 
-	msbuild -verbosity:m -nologo -t:Clean "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj"
+	msbuild -verbosity:m -nologo -t:Clean -p:DiscoverEditorConfigFiles=false "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj"
 	rm -rf "${SRC_PATH:?}/bin"
-	msbuild -t:Build "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -restore -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:LauncherIcon="${ICON_PATH}" -p:ModID="${MOD_ID}" -p:DisplayName="${MOD_NAME}" -p:FaqUrl="${FAQ_URL}"
+	msbuild -t:Build "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -restore -p:DiscoverEditorConfigFiles=false -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:LauncherIcon="${ICON_PATH}" -p:ModID="${MOD_ID}" -p:DisplayName="${MOD_NAME}" -p:FaqUrl="${FAQ_URL}"
 	install -m755 "${SRC_PATH}/bin/${LAUNCHER_NAME}.exe" "${DEST_PATH}"
 	install -m644 "${SRC_PATH}/bin/${LAUNCHER_NAME}.exe.config" "${DEST_PATH}"
 

Return to bug 256342

Lines 56-65 PORTDATA= * Link Here

(-)b/games/openra/Makefile (-4 / +1 lines)
56		56
57	.include <bsd.port.pre.mk>	57	.include <bsd.port.pre.mk>
58		58
59	.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6
60	BROKEN= fails to build with Mono version ${MONO_DEFAULT}: error MSB4184: The expression ""Program.cs".GetPathsOfAllDirectoriesAbove()" cannot be evaluated. Method 'System.String.GetPathsOfAllDirectoriesAbove' not found.
61	.endif
62
63	post-extract:	59	post-extract:
64	${CP} ${_DISTDIR}/${DISTFILES:C/:.//:MIP2LOCATION-} ${WRKSRC}	60	${CP} ${_DISTDIR}/${DISTFILES:C/:.//:MIP2LOCATION-} ${WRKSRC}
65		61
Lines 69-74 post-patch: Link Here
69	-e '/echo/!s/ @/ /' \	65	-e '/echo/!s/ @/ /' \
70	-e '/^VERSION/s/=.*/= ${GH_TAGNAME}/' \	66	-e '/^VERSION/s/=.*/= ${GH_TAGNAME}/' \
71	-e '/^all:/s/$$/ version/' \	67	-e '/^all:/s/$$/ version/' \
		68	-e '/MSBUILD/s/ -p:TargetPlatform/ -p:DiscoverEditorConfigFiles=false&/' \
72	${WRKSRC}/Makefile	69	${WRKSRC}/Makefile
73	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \	70	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
74	-e '/target/s,$${DIR}/,,' \	71	-e '/target/s,$${DIR}/,,' \

Added Link Here

(-)b/games/openra/files/patch-packaging_functions.sh (-1 / +26 lines)
0	-	1	--- packaging/functions.sh.orig 2023-08-13 22:34:45 UTC
		2	+++ packaging/functions.sh
		3	@@ -33,9 +33,9 @@ install_assemblies_mono() {
		4	echo "Building assemblies"
		5	ORIG_PWD=$(pwd)
		6	cd "${SRC_PATH}" \|\| exit 1
		7	- msbuild -verbosity:m -nologo -t:Clean
		8	+ msbuild -verbosity:m -nologo -t:Clean -p:DiscoverEditorConfigFiles=false
		9	rm -rf "${SRC_PATH:?}/bin"
		10	- msbuild -verbosity:m -nologo -t:Build -restore -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}"
		11	+ msbuild -verbosity:m -nologo -t:Build -restore -p:DiscoverEditorConfigFiles=false -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}"
		12	if [ "${TARGETPLATFORM}" = "unix-generic" ]; then
		13	./configure-system-libraries.sh
		14	fi
		15	@@ -163,9 +163,9 @@ install_windows_launcher()
		16	ICON_PATH="${7}"
		17	FAQ_URL="${8}"
		18
		19	- msbuild -verbosity:m -nologo -t:Clean "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj"
		20	+ msbuild -verbosity:m -nologo -t:Clean -p:DiscoverEditorConfigFiles=false "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj"
		21	rm -rf "${SRC_PATH:?}/bin"
		22	- msbuild -t:Build "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -restore -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:LauncherIcon="${ICON_PATH}" -p:ModID="${MOD_ID}" -p:DisplayName="${MOD_NAME}" -p:FaqUrl="${FAQ_URL}"
		23	+ msbuild -t:Build "${SRC_PATH}/OpenRA.WindowsLauncher/OpenRA.WindowsLauncher.csproj" -restore -p:DiscoverEditorConfigFiles=false -p:Configuration=Release -p:TargetPlatform="${TARGETPLATFORM}" -p:LauncherName="${LAUNCHER_NAME}" -p:LauncherIcon="${ICON_PATH}" -p:ModID="${MOD_ID}" -p:DisplayName="${MOD_NAME}" -p:FaqUrl="${FAQ_URL}"
		24	install -m755 "${SRC_PATH}/bin/${LAUNCHER_NAME}.exe" "${DEST_PATH}"
		25	install -m644 "${SRC_PATH}/bin/${LAUNCHER_NAME}.exe.config" "${DEST_PATH}"
		26