Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1590222800290850"
MIME-Version: 1.0
Date: Sat, 23 May 2020 08:33:20 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/lang/mono
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
Message-Id: <20200523083320.69BB4FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1590222800290850
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sat May 23 08:33:20 UTC 2020

Modified Files:
	pkgsrc/lang/mono: Makefile

Log Message:
lang/mono: clean up configure options and REPLACE_*


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 pkgsrc/lang/mono/Makefile

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


--_----------=_1590222800290850
Content-Disposition: inline
Content-Length: 2702
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/mono/Makefile
diff -u pkgsrc/lang/mono/Makefile:1.190 pkgsrc/lang/mono/Makefile:1.191
--- pkgsrc/lang/mono/Makefile:1.190	Tue May 12 16:46:27 2020
+++ pkgsrc/lang/mono/Makefile	Sat May 23 08:33:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.190 2020/05/12 16:46:27 rillig Exp $
+# $NetBSD: Makefile,v 1.191 2020/05/23 08:33:20 rillig Exp $
 
 DISTNAME=	mono-4.0.4.1
 PKGREVISION=	19
@@ -22,8 +22,8 @@ USE_LANGUAGES+=	c c99 c++
 EXTRACT_USING=	gtar
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q} --with-icu=yes
-CONFIGURE_ARGS+=	--with-preview=yes --with-libgdiplus=installed
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-libgdiplus=installed
 CONFIGURE_ARGS+=	--disable-dtrace
 
 CTF_SUPPORTED=	no	# https://smartos.org/bugview/OS-6510
@@ -44,26 +44,27 @@ PKGCONFIG_OVERRIDE+=	data/system.web.ext
 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/errors/do-tests.pl mcs/tools/scan-tests.pl
+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_PYTHON+=	scripts/mono-heapviz
 
-REPLACE_BASH+=	build-mingw32.sh mono/arch/arm/dpiops.sh mono/arch/arm/fpaops.sh
-REPLACE_BASH+=	mono/arch/arm/vfpops.sh mono/tests/make_imt_test.sh
-REPLACE_BASH+=	scripts/mono-find-provides.in scripts/mono-find-requires.in
-REPLACE_BASH+=	scripts/mono-test-install web/mono-build-w32.sh
-REPLACE_BASH+=	mcs/class/Mono.WebBrowser/build-csproj2k5
-REPLACE_BASH+=	mcs/class/Managed.Windows.Forms/build-csproj
-REPLACE_BASH+=	mcs/class/Managed.Windows.Forms/build-csproj2k5
+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-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 libgc/mkinstalldirs
-REPLACE_BASH+=	mcs/mkinstalldirs mkinstalldirs
+REPLACE_BASH+=	mcs/tools/tinderbox/tinderbox.sh
+REPLACE_BASH+=	libgc/mkinstalldirs
+REPLACE_BASH+=	mcs/mkinstalldirs
+REPLACE_BASH+=	mkinstalldirs
 
 EGDIR=		${PREFIX}/share/examples/mono
 CONF_FILES=	${EGDIR}/config ${PKG_SYSCONFDIR}/mono/config


--_----------=_1590222800290850--