mono6: Set PKG_SYSCONFSUBDIR

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Mon Aug 5 17:42:03 2019 +0100
Changeset:	9505cf6329513b5f5ae2a110a99b8bcc076bf0da

Modified Files:
	mono6/Makefile
	mono6/distinfo
	mono6/patches/patch-configure.ac

Log Message:
mono6: Set PKG_SYSCONFSUBDIR

Fix the path to more GUI-related libraries... still doesn't work.

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

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

diffstat:
 mono6/Makefile                   | 12 +++++++-----
 mono6/distinfo                   |  2 +-
 mono6/patches/patch-configure.ac | 14 ++++++++++----
 3 files changed, 18 insertions(+), 10 deletions(-)

diffs:
diff --git a/mono6/Makefile b/mono6/Makefile
index 3a3cd509f0..8409d5b927 100644
--- a/mono6/Makefile
+++ b/mono6/Makefile
@@ -22,6 +22,7 @@ USE_LANGUAGES+=	c c99 c++
 EXTRACT_USING=	gtar
 
 GNU_CONFIGURE=		yes
+PKG_SYSCONFSUBDIR=	mono
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} --with-icu=yes
 CONFIGURE_ARGS+=	--disable-dtrace
 
@@ -117,11 +118,12 @@ SUBST_MESSAGE.fix-cfgdir=	Fixing configuration files install dir
 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
+SUBST_CLASSES+=			fix-libs
+SUBST_STAGE.fix-libs=		pre-configure
+SUBST_MESSAGE.fix-libs=		Fixing library search path configuration
+SUBST_FILES.fix-libs=		configure.ac
+SUBST_VARS.fix-libs+=		X11BASE
+SUBST_VARS.fix-libs+=		PREFIX
 
 SUBST_CLASSES+=			fix-python
 SUBST_STAGE.fix-python=		pre-configure
diff --git a/mono6/distinfo b/mono6/distinfo
index 841c2972d6..29997b65aa 100644
--- a/mono6/distinfo
+++ b/mono6/distinfo
@@ -4,7 +4,7 @@ SHA1 (mono-6.0.0.313.tar.xz) = c5cccad2cb5be936f23e46b95df7628013e29e3c
 RMD160 (mono-6.0.0.313.tar.xz) = 801e5128561d2e95a6736cdfce040d8850be4e2f
 SHA512 (mono-6.0.0.313.tar.xz) = a1de452eb1c6edba503723217a4b5839563d154ff0c01852b551a41b3c98b5b617637e4e435de87bf275cfdce4066e70bfc763b607882f0b42e14196d7d5c156
 Size (mono-6.0.0.313.tar.xz) = 218124872 bytes
-SHA1 (patch-configure.ac) = 8639e82f6116f6a2b09d4aacc3e6744a120838bc
+SHA1 (patch-configure.ac) = f932add14f5b54af5cc183cfd30f482f11f7d504
 SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
 SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9
 SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee
diff --git a/mono6/patches/patch-configure.ac b/mono6/patches/patch-configure.ac
index 7683c65f7c..ae5b882d64 100644
--- a/mono6/patches/patch-configure.ac
+++ b/mono6/patches/patch-configure.ac
@@ -5,15 +5,21 @@ https://github.com/mono/mono/pull/15938
 
 --- configure.ac.orig	2019-07-18 07:52:31.000000000 +0000
 +++ configure.ac
-@@ -4066,7 +4066,7 @@ LIBC="libc.so.6"
+@@ -4066,10 +4066,10 @@ LIBC="libc.so.6"
  INTL="libc.so.6"
  SQLITE="libsqlite.so.0"
  SQLITE3="libsqlite3.so.0"
 -X11="libX11.so"
+-GDKX11="libgdk-x11-2.0.so.0"
+-GTKX11="libgtk-x11-2.0.so.0"
+-XINERAMA="libXinerama.so.1"
 +X11="@X11BASE@/lib/libX11.so"
- GDKX11="libgdk-x11-2.0.so.0"
- GTKX11="libgtk-x11-2.0.so.0"
- XINERAMA="libXinerama.so.1"
++GDKX11="@PREFIX@/lib/libgdk-x11-2.0.so.0"
++GTKX11="@PREFIX@/lib/libgtk-x11-2.0.so.0"
++XINERAMA="@X11BASE@/lib/libXinerama.so"
+ 
+ sizeof_register="SIZEOF_VOID_P"
+ 
 @@ -6177,6 +6177,22 @@ elif test x$platform_android = xyes; the
  	MONO_NATIVE_PLATFORM=android