23 files changed, 579 insertions, 91 deletions

diff --git a/multimedia/banshee-mirage/Makefile b/multimedia/banshee-mirage/Makefile
index ada87584c8b2..1543bd4ae3f6 100644
--- a/multimedia/banshee-mirage/Makefile
+++ b/multimedia/banshee-mirage/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mirage
-PORTVERSION=	0.5.0
-PORTREVISION=	4
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://hop.at/mirage/download/
 PKGNAMEPREFIX=	banshee-
diff --git a/multimedia/banshee-mirage/distinfo b/multimedia/banshee-mirage/distinfo
index cf4719d37015..d051a88eaddd 100644
--- a/multimedia/banshee-mirage/distinfo
+++ b/multimedia/banshee-mirage/distinfo
@@ -1,3 +1,3 @@
-MD5 (mirage-0.5.0.tar.gz) = c2a5a3b659e6473b0ec41e0fcf007bce
-SHA256 (mirage-0.5.0.tar.gz) = 83553ce7868f2500e38273b907936fb074255390bc955847dea679fbad9cb109
-SIZE (mirage-0.5.0.tar.gz) = 352617
+MD5 (mirage-0.6.0.tar.gz) = 257bfa37d65467971da957ed5c469266
+SHA256 (mirage-0.6.0.tar.gz) = 9b4384abc1f30b406de7a7a66583049e58454625427b43f2a7551d1ce09831cb
+SIZE (mirage-0.6.0.tar.gz) = 390005
diff --git a/multimedia/banshee-mirage/pkg-plist b/multimedia/banshee-mirage/pkg-plist
index 3177682a666a..685fae237171 100644
--- a/multimedia/banshee-mirage/pkg-plist
+++ b/multimedia/banshee-mirage/pkg-plist
@@ -6,6 +6,6 @@ lib/banshee-1/Extensions/Mirage.dll
 lib/banshee-1/Extensions/Mirage.dll.mdb
 lib/banshee-1/Extensions/Banshee.Mirage.dll
 lib/banshee-1/Extensions/Banshee.Mirage.dll.mdb
-share/locale/de/LC_MESSAGES/mirage.mo
-share/locale/it/LC_MESSAGES/mirage.mo
+share/locale/de/LC_MESSAGES/banshee-mirage.mo
+share/locale/it/LC_MESSAGES/banshee-mirage.mo
 @dirrmtry lib/banshee-1/Extensions
diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index 3c49ab1a5644..3be69a4f401d 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	banshee
-PORTVERSION=	1.5.1
-PORTREVISION=	5
+PORTVERSION=	1.6.0
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://download.banshee-project.org/${PORTNAME}/stable/${PORTVERSION}/
@@ -26,12 +25,16 @@ LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mono.pc:${PORTSDIR}/lang/mono \
 		${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
 		${LOCALBASE}/libdata/pkgconfig/taglib-sharp.pc:${PORTSDIR}/audio/taglib-sharp \
 		${LOCALBASE}/libdata/pkgconfig/mono-zeroconf.pc:${PORTSDIR}/net/mono-zeroconf \
-		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:${PORTSDIR}/devel/mono-addins
+		${LOCALBASE}/libdata/pkgconfig/mono-addins.pc:${PORTSDIR}/devel/mono-addins \
+		${LOCALBASE}/libdata/pkgconfig/notify-sharp.pc:${PORTSDIR}/devel/notify-sharp
 
-OPTIONS=	DOCS      "Install documentation" on \
-		MTP       "Enable MTP support"    on \
-		BPMDETECT "Enable BPM detection"  on \
-#		IPOD      "Enable iPod support"   on
+OPTIONS=	DOCS      "Install documentation"    on \
+		BOO       "Enable Boo support"       off \
+		BPMDETECT "Enable BPM detection"     on \
+		MTP       "Enable MTP support"       on \
+		IPOD      "Enable iPod support"      on \
+		WEBKIT    "Enable Wikipedia support" on \
+		YOUTUBE   "Enable Youtube support"   on
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -45,7 +48,8 @@ USE_XORG=	xrandr xxf86vm
 USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--disable-boo --disable-shave
+CONFIGURE_ARGS+=	--with-vendor-build-id=FreeBSD\ BSD\#\ Project \
+			--disable-gapless-playback
 
 # Need absolute path for build/icon-install-theme.
 INSTALL=	/usr/bin/install
@@ -57,24 +61,54 @@ INSTALL=	/usr/bin/install
 CONFIGURE_ARGS+=	--disable-docs
 .endif
 
-#.if !defined(WITHOUT_IPOD)
-#LIB_PC_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/ipod-sharp-ui.pc:${PORTSDIR}/audio/ipod-sharp
-#PLIST_SUB+=	OPT_IPOD=""
-#.else
-CONFIGURE_ARGS+=	--disable-ipod
+.if !defined(WITHOUT_BPMDETECT)
+USE_GSTREAMER+=	soundtouch
+.endif
+
+.if defined(WITH_BOO)
+CONFIGURE_ARGS+=--enable-boo
+BUILD_DEPENDS+=	booc:${PORTSDIR}/lang/boo
+RUN_DEPENDS+=	booc:${PORTSDIR}/lang/boo
+PLIST_SUB+=	OPT_BOO=""
+.else
+CONFIGURE_ARGS+=--disable-boo
+PLIST_SUB+=	OPT_BOO="@comment "
+.endif
+
+.if !defined(WITHOUT_IPOD)
+CONFIGURE_ARGS+=--enable-ipod
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/ipod-sharp-ui.pc:${PORTSDIR}/audio/ipod-sharp
+PLIST_SUB+=	OPT_IPOD=""
+.else
+CONFIGURE_ARGS+=--disable-ipod
 PLIST_SUB+=	OPT_IPOD="@comment "
-#.endif
+.endif
 
 .if !defined(WITHOUT_MTP)
+CONFIGURE_ARGS+=--enable-mtp
 LIB_DEPENDS+=	mtp.11:${PORTSDIR}/audio/libmtp
 PLIST_SUB+=	OPT_MTP=""
 .else
-CONFIGURE_ARGS+=	--disable-mtp
+CONFIGURE_ARGS+=--disable-mtp
 PLIST_SUB+=	OPT_MTP="@comment "
 .endif
 
-.if !defined(WITHOUT_BPMDETECT)
-USE_GSTREAMER+=	soundtouch
+.if !defined(WITHOUT_WEBKIT)
+CONFIGURE_ARGS+=--enable-webkit
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/webkit-sharp-1.0.pc:${PORTSDIR}/www/webkit-sharp
+PLIST_SUB+=	OPT_WEBKIT=""
+.else
+CONFIGURE_ARGS+=--disable-webkit
+PLIST_SUB+=	OPT_WEBKIT="@comment "
+.endif
+
+.if !defined(WITHOUT_YOUTUBE)
+CONFIGURE_ARGS+=--enable-youtube
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/gdata-sharp-youtube.pc:${PORTSDIR}/devel/google-gdata
+PLIST_SUB+=	OPT_YOUTUBE=""
+.else
+CONFIGURE_ARGS+=--disable-youtube
+PLIST_SUB+=	OPT_YOUTUBE="@comment "
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/banshee/distinfo b/multimedia/banshee/distinfo
index 0b95639309ab..04f199fd0f9c 100644
--- a/multimedia/banshee/distinfo
+++ b/multimedia/banshee/distinfo
@@ -1,3 +1,3 @@
-MD5 (banshee-1-1.5.1.tar.bz2) = b24051482dca8b87932db2a1e27ff43f
-SHA256 (banshee-1-1.5.1.tar.bz2) = 599b67ffd6ca1bf585adb13c397959e7f632596648c7782a20bdf5ab57978b8b
-SIZE (banshee-1-1.5.1.tar.bz2) = 2403695
+MD5 (banshee-1-1.6.0.tar.bz2) = 4ab6f48198627ed7a9a10b13c2656cd2
+SHA256 (banshee-1-1.6.0.tar.bz2) = f648968ae069f175f342ac27a466f89c0f077f8c45078ea7852962d5740a3c3a
+SIZE (banshee-1-1.6.0.tar.bz2) = 3167084
diff --git a/multimedia/banshee/files/patch-libbanshee_banshee-player-pipeline.c b/multimedia/banshee/files/patch-libbanshee_banshee-player-pipeline.c
new file mode 100644
index 000000000000..ec5d75df771f
--- /dev/null
+++ b/multimedia/banshee/files/patch-libbanshee_banshee-player-pipeline.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- libbanshee/banshee-player-pipeline.c.orig
++++ libbanshee/banshee-player-pipeline.c
+@@ -236,6 +236,7 @@
+ 
+ static void bp_volume_changed_callback (GstElement *playbin, GParamSpec *spec, BansheePlayer *player)
+ {
++    return;
+     g_return_if_fail (IS_BANSHEE_PLAYER (player));
+     g_return_if_fail (GST_IS_ELEMENT (playbin));
+ 
diff --git a/multimedia/banshee/pkg-plist b/multimedia/banshee/pkg-plist
index b500a04b9df4..485947aeb228 100644
--- a/multimedia/banshee/pkg-plist
+++ b/multimedia/banshee/pkg-plist
@@ -24,7 +24,6 @@ lib/banshee-1/Banshee.Services.addins
 lib/banshee-1/Banshee.Services.dll
 lib/banshee-1/Banshee.Services.dll.mdb
 lib/banshee-1/Banshee.ThickClient.dll
-lib/banshee-1/Banshee.ThickClient.dll.config
 lib/banshee-1/Banshee.ThickClient.dll.mdb
 lib/banshee-1/Banshee.Widgets.dll
 lib/banshee-1/Banshee.Widgets.dll.config
@@ -36,6 +35,10 @@ lib/banshee-1/Beroe.exe
 lib/banshee-1/Beroe.exe.mdb
 lib/banshee-1/Extensions/Banshee.AudioCd.dll
 lib/banshee-1/Extensions/Banshee.AudioCd.dll.mdb
+lib/banshee-1/Extensions/Banshee.Audiobook.dll
+lib/banshee-1/Extensions/Banshee.Audiobook.dll.mdb
+%%OPT_BOO%%lib/banshee-1/Extensions/Banshee.BooScript.dll
+%%OPT_BOO%%lib/banshee-1/Extensions/Banshee.BooScript.dll.mdb
 lib/banshee-1/Extensions/Banshee.Bookmarks.dll
 lib/banshee-1/Extensions/Banshee.Bookmarks.dll.mdb
 lib/banshee-1/Extensions/Banshee.Bpm.dll
@@ -52,12 +55,18 @@ lib/banshee-1/Extensions/Banshee.Dap.MassStorage.dll.mdb
 %%OPT_MTP%%lib/banshee-1/Extensions/Banshee.Dap.Mtp.dll.mdb
 lib/banshee-1/Extensions/Banshee.Dap.dll
 lib/banshee-1/Extensions/Banshee.Dap.dll.mdb
+lib/banshee-1/Extensions/Banshee.Emusic.dll
+lib/banshee-1/Extensions/Banshee.Emusic.dll.mdb
 lib/banshee-1/Extensions/Banshee.FileSystemQueue.dll
 lib/banshee-1/Extensions/Banshee.FileSystemQueue.dll.mdb
+lib/banshee-1/Extensions/Banshee.InternetArchive.dll
+lib/banshee-1/Extensions/Banshee.InternetArchive.dll.mdb
 lib/banshee-1/Extensions/Banshee.InternetRadio.dll
 lib/banshee-1/Extensions/Banshee.InternetRadio.dll.mdb
 lib/banshee-1/Extensions/Banshee.Lastfm.dll
 lib/banshee-1/Extensions/Banshee.Lastfm.dll.mdb
+lib/banshee-1/Extensions/Banshee.LibraryWatcher.dll
+lib/banshee-1/Extensions/Banshee.LibraryWatcher.dll.mdb
 lib/banshee-1/Extensions/Banshee.MiniMode.dll
 lib/banshee-1/Extensions/Banshee.MiniMode.dll.mdb
 lib/banshee-1/Extensions/Banshee.MultimediaKeys.dll
@@ -66,7 +75,6 @@ lib/banshee-1/Extensions/Banshee.NotificationArea.dll
 lib/banshee-1/Extensions/Banshee.NotificationArea.dll.config
 lib/banshee-1/Extensions/Banshee.NotificationArea.dll.mdb
 lib/banshee-1/Extensions/Banshee.NowPlaying.dll
-lib/banshee-1/Extensions/Banshee.NowPlaying.dll.config
 lib/banshee-1/Extensions/Banshee.NowPlaying.dll.mdb
 lib/banshee-1/Extensions/Banshee.PlayQueue.dll
 lib/banshee-1/Extensions/Banshee.PlayQueue.dll.mdb
@@ -74,10 +82,12 @@ lib/banshee-1/Extensions/Banshee.PlayerMigration.dll
 lib/banshee-1/Extensions/Banshee.PlayerMigration.dll.mdb
 lib/banshee-1/Extensions/Banshee.Podcasting.dll
 lib/banshee-1/Extensions/Banshee.Podcasting.dll.mdb
+%%OPT_WEBKIT%%lib/banshee-1/Extensions/Banshee.Wikipedia.dll
+%%OPT_WEBKIT%%lib/banshee-1/Extensions/Banshee.Wikipedia.dll.mdb
+%%OPT_YOUTUBE%%lib/banshee-1/Extensions/Banshee.YouTube.dll
+%%OPT_YOUTUBE%%lib/banshee-1/Extensions/Banshee.YouTube.dll.mdb
 %%OPT_IPOD%%lib/banshee-1/Extensions/ipod-sharp-ui.dll
-%%OPT_IPOD%%lib/banshee-1/Extensions/ipod-sharp-ui.dll.mdb
 %%OPT_IPOD%%lib/banshee-1/Extensions/ipod-sharp.dll
-%%OPT_IPOD%%lib/banshee-1/Extensions/ipod-sharp.dll.mdb
 lib/banshee-1/Halie.exe
 lib/banshee-1/Halie.exe.mdb
 lib/banshee-1/Hyena.Gui.dll
@@ -125,11 +135,13 @@ libdata/pkgconfig/banshee-1-lastfm-gui.pc
 libdata/pkgconfig/banshee-1-lastfm.pc
 libdata/pkgconfig/banshee-1-mono-media.pc
 libdata/pkgconfig/banshee-1-musicbrainz.pc
+libdata/pkgconfig/banshee-1-nowplaying.pc
 libdata/pkgconfig/banshee-1-services.pc
 libdata/pkgconfig/banshee-1-thickclient.pc
 share/applications/banshee-1-audiocd.desktop
 share/applications/banshee-1-media-player.desktop
 share/applications/banshee-1.desktop
+share/banshee-1/audio-profiles/aac-novell.xml
 share/banshee-1/audio-profiles/base.xml
 share/banshee-1/audio-profiles/flac.xml
 share/banshee-1/audio-profiles/mp3-lame.xml
@@ -138,16 +150,20 @@ share/banshee-1/audio-profiles/vorbis.xml
 share/banshee-1/audio-profiles/wav.xml
 share/banshee-1/audio-profiles/wavpack.xml
 share/banshee-1/audio-profiles/wma.xml
+share/banshee-1/icons/hicolor/128x128/devices/phone-google-nexus-one.png
 share/banshee-1/icons/hicolor/128x128/devices/phone-htc-g1-white.png
+share/banshee-1/icons/hicolor/128x128/devices/phone-nokia-n900.png
 share/banshee-1/icons/hicolor/16x16/actions/media-import-audio-cd.png
 share/banshee-1/icons/hicolor/16x16/actions/media-repeat-all.png
 share/banshee-1/icons/hicolor/16x16/actions/media-repeat-none.png
 share/banshee-1/icons/hicolor/16x16/actions/media-repeat-single.png
 share/banshee-1/icons/hicolor/16x16/actions/media-write-cd.png
 share/banshee-1/icons/hicolor/16x16/categories/amazon-mp3-source.png
+share/banshee-1/icons/hicolor/16x16/categories/audiobook.png
 share/banshee-1/icons/hicolor/16x16/categories/podcast.png
 share/banshee-1/icons/hicolor/16x16/categories/source-playlist.png
 share/banshee-1/icons/hicolor/16x16/categories/source-smart-playlist.png
+share/banshee-1/icons/hicolor/16x16/categories/wikipedia.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-U2-color.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-U2-monochrome.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-blue.png
@@ -162,7 +178,10 @@ share/banshee-1/icons/hicolor/16x16/categories/source-smart-playlist.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-standard-monochrome.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-video-black.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-video-white.png
+share/banshee-1/icons/hicolor/16x16/devices/phone-google-nexus-one.png
 share/banshee-1/icons/hicolor/16x16/devices/phone-htc-g1-white.png
+share/banshee-1/icons/hicolor/16x16/devices/phone-nokia-n900.png
+share/banshee-1/icons/hicolor/16x16/devices/phone-palm-pre.png
 share/banshee-1/icons/hicolor/16x16/emblems/creative-commons-by.png
 share/banshee-1/icons/hicolor/16x16/emblems/creative-commons-nc.png
 share/banshee-1/icons/hicolor/16x16/emblems/creative-commons-nd.png
@@ -173,6 +192,8 @@ share/banshee-1/icons/hicolor/22x22/actions/encode.png
 share/banshee-1/icons/hicolor/22x22/actions/media-import-audio-cd.png
 share/banshee-1/icons/hicolor/22x22/actions/media-write-cd.png
 share/banshee-1/icons/hicolor/22x22/categories/amazon-mp3-source.png
+share/banshee-1/icons/hicolor/22x22/categories/audiobook.png
+share/banshee-1/icons/hicolor/22x22/categories/internet-archive.png
 share/banshee-1/icons/hicolor/22x22/categories/lastfm-audioscrobbler.png
 share/banshee-1/icons/hicolor/22x22/categories/lastfm-neighbour.png
 share/banshee-1/icons/hicolor/22x22/categories/lastfm-personal.png
@@ -182,6 +203,7 @@ share/banshee-1/icons/hicolor/22x22/categories/podcast.png
 share/banshee-1/icons/hicolor/22x22/categories/radio.png
 share/banshee-1/icons/hicolor/22x22/categories/source-playlist.png
 share/banshee-1/icons/hicolor/22x22/categories/source-smart-playlist.png
+share/banshee-1/icons/hicolor/22x22/categories/wikipedia.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-U2-color.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-U2-monochrome.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-blue.png
@@ -196,14 +218,34 @@ share/banshee-1/icons/hicolor/22x22/categories/source-smart-playlist.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-standard-monochrome.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-video-black.png
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-video-white.png
+share/banshee-1/icons/hicolor/22x22/devices/phone-google-nexus-one.png
 share/banshee-1/icons/hicolor/22x22/devices/phone-htc-g1-white.png
+share/banshee-1/icons/hicolor/22x22/devices/phone-nokia-n900.png
+share/banshee-1/icons/hicolor/22x22/devices/phone-palm-pre.png
+share/banshee-1/icons/hicolor/24x24/devices/phone-google-nexus-one.png
+share/banshee-1/icons/hicolor/24x24/devices/phone-htc-g1-white.png
+share/banshee-1/icons/hicolor/24x24/devices/phone-nokia-n900.png
+share/banshee-1/icons/hicolor/24x24/devices/phone-palm-pre.png
+share/banshee-1/icons/hicolor/256x256/devices/phone-google-nexus-one.png
+share/banshee-1/icons/hicolor/256x256/devices/phone-palm-pre.png
 share/banshee-1/icons/hicolor/32x32/actions/media-write-cd.png
+share/banshee-1/icons/hicolor/32x32/categories/wikipedia.png
+share/banshee-1/icons/hicolor/32x32/devices/phone-google-nexus-one.png
 share/banshee-1/icons/hicolor/32x32/devices/phone-htc-g1-white.png
+share/banshee-1/icons/hicolor/32x32/devices/phone-nokia-n900.png
+share/banshee-1/icons/hicolor/32x32/devices/phone-palm-pre.png
 share/banshee-1/icons/hicolor/48x48/actions/media-write-cd.png
+share/banshee-1/icons/hicolor/48x48/categories/audiobook.png
 share/banshee-1/icons/hicolor/48x48/categories/podcast.png
 share/banshee-1/icons/hicolor/48x48/categories/radio.png
+share/banshee-1/icons/hicolor/48x48/categories/wikipedia.png
+share/banshee-1/icons/hicolor/48x48/devices/phone-google-nexus-one.png
 share/banshee-1/icons/hicolor/48x48/devices/phone-htc-g1-white.png
+share/banshee-1/icons/hicolor/48x48/devices/phone-nokia-n900.png
+share/banshee-1/icons/hicolor/48x48/devices/phone-palm-pre.png
+share/banshee-1/icons/hicolor/scalable/categories/audiobook.svg
 share/banshee-1/icons/hicolor/scalable/categories/radio.svg
+share/banshee-1/icons/hicolor/scalable/categories/wikipedia.svg
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-U2-color.svg
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-U2-monochrome.svg
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-blue.svg
@@ -218,6 +260,8 @@ share/banshee-1/icons/hicolor/scalable/categories/radio.svg
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-standard-monochrome.svg
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-video-black.svg
 %%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-video-white.svg
+share/banshee-1/icons/hicolor/scalable/devices/phone-nokia-n900.svg
+share/banshee-1/icons/hicolor/scalable/devices/phone-palm-pre.svg
 share/dbus-1/services/org.bansheeproject.Banshee.service
 share/dbus-1/services/org.bansheeproject.CollectionIndexer.service
 share/icons/hicolor/16x16/apps/media-player-banshee.png
@@ -278,8 +322,13 @@ share/locale/zh_TW/LC_MESSAGES/banshee-1.mo
 @dirrm share/banshee-1/icons/hicolor/48x48/actions
 @dirrm share/banshee-1/icons/hicolor/48x48
 @dirrm share/banshee-1/icons/hicolor/32x32/devices
+@dirrm share/banshee-1/icons/hicolor/32x32/categories
 @dirrm share/banshee-1/icons/hicolor/32x32/actions
 @dirrm share/banshee-1/icons/hicolor/32x32
+@dirrm share/banshee-1/icons/hicolor/256x256/devices
+@dirrm share/banshee-1/icons/hicolor/256x256
+@dirrm share/banshee-1/icons/hicolor/24x24/devices
+@dirrm share/banshee-1/icons/hicolor/24x24
 @dirrm share/banshee-1/icons/hicolor/22x22/devices
 @dirrm share/banshee-1/icons/hicolor/22x22/categories
 @dirrm share/banshee-1/icons/hicolor/22x22/actions
diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile
index 1129e033dfa8..1de9de46e8c1 100644
--- a/multimedia/moonlight/Makefile
+++ b/multimedia/moonlight/Makefile
@@ -6,36 +6,51 @@
 #
 
 PORTNAME=	moonlight
-PORTVERSION=	1.0.1
-PORTREVISION=	6
+PORTVERSION=	2.0
 CATEGORIES=	multimedia www
-MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/moon/
-DISTNAME=	moon-${PORTVERSION}
+MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/moon/${PORTVERSION}/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		mono-${MONO_VERSION}${EXTRACT_SUFX} \
+		mono-basic-${MONO_BASIC_VERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	OpenSource Implementation of Silverlight
 
+BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 		execinfo.1:${PORTSDIR}/devel/libexecinfo
 
+USE_BISON=	build
 USE_GECKO=	libxul
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomedesktopsharp20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-cairo=system \
 		--with-debug=yes \
 		--with-ff2=no \
-		--with-ff3=yes
+		--with-ff3=yes \
+		--with-mcspath=${MONODIR}/mcs/ \
+		--with-mono-basic-path=${MONOBASICDIR}/
+
+MONO_VERSION=	2.6
+MONO_BASIC_VERSION=2.6
+
+MONODIR=	${WRKDIR}/mono-${MONO_VERSION}
+MONOBASICDIR=	${WRKDIR}/mono-basic-${MONO_BASIC_VERSION}
 
 USE_WEBPLUGINS=		gecko19
-WEBPLUGINS_DIR=		${PREFIX}/lib/moon/plugin
+WEBPLUGINS_DIR=		${PREFIX}/lib/moonlight/plugin
 WEBPLUGINS_FILES=	libmoonloader.so \
 			libmoonplugin.so \
 			libmoonplugin-ff3bridge.so
 
 OPTIONS=	PULSEAUDIO "Build with PA (needed for sound support)" on
 
+MAN1=	mopen.1 mxap.1 respack.1 sockpol.1 svg2xaml.1 xamlg.1
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 
@@ -63,22 +78,19 @@ PLIST_FILES=	${WEBPLUGINS_DIR}/${PKGNAME}-freebsd-${OSREL}.xpi
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/TEST_SUBDIR =/d' \
-			${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|' \
+			${MONODIR}/mcs/class/Mono.WebBrowser/build-csproj2k5
 	@${REINPLACE_CMD} -e '/<malloc.h>/d' \
-			${WRKSRC}/src/animation.cpp \
 			${WRKSRC}/src/runtime.cpp \
-			${WRKSRC}/src/xaml.cpp \
-			${WRKSRC}/src/xap.cpp \
-			${WRKSRC}/src/value.cpp
-	@${REINPLACE_CMD} -e 's|CODEC_URL|""|' \
-			${WRKSRC}/src/pipeline-ui.cpp
+			${WRKSRC}/src/xaml.cpp
 	@${REINPLACE_CMD} -e 's|\(^LIBS\) =|\1 = -lexecinfo|' \
-		-e 's|/proc/|/compat/linux/proc/| ' \
 			${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-ldl||' \
 			${WRKSRC}/plugin/Makefile.in
 
+pre-configure:
+	@( cd ${MONODIR} && ./configure --with-profile2=no --with-moonlight=yes --with-profile4=no --with-monotouch=no --with-mcs-docs=no && ${GMAKE} )
+
 .if defined(WITH_XPI_PLUGIN_ONLY)
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/plugin/install/novell-moonlight.xpi \
diff --git a/multimedia/moonlight/distinfo b/multimedia/moonlight/distinfo
index 39ef9d71ad50..21435eba2340 100644
--- a/multimedia/moonlight/distinfo
+++ b/multimedia/moonlight/distinfo
@@ -1,3 +1,9 @@
-MD5 (moon-1.0.1.tar.bz2) = 48fafb26a48f15c30fd2d52b2add5660
-SHA256 (moon-1.0.1.tar.bz2) = da3ea10ea85cba126952a6a27f1cdd3e2c83f6e20fe3942819201e6beb80b9b7
-SIZE (moon-1.0.1.tar.bz2) = 8812587
+MD5 (moonlight-2.0.tar.bz2) = a3d35a2f92168baa11eabe2be26f5726
+SHA256 (moonlight-2.0.tar.bz2) = 7c437386e5d155e1673796b8dd20a85b523581426dcea78504ee0bc7e135102c
+SIZE (moonlight-2.0.tar.bz2) = 8108206
+MD5 (mono-2.6.tar.bz2) = 5c71c97fd789c5fc023de00deb3b1fed
+SHA256 (mono-2.6.tar.bz2) = 32f377fb52109bec6e79f500db8f7c4e284d9a788e605580b6b597b0174565ab
+SIZE (mono-2.6.tar.bz2) = 27645056
+MD5 (mono-basic-2.6.tar.bz2) = 225104257d7831f0f1c330269c26023e
+SHA256 (mono-basic-2.6.tar.bz2) = 1491256de6bc793e0d4e2f5cf382cdd3b431edf34e9c56cd79b0771278f114c6
+SIZE (mono-basic-2.6.tar.bz2) = 1211592
diff --git a/multimedia/moonlight/files/patch-class_System.Windows_Mono_NativeDependencyObjectHelper.cs b/multimedia/moonlight/files/patch-class_System.Windows_Mono_NativeDependencyObjectHelper.cs
new file mode 100644
index 000000000000..5d782e4e47f5
--- /dev/null
+++ b/multimedia/moonlight/files/patch-class_System.Windows_Mono_NativeDependencyObjectHelper.cs
@@ -0,0 +1,21 @@
+
+$FreeBSD$
+
+--- class/System.Windows/Mono/NativeDependencyObjectHelper.cs.orig
++++ class/System.Windows/Mono/NativeDependencyObjectHelper.cs
+@@ -177,7 +177,6 @@
+ 					throw new ExecutionEngineException ("multiple mappings registered for the same unmanaged peer");
+ 	#endif
+ 					Console.WriteLine ("multiple mappings registered for the same unmanaged peer 0x{0:x}, type = {1}", native, wrapper.GetType());
+-					Console.WriteLine (Environment.StackTrace);
+ 					return false;
+ 				}
+ 				
+@@ -229,7 +228,6 @@
+ 			INativeEventObjectWrapper wrapper = CreateObject (k, ptr) as INativeEventObjectWrapper;
+ 			if (wrapper == null){
+ 				Report.Warning ("System.Windows: Returning a null object, did not know how to construct {0}", k);
+-				Report.Warning (Environment.StackTrace);
+ 			}
+ 
+ 			return wrapper;
diff --git a/multimedia/moonlight/files/patch-configure b/multimedia/moonlight/files/patch-configure
index 84cdf9a97800..7eb717b40229 100644
--- a/multimedia/moonlight/files/patch-configure
+++ b/multimedia/moonlight/files/patch-configure
@@ -1,23 +1,35 @@
---- configure.orig	2009-01-13 19:53:23.000000000 +0000
-+++ configure	2009-02-24 17:52:38.000000000 +0000
-@@ -23676,6 +23676,9 @@
-     *linux* )
-     TARGET_PLATFORM="Linux"
-     ;;
-+    *freebsd* )
-+    TARGET_PLATFORM="FreeBSD"
-+    ;;
-     * )
-     { { echo "$as_me:$LINENO: error: Target os $target_os is unknown.
-     Please add the appropriate string to configure.ac.
-@@ -24223,6 +24226,10 @@
-                 OSTYPE=linux
- 		CODECS_OS_SUPPORTED="yes"
-                 ;;
-+    *freebsd*)
-+                OSTYPE=freebsd
-+		CODECS_OS_SUPPORTED="no"
-+                ;;
- esac
+
+$FreeBSD$
+
+--- configure.orig
++++ configure
+@@ -17940,6 +17940,10 @@
+ 			MOONLIGHT_CODEC_OSTYPE=linux
+ 			CODECS_OS_SUPPORTED="yes"
+ 			;;
++		*-*-*freebsd*)
++			MOONLIGHT_CODEC_OSTYPE=freebsd
++			CODECS_OS_SUPPORTED="yes"
++			;;
+ 	esac
  
- if test ${ARCH} = unknown; then
+ 	if test ${MOONLIGHT_CODEC_ARCH} = unknown; then
+@@ -20603,6 +20607,9 @@
+ 		*linux*)
+ 			TARGET_PLATFORM="Linux"
+ 			;;
++		*freebsd*)
++			TARGET_PLATFORM="FreeBSD"
++			;;
+ 		*)
+ 			{ { $as_echo "$as_me:$LINENO: error: Target os $target_os is unknown.
+ 				Please add the appropriate string to configure.ac.
+@@ -20619,7 +20626,7 @@
+ 			TARGET_PLATFORM="$TARGET_PLATFORM"_x86-gcc3
+ 			INSTALL_ARCH=i586
+ 			;;
+-		x86_64)
++		x86_64|amd64)
+ 				TARGET_PLATFORM="$TARGET_PLATFORM"_x86_64-gcc3
+ 			INSTALL_ARCH=x86_64
+ 			;;
diff --git a/multimedia/moonlight/files/patch-m4_codecs.m4 b/multimedia/moonlight/files/patch-m4_codecs.m4
new file mode 100644
index 000000000000..43814be520a1
--- /dev/null
+++ b/multimedia/moonlight/files/patch-m4_codecs.m4
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- m4/codecs.m4.orig
++++ m4/codecs.m4
+@@ -25,6 +25,10 @@
+ 			MOONLIGHT_CODEC_OSTYPE=linux
+ 			CODECS_OS_SUPPORTED="yes"
+ 			;;
++		*-*-*freebsd*)
++			MOONLIGHT_CODEC_OSTYPE=freebsd
++			CODECS_OS_SUPPORTED="yes"
++			;;
+ 	esac
+ 
+ 	if test ${MOONLIGHT_CODEC_ARCH} = unknown; then
diff --git a/multimedia/moonlight/files/patch-m4_firefox-xpi.m4 b/multimedia/moonlight/files/patch-m4_firefox-xpi.m4
new file mode 100644
index 000000000000..688d3404d69f
--- /dev/null
+++ b/multimedia/moonlight/files/patch-m4_firefox-xpi.m4
@@ -0,0 +1,24 @@
+
+$FreeBSD$
+
+--- m4/firefox-xpi.m4.orig
++++ m4/firefox-xpi.m4
+@@ -16,6 +16,9 @@
+ 		*linux*)
+ 			TARGET_PLATFORM="Linux"
+ 			;;
++		*freebsd*)
++			TARGET_PLATFORM="FreeBSD"
++			;;
+ 		*)
+ 			AC_MSG_ERROR([Target os $target_os is unknown.
+ 				Please add the appropriate string to configure.ac.
+@@ -28,7 +31,7 @@
+ 			TARGET_PLATFORM="$TARGET_PLATFORM"_x86-gcc3
+ 			INSTALL_ARCH=i586
+ 			;;
+-		x86_64)
++		x86_64|amd64)
+ 				TARGET_PLATFORM="$TARGET_PLATFORM"_x86_64-gcc3
+ 			INSTALL_ARCH=x86_64
+ 			;;
diff --git a/multimedia/moonlight/files/patch-plugin_plugin.cpp b/multimedia/moonlight/files/patch-plugin_plugin.cpp
new file mode 100644
index 000000000000..bfde8c1b7c9a
--- /dev/null
+++ b/multimedia/moonlight/files/patch-plugin_plugin.cpp
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- plugin/plugin.cpp.orig
++++ plugin/plugin.cpp
+@@ -17,6 +17,7 @@
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <dlfcn.h>
++#include <unistd.h>
+ 
+ #include "plugin.h"
+ #include "plugin-spinner.h"
diff --git a/multimedia/moonlight/files/patch-src_application.cpp b/multimedia/moonlight/files/patch-src_application.cpp
new file mode 100644
index 000000000000..33e57fa6525a
--- /dev/null
+++ b/multimedia/moonlight/files/patch-src_application.cpp
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- src/application.cpp.orig
++++ src/application.cpp
+@@ -17,6 +17,10 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ 
++#ifdef __FreeBSD__
++#include <unistd.h>
++#endif
++
+ #include "application.h"
+ #include "runtime.h"
+ #include "deployment.h"
+@@ -369,4 +373,4 @@
+ 		Deployment::GetCurrent()->TrackPath (resource_root);
+ 	}
+ 	return resource_root;
+-}
+\ No newline at end of file
++}
diff --git a/multimedia/moonlight/files/patch-src_bitmapimage.cpp b/multimedia/moonlight/files/patch-src_bitmapimage.cpp
new file mode 100644
index 000000000000..9bc492336d76
--- /dev/null
+++ b/multimedia/moonlight/files/patch-src_bitmapimage.cpp
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- src/bitmapimage.cpp.orig
++++ src/bitmapimage.cpp
+@@ -16,6 +16,9 @@
+ #include <glib/gstdio.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#ifdef __FreeBSD__
++#include <unistd.h>
++#endif
+ 
+ #include "application.h"
+ #include "bitmapimage.h"
diff --git a/multimedia/moonlight/files/patch-src_deployment.cpp b/multimedia/moonlight/files/patch-src_deployment.cpp
new file mode 100644
index 000000000000..ebd10a84bbb1
--- /dev/null
+++ b/multimedia/moonlight/files/patch-src_deployment.cpp
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- src/deployment.cpp.orig
++++ src/deployment.cpp
+@@ -237,8 +237,8 @@
+ 		}			
+ 		
+ 		if (mismatch) {
+-			LOG_DEPLOYMENT ("Deployment::GetCurrent (): Domain mismatch, thread %u, (tls) deployment: %p, deployment->domain: %p, (mono_domain_get) current_domain: %p, root_domain: %p, hash deployment: %p\n",
+-				(int) pthread_self (), deployment, deployment->domain, current_domain, root_domain, g_hash_table_lookup (current_hash, current_domain));
++			LOG_DEPLOYMENT ("Deployment::GetCurrent (): Domain mismatch, thread %li, (tls) deployment: %p, deployment->domain: %p, (mono_domain_get) current_domain: %p, root_domain: %p, hash deployment: %p\n",
++			(long)	pthread_self (), deployment, deployment->domain, current_domain, root_domain, g_hash_table_lookup (current_hash, current_domain));
+ 			pthread_mutex_lock (&hash_mutex);
+ 			deployment = (Deployment *) g_hash_table_lookup (current_hash, current_domain);
+ 			pthread_mutex_unlock (&hash_mutex);
+@@ -270,9 +270,9 @@
+ {
+ #if DEBUG
+ 	if (deployment && mono_domain_get () != deployment->domain) {
+-		LOG_DEPLOYMENT ("Deployment::SetCurrent (%p), thread: %i domain mismatch, is: %p\n", deployment, (int) pthread_self (), mono_domain_get ());
++		LOG_DEPLOYMENT ("Deployment::SetCurrent (%p), thread: %li domain mismatch, is: %p\n", deployment, (long) pthread_self (), mono_domain_get ());
+ 	} else if (pthread_getspecific (tls_key) != deployment) {
+-		LOG_DEPLOYMENT ("Deployment::SetCurrent (%p), thread: %i deployment mismatch, is: %p\n", deployment, (int) pthread_self (), pthread_getspecific (tls_key));
++		LOG_DEPLOYMENT ("Deployment::SetCurrent (%p), thread: %li deployment mismatch, is: %p\n", deployment, (long) pthread_self (), pthread_getspecific (tls_key));
+ 	}
+ #endif
+ 	
diff --git a/multimedia/moonlight/files/patch-src_easing.cpp b/multimedia/moonlight/files/patch-src_easing.cpp
new file mode 100644
index 000000000000..49974c3cac5c
--- /dev/null
+++ b/multimedia/moonlight/files/patch-src_easing.cpp
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- src/easing.cpp.orig
++++ src/easing.cpp
+@@ -16,7 +16,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef __FreeBSD__
+ #include <malloc.h>
++#endif
+ #include <math.h>
+ 
+ #include <runtime.h>
diff --git a/multimedia/moonlight/files/patch-src_file-downloader.cpp b/multimedia/moonlight/files/patch-src_file-downloader.cpp
new file mode 100644
index 000000000000..2420a5b21c5f
--- /dev/null
+++ b/multimedia/moonlight/files/patch-src_file-downloader.cpp
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- src/file-downloader.cpp.orig
++++ src/file-downloader.cpp
+@@ -17,6 +17,9 @@
+ #include <glib/gstdio.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#ifdef __FreeBSD__
++#include <unistd.h>
++#endif
+ 
+ #include "file-downloader.h"
+ #include "zip/unzip.h"
diff --git a/multimedia/moonlight/files/patch-src_pipeline-ui.cpp b/multimedia/moonlight/files/patch-src_pipeline-ui.cpp
new file mode 100644
index 000000000000..79fc0b72705c
--- /dev/null
+++ b/multimedia/moonlight/files/patch-src_pipeline-ui.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/pipeline-ui.cpp.orig
++++ src/pipeline-ui.cpp
+@@ -310,7 +310,7 @@
+ 		if (env_url != NULL)
+ 			dl->Open ("GET", env_url, NoPolicy);
+ 		else
+-			dl->Open ("GET", CODEC_URL, NoPolicy);
++			dl->Open ("GET", "", NoPolicy);
+ 		
+ 		dl->Send ();
+ 
diff --git a/multimedia/moonlight/files/patch-src_pipeline.cpp b/multimedia/moonlight/files/patch-src_pipeline.cpp
index 42eb6251558d..205ce11f56e7 100644
--- a/multimedia/moonlight/files/patch-src_pipeline.cpp
+++ b/multimedia/moonlight/files/patch-src_pipeline.cpp
@@ -1,10 +1,61 @@
---- src/pipeline.cpp.orig	2009-02-12 20:44:18.000000000 +0000
-+++ src/pipeline.cpp	2009-02-12 20:44:30.000000000 +0000
-@@ -15,6 +15,7 @@
- #include <config.h>
- #include <stdio.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
+
+$FreeBSD$
+
+--- src/pipeline.cpp.orig
++++ src/pipeline.cpp
+@@ -40,6 +40,23 @@
+ #include "deployment.h"
+ #include "timesource.h"
+ 
++#ifdef __FreeBSD__
++int
++sigisemptyset(sigset_t *set)
++{
++	sigset_t empty;
++	int ret = sigemptyset (&empty);
++	if (ret == 0) {
++		if (0 == memcmp (&empty, set, sizeof (sigset_t)))
++			ret = 1;
++		else
++			ret = 0;
++	}
++
++	return ret;
++}
++#endif
++
+ /*
+  * Media
+  */
+@@ -2260,7 +2277,7 @@
+ 	}
+ 	pthread_mutex_unlock (&mutex);
+ 	
+-	LOG_PIPELINE ("MediaThreadPool::WorkerLoop () %u: Started thread with index %i.\n", (int) pthread_self (), self_index);
++	LOG_PIPELINE ("MediaThreadPool::WorkerLoop () %lu: Started thread with index %i.\n", (long) pthread_self (), self_index);
+ 	
+ 	g_return_val_if_fail (self_index >= 0, NULL);
+ 	
+@@ -2316,11 +2333,11 @@
+ 		
+ 		media->SetCurrentDeployment (true, true);
+ 
+-		LOG_FRAMEREADERLOOP ("MediaThreadLoop::WorkerLoop () %u: got %s %p for media %p on deployment %p, there are %d nodes left.\n", (int) pthread_self (), node->closure->GetDescription (), node, media, media->GetDeployment (), queue ? queue->Length () : -1);
++		LOG_FRAMEREADERLOOP ("MediaThreadLoop::WorkerLoop () %lu: got %s %p for media %p on deployment %p, there are %d nodes left.\n", (long) pthread_self (), node->closure->GetDescription (), node, media, media->GetDeployment (), queue ? queue->Length () : -1);
+ 		
+ 		node->closure->Call ();
+ 		
+-		LOG_FRAMEREADERLOOP ("MediaThreadLoop::WorkerLoop () %u: processed node %p\n", (int) pthread_self (), node);
++		LOG_FRAMEREADERLOOP ("MediaThreadLoop::WorkerLoop () %lu: processed node %p\n", (long) pthread_self (), node);
+ 		
+ 		delete node;
+ 	}
+@@ -2333,7 +2350,7 @@
+ 		pthread_cond_signal (&completed_condition);
+ 	pthread_mutex_unlock (&mutex);
+ 	
+-	LOG_PIPELINE ("MediaThreadPool::WorkerLoop () %u: Exited (index: %i).\n", (int) pthread_self (), self_index);
++	LOG_PIPELINE ("MediaThreadPool::WorkerLoop () %lu: Exited (index: %i).\n", (long) pthread_self (), self_index);
+ 	
+ 	return NULL;
+ }
diff --git a/multimedia/moonlight/files/patch-src_utils.cpp b/multimedia/moonlight/files/patch-src_utils.cpp
new file mode 100644
index 000000000000..d363fd459082
--- /dev/null
+++ b/multimedia/moonlight/files/patch-src_utils.cpp
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- src/utils.cpp.orig
++++ src/utils.cpp
+@@ -16,6 +16,9 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <stdlib.h>
++#ifdef __FreeBSD__
++#include <unistd.h>
++#endif
+ 
+ #include "utils.h"
+ #include "application.h"
diff --git a/multimedia/moonlight/pkg-plist b/multimedia/moonlight/pkg-plist
index 5f0e4b4bddc5..238ab1311c1a 100644
--- a/multimedia/moonlight/pkg-plist
+++ b/multimedia/moonlight/pkg-plist
@@ -1,13 +1,126 @@
-bin/mopen1
+bin/mopen
+bin/munxap
+bin/mxap
+bin/respack
+bin/smcs
+bin/sockpol
+bin/unrespack
+bin/xaml2html
+bin/xamlg
 lib/libmoon.la
 lib/libmoon.so
 lib/libmoon.so.0
-lib/moon/plugin/README
-lib/moon/plugin/libmoonloader.la
-lib/moon/plugin/libmoonloader.so
-lib/moon/plugin/libmoonplugin-ff3bridge.la
-lib/moon/plugin/libmoonplugin-ff3bridge.so
-lib/moon/plugin/libmoonplugin.la
-lib/moon/plugin/libmoonplugin.so
-@dirrm lib/moon/plugin
-@dirrm lib/moon
+lib/mono/gac/Moon.Windows.Desktop/3.0.0.0__0738eb9f132ed756/Moon.Windows.Desktop.dll
+lib/mono/gac/Moon.Windows.Desktop/3.0.0.0__0738eb9f132ed756/Moon.Windows.Desktop.dll.mdb
+lib/mono/gac/Moonlight.Gtk/3.0.0.0__976ad8f3443f9a4d/Moonlight.Gtk.dll
+lib/mono/gac/Moonlight.Gtk/3.0.0.0__976ad8f3443f9a4d/Moonlight.Gtk.dll.mdb
+lib/mono/gac/System.Windows.Browser/3.0.0.0__0738eb9f132ed756/System.Windows.Browser.dll
+lib/mono/gac/System.Windows.Browser/3.0.0.0__0738eb9f132ed756/System.Windows.Browser.dll.mdb
+lib/mono/gac/System.Windows.Controls.Data/2.0.5.0__0738eb9f132ed756/System.Windows.Controls.Data.dll
+lib/mono/gac/System.Windows.Controls.Data/2.0.5.0__0738eb9f132ed756/System.Windows.Controls.Data.dll.mdb
+lib/mono/gac/System.Windows.Controls/2.0.5.0__0738eb9f132ed756/System.Windows.Controls.dll
+lib/mono/gac/System.Windows.Controls/2.0.5.0__0738eb9f132ed756/System.Windows.Controls.dll.mdb
+lib/mono/gac/System.Windows/3.0.0.0__0738eb9f132ed756/System.Windows.dll
+lib/mono/gac/System.Windows/3.0.0.0__0738eb9f132ed756/System.Windows.dll.config
+lib/mono/gac/System.Windows/3.0.0.0__0738eb9f132ed756/System.Windows.dll.mdb
+lib/mono/moonlight/Moon.Windows.Desktop.dll
+lib/mono/moonlight/Moonlight.Gtk.dll
+lib/mono/moonlight/System.Windows.Browser.dll
+lib/mono/moonlight/System.Windows.Controls.Data.dll
+lib/mono/moonlight/System.Windows.Controls.dll
+lib/mono/moonlight/System.Windows.dll
+lib/monodoc/sources/moonlight-gtk.source
+lib/monodoc/sources/moonlight-gtk.tree
+lib/monodoc/sources/moonlight-gtk.zip
+lib/moonlight/2.0-redist/System.Windows.Controls.Data.dll
+lib/moonlight/2.0-redist/System.Windows.Controls.Data.dll.mdb
+lib/moonlight/2.0-redist/System.Windows.Controls.dll
+lib/moonlight/2.0-redist/System.Windows.Controls.dll.mdb
+lib/moonlight/2.0-redist/System.Xml.Linq.dll
+lib/moonlight/2.0-redist/System.Xml.Linq.dll.mdb
+lib/moonlight/2.0/Microsoft.VisualBasic.dll
+lib/moonlight/2.0/Mono.CompilerServices.SymbolWriter.dll
+lib/moonlight/2.0/Mono.CompilerServices.SymbolWriter.dll.mdb
+lib/moonlight/2.0/System.Core.dll
+lib/moonlight/2.0/System.Core.dll.mdb
+lib/moonlight/2.0/System.Net.dll
+lib/moonlight/2.0/System.Net.dll.mdb
+lib/moonlight/2.0/System.Runtime.Serialization.dll
+lib/moonlight/2.0/System.Runtime.Serialization.dll.mdb
+lib/moonlight/2.0/System.ServiceModel.Web.dll
+lib/moonlight/2.0/System.ServiceModel.Web.dll.mdb
+lib/moonlight/2.0/System.ServiceModel.dll
+lib/moonlight/2.0/System.ServiceModel.dll.mdb
+lib/moonlight/2.0/System.Windows.Browser.dll
+lib/moonlight/2.0/System.Windows.Browser.dll.mdb
+lib/moonlight/2.0/System.Windows.dll
+lib/moonlight/2.0/System.Windows.dll.mdb
+lib/moonlight/2.0/System.Xml.dll
+lib/moonlight/2.0/System.Xml.dll.mdb
+lib/moonlight/2.0/System.dll
+lib/moonlight/2.0/System.dll.mdb
+lib/moonlight/2.0/buildversion
+lib/moonlight/2.0/mscorlib.dll
+lib/moonlight/2.0/mscorlib.dll.mdb
+lib/moonlight/2.0/respack.exe
+lib/moonlight/2.0/respack.exe.mdb
+lib/moonlight/2.0/smcs.exe
+lib/moonlight/2.0/smcs.exe.mdb
+lib/moonlight/mopen.exe
+lib/moonlight/mopen.exe.config
+lib/moonlight/mopen.exe.mdb
+lib/moonlight/munxap.exe
+lib/moonlight/mxap.exe
+lib/moonlight/plugin/Microsoft.VisualBasic.dll
+lib/moonlight/plugin/System.Core.dll
+lib/moonlight/plugin/System.Core.dll.mdb
+lib/moonlight/plugin/System.Net.dll
+lib/moonlight/plugin/System.Net.dll.mdb
+lib/moonlight/plugin/System.Runtime.Serialization.dll
+lib/moonlight/plugin/System.Runtime.Serialization.dll.mdb
+lib/moonlight/plugin/System.ServiceModel.Web.dll
+lib/moonlight/plugin/System.ServiceModel.Web.dll.mdb
+lib/moonlight/plugin/System.ServiceModel.dll
+lib/moonlight/plugin/System.ServiceModel.dll.mdb
+lib/moonlight/plugin/System.Windows.Browser.dll
+lib/moonlight/plugin/System.Windows.Browser.dll.mdb
+lib/moonlight/plugin/System.Windows.dll
+lib/moonlight/plugin/System.Windows.dll.config
+lib/moonlight/plugin/System.Windows.dll.mdb
+lib/moonlight/plugin/System.Xml.dll
+lib/moonlight/plugin/System.Xml.dll.mdb
+lib/moonlight/plugin/System.dll
+lib/moonlight/plugin/System.dll.mdb
+lib/moonlight/plugin/libmoonloader.la
+lib/moonlight/plugin/libmoonloader.so
+lib/moonlight/plugin/libmoonplugin-ff3bridge.la
+lib/moonlight/plugin/libmoonplugin-ff3bridge.so
+lib/moonlight/plugin/libmoonplugin.la
+lib/moonlight/plugin/libmoonplugin.so
+lib/moonlight/plugin/mscorlib.dll
+lib/moonlight/plugin/mscorlib.dll.mdb
+lib/moonlight/respack.exe
+lib/moonlight/sockpol.exe
+lib/moonlight/xaml2html.exe
+lib/moonlight/xamlg.exe
+share/pkgconfig/moonlight-desktop-2.0.pc
+share/pkgconfig/moonlight-gtk-2.0.pc
+share/pkgconfig/moonlight-web-2.0.pc
+@dirrm share/pkgconfig
+@dirrm lib/moonlight/plugin
+@dirrm lib/moonlight/2.0-redist
+@dirrm lib/moonlight/2.0
+@dirrm lib/moonlight
+@dirrm lib/mono/moonlight
+@dirrm lib/mono/gac/System.Windows/3.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/System.Windows.Controls/2.0.5.0__0738eb9f132ed756
+@dirrm lib/mono/gac/System.Windows.Controls.Data/2.0.5.0__0738eb9f132ed756
+@dirrm lib/mono/gac/System.Windows.Controls.Data
+@dirrm lib/mono/gac/System.Windows.Controls
+@dirrm lib/mono/gac/System.Windows.Browser/3.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/System.Windows.Browser
+@dirrm lib/mono/gac/System.Windows
+@dirrm lib/mono/gac/Moonlight.Gtk/3.0.0.0__976ad8f3443f9a4d
+@dirrm lib/mono/gac/Moonlight.Gtk
+@dirrm lib/mono/gac/Moon.Windows.Desktop/3.0.0.0__0738eb9f132ed756
+@dirrm lib/mono/gac/Moon.Windows.Desktop