- Update lang/mono to 2.0.1.

- Also update a bunch of c-sharp ports to their latest version.
- Change maintainership to mono@FreeBSD.org.

PR:		ports/129724
Submitted by:	Phillip Neumann, Romain Tartiere (bsd-sharp team)

7 files changed, 66 insertions, 123 deletions

diff --git a/net/blam/Makefile b/net/blam/Makefile
index 627f8b90f386..ef64d5d28757 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -7,39 +7,26 @@
 #
 
 PORTNAME=	blam
-PORTVERSION=	1.8.4
-PORTREVISION=	2
-CATEGORIES=	net gnome
-MASTER_SITES=	http://www.cmartin.tk/blam/
+PORTVERSION=	1.8.6
+PORTREVISION=	1
+CATEGORIES=	net
+MASTER_SITES=	http://www.cmartin.tk/${PORTNAME}/
 
-MAINTAINER=	bsd-sharp@googlegroups.com
-COMMENT=	Mono based RSS feed reader
+MAINTAINER=	mono@FreeBSD.org
+COMMENT=	A simple feed reader for GNOME
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gecko-sharp-2.0.pc:${PORTSDIR}/www/gecko-sharp20
+BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext \
+		${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:${PORTSDIR}/www/webkit-sharp
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:${PORTSDIR}/www/webkit-sharp
 
-USE_GECKO=	firefox mozilla
-USE_GNOME=	gnomeprefix gnomehack intlhack intltool libgnomeui gnomesharp20
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mozilla=${GECKO}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=	blam.1
-
+USE_GMAKE=	yes
+CONFIGURE_ENV=	GMSGFMT="${LOCALBASE}/bin/msgfmt" DATADIRNAME="share"
+USE_GNOME=	gnomesharp20
+USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
 GCONF_SCHEMAS=	blam.schemas
 
-post-patch:
-	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/blam/|g' \
-		${WRKSRC}/themes/blam/theme.html
-	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/pimped/|g' \
-		${WRKSRC}/themes/pimped/theme.html
-
+MAN1=		blam.1
 
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/blam/distinfo b/net/blam/distinfo
index 29bd42e955f1..8154dd287444 100644
--- a/net/blam/distinfo
+++ b/net/blam/distinfo
@@ -1,3 +1,3 @@
-MD5 (blam-1.8.4.tar.bz2) = 7ec48fece9994ed71dbb53ffa35b633e
-SHA256 (blam-1.8.4.tar.bz2) = c867ce3638d31705d484538f0cd18ff7f8209eea56466b430db63267adde1c13
-SIZE (blam-1.8.4.tar.bz2) = 517873
+MD5 (blam-1.8.6.tar.gz) = 5f7da752c6646a10655f19dda528e7c4
+SHA256 (blam-1.8.6.tar.gz) = f20c061371c4ec4f7f730a117f1285e3391b3d0c5c8ecdd34affa2c6d324f63f
+SIZE (blam-1.8.6.tar.gz) = 310503
diff --git a/net/blam/files/patch-blam.exe.config b/net/blam/files/patch-blam.exe.config
deleted file mode 100644
index a8ce8acc93ac..000000000000
--- a/net/blam/files/patch-blam.exe.config
+++ /dev/null
@@ -1,8 +0,0 @@
---- blam.exe.config.orig	Sat Jun 18 20:38:30 2005
-+++ blam.exe.config	Sat Feb  4 21:12:35 2006
-@@ -1,4 +1,4 @@
- <configuration>
-   <dllmap dll="gdk-x11-2.0" target="libgdk-x11-2.0.so.0"/>
--  <dllmap dll="libX11" target="libX11.so.6"/>
-+  <dllmap dll="libX11" target="libX11.so"/>
- </configuration>
diff --git a/net/blam/files/patch-blam.in b/net/blam/files/patch-blam.in
deleted file mode 100644
index 1ea7ec1c8e2c..000000000000
--- a/net/blam/files/patch-blam.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- blam.in.orig	Sun Apr 15 16:58:55 2007
-+++ blam.in	Sun Apr 15 16:59:02 2007
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- LD_LIBRARY_PATH="@prefix@/lib/blam:@MOZILLA_HOME@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" MOZILLA_FIVE_HOME=@MOZILLA_HOME@ \
--MOZILLA_HOME=@MOZILLA_HOME@ exec -a 'blam' mono @prefix@/lib/blam/blam.exe $@
-+MOZILLA_HOME=@MOZILLA_HOME@ exec mono @prefix@/lib/blam/blam.exe $@
diff --git a/net/blam/files/patch-src-Application.cs b/net/blam/files/patch-src-Application.cs
deleted file mode 100644
index bfde3504220a..000000000000
--- a/net/blam/files/patch-src-Application.cs
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/Application.cs.orig	Sun Apr 15 16:59:40 2007
-+++ src/Application.cs	Sun Apr 15 17:00:45 2007
-@@ -23,8 +23,7 @@
-     public class Application : Program {
- 
- 	[DllImport("libc")]
--	private static extern int prctl(int option, byte [] arg2, ulong arg3, 
--    	ulong arg4, ulong arg5);
-+	private static extern void setproctitle(byte [] fmt, byte [] str_arg);
-         
- 	public static Application TheApp;
- 
-@@ -723,11 +722,7 @@
- 
- 	public static void SetProcessName(string name)
- 	{
--	    if(prctl(15 /* PR_SET_NAME */, Encoding.ASCII.GetBytes(name + "\0"), 
--        	0, 0, 0) != 0) {
--        	throw new ApplicationException("Error setting process name: " + 
--        	    Mono.Unix.Native.Stdlib.GetLastError());
--	    }
-+		setproctitle(Encoding.ASCII.GetBytes("%s\0"), Encoding.ASCII.GetBytes(name + "\0"));
- 	}
- 
-         public static void Main(string[] args)
diff --git a/net/blam/pkg-descr b/net/blam/pkg-descr
index 2641a920cbaf..2dc687b62728 100644
--- a/net/blam/pkg-descr
+++ b/net/blam/pkg-descr
@@ -2,7 +2,7 @@ Blam is a tool that helps you keep track of the growing number of news
 feeds distributed as RSS. Blam lets you subscribe to any number of feeds
 and provides an easy to use and clean interface to stay up to date.  It
 is written in C# and uses Mono, GTK#, and RSS.NET.
-
+ 
 Among the features are:
 
 * Support for RSS and RDF feeds
@@ -10,4 +10,4 @@ Among the features are:
 * Print the news entries you like
 * Automatically update the feeds at regular intervals
 
-WWW: http://www.cmartin.tk/blam.html
+WWW: http://www.cmartin.tk/blam2.html
diff --git a/net/blam/pkg-plist b/net/blam/pkg-plist
index 9cbf238201c8..48a23ac7098d 100644
--- a/net/blam/pkg-plist
+++ b/net/blam/pkg-plist
@@ -1,43 +1,48 @@
+@comment $FreeBSD$
 bin/blam
-lib/blam/Atom.NET.dll
-lib/blam/RSS.NET.dll
+lib/blam/AtomFeed.dll
+lib/blam/RSSFeed.dll
 lib/blam/blam.exe
 lib/blam/blam.exe.config
-lib/blam/libblam.a
-lib/blam/libblam.la
-lib/blam/libblam.so
-lib/blam/libblam.so.0
 share/applications/blam.desktop
-share/blam/themes/planet/theme.html
-share/blam/themes/planet/planet.css
-share/blam/themes/planet/bubble-top.png
-share/blam/themes/planet/bubble-top-right.png
-share/blam/themes/planet/bubble-top-left.png
-share/blam/themes/planet/bubble-right.png
-share/blam/themes/planet/bubble-nipple.png
-share/blam/themes/planet/bubble-left.png
-share/blam/themes/planet/bubble-bottom.png
-share/blam/themes/planet/bubble-bottom-right.png
-share/blam/themes/planet/bubble-bottom-left.png
-share/blam/themes/pimped/theme.html
-share/blam/themes/pimped/pimped.css
-share/blam/themes/pimped/news.png
-share/blam/themes/pimped/blam.png
-share/blam/themes/blam/theme.html
-share/blam/themes/blam/blam-box-top-right.png
-share/blam/themes/blam/blam-box-top-left.png
-share/blam/themes/blam/blam-box-pad.png
-share/blam/themes/blam/blam-box-bottom-right.png
-share/blam/themes/blam/blam-box-bottom-left.png
-share/blam/themes/akregator/theme.html
-share/blam/collection.xml
-share/pixmaps/blam.png
+%%DATADIR%%/collection.xml
+%%DATADIR%%/themes/akregator/theme.html
+%%DATADIR%%/themes/blam/blam-box-bottom-left.png
+%%DATADIR%%/themes/blam/blam-box-bottom-right.png
+%%DATADIR%%/themes/blam/blam-box-pad.png
+%%DATADIR%%/themes/blam/blam-box-top-left.png
+%%DATADIR%%/themes/blam/blam-box-top-right.png
+%%DATADIR%%/themes/blam/blam.css
+%%DATADIR%%/themes/blam/theme.html
+%%DATADIR%%/themes/pimped/blam.png
+%%DATADIR%%/themes/pimped/news.png
+%%DATADIR%%/themes/pimped/pimped.css
+%%DATADIR%%/themes/pimped/theme.html
+%%DATADIR%%/themes/planet/bubble-bottom-left.png
+%%DATADIR%%/themes/planet/bubble-bottom-right.png
+%%DATADIR%%/themes/planet/bubble-bottom.png
+%%DATADIR%%/themes/planet/bubble-left.png
+%%DATADIR%%/themes/planet/bubble-nipple.png
+%%DATADIR%%/themes/planet/bubble-right.png
+%%DATADIR%%/themes/planet/bubble-top-left.png
+%%DATADIR%%/themes/planet/bubble-top-right.png
+%%DATADIR%%/themes/planet/bubble-top.png
+%%DATADIR%%/themes/planet/planet.css
+%%DATADIR%%/themes/planet/theme.html
+share/icons/hicolor/16x16/apps/blam.png
+share/icons/hicolor/22x22/apps/blam.png
+share/icons/hicolor/24x24/apps/blam.png
+share/icons/hicolor/32x32/apps/blam.png
+share/icons/hicolor/48x48/apps/blam.png
+share/icons/hicolor/scalable/apps/blam.svg
+share/locale/ar/LC_MESSAGES/blam.mo
 share/locale/bg/LC_MESSAGES/blam.mo
 share/locale/bs/LC_MESSAGES/blam.mo
 share/locale/ca/LC_MESSAGES/blam.mo
 share/locale/cs/LC_MESSAGES/blam.mo
 share/locale/da/LC_MESSAGES/blam.mo
 share/locale/de/LC_MESSAGES/blam.mo
+share/locale/dz/LC_MESSAGES/blam.mo
 share/locale/el/LC_MESSAGES/blam.mo
 share/locale/en_CA/LC_MESSAGES/blam.mo
 share/locale/en_GB/LC_MESSAGES/blam.mo
@@ -57,36 +62,29 @@ share/locale/lv/LC_MESSAGES/blam.mo
 share/locale/nb/LC_MESSAGES/blam.mo
 share/locale/ne/LC_MESSAGES/blam.mo
 share/locale/nl/LC_MESSAGES/blam.mo
+share/locale/oc/LC_MESSAGES/blam.mo
 share/locale/pa/LC_MESSAGES/blam.mo
 share/locale/pl/LC_MESSAGES/blam.mo
 share/locale/pt/LC_MESSAGES/blam.mo
 share/locale/pt_BR/LC_MESSAGES/blam.mo
-share/locale/rw/LC_MESSAGES/blam.mo
 share/locale/ru/LC_MESSAGES/blam.mo
+share/locale/rw/LC_MESSAGES/blam.mo
+share/locale/sk/LC_MESSAGES/blam.mo
+share/locale/sl/LC_MESSAGES/blam.mo
 share/locale/sq/LC_MESSAGES/blam.mo
 share/locale/sr/LC_MESSAGES/blam.mo
 share/locale/sr@Latn/LC_MESSAGES/blam.mo
 share/locale/sv/LC_MESSAGES/blam.mo
-share/locale/sk/LC_MESSAGES/blam.mo
 share/locale/tr/LC_MESSAGES/blam.mo
 share/locale/uk/LC_MESSAGES/blam.mo
 share/locale/vi/LC_MESSAGES/blam.mo
 share/locale/zh_CN/LC_MESSAGES/blam.mo
 share/locale/zh_HK/LC_MESSAGES/blam.mo
 share/locale/zh_TW/LC_MESSAGES/blam.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrm share/blam/themes/planet
-@dirrm share/blam/themes/pimped
-@dirrm share/blam/themes/blam
-@dirrm share/blam/themes/akregator
-@dirrm share/blam/themes
-@dirrm share/blam
+@dirrm %%DATADIR%%/themes/planet
+@dirrm %%DATADIR%%/themes/pimped
+@dirrm %%DATADIR%%/themes/blam
+@dirrm %%DATADIR%%/themes/akregator
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%
 @dirrm lib/blam
-@dirrmtry share/applications