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@

4 files changed, 13 insertions, 13 deletions

diff --git a/textproc/OdfConverter/Makefile b/textproc/OdfConverter/Makefile
index 82bea47dfb4..9e631843798 100644
--- a/textproc/OdfConverter/Makefile
+++ b/textproc/OdfConverter/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.28 2013/06/06 12:55:06 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2013/06/17 12:44:55 wiz Exp $
 #
 
 DISTNAME=	OdfAddinForOffice-src-3.0
 PKGNAME=	OdfConverter-3.0
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	converters textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=odf-converter/}
 EXTRACT_SUFX=	.zip
@@ -14,7 +14,7 @@ COMMENT=	Converter between Microsoft Office 2007 and OpenOffice formats
 LICENSE=	modified-bsd
 
 # mono-basic DLLs are required at run-time (but not at build time).
-DEPENDS+=	mono-basic-[0-9]*:../../lang/mono-basic
+DEPENDS+=	mono-basic-[0-9]*:../../lang/mono2-basic
 
 USE_LANGUAGES=	c
 USE_TOOLS+=	gmake pkg-config
@@ -70,6 +70,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/source/Shell/OdfConverter/README.TXT \
 		${DESTDIR}${PREFIX}/share/doc/OdfConverter/README.TXT
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gnome-subtitles/Makefile b/textproc/gnome-subtitles/Makefile
index d4d981a8d5b..59bedb8fab4 100644
--- a/textproc/gnome-subtitles/Makefile
+++ b/textproc/gnome-subtitles/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2013/06/06 12:55:07 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/06/17 12:44:55 wiz Exp $
 
 DISTNAME=	gnome-subtitles-1.1
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	multimedia textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnome-subtitles/}
 
@@ -23,7 +23,7 @@ DEPENDS+=	enchant>=1.3:../../textproc/enchant
 DEPENDS+=	gtkspell>=2.0:../../textproc/gtkspell
 
 .include "../../devel/GConf/schemas.mk"
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/textproc/sublib/Makefile b/textproc/sublib/Makefile
index 2cbf003e3f7..8e6948bf389 100644
--- a/textproc/sublib/Makefile
+++ b/textproc/sublib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/05/09 07:39:20 adam Exp $
+# $NetBSD: Makefile,v 1.10 2013/06/17 12:44:55 wiz Exp $
 
 DISTNAME=		sublib-0.9
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		multimedia textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sublib/}
 EXTRACT_SUFX=		.zip
@@ -20,5 +20,5 @@ SUBST_MESSAGE.fix-prefix=	Fixing library installation directory
 SUBST_FILES.fix-prefix=		data/sublib.pc.in
 SUBST_SED.fix-prefix=		-e 's,@libdir@,@libdir@/mono,'
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/sublib/buildlink3.mk b/textproc/sublib/buildlink3.mk
index b6f581dcfd6..33df129f968 100644
--- a/textproc/sublib/buildlink3.mk
+++ b/textproc/sublib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2013/01/26 21:36:49 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2013/06/17 12:44:55 wiz Exp $
 
 BUILDLINK_TREE+=	sublib
 
@@ -6,10 +6,10 @@ BUILDLINK_TREE+=	sublib
 SUBLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.sublib+=	sublib>=0.9
-BUILDLINK_ABI_DEPENDS.sublib+=	sublib>=0.9nb6
+BUILDLINK_ABI_DEPENDS.sublib+=	sublib>=0.9nb8
 BUILDLINK_PKGSRCDIR.sublib?=	../../textproc/sublib
 
-.include "../../lang/mono/buildlink3.mk"
+.include "../../lang/mono2/buildlink3.mk"
 .endif # SUBLIB_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-sublib