5 files changed, 19 insertions, 38 deletions

diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 40c77f712051..2739bb6f3f0e 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bmpx
-PORTVERSION=	0.40.7
-PORTREVISION=	3
+PORTVERSION=	0.40.14
 CATEGORIES=	multimedia
 MASTER_SITES=	http://files.backtrace.info/releases/0.40/
 
@@ -17,7 +16,7 @@ COMMENT=	Media player geared towards usability, technical efficiency and looks
 LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
 		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-		cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
+		cdio.8:${PORTSDIR}/sysutils/libcdio \
 		glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		rsvg-2:${PORTSDIR}/graphics/librsvg2 \
@@ -29,7 +28,6 @@ LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
 
 CONFLICTS=	bmpx-devel-[0-9]*
 
-USE_AUTOTOOLS=	automake:19 autoconf:261
 USE_BISON=	build
 USE_XORG=	ice sm
 USE_BZIP2=	yes
@@ -44,16 +42,15 @@ CONFIGURE_ARGS+=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
 			--with-dbus-services-dir="${PREFIX}/share/dbus-1/services" \
 			--with-libintl-prefix="${LOCALBASE}" \
 			--disable-doc
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		beep-media-player-2.1
 
-.if !defined(WITH_HAL)
-CONFIGURE_ARGS+=	--disable-hal
-.else
+.if !defined(WITHOUT_HAL)
 LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+.else
+CONFIGURE_ARGS+=	--disable-hal
 .endif
 
 .if defined(WITHOUT_STARTUP_NOTIFICATION)
diff --git a/multimedia/bmpx/distinfo b/multimedia/bmpx/distinfo
index 0808df651e0a..dfc99b024f6a 100644
--- a/multimedia/bmpx/distinfo
+++ b/multimedia/bmpx/distinfo
@@ -1,3 +1,3 @@
-MD5 (bmpx-0.40.7.tar.bz2) = becfb6fc22133cd2434c7e0250012543
-SHA256 (bmpx-0.40.7.tar.bz2) = 783e51d29478fc46121c0175278158ed8da86c13b4b9c4c1e51e37b4fb82ab9d
-SIZE (bmpx-0.40.7.tar.bz2) = 1792042
+MD5 (bmpx-0.40.14.tar.bz2) = c741e05a82a82b14b6775d44a7c93c15
+SHA256 (bmpx-0.40.14.tar.bz2) = 6c991bab6c71228ed44a815dd3bb00cdc70ef89d81590bad8721377a4e8806d9
+SIZE (bmpx-0.40.14.tar.bz2) = 1776299
diff --git a/multimedia/bmpx/files/patch-libhal++__device.hh b/multimedia/bmpx/files/patch-libhal++__device.hh
deleted file mode 100644
index c7ed49816f0f..000000000000
--- a/multimedia/bmpx/files/patch-libhal++__device.hh
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libhal++/device.hh.orig	2007-08-08 21:48:40.000000000 +0200
-+++ ./libhal++/device.hh	2007-08-08 21:48:51.000000000 +0200
-@@ -60,11 +60,7 @@
- 
-               inline bool operator==(iterator const& other)
-               {
--#ifdef HAVE_HAL_058
-                 return ((i.idx == other.i.idx) && (i.set == other.i.set));
--#else
--                return ((i.index == other.i.index) && (i.set == other.i.set));
--#endif // HAVE_HAL_058
-               }
- 
-               inline bool operator!=(iterator const& other)
diff --git a/multimedia/bmpx/files/patch-src-sanity.cc b/multimedia/bmpx/files/patch-src-sanity.cc
deleted file mode 100644
index 999a04ab2740..000000000000
--- a/multimedia/bmpx/files/patch-src-sanity.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sanity.cc.orig	2007-12-21 22:12:05.000000000 +0300
-+++ src/sanity.cc	2007-12-21 22:14:07.000000000 +0300
-@@ -72,7 +72,7 @@
- gchar *
- sanity_check_gtk (void)
- {
--  return gtk_check_version (GTK_REQUIRED_MAJOR_VER,
-+  return (gchar *)gtk_check_version (GTK_REQUIRED_MAJOR_VER,
-                             GTK_REQUIRED_MINOR_VER,
-                             GTK_REQUIRED_MICRO_VER);
- }
diff --git a/multimedia/bmpx/pkg-plist b/multimedia/bmpx/pkg-plist
index 591d106848a5..b8e231d1b99e 100644
--- a/multimedia/bmpx/pkg-plist
+++ b/multimedia/bmpx/pkg-plist
@@ -4,6 +4,14 @@ 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_flac.la
 lib/bmpx/plugins/taglib/libtaglib_plugin_flac.so
 lib/bmpx/plugins/taglib/libtaglib_plugin_flac.so.0
@@ -50,6 +58,7 @@ share/applications/bmp-2.0-offline.desktop
 share/applications/bmp-2.0.desktop
 share/applications/bmp-play-2.0.desktop
 %%DATADIR%%/glade/dialog-add-podcast.glade
+%%DATADIR%%/glade/dialog-bounce-adjust.glade
 %%DATADIR%%/glade/dialog-equalizer.glade
 %%DATADIR%%/glade/dialog-export.glade
 %%DATADIR%%/glade/dialog-filebrowser.glade
@@ -138,13 +147,12 @@ share/applications/bmp-play-2.0.desktop
 %%DATADIR%%/icons/tray-icons/tray-icon-default.png
 %%DATADIR%%/icons/tray-icons/tray-icon-paused.png
 %%DATADIR%%/icons/tray-icons/tray-icon-playing.png
-%%DATADIR%%/images/cover-frame.png
 %%DATADIR%%/images/logo-splash.png
 %%DATADIR%%/images/logo-about.png
 %%DATADIR%%/images/audio-default.png
+%%DATADIR%%/images/video-default.png
 %%DATADIR%%/images/throbber.gif
 %%DATADIR%%/images/throbber-small.gif
-%%DATADIR%%/images/throbber-square.gif
 %%DATADIR%%/images/svg/button-background.svg
 %%DATADIR%%/images/svg/button-outline.svg
 %%DATADIR%%/images/stock/approve-partial.png
@@ -291,5 +299,6 @@ share/icons/hicolor/48x48/apps/bmpx.png
 @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