- Update to 0.26.0

- Convert to OptionsNG
- Force binutils from ports for 7.x/8.x because binutils from base is too old
- Trim Makefile headers

Feature safe:	yes

4 files changed, 9 insertions, 19 deletions

diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index 9762286788a4..bbfd3de2b74e 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	mythplugin-mythmusic
-# Date created:		2010-03-07
-# Whom:			Bernhard Froehlich <decke@bluelife.at>
-#
+# Created by: Bernhard Froehlich <decke@bluelife.at>
 # $FreeBSD$
-#
 
 PORTNAME=	mythmusic
-PORTVERSION=	0.25.2
+PORTVERSION=	0.26.0
 CATEGORIES=	audio
 MASTER_SITES=	http://ftp.osuosl.org/pub/mythtv/ \
 		http://ftp.osuosl.org/pub/mythtv/old_releases/ \
diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo
index f909e59ab41f..a7c45c312967 100644
--- a/audio/mythplugin-mythmusic/distinfo
+++ b/audio/mythplugin-mythmusic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mythplugins-0.25.2.tar.bz2) = e8507dcddfbb63ab50fe738400639c20bf2f2a278a8947fa85d9096e537f11f3
-SIZE (mythplugins-0.25.2.tar.bz2) = 36763594
+SHA256 (mythplugins-0.26.0.tar.bz2) = 4e7f0493f37792c084c1b4d0b5863b4201ebce6d62ab7c6cc31ca74087d83c62
+SIZE (mythplugins-0.26.0.tar.bz2) = 36673620
diff --git a/audio/mythplugin-mythmusic/files/patch-settings.pro b/audio/mythplugin-mythmusic/files/patch-settings.pro
deleted file mode 100644
index 815eb72838c1..000000000000
--- a/audio/mythplugin-mythmusic/files/patch-settings.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- settings.pro.orig	2012-04-10 07:29:22.000000000 +0200
-+++ settings.pro	2012-04-13 21:31:59.774177979 +0200
-@@ -2,7 +2,7 @@
- 
- LIBVERSION = 0.25
- 
--INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
-+#INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
- #INCLUDEPATH += /usr/include/cdda
- #INCLUDEPATH += /usr/include/FLAC
- 
diff --git a/audio/mythplugin-mythmusic/pkg-plist b/audio/mythplugin-mythmusic/pkg-plist
index 885a84863142..09d866cbc70f 100644
--- a/audio/mythplugin-mythmusic/pkg-plist
+++ b/audio/mythplugin-mythmusic/pkg-plist
@@ -26,6 +26,7 @@ lib/mythtv/plugins/libmythmusic.so
 %%MYTHSHARE%%/i18n/mythmusic_sv.qm
 %%MYTHSHARE%%/music_settings.xml
 %%MYTHSHARE%%/musicmenu.xml
+%%MYTHSHARE%%/mythmusic/streams.xml
 %%MYTHSHARE%%/themes/default-wide/mm-titlelines.png
 %%MYTHSHARE%%/themes/default-wide/mm_blackhole_border.png
 %%MYTHSHARE%%/themes/default-wide/mm_volume_background.png
@@ -34,6 +35,7 @@ lib/mythtv/plugins/libmythmusic.so
 %%MYTHSHARE%%/themes/default-wide/music-sel-bg.png
 %%MYTHSHARE%%/themes/default-wide/music-ui.xml
 %%MYTHSHARE%%/themes/default-wide/musicsettings-ui.xml
+%%MYTHSHARE%%/themes/default-wide/stream-ui.xml
 %%MYTHSHARE%%/themes/default/ff_button_off.png
 %%MYTHSHARE%%/themes/default/ff_button_on.png
 %%MYTHSHARE%%/themes/default/ff_button_pushed.png
@@ -49,6 +51,7 @@ lib/mythtv/plugins/libmythmusic.so
 %%MYTHSHARE%%/themes/default/mm_compartists.png
 %%MYTHSHARE%%/themes/default/mm_compilations.png
 %%MYTHSHARE%%/themes/default/mm_descending.png
+%%MYTHSHARE%%/themes/default/mm_directory.png
 %%MYTHSHARE%%/themes/default/mm_down_arrow.png
 %%MYTHSHARE%%/themes/default/mm_folder.png
 %%MYTHSHARE%%/themes/default/mm_genres.png
@@ -117,4 +120,6 @@ lib/mythtv/plugins/libmythmusic.so
 %%MYTHSHARE%%/themes/default/stop_button_on.png
 %%MYTHSHARE%%/themes/default/stop_button_pushed.png
 %%MYTHSHARE%%/themes/default/track_info_background.png
+@dirrmtry lib/pkgconfig
 @dirrmtry lib/mythtv/plugins
+@dirrm %%MYTHSHARE%%/mythmusic