[pkgsrc/trunk]: pkgsrc/lang/mono6 mono6: Give up and add cmake to USE_TOOLS.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/612aa0c25f90
branches:  trunk
changeset: 400678:612aa0c25f90
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Sep 01 12:04:38 2019 +0000

description:
mono6: Give up and add cmake to USE_TOOLS.

While here, silcence some pkglint warnings.

diffstat:

 lang/mono6/Makefile      |  14 ++++++--------
 lang/mono6/buildlink3.mk |   4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diffs (72 lines):

diff -r 1a71847be3a2 -r 612aa0c25f90 lang/mono6/Makefile
--- a/lang/mono6/Makefile       Sun Sep 01 11:44:19 2019 +0000
+++ b/lang/mono6/Makefile       Sun Sep 01 12:04:38 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/08/31 10:30:03 nia Exp $
+# $NetBSD: Makefile,v 1.4 2019/09/01 12:04:38 nia Exp $
 
 DISTNAME=      mono-6.0.0.313
 CATEGORIES=    lang
@@ -16,7 +16,8 @@
 CONFLICTS=     pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
 ALL_ENV+=      MONO_SHARED_DIR=${WRKDIR} PLATFORM=
 
-USE_TOOLS+=    bash:run bison gmake gtar msgfmt perl:run pkg-config autoconf automake
+USE_TOOLS+=    bash:run cmake gmake gtar msgfmt perl:run pkg-config
+USE_TOOLS+=    bison autoconf automake
 USE_LIBTOOL=   yes
 USE_LANGUAGES+=        c c99 c++
 EXTRACT_USING= gtar
@@ -25,10 +26,6 @@
 PKG_SYSCONFSUBDIR=     mono
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
-# The boringtls provider seems Linux-only and requires CMake to build.
-CONFIGURE_ARGS+=       --disable-btls
-CONFIGURE_ARGS+=       --disable-btls-lib
-
 # Requires a cwrappers change: http://mail-index.netbsd.org/tech-pkg/2019/08/16/msg021791.html
 USE_CWRAPPERS=         no
 
@@ -112,13 +109,13 @@
 TEST_TARGET=   check
 
 SUBST_CLASSES+=                        fix-prefix
-SUBST_STAGE.fix-prefix=                post-patch
+SUBST_STAGE.fix-prefix=                pre-configure
 SUBST_MESSAGE.fix-prefix=      Fixing relative prefix
 SUBST_FILES.fix-prefix=                ${PKGCONFIG_OVERRIDE}
 SUBST_SED.fix-prefix=          -e 's,$${pcfiledir}/../..,\@prefix\@,g'
 
 SUBST_CLASSES+=                        fix-cfgdir
-SUBST_STAGE.fix-cfgdir=                post-patch
+SUBST_STAGE.fix-cfgdir=                pre-configure
 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'
@@ -167,6 +164,7 @@
 CFLAGS+=               -march=i586
 .endif
 
+# Unsafe JIT, possibly problematic boehm-gc
 NOT_PAX_MPROTECT_SAFE+=        bin/mono-sgen
 
 post-install:
diff -r 1a71847be3a2 -r 612aa0c25f90 lang/mono6/buildlink3.mk
--- a/lang/mono6/buildlink3.mk  Sun Sep 01 11:44:19 2019 +0000
+++ b/lang/mono6/buildlink3.mk  Sun Sep 01 12:04:38 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/08/25 16:37:01 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/09/01 12:04:38 nia Exp $
 
 BUILDLINK_TREE+=       mono
 
@@ -6,7 +6,7 @@
 MONO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mono+=   mono>=4
-BUILDLINK_ABI_DEPENDS.mono?=   mono>=4.0.1
+BUILDLINK_ABI_DEPENDS.mono+=   mono>=4.0.1
 BUILDLINK_PKGSRCDIR.mono?=     ../../lang/mono
 ALL_ENV+=                      MONO_SHARED_DIR=${WRKDIR}
 BUILDLINK_CONTENTS_FILTER.mono=        ${EGREP} '(^include/|^lib/)'