- Update to 2.6.2;

  - Unbreak;
  - Stageify.

3 files changed, 36 insertions, 10 deletions

diff --git a/multimedia/banshee/Makefile b/multimedia/banshee/Makefile
index f4f0c33c92d3..41d35b9da831 100644
--- a/multimedia/banshee/Makefile
+++ b/multimedia/banshee/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	banshee
-PORTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	GNOME
@@ -10,8 +9,6 @@ MASTER_SITES=	GNOME
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Music management and playback for gnome
 
-BROKEN=		Does not compile
-
 # Could do without bash, but it's brought in by gnome anyway.
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
 		bash:${PORTSDIR}/shells/bash
@@ -36,10 +33,10 @@ YOUTUBE_DESC=	Build and/or install the Youtube extension
 OPTIONS_DEFAULT=BPMDETECT GIO MTP WEBKIT YOUTUBE
 
 USE_XZ=		yes
-USES=		gmake perl5 pkgconfig
+USES=		desktop-file-utils gmake pathfix perl5 pkgconfig shared-mime-info
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack gtksharp20 gnomesharp20
+USE_GNOME=	gtksharp20 gnomesharp20
 USE_GSTREAMER=	cdparanoia
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME:C/-.*//}
 USE_XORG=	xrandr xxf86vm
@@ -48,7 +45,6 @@ INSTALLS_ICONS=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-vendor-build-id=FreeBSD\ BSD\#\ Project --disable-gio-hardware --disable-boo
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
@@ -97,7 +93,7 @@ PLIST_SUB+=	APPLEDEV="@comment "
 
 .if ${PORT_OPTIONS:MMTP}
 CONFIGURE_ARGS+=--enable-mtp
-LIB_DEPENDS+=	mtp:${PORTSDIR}/audio/libmtp
+LIB_PC_DEPENDS+=${LOCALBASE}/libdata/pkgconfig/libmtp.pc:${PORTSDIR}/audio/libmtp
 PLIST_SUB+=	OPT_MTP=""
 .else
 CONFIGURE_ARGS+=--disable-mtp
@@ -128,4 +124,7 @@ PLIST_SUB+=	OPT_WEBKITORYOUTUBE=""
 PLIST_SUB+=	OPT_WEBKITORYOUTUBE="@comment "
 .endif
 
+post-patch:
+	${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} -e 's|-r:Mono.Cairo|-r:${PREFIX}/lib/mono/gac/Mono.Cairo/4.0.0.0__0738eb9f132ed756/Mono.Cairo.dll|'
+
 .include <bsd.port.mk>
diff --git a/multimedia/banshee/distinfo b/multimedia/banshee/distinfo
index ab8298c3e228..4ffe70957113 100644
--- a/multimedia/banshee/distinfo
+++ b/multimedia/banshee/distinfo
@@ -1,2 +1,2 @@
-SHA256 (banshee-2.6.0.tar.xz) = a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a
-SIZE (banshee-2.6.0.tar.xz) = 3280112
+SHA256 (banshee-2.6.2.tar.xz) = f77c089b05e3dc956236d13ff02945fe560f56e402df57621a9196de39ba60f8
+SIZE (banshee-2.6.2.tar.xz) = 3372372
diff --git a/multimedia/banshee/pkg-plist b/multimedia/banshee/pkg-plist
index 644db261601b..20cfc0c4e7d4 100644
--- a/multimedia/banshee/pkg-plist
+++ b/multimedia/banshee/pkg-plist
@@ -32,6 +32,7 @@ lib/banshee/Banshee.Services.dll
 lib/banshee/Banshee.Services.dll.config
 lib/banshee/Banshee.Services.dll.mdb
 lib/banshee/Banshee.ThickClient.dll
+lib/banshee/Banshee.ThickClient.dll.config
 lib/banshee/Banshee.ThickClient.dll.mdb
 %%OPT_WEBKIT%%lib/banshee/Banshee.WebBrowser.dll
 %%OPT_WEBKIT%%lib/banshee/Banshee.WebBrowser.dll.mdb
@@ -157,6 +158,7 @@ libdata/pkgconfig/banshee-nowplaying.pc
 libdata/pkgconfig/banshee-services.pc
 libdata/pkgconfig/banshee-thickclient.pc
 libdata/pkgconfig/banshee-webbrowser.pc
+share/appdata/banshee.appdata.xml
 share/applications/banshee-audiocd.desktop
 share/applications/banshee-media-player.desktop
 share/applications/banshee.desktop
@@ -549,6 +551,29 @@ share/gnome/help/banshee/ja/search.page
 share/gnome/help/banshee/ja/sort.page
 share/gnome/help/banshee/ja/sync.page
 share/gnome/help/banshee/ja/ui.page
+share/gnome/help/banshee/pt_BR/add-podcast.page
+share/gnome/help/banshee/pt_BR/add-radio.page
+share/gnome/help/banshee/pt_BR/advanced.page
+share/gnome/help/banshee/pt_BR/amazon.page
+share/gnome/help/banshee/pt_BR/emusic.page
+share/gnome/help/banshee/pt_BR/extensions.page
+share/gnome/help/banshee/pt_BR/import.page
+share/gnome/help/banshee/pt_BR/index.page
+share/gnome/help/banshee/pt_BR/introduction.page
+share/gnome/help/banshee/pt_BR/itunes-import.page
+share/gnome/help/banshee/pt_BR/keyboardshortcuts.page
+share/gnome/help/banshee/pt_BR/lastfm.page
+share/gnome/help/banshee/pt_BR/legal.xml
+share/gnome/help/banshee/pt_BR/manage-coverart.page
+share/gnome/help/banshee/pt_BR/manage-playlists.page
+share/gnome/help/banshee/pt_BR/manage-tags.page
+share/gnome/help/banshee/pt_BR/play-queue.page
+share/gnome/help/banshee/pt_BR/play.page
+share/gnome/help/banshee/pt_BR/rb-import.page
+share/gnome/help/banshee/pt_BR/search.page
+share/gnome/help/banshee/pt_BR/sort.page
+share/gnome/help/banshee/pt_BR/sync.page
+share/gnome/help/banshee/pt_BR/ui.page
 share/gnome/help/banshee/sl/add-podcast.page
 share/gnome/help/banshee/sl/add-radio.page
 share/gnome/help/banshee/sl/advanced.page
@@ -683,6 +708,7 @@ share/mime/packages/banshee-emx.xml
 @dirrm share/gnome/help/banshee/zh_CN
 @dirrm share/gnome/help/banshee/uk
 @dirrm share/gnome/help/banshee/sl
+@dirrm share/gnome/help/banshee/pt_BR
 @dirrm share/gnome/help/banshee/ja
 @dirrm share/gnome/help/banshee/hu
 @dirrm share/gnome/help/banshee/gl
@@ -729,6 +755,7 @@ share/mime/packages/banshee-emx.xml
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/audio-profiles
 @dirrm %%DATADIR%%
+@dirrmtry share/appdata
 @dirrm lib/banshee/Extensions
 @dirrm lib/banshee/Backends
 @dirrm lib/banshee