mono6: look for dllmap in /usr/pkg/etc/mono/config

[Maya Rashish <maya%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Maya Rashish <maya%NetBSD.org@localhost>
Pushed By:	coypu
Date:		Thu Aug 15 17:30:45 2019 +0300
Changeset:	8050622c8ef7806e438913eef562304c42a6ef40

Modified Files:
	mono6/distinfo
Added Files:
	mono6/patches/patch-mono_metadata_mono-config.c

Log Message:
mono6: look for dllmap in /usr/pkg/etc/mono/config

instead of /usr/pkg/etc/mono/mono/config.

Thanks for Chavdar Ivanov for pointing out it already makes an
attempt to search for the dllmap in what is almost the right place.

Now all the Mono binaries work very well for a lot of programs.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8050622c8ef7806e438913eef562304c42a6ef40

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 mono6/distinfo                                  |  1 +
 mono6/patches/patch-mono_metadata_mono-config.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diffs:
diff --git a/mono6/distinfo b/mono6/distinfo
index 1dc2bb9e9a..b9325b0de2 100644
--- a/mono6/distinfo
+++ b/mono6/distinfo
@@ -14,6 +14,7 @@ SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7
 SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
 SHA1 (patch-mcs_class_corlib_Test_Mono_MonoNativePlatformType.cs) = 3368edee232b184879091df3d68daf4900f744c2
 SHA1 (patch-mono_metadata_icall.c) = 292c7bc4c959a3a5c1a982ccf2bc26a5300a0730
+SHA1 (patch-mono_metadata_mono-config.c) = ba690e4790c94e085214d303a9ac71a2a1d08fee
 SHA1 (patch-mono_metadata_threads.c) = e1432cced0dafce1a2712869ce79e12a2ab35973
 SHA1 (patch-mono_mini_Makefile.am.in) = 697b0b56d9b7ddb5f61cd105c2c9c5dfac53ed9b
 SHA1 (patch-mono_native_Makefile.am) = 47e57623ebfce32f13a5fc1c19a0dbcb31dad8d4
diff --git a/mono6/patches/patch-mono_metadata_mono-config.c b/mono6/patches/patch-mono_metadata_mono-config.c
new file mode 100644
index 0000000000..9d7ac71b8d
--- /dev/null
+++ b/mono6/patches/patch-mono_metadata_mono-config.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Look for our dllmap in /usr/pkg/etc/mono/config
+as opposed to /usr/pkg/etc/mono/mono/config
+
+--- mono/metadata/mono-config.c.orig	2019-07-18 07:46:08.000000000 +0000
++++ mono/metadata/mono-config.c
+@@ -694,7 +694,7 @@ mono_config_parse (const char *filename)
+ 
+ 	const char *mono_cfg_dir = mono_get_config_dir ();
+ 	if (mono_cfg_dir) {
+-		mono_cfg = g_build_filename (mono_cfg_dir, "mono", "config", NULL);
++		mono_cfg = g_build_filename (mono_cfg_dir, "config", NULL);
+ 		mono_config_parse_file (mono_cfg);
+ 		g_free (mono_cfg);
+ 	}