Update multimedia/banshee to 1.4.0.1.

5 files changed, 150 insertions, 6 deletions

diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index c54aa62a9fdd..d84ab8cb2f99 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	banshee
-PORTVERSION=	1.3.3
+PORTVERSION=	1.4.0.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://download.banshee-project.org/banshee/
 DISTNAME=	${PORTNAME}-1-${PORTVERSION}
@@ -25,6 +25,7 @@ LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mono.pc:${PORTSDIR}/lang/mono \
 
 OPTIONS=	DOCS "Install documentation" on \
 		MTP "Enable MTP support" on
+#		IPOD "Enable iPod support" on \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,7 +39,7 @@ USE_XORG=	xrandr xxf86vm
 USE_SQLITE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=	--disable-boo --disable-ipod
+CONFIGURE_ARGS+=	--disable-boo
 
 # Need absolute path for build/icon-install-theme.
 INSTALL=	/usr/bin/install
@@ -52,6 +53,14 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/monodocer:${PORTSDIR}/devel/monodoc
 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
+PLIST_SUB+=	OPT_IPOD="@comment "
+#.endif
+
 .if !defined(WITHOUT_MTP)
 LIB_DEPENDS+=	mtp.8:${PORTSDIR}/audio/libmtp
 PLIST_SUB+=	OPT_MTP=""
@@ -86,7 +95,7 @@ pre-build:
 # XXX - This one is the best.
 pre-install:
 .for i in 16x16 22x22 32x32 48x48 scalable
-. for j in actions categories status
+. for j in actions categories devices status
 	${MKDIR} ${PREFIX}/share/banshee-1/icons/hicolor/$i/$j/
 . endfor
 .endfor
diff --git a/multimedia/banshee/distinfo b/multimedia/banshee/distinfo
index 703508493678..329162c76ac0 100644
--- a/multimedia/banshee/distinfo
+++ b/multimedia/banshee/distinfo
@@ -1,3 +1,3 @@
-MD5 (banshee-1-1.3.3.tar.bz2) = bc7ce33597b5a1d1dd9529053522ee7d
-SHA256 (banshee-1-1.3.3.tar.bz2) = 7865850cd633caf780b55334c555f04ba7bfa4e8e014c1041783078d11bfa4a6
-SIZE (banshee-1-1.3.3.tar.bz2) = 2367812
+MD5 (banshee-1-1.4.0.1.tar.bz2) = dba1541012bdb01800d656ce6f251272
+SHA256 (banshee-1-1.4.0.1.tar.bz2) = 36b7099c3674906f9fd35341fb19adeed1e71039a5951ced607476474e14b2ef
+SIZE (banshee-1-1.4.0.1.tar.bz2) = 2396293
diff --git a/multimedia/banshee/files/patch-dllmap b/multimedia/banshee/files/patch-dllmap
new file mode 100644
index 000000000000..fe89cc672129
--- /dev/null
+++ b/multimedia/banshee/files/patch-dllmap
@@ -0,0 +1,67 @@
+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/files/patch-stupid-old-mono b/multimedia/banshee/files/patch-stupid-old-mono
new file mode 100644
index 000000000000..bf380a08098f
--- /dev/null
+++ b/multimedia/banshee/files/patch-stupid-old-mono
@@ -0,0 +1,11 @@
+--- src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs.orig	2008-11-07 16:37:50.000000000 +0000
++++ src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs	2008-11-07 16:36:52.000000000 +0000
+@@ -69,7 +69,7 @@
+             }
+             
+             try {
+-                foreach (var item in new KeyValueParser (reader = new StreamReader (path))) {
++                foreach (KeyValuePair<string, string []> item in new KeyValueParser (reader = new StreamReader (path))) {
+                     try {
+                         switch (item.Key) {
+                             case "name": name = item.Value[0]; break;
diff --git a/multimedia/banshee/pkg-plist b/multimedia/banshee/pkg-plist
index 3828959fe846..0adff41179b7 100644
--- a/multimedia/banshee/pkg-plist
+++ b/multimedia/banshee/pkg-plist
@@ -8,6 +8,7 @@ lib/banshee-1/Backends/Banshee.Hal.dll.mdb
 lib/banshee-1/Backends/Banshee.NowPlaying.X11.dll
 lib/banshee-1/Backends/Banshee.NowPlaying.X11.dll.mdb
 lib/banshee-1/Backends/Banshee.Unix.dll
+lib/banshee-1/Backends/Banshee.Unix.dll.config
 lib/banshee-1/Backends/Banshee.Unix.dll.mdb
 lib/banshee-1/Backends/libbnpx11.a
 lib/banshee-1/Backends/libbnpx11.la
@@ -26,6 +27,7 @@ lib/banshee-1/Banshee.Widgets.dll
 lib/banshee-1/Banshee.Widgets.dll.config
 lib/banshee-1/Banshee.Widgets.dll.mdb
 lib/banshee-1/Banshee.exe
+lib/banshee-1/Banshee.exe.config
 lib/banshee-1/Banshee.exe.mdb
 lib/banshee-1/Beroe.exe
 lib/banshee-1/Beroe.exe.mdb
@@ -43,6 +45,8 @@ 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
+%%OPT_IPOD%%lib/banshee-1/Extensions/Banshee.Dap.Ipod.dll
+%%OPT_IPOD%%lib/banshee-1/Extensions/Banshee.Dap.Ipod.dll.mdb
 lib/banshee-1/Extensions/Banshee.FileSystemQueue.dll
 lib/banshee-1/Extensions/Banshee.FileSystemQueue.dll.mdb
 lib/banshee-1/Extensions/Banshee.InternetRadio.dll
@@ -62,6 +66,10 @@ lib/banshee-1/Extensions/Banshee.PlayQueue.dll
 lib/banshee-1/Extensions/Banshee.PlayQueue.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
+%%OPT_IPOD%%lib/banshee-1/Extensions/ipod-sharp.dll.mdb
+%%OPT_IPOD%%lib/banshee-1/Extensions/ipod-sharp-ui.dll
+%%OPT_IPOD%%lib/banshee-1/Extensions/ipod-sharp-ui.dll.mdb
 lib/banshee-1/Halie.exe
 lib/banshee-1/Halie.exe.mdb
 lib/banshee-1/Hyena.Gui.dll
@@ -126,10 +134,25 @@ share/banshee-1/icons/hicolor/16x16/actions/media-write-cd.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
+%%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
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-gold.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-green.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-pink.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-mini-silver.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-nano-black.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-nano-white.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-shuffle.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/16x16/devices/multimedia-player-ipod-standard-color.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/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
 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/lastfm-audioscrobbler.png
 share/banshee-1/icons/hicolor/22x22/categories/lastfm-neighbour.png
 share/banshee-1/icons/hicolor/22x22/categories/lastfm-personal.png
@@ -139,11 +162,39 @@ 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
+%%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
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-gold.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-green.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-pink.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-mini-silver.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-nano-black.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-nano-white.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-shuffle.png
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/22x22/devices/multimedia-player-ipod-standard-color.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/32x32/actions/media-write-cd.png
 share/banshee-1/icons/hicolor/48x48/actions/media-write-cd.png
 share/banshee-1/icons/hicolor/48x48/categories/podcast.png
 share/banshee-1/icons/hicolor/48x48/categories/radio.png
 share/banshee-1/icons/hicolor/scalable/categories/radio.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
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-gold.svg
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-green.svg
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-pink.svg
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-mini-silver.svg
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-nano-black.svg
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-nano-white.svg
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-shuffle.svg
+%%OPT_IPOD%%share/banshee-1/icons/hicolor/scalable/devices/multimedia-player-ipod-standard-color.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/dbus-1/services/org.bansheeproject.Banshee.service
 share/dbus-1/services/org.bansheeproject.CollectionIndexer.service
 share/icons/hicolor/16x16/apps/media-player-banshee.png
@@ -187,27 +238,33 @@ share/locale/sr/LC_MESSAGES/banshee-1.mo
 share/locale/sr@Latn/LC_MESSAGES/banshee-1.mo
 share/locale/sv/LC_MESSAGES/banshee-1.mo
 share/locale/th/LC_MESSAGES/banshee-1.mo
+share/locale/uk/LC_MESSAGES/banshee-1.mo
 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
 @dirrm share/banshee-1/icons/hicolor/scalable/status
+@dirrm share/banshee-1/icons/hicolor/scalable/devices
 @dirrm share/banshee-1/icons/hicolor/scalable/categories
 @dirrm share/banshee-1/icons/hicolor/scalable/actions
 @dirrm share/banshee-1/icons/hicolor/scalable
 @dirrm share/banshee-1/icons/hicolor/48x48/status
+@dirrm share/banshee-1/icons/hicolor/48x48/devices
 @dirrm share/banshee-1/icons/hicolor/48x48/categories
 @dirrm share/banshee-1/icons/hicolor/48x48/actions
 @dirrm share/banshee-1/icons/hicolor/48x48
 @dirrm share/banshee-1/icons/hicolor/32x32/status
+@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/22x22/status
+@dirrm share/banshee-1/icons/hicolor/22x22/devices
 @dirrm share/banshee-1/icons/hicolor/22x22/categories
 @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/devices
 @dirrm share/banshee-1/icons/hicolor/16x16/categories
 @dirrm share/banshee-1/icons/hicolor/16x16/actions
 @dirrm share/banshee-1/icons/hicolor/16x16