Update to 0.40.13:

0.40.9:
The tray icon behavior was made GNOME HIG compliant. Crashes with the
GStreamer error handler and resizing columns in the playlist were fixed.
Equalizer use is now optional even when the GStreamer equalizer element is
installed. A few patches from pkgsrc are now included in upstream.

0.40.8:
Last.fm support was improved (more functionality). Shoutcast support
was improved. Support for NetworkManager, global hotkeys (X11-based,
custom, or GNOME-based), and support for generic video playback
(file playback, no DVD support, or similar) was added in addition
to video podcasts. Bugfixes all around have been made, and
responsiveness was improved by using asynchronous networking where
possible.

I didn't find NEWS for the other point releases since 0.40.1, sorry.

7 files changed, 41 insertions, 121 deletions

diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index f75eee99f07..5f419c74b6e 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/09/21 13:03:26 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/10/27 00:35:16 wiz Exp $
 #
 
-DISTNAME=	bmpx-0.40.1
-PKGREVISION=	3
+DISTNAME=	bmpx-0.40.13
 CATEGORIES=	audio
 MASTER_SITES=	http://files.beep-media-player.org/releases/0.40/
 EXTRACT_SUFX=	.tar.bz2
@@ -19,11 +18,16 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-CONFIGURE_ENV+=		BOOST_REGEX_LIBS=-lboost_regex-mt
+CONFIGURE_ARGS+=	--with-boost-regex=mt
+CONFIGURE_ARGS+=	--with-boost-filesystem=mt
+CONFIGURE_ARGS+=	--with-boost-iostreams=mt
 # the following is a fix for nonsense in the configure script
-CONFIGURE_ENV+=		SQL3PATH=${BUILDLINK_PREFIX.sqlite3}
 CPPFLAGS+=		-I${LOCALBASE}/include/cdparanoia
 
+CHECK_WRKREF_SKIP=	bin/beep-media-player-2
+CHECK_WRKREF_SKIP+=	bin/bmp2
+CHECK_WRKREF_SKIP+=	libexec/beep-media-player-2-bin
+
 .include "../../audio/cdparanoia/buildlink3.mk"
 .include "../../audio/libofa/buildlink3.mk"
 BUILDLINK_API_DEPENDS.taglib+=		taglib>=1.4
@@ -39,7 +43,7 @@ BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.14.0
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/libsoup-devel/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtkmm+=		gtkmm>=2.10.0
 .include "../../x11/gtkmm/buildlink3.mk"
diff --git a/audio/bmpx/PLIST b/audio/bmpx/PLIST
index 888086878ab..1c812ccc49f 100644
--- a/audio/bmpx/PLIST
+++ b/audio/bmpx/PLIST
@@ -1,12 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2007/08/13 12:06:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/10/27 00:35:16 wiz Exp $
 bin/beep-media-player-2
-bin/bmp-enqueue-files-2.0
-bin/bmp-enqueue-uris-2.0
 bin/bmp-play-files-2.0
-bin/bmp-play-lastfm-2.0
+bin/bmp-play-uris-2.0
 bin/bmp2
 include/bmp-2.0/bmp/bmp.hh
 include/bmp-2.0/bmp/dbus.hh
+include/bmp-2.0/bmp/types/types-basic.hh
+include/bmp-2.0/bmp/types/types-bookmarks.hh
+include/bmp-2.0/bmp/types/types-database.hh
+include/bmp-2.0/bmp/types/types-lastfm.hh
+include/bmp-2.0/bmp/types/types-library.hh
+include/bmp-2.0/bmp/types/types-network.hh
+include/bmp-2.0/bmp/types/types-ui.hh
+include/bmp-2.0/bmp/types/types-xspf.hh
 lib/bmpx/plugins/taglib/libtaglib_plugin_asf.la
 lib/bmpx/plugins/taglib/libtaglib_plugin_flac.la
 lib/bmpx/plugins/taglib/libtaglib_plugin_mp3.la
@@ -19,14 +25,12 @@ lib/bmpx/plugins/vfs/container/libcontainer_pls.la
 lib/bmpx/plugins/vfs/container/libcontainer_xspf.la
 lib/bmpx/plugins/vfs/transport/libtransport_file.la
 lib/bmpx/plugins/vfs/transport/libtransport_http.la
-lib/libbmp_id3v2_reader.la
 lib/pkgconfig/bmp-2.0.pc
 libexec/beep-media-player-2-bin
 libexec/beep-media-player-2-sentinel
 man/man1/beep-media-player-2.1
 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
 share/bmpx/glade/dialog-add-podcast.glade
 share/bmpx/glade/dialog-equalizer.glade
@@ -37,6 +41,7 @@ share/bmpx/glade/dialog-lastfm-recommend.glade
 share/bmpx/glade/dialog-lastfm-tag.glade
 share/bmpx/glade/dialog-play-uri.glade
 share/bmpx/glade/dialog-progress.glade
+share/bmpx/glade/dialog-remove-update-podcast.glade
 share/bmpx/glade/dialog-simple-entry.glade
 share/bmpx/glade/dialog-simple-progress.glade
 share/bmpx/glade/dialog-track-details.glade
@@ -116,34 +121,12 @@ share/bmpx/icons/themes/tango/icon_streams_64.png
 share/bmpx/icons/tray-icons/tray-icon-default.png
 share/bmpx/icons/tray-icons/tray-icon-paused.png
 share/bmpx/icons/tray-icons/tray-icon-playing.png
-share/bmpx/images/audio-default-no-background.png
 share/bmpx/images/audio-default.png
 share/bmpx/images/cdda/audiocd-big.png
 share/bmpx/images/cdda/audiocd-unplayable.png
-share/bmpx/images/collections/collection.png
 share/bmpx/images/cover-frame.png
-share/bmpx/images/hal/dev-cdrom.png
-share/bmpx/images/hal/dev-volume-1394.png
-share/bmpx/images/hal/dev-volume-ide.png
-share/bmpx/images/hal/dev-volume-usb.png
-share/bmpx/images/hal/device-camera.png
-share/bmpx/images/hal/device-cdrom.png
-share/bmpx/images/hal/device-cf-card.png
-share/bmpx/images/hal/device-floppy.png
-share/bmpx/images/hal/device-harddrive-1394.png
-share/bmpx/images/hal/device-harddrive-usb.png
-share/bmpx/images/hal/device-harddrive.png
-share/bmpx/images/hal/device-ipod.png
-share/bmpx/images/hal/device-ms.png
-share/bmpx/images/hal/device-removable-1394.png
-share/bmpx/images/hal/device-removable-usb.png
-share/bmpx/images/hal/device-removable.png
-share/bmpx/images/hal/device-sdmmc-card.png
-share/bmpx/images/hal/device-sm-card.png
+share/bmpx/images/lastfm/artist-unknown.png
 share/bmpx/images/lastfm/audioscrobbler.png
-share/bmpx/images/lastfm/header-logo-left.png
-share/bmpx/images/lastfm/header-logo-right.png
-share/bmpx/images/lastfm/header-logo-slice.png
 share/bmpx/images/lastfm/lastfm-album.png
 share/bmpx/images/lastfm/lastfm-artist.png
 share/bmpx/images/lastfm/lastfm-friend.png
@@ -157,22 +140,10 @@ share/bmpx/images/lastfm/lastfm-track.png
 share/bmpx/images/lastfm/lastfm-user.png
 share/bmpx/images/logo-about.png
 share/bmpx/images/logo-splash.png
-share/bmpx/images/main/header-logo-left.png
-share/bmpx/images/main/header-logo-right.png
-share/bmpx/images/main/header-logo-slice.png
-share/bmpx/images/main/warning.png
-share/bmpx/images/main/yingyang.gif
-share/bmpx/images/main/yingyang_paused.gif
-share/bmpx/images/main/yingyang_seeking.png
+share/bmpx/images/main/paused.gif
 share/bmpx/images/podcast/feed-default.png
 share/bmpx/images/podcast/feed-expired.png
-share/bmpx/images/preferences/lastfm.png
-share/bmpx/images/preferences/library.png
-share/bmpx/images/preferences/misc.png
-share/bmpx/images/preferences/museek.png
-share/bmpx/images/preferences/musicbrainz.png
-share/bmpx/images/preferences/playback.png
-share/bmpx/images/preferences/podcasts.png
+share/bmpx/images/podcast/updating.png
 share/bmpx/images/rating/stars_0.png
 share/bmpx/images/rating/stars_1.png
 share/bmpx/images/rating/stars_2.png
@@ -226,7 +197,6 @@ share/bmpx/images/stock/silk-feed_add.png
 share/bmpx/images/stock/silk-feed_delete.png
 share/bmpx/images/stock/silk-feed_disk.png
 share/bmpx/images/stock/silk-folder.png
-share/bmpx/images/stock/silk-html.png
 share/bmpx/images/stock/silk-new.png
 share/bmpx/images/stock/silk-picture.png
 share/bmpx/images/stock/silk-plugin.png
@@ -236,27 +206,20 @@ share/bmpx/images/stock/silk-world_link.png
 share/bmpx/images/stock/tag.png
 share/bmpx/images/stock/track.png
 share/bmpx/images/stock/undo.png
+share/bmpx/images/stock/web.png
 share/bmpx/images/stock/xiph.png
 share/bmpx/images/svg/button-background.svg
 share/bmpx/images/svg/button-outline.svg
+share/bmpx/images/throbber-small.gif
 share/bmpx/images/throbber.gif
+share/bmpx/images/video-default.png
 share/dbus-1/services/org.beepmediaplayer.sentinel.service
 share/dbus-1/services/org.mpris.bmp.service
-share/doc/bmpx/images/active-source.png
-share/doc/bmpx/images/bmp-logo-small.png
-share/doc/bmpx/images/bmp.png
-share/doc/bmpx/images/favicon.ico
-share/doc/bmpx/images/gradient.png
-share/doc/bmpx/images/important.png
-share/doc/bmpx/images/main-window.png
-share/doc/bmpx/images/playing-source.png
-share/doc/bmpx/images/rect1869.png
-share/doc/bmpx/images/tip.png
 share/icons/hicolor/48x48/apps/bmpx.png
 share/locale/af/LC_MESSAGES/bmpx.mo
 share/locale/cs/LC_MESSAGES/bmpx.mo
+share/locale/da/LC_MESSAGES/bmpx.mo
 share/locale/de/LC_MESSAGES/bmpx.mo
-share/locale/dk/LC_MESSAGES/bmpx.mo
 share/locale/el/LC_MESSAGES/bmpx.mo
 share/locale/es/LC_MESSAGES/bmpx.mo
 share/locale/et/LC_MESSAGES/bmpx.mo
@@ -277,21 +240,14 @@ share/locale/th_TH/LC_MESSAGES/bmpx.mo
 share/locale/zh_CN/LC_MESSAGES/bmpx.mo
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@dirrm share/doc/bmpx/images
-@dirrm share/doc/bmpx
 @comment in dbus: @dirrm share/dbus-1/services
 @dirrm share/bmpx/images/svg
 @dirrm share/bmpx/images/stock
 @dirrm share/bmpx/images/sources
 @dirrm share/bmpx/images/rating
-@dirrm share/bmpx/images/preferences
 @dirrm share/bmpx/images/podcast
 @dirrm share/bmpx/images/main
-@exec ${MKDIR} %D/share/bmpx/images/library
-@dirrm share/bmpx/images/library
 @dirrm share/bmpx/images/lastfm
-@dirrm share/bmpx/images/hal
-@dirrm share/bmpx/images/collections
 @dirrm share/bmpx/images/cdda
 @dirrm share/bmpx/images
 @dirrm share/bmpx/icons/tray-icons
@@ -313,5 +269,6 @@ share/locale/zh_CN/LC_MESSAGES/bmpx.mo
 @dirrm lib/bmpx/plugins/taglib
 @dirrm lib/bmpx/plugins
 @dirrm lib/bmpx
+@dirrm include/bmp-2.0/bmp/types
 @dirrm include/bmp-2.0/bmp
 @dirrm include/bmp-2.0
diff --git a/audio/bmpx/distinfo b/audio/bmpx/distinfo
index adb6509d1b0..647e594c4e7 100644
--- a/audio/bmpx/distinfo
+++ b/audio/bmpx/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.6 2007/08/31 17:08:54 drochner Exp $
+$NetBSD: distinfo,v 1.7 2007/10/27 00:35:16 wiz Exp $
 
-SHA1 (bmpx-0.40.1.tar.bz2) = c2d69fd8909d1d7a69ff13eee149084da9b802f0
-RMD160 (bmpx-0.40.1.tar.bz2) = 8d00392449ad4602e380c9f78cb12c4077db9eec
-Size (bmpx-0.40.1.tar.bz2) = 1793356 bytes
-SHA1 (patch-aa) = b4a761b618aa976945c6983e752389cc226b1cbb
-SHA1 (patch-ab) = 71e24c8d18b9223a9a9895a9af18e5818886a60c
+SHA1 (bmpx-0.40.13.tar.bz2) = 3327baa8f13f8411a15ebafd0112b9ba8623c0ef
+RMD160 (bmpx-0.40.13.tar.bz2) = 6eab5edf1ffce8c7226db59281c79c2165886d05
+Size (bmpx-0.40.13.tar.bz2) = 1820642 bytes
+SHA1 (patch-ab) = c4b8094e4c542eda3278af9229aa1be58dc36b18
 SHA1 (patch-ac) = 77d88acc2c74259f293dc54699a322962f50ce57
-SHA1 (patch-ad) = baaff3d28d81532d692a7594818d763552b81349
-SHA1 (patch-ae) = 249f85f328d82e69b440999063a4b42be5f0614d
diff --git a/audio/bmpx/patches/patch-aa b/audio/bmpx/patches/patch-aa
deleted file mode 100644
index b9bb4ad0388..00000000000
--- a/audio/bmpx/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2007/08/13 12:06:41 drochner Exp $
-
---- configure.orig	2007-08-13 12:13:03.000000000 +0200
-+++ configure
-@@ -31402,7 +31402,7 @@ fi
-     { echo "$as_me:$LINENO: checking for SQLite3 library >= $sqlite3_version_req" >&5
- echo $ECHO_N "checking for SQLite3 library >= $sqlite3_version_req... $ECHO_C" >&6; }
- 
--    for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
-+    for ac_sqlite3_path_tmp in ${SQL3PATH} /usr /usr/local /opt ; do
-         if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
-             && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
-             ac_sqlite3_path=$ac_sqlite3_path_tmp
diff --git a/audio/bmpx/patches/patch-ab b/audio/bmpx/patches/patch-ab
index e3ad7ed63dd..17c6805e1cf 100644
--- a/audio/bmpx/patches/patch-ab
+++ b/audio/bmpx/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.4 2007/08/31 17:08:54 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2007/10/27 00:35:17 wiz Exp $
 
---- jnetlib/connection.cpp.orig	2007-08-11 20:41:49.000000000 +0200
+--- jnetlib/connection.cpp.orig	2007-10-18 17:17:06.000000000 +0000
 +++ jnetlib/connection.cpp
-@@ -215,7 +215,16 @@ void JNL_Connection::run(int max_send_by
-         sigdelset (&sigs, SIGSEGV);
-         sigdelset (&sigs, SIGKILL);
-         sigdelset (&sigs, SIGSTOP);
+@@ -224,8 +224,17 @@ void JNL_Connection::run(int max_send_by
+    
+         if (select_retval == -1)
+ #else
 +#ifdef __DragonFly__
 +	sigset_t cur_set;
 +	sigprocmask(SIG_SETMASK, &sigs, &cur_set);
@@ -15,6 +15,7 @@ $NetBSD: patch-ab,v 1.4 2007/08/31 17:08:54 drochner Exp $
 +	if (select_retval == -1)
 +#else
          if (pselect(m_socket+1,&f[0],&f[1],&f[2],&ts,&sigs)==-1)
+ #endif
 +#endif
          {
            m_errorstr="connecting to host (calling select())";
diff --git a/audio/bmpx/patches/patch-ad b/audio/bmpx/patches/patch-ad
deleted file mode 100644
index 981ace45102..00000000000
--- a/audio/bmpx/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2007/08/30 15:30:31 joerg Exp $
-
---- src/network.cc.orig	2007-08-30 14:13:19.000000000 +0000
-+++ src/network.cc
-@@ -166,7 +166,7 @@ namespace Bmp
-             FD_SET (rc, &rfds);
- 
-             tv.tv_sec  = time_t (timeout);
--            tv.tv_usec = suseconds_t ((timeout - tv.tv_sec) * 1000000);
-+            tv.tv_usec = (long)((timeout - tv.tv_sec) * 1000000);
- 
-             if (write)
-               retval = select (rc+1, &rfds, NULL, NULL, &tv);
diff --git a/audio/bmpx/patches/patch-ae b/audio/bmpx/patches/patch-ae
deleted file mode 100644
index 3db5abed779..00000000000
--- a/audio/bmpx/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/08/30 15:30:32 joerg Exp $
-
---- jnetlib/asyncdns.h.orig	2007-08-30 14:37:50.000000000 +0000
-+++ jnetlib/asyncdns.h
-@@ -18,6 +18,8 @@
- #ifndef _ASYNCDNS_H_
- #define _ASYNCDNS_H_
- 
-+#include <pthread.h>
-+
- class JNL_AsyncDNS
- {
- public: