build with moonlight support. Added as a default option. Bump pkgrevision

5 files changed, 71 insertions, 5 deletions

diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 607e40e1245..be2ca109486 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.94 2009/10/11 07:49:49 kefren Exp $
+# $NetBSD: Makefile,v 1.95 2009/11/25 10:13:06 kefren Exp $
 
 DISTNAME=	mono-${MONO_VERSION}
 CATEGORIES=	lang
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mono/
 EXTRACT_SUFX=	.tar.bz2
 
@@ -29,7 +29,8 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-icu=yes
 CONFIGURE_ARGS+=	--with-preview=yes
 CONFIGURE_ARGS+=	--with-libgdiplus=installed
-CONFIGURE_ARGS+=	--with-moonlight=no
+
+.include "options.mk"
 
 MAKE_JOBS_SAFE=		no
 
diff --git a/lang/mono/PLIST.common b/lang/mono/PLIST.common
index 9f390717237..5202befcebf 100644
--- a/lang/mono/PLIST.common
+++ b/lang/mono/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.6 2009/07/15 11:37:16 kefren Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2009/11/25 10:13:06 kefren Exp $
 bin/al
 bin/al1
 bin/al2
@@ -452,6 +452,19 @@ lib/mono/2.0/xbuild.exe.mdb
 lib/mono/2.0/xbuild.rsp
 lib/mono/2.0/xsd.exe
 lib/mono/2.0/xsd.exe.mdb
+${PLIST.moon}lib/mono/2.1/Mono.CompilerServices.SymbolWriter.dll
+${PLIST.moon}lib/mono/2.1/System.Core.dll
+${PLIST.moon}lib/mono/2.1/System.Net.dll
+${PLIST.moon}lib/mono/2.1/System.Runtime.Serialization.dll
+${PLIST.moon}lib/mono/2.1/System.ServiceModel.Web.dll
+${PLIST.moon}lib/mono/2.1/System.ServiceModel.dll
+${PLIST.moon}lib/mono/2.1/System.Xml.Linq.dll
+${PLIST.moon}lib/mono/2.1/System.Xml.dll
+${PLIST.moon}lib/mono/2.1/System.dll
+${PLIST.moon}lib/mono/2.1/mscorlib.dll
+${PLIST.moon}lib/mono/2.1/mscorlib.dll.mdb
+${PLIST.moon}lib/mono/2.1/smcs.exe
+${PLIST.moon}lib/mono/2.1/smcs.exe.mdb
 lib/mono/3.5/System.Web.Extensions.Design.dll
 lib/mono/compat-1.0/ICSharpCode.SharpZipLib.dll
 lib/mono/compat-2.0/ICSharpCode.SharpZipLib.dll
@@ -740,6 +753,24 @@ lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll
 lib/mono/gac/System/1.0.5000.0__b77a5c561934e089/System.dll.mdb
 lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll
 lib/mono/gac/System/2.0.0.0__b77a5c561934e089/System.dll.mdb
+${PLIST.moon}lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.5.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll
+${PLIST.moon}lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.5.0__0738eb9f132ed756/Mono.CompilerServices.SymbolWriter.dll.mdb
+${PLIST.moon}lib/mono/gac/System.Core/2.0.5.0__7cec85d7bea7798e/System.Core.dll
+${PLIST.moon}lib/mono/gac/System.Core/2.0.5.0__7cec85d7bea7798e/System.Core.dll.mdb
+${PLIST.moon}lib/mono/gac/System.Net/2.0.5.0__7cec85d7bea7798e/System.Net.dll
+${PLIST.moon}lib/mono/gac/System.Net/2.0.5.0__7cec85d7bea7798e/System.Net.dll.mdb
+${PLIST.moon}lib/mono/gac/System.Runtime.Serialization/2.0.5.0__7cec85d7bea7798e/System.Runtime.Serialization.dll
+${PLIST.moon}lib/mono/gac/System.Runtime.Serialization/2.0.5.0__7cec85d7bea7798e/System.Runtime.Serialization.dll.mdb
+${PLIST.moon}lib/mono/gac/System.ServiceModel.Web/2.0.5.0__7cec85d7bea7798e/System.ServiceModel.Web.dll
+${PLIST.moon}lib/mono/gac/System.ServiceModel.Web/2.0.5.0__7cec85d7bea7798e/System.ServiceModel.Web.dll.mdb
+${PLIST.moon}lib/mono/gac/System.ServiceModel/2.0.5.0__31bf3856ad364e35/System.ServiceModel.dll
+${PLIST.moon}lib/mono/gac/System.ServiceModel/2.0.5.0__31bf3856ad364e35/System.ServiceModel.dll.mdb
+${PLIST.moon}lib/mono/gac/System.Xml.Linq/2.0.5.0__31bf3856ad364e35/System.Xml.Linq.dll
+${PLIST.moon}lib/mono/gac/System.Xml.Linq/2.0.5.0__31bf3856ad364e35/System.Xml.Linq.dll.mdb
+${PLIST.moon}lib/mono/gac/System.Xml/2.0.5.0__7cec85d7bea7798e/System.Xml.dll
+${PLIST.moon}lib/mono/gac/System.Xml/2.0.5.0__7cec85d7bea7798e/System.Xml.dll.mdb
+${PLIST.moon}lib/mono/gac/System/2.0.5.0__7cec85d7bea7798e/System.dll
+${PLIST.moon}lib/mono/gac/System/2.0.5.0__7cec85d7bea7798e/System.dll.mdb
 lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll
 lib/mono/gac/cscompmgd/7.0.5000.0__b03f5f7f11d50a3a/cscompmgd.dll.mdb
 lib/mono/gac/cscompmgd/8.0.0.0__b03f5f7f11d50a3a/cscompmgd.dll
diff --git a/lang/mono/distinfo b/lang/mono/distinfo
index dd8b99f96e2..646d3a44364 100644
--- a/lang/mono/distinfo
+++ b/lang/mono/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2009/10/11 07:49:49 kefren Exp $
+$NetBSD: distinfo,v 1.57 2009/11/25 10:13:06 kefren Exp $
 
 SHA1 (mono-2.4.2.3.tar.bz2) = c0e7c2992ef6c1ea3d1fd48ef581aa1ff6ec29cb
 RMD160 (mono-2.4.2.3.tar.bz2) = f52bf6e281b076b859a567c17917577710522684
@@ -27,6 +27,7 @@ SHA1 (patch-cb) = eaf041b83af24afc4d82d5088a01f98810a1de69
 SHA1 (patch-cd) = dc2afe3992c50b4201af628e12fc269d8bf893a6
 SHA1 (patch-ce) = ba1ae96ab63fe798ce781f0def5fe026d1776df0
 SHA1 (patch-ch) = d495e5a77a349b8d243ebf0a06a48d4342627ae2
+SHA1 (patch-ci) = d988ba39115c1656e1b84f354689706a41bf17d3
 SHA1 (patch-da) = 877ed8ec92ec25686c5a9a59db107f122d49035d
 SHA1 (patch-db) = 97c39aafeb66afdd42317a18c9b8d7d92b103cc0
 SHA1 (patch-dc) = 29fe575f97b7716ffb467e3ae0f19cb8b1e35c87
diff --git a/lang/mono/options.mk b/lang/mono/options.mk
new file mode 100644
index 00000000000..fe2a3fa2cc6
--- /dev/null
+++ b/lang/mono/options.mk
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2009/11/25 10:13:06 kefren Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mono
+PKG_SUPPORTED_OPTIONS=	moonlight
+PKG_SUGGESTED_OPTIONS=	moonlight
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		moon
+
+.if !empty(PKG_OPTIONS:Mmoonlight)
+PLIST.moon=	yes
+.else
+CONFIGURE_ARGS+=	--with-moonlight=no
+.endif
diff --git a/lang/mono/patches/patch-ci b/lang/mono/patches/patch-ci
new file mode 100644
index 00000000000..1c99cafb445
--- /dev/null
+++ b/lang/mono/patches/patch-ci
@@ -0,0 +1,18 @@
+$NetBSD: patch-ci,v 1.5 2009/11/25 10:13:06 kefren Exp $
+--- mcs/tools/moon/Makefile.orig	2009-11-25 10:54:11.000000000 +0200
++++ mcs/tools/moon/Makefile	2009-11-25 10:54:30.000000000 +0200
+@@ -53,12 +53,12 @@
+ test-local run-test-local run-test-ondotnet-local:
+ 
+ TUNER_FLAGS = -d $(WORKING_DIR) -o $(OUTPUT_DIR)	\
+-	-l none		\
+ 	-c link		\
+ 	-a smcs		\
+ 	-b true		\
+ 	-g true		\
+-	-m display_internalized false
++	-m display_internalized false			\
++	-l
+ 
+ TUNER_STEPS = \
+ 	Mono.Tuner.InjectAttributes,Mono.Tuner:OutputStep	\