switch dbus-sharp, dbus-sharp-glib, ndesk-dbus and ndesk-dbus-glib to

the latest mono

6 files changed, 35 insertions, 11 deletions

diff --git a/sysutils/dbus-sharp-glib/Makefile b/sysutils/dbus-sharp-glib/Makefile
index 231035f078d..7211ee00e5b 100644
--- a/sysutils/dbus-sharp-glib/Makefile
+++ b/sysutils/dbus-sharp-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/06 08:17:17 adam Exp $
+# $NetBSD: Makefile,v 1.6 2015/05/23 06:40:15 kefren Exp $
 #
 
 DISTNAME=	dbus-sharp-glib-0.5.0
@@ -17,5 +17,11 @@ USE_TOOLS+=	gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	dbus-sharp-glib-1.0.pc.in
 
+SUBST_CLASSES+=         fix-mcs
+SUBST_STAGE.fix-mcs=    post-patch
+SUBST_MESSAGE.fix-mcs=  Fix compiler name
+SUBST_FILES.fix-mcs=    configure
+SUBST_SED.fix-mcs=      -e 's,gmcs,mcs,'
+
 .include "../../sysutils/dbus-sharp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dbus-sharp/Makefile b/sysutils/dbus-sharp/Makefile
index e6d5d5565b8..9fc75ab6087 100644
--- a/sysutils/dbus-sharp/Makefile
+++ b/sysutils/dbus-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/04/06 08:17:17 adam Exp $
+# $NetBSD: Makefile,v 1.8 2015/05/23 06:40:15 kefren Exp $
 #
 
 DISTNAME=	dbus-sharp-0.7.0
@@ -17,5 +17,11 @@ USE_LANGUAGES=	# none
 
 PKGCONFIG_OVERRIDE+=	dbus-sharp-1.0.pc.in
 
-.include "../../lang/mono2/buildlink3.mk"
+SUBST_CLASSES+=         fix-mcs
+SUBST_STAGE.fix-mcs=    post-patch
+SUBST_MESSAGE.fix-mcs=  Fix compiler name
+SUBST_FILES.fix-mcs=    configure
+SUBST_SED.fix-mcs=      -e 's,gmcs,mcs,'
+
+.include "../../lang/mono/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dbus-sharp/buildlink3.mk b/sysutils/dbus-sharp/buildlink3.mk
index 3213a3c3dee..3f30f1d5950 100644
--- a/sysutils/dbus-sharp/buildlink3.mk
+++ b/sysutils/dbus-sharp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2015/04/06 08:17:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2015/05/23 06:40:15 kefren Exp $
 
 BUILDLINK_TREE+=	dbus-sharp
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.dbus-sharp+=	dbus-sharp>=0.7.0
 BUILDLINK_ABI_DEPENDS.dbus-sharp?=	dbus-sharp>=0.7.0nb6
 BUILDLINK_PKGSRCDIR.dbus-sharp?=	../../sysutils/dbus-sharp
 
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .endif	# DBUS_SHARP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-dbus-sharp
diff --git a/sysutils/ndesk-dbus-glib/Makefile b/sysutils/ndesk-dbus-glib/Makefile
index 176b718f9bb..c94e9b8d021 100644
--- a/sysutils/ndesk-dbus-glib/Makefile
+++ b/sysutils/ndesk-dbus-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/04/06 08:17:17 adam Exp $
+# $NetBSD: Makefile,v 1.19 2015/05/23 06:40:15 kefren Exp $
 
 DISTNAME=	ndesk-dbus-glib-0.4.1
 PKGREVISION=	15
@@ -14,7 +14,13 @@ USE_TOOLS+=	pkg-config gmake
 
 PKGCONFIG_OVERRIDE+=	ndesk-dbus-glib-1.0.pc.in
 
+SUBST_CLASSES+=		fix-mcs
+SUBST_STAGE.fix-mcs=	post-patch
+SUBST_MESSAGE.fix-mcs=	Fix compiler name
+SUBST_FILES.fix-mcs=	configure
+SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
+
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ndesk-dbus-glib/buildlink3.mk b/sysutils/ndesk-dbus-glib/buildlink3.mk
index 745d5260272..d5b0cbbea27 100644
--- a/sysutils/ndesk-dbus-glib/buildlink3.mk
+++ b/sysutils/ndesk-dbus-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2015/04/06 08:17:17 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2015/05/23 06:40:15 kefren Exp $
 
 BUILDLINK_TREE+=	ndesk-dbus-glib
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.ndesk-dbus-glib+=	ndesk-dbus-glib>=0.4.1
 BUILDLINK_ABI_DEPENDS.ndesk-dbus-glib+=	ndesk-dbus-glib>=0.4.1nb15
 BUILDLINK_PKGSRCDIR.ndesk-dbus-glib?=	../../sysutils/ndesk-dbus-glib
 
-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus/buildlink3.mk"
 .endif # NDESK_DBUS_GLIB_BUILDLINK3_MK
 
diff --git a/sysutils/ndesk-dbus/Makefile b/sysutils/ndesk-dbus/Makefile
index 81f0d0d323c..f64cecedcd3 100644
--- a/sysutils/ndesk-dbus/Makefile
+++ b/sysutils/ndesk-dbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/04/06 08:17:38 adam Exp $
+# $NetBSD: Makefile,v 1.19 2015/05/23 06:40:15 kefren Exp $
 
 DISTNAME=	ndesk-dbus-0.6.1a
 PKGREVISION=	14
@@ -16,5 +16,11 @@ DEPENDS+=	dbus>=1.0:../../sysutils/dbus
 
 PKGCONFIG_OVERRIDE+=	ndesk-dbus-1.0.pc.in
 
-.include "../../lang/mono2/buildlink3.mk"
+SUBST_CLASSES+=		fix-mcs
+SUBST_STAGE.fix-mcs=	post-patch
+SUBST_MESSAGE.fix-mcs=	Fix compiler name
+SUBST_FILES.fix-mcs=	configure
+SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
+
+.include "../../lang/mono/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"