- Update to 0.14.4

- Update COMMENT
- Pet portlint

PR:		96765 (based on)
Submitted by:	Andrew Pantyukhin <infofarmer@gmail.com>

6 files changed, 93 insertions, 160 deletions

diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 7a836a6f1484..0ce7adde90e4 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	bmpx
-PORTVERSION=	0.13
+PORTVERSION=	0.14.4
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	beepmp
 
 MAINTAINER=	novel@FreeBSD.org
-COMMENT=	Audio player
+COMMENT=	Media player geared towards usability, technical efficiency and looks
 
 LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
-		xine.15:${PORTSDIR}/multimedia/libxine \
+		cairo.2:${PORTSDIR}/graphics/cairo \
+		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		neon.25:${PORTSDIR}/www/neon
 
-USE_AUTOTOOLS=	libtool:15
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_FAM=	yes
@@ -27,16 +27,17 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2 desktopfileutils
 LIBTOOLFILES=	configure libhrel/configure \
 		libchroma/configure libskinned/configure
+USE_GSTREAMER=	mad ogg
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-xine --disable-gst
+CONFIGURE_ARGS+=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
-MAN1=		bmpx.1
+MAN1=		beep-media-player-2.1
 
 .if !defined(WITHOUT_AMAZON)
 CONFIGURE_ARGS+=	--enable-amazon
@@ -44,13 +45,16 @@ CONFIGURE_ARGS+=	--enable-amazon
 
 .if defined(WITHOUT_DBUS)
 CONFIGURE_ARGS+=	--disable-dbus
+PLIST_SUB+=	DBUS="@comment "
 .else
 LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
+PLIST_SUB+=	DBUS=""
 .endif
 
-.if !defined(WITHOUT_GCONF)
+.if defined(WITHOUT_GCONF)
 USE_GNOME+=	gconf2
 CONFIGURE_ARGS+=	--enable-gconf
+GCONF_SCHEMAS=	bmp-2.0.schema
 .endif
 
 .if defined(WITHOUT_PERL)
@@ -59,16 +63,6 @@ CONFIGURE_ARGS+=	--disable-perl
 USE_PERL5_BUILD=	yes
 .endif
 
-.if defined(WITHOUT_PYTHON)
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=	PYTHON="@comment "
-.else
-USE_PYTHON=	yes
-USE_GNOME+=	pygtk2
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/dbus.pth:${PORTSDIR}/devel/py-dbus
-PLIST_SUB+=	PYTHON=""
-.endif
-
 .if defined(WITHOUT_STARTUP_NOTIFICATION)
 CONFIGURE_ARGS+=	--disable-sn
 .else
diff --git a/multimedia/bmpx/distinfo b/multimedia/bmpx/distinfo
index fc559f885461..b95485f3d8d6 100644
--- a/multimedia/bmpx/distinfo
+++ b/multimedia/bmpx/distinfo
@@ -1,3 +1,3 @@
-MD5 (bmpx-0.13.tar.bz2) = dd4ccd24a1a0ff6b7319a4c7f929f3c8
-SHA256 (bmpx-0.13.tar.bz2) = 3e11145b9b50cabf51446fe3542275012c2d5e7205b7e7ceb77ce085db6a2a04
-SIZE (bmpx-0.13.tar.bz2) = 2139201
+MD5 (bmpx-0.14.4.tar.bz2) = cd89d4afdf64bdf483c8ffcdacd7a009
+SHA256 (bmpx-0.14.4.tar.bz2) = 8fa68c0059c769b565c00fb7c7a637129f1d3dfbeaad35e0c418730728399551
+SIZE (bmpx-0.14.4.tar.bz2) = 1960833
diff --git a/multimedia/bmpx/files/patch-libhrel-Makefile.in b/multimedia/bmpx/files/patch-libhrel-Makefile.in
deleted file mode 100644
index 65a02316046f..000000000000
--- a/multimedia/bmpx/files/patch-libhrel-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- libhrel/Makefile.in.bak	Wed Nov 23 01:43:28 2005
-+++ libhrel/Makefile.in	Thu Nov 24 22:45:37 2005
-@@ -186,8 +186,8 @@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
--pkgconfigdir = @pkgconfigdir@
- prefix = @prefix@
-+pkgconfigdir = ${prefix}/libdata/pkgconfig
- program_transform_name = @program_transform_name@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
diff --git a/multimedia/bmpx/files/patch-plugins-flow-Makefile.in b/multimedia/bmpx/files/patch-plugins-flow-Makefile.in
deleted file mode 100644
index d2ba62251ab7..000000000000
--- a/multimedia/bmpx/files/patch-plugins-flow-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/flow/Makefile.in.orig	Fri Feb 10 05:45:38 2006
-+++ plugins/flow/Makefile.in	Sat Feb 11 19:40:00 2006
-@@ -310,13 +310,13 @@
- xchat_plugin_dir = @xchat_plugin_dir@
- AUTOMAKE_OPTIONS = foreign
- INCLUDES = \
-+	-I$(top_srcdir)         \
-+	-I$(top_srcdir)/include \
-+	-I$(top_builddir)/include \
- 	$(GTK_CFLAGS)           \
- 	$(GLIB_CFLAGS)          \
- 	$(HREL_CFLAGS)	        \
--	$(BMPX_DEFINES)		\
--	-I$(top_srcdir)         \
--	-I$(top_srcdir)/include \
--	-I$(top_builddir)/include
-+	$(BMPX_DEFINES)
- 
- libflow_shuffle_LTLIBRARIES = libflow_shuffle.la
- libflow_shuffledir = $(PLUGIN_DIR)/flow
diff --git a/multimedia/bmpx/files/patch-plugins-transport-Makefile.in b/multimedia/bmpx/files/patch-plugins-transport-Makefile.in
deleted file mode 100644
index c09db16b94cb..000000000000
--- a/multimedia/bmpx/files/patch-plugins-transport-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- plugins/transport/Makefile.in.orig	Sat Feb 11 19:39:08 2006
-+++ plugins/transport/Makefile.in	Sat Feb 11 19:39:40 2006
-@@ -331,14 +331,14 @@
- xchat_plugin_dir = @xchat_plugin_dir@
- AUTOMAKE_OPTIONS = foreign
- INCLUDES = \
-+	-I$(top_srcdir)         \
-+	-I$(top_srcdir)/include \
-+	-I$(top_builddir)/include \
- 	$(NEON_CFLAGS)		\
- 	$(GTK_CFLAGS)           \
- 	$(GLIB_CFLAGS)          \
- 	$(BMPX_DEFINES)		\
--	$(HREL_CFLAGS)		\
--	-I$(top_srcdir)         \
--	-I$(top_srcdir)/include \
--	-I$(top_builddir)/include
-+	$(HREL_CFLAGS)		
- 
- libtransport_http_LTLIBRARIES = libtransport_http.la
- libtransport_httpdir = $(PLUGIN_DIR)/transport
diff --git a/multimedia/bmpx/pkg-plist b/multimedia/bmpx/pkg-plist
index d74ebc716935..8a481164827c 100644
--- a/multimedia/bmpx/pkg-plist
+++ b/multimedia/bmpx/pkg-plist
@@ -1,18 +1,11 @@
-bin/bmpx-enqueue-uris
-bin/bmpx-enqueue-files
-bin/bmpx-play-files
-bin/bmpx-web
-bin/bmpx-web-ajax
-bin/bmpx-dbus-introspect
-bin/bmpx-dbus-system-control
-bin/bmpx-dbus-query-list
-bin/bmpx-medialib-browser
-bin/bmpx
-%%PYTHON%%bin/bmpx-client-pygtk
-%%PYTHON%%bin/bmpty
-include/bmpx/dbus.h
-include/libchroma/chroma-list-selection.h
+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
@@ -33,58 +26,53 @@ include/libhrel/libhrel/relation_union.h
 include/libhrel/libhrel/stack.h
 include/libhrel/libhrel/tuple.h
 include/libhrel/libhrel/types.h
-libexec/bmpx-bin
-lib/bmpx/plugins/container/libcontainer_folder.a
-lib/bmpx/plugins/container/libcontainer_folder.so
-lib/bmpx/plugins/container/libcontainer_folder.so.0
-lib/bmpx/plugins/container/libcontainer_m3u.a
-lib/bmpx/plugins/container/libcontainer_m3u.so
-lib/bmpx/plugins/container/libcontainer_m3u.so.0
-lib/bmpx/plugins/container/libcontainer_pls.a
-lib/bmpx/plugins/container/libcontainer_pls.so
-lib/bmpx/plugins/container/libcontainer_pls.so.0
-lib/bmpx/plugins/container/libcontainer_query.a
-lib/bmpx/plugins/container/libcontainer_query.so
-lib/bmpx/plugins/container/libcontainer_query.so.0
-lib/bmpx/plugins/container/libcontainer_xspf.a
-lib/bmpx/plugins/container/libcontainer_xspf.so
-lib/bmpx/plugins/container/libcontainer_xspf.so.0
-lib/bmpx/plugins/flow/libflow_linear.a
-lib/bmpx/plugins/flow/libflow_linear.so
-lib/bmpx/plugins/flow/libflow_linear.so.0
-lib/bmpx/plugins/flow/libflow_shuffle.a
-lib/bmpx/plugins/flow/libflow_shuffle.so
-lib/bmpx/plugins/flow/libflow_shuffle.so.0
-lib/bmpx/plugins/transport/libtransport_cdda.a
-lib/bmpx/plugins/transport/libtransport_cdda.so
-lib/bmpx/plugins/transport/libtransport_cdda.so.0
-lib/bmpx/plugins/transport/libtransport_file.a
-lib/bmpx/plugins/transport/libtransport_file.so
-lib/bmpx/plugins/transport/libtransport_file.so.0
-lib/bmpx/plugins/transport/libtransport_http.a
-lib/bmpx/plugins/transport/libtransport_http.so
-lib/bmpx/plugins/transport/libtransport_http.so.0
-lib/bmpx/plugins/transport/libtransport_query.a
-lib/bmpx/plugins/transport/libtransport_query.so
-lib/bmpx/plugins/transport/libtransport_query.so.0
-lib/libchroma.a
+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.a
+lib/libhrel.la
 lib/libhrel.so
 lib/libhrel.so.1
-@comment %%PYTHON_XCHAT%%lib/xchat/plugins/bmpx-xchat.py
+libdata/pkgconfig/bmp-2.0.pc
 libdata/pkgconfig/hrel.pc
+libdata/pkgconfig/libchroma.pc
 share/libhrel/examples/hrel-demo
-share/applications/bmpx.desktop
-share/applications/bmpx_enqueue.desktop
-share/applications/bmpx_play.desktop
-%%PYTHON%%share/bmpx-clients/pygtk/bmpx-client-image.png
-%%PYTHON%%share/bmpx-clients/pygtk/bmpx_client.glade
-%%PYTHON%%share/bmpx-clients/pygtk/bmpx-medialib-browser.in
-%%PYTHON%%share/bmpx-clients/pygtk/bmpx_medialib_browser.glade
-%%DATADIR%%/bmpx-web/functions.js
-%%DATADIR%%/bmpx-web/header.png
+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_files.glade
 %%DATADIR%%/glade/dialog_bookmarks.glade
@@ -143,18 +131,22 @@ share/applications/bmpx_play.desktop
 %%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/preferences/appearance.png
-%%DATADIR%%/images/preferences/eq.png
-%%DATADIR%%/images/preferences/playback.png
-%%DATADIR%%/images/preferences/playlist.png
-%%DATADIR%%/images/preferences/plugins.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/playback.png
+%%DATADIR%%/images/preferences/playlist.png
+%%DATADIR%%/images/preferences/plugins.png
 %%DATADIR%%/images/shoutcast.png
 %%DATADIR%%/images/splash.png
 %%DATADIR%%/images/wait.gif
@@ -180,52 +172,52 @@ share/applications/bmpx_play.desktop
 %%DATADIR%%/ui/plmanager.ui
 %%DATADIR%%/ui/tracklist.ui
 %%DATADIR%%/ui/trayicon.ui
-share/icons/hicolor/48x48/apps/bmpx.png
 share/locale/af/LC_MESSAGES/bmpx.mo
 share/locale/bg/LC_MESSAGES/bmpx.mo
 share/locale/cs/LC_MESSAGES/bmpx.mo
 share/locale/de/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
 share/locale/fi/LC_MESSAGES/bmpx.mo
 share/locale/fr/LC_MESSAGES/bmpx.mo
 share/locale/hu/LC_MESSAGES/bmpx.mo
 share/locale/ja/LC_MESSAGES/bmpx.mo
 share/locale/lt/LC_MESSAGES/bmpx.mo
+share/locale/nl/LC_MESSAGES/bmpx.mo
 share/locale/pl/LC_MESSAGES/bmpx.mo
 share/locale/pt_BR/LC_MESSAGES/bmpx.mo
 share/locale/ru/LC_MESSAGES/bmpx.mo
 share/locale/sv/LC_MESSAGES/bmpx.mo
 share/locale/zh_CN/LC_MESSAGES/bmpx.mo
-@dirrm %%DATADIR%%/bmpx-web
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/skins/default
-@dirrm %%DATADIR%%/skins
-@dirrm %%DATADIR%%/images/preferences
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/icons/tray-icons
-@dirrm %%DATADIR%%/icons/themes/red
-@dirrm %%DATADIR%%/icons/themes/plastic
-@dirrm %%DATADIR%%/icons/themes/display
+%%DBUS%%%%LOCALBASE%%/share/dbus-1/services/org.beepmediaplayer.bmp.service
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/icons/themes/darksphere
+@dirrm %%DATADIR%%/icons/themes/display
+@dirrm %%DATADIR%%/icons/themes/plastic
+@dirrm %%DATADIR%%/icons/themes/red
 @dirrm %%DATADIR%%/icons/themes
+@dirrm %%DATADIR%%/icons/tray-icons
 @dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/images/preferences
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/skins/default
+@dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
-@dirrm lib/bmpx/plugins/transport
-@dirrm lib/bmpx/plugins/flow
-@dirrm lib/bmpx/plugins/container
-@dirrm lib/bmpx/plugins
-@dirrm lib/bmpx
+@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/bmpx
+@dirrm include/bmp-2.0/bmp
+@dirrm include/bmp-2.0
 @dirrm share/libhrel/examples
 @dirrm share/libhrel
-%%PYTHON%%@dirrm share/bmpx-clients/pygtk
-%%PYTHON%%@dirrm share/bmpx-clients
 @dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true