From nobody Tue Aug 08 11:22:38 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKrQ64T9Rz4mCT4; Tue, 8 Aug 2023 11:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKrQ63zLhz4clR; Tue, 8 Aug 2023 11:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691493758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ARzBOKj4QvSs7m5EPjzhyEjXOEDi3S2u0O4BlRCHJyk=; b=DEK9e+oFD0pHE3s2dVF6o0g/GZSWOPKmGkzLK75gggn0oZPssoKxipkaGMki4xbS0Pivj7 295Mk9rgqbnv25merQJTSzYrIZe7iSGcFE32Oo5OEpj2eFPdaeAlwS2uOK8EvIJcQKM/RM fFSrA2FyIaVmnsEv4rY5pTOhK3gVnIlnXlJ+awZatSD08WpF/x188XcB0a2b0xtYGaKgmE muRg/V1XbT0JzwN967i39Z7gN6KSRujMTFD8ag9SSKumhO85axrYKMeWBLaosDdutxxOvT z0J/79xrTbRoz4LgyV276y7n8YAl2EX0gRBK/7tAdtS0tdc00rnoC0c1yZ1juw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691493758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ARzBOKj4QvSs7m5EPjzhyEjXOEDi3S2u0O4BlRCHJyk=; b=sVs/WVFexZjVfDUmoP6D717YMUmkzaSEktYwxdKKi0o7xGBTJiF5TXDMwZ39ZyIFux8kSU 3/JYy+qJekRypdozHT5cuME41WGxeI0FvR5bdplfPCxHREQvnK4AMRt2O6WFI584e4fYJ0 h8wum6gO8AVFUV/zxHETsDbmaHIlW6zzQtfix/3IOsVMX2/JbRgpd4dBflhkz7rhHn0041 PIzD+jXGjBTtw8R++tWWdDLtCqqH4VBZZigvynrvD+m+xh5krV9YHLckXHD18hUs21c5Ud SwoTNDsA9AuIT6V6hGctQUJY9Hdf3h4sXDIo97QHWkYgNtGll2nIFMcoFiU08Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691493758; a=rsa-sha256; cv=none; b=COwcdXnwLAcccKHQhhoC+GUIKcqZ7I4GQ+iAn1uIQyxW7W5TA+0Ho44e79O+Rxvzwuq5Ew o+Mene8ecETSRRMh355ICt9K/kow3A4d1mf1hhs+1qs2XJSi5qaon+4gZZQ3iwn7x/hBu8 fKZz50n0nFuGN7DL8YBccePXxNfFrDbqqknuWKHlXnp/VQBqzM8NxlBtNHCrxbSrvnqNnE 8K6yUNRM0uwfRxNgXzLPurVQCYqj/712gu3/h8C4qtsuofhdFf7ZlZxt4Fl5uIu8rSEEA5 V6OZXOcFRqCGL5HJ9L6kqJwWjCrh/RWPIc0ISaOiUvjrpY6cSzydW4AWXT+DUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKrQ635FGzXhd; Tue, 8 Aug 2023 11:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378BMcZ0025394; Tue, 8 Aug 2023 11:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378BMcXh025393; Tue, 8 Aug 2023 11:22:38 GMT (envelope-from git) Date: Tue, 8 Aug 2023 11:22:38 GMT Message-Id: <202308081122.378BMcXh025393@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bcd90622c73c - main - lang/mono*: add compat symlink for devel/msbuild < 16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcd90622c73cdc090877a2f8173cf50a8e8e611f Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcd90622c73cdc090877a2f8173cf50a8e8e611f commit bcd90622c73cdc090877a2f8173cf50a8e8e611f Author: Jan Beich AuthorDate: 2023-08-08 09:16:02 +0000 Commit: Jan Beich CommitDate: 2023-08-08 11:16:45 +0000 lang/mono*: add compat symlink for devel/msbuild < 16 /usr/local/lib/mono/msbuild/15.0/bin/Microsoft.CSharp.CurrentVersion.targets(331,5): error MSB4019: The imported project "/usr/local/lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CSharp.Core.targets" was not found. Confirm that the path in the declaration is correct, and that the file exists on disk. PR: 256342 Suggested by: Marcin Cieślak Regressed by: https://github.com/mono/mono/commit/1717687e16dd --- emulators/mesen/Makefile | 4 ++-- games/openbve/Makefile | 4 ++-- games/openra/Makefile | 4 ++-- lang/fsharp/Makefile | 6 +----- lang/mono5.20/Makefile | 6 +++++- lang/mono6.8/Makefile | 6 +++++- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/emulators/mesen/Makefile b/emulators/mesen/Makefile index 714249ad2183..f21ec15999c8 100644 --- a/emulators/mesen/Makefile +++ b/emulators/mesen/Makefile @@ -50,8 +50,8 @@ LIBRETRO_ALL_TARGET= libretro .include -.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 5.10 -BROKEN= fails to build with Mono version ${MONO_DEFAULT}: The imported project "/usr/local/lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CSharp.Core.targets" was not found +.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 do-install: # empty to avoid default diff --git a/games/openbve/Makefile b/games/openbve/Makefile index 05ba72df83d9..975863c09f79 100644 --- a/games/openbve/Makefile +++ b/games/openbve/Makefile @@ -53,8 +53,8 @@ OPTIONS_DEFINE= DOCS .include -.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 5.10 -BROKEN= fails to build with Mono version ${MONO_DEFAULT}: The imported project "/usr/local/lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CSharp.Core.targets" was not found +.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-patch: diff --git a/games/openra/Makefile b/games/openra/Makefile index e92c5382d049..7c2c0fdf8b27 100644 --- a/games/openra/Makefile +++ b/games/openra/Makefile @@ -57,8 +57,8 @@ PORTDATA= * .include -.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 5.10 -BROKEN= fails to build with Mono version ${MONO_DEFAULT}: The imported project "/usr/local/lib/mono/msbuild/15.0/bin/Roslyn/Microsoft.CSharp.Core.targets" was not found +.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: diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile index 7e1d2c4717b2..397f49249e98 100644 --- a/lang/fsharp/Makefile +++ b/lang/fsharp/Makefile @@ -32,12 +32,8 @@ do-test: .include -.if defined(MONO_DEFAULT) -.if ${MONO_DEFAULT} > 6 +.if defined(MONO_DEFAULT) && ${MONO_DEFAULT} > 6 BROKEN= fails to build with Mono version ${MONO_DEFAULT}: A unique overload for method 'GetFileNameWithoutExtension' could not be determined based on type information prior to this program point -.elif ${MONO_DEFAULT} > 5.10 -BROKEN= fails to build with Mono version ${MONO_DEFAULT}: The type 'HashSet' is not defined -.endif .endif .include diff --git a/lang/mono5.20/Makefile b/lang/mono5.20/Makefile index b8cc60124a80..0d6815f6130c 100644 --- a/lang/mono5.20/Makefile +++ b/lang/mono5.20/Makefile @@ -1,6 +1,6 @@ PORTNAME= mono PORTVERSION= 5.20.1.34 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= https://download.mono-project.com/sources/mono/ PKGNAMESUFFIX= 5.20 @@ -108,5 +108,9 @@ post-configure: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/mono +# XXX Drop after devel/msbuild >= 16.0 per https://github.com/mono/msbuild/commit/48f3571f4036 + ${RLN} ${STAGEDIR}${PREFIX}/lib/mono/msbuild/Current \ + ${STAGEDIR}${PREFIX}/lib/mono/msbuild/15.0 + ${ECHO_CMD} lib/mono/msbuild/15.0 >>${TMPPLIST} .include diff --git a/lang/mono6.8/Makefile b/lang/mono6.8/Makefile index d477f74f20f4..59bd251c8a67 100644 --- a/lang/mono6.8/Makefile +++ b/lang/mono6.8/Makefile @@ -1,6 +1,6 @@ PORTNAME= mono PORTVERSION= 6.8.0.123 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= https://download.mono-project.com/sources/mono/ PKGNAMESUFFIX= 6.8 @@ -118,5 +118,9 @@ post-patch: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/mono +# XXX Drop after devel/msbuild >= 16.0 per https://github.com/mono/msbuild/commit/48f3571f4036 + ${RLN} ${STAGEDIR}${PREFIX}/lib/mono/msbuild/Current \ + ${STAGEDIR}${PREFIX}/lib/mono/msbuild/15.0 + ${ECHO_CMD} lib/mono/msbuild/15.0 >>${TMPPLIST} .include