Update to 0.40.0.

PR:		115331 (with minor changes)
Submitted by:	"Patrick Hurrelmann" <outi@bytephobia.de>

4 files changed, 106 insertions, 90 deletions

diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index a79270e2484a..524babd0243b 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	bmpx
-PORTVERSION=	0.36.1
-PORTREVISION=	5
+PORTVERSION=	0.40.0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://files.beep-media-player.org/releases/0.36/
+MASTER_SITES=	http://files.beep-media-player.org/releases/0.40/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Media player geared towards usability, technical efficiency and looks
@@ -23,11 +22,15 @@ LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		rsvg-2:${PORTSDIR}/graphics/librsvg2 \
 		boost_date_time.4:${PORTSDIR}/devel/boost \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		hal.1:${PORTSDIR}/sysutils/hal \
+		sexymm.2:${PORTSDIR}/x11-toolkits/libsexymm \
+		ofa.0:${PORTSDIR}/audio/libofa \
+		soup-2.2.8:${PORTSDIR}/devel/libsoup
 
 CONFLICTS=	bmpx-devel-[0-9]*
 
-USE_AUTOTOOLS=	autoconf:259
+USE_AUTOTOOLS=	autoconf:261
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_FAM=	yes
@@ -38,8 +41,7 @@ INSTALLS_ICONS=	yes
 USE_GSTREAMER=	good mp3 ogg vorbis cdparanoia
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-hal \
-			--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
+CONFIGURE_ARGS+=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
 			--with-dbus-services-dir="${PREFIX}/share/dbus-1/services" \
 			--with-libintl-prefix="${LOCALBASE}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -64,11 +66,6 @@ USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .endif
 
-.if defined(WITH_OFA)
-CONFIGURE_ARGS+=	--enable-ofa
-LIB_DEPENDS+=		ofa.0:${PORTSDIR}/audio/libofa
-.endif
-
 .if defined(WITH_SIDPLAY)
 CONFIGURE_ARGS+=	--enable-sid
 USE_GSTREAMER+=		sidplay
@@ -88,10 +85,4 @@ PLIST_SUB+=		MPEG4IP=""
 PLIST_SUB+=		MPEG4IP="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-BROKEN=		Does not compile on 5.x
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/bmpx/distinfo b/multimedia/bmpx/distinfo
index 74d0198fcae9..3cf04b5c3f35 100644
--- a/multimedia/bmpx/distinfo
+++ b/multimedia/bmpx/distinfo
@@ -1,3 +1,3 @@
-MD5 (bmpx-0.36.1.tar.bz2) = 03a55f8b5b3899f03d71ca9dd681545d
-SHA256 (bmpx-0.36.1.tar.bz2) = 3e9fa55b9ec5596132a1dabf117326faab33f6933995c3035aa9cc4afbf955c1
-SIZE (bmpx-0.36.1.tar.bz2) = 2452879
+MD5 (bmpx-0.40.0.tar.bz2) = acae0b6e42202ce6b3688725f6488e30
+SHA256 (bmpx-0.40.0.tar.bz2) = 57902bac23247bb987be91ed72b55a57aa2afb77219d397b9d12a396e58d9d62
+SIZE (bmpx-0.40.0.tar.bz2) = 1783485
diff --git a/multimedia/bmpx/pkg-descr b/multimedia/bmpx/pkg-descr
index 448fd62ffe72..c340449a0db3 100644
--- a/multimedia/bmpx/pkg-descr
+++ b/multimedia/bmpx/pkg-descr
@@ -1,8 +1,6 @@
-BMPx is an audio player that can be either used with a built-in
-frontend which currently utilizes Winamp 2.x compatible skins, or
-as a daemon for other frontends to connect via a DBus interface.
-It can run under X11 with graphical GUIs, or without X under 
-plain UNIX terminal as a daemon (in which case it requires a 
-different frontend connecting to it via DBus).
+BMPx is a media player which provides a very easy-to-use interface
+and usage semantics for all tasks, while having extensive standards
+and services support under the hood (MusicBrainz, Last.fm radio/scrobbling,
+HAL, DBus), yet keeping the details out of the way of the user.
 
 WWW:	http://beep-media-player.org/
diff --git a/multimedia/bmpx/pkg-plist b/multimedia/bmpx/pkg-plist
index 1e963d95266d..c0e56a297ffb 100644
--- a/multimedia/bmpx/pkg-plist
+++ b/multimedia/bmpx/pkg-plist
@@ -4,32 +4,23 @@ bin/bmp-enqueue-uris-2.0
 bin/bmp-play-files-2.0
 bin/bmp-play-lastfm-2.0
 bin/bmp2
-include/bmp-2.0/bmp/base_types.hh
 include/bmp-2.0/bmp/bmp.hh
-include/bmp-2.0/bmp/database_types.hh
 include/bmp-2.0/bmp/dbus.hh
-include/bmp-2.0/bmp/library_types.hh
-lib/bmpx/plugins/taglib/libtaglib_plugin_audible.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_audible.so
-lib/bmpx/plugins/taglib/libtaglib_plugin_audible.so.0
 lib/bmpx/plugins/taglib/libtaglib_plugin_flac.la
 lib/bmpx/plugins/taglib/libtaglib_plugin_flac.so
 lib/bmpx/plugins/taglib/libtaglib_plugin_flac.so.0
-lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.so
-lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.so.0
 lib/bmpx/plugins/taglib/libtaglib_plugin_mp3.la
 lib/bmpx/plugins/taglib/libtaglib_plugin_mp3.so
 lib/bmpx/plugins/taglib/libtaglib_plugin_mp3.so.0
 %%MPEG4IP%%lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.la
 %%MPEG4IP%%lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.so
 %%MPEG4IP%%lib/bmpx/plugins/taglib/libtaglib_plugin_mp4.so.0
+lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.la
+lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.so
+lib/bmpx/plugins/taglib/libtaglib_plugin_mpc.so.0
 lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.la
 lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.so
 lib/bmpx/plugins/taglib/libtaglib_plugin_ogg.so.0
-lib/bmpx/plugins/taglib/libtaglib_plugin_rmff.la
-lib/bmpx/plugins/taglib/libtaglib_plugin_rmff.so
-lib/bmpx/plugins/taglib/libtaglib_plugin_rmff.so.0
 lib/bmpx/plugins/taglib/libtaglib_plugin_wma.la
 lib/bmpx/plugins/taglib/libtaglib_plugin_wma.so
 lib/bmpx/plugins/taglib/libtaglib_plugin_wma.so.0
@@ -39,15 +30,9 @@ lib/bmpx/plugins/vfs/container/libcontainer_folder.so.0
 lib/bmpx/plugins/vfs/container/libcontainer_m3u.la
 lib/bmpx/plugins/vfs/container/libcontainer_m3u.so
 lib/bmpx/plugins/vfs/container/libcontainer_m3u.so.0
-lib/bmpx/plugins/vfs/container/libcontainer_mlq.la
-lib/bmpx/plugins/vfs/container/libcontainer_mlq.so
-lib/bmpx/plugins/vfs/container/libcontainer_mlq.so.0
 lib/bmpx/plugins/vfs/container/libcontainer_pls.la
 lib/bmpx/plugins/vfs/container/libcontainer_pls.so
 lib/bmpx/plugins/vfs/container/libcontainer_pls.so.0
-lib/bmpx/plugins/vfs/container/libcontainer_query.la
-lib/bmpx/plugins/vfs/container/libcontainer_query.so
-lib/bmpx/plugins/vfs/container/libcontainer_query.so.0
 lib/bmpx/plugins/vfs/container/libcontainer_xspf.la
 lib/bmpx/plugins/vfs/container/libcontainer_xspf.so
 lib/bmpx/plugins/vfs/container/libcontainer_xspf.so.0
@@ -60,25 +45,25 @@ lib/bmpx/plugins/vfs/transport/libtransport_http.so.0
 libdata/pkgconfig/bmp-2.0.pc
 libexec/beep-media-player-2-bin
 libexec/beep-media-player-2-sentinel
-share/applications/bmp-2.0.desktop
 share/applications/bmp-2.0-offline.desktop
+share/applications/bmp-2.0.desktop
 share/applications/bmp-enqueue-2.0.desktop
 share/applications/bmp-play-2.0.desktop
-%%DATADIR%%/data/GPL.txt
 %%DATADIR%%/glade/dialog-add-podcast.glade
+%%DATADIR%%/glade/dialog-equalizer.glade
 %%DATADIR%%/glade/dialog-export.glade
 %%DATADIR%%/glade/dialog-filebrowser.glade
-%%DATADIR%%/glade/dialog-filelist.glade
-%%DATADIR%%/glade/dialog-gaim-send-file.glade
 %%DATADIR%%/glade/dialog-gsterror.glade
 %%DATADIR%%/glade/dialog-lastfm-recommend.glade
-%%DATADIR%%/glade/dialog-lyrics.glade
+%%DATADIR%%/glade/dialog-lastfm-tag.glade
+%%DATADIR%%/glade/dialog-play-uri.glade
 %%DATADIR%%/glade/dialog-progress.glade
-%%DATADIR%%/glade/library-ui-create-collection.glade
+%%DATADIR%%/glade/dialog-simple-entry.glade
+%%DATADIR%%/glade/dialog-simple-progress.glade
+%%DATADIR%%/glade/dialog-track-details.glade
 %%DATADIR%%/glade/library-ui-modify-import.glade
-%%DATADIR%%/glade/library-ui-relocate-album.glade
-%%DATADIR%%/glade/main-ui.glade
-%%DATADIR%%/glade/preferences-ui.glade
+%%DATADIR%%/glade/main.glade
+%%DATADIR%%/glade/preferences.glade
 %%DATADIR%%/icons/themes/darksphere/icon_player_128.png
 %%DATADIR%%/icons/themes/darksphere/icon_player_16.png
 %%DATADIR%%/icons/themes/darksphere/icon_player_32.png
@@ -150,16 +135,14 @@ share/applications/bmp-play-2.0.desktop
 %%DATADIR%%/icons/themes/tango/icon_streams_48.png
 %%DATADIR%%/icons/themes/tango/icon_streams_64.png
 %%DATADIR%%/icons/tray-icons/tray-icon-default.png
-%%DATADIR%%/icons/tray-icons/tray-icon-exit.png
 %%DATADIR%%/icons/tray-icons/tray-icon-paused.png
 %%DATADIR%%/icons/tray-icons/tray-icon-playing.png
+%%DATADIR%%/images/audio-default-no-background.png
 %%DATADIR%%/images/audio-default.png
-%%DATADIR%%/images/audio-empty.png
-%%DATADIR%%/images/audio-multiple.png
-%%DATADIR%%/images/blue-speaker.png
 %%DATADIR%%/images/cdda/audiocd-big.png
 %%DATADIR%%/images/cdda/audiocd-unplayable.png
 %%DATADIR%%/images/collections/collection.png
+%%DATADIR%%/images/cover-frame.png
 %%DATADIR%%/images/hal/dev-cdrom.png
 %%DATADIR%%/images/hal/dev-volume-1394.png
 %%DATADIR%%/images/hal/dev-volume-ide.png
@@ -168,14 +151,14 @@ share/applications/bmp-play-2.0.desktop
 %%DATADIR%%/images/hal/device-cdrom.png
 %%DATADIR%%/images/hal/device-cf-card.png
 %%DATADIR%%/images/hal/device-floppy.png
-%%DATADIR%%/images/hal/device-harddrive.png
-%%DATADIR%%/images/hal/device-harddrive-usb.png
 %%DATADIR%%/images/hal/device-harddrive-1394.png
+%%DATADIR%%/images/hal/device-harddrive-usb.png
+%%DATADIR%%/images/hal/device-harddrive.png
 %%DATADIR%%/images/hal/device-ipod.png
 %%DATADIR%%/images/hal/device-ms.png
-%%DATADIR%%/images/hal/device-removable.png
-%%DATADIR%%/images/hal/device-removable-usb.png
 %%DATADIR%%/images/hal/device-removable-1394.png
+%%DATADIR%%/images/hal/device-removable-usb.png
+%%DATADIR%%/images/hal/device-removable.png
 %%DATADIR%%/images/hal/device-sdmmc-card.png
 %%DATADIR%%/images/hal/device-sm-card.png
 %%DATADIR%%/images/lastfm/audioscrobbler.png
@@ -187,30 +170,27 @@ share/applications/bmp-play-2.0.desktop
 %%DATADIR%%/images/lastfm/lastfm-friend.png
 %%DATADIR%%/images/lastfm/lastfm-mainuser.png
 %%DATADIR%%/images/lastfm/lastfm-neighbour.png
-%%DATADIR%%/images/lastfm/lastfm-net-idle.png
-%%DATADIR%%/images/lastfm/lastfm-net-rx.png
-%%DATADIR%%/images/lastfm/lastfm-net-tx.png
-%%DATADIR%%/images/lastfm/lastfm-station.png
+%%DATADIR%%/images/lastfm/lastfm-recommended-radio.png
 %%DATADIR%%/images/lastfm/lastfm-station-small.png
+%%DATADIR%%/images/lastfm/lastfm-station.png
 %%DATADIR%%/images/lastfm/lastfm-tag.png
 %%DATADIR%%/images/lastfm/lastfm-track.png
 %%DATADIR%%/images/lastfm/lastfm-user.png
-%%DATADIR%%/images/library/new.png
 %%DATADIR%%/images/logo-about.png
 %%DATADIR%%/images/logo-splash.png
-%%DATADIR%%/images/main/add.png
 %%DATADIR%%/images/main/header-logo-left.png
 %%DATADIR%%/images/main/header-logo-right.png
 %%DATADIR%%/images/main/header-logo-slice.png
-%%DATADIR%%/images/main/playing.png
-%%DATADIR%%/images/main/remove.png
 %%DATADIR%%/images/main/warning.png
 %%DATADIR%%/images/main/yingyang.gif
 %%DATADIR%%/images/main/yingyang_paused.gif
 %%DATADIR%%/images/main/yingyang_seeking.png
 %%DATADIR%%/images/podcast/feed-default.png
+%%DATADIR%%/images/podcast/feed-expired.png
+%%DATADIR%%/images/preferences/lastfm.png
 %%DATADIR%%/images/preferences/library.png
 %%DATADIR%%/images/preferences/misc.png
+%%DATADIR%%/images/preferences/museek.png
 %%DATADIR%%/images/preferences/musicbrainz.png
 %%DATADIR%%/images/preferences/playback.png
 %%DATADIR%%/images/preferences/podcasts.png
@@ -220,61 +200,98 @@ share/applications/bmp-play-2.0.desktop
 %%DATADIR%%/images/rating/stars_3.png
 %%DATADIR%%/images/rating/stars_4.png
 %%DATADIR%%/images/rating/stars_5.png
+%%DATADIR%%/images/sources/audiocd.png
+%%DATADIR%%/images/sources/jamendo.png
+%%DATADIR%%/images/sources/lastfm.png
+%%DATADIR%%/images/sources/library.png
+%%DATADIR%%/images/sources/playlist.png
+%%DATADIR%%/images/sources/podcasts.png
+%%DATADIR%%/images/sources/radio.png
 %%DATADIR%%/images/stock/approve-partial.png
 %%DATADIR%%/images/stock/approve.png
+%%DATADIR%%/images/stock/artist-blackstar.png
+%%DATADIR%%/images/stock/artist-mb.png
+%%DATADIR%%/images/stock/artist-multiple.png
+%%DATADIR%%/images/stock/artist.png
 %%DATADIR%%/images/stock/audio.png
 %%DATADIR%%/images/stock/bmp.png
 %%DATADIR%%/images/stock/cdrom.png
-%%DATADIR%%/images/stock/entry-clear.png
+%%DATADIR%%/images/stock/clear.png
+%%DATADIR%%/images/stock/eek.png
+%%DATADIR%%/images/stock/equalizer.png
+%%DATADIR%%/images/stock/feed.png
+%%DATADIR%%/images/stock/jamendo.png
 %%DATADIR%%/images/stock/lastfm-ban.png
 %%DATADIR%%/images/stock/lastfm-love.png
 %%DATADIR%%/images/stock/lastfm-skip.png
 %%DATADIR%%/images/stock/lastfm.png
 %%DATADIR%%/images/stock/library.png
-%%DATADIR%%/images/stock/museek.png
+%%DATADIR%%/images/stock/lyrics.png
 %%DATADIR%%/images/stock/musicbrainz.png
+%%DATADIR%%/images/stock/play.png
 %%DATADIR%%/images/stock/playlist.png
-%%DATADIR%%/images/stock/shoutcast.png
+%%DATADIR%%/images/stock/repeat.png
+%%DATADIR%%/images/stock/search.png
+%%DATADIR%%/images/stock/shuffle.png
 %%DATADIR%%/images/stock/silk-add.png
 %%DATADIR%%/images/stock/silk-application_edit.png
 %%DATADIR%%/images/stock/silk-attach.png
 %%DATADIR%%/images/stock/silk-cart_put.png
-%%DATADIR%%/images/stock/silk-cd_add.png
 %%DATADIR%%/images/stock/silk-cd_delete.png
 %%DATADIR%%/images/stock/silk-cd_edit.png
-%%DATADIR%%/images/stock/silk-cd_go.png
-%%DATADIR%%/images/stock/silk-cog.png
-%%DATADIR%%/images/stock/silk-control_pause_blue.png
-%%DATADIR%%/images/stock/silk-control_play_blue.png
-%%DATADIR%%/images/stock/silk-control_stop_blue.png
 %%DATADIR%%/images/stock/silk-delete.png
+%%DATADIR%%/images/stock/silk-disk.png
 %%DATADIR%%/images/stock/silk-drive.png
 %%DATADIR%%/images/stock/silk-exclamation.png
-%%DATADIR%%/images/stock/silk-feed.png
 %%DATADIR%%/images/stock/silk-feed_add.png
 %%DATADIR%%/images/stock/silk-feed_delete.png
-%%DATADIR%%/images/stock/silk-folder_star.png
+%%DATADIR%%/images/stock/silk-feed_disk.png
+%%DATADIR%%/images/stock/silk-folder.png
 %%DATADIR%%/images/stock/silk-html.png
-%%DATADIR%%/images/stock/silk-mod-server_down.png
-%%DATADIR%%/images/stock/silk-mod-server_up.png
 %%DATADIR%%/images/stock/silk-new.png
 %%DATADIR%%/images/stock/silk-picture.png
 %%DATADIR%%/images/stock/silk-plugin.png
 %%DATADIR%%/images/stock/silk-plugin_disabled.png
-%%DATADIR%%/images/stock/silk-tag_blue_add.png
-%%DATADIR%%/images/stock/silk-tag_blue_delete.png
+%%DATADIR%%/images/stock/silk-server_database.png
+%%DATADIR%%/images/stock/silk-world_link.png
 %%DATADIR%%/images/stock/tag.png
+%%DATADIR%%/images/stock/track.png
+%%DATADIR%%/images/stock/undo.png
 %%DATADIR%%/images/stock/xiph.png
 %%DATADIR%%/images/svg/button-background.svg
-%%DATADIR%%/images/svg/button-glow-overlay.svg
 %%DATADIR%%/images/svg/button-outline.svg
 %%DATADIR%%/images/throbber.gif
-share/dbus-1/services/org.beepmediaplayer.bmp.service
 share/dbus-1/services/org.beepmediaplayer.sentinel.service
+share/dbus-1/services/org.mpris.bmp.service
+%%DOCSDIR%%/html/apa.html
+%%DOCSDIR%%/html/ch01.html
+%%DOCSDIR%%/html/ch02.html
+%%DOCSDIR%%/html/ch02s01.html
+%%DOCSDIR%%/html/ch03.html
+%%DOCSDIR%%/html/ch03s01.html
+%%DOCSDIR%%/html/ch03s02.html
+%%DOCSDIR%%/html/ch04.html
+%%DOCSDIR%%/html/ch05.html
+%%DOCSDIR%%/html/ch06.html
+%%DOCSDIR%%/html/ch07.html
+%%DOCSDIR%%/html/ch08.html
+%%DOCSDIR%%/html/ch09.html
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/images/active-source.png
+%%DOCSDIR%%/images/bmp-logo-small.png
+%%DOCSDIR%%/images/bmp.png
+%%DOCSDIR%%/images/favicon.ico
+%%DOCSDIR%%/images/gradient.png
+%%DOCSDIR%%/images/important.png
+%%DOCSDIR%%/images/main-window.png
+%%DOCSDIR%%/images/playing-source.png
+%%DOCSDIR%%/images/rect1869.png
+%%DOCSDIR%%/images/tip.png
 share/icons/hicolor/48x48/apps/bmpx.png
 %%NLS%%share/locale/af/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/de/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/dk/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/el/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/et/LC_MESSAGES/bmpx.mo
@@ -293,10 +310,20 @@ share/icons/hicolor/48x48/apps/bmpx.png
 %%NLS%%share/locale/sv/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/th_TH/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/bmpx.mo
-%%NLS%%@dirrmtry share/locale/th_TH/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/th_TH
+@dirrmtry %%NLS%%share/locale/th_TH/LC_MESSAGES
+@dirrmtry %%NLS%%share/locale/th_TH
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm %%DOCSDIR%%/images
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
+@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1
 @dirrm %%DATADIR%%/images/svg
 @dirrm %%DATADIR%%/images/stock
+@dirrm %%DATADIR%%/images/sources
 @dirrm %%DATADIR%%/images/rating
 @dirrm %%DATADIR%%/images/preferences
 @dirrm %%DATADIR%%/images/podcast