diff options
Diffstat (limited to 'lang/dotnet')
| -rw-r--r-- | lang/dotnet/Makefile | 73 | ||||
| -rw-r--r-- | lang/dotnet/distinfo | 26 | ||||
| -rw-r--r-- | lang/dotnet/pkg-plist | 6 |
3 files changed, 64 insertions, 41 deletions
diff --git a/lang/dotnet/Makefile b/lang/dotnet/Makefile index a832cab68c5f..7bf8124301cb 100644 --- a/lang/dotnet/Makefile +++ b/lang/dotnet/Makefile @@ -1,9 +1,10 @@ PORTNAME= dotnet -DISTVERSION= ${DOTNETVERSION}.9 +DISTVERSION?= ${DOTNETVERSION}.10 +PORTREVISION?= 0 CATEGORIES= lang devel -MASTER_SITES= https://github.com/dotnet/dotnet/releases/download/${GH_TAGNAME}/release.json?dummy=/:dotnetmanifest \ - https://github.com/sec/dotnet-core-freebsd-source-build/releases/download/${BOOTSTRAP_SDKVERSION}-vmr/:bootstrap -DISTFILES= release.json-${PORTVERSION}:dotnetmanifest \ +MASTER_SITES= ${NO_RELEASE_JSON:Uhttps\://github.com/dotnet/dotnet/releases/download/${GH_TAGNAME}/release.json?dummy=/\:dotnetmanifest} \ + LOCAL/arrowd/dotnet/:bootstrap +DISTFILES= ${NO_RELEASE_JSON:Urelease.json-${PORTVERSION}\:dotnetmanifest} \ ${BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}:bootstrap \ ${BOOTSTRAP_SDK_DISTNAME}${EXTRACT_SUFX}:bootstrap DIST_SUBDIR= dotnet @@ -33,27 +34,37 @@ USES= autoreconf:build gssapi:mit llvm:noexport pkgconfig \ python:build,3.9+ shebangfix ssl USE_GITHUB= yes -GH_TAGNAME= v${SDKVERSION} +GH_TAGNAME?= v${SDKVERSION} -SHEBANG_FILES= src/diagnostics/src/Tools/dotnet-trace/*.sh +SHEBANG_FILES+= src/diagnostics/src/Tools/dotnet-trace/*.sh BINARY_ALIAS= grep=${LOCALBASE}/bin/ggrep -DOTNET_ENV= PYTHON=${PYTHON_CMD} +DOTNET_ENV+= PYTHON=${PYTHON_CMD} -BOOTSTRAP_DOTNETVERSION= 9.0 -BOOTSTRAP_SDKVERSION= ${BOOTSTRAP_DOTNETVERSION}.103 -BOOTSTRAP_SDKVERSIONSUFFIX= -servicing.25071.1 -BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME= Private.SourceBuilt.Artifacts.${BOOTSTRAP_SDKVERSION}${BOOTSTRAP_SDKVERSIONSUFFIX}.freebsd-${DOTNET_ARCH} +BOOTSTRAP_DOTNETVERSION?= 9.0 +BOOTSTRAP_SDKVERSION?= ${BOOTSTRAP_DOTNETVERSION}.110 +BOOTSTRAP_SDKVERSIONSUFFIX?= -servicing.25421.1 +BOOTSTRAP_SOURCEBUILT_ARTIFACTS_DISTNAME= Private.SourceBuilt.Artifacts.${BOOTSTRAP_SDKVERSION}${BOOTSTRAP_SDKVERSIONSUFFIX}.freebsd.13-${DOTNET_ARCH} BOOTSTRAP_SDK_DISTNAME= dotnet-sdk-${BOOTSTRAP_SDKVERSION}-freebsd-${DOTNET_ARCH} -DOTNETVERSION= 9.0 -SDKVERSION= ${DOTNETVERSION}.110 -SDKVERSIONSUFFIX= -servicing.25420.3 -SDKSERVICESUFFIX= -servicing.25421.1 +DOTNETVERSION?= 9.0 +SDKVERSION?= ${DOTNETVERSION}.111 +SDKVERSIONSUFFIX?= -servicing.25475.17 +SDKSERVICESUFFIX?= -servicing.25476.1 MANIFESTSUFFIX= ${DOTNETVERSION}.100 -SDK_DISTNAME= dotnet-sdk-${SDKVERSION}-${SDK_RID} -SDK_RID= freebsd.${_OSVERSION_MAJOR}-${DOTNET_ARCH} DOTNET_ARCH= ${ARCH:S|amd64|x64|:C|aarch64|arm64|} +SDK_DISTNAME?= dotnet-sdk-${SDKVERSION}-${SDK_RID} +SDK_RID?= freebsd.${_OSVERSION_MAJOR}-${DOTNET_ARCH} +DOTNET_BUILD_SH_EXTRA_FLAGS?= --source-build +.ifndef NO_RELEASE_JSON +DOTNET_BUILD_SH_SOURCELINK_FLAG= --release-manifest release.json +.else +DOTNET_BUILD_SH_SOURCELINK_FLAG= --source-repository https://github.com/dotnet/dotnet \ + --source-version ${GH_TAGNAME} +.endif + +ARTIFACTS_SUBDIR?= /artifacts/assets/Release +SOURCEBUILT_ARTIFACTS_DISTNAME?=Private.SourceBuilt.Artifacts.${SDKVERSION}${SDKSERVICESUFFIX}.freebsd-${DOTNET_ARCH} PLIST_SUB= DOTNET_ARCH=${DOTNET_ARCH} FULL_DOTNETVERSION=${DISTVERSION} \ DOTNETVERSION=${DOTNETVERSION} SDKVERSION=${SDKVERSION} \ @@ -70,7 +81,11 @@ PLIST_SUB+= NONPORTABLE= .include <bsd.port.pre.mk> -.if ${SSL_DEFAULT} == base +.if ${DOTNETVERSION:R} == 8 && ${ARCH} == aarch64 +BROKEN= "crossgen2" exited with code 139 +.endif + +.if ${SSL_DEFAULT} == base && ${DOTNETVERSION:R} > 8 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-base-openssl .endif @@ -85,7 +100,9 @@ PLIST_SUB+= VXSORT="@comment " .endif post-extract: +.ifndef NO_RELEASE_JSON ${CP} ${DISTDIR}/${DIST_SUBDIR}/release.json-${PORTVERSION} ${WRKSRC}/release.json +.endif @${MKDIR} ${WRKDIR}/packages ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ @@ -103,35 +120,41 @@ post-extract: do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${DOTNET_ENV} ./build.sh \ - --release-manifest release.json \ + ${DOTNET_BUILD_SH_SOURCELINK_FLAG} \ --clean-while-building \ --with-sdk ${WRKDIR}/bootstrap_sdk \ --with-packages ${WRKDIR}/packages \ - --source-build \ + ${DOTNET_BUILD_SH_EXTRA_FLAGS} \ -- \ -maxcpucount:${MAKE_JOBS_NUMBER} \ ${PORTABLE_BUILD_FLAG} do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/artifacts/assets/Release/${SDK_DISTNAME}${EXTRACT_SUFX} -C ${STAGEDIR}${DATADIR} ${EXTRACT_AFTER_ARGS} + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}${ARTIFACTS_SUBDIR}/${SDK_DISTNAME}${EXTRACT_SUFX} -C ${STAGEDIR}${DATADIR} ${EXTRACT_AFTER_ARGS} +.if ${DOTNETVERSION:R} == 8 + ${RM} -r ${STAGEDIR}${DATADIR}/packs/NETStandard.Library.Ref +.else ${FIND} ${WRKSRC}/artifacts/packages/Release -name "*freebsd*.nupkg" -exec \ ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/library-packs/ \; +.endif ${STRIP_CMD} ${STAGEDIR}${DATADIR}/sdk/${SDKVERSION}/AppHostTemplate/apphost ${STRIP_CMD} ${STAGEDIR}${DATADIR}/packs/Microsoft.NETCore.App.Host.${SDK_RID}/${DISTVERSION}/runtimes/${SDK_RID}/native/apphost ${STRIP_CMD} ${STAGEDIR}${DATADIR}/packs/Microsoft.NETCore.App.Host.${SDK_RID}/${DISTVERSION}/runtimes/${SDK_RID}/native/singlefilehost +.if ${DOTNETVERSION:R} > 8 ${STRIP_CMD} ${STAGEDIR}${DATADIR}/packs/runtime.${SDK_RID}.Microsoft.DotNet.ILCompiler/${DISTVERSION}/tools/ilc +.endif ${FIND} ${STAGEDIR}${DATADIR} -name "*.so" -exec ${STRIP_CMD} -s "{}" ";" bootstrap-makesum: - cd ${WRKSRC}/artifacts/assets/Release && sha256 ${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX} + cd ${WRKSRC}${ARTIFACTS_SUBDIR} && sha256 ${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX} @${ECHO_CMD} -n "SIZE (${DIST_SUBDIR}/${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX}) = " - @${STAT} -f %z ${WRKSRC}/artifacts/assets/Release/${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX} + @${STAT} -f %z ${WRKSRC}${ARTIFACTS_SUBDIR}/${SOURCEBUILT_ARTIFACTS_DISTNAME}${EXTRACT_SUFX} - @cd ${WRKSRC}/artifacts/assets/Release && sha256 ${SDK_DISTNAME}${EXTRACT_SUFX} + @cd ${WRKSRC}${ARTIFACTS_SUBDIR} && sha256 ${SDK_DISTNAME}${EXTRACT_SUFX} @${ECHO_CMD} -n "SIZE (${DIST_SUBDIR}/${SDK_DISTNAME}${EXTRACT_SUFX}) = " - @${STAT} -f %z ${WRKSRC}/artifacts/assets/Release/${SDK_DISTNAME}${EXTRACT_SUFX} + @${STAT} -f %z ${WRKSRC}${ARTIFACTS_SUBDIR}/${SDK_DISTNAME}${EXTRACT_SUFX} @${ECHO_CMD} diff --git a/lang/dotnet/distinfo b/lang/dotnet/distinfo index a53dc7b74c0a..b9af376fe670 100644 --- a/lang/dotnet/distinfo +++ b/lang/dotnet/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1758978575 -SHA256 (dotnet/release.json-9.0.9) = 13bc9291f6adc341325cf21258f892528d5ce988de6da6b46a4c2b56845002a1 -SIZE (dotnet/release.json-9.0.9) = 275 -SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.103-servicing.25071.1.freebsd-arm64.tar.gz) = 8dd55906bd75de83cad9c6b257cbe772cf23413c3a2caee913cde7398c1a0622 -SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.103-servicing.25071.1.freebsd-arm64.tar.gz) = 827383751 -SHA256 (dotnet/dotnet-sdk-9.0.103-freebsd-arm64.tar.gz) = 04027a151f981dc948f3f93fca0c8a88c3de9c18d709f61c91105af8abeb3196 -SIZE (dotnet/dotnet-sdk-9.0.103-freebsd-arm64.tar.gz) = 504643018 -SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.103-servicing.25071.1.freebsd-x64.tar.gz) = 307bba6133c8c247f014553676663da26b82a0a8a8db7940c131d1b00772853b -SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.103-servicing.25071.1.freebsd-x64.tar.gz) = 837219995 -SHA256 (dotnet/dotnet-sdk-9.0.103-freebsd-x64.tar.gz) = cab6accdf9fc926c6f4e231caa13d2075ba9b3584708e08cc08c05c0d0e42fd6 -SIZE (dotnet/dotnet-sdk-9.0.103-freebsd-x64.tar.gz) = 513941299 -SHA256 (dotnet/dotnet-dotnet-9.0.9-v9.0.110_GH0.tar.gz) = 310170a6572f97c6d1437024eb47b1bac5e0a169776631df061754263dcf62d6 -SIZE (dotnet/dotnet-dotnet-9.0.9-v9.0.110_GH0.tar.gz) = 495148389 +TIMESTAMP = 1760626696 +SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.110-servicing.25421.1.freebsd.13-arm64.tar.gz) = 4599ae777acd3a58919ceeeaa07b74668e1a53661c3ebf24b99f877e3c5ebe0e +SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.110-servicing.25421.1.freebsd.13-arm64.tar.gz) = 828079589 +SHA256 (dotnet/dotnet-sdk-9.0.110-freebsd-arm64.tar.gz) = 05f3c223c70fa3096a97350cf485eaffdee1ddb2796a71984cbf4760009f40dc +SIZE (dotnet/dotnet-sdk-9.0.110-freebsd-arm64.tar.gz) = 505604643 +SHA256 (dotnet/Private.SourceBuilt.Artifacts.9.0.110-servicing.25421.1.freebsd.13-x64.tar.gz) = 91239d2dc1197211d7cb8b1d30cfb783035dfc574a593093d56bab885c887a75 +SIZE (dotnet/Private.SourceBuilt.Artifacts.9.0.110-servicing.25421.1.freebsd.13-x64.tar.gz) = 837969817 +SHA256 (dotnet/dotnet-sdk-9.0.110-freebsd-x64.tar.gz) = eb8d675d1a0edc27f4a8b12455dbb13545809b95d80a23536dfea4c94e7a23d2 +SIZE (dotnet/dotnet-sdk-9.0.110-freebsd-x64.tar.gz) = 514661886 +SHA256 (dotnet/release.json-9.0.10) = 429d63f3d9d6d10921b6e0784f3343fe7a0676b888e726b1e4a20ff2ae9bbbf5 +SIZE (dotnet/release.json-9.0.10) = 278 +SHA256 (dotnet/dotnet-dotnet-9.0.10-v9.0.111_GH0.tar.gz) = a18cbf9a48e58a516c1da3c58f0e46f66dcf1c5e7ef028e87101b1dc246e536a +SIZE (dotnet/dotnet-dotnet-9.0.10-v9.0.111_GH0.tar.gz) = 495176418 diff --git a/lang/dotnet/pkg-plist b/lang/dotnet/pkg-plist index 744c8195c72f..1c88eb7ce33d 100644 --- a/lang/dotnet/pkg-plist +++ b/lang/dotnet/pkg-plist @@ -12,7 +12,7 @@ %%DATADIR%%/library-packs/runtime.%%SDK_RID%%.Microsoft.NETCore.DotNetAppHost.%%FULL_DOTNETVERSION%%.nupkg %%DATADIR%%/library-packs/runtime.%%SDK_RID%%.Microsoft.NETCore.ILAsm.%%FULL_DOTNETVERSION%%.nupkg %%DATADIR%%/library-packs/runtime.%%SDK_RID%%.Microsoft.NETCore.ILDAsm.%%FULL_DOTNETVERSION%%.nupkg -@comment %%DATADIR%%/library-packs/runtime.%%SDK_RID%%.Microsoft.NETCore.TestHost.%%FULL_DOTNETVERSION%%-servicing.25419.16.nupkg +@comment %%DATADIR%%/library-packs/runtime.%%SDK_RID%%.Microsoft.NETCore.TestHost.%%FULL_DOTNETVERSION%%-servicing.25475.15.nupkg %%DATADIR%%/metadata/workloads/%%MANIFESTSUFFIX%%/userlocal %%DATADIR%%/packs/Microsoft.AspNetCore.App.Ref/%%FULL_DOTNETVERSION%%/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.dll %%DATADIR%%/packs/Microsoft.AspNetCore.App.Ref/%%FULL_DOTNETVERSION%%/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.dll @@ -4572,5 +4572,5 @@ %%DATADIR%%/templates/%%FULL_DOTNETVERSION%%/microsoft.dotnet.common.itemtemplates.%%SDKVERSION%%.nupkg %%DATADIR%%/templates/%%FULL_DOTNETVERSION%%/microsoft.dotnet.common.projecttemplates.%%DOTNETVERSION%%.%%SDKVERSION%%.nupkg %%DATADIR%%/templates/%%FULL_DOTNETVERSION%%/microsoft.dotnet.test.projecttemplates.%%DOTNETVERSION%%.1.1.0-rtm.25262.1.nupkg -%%DATADIR%%/templates/%%FULL_DOTNETVERSION%%/microsoft.dotnet.web.itemtemplates.%%FULL_DOTNETVERSION%%.0.9.nupkg -%%DATADIR%%/templates/%%FULL_DOTNETVERSION%%/microsoft.dotnet.web.projecttemplates.%%FULL_DOTNETVERSION%%.0.9.nupkg +%%DATADIR%%/templates/%%FULL_DOTNETVERSION%%/microsoft.dotnet.web.itemtemplates.%%DOTNETVERSION%%.9.0.10.nupkg +%%DATADIR%%/templates/%%FULL_DOTNETVERSION%%/microsoft.dotnet.web.projecttemplates.%%DOTNETVERSION%%.9.0.10.nupkg |