3 files changed, 25 insertions, 14 deletions

diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile
index c87448fff80c..581c85e73c1b 100644
--- a/devel/mono-addins/Makefile
+++ b/devel/mono-addins/Makefile
@@ -6,13 +6,18 @@
 #
 
 PORTNAME=	mono-addins
-PORTVERSION=	0.3
+PORTVERSION=	0.3.1
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
 
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Mono framework to create extensible applications
 
+LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mono.pc:${PORTSDIR}/lang/mono
+
+BUILD_DEPENDS+=	${LIB_PC_DEPENDS}
+RUN_DEPENDS+=	${LIB_PC_DEPENDS}
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -26,8 +31,14 @@ OPTIONS=	GTK2 "Enable GTK support" on
 .if !defined(WITHOUT_GTK2) && !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
 USE_GNOME+=	gtksharp20
 CONFIGURE_ARGS+=	--enable-gui
+PLIST_SUB=	OPT_GTK2=""
 .else
 CONFIGURE_ARGS+=	--disable-gui
+PLIST_SUB=	OPT_GTK2="@comment "
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} 's|Exception ex|System.Exception ex|' \
+		${WRKSRC}/Mono.Addins.Gui/Mono.Addins.Gui/ManageSitesDialog.cs
+
 .include <bsd.port.post.mk>
diff --git a/devel/mono-addins/distinfo b/devel/mono-addins/distinfo
index 79c26935c502..01a668852d0c 100644
--- a/devel/mono-addins/distinfo
+++ b/devel/mono-addins/distinfo
@@ -1,3 +1,3 @@
-MD5 (mono-addins-0.3.tar.bz2) = d8af0d5c6dabce1aa58efbfd268b6639
-SHA256 (mono-addins-0.3.tar.bz2) = 1f250a2c3958efaa5b378ed996a2c71d01568421f152d30ef562841150aebb1f
-SIZE (mono-addins-0.3.tar.bz2) = 176869
+MD5 (mono-addins-0.3.1.tar.bz2) = bae5e01ba61bd261de2335ab0dfe999f
+SHA256 (mono-addins-0.3.1.tar.bz2) = 73905af929d37b17e53a54ed50ab2fec5577c27d9bf590aa7d2eb00fbd8ee90c
+SIZE (mono-addins-0.3.1.tar.bz2) = 178668
diff --git a/devel/mono-addins/pkg-plist b/devel/mono-addins/pkg-plist
index 596812cf1379..42f09ae54f22 100644
--- a/devel/mono-addins/pkg-plist
+++ b/devel/mono-addins/pkg-plist
@@ -1,34 +1,34 @@
 bin/mautil
-lib/mono/gac/Mono.Addins.Gui/0.3.0.0__0738eb9f132ed756/Mono.Addins.Gui.dll
-lib/mono/gac/Mono.Addins.Gui/0.3.0.0__0738eb9f132ed756/Mono.Addins.Gui.dll.mdb
+%%OPT_GTK2%%lib/mono/gac/Mono.Addins.Gui/0.3.0.0__0738eb9f132ed756/Mono.Addins.Gui.dll
+%%OPT_GTK2%%lib/mono/gac/Mono.Addins.Gui/0.3.0.0__0738eb9f132ed756/Mono.Addins.Gui.dll.mdb
 lib/mono/gac/Mono.Addins.Setup/0.3.0.0__0738eb9f132ed756/Mono.Addins.Setup.dll
 lib/mono/gac/Mono.Addins.Setup/0.3.0.0__0738eb9f132ed756/Mono.Addins.Setup.dll.mdb
 lib/mono/gac/Mono.Addins/0.3.0.0__0738eb9f132ed756/Mono.Addins.dll
 lib/mono/gac/Mono.Addins/0.3.0.0__0738eb9f132ed756/Mono.Addins.dll.config
 lib/mono/gac/Mono.Addins/0.3.0.0__0738eb9f132ed756/Mono.Addins.dll.mdb
-lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.Gui.dll
-lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.config
+%%OPT_GTK2%%lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.Gui.dll
+%%OPT_GTK2%%lib/mono/gac/policy.0.2.Mono.Addins.Gui/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
 lib/mono/gac/policy.0.2.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756/policy.0.2.config
 lib/mono/gac/policy.0.2.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.2.Mono.Addins.dll
 lib/mono/gac/policy.0.2.Mono.Addins/0.0.0.0__0738eb9f132ed756/policy.0.2.config
-lib/mono/mono-addins/Mono.Addins.Gui.dll
+%%OPT_GTK2%%lib/mono/mono-addins/Mono.Addins.Gui.dll
 lib/mono/mono-addins/Mono.Addins.Setup.dll
 lib/mono/mono-addins/Mono.Addins.dll
 lib/mono/mono-addins/mautil.exe
-libdata/pkgconfig/mono-addins-gui.pc
+%%OPT_GTK2%%libdata/pkgconfig/mono-addins-gui.pc
 libdata/pkgconfig/mono-addins-setup.pc
 libdata/pkgconfig/mono-addins.pc
 @dirrm lib/mono/mono-addins
 @dirrm lib/mono/gac/policy.0.2.Mono.Addins/0.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/policy.0.2.Mono.Addins.Setup/0.0.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/policy.0.2.Mono.Addins.Setup
-@dirrm lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/policy.0.2.Mono.Addins.Gui
+%%OPT_GTK2%%@dirrm lib/mono/gac/policy.0.2.Mono.Addins.Gui/0.0.0.0__0738eb9f132ed756
+%%OPT_GTK2%%@dirrm lib/mono/gac/policy.0.2.Mono.Addins.Gui
 @dirrm lib/mono/gac/policy.0.2.Mono.Addins
 @dirrm lib/mono/gac/Mono.Addins/0.3.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Addins.Setup/0.3.0.0__0738eb9f132ed756
 @dirrm lib/mono/gac/Mono.Addins.Setup
-@dirrm lib/mono/gac/Mono.Addins.Gui/0.3.0.0__0738eb9f132ed756
-@dirrm lib/mono/gac/Mono.Addins.Gui
+%%OPT_GTK2%%@dirrm lib/mono/gac/Mono.Addins.Gui/0.3.0.0__0738eb9f132ed756
+%%OPT_GTK2%%@dirrm lib/mono/gac/Mono.Addins.Gui
 @dirrm lib/mono/gac/Mono.Addins