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@

8 files changed, 22 insertions, 22 deletions

diff --git a/net/avahi/Makefile b/net/avahi/Makefile
index 2e92da75dc3..88391cb03ab 100644
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2013/06/06 12:53:42 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2013/06/17 12:44:54 wiz Exp $
 
 DISTNAME=		avahi-0.6.31
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		net
 MASTER_SITES=		http://avahi.org/download/
 
diff --git a/net/avahi/options.mk b/net/avahi/options.mk
index ad74ac36291..bbf8980891b 100644
--- a/net/avahi/options.mk
+++ b/net/avahi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2013/04/21 00:58:46 rodent Exp $
+# $NetBSD: options.mk,v 1.4 2013/06/17 12:44:54 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.avahi
 PKG_SUPPORTED_OPTIONS=	avahi-howl gdbm introspection gtk2 gtk3 mono python qt3
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+=	--enable-introspection=no
 
 .if !empty(PKG_OPTIONS:Mmono)
 .include "../../x11/gtk-sharp/buildlink3.mk"
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 CONFIGURE_ARGS+=	--disable-monodoc # XXX broken
 PLIST.mono=		yes
 .else
diff --git a/net/dcsharp/Makefile b/net/dcsharp/Makefile
index b92a985fa53..11968dc0924 100644
--- a/net/dcsharp/Makefile
+++ b/net/dcsharp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2013/06/06 12:54:54 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2013/06/17 12:44:54 wiz Exp $
 
 DISTNAME=	dcsharp-0.11.1
-PKGREVISION=	33
+PKGREVISION=	34
 CATEGORIES=	net
 MASTER_SITES=	http://dcsharp.googlecode.com/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -25,7 +25,7 @@ do-build:
 do-install:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${DESTDIR}${PREFIX} install
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../x11/gnome-sharp/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus/buildlink3.mk"
diff --git a/net/mono-nat/Makefile b/net/mono-nat/Makefile
index fd9bd67f6bb..f7e2cf94f92 100644
--- a/net/mono-nat/Makefile
+++ b/net/mono-nat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/05/09 07:39:18 adam Exp $
+# $NetBSD: Makefile,v 1.9 2013/06/17 12:44:54 wiz Exp $
 
 DISTNAME=	mono-nat-1.0.2
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://projects.qnetp.net/attachments/download/22/
 
@@ -13,5 +13,5 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	no
 USE_TOOLS+=	gmake pkg-config
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/mono-nat/buildlink3.mk b/net/mono-nat/buildlink3.mk
index 9c4d6233bd8..992ecb234a0 100644
--- a/net/mono-nat/buildlink3.mk
+++ b/net/mono-nat/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2013/01/26 21:36:42 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2013/06/17 12:44:54 wiz Exp $
 
 BUILDLINK_TREE+=	mono-nat
 
@@ -6,10 +6,10 @@ BUILDLINK_TREE+=	mono-nat
 MONO_NAT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.mono-nat+=	mono-nat>=1.0.2
-BUILDLINK_ABI_DEPENDS.mono-nat+=	mono-nat>=1.0.2nb5
+BUILDLINK_ABI_DEPENDS.mono-nat+=	mono-nat>=1.0.2nb7
 BUILDLINK_PKGSRCDIR.mono-nat?=	../../net/mono-nat
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 
 .endif	# MONO_NAT_BUILDLINK3_MK
 
diff --git a/net/monotorrent/Makefile b/net/monotorrent/Makefile
index 117989e3925..b9a3d237a9a 100644
--- a/net/monotorrent/Makefile
+++ b/net/monotorrent/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/05/09 07:39:18 adam Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/17 12:44:54 wiz Exp $
 
 DISTNAME=	monotorrent-0.72
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://projects.qnetp.net/attachments/download/13/
 
@@ -14,5 +14,5 @@ MAKE_JOBS_SAFE=	no
 USE_TOOLS+=	gmake bsdtar pkg-config
 EXTRACT_USING=	bsdtar
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/monotorrent/buildlink3.mk b/net/monotorrent/buildlink3.mk
index 2cee86f1622..aab9b05c69e 100644
--- a/net/monotorrent/buildlink3.mk
+++ b/net/monotorrent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2013/01/26 21:36:42 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2013/06/17 12:44:54 wiz Exp $
 
 BUILDLINK_TREE+=	monotorrent
 
@@ -6,10 +6,10 @@ BUILDLINK_TREE+=	monotorrent
 MONOTORRENT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.monotorrent+=	monotorrent>=0.72
-BUILDLINK_ABI_DEPENDS.monotorrent+=	monotorrent>=0.72nb5
+BUILDLINK_ABI_DEPENDS.monotorrent+=	monotorrent>=0.72nb7
 BUILDLINK_PKGSRCDIR.monotorrent?=	../../net/monotorrent
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .endif # MONOTORRENT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-monotorrent
diff --git a/net/monsoon/Makefile b/net/monsoon/Makefile
index 9f7a8548845..81e95660b2a 100644
--- a/net/monsoon/Makefile
+++ b/net/monsoon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2013/06/06 12:54:57 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2013/06/17 12:44:54 wiz Exp $
 
 DISTNAME=	monsoon-0.20
-PKGREVISION=	31
+PKGREVISION=	32
 CATEGORIES=	net
 MASTER_SITES=	http://www.monsoon-project.org/jaws/data/files/
 
@@ -14,7 +14,7 @@ MAKE_JOBS_SAFE=	no
 USE_TOOLS+=	gmake gtar intltool perl pkg-config msgfmt
 EXTRACT_USING=	gtar
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../net/mono-nat/buildlink3.mk"
 .include "../../net/monotorrent/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"