pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Move lang/mono6 to lang/mono.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/638b1c685feb
branches:  trunk
changeset: 448024:638b1c685feb
user:      nia <nia%pkgsrc.org@localhost>
date:      Wed Mar 03 12:05:40 2021 +0000

description:
Move lang/mono6 to lang/mono.

The old mono4 has been refusing to build on all platforms for a while,
while mono6 at least builds on some, so hopefully this is less misleading.

diffstat:

 archivers/torrentzip/Makefile                                                                |     4 +-
 doc/CHANGES-2021                                                                             |     4 +-
 doc/TODO                                                                                     |     4 +-
 games/fna/Makefile                                                                           |     4 +-
 lang/Makefile                                                                                |     3 +-
 lang/mono/Makefile                                                                           |   174 +-
 lang/mono/PLIST.Darwin                                                                       |     6 -
 lang/mono/PLIST.Linux                                                                        |     6 -
 lang/mono/PLIST.common                                                                       |  1140 ---
 lang/mono/buildlink3.mk                                                                      |    12 +-
 lang/mono/distinfo                                                                           |    96 +-
 lang/mono/options.mk                                                                         |    13 -
 lang/mono/patches/patch-aa                                                                   |    15 -
 lang/mono/patches/patch-acceptance-tests_Makefile.in                                         |    13 +
 lang/mono/patches/patch-acceptance-tests_microbench-perf_sh_in                               |    28 +
 lang/mono/patches/patch-ae                                                                   |    21 -
 lang/mono/patches/patch-af                                                                   |    12 -
 lang/mono/patches/patch-ai                                                                   |   207 -
 lang/mono/patches/patch-aj                                                                   |    12 -
 lang/mono/patches/patch-ak                                                                   |    56 -
 lang/mono/patches/patch-al                                                                   |    12 -
 lang/mono/patches/patch-am                                                                   |    22 -
 lang/mono/patches/patch-ap                                                                   |    26 -
 lang/mono/patches/patch-aq                                                                   |    12 -
 lang/mono/patches/patch-ar                                                                   |    12 -
 lang/mono/patches/patch-as                                                                   |    18 -
 lang/mono/patches/patch-ba                                                                   |    12 -
 lang/mono/patches/patch-bc                                                                   |    23 -
 lang/mono/patches/patch-bd                                                                   |    17 -
 lang/mono/patches/patch-be                                                                   |    36 -
 lang/mono/patches/patch-bf                                                                   |    25 -
 lang/mono/patches/patch-bi                                                                   |    37 -
 lang/mono/patches/patch-cc                                                                   |    33 -
 lang/mono/patches/patch-configure                                                            |   166 -
 lang/mono/patches/patch-da                                                                   |   157 -
 lang/mono/patches/patch-data_Makefile.am                                                     |    14 +
 lang/mono/patches/patch-data_Makefile.in                                                     |    15 -
 lang/mono/patches/patch-data_mono-nunit.pc.in                                                |    12 -
 lang/mono/patches/patch-data_net_4_0_Browsers_Makefile.in                                    |    15 -
 lang/mono/patches/patch-data_net_4_5_Browsers_Makefile.in                                    |    15 -
 lang/mono/patches/patch-data_net_4_5_Makefile.in                                             |    15 -
 lang/mono/patches/patch-data_net__2__0_Browsers_Makefile.am                                  |    12 +
 lang/mono/patches/patch-data_net__2__0_Makefile.am                                           |    14 +
 lang/mono/patches/patch-data_net__4__0_Browsers_Makefile.am                                  |    12 +
 lang/mono/patches/patch-data_net__4__0_Makefile.am                                           |    14 +
 lang/mono/patches/patch-data_net__4__5_Browsers_Makefile.am                                  |    12 +
 lang/mono/patches/patch-data_net__4__5_Makefile.am                                           |    14 +
 lang/mono/patches/patch-db                                                                   |    37 -
 lang/mono/patches/patch-dc                                                                   |    12 -
 lang/mono/patches/patch-de                                                                   |    12 -
 lang/mono/patches/patch-df                                                                   |    12 -
 lang/mono/patches/patch-dh                                                                   |    12 -
 lang/mono/patches/patch-di                                                                   |    12 -
 lang/mono/patches/patch-dj                                                                   |    16 -
 lang/mono/patches/patch-dk                                                                   |    12 -
 lang/mono/patches/patch-dl                                                                   |    34 -
 lang/mono/patches/patch-do                                                                   |    13 -
 lang/mono/patches/patch-external_corert_src_Native_gc_env_gcenv.structs.h                    |    15 +
 lang/mono/patches/patch-libgc_misc.c                                                         |    36 -
 lang/mono/patches/patch-man_mprof-report.1                                                   |    12 -
 lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_IPGlobalProperties.cs |    15 -
 lang/mono/patches/patch-mono_dis_Makefile.in                                                 |    13 -
 lang/mono/patches/patch-mono_eglib_giconv.c                                                  |    30 +
 lang/mono/patches/patch-mono_metadata_boehm-gc.c                                             |    30 -
 lang/mono/patches/patch-mono_metadata_icall.c                                                |    30 +-
 lang/mono/patches/patch-mono_metadata_mono-perfcounters.c                                    |    52 -
 lang/mono/patches/patch-mono_metadata_mono-route.c                                           |    14 -
 lang/mono/patches/patch-mono_metadata_w32mutex-unix.c                                        |    51 +
 lang/mono/patches/patch-mono_mini_Makefile.am.in                                             |    13 +
 lang/mono/patches/patch-mono_mini_Makefile.in                                                |    13 +
 lang/mono/patches/patch-mono_mini_mini-arm.c                                                 |    72 -
 lang/mono/patches/patch-mono_profiler_proflog.c                                              |    17 -
 lang/mono/patches/patch-mono_tests_Makefile.am                                               |    13 +
 lang/mono/patches/patch-mono_tests_Makefile.in                                               |    13 +
 lang/mono/patches/patch-mono_unit-tests_Makefile.in                                          |    21 -
 lang/mono/patches/patch-mono_utils_Makefile.in                                               |    43 -
 lang/mono/patches/patch-mono_utils_jemalloc_Makefile.in                                      |    13 +
 lang/mono/patches/patch-mono_utils_mono-compiler.h                                           |    38 -
 lang/mono/patches/patch-mono_utils_mono-mmap.c                                               |    15 -
 lang/mono/patches/patch-mono_utils_mono-os-semaphore.h                                       |    16 +
 lang/mono/patches/patch-mono_utils_mono-semaphore.c                                          |    55 -
 lang/mono/patches/patch-mono_utils_mono-sigcontext.h                                         |    68 +-
 lang/mono/patches/patch-mono_utils_mono-threads-dragonfly.c                                  |    29 -
 lang/mono/patches/patch-mono_utils_mono-threads-netbsd.c                                     |    28 -
 lang/mono/patches/patch-mono_utils_mono-threads-posix.c                                      |    33 +-
 lang/mono/patches/patch-mono_utils_mono-threads-solaris.c                                    |    24 -
 lang/mono/patches/patch-mono_utils_mono-threads.c                                            |    22 -
 lang/mono/patches/patch-mono_utils_mono-utils-debug.c                                        |    46 +
 lang/mono/patches/patch-po_Makefile.in                                                       |    13 -
 lang/mono/patches/patch-runtime_mono-wrapper.in                                              |    12 +
 lang/mono/patches/patch-scripts_submodules_versions.mk                                       |    13 +
 lang/mono/patches/patch-support_minizip_ioapi.c                                              |    15 +
 lang/mono/patches/patch-support_signal.c                                                     |    17 -
 lang/mono/patches/patch-support_time.c                                                       |    16 -
 lang/mono/patches/patch-support_unistd.c                                                     |    18 -
 lang/mono6/DESCR                                                                             |     6 -
 lang/mono6/Makefile                                                                          |   185 -
 lang/mono6/PLIST                                                                             |  3402 ----------
 lang/mono6/buildlink3.mk                                                                     |    17 -
 lang/mono6/distinfo                                                                          |    31 -
 lang/mono6/patches/patch-acceptance-tests_Makefile.in                                        |    13 -
 lang/mono6/patches/patch-acceptance-tests_microbench-perf_sh_in                              |    28 -
 lang/mono6/patches/patch-data_Makefile.am                                                    |    14 -
 lang/mono6/patches/patch-data_net__2__0_Browsers_Makefile.am                                 |    12 -
 lang/mono6/patches/patch-data_net__2__0_Makefile.am                                          |    14 -
 lang/mono6/patches/patch-data_net__4__0_Browsers_Makefile.am                                 |    12 -
 lang/mono6/patches/patch-data_net__4__0_Makefile.am                                          |    14 -
 lang/mono6/patches/patch-data_net__4__5_Browsers_Makefile.am                                 |    12 -
 lang/mono6/patches/patch-data_net__4__5_Makefile.am                                          |    14 -
 lang/mono6/patches/patch-external_corert_src_Native_gc_env_gcenv.structs.h                   |    15 -
 lang/mono6/patches/patch-mono_eglib_giconv.c                                                 |    30 -
 lang/mono6/patches/patch-mono_metadata_icall.c                                               |    16 -
 lang/mono6/patches/patch-mono_metadata_w32mutex-unix.c                                       |    51 -
 lang/mono6/patches/patch-mono_mini_Makefile.am.in                                            |    13 -
 lang/mono6/patches/patch-mono_mini_Makefile.in                                               |    13 -
 lang/mono6/patches/patch-mono_tests_Makefile.am                                              |    13 -
 lang/mono6/patches/patch-mono_tests_Makefile.in                                              |    13 -
 lang/mono6/patches/patch-mono_utils_jemalloc_Makefile.in                                     |    13 -
 lang/mono6/patches/patch-mono_utils_mono-os-semaphore.h                                      |    16 -
 lang/mono6/patches/patch-mono_utils_mono-sigcontext.h                                        |    19 -
 lang/mono6/patches/patch-mono_utils_mono-threads-posix.c                                     |    15 -
 lang/mono6/patches/patch-mono_utils_mono-utils-debug.c                                       |    46 -
 lang/mono6/patches/patch-runtime_mono-wrapper.in                                             |    12 -
 lang/mono6/patches/patch-scripts_submodules_versions.mk                                      |    13 -
 lang/mono6/patches/patch-support_minizip_ioapi.c                                             |    15 -
 125 files changed, 554 insertions(+), 7301 deletions(-)

diffs (truncated from 8507 to 300 lines):

diff -r 69317d4b3a36 -r 638b1c685feb archivers/torrentzip/Makefile
--- a/archivers/torrentzip/Makefile     Wed Mar 03 10:46:14 2021 +0000
+++ b/archivers/torrentzip/Makefile     Wed Mar 03 12:05:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/10/05 15:21:07 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2021/03/03 12:05:41 nia Exp $
 
 DISTNAME=      TrrntZip.NET106
 PKGNAME=       torrentzip-1.0.6
@@ -11,7 +11,7 @@
 COMMENT=       Convert zip archives to torrentzip format
 LICENSE=       apache-2.0
 
-DEPENDS+=      mono-[0-9]*:../../lang/mono6
+DEPENDS+=      mono-[0-9]*:../../lang/mono
 
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= # none
diff -r 69317d4b3a36 -r 638b1c685feb doc/CHANGES-2021
--- a/doc/CHANGES-2021  Wed Mar 03 10:46:14 2021 +0000
+++ b/doc/CHANGES-2021  Wed Mar 03 12:05:40 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.1365 2021/03/03 10:22:22 fox Exp $
+$NetBSD: CHANGES-2021,v 1.1366 2021/03/03 12:05:40 nia Exp $
 
 Changes to the packages collection and infrastructure in 2021:
 
@@ -2147,3 +2147,5 @@
        Updated net/rabbitmq to 3.8.14 [adam 2021-03-03]
        Updated www/bozohttpd to 20210227 [mrg 2021-03-03]
        Updated audio/fasttracker2 to 1.44 [fox 2021-03-03]
+       Updated lang/mono to 6.12.0.107 [nia 2021-03-03]
+       Removed lang/mono6 successor lang/mono [nia 2021-03-03]
diff -r 69317d4b3a36 -r 638b1c685feb doc/TODO
--- a/doc/TODO  Wed Mar 03 10:46:14 2021 +0000
+++ b/doc/TODO  Wed Mar 03 12:05:40 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.20411 2021/03/01 13:22:23 adam Exp $
+$NetBSD: TODO,v 1.20412 2021/03/03 12:05:40 nia Exp $
 
 Suggested new packages
 ======================
@@ -811,7 +811,7 @@
        o molden-4.8 [after which PR 40252 can be closed]
        o molden-5.5
        o mono-nat-1.1.0
-       o mono6-6.12.0.122
+       o mono-6.12.0.122
        o mopher-0.6.0
        o moserial-2.30.0
        o mpdas-0.4.1
diff -r 69317d4b3a36 -r 638b1c685feb games/fna/Makefile
--- a/games/fna/Makefile        Wed Mar 03 10:46:14 2021 +0000
+++ b/games/fna/Makefile        Wed Mar 03 12:05:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/01/24 19:07:21 maya Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/03 12:05:41 nia Exp $
 
 GITHUB_PROJECT=        FNA
 GITHUB_TAG=    21.01
@@ -65,5 +65,5 @@
 .include "../../graphics/fna3d/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../audio/faudio/buildlink3.mk"
-.include "../../lang/mono6/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 69317d4b3a36 -r 638b1c685feb lang/Makefile
--- a/lang/Makefile     Wed Mar 03 10:46:14 2021 +0000
+++ b/lang/Makefile     Wed Mar 03 12:05:40 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.594 2021/03/01 08:45:42 nia Exp $
+# $NetBSD: Makefile,v 1.595 2021/03/03 12:05:41 nia Exp $
 #
 
 COMMENT=       Programming languages
@@ -164,7 +164,6 @@
 SUBDIR+=       mit-scheme-bin
 SUBDIR+=       mono
 SUBDIR+=       mono-basic
-SUBDIR+=       mono6
 SUBDIR+=       moscow_ml
 SUBDIR+=       mozjs78
 SUBDIR+=       mpd
diff -r 69317d4b3a36 -r 638b1c685feb lang/mono/Makefile
--- a/lang/mono/Makefile        Wed Mar 03 10:46:14 2021 +0000
+++ b/lang/mono/Makefile        Wed Mar 03 12:05:40 2021 +0000
@@ -1,34 +1,36 @@
-# $NetBSD: Makefile,v 1.195 2020/12/04 20:45:26 nia Exp $
+# $NetBSD: Makefile,v 1.196 2021/03/03 12:05:41 nia Exp $
 
-DISTNAME=      mono-4.0.4.1
-PKGREVISION=   23
+DISTNAME=      mono-6.12.0.107
 CATEGORIES=    lang
 MASTER_SITES=  https://download.mono-project.com/sources/mono/
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.mono-project.com/
 COMMENT=       Open source implementation of the .NET Development Framework
 LICENSE=       mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
 
-BUILD_DEPENDS+=        p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+WRKSRC=                ${WRKDIR}/${DISTNAME}
+
+TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 CONFLICTS=     pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
-ALL_ENV+=      MONO_SHARED_DIR=${WRKDIR:Q} PLATFORM=
-WRKSRC=                ${WRKDIR}/mono-4.0.4
+ALL_ENV+=      MONO_SHARED_DIR=${WRKDIR} PLATFORM=
+ALL_ENV+=      PAXCTL=${PAXCTL}
 
-USE_TOOLS+=    bash:run bison gmake gtar msgfmt perl:run pkg-config
+USE_TOOLS+=    bash:run cmake gmake msgfmt perl:run pkg-config
+USE_TOOLS+=    bison autoconf automake
 USE_LIBTOOL=   yes
 USE_LANGUAGES+=        c c99 c++
-EXTRACT_USING= gtar
+EXTRACT_USING= bsdtar
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --with-libgdiplus=installed
-CONFIGURE_ARGS+=       --disable-dtrace
+GNU_CONFIGURE_STRICT=  no # has sub-configures
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --disable-btls
+CONFIGURE_ARGS+=       --disable-btls-lib
 
-CTF_SUPPORTED= no      # https://smartos.org/bugview/OS-6510
-
-.include "options.mk"
+# Requires a cwrappers change: http://mail-index.netbsd.org/tech-pkg/2019/08/16/msg021791.html
+USE_CWRAPPERS=         no
 
 MAKE_FLAGS+=           PERL=${PERL5:Q} mandir=${PREFIX}/${PKGMANDIR}
 UNLIMIT_RESOURCES=     datasize stacksize memorysize
@@ -44,62 +46,49 @@
 PKGCONFIG_OVERRIDE+=   data/system.web.extensions.design_1.0.pc.in
 PKGCONFIG_OVERRIDE+=   data/system.web.mvc.pc.in data/wcf.pc.in
 
-REPLACE_PERL+= mcs/tools/scan-tests.pl
-REPLACE_PERL+= msvc/create-windef.pl mono/benchmark/test-driver
-REPLACE_PERL+= mono/cil/make-opcodes-def.pl mono/metadata/make-bundle.pl
-REPLACE_PERL+= mono/mini/genmdesc.pl mono/tests/stress-runner.pl
+REPLACE_PERL+= mono/benchmark/test-driver
+REPLACE_PERL+= mono/cil/make-opcodes-def.pl
+REPLACE_PERL+= mono/tests/stress-runner.pl
 
 REPLACE_PYTHON+=       scripts/mono-heapviz
 
-REPLACE_BASH+= build-mingw32.sh
 REPLACE_BASH+= mono/arch/arm/dpiops.sh
 REPLACE_BASH+= mono/arch/arm/vfpops.sh
-REPLACE_BASH+= scripts/mono-find-provides.in
-REPLACE_BASH+= scripts/mono-find-requires.in
+REPLACE_BASH+= scripts/mono-package-runtime
+REPLACE_BASH+= scripts/mono-find-provides.in scripts/mono-find-requires.in
 REPLACE_BASH+= scripts/mono-test-install
 REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/gtk/compile.sh
 REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/png/compile.sh
 REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/win32/compile.sh
 REPLACE_BASH+= mcs/class/Mono.Cairo/Samples/x11/compile.sh
-REPLACE_BASH+= mcs/tools/tinderbox/tinderbox.sh
 REPLACE_BASH+= libgc/mkinstalldirs
-REPLACE_BASH+= mcs/mkinstalldirs
-REPLACE_BASH+= mkinstalldirs
+REPLACE_BASH+= mcs/mkinstalldirs mkinstalldirs
 
 EGDIR=         ${PREFIX}/share/examples/mono
-CONF_FILES=    ${EGDIR}/config ${PKG_SYSCONFDIR}/mono/config
-CONF_FILES+=   ${EGDIR}/browscap.ini ${PKG_SYSCONFDIR}/mono/browscap.ini
-CONF_FILES+=   ${EGDIR}/2.0/DefaultWsdlHelpGenerator.aspx \
-                       ${PKG_SYSCONFDIR}/mono/2.0/DefaultWsdlHelpGenerator.aspx
-CONF_FILES+=   ${EGDIR}/2.0/machine.config \
-                       ${PKG_SYSCONFDIR}/mono/2.0/machine.config
-CONF_FILES+=   ${EGDIR}/mconfig/config.xml \
-                       ${PKG_SYSCONFDIR}/mono/mconfig/config.xml
-CONF_FILES+=   ${EGDIR}/2.0/settings.map \
-                       ${PKG_SYSCONFDIR}/mono/2.0/settings.map
-CONF_FILES+=   ${EGDIR}/2.0/web.config \
-                       ${PKG_SYSCONFDIR}/mono/2.0/web.config
-CONF_FILES+=   ${EGDIR}/2.0/Browsers/Compat.browser \
-                       ${PKG_SYSCONFDIR}/mono/2.0/Browsers/Compat.browser
-CONF_FILES+=   ${EGDIR}/4.0/DefaultWsdlHelpGenerator.aspx \
-                       ${PKG_SYSCONFDIR}/mono/4.0/DefaultWsdlHelpGenerator.aspx
-CONF_FILES+=   ${EGDIR}/4.0/machine.config \
-                       ${PKG_SYSCONFDIR}/mono/4.0/machine.config
-CONF_FILES+=   ${EGDIR}/4.0/settings.map \
-                       ${PKG_SYSCONFDIR}/mono/4.0/settings.map
-CONF_FILES+=   ${EGDIR}/4.0/web.config \
-                       ${PKG_SYSCONFDIR}/mono/4.0/web.config
-CONF_FILES+=   ${EGDIR}/4.0/Browsers/Compat.browser \
-                       ${PKG_SYSCONFDIR}/mono/4.0/Browsers/Compat.browser
-CONF_FILES+=   ${EGDIR}/4.5/DefaultWsdlHelpGenerator.aspx \
-                       ${PKG_SYSCONFDIR}/mono/4.5/DefaultWsdlHelpGenerator.aspx
-CONF_FILES+=   ${EGDIR}/4.5/machine.config \
-                       ${PKG_SYSCONFDIR}/mono/4.5/machine.config
-CONF_FILES+=   ${EGDIR}/4.5/settings.map \
-                       ${PKG_SYSCONFDIR}/mono/4.5/settings.map
-CONF_FILES+=   ${EGDIR}/4.5/web.config  ${PKG_SYSCONFDIR}/mono/4.5/web.config
-CONF_FILES+=   ${EGDIR}/4.5/Browsers/Compat.browser \
-                       ${PKG_SYSCONFDIR}/mono/4.5/Browsers/Compat.browser
+
+EGDIR_CONF_FILES= \
+
+.for conf in \
+       2.0/Browsers/Compat.browser \
+       2.0/DefaultWsdlHelpGenerator.aspx \
+       2.0/DefaultWsdlHelpGenerator.aspx \
+       2.0/machine.config \
+       2.0/settings.map \
+       2.0/web.config \
+       4.0/Browsers/Compat.browser \
+       4.0/DefaultWsdlHelpGenerator.aspx \
+       4.0/machine.config \
+       4.0/settings.map \
+       4.0/web.config \
+       4.5/Browsers/Compat.browser \
+       4.5/DefaultWsdlHelpGenerator.aspx \
+       4.5/machine.config \
+       4.5/settings.map \
+       4.5/web.config \
+       browscap.ini \
+       config
+CONF_FILES+=   ${EGDIR}/${conf} ${PKG_SYSCONFDIR}/mono/${conf}
+.endfor
 
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/2.0
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/2.0/Browsers
@@ -109,7 +98,8 @@
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/4.5/Browsers
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/mconfig
 
-INSTALLATION_DIRS+=    share/examples/mono/4.5
+# Uses [[ ... ]], not needed during the build.
+SKIP_PORTABILITY_CHECK+=       acceptance-tests/microbench-perf.sh.in
 
 TEST_TARGET=   check
 
@@ -118,13 +108,7 @@
 SUBST_MESSAGE.fix-prefix=      Fixing relative prefix
 SUBST_FILES.fix-prefix=                ${PKGCONFIG_OVERRIDE}
 SUBST_SED.fix-prefix=          -e 's,$${pcfiledir}/../..,\@prefix\@,g'
-SUBST_NOOP_OK.fix-prefix=      yes # some of the files are modified
-
-SUBST_CLASSES+=                        fix-mcs
-SUBST_STAGE.fix-mcs=           pre-configure
-SUBST_MESSAGE.fix-mcs=         Fixing mcs default prefix
-SUBST_FILES.fix-mcs=           mcs/build/config-default.make
-SUBST_VARS.fix-mcs=            PREFIX PKGMANDIR
+SUBST_NOOP_OK.fix-prefix=      yes
 
 SUBST_CLASSES+=                        fix-cfgdir
 SUBST_STAGE.fix-cfgdir=                pre-configure
@@ -132,47 +116,31 @@
 SUBST_FILES.fix-cfgdir=                mcs/tools/mconfig/Makefile
 SUBST_SED.fix-cfgdir=          -e 's,$$(sysconfdir)/mono,${EGDIR},g'
 
-SUBST_CLASSES+=                        fix-libx11
-SUBST_STAGE.fix-libx11=                pre-configure
-SUBST_MESSAGE.fix-libx11=      Fixing libX11 search path configuration
-SUBST_FILES.fix-libx11=                configure
-SUBST_VARS.fix-libx11=         X11BASE
-
-PLIST_VARS=    libgc monodoc
+# Uses [[ ... ]], not needed during the build.
+CHECK_PORTABILITY_SKIP+=       acceptance-tests/microbench-perf.sh.in
+CHECK_PORTABILITY_SKIP+=       external/llvm-project/polly/lib/External/isl/configure
 
 .include "../../mk/bsd.prefs.mk"
 
-SUBST_CLASSES+=                        fix-domlib
-SUBST_STAGE.fix-domlib=                pre-configure
-SUBST_FILES.fix-domlib=                mcs/class/System/System.Net.NetworkInformation/IPGlobalProperties.cs
-.if ${OPSYS} == "SunOS"
-SUBST_SED.fix-domlib=          -e 's,@DOMAINLIB@,libnsl,g'
-.else
-SUBST_SED.fix-domlib=          -e 's,@DOMAINLIB@,libc,g'
-.endif
-
-# The builtin boehm-gc fails on SunOS with newer GCC, just use the pkgsrc
-# version in any case as it is optimised.
-.if ${OPSYS} == "SunOS"
-.include "../../devel/boehm-gc/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-gc=boehm
-.else
-CONFIGURE_ARGS+=       --with-gc=included
-PLIST.libgc=           yes
-.endif
+# We patched makefiles, regen
+pre-configure:
+       ${RUN} cd ${WRKSRC} && NOCONFIGURE=1 ${SH} ./autogen.sh
 
 .if ${OPSYS} == "SunOS"
 CFLAGS+=               -D_XOPEN_SOURCE=600
+# Conflicts with the above settings
+CONFIGURE_ENV+=                ac_cv_func_madvise=no



Home | Main Index | Thread Index | Old Index