Make mono packages depend on lang/mono2 instead of lang/mono.

The latter contains the unstable version 3 of mono, which breaks many mono
packages.

Bump dependencies and PKGREVISIONs.

Ok during freeze: gdt@

11 files changed, 26 insertions, 44 deletions

diff --git a/devel/libthrift/Makefile b/devel/libthrift/Makefile
index b19a95936d3..a64db6bad4a 100644
--- a/devel/libthrift/Makefile
+++ b/devel/libthrift/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2013/05/31 12:40:01 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2013/06/17 12:44:53 wiz Exp $
 
 DISTNAME=	thrift-${THRIFT_VERSION}
 PKGNAME=	libthrift-${THRIFT_VERSION}
-PKGREVISION=	15
+PKGREVISION=	16
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:=thrift/${THRIFT_VERSION}/}
 
diff --git a/devel/libthrift/options.mk b/devel/libthrift/options.mk
index 4459eaf4e28..0c426348984 100644
--- a/devel/libthrift/options.mk
+++ b/devel/libthrift/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2011/10/14 03:25:33 dholland Exp $
+# $NetBSD: options.mk,v 1.6 2013/06/17 12:44:53 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libthrift
 PKG_SUPPORTED_OPTIONS=	csharp java erlang python perl php ruby
@@ -17,7 +17,7 @@ post-install:
 	${INSTALL_LIB} ${WRKSRC}/lib/csharp/Thrift.dll \
 	  ${DESTDIR}${PREFIX}/lib/thrift/Thrift.dll
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-csharp
 .endif
diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile
index a26b91252fc..439d3a68583 100644
--- a/devel/mono-addins/Makefile
+++ b/devel/mono-addins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2013/05/09 07:39:07 adam Exp $
+# $NetBSD: Makefile,v 1.23 2013/06/17 12:44:53 wiz Exp $
 
 DISTNAME=	mono-addins-1.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	-http://download-codeplex.sec.s-msft.com/Download/Release?ProjectName=monoaddins&DownloadId=509482&FileTime=129948574181430000&Build=19556
 
@@ -14,6 +14,6 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake pkg-config
 MAKE_JOBS_SAFE=	no
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/mono-addins/buildlink3.mk b/devel/mono-addins/buildlink3.mk
index f9815ac4af7..babf81a4071 100644
--- a/devel/mono-addins/buildlink3.mk
+++ b/devel/mono-addins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2013/05/09 07:39:07 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2013/06/17 12:44:53 wiz Exp $
 
 BUILDLINK_TREE+=	mono-addins
 
@@ -6,11 +6,11 @@ BUILDLINK_TREE+=	mono-addins
 MONO_ADDINS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mono-addins+=	mono-addins>=0.3
-BUILDLINK_ABI_DEPENDS.mono-addins+=	mono-addins>=1.0nb2
+BUILDLINK_ABI_DEPENDS.mono-addins+=	mono-addins>=1.0nb3
 BUILDLINK_PKGSRCDIR.mono-addins?=	../../devel/mono-addins
 BUILDLINK_CONTENTS_FILTER.mono-addins+=	${EGREP} '^lib/'
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .endif # MONO_ADDINS_BUILDLINK3_MK
 
diff --git a/devel/mono-addins/distinfo b/devel/mono-addins/distinfo
index 85f0117fd66..bb196e7d0b1 100644
--- a/devel/mono-addins/distinfo
+++ b/devel/mono-addins/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2013/05/29 11:13:03 wiz Exp $
+$NetBSD: distinfo,v 1.8 2013/06/17 12:44:53 wiz Exp $
 
 SHA1 (mono-addins-1.0.tar.gz) = f6c4b4c0bb64fcd8ba7d0ef4ade9e4cc42c03434
 RMD160 (mono-addins-1.0.tar.gz) = 591dd434a10069cb249f32834248dcb4bccd4928
 Size (mono-addins-1.0.tar.gz) = 539596 bytes
-SHA1 (patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj) = 467bec67decf82312122b61a75b65ce3a413e35a
diff --git a/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj b/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj
deleted file mode 100644
index 95c75e7bdc8..00000000000
--- a/devel/mono-addins/patches/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj,v 1.1 2013/05/29 11:13:03 wiz Exp $
-
-Fix
-: error CS1705: Assembly `gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f' references `Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756' which has a higher version number than imported assembly `Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756'
-Mono.Addins.Gui/HeaderBox.cs(133,47): error CS0012: The type `Cairo.Context' is defined in an assembly that is not referenced. Consider adding a reference to assembly `Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756'
-
---- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig	2012-10-16 10:04:04.000000000 +0000
-+++ Mono.Addins.Gui/Mono.Addins.Gui.csproj
-@@ -42,7 +42,7 @@
-     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
--    <Reference Include="Mono.Cairo" />
-+    <Reference Include="Mono.Cairo, Version=4.0.0.0" />
-     <Reference Include="System.Core" />
-   </ItemGroup>
-   <ItemGroup>
diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile
index ee8a2fc9199..6fb82b98d17 100644
--- a/devel/mono-tools/Makefile
+++ b/devel/mono-tools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2013/06/06 12:54:13 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2013/06/17 12:44:53 wiz Exp $
 
 DISTNAME=	mono-tools-2.10
-PKGREVISION=	25
+PKGREVISION=	26
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/mono-tools/
 EXTRACT_SUFX=	.tar.bz2
@@ -21,7 +21,7 @@ MAKE_JOBS_SAFE=		no
 CONFIGURE_ARGS+=	--mandir=${PKGMANDIR}
 
 .include "../../graphics/libgdiplus/buildlink3.mk"
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
 .include "../../x11/gnome-desktop-sharp/buildlink3.mk"
diff --git a/devel/monodevelop-database/Makefile b/devel/monodevelop-database/Makefile
index 4daac0ec1cf..8c9568f4c14 100644
--- a/devel/monodevelop-database/Makefile
+++ b/devel/monodevelop-database/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:14 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/17 12:44:53 wiz Exp $
 
 DISTNAME=	monodevelop-database-2.4
-PKGREVISION=	23
+PKGREVISION=	24
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/monodevelop-database/
 EXTRACT_SUFX=	.tar.bz2
@@ -19,7 +19,7 @@ MAKE_JOBS_SAFE=	no
 
 .include "../../devel/mono-addins/buildlink3.mk"
 .include "../../devel/monodevelop/buildlink3.mk"
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 2dedbfce2f7..9cd75f1dc9d 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2013/06/06 12:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2013/06/17 12:44:53 wiz Exp $
 
 DISTNAME=	monodevelop-2.4.2
-PKGREVISION=	23
+PKGREVISION=	24
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/monodevelop/
 EXTRACT_SUFX=	.tar.bz2
@@ -41,7 +41,7 @@ SUBST_SED.fix-gmake=		-e 's,MAKEPROGRAM,${MAKE_PROGRAM},'
 .include "../../devel/mono-addins/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libgdiplus/buildlink3.mk"
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtksourceview-sharp2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
diff --git a/devel/monodevelop/buildlink3.mk b/devel/monodevelop/buildlink3.mk
index 766e42e9480..2697592883b 100644
--- a/devel/monodevelop/buildlink3.mk
+++ b/devel/monodevelop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2013/06/06 12:53:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2013/06/17 12:44:53 wiz Exp $
 
 BUILDLINK_TREE+=	monodevelop
 
@@ -6,14 +6,14 @@ BUILDLINK_TREE+=	monodevelop
 MONODEVELOP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.monodevelop+=	monodevelop>=2.4
-BUILDLINK_ABI_DEPENDS.monodevelop+=	monodevelop>=2.4.2nb23
+BUILDLINK_ABI_DEPENDS.monodevelop+=	monodevelop>=2.4.2nb24
 BUILDLINK_PKGSRCDIR.monodevelop?=	../../devel/monodevelop
 BUILDLINK_CONTENTS_FILTER.monodevelop+=	${EGREP} '^lib/'
 
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/mono-addins/buildlink3.mk"
 .include "../../graphics/libgdiplus/buildlink3.mk"
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../x11/gtksourceview-sharp2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
diff --git a/devel/nant/Makefile b/devel/nant/Makefile
index 82b988237b6..e27227394f6 100644
--- a/devel/nant/Makefile
+++ b/devel/nant/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2013/05/09 07:39:37 adam Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/17 12:44:54 wiz Exp $
 #
 
 DISTNAME=	nant-0.86-beta1-src
 PKGNAME=	nant-0.86beta1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nant/}
 
@@ -25,5 +25,5 @@ INSTALL_MAKE_FLAGS+=		prefix=${DESTDIR}${PREFIX} \
 do-configure:
 	cd ${WRKSRC} &&	${SETENV} ${MAKE_ENV} ${GMAKE} setup
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"