[pkgsrc/trunk]: pkgsrc/lang/mono6 don't use PKG_SYSCONFSUBDIR, as mono source...

[plunky <plunky%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a39055db1c32
branches:  trunk
changeset: 431033:a39055db1c32
user:      plunky <plunky%pkgsrc.org@localhost>
date:      Fri May 08 11:00:08 2020 +0000

description:
don't use PKG_SYSCONFSUBDIR, as mono sources refer to ${sysconfdir}/mono
in various ways

- this fixes specific problem with gacutil failing to run

diffstat:

 lang/mono6/Makefile                                  |  53 +++++++++----------
 lang/mono6/patches/patch-mono_metadata_mono-config.c |  16 ------
 2 files changed, 26 insertions(+), 43 deletions(-)

diffs (113 lines):

diff -r ae4d31b9ca86 -r a39055db1c32 lang/mono6/Makefile
--- a/lang/mono6/Makefile       Fri May 08 09:33:48 2020 +0000
+++ b/lang/mono6/Makefile       Fri May 08 11:00:08 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2020/04/25 18:16:42 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2020/05/08 11:00:08 plunky Exp $
 
 DISTNAME=      mono-6.8.0.105
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang
 MASTER_SITES=  https://download.mono-project.com/sources/mono/
 EXTRACT_SUFX=  .tar.xz
@@ -25,7 +25,6 @@
 EXTRACT_USING= gtar
 
 GNU_CONFIGURE=         yes
-PKG_SYSCONFSUBDIR=     mono
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --disable-btls
 CONFIGURE_ARGS+=       --disable-btls-lib
@@ -68,47 +67,47 @@
 EGDIR=         ${PREFIX}/share/examples/mono
 
 CONF_FILES+=   ${EGDIR}/2.0/Browsers/Compat.browser \
-               ${PKG_SYSCONFDIR}/2.0/Browsers/Compat.browser
+               ${PKG_SYSCONFDIR}/mono/2.0/Browsers/Compat.browser
 CONF_FILES+=   ${EGDIR}/2.0/DefaultWsdlHelpGenerator.aspx \
-               ${PKG_SYSCONFDIR}/2.0/DefaultWsdlHelpGenerator.aspx
+               ${PKG_SYSCONFDIR}/mono/2.0/DefaultWsdlHelpGenerator.aspx
 CONF_FILES+=   ${EGDIR}/2.0/machine.config \
-               ${PKG_SYSCONFDIR}/2.0/machine.config
+               ${PKG_SYSCONFDIR}/mono/2.0/machine.config
 CONF_FILES+=   ${EGDIR}/2.0/settings.map \
-               ${PKG_SYSCONFDIR}/2.0/settings.map
+               ${PKG_SYSCONFDIR}/mono/2.0/settings.map
 CONF_FILES+=   ${EGDIR}/2.0/web.config \
-               ${PKG_SYSCONFDIR}/2.0/web.config
+               ${PKG_SYSCONFDIR}/mono/2.0/web.config
 CONF_FILES+=   ${EGDIR}/4.0/Browsers/Compat.browser \
-               ${PKG_SYSCONFDIR}/4.0/Browsers/Compat.browser
+               ${PKG_SYSCONFDIR}/mono/4.0/Browsers/Compat.browser
 CONF_FILES+=   ${EGDIR}/4.0/DefaultWsdlHelpGenerator.aspx \
-               ${PKG_SYSCONFDIR}/4.0/DefaultWsdlHelpGenerator.aspx
+               ${PKG_SYSCONFDIR}/mono/4.0/DefaultWsdlHelpGenerator.aspx
 CONF_FILES+=   ${EGDIR}/4.0/machine.config \
-               ${PKG_SYSCONFDIR}/4.0/machine.config
+               ${PKG_SYSCONFDIR}/mono/4.0/machine.config
 CONF_FILES+=   ${EGDIR}/4.0/settings.map \
-               ${PKG_SYSCONFDIR}/4.0/settings.map
+               ${PKG_SYSCONFDIR}/mono/4.0/settings.map
 CONF_FILES+=   ${EGDIR}/4.0/web.config \
-               ${PKG_SYSCONFDIR}/4.0/web.config
+               ${PKG_SYSCONFDIR}/mono/4.0/web.config
 CONF_FILES+=   ${EGDIR}/4.5/Browsers/Compat.browser \
-               ${PKG_SYSCONFDIR}/4.5/Browsers/Compat.browser
+               ${PKG_SYSCONFDIR}/mono/4.5/Browsers/Compat.browser
 CONF_FILES+=   ${EGDIR}/4.5/DefaultWsdlHelpGenerator.aspx \
-               ${PKG_SYSCONFDIR}/4.5/DefaultWsdlHelpGenerator.aspx
+               ${PKG_SYSCONFDIR}/mono/4.5/DefaultWsdlHelpGenerator.aspx
 CONF_FILES+=   ${EGDIR}/4.5/machine.config \
-               ${PKG_SYSCONFDIR}/4.5/machine.config
+               ${PKG_SYSCONFDIR}/mono/4.5/machine.config
 CONF_FILES+=   ${EGDIR}/4.5/settings.map \
-               ${PKG_SYSCONFDIR}/4.5/settings.map
+               ${PKG_SYSCONFDIR}/mono/4.5/settings.map
 CONF_FILES+=   ${EGDIR}/4.5/web.config \
-               ${PKG_SYSCONFDIR}/4.5/web.config
+               ${PKG_SYSCONFDIR}/mono/4.5/web.config
 CONF_FILES+=   ${EGDIR}/browscap.ini \
-               ${PKG_SYSCONFDIR}/browscap.ini
+               ${PKG_SYSCONFDIR}/mono/browscap.ini
 CONF_FILES+=   ${EGDIR}/config \
-               ${PKG_SYSCONFDIR}/config
+               ${PKG_SYSCONFDIR}/mono/config
 
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/2.0
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/2.0/Browsers
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/4.0
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/4.0/Browsers
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/4.5
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/4.5/Browsers
-MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mconfig
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/2.0
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/2.0/Browsers
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/4.0
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/4.0/Browsers
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/4.5
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/4.5/Browsers
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/mono/mconfig
 
 TEST_TARGET=   check
 
diff -r ae4d31b9ca86 -r a39055db1c32 lang/mono6/patches/patch-mono_metadata_mono-config.c
--- a/lang/mono6/patches/patch-mono_metadata_mono-config.c      Fri May 08 09:33:48 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-mono_metadata_mono-config.c,v 1.4 2020/02/12 15:25:16 ryoon Exp $
-
-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   2020-02-04 17:00:34.000000000 +0000
-+++ mono/metadata/mono-config.c
-@@ -676,7 +676,7 @@ mono_config_parse (const char *filename)
- 
-       const char *cfg_dir = mono_get_config_dir ();
-       if (cfg_dir) {
--              char *mono_cfg = g_build_filename (cfg_dir, "mono", "config", (const char*)NULL);
-+              char *mono_cfg = g_build_filename (cfg_dir, "config", (const char*)NULL);
-               mono_config_parse_file (mono_cfg);
-               g_free (mono_cfg);
-       }