4 files changed, 23 insertions, 24 deletions

diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index d84ab8cb2f99..467ca4a8812f 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	banshee
-PORTVERSION=	1.4.0.1
+PORTVERSION=	1.4.1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://download.banshee-project.org/banshee/
 DISTNAME=	${PORTNAME}-1-${PORTVERSION}
@@ -14,7 +14,10 @@ DISTNAME=	${PORTNAME}-1-${PORTVERSION}
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Music management and playback for gnome
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+# Could do without bash, but it's brought in by gnome anyway.
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
+		bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 LIB_PC_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mono.pc:${PORTSDIR}/lang/mono \
 		${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus \
@@ -70,13 +73,9 @@ PLIST_SUB+=	OPT_MTP="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's|#!/bin/bash|#!/bin/sh|' \
-				${WRKSRC}/src/Clients/Booter/banshee-1.in \
+	@${REINPLACE_CMD} "s|!/bin/bash|!${PREFIX}/bin/bash|" \
 				${WRKSRC}/build/icon-theme-installer \
-				${WRKSRC}/build/private-icon-theme-installer
-	@${REINPLACE_CMD} 's|\[\[|\[|g;s|\]\]|\]|g;s|==|=|g;s/||/-o/g' \
-				${WRKSRC}/build/private-icon-theme-installer
-	@${REINPLACE_CMD} 's|-a banshee-1||' \
+				${WRKSRC}/build/private-icon-theme-installer \
 				${WRKSRC}/src/Clients/Booter/banshee-1.in
 	@${REINPLACE_CMD} 's|sed -r|sed -E|' \
 				${WRKSRC}/data/icon-theme-hicolor/Makefile.in
@@ -94,9 +93,9 @@ pre-build:
 
 # XXX - This one is the best.
 pre-install:
-.for i in 16x16 22x22 32x32 48x48 scalable
+.for i in 16x16 22x22 32x32 48x48 128x128 scalable
 . for j in actions categories devices status
-	${MKDIR} ${PREFIX}/share/banshee-1/icons/hicolor/$i/$j/
+	@${MKDIR} ${PREFIX}/share/banshee-1/icons/hicolor/$i/$j/
 . endfor
 .endfor
 
diff --git a/multimedia/banshee/distinfo b/multimedia/banshee/distinfo
index 329162c76ac0..6e780b015f43 100644
--- a/multimedia/banshee/distinfo
+++ b/multimedia/banshee/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (banshee-1-1.4.1.tar.bz2) = cd245c2eb47c67f83e921f4edf105abe
+SHA256 (banshee-1-1.4.1.tar.bz2) = c0e254281a11f4f46c38b16bc6658323e23b16f3518777ab90c13f9d157b6cf1
+SIZE (banshee-1-1.4.1.tar.bz2) = 2412337
diff --git a/multimedia/banshee/files/patch-stupid-old-mono b/multimedia/banshee/files/patch-stupid-old-mono
deleted file mode 100644
index bf380a08098f..000000000000
--- a/multimedia/banshee/files/patch-stupid-old-mono
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 0adff41179b7..ad920b1e8058 100644
--- a/multimedia/banshee/pkg-plist
+++ b/multimedia/banshee/pkg-plist
@@ -131,6 +131,7 @@ 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/podcast.png
 share/banshee-1/icons/hicolor/16x16/categories/source-playlist.png
 share/banshee-1/icons/hicolor/16x16/categories/source-smart-playlist.png
@@ -148,6 +149,7 @@ 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-htc-g1-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
@@ -176,10 +178,14 @@ 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-htc-g1-white.png
 share/banshee-1/icons/hicolor/32x32/actions/media-write-cd.png
+share/banshee-1/icons/hicolor/32x32/devices/phone-htc-g1-white.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/48x48/devices/phone-htc-g1-white.png
+share/banshee-1/icons/hicolor/128x128/devices/phone-htc-g1-white.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
@@ -248,6 +254,11 @@ share/locale/zh_TW/LC_MESSAGES/banshee-1.mo
 @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/128x128/status
+@dirrm share/banshee-1/icons/hicolor/128x128/devices
+@dirrm share/banshee-1/icons/hicolor/128x128/categories
+@dirrm share/banshee-1/icons/hicolor/128x128/actions
+@dirrm share/banshee-1/icons/hicolor/128x128
 @dirrm share/banshee-1/icons/hicolor/48x48/status
 @dirrm share/banshee-1/icons/hicolor/48x48/devices
 @dirrm share/banshee-1/icons/hicolor/48x48/categories