Update to 1.3.

5 files changed, 58 insertions, 22 deletions

diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile
index 36e3eb445092..32fcb07f40ea 100644
--- a/devel/mono-addins/Makefile
+++ b/devel/mono-addins/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mono-addins
-PORTVERSION=	1.1
+PORTVERSION=	1.3
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	devel
 
@@ -18,13 +18,17 @@ CONFIGURE_ENV=	ac_cv_path_MCS=${LOCALBASE}/bin/mcs
 USES=		autoreconf gmake mono pkgconfig
 WANT_GNOME=	yes
 
-OPTIONS_DEFINE=	GTK2
+OPTIONS_DEFINE=	GTK2 GTK3
 OPTIONS_DEFAULT=GTK2
 
 GTK2_USE=	GNOME=gtksharp20
 GTK2_CONFIGURE_ENABLE=	gui
 OPTIONS_SUB=	yes
 
+#GTK3_USE=	GNOME=gtksharp30
+GTK3_CONFIGURE_ENABLE=	gui-gtk3
+OPTIONS_SUB=	yes
+
 PLIST_SUB+=	VER=1.0.0
 
 .include <bsd.port.mk>
diff --git a/devel/mono-addins/distinfo b/devel/mono-addins/distinfo
index d42c4b277e99..e4668ecb5ce8 100644
--- a/devel/mono-addins/distinfo
+++ b/devel/mono-addins/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mono-mono-addins-mono-addins-1.1_GH0.tar.gz) = 9dae88975597f82564756a75d503e5c23071c17b7092c08069d71f650aa9a075
-SIZE (mono-mono-addins-mono-addins-1.1_GH0.tar.gz) = 555705
+TIMESTAMP = 1470311096
+SHA256 (mono-mono-addins-mono-addins-1.3_GH0.tar.gz) = e2c4db9fd12087b795dd03a035c6ab8daffe157694d98dcfe227067913db5580
+SIZE (mono-mono-addins-mono-addins-1.3_GH0.tar.gz) = 672166
diff --git a/devel/mono-addins/files/patch-Mono.Addins.GuiGtk3_Mono.Addins.GuiGtk3.csproj b/devel/mono-addins/files/patch-Mono.Addins.GuiGtk3_Mono.Addins.GuiGtk3.csproj
new file mode 100644
index 000000000000..5529cd58b55d
--- /dev/null
+++ b/devel/mono-addins/files/patch-Mono.Addins.GuiGtk3_Mono.Addins.GuiGtk3.csproj
@@ -0,0 +1,35 @@
+
+$FreeBSD$
+
+--- Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj.orig
++++ Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
+@@ -141,25 +141,25 @@
+       <LogicalName>plugin-22.png</LogicalName>
+     </EmbeddedResource>
+     <EmbeddedResource Include="icons\plugin-22%402x.png">
+-      <LogicalName>plugin-22.png</LogicalName>
++      <LogicalName>plugin-22@2x.png</LogicalName>
+     </EmbeddedResource>
+     <EmbeddedResource Include="icons\plugin-22~dark.png">
+       <LogicalName>plugin-22~dark.png</LogicalName>
+     </EmbeddedResource>
+     <EmbeddedResource Include="icons\plugin-22~dark%402x.png">
+-      <LogicalName>plugin-22~dark.png</LogicalName>
++      <LogicalName>plugin-22~dark@2x.png</LogicalName>
+     </EmbeddedResource>
+     <EmbeddedResource Include="icons\plugin-22~sel.png">
+       <LogicalName>plugin-22~sel.png</LogicalName>
+     </EmbeddedResource>
+     <EmbeddedResource Include="icons\plugin-22~sel%402x.png">
+-      <LogicalName>plugin-22~sel.png</LogicalName>
++      <LogicalName>plugin-22~sel@2x.png</LogicalName>
+     </EmbeddedResource>
+     <EmbeddedResource Include="icons\plugin-22~dark~sel.png">
+       <LogicalName>plugin-22~dark~sel.png</LogicalName>
+     </EmbeddedResource>
+     <EmbeddedResource Include="icons\plugin-22~dark~sel%402x.png">
+-      <LogicalName>plugin-22~dark~sel.png</LogicalName>
++      <LogicalName>plugin-22~dark~sel@2x.png</LogicalName>
+     </EmbeddedResource>
+     <EmbeddedResource Include="icons\plugin-32.png">
+       <LogicalName>plugin-32.png</LogicalName>
diff --git a/devel/mono-addins/files/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj b/devel/mono-addins/files/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj
deleted file mode 100644
index d650305c3174..000000000000
--- a/devel/mono-addins/files/patch-Mono.Addins.Gui_Mono.Addins.Gui.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
---- Mono.Addins.Gui/Mono.Addins.Gui.csproj.orig
-+++ Mono.Addins.Gui/Mono.Addins.Gui.csproj
-@@ -52,7 +52,7 @@
-     </Reference>
-     <Reference Include="System" />
-     <Reference Include="Mono.Posix" />
--    <Reference Include="Mono.Cairo" />
-+    <Reference Include="Mono.Cairo, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-     <Reference Include="System.Core" />
-   </ItemGroup>
-   <ItemGroup>
-@@ -181,4 +181,4 @@
-       </Properties>
-     </MonoDevelop>
-   </ProjectExtensions>
--</Project>
-\ No newline at end of file
-+</Project>
diff --git a/devel/mono-addins/pkg-plist b/devel/mono-addins/pkg-plist
index 71911c2d741a..66826e57045e 100644
--- a/devel/mono-addins/pkg-plist
+++ b/devel/mono-addins/pkg-plist
@@ -3,6 +3,8 @@ lib/mono/gac/Mono.Addins.CecilReflector/%%VER%%.0__0738eb9f132ed756/Mono.Addins.
 lib/mono/gac/Mono.Addins.CecilReflector/%%VER%%.0__0738eb9f132ed756/Mono.Addins.CecilReflector.dll.mdb
 %%GTK2%%lib/mono/gac/Mono.Addins.Gui/%%VER%%.0__0738eb9f132ed756/Mono.Addins.Gui.dll
 %%GTK2%%lib/mono/gac/Mono.Addins.Gui/%%VER%%.0__0738eb9f132ed756/Mono.Addins.Gui.dll.mdb
+%%GTK3%%lib/mono/gac/Mono.Addins.GuiGtk3/1.0.6060.21481__0738eb9f132ed756/Mono.Addins.GuiGtk3.dll
+%%GTK3%%lib/mono/gac/Mono.Addins.GuiGtk3/1.0.6060.21481__0738eb9f132ed756/Mono.Addins.GuiGtk3.dll.mdb
 lib/mono/gac/Mono.Addins.MSBuild/%%VER%%.0__0738eb9f132ed756/Mono.Addins.MSBuild.dll
 lib/mono/gac/Mono.Addins.MSBuild/%%VER%%.0__0738eb9f132ed756/Mono.Addins.MSBuild.dll.mdb
 lib/mono/gac/Mono.Addins.Setup/%%VER%%.0__0738eb9f132ed756/Mono.Addins.Setup.dll
@@ -13,6 +15,8 @@ lib/mono/gac/policy.0.2.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/pol
 lib/mono/gac/policy.0.2.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.2.config
 %%GTK2%%lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.Gui.dll
 %%GTK2%%lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.config
+%%GTK3%%lib/mono/gac/policy.0.2.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.GuiGtk3.dll
+%%GTK3%%lib/mono/gac/policy.0.2.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.2.config
 lib/mono/gac/policy.0.2.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.2.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.2.config
 lib/mono/gac/policy.0.2.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.Setup.dll
@@ -23,6 +27,8 @@ lib/mono/gac/policy.0.3.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/pol
 lib/mono/gac/policy.0.3.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.3.config
 %%GTK2%%lib/mono/gac/policy.0.3.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.Gui.dll
 %%GTK2%%lib/mono/gac/policy.0.3.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.3.config
+%%GTK3%%lib/mono/gac/policy.0.3.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.GuiGtk3.dll
+%%GTK3%%lib/mono/gac/policy.0.3.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.3.config
 lib/mono/gac/policy.0.3.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.3.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.3.config
 lib/mono/gac/policy.0.3.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.3.Mono.Addins.Setup.dll
@@ -33,6 +39,8 @@ lib/mono/gac/policy.0.4.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/pol
 lib/mono/gac/policy.0.4.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.4.config
 %%GTK2%%lib/mono/gac/policy.0.4.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.Gui.dll
 %%GTK2%%lib/mono/gac/policy.0.4.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.4.config
+%%GTK3%%lib/mono/gac/policy.0.4.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.GuiGtk3.dll
+%%GTK3%%lib/mono/gac/policy.0.4.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.4.config
 lib/mono/gac/policy.0.4.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.4.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.4.config
 lib/mono/gac/policy.0.4.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.4.Mono.Addins.Setup.dll
@@ -43,6 +51,8 @@ lib/mono/gac/policy.0.5.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/pol
 lib/mono/gac/policy.0.5.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.5.config
 %%GTK2%%lib/mono/gac/policy.0.5.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.Gui.dll
 %%GTK2%%lib/mono/gac/policy.0.5.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.5.config
+%%GTK3%%lib/mono/gac/policy.0.5.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.GuiGtk3.dll
+%%GTK3%%lib/mono/gac/policy.0.5.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.5.config
 lib/mono/gac/policy.0.5.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.5.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.5.config
 lib/mono/gac/policy.0.5.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.5.Mono.Addins.Setup.dll
@@ -53,6 +63,8 @@ lib/mono/gac/policy.0.6.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/pol
 lib/mono/gac/policy.0.6.Mono.Addins.CecilReflector/0.0.0.0__0738eb9f132ed756/policy.0.6.config
 %%GTK2%%lib/mono/gac/policy.0.6.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.Gui.dll
 %%GTK2%%lib/mono/gac/policy.0.6.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.6.config
+%%GTK3%%lib/mono/gac/policy.0.6.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.GuiGtk3.dll
+%%GTK3%%lib/mono/gac/policy.0.6.Mono.Addins.GuiGtk3/0.0.0.0__0738eb9f132ed756/policy.0.6.config
 lib/mono/gac/policy.0.6.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.MSBuild.dll
 lib/mono/gac/policy.0.6.Mono.Addins.MSBuild/0.0.0.0__0738eb9f132ed756/policy.0.6.config
 lib/mono/gac/policy.0.6.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Addins.Setup.dll
@@ -61,11 +73,13 @@ lib/mono/gac/policy.0.6.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.6.Mono.Ad
 lib/mono/gac/policy.0.6.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.6.config
 lib/mono/mono-addins/Mono.Addins.CecilReflector.dll
 %%GTK2%%lib/mono/mono-addins/Mono.Addins.Gui.dll
+%%GTK3%%lib/mono/mono-addins/Mono.Addins.GuiGtk3.dll
 lib/mono/mono-addins/Mono.Addins.MSBuild.dll
 lib/mono/mono-addins/Mono.Addins.Setup.dll
 lib/mono/mono-addins/Mono.Addins.dll
 lib/mono/mono-addins/mautil.exe
 %%GTK2%%libdata/pkgconfig/mono-addins-gui.pc
+%%GTK3%%libdata/pkgconfig/mono-addins-gui-gtk3.pc
 libdata/pkgconfig/mono-addins-msbuild.pc
 libdata/pkgconfig/mono-addins-setup.pc
 libdata/pkgconfig/mono-addins.pc