diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile index 36042ad5045..f712ed1ad3c 100644 --- a/devel/mono-addins/Makefile +++ b/devel/mono-addins/Makefile @@ -1,35 +1,34 @@ -# $OpenBSD: Makefile,v 1.16 2016/11/07 10:36:50 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2017/04/28 16:58:40 ajacoutot Exp $ -BROKEN= failing since mono update +BROKEN= needs thread local storage -COMMENT= framework for creating extensible applications +COMMENT= framework for creating extensible applications -DISTNAME= mono-addins-1.2 -CATEGORIES= devel lang +GH_ACCOUNT= mono +GH_PROJECT= mono-addins +GH_TAGNAME= ${GH_PROJECT}-1.3 -HOMEPAGE= http://www.mono-project.com/Mono.Addins +CATEGORIES= devel lang -GH_ACCOUNT= mono -GH_PROJECT= mono-addins -GH_TAGNAME= ${DISTNAME} +HOMEPAGE= http://www.mono-project.com/Mono.Addins # MIT X11, MPL PERMIT_PACKAGE_CDROM= Yes -USE_GMAKE= Yes +MODULES= lang/mono -MODULES= lang/mono +BUILD_DEPENDS= x11/mono-gtk2 +RUN_DEPENDS= x11/mono-gtk2 + +USE_GMAKE= Yes + +CONFIGURE_STYLE= gnu AUTOCONF_VERSION= 2.68 AUTOMAKE_VERSION= 1.14 - -BUILD_DEPENDS= ${RUN_DEPENDS} \ - ${MODGNU_AUTOCONF_DEPENDS} \ - ${MODGNU_AUTOMAKE_DEPENDS} \ - devel/libtool -RUN_DEPENDS= x11/mono-gtk2 - -CONFIGURE_STYLE=gnu +BUILD_DEPENDS += ${MODGNU_AUTOCONF_DEPENDS} \ + ${MODGNU_AUTOMAKE_DEPENDS} \ + devel/libtool pre-configure: perl -pi -e 's,^prefix=.*,prefix=\@prefix\@,g' \ @@ -37,7 +36,10 @@ pre-configure: ${WRKSRC}/Mono.Addins.Gui/mono-addins-gui.pc.in \ ${WRKSRC}/Mono.Addins.MSBuild/mono-addins-msbuild.pc.in \ ${WRKSRC}/Mono.Addins.Setup/mono-addins-setup.pc.in - cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \ + +do-configure: + cd ${WRKSRC} && ${SETENV} \ + AUTOCONF_VERSION=${AUTOCONF_VERSION} \ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh .include diff --git a/devel/mono-addins/distinfo b/devel/mono-addins/distinfo index cbf028a775c..c44fd13d70b 100644 --- a/devel/mono-addins/distinfo +++ b/devel/mono-addins/distinfo @@ -1,2 +1,2 @@ -SHA256 (mono-addins-1.2.tar.gz) = yh+3ZbvyGt8Yi4uUByebvPKZGfKzr6590eaAc3olfmI= -SIZE (mono-addins-1.2.tar.gz) = 616250 +SHA256 (mono-addins-mono-addins-1.3.tar.gz) = 4sTbn9Egh7eV3QOgNcarja/+FXaU2Y3P4icGeRPbVYA= +SIZE (mono-addins-mono-addins-1.3.tar.gz) = 672166 diff --git a/devel/mono-addins/patches/patch-Mono_Addins_CecilReflector_Mono_Addins_CecilReflector_csproj b/devel/mono-addins/patches/patch-Mono_Addins_CecilReflector_Mono_Addins_CecilReflector_csproj new file mode 100644 index 00000000000..e0b0bc487c3 --- /dev/null +++ b/devel/mono-addins/patches/patch-Mono_Addins_CecilReflector_Mono_Addins_CecilReflector_csproj @@ -0,0 +1,18 @@ +$OpenBSD: patch-Mono_Addins_CecilReflector_Mono_Addins_CecilReflector_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $ + +From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001 +From: "Andres G. Aragoneses" +Date: Sat, 17 Sep 2016 13:12:28 +0800 +Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1) + +--- Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj.orig Wed Jul 27 00:26:26 2016 ++++ Mono.Addins.CecilReflector/Mono.Addins.CecilReflector.csproj Wed Nov 9 11:32:00 2016 +@@ -11,7 +11,7 @@ + Mono.Addins.CecilReflector + True + ..\mono-addins.snk +- v4.0 ++ v4.5 + + + True 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 index 0bcda4ee741..603cc83aa83 100644 --- 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 @@ -1,19 +1,18 @@ -$OpenBSD: patch-Mono_Addins_Gui_Mono_Addins_Gui_csproj,v 1.2 2015/10/03 11:56:05 robert Exp $ ---- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig Sat Oct 3 13:26:57 2015 -+++ Mono.Addins.Gui/Mono.Addins.Gui.csproj Sat Oct 3 13:27:09 2015 -@@ -52,7 +52,7 @@ - - - -- -+ - - - -@@ -166,4 +166,4 @@ - - - -- -\ No newline at end of file -+ +$OpenBSD: patch-Mono_Addins_Gui_Mono_Addins_Gui_csproj,v 1.3 2017/04/28 16:58:40 ajacoutot Exp $ + +From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001 +From: "Andres G. Aragoneses" +Date: Sat, 17 Sep 2016 13:12:28 +0800 +Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1) + +--- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig Wed Jul 27 00:26:26 2016 ++++ Mono.Addins.Gui/Mono.Addins.Gui.csproj Wed Nov 9 11:32:00 2016 +@@ -11,7 +11,7 @@ + Mono.Addins.Gui + True + ..\mono-addins.snk +- v4.0 ++ v4.5 + + + True diff --git a/devel/mono-addins/patches/patch-Mono_Addins_MSBuild_Mono_Addins_MSBuild_csproj b/devel/mono-addins/patches/patch-Mono_Addins_MSBuild_Mono_Addins_MSBuild_csproj new file mode 100644 index 00000000000..f9a9e451eff --- /dev/null +++ b/devel/mono-addins/patches/patch-Mono_Addins_MSBuild_Mono_Addins_MSBuild_csproj @@ -0,0 +1,17 @@ +$OpenBSD: patch-Mono_Addins_MSBuild_Mono_Addins_MSBuild_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $ + +From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001 +From: "Andres G. Aragoneses" +Date: Sat, 17 Sep 2016 13:12:28 +0800 +Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1) + +--- Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj.orig Wed Jul 27 00:26:26 2016 ++++ Mono.Addins.MSBuild/Mono.Addins.MSBuild.csproj Wed Nov 9 11:32:00 2016 +@@ -11,6 +11,7 @@ + Mono.Addins.MSBuild + True + ..\mono-addins.snk ++ v4.5 + + + True diff --git a/devel/mono-addins/patches/patch-Mono_Addins_Mono_Addins_Addin_cs b/devel/mono-addins/patches/patch-Mono_Addins_Mono_Addins_Addin_cs new file mode 100644 index 00000000000..b67ed137a19 --- /dev/null +++ b/devel/mono-addins/patches/patch-Mono_Addins_Mono_Addins_Addin_cs @@ -0,0 +1,18 @@ +$OpenBSD: patch-Mono_Addins_Mono_Addins_Addin_cs,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $ + +From 877e8d901a35672b371140121f27773768d36ad4 Mon Sep 17 00:00:00 2001 +From: Marius Ungureanu +Date: Sun, 25 Sep 2016 21:05:47 +0300 +Subject: [PATCH] [Addin] Simplify linq + +--- Mono.Addins/Mono.Addins/Addin.cs.orig Wed Jul 27 00:26:26 2016 ++++ Mono.Addins/Mono.Addins/Addin.cs Wed Nov 9 11:33:07 2016 +@@ -178,7 +178,7 @@ namespace Mono.Addins + string id, version; + Addin.GetIdParts (AddinInfo.Id, out id, out version); + var addins = database.GetInstalledAddins (null, AddinSearchFlagsInternal.IncludeAll | AddinSearchFlagsInternal.LatestVersionsOnly); +- isLatestVersion = addins.Where (a => Addin.GetIdName (a.Id) == id && a.Version == version).Any (); ++ isLatestVersion = addins.Any (a => Addin.GetIdName (a.Id) == id && a.Version == version); + } + return isLatestVersion.Value; + } diff --git a/devel/mono-addins/patches/patch-Mono_Addins_Mono_Addins_csproj b/devel/mono-addins/patches/patch-Mono_Addins_Mono_Addins_csproj new file mode 100644 index 00000000000..200b00987a9 --- /dev/null +++ b/devel/mono-addins/patches/patch-Mono_Addins_Mono_Addins_csproj @@ -0,0 +1,18 @@ +$OpenBSD: patch-Mono_Addins_Mono_Addins_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $ + +From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001 +From: "Andres G. Aragoneses" +Date: Sat, 17 Sep 2016 13:12:28 +0800 +Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1) + +--- Mono.Addins/Mono.Addins.csproj.orig Wed Jul 27 00:26:26 2016 ++++ Mono.Addins/Mono.Addins.csproj Wed Nov 9 11:32:00 2016 +@@ -11,7 +11,7 @@ + Mono.Addins + True + ..\mono-addins.snk +- v4.0 ++ v4.5 + + + True diff --git a/devel/mono-addins/patches/patch-Mono_Addins_Setup_Mono_Addins_Setup_csproj b/devel/mono-addins/patches/patch-Mono_Addins_Setup_Mono_Addins_Setup_csproj new file mode 100644 index 00000000000..d37aad9cbb6 --- /dev/null +++ b/devel/mono-addins/patches/patch-Mono_Addins_Setup_Mono_Addins_Setup_csproj @@ -0,0 +1,18 @@ +$OpenBSD: patch-Mono_Addins_Setup_Mono_Addins_Setup_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $ + +From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001 +From: "Andres G. Aragoneses" +Date: Sat, 17 Sep 2016 13:12:28 +0800 +Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1) + +--- Mono.Addins.Setup/Mono.Addins.Setup.csproj.orig Wed Jul 27 00:26:26 2016 ++++ Mono.Addins.Setup/Mono.Addins.Setup.csproj Wed Nov 9 11:32:00 2016 +@@ -11,7 +11,7 @@ + Mono.Addins.Setup + True + ..\mono-addins.snk +- v4.0 ++ v4.5 + + + True diff --git a/devel/mono-addins/patches/patch-configure_ac b/devel/mono-addins/patches/patch-configure_ac deleted file mode 100644 index 1f51a2fcfec..00000000000 --- a/devel/mono-addins/patches/patch-configure_ac +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.1 2015/10/03 11:56:05 robert Exp $ ---- configure.ac.orig Sat Oct 3 13:40:01 2015 -+++ configure.ac Sat Oct 3 13:40:09 2015 -@@ -18,7 +18,7 @@ AC_SUBST(POLICY_VERSIONS) - - AC_PROG_INSTALL - --AC_PATH_PROG(MCS, gmcs, no) -+AC_PATH_PROG(MCS, mcs, no) - if test "x$MCS" = "xno"; then - AC_MSG_ERROR([mcs Not found]) - fi diff --git a/devel/mono-addins/patches/patch-mautil_mautil_csproj b/devel/mono-addins/patches/patch-mautil_mautil_csproj new file mode 100644 index 00000000000..accde982492 --- /dev/null +++ b/devel/mono-addins/patches/patch-mautil_mautil_csproj @@ -0,0 +1,17 @@ +$OpenBSD: patch-mautil_mautil_csproj,v 1.1 2017/04/28 16:58:40 ajacoutot Exp $ + +From a3efa4ca9f56fab3aae32060b3b56d3585505966 Mon Sep 17 00:00:00 2001 +From: "Andres G. Aragoneses" +Date: Sat, 17 Sep 2016 13:12:28 +0800 +Subject: [PATCH] build: fix build with xbuild 12.0 engine (mono 4.2.1) + +--- mautil/mautil.csproj.orig Wed Jul 27 00:26:26 2016 ++++ mautil/mautil.csproj Wed Nov 9 11:32:00 2016 +@@ -9,6 +9,7 @@ + mautil + 2.0 + mautil ++ v4.5 + + + True