3 files changed, 135 insertions, 143 deletions

diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 4ee2c591306f..2c588f49d73b 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -6,11 +6,9 @@
 #
 
 PORTNAME=	bmpx
-PORTVERSION=	0.14.4
-PORTREVISION=	1
+PORTVERSION=	0.20.2
 CATEGORIES=	multimedia
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	beepmp
+MASTER_SITES=	http://files.beep-media-player.org/releases/${PORTVERSION:C/\.[0-9]*$//}/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Media player geared towards usability, technical efficiency and looks
@@ -18,7 +16,12 @@ COMMENT=	Media player geared towards usability, technical efficiency and looks
 LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
 		cairo.2:${PORTSDIR}/graphics/cairo \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-		neon.25:${PORTSDIR}/www/neon
+		neon.25:${PORTSDIR}/www/neon \
+		glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
+		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		notify.2:${PORTSDIR}/devel/libnotify \
+		boost_date_time.3:${PORTSDIR}/devel/boost \
+		dbus-1.2:${PORTSDIR}/devel/dbus
 
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -28,42 +31,18 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2 desktopfileutils
 LIBTOOLFILES=	configure libhrel/configure \
 		libchroma/configure libskinned/configure
-USE_GSTREAMER=	bad good ugly mad ogg
+USE_GSTREAMER=	good mad ogg
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
+CONFIGURE_ARGS+=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
+			--with-dbus-services-dir="${PREFIX}/share/dbus-1/services"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} -D__BSD_VISIBLE"
 
 MAN1=		beep-media-player-2.1
 
-.if !defined(WITHOUT_AMAZON)
-CONFIGURE_ARGS+=	--enable-amazon
-.endif
-
-.if defined(WITHOUT_DBUS)
-CONFIGURE_ARGS+=	--disable-dbus
-PLIST_SUB+=	DBUS="@comment "
-.else
-CONFIGURE_ARGS+=	--with-dbus-services-dir="${PREFIX}/share/dbus-1/services"
-LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
-PLIST_SUB+=	DBUS=""
-.endif
-
-.if defined(WITH_GCONF)
-USE_GNOME+=	gconf2
-CONFIGURE_ARGS+=	--enable-gconf
-GCONF_SCHEMAS=	bmp-2.0.schema
-.endif
-
-.if defined(WITHOUT_PERL)
-CONFIGURE_ARGS+=	--disable-perl
-.else
-USE_PERL5_BUILD=	yes
-.endif
-
 .if defined(WITHOUT_STARTUP_NOTIFICATION)
 CONFIGURE_ARGS+=	--disable-sn
 .else
@@ -80,6 +59,10 @@ PLIST_SUB+=		NLS=""
 
 .include <bsd.port.pre.mk>
 
+post-extract:
+	@${REINPLACE_CMD} -e 's|am__append_1 = -D_XOPEN_SOURCE=600||' \
+		${WRKSRC}/src/Makefile.in
+
 .if ${OSVERSION} < 500000
 post-patch:
 	@${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' \
diff --git a/multimedia/bmpx/distinfo b/multimedia/bmpx/distinfo
index b95485f3d8d6..abddc48c76bc 100644
--- a/multimedia/bmpx/distinfo
+++ b/multimedia/bmpx/distinfo
@@ -1,3 +1,3 @@
-MD5 (bmpx-0.14.4.tar.bz2) = cd89d4afdf64bdf483c8ffcdacd7a009
-SHA256 (bmpx-0.14.4.tar.bz2) = 8fa68c0059c769b565c00fb7c7a637129f1d3dfbeaad35e0c418730728399551
-SIZE (bmpx-0.14.4.tar.bz2) = 1960833
+MD5 (bmpx-0.20.2.tar.bz2) = cff15f37296d8d8f4a2c6517662885fa
+SHA256 (bmpx-0.20.2.tar.bz2) = ff643d805c5bc641a24d2052681756907607feab3a59107bc7412852d4b112b0
+SIZE (bmpx-0.20.2.tar.bz2) = 1956156
diff --git a/multimedia/bmpx/pkg-plist b/multimedia/bmpx/pkg-plist
index 7dc05f0ff819..07fc0c1562c2 100644
--- a/multimedia/bmpx/pkg-plist
+++ b/multimedia/bmpx/pkg-plist
@@ -1,88 +1,53 @@
+@comment $FreeBSD$
+bin/bmp2
 bin/bmp-enqueue-files-2.0
 bin/bmp-enqueue-uris-2.0
 bin/bmp-play-files-2.0
 bin/beep-media-player-2
 include/bmp-2.0/bmp/dbus.h
-include/bmp-2.0/bmp/metadata.h
-include/libchroma/chroma-list-column.h
-include/libchroma/chroma-list-selection.h
-include/libchroma/chroma-list.h
-include/libchroma/chroma-vscrollbar.h
-include/libchroma/dnd.h
-include/libhrel/libhrel/attr_map.h
-include/libhrel/libhrel/avl_tree_index.h
-include/libhrel/libhrel/btree.h
-include/libhrel/libhrel/hash_index.h
-include/libhrel/libhrel/hash_table.h
-include/libhrel/libhrel/misc.h
-include/libhrel/libhrel/relation.h
-include/libhrel/libhrel/relation_base.h
-include/libhrel/libhrel/relation_diff.h
-include/libhrel/libhrel/relation_intersect.h
-include/libhrel/libhrel/relation_project.h
-include/libhrel/libhrel/relation_restrict.h
-include/libhrel/libhrel/relation_sort.h
-include/libhrel/libhrel/relation_union.h
-include/libhrel/libhrel/stack.h
-include/libhrel/libhrel/tuple.h
-include/libhrel/libhrel/types.h
-libexec/beep-media-player-2-bin
-lib/bmp-2.0/plugins/container/libcontainer_folder.la
-lib/bmp-2.0/plugins/container/libcontainer_folder.so
-lib/bmp-2.0/plugins/container/libcontainer_folder.so.0
-lib/bmp-2.0/plugins/container/libcontainer_m3u.la
-lib/bmp-2.0/plugins/container/libcontainer_m3u.so
-lib/bmp-2.0/plugins/container/libcontainer_m3u.so.0
-lib/bmp-2.0/plugins/container/libcontainer_pls.la
-lib/bmp-2.0/plugins/container/libcontainer_pls.so
-lib/bmp-2.0/plugins/container/libcontainer_pls.so.0
-lib/bmp-2.0/plugins/container/libcontainer_query.la
-lib/bmp-2.0/plugins/container/libcontainer_query.so
-lib/bmp-2.0/plugins/container/libcontainer_query.so.0
-lib/bmp-2.0/plugins/container/libcontainer_xspf.la
-lib/bmp-2.0/plugins/container/libcontainer_xspf.so
-lib/bmp-2.0/plugins/container/libcontainer_xspf.so.0
-lib/bmp-2.0/plugins/flow/libflow_linear.la
-lib/bmp-2.0/plugins/flow/libflow_linear.so
-lib/bmp-2.0/plugins/flow/libflow_linear.so.0
-lib/bmp-2.0/plugins/flow/libflow_shuffle.la
-lib/bmp-2.0/plugins/flow/libflow_shuffle.so
-lib/bmp-2.0/plugins/flow/libflow_shuffle.so.0
-lib/bmp-2.0/plugins/transport/libtransport_cdda.la
-lib/bmp-2.0/plugins/transport/libtransport_cdda.so
-lib/bmp-2.0/plugins/transport/libtransport_cdda.so.0
-lib/bmp-2.0/plugins/transport/libtransport_file.la
-lib/bmp-2.0/plugins/transport/libtransport_file.so
-lib/bmp-2.0/plugins/transport/libtransport_file.so.0
-lib/bmp-2.0/plugins/transport/libtransport_http.la
-lib/bmp-2.0/plugins/transport/libtransport_http.so
-lib/bmp-2.0/plugins/transport/libtransport_http.so.0
-lib/bmp-2.0/plugins/transport/libtransport_query.la
-lib/bmp-2.0/plugins/transport/libtransport_query.so
-lib/bmp-2.0/plugins/transport/libtransport_query.so.0
-lib/libchroma.la
-lib/libchroma.so
-lib/libchroma.so.0
-lib/libhrel.la
-lib/libhrel.so
-lib/libhrel.so.1
 libdata/pkgconfig/bmp-2.0.pc
-libdata/pkgconfig/hrel.pc
-libdata/pkgconfig/libchroma.pc
-share/libhrel/examples/hrel-demo
-share/applications/bmp-2.0.desktop
-share/applications/bmp-enqueue-2.0.desktop
-share/applications/bmp-play-2.0.desktop
-share/icons/hicolor/48x48/apps/bmpx.png
+libexec/beep-media-player-2-bin
+lib/bmpx/plugins/flow/libflow_linear.so.0
+lib/bmpx/plugins/flow/libflow_linear.so
+lib/bmpx/plugins/flow/libflow_linear.la
+lib/bmpx/plugins/flow/libflow_shuffle.so.0
+lib/bmpx/plugins/flow/libflow_shuffle.so
+lib/bmpx/plugins/flow/libflow_shuffle.la
+lib/bmpx/plugins/vfs/container/libcontainer_folder.so.0
+lib/bmpx/plugins/vfs/container/libcontainer_folder.so
+lib/bmpx/plugins/vfs/container/libcontainer_folder.la
+lib/bmpx/plugins/vfs/container/libcontainer_m3u.so.0
+lib/bmpx/plugins/vfs/container/libcontainer_m3u.so
+lib/bmpx/plugins/vfs/container/libcontainer_m3u.la
+lib/bmpx/plugins/vfs/container/libcontainer_mlq.so.0
+lib/bmpx/plugins/vfs/container/libcontainer_mlq.so
+lib/bmpx/plugins/vfs/container/libcontainer_mlq.la
+lib/bmpx/plugins/vfs/container/libcontainer_pls.so.0
+lib/bmpx/plugins/vfs/container/libcontainer_pls.so
+lib/bmpx/plugins/vfs/container/libcontainer_pls.la
+lib/bmpx/plugins/vfs/container/libcontainer_query.so.0
+lib/bmpx/plugins/vfs/container/libcontainer_query.so
+lib/bmpx/plugins/vfs/container/libcontainer_query.la
+lib/bmpx/plugins/vfs/container/libcontainer_xspf.so.0
+lib/bmpx/plugins/vfs/container/libcontainer_xspf.so
+lib/bmpx/plugins/vfs/container/libcontainer_xspf.la
+lib/bmpx/plugins/vfs/transport/libtransport_file.so.0
+lib/bmpx/plugins/vfs/transport/libtransport_file.so
+lib/bmpx/plugins/vfs/transport/libtransport_file.la
+lib/bmpx/plugins/vfs/transport/libtransport_http.so.0
+lib/bmpx/plugins/vfs/transport/libtransport_http.so
+lib/bmpx/plugins/vfs/transport/libtransport_http.la
 %%DATADIR%%/data/GPL.txt
-%%DATADIR%%/glade/dialog_add_files.glade
-%%DATADIR%%/glade/dialog_bookmarks.glade
-%%DATADIR%%/glade/dialog_export_tracklist.glade
-%%DATADIR%%/glade/dialog_file_info.glade
-%%DATADIR%%/glade/dialog_jump_to_track.glade
-%%DATADIR%%/glade/dialog_library.glade
-%%DATADIR%%/glade/dialog_preferences.glade
-%%DATADIR%%/glade/dialog_streams.glade
+%%DATADIR%%/glade/streams.glade
+%%DATADIR%%/glade/export.glade
+%%DATADIR%%/glade/filebrowser.glade
+%%DATADIR%%/glade/preferences.glade
+%%DATADIR%%/glade/trackinfo.glade
+%%DATADIR%%/glade/library_ui.glade
+%%DATADIR%%/glade/library_ui_modify_albums.glade
+%%DATADIR%%/glade/library_ui_modify_tracks.glade
+%%DATADIR%%/glade/library_ui_move_album.glade
+%%DATADIR%%/glade/dialog-filelist.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
@@ -128,31 +93,66 @@ share/icons/hicolor/48x48/apps/bmpx.png
 %%DATADIR%%/icons/themes/red/icon_playlist_32.png
 %%DATADIR%%/icons/themes/red/icon_playlist_48.png
 %%DATADIR%%/icons/themes/red/icon_playlist_64.png
+%%DATADIR%%/icons/themes/red/icon_streams_128.png
+%%DATADIR%%/icons/themes/red/icon_streams_16.png
+%%DATADIR%%/icons/themes/red/icon_streams_32.png
+%%DATADIR%%/icons/themes/red/icon_streams_48.png
+%%DATADIR%%/icons/themes/red/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/about-logo.png
-%%DATADIR%%/images/audio.png
-%%DATADIR%%/images/audioscrobbler.png
-%%DATADIR%%/images/header-bookmarks.png
-%%DATADIR%%/images/header-library.png
-%%DATADIR%%/images/header-streams.png
-%%DATADIR%%/images/icon-bookmark.png
-%%DATADIR%%/images/icon-playlist.png
-%%DATADIR%%/images/lastfm-logo.png
 %%DATADIR%%/images/preferences/appearance.png
 %%DATADIR%%/images/preferences/eq.png
 %%DATADIR%%/images/preferences/lastfm.png
 %%DATADIR%%/images/preferences/library.png
+%%DATADIR%%/images/preferences/misc.png
 %%DATADIR%%/images/preferences/playback.png
 %%DATADIR%%/images/preferences/playlist.png
 %%DATADIR%%/images/preferences/plugins.png
-%%DATADIR%%/images/shoutcast.png
+%%DATADIR%%/images/audioscrobbler.png
 %%DATADIR%%/images/splash.png
+%%DATADIR%%/images/about-logo.png
+%%DATADIR%%/images/lastfm-logo.png
+%%DATADIR%%/images/lastfm-net-idle.png
+%%DATADIR%%/images/lastfm-net-tx.png
+%%DATADIR%%/images/lastfm-net-rx.png
+%%DATADIR%%/images/header-streams-left.png
+%%DATADIR%%/images/header-streams-right.png
+%%DATADIR%%/images/header-streams-slice.png
+%%DATADIR%%/images/audio.png
 %%DATADIR%%/images/wait.gif
-%%DATADIR%%/images/xiph.png
-%%DATADIR%%/skins/default/README
+%%DATADIR%%/images/library/header-logo-left.png
+%%DATADIR%%/images/library/header-logo-right.png
+%%DATADIR%%/images/library/header-logo-slice.png
+%%DATADIR%%/images/library/add.png
+%%DATADIR%%/images/library/remove.png
+%%DATADIR%%/images/stock/library.png
+%%DATADIR%%/images/stock/streams.png
+%%DATADIR%%/images/stock/bmp.png
+%%DATADIR%%/images/stock/bookmarks.png
+%%DATADIR%%/images/stock/xiph.png
+%%DATADIR%%/images/stock/shoutcast.png
+%%DATADIR%%/images/stock/musicbrainz.png
+%%DATADIR%%/images/stock/amazon.png
+%%DATADIR%%/images/stock/search.png
+%%DATADIR%%/images/stock/tachikoma.png
+%%DATADIR%%/images/stock/audio.png
+%%DATADIR%%/images/stock/tag.png
+%%DATADIR%%/images/stock/playlist.png
+%%DATADIR%%/images/stock/silk-cd_edit.png
+%%DATADIR%%/images/stock/silk-cd_go.png
+%%DATADIR%%/images/stock/silk-cd_add.png
+%%DATADIR%%/images/stock/silk-cd_delete.png
+%%DATADIR%%/images/stock/silk-add.png
+%%DATADIR%%/images/stock/silk-delete.png
+%%DATADIR%%/images/stock/silk-application_edit.png
+%%DATADIR%%/images/stock/silk-plugin.png
+%%DATADIR%%/images/stock/silk-control_play_blue.png
+%%DATADIR%%/images/stock/silk-control_pause_blue.png
+%%DATADIR%%/images/stock/silk-control_stop_blue.png
+%%DATADIR%%/images/stock/silk-plugin_disabled.png
+%%DATADIR%%/images/laughing-man.png
 %%DATADIR%%/skins/default/balance.bmp
 %%DATADIR%%/skins/default/cbuttons.bmp
 %%DATADIR%%/skins/default/eq_ex.bmp
@@ -162,17 +162,18 @@ share/icons/hicolor/48x48/apps/bmpx.png
 %%DATADIR%%/skins/default/nums_ex.bmp
 %%DATADIR%%/skins/default/playpaus.bmp
 %%DATADIR%%/skins/default/pledit.bmp
-%%DATADIR%%/skins/default/pledit.txt
 %%DATADIR%%/skins/default/posbar.bmp
 %%DATADIR%%/skins/default/shufrep.bmp
 %%DATADIR%%/skins/default/text.bmp
 %%DATADIR%%/skins/default/titlebar.bmp
-%%DATADIR%%/skins/default/viscolor.txt
 %%DATADIR%%/skins/default/volume.bmp
-%%DATADIR%%/ui/main.ui
-%%DATADIR%%/ui/plmanager.ui
+%%DATADIR%%/skins/default/pledit.txt
+%%DATADIR%%/skins/default/viscolor.txt
+%%DATADIR%%/skins/default/README
 %%DATADIR%%/ui/tracklist.ui
+%%DATADIR%%/ui/main.ui
 %%DATADIR%%/ui/trayicon.ui
+%%DATADIR%%/ui/plmanager.ui
 %%NLS%%share/locale/af/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/bmpx.mo
@@ -183,6 +184,7 @@ share/icons/hicolor/48x48/apps/bmpx.png
 %%NLS%%share/locale/fi/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/it/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/bmpx.mo
@@ -190,8 +192,23 @@ share/icons/hicolor/48x48/apps/bmpx.png
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bmpx.mo
 %%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
-%%DBUS%%share/dbus-1/services/org.beepmediaplayer.bmp.service
+share/dbus-1/services/org.beepmediaplayer.bmp.service
+share/mime/packages/bmp-2.0.xml
+share/icons/hicolor/48x48/apps/bmpx.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-media-library-query.png
+share/applications/bmp-2.0.desktop
+share/applications/bmp-enqueue-2.0.desktop
+share/applications/bmp-play-2.0.desktop
+@dirrm lib/bmpx/plugins/vfs/transport
+@dirrm lib/bmpx/plugins/vfs/container
+@dirrm lib/bmpx/plugins/vfs
+@dirrm lib/bmpx/plugins/flow
+@dirrm lib/bmpx/plugins
+@dirrm lib/bmpx
+@dirrm include/bmp-2.0/bmp
+@dirrm include/bmp-2.0
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/icons/themes/darksphere
@@ -202,23 +219,15 @@ share/icons/hicolor/48x48/apps/bmpx.png
 @dirrm %%DATADIR%%/icons/tray-icons
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/images/preferences
+@dirrm %%DATADIR%%/images/stock
+@dirrm %%DATADIR%%/images/library
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/skins/default
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
-@dirrm lib/bmp-2.0/plugins/container
-@dirrm lib/bmp-2.0/plugins/flow
-@dirrm lib/bmp-2.0/plugins/transport
-@dirrm lib/bmp-2.0/plugins
-@dirrm lib/bmp-2.0
-@dirrm include/libchroma
-@dirrm include/libhrel/libhrel
-@dirrm include/libhrel
-@dirrm include/bmp-2.0/bmp
-@dirrm include/bmp-2.0
-@dirrm share/libhrel/examples
-@dirrm share/libhrel
 @dirrmtry share/applications
+%%NLS%%@dirrmtry share/locale/th_TH/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/th_TH
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true