4 files changed, 26 insertions, 73 deletions

diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index 20776ed7e4e3..e603474a3f38 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	banshee
-PORTVERSION=	1.4.3
+PORTVERSION=	1.5.1
 PORTEPOCH=	1
-PORTREVISION=	2
 CATEGORIES=	multimedia audio
-MASTER_SITES=	http://download.banshee-project.org/banshee/
+MASTER_SITES=	http://download.banshee-project.org/${PORTNAME}/stable/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-1-${PORTVERSION}
 
 MAINTAINER=	mono@FreeBSD.org
diff --git a/multimedia/banshee/distinfo b/multimedia/banshee/distinfo
index 3ac50b42de05..0b95639309ab 100644
--- a/multimedia/banshee/distinfo
+++ b/multimedia/banshee/distinfo
@@ -1,3 +1,3 @@
-MD5 (banshee-1-1.4.3.tar.bz2) = 880dee65d2bfe62be711a8edfe4d737f
-SHA256 (banshee-1-1.4.3.tar.bz2) = 8abe54b17c6755b7b6f617c8470ba5e84c94a96b86af9aac1031080646e142d1
-SIZE (banshee-1-1.4.3.tar.bz2) = 2415388
+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
diff --git a/multimedia/banshee/files/patch-dllmap b/multimedia/banshee/files/patch-dllmap
deleted file mode 100644
index fe89cc672129..000000000000
--- a/multimedia/banshee/files/patch-dllmap
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: src/Clients/Booter/Banshee.exe.config
-===================================================================
---- src/Clients/Booter/Banshee.exe.config	(revision 4804)
-+++ src/Clients/Booter/Banshee.exe.config	(working copy)
-@@ -1,4 +1,4 @@
- <configuration>
--  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0" os="linux"/>
-+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0" os="!windows,osx"/>
-   <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-quartz-2.0.dylib" os="osx"/>
- </configuration>
-Index: src/Core/Banshee.Widgets/Banshee.Widgets.dll.config
-===================================================================
---- src/Core/Banshee.Widgets/Banshee.Widgets.dll.config	(revision 4804)
-+++ src/Core/Banshee.Widgets/Banshee.Widgets.dll.config	(working copy)
-@@ -1,4 +1,4 @@
- <configuration>
--  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" os="linux"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" os="!windows,osx"/>
-   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.0.dylib" os="osx"/>
- </configuration>
-Index: src/Core/Banshee.Core/Banshee.Core.dll.config
-===================================================================
---- src/Core/Banshee.Core/Banshee.Core.dll.config	(revision 4804)
-+++ src/Core/Banshee.Core/Banshee.Core.dll.config	(working copy)
-@@ -1,4 +1,4 @@
- <configuration>
--  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="linux"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="!windows,osx"/>
-   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.dylib" os="osx"/>
--</configuration>
-\ No newline at end of file
-+</configuration>
-Index: src/Backends/Banshee.Unix/Banshee.Unix.dll.config
-===================================================================
---- src/Backends/Banshee.Unix/Banshee.Unix.dll.config	(revision 4804)
-+++ src/Backends/Banshee.Unix/Banshee.Unix.dll.config	(working copy)
-@@ -1,4 +1,4 @@
- <configuration>
--  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="linux"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="!windows,osx"/>
-   <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.dylib" os="osx"/>
--</configuration>
-\ No newline at end of file
-+</configuration>
-Index: src/Libraries/Hyena.Gui/Hyena.Gui.dll.config
-===================================================================
---- src/Libraries/Hyena.Gui/Hyena.Gui.dll.config	(revision 4804)
-+++ src/Libraries/Hyena.Gui/Hyena.Gui.dll.config	(working copy)
-@@ -1,11 +1,11 @@
- <configuration>
--  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0" os="linux"/>
--  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0" os="linux"/>
--  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="linux"/>
--  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" os="linux"/>
--  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0" os="linux"/>
--  <dllmap dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0.so.0" os="linux"/>
--  <dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="linux"/>
-+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0" os="!windows,osx"/>
-+  <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0" os="!windows,osx"/>
-+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0" os="!windows,osx"/>
-+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0" os="!windows,osx"/>
-+  <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0" os="!windows,osx"/>
-+  <dllmap dll="libpangocairo-1.0-0.dll" target="libpangocairo-1.0.so.0" os="!windows,osx"/>
-+  <dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows,osx"/>
- 
-   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-quartz-2.0.dylib" os="osx"/>
-   <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-quartz-2.0.dylib" os="osx"/>
diff --git a/multimedia/banshee/pkg-plist b/multimedia/banshee/pkg-plist
index e50dee42e54e..e40cadfb7b77 100644
--- a/multimedia/banshee/pkg-plist
+++ b/multimedia/banshee/pkg-plist
@@ -1,5 +1,7 @@
 bin/banshee-1
+bin/muinshee
 lib/banshee-1/Backends/Banshee.GStreamer.dll
+lib/banshee-1/Backends/Banshee.GStreamer.dll.config
 lib/banshee-1/Backends/Banshee.GStreamer.dll.mdb
 lib/banshee-1/Backends/Banshee.Gnome.dll
 lib/banshee-1/Backends/Banshee.Gnome.dll.mdb
@@ -22,6 +24,7 @@ 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
@@ -35,6 +38,8 @@ lib/banshee-1/Extensions/Banshee.AudioCd.dll
 lib/banshee-1/Extensions/Banshee.AudioCd.dll.mdb
 lib/banshee-1/Extensions/Banshee.Bookmarks.dll
 lib/banshee-1/Extensions/Banshee.Bookmarks.dll.mdb
+lib/banshee-1/Extensions/Banshee.Bpm.dll
+lib/banshee-1/Extensions/Banshee.Bpm.dll.mdb
 lib/banshee-1/Extensions/Banshee.CoverArt.dll
 lib/banshee-1/Extensions/Banshee.CoverArt.dll.mdb
 lib/banshee-1/Extensions/Banshee.Daap.dll
@@ -61,9 +66,12 @@ 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
+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_IPOD%%lib/banshee-1/Extensions/ipod-sharp.dll
@@ -83,6 +91,8 @@ lib/banshee-1/Lastfm.dll
 lib/banshee-1/Lastfm.dll.mdb
 lib/banshee-1/Migo.dll
 lib/banshee-1/Migo.dll.mdb
+lib/banshee-1/Mono.Data.Sqlite.dll
+lib/banshee-1/Mono.Data.Sqlite.dll.mdb
 lib/banshee-1/Mono.Media.dll
 lib/banshee-1/Mono.Media.dll.mdb
 %%OPT_MTP%%lib/banshee-1/Mtp.dll
@@ -152,6 +162,11 @@ share/banshee-1/icons/hicolor/16x16/categories/source-smart-playlist.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-htc-g1-white.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
+share/banshee-1/icons/hicolor/16x16/emblems/creative-commons-pd.png
+share/banshee-1/icons/hicolor/16x16/emblems/creative-commons-sa.png
 share/banshee-1/icons/hicolor/16x16/status/podcast-new.png
 share/banshee-1/icons/hicolor/22x22/actions/encode.png
 share/banshee-1/icons/hicolor/22x22/actions/media-import-audio-cd.png
@@ -214,6 +229,7 @@ share/icons/hicolor/48x48/apps/media-player-banshee.png
 share/locale/ar/LC_MESSAGES/banshee-1.mo
 share/locale/be@latin/LC_MESSAGES/banshee-1.mo
 share/locale/bg/LC_MESSAGES/banshee-1.mo
+share/locale/br/LC_MESSAGES/banshee-1.mo
 share/locale/ca/LC_MESSAGES/banshee-1.mo
 share/locale/cs/LC_MESSAGES/banshee-1.mo
 share/locale/da/LC_MESSAGES/banshee-1.mo
@@ -222,6 +238,7 @@ share/locale/dz/LC_MESSAGES/banshee-1.mo
 share/locale/en_CA/LC_MESSAGES/banshee-1.mo
 share/locale/en_GB/LC_MESSAGES/banshee-1.mo
 share/locale/es/LC_MESSAGES/banshee-1.mo
+share/locale/eu/LC_MESSAGES/banshee-1.mo
 share/locale/fi/LC_MESSAGES/banshee-1.mo
 share/locale/fr/LC_MESSAGES/banshee-1.mo
 share/locale/gl/LC_MESSAGES/banshee-1.mo
@@ -230,6 +247,8 @@ share/locale/he/LC_MESSAGES/banshee-1.mo
 share/locale/hu/LC_MESSAGES/banshee-1.mo
 share/locale/it/LC_MESSAGES/banshee-1.mo
 share/locale/ja/LC_MESSAGES/banshee-1.mo
+share/locale/ko/LC_MESSAGES/banshee-1.mo
+share/locale/ky/LC_MESSAGES/banshee-1.mo
 share/locale/lt/LC_MESSAGES/banshee-1.mo
 share/locale/lv/LC_MESSAGES/banshee-1.mo
 share/locale/mk/LC_MESSAGES/banshee-1.mo
@@ -251,6 +270,7 @@ share/locale/vi/LC_MESSAGES/banshee-1.mo
 share/locale/zh_CN/LC_MESSAGES/banshee-1.mo
 share/locale/zh_HK/LC_MESSAGES/banshee-1.mo
 share/locale/zh_TW/LC_MESSAGES/banshee-1.mo
+@dirrmtry share/locale/ky/LC_MESSAGES
 @dirrm share/banshee-1/icons/hicolor/scalable/status
 @dirrm share/banshee-1/icons/hicolor/scalable/devices
 @dirrm share/banshee-1/icons/hicolor/scalable/categories
@@ -277,6 +297,7 @@ share/locale/zh_TW/LC_MESSAGES/banshee-1.mo
 @dirrm share/banshee-1/icons/hicolor/22x22/actions
 @dirrm share/banshee-1/icons/hicolor/22x22
 @dirrm share/banshee-1/icons/hicolor/16x16/status
+@dirrm share/banshee-1/icons/hicolor/16x16/emblems
 @dirrm share/banshee-1/icons/hicolor/16x16/devices
 @dirrm share/banshee-1/icons/hicolor/16x16/categories
 @dirrm share/banshee-1/icons/hicolor/16x16/actions