Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/bmpx/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile	1 Dec 2006 14:30:32 -0000	1.24
+++ Makefile	3 Dec 2006 23:09:55 -0000
@@ -6,44 +6,54 @@
 #
 
 PORTNAME=	bmpx
-PORTVERSION=	0.32.0
-PORTREVISION=	4
+PORTVERSION=	0.34.9
 CATEGORIES=	multimedia
-MASTER_SITES=	http://files.beep-media-player.org/releases/0.30/
+MASTER_SITES=	http://files.beep-media-player.org/releases/${PORTVERSION:C|([0-9]+.[0-9]+).*|\1|}/ CSME
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Media player geared towards usability, technical efficiency and looks
 
 LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
+		cairo.2:${PORTSDIR}/graphics/cairo \
 		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
 		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		neon.25:${PORTSDIR}/www/neon \
+		glade-2.0.0:${PORTSDIR}/devel/libglade2 \
 		glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
+		glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
+		hal.1:${PORTSDIR}/sysutils/hal \
+		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		boost_date_time.3:${PORTSDIR}/devel/boost \
+		mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
+		sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
+		ofa.0:${PORTSDIR}/audio/libofa \
+		modplug.0:${PORTSDIR}/audio/libmodplug \
+		cdda_interface.0:${PORTSDIR}/audio/cdparanoia \
+		moodriver.1:${PORTSDIR}/net-p2p/moodriver \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
 CONFLICTS=	bmpx-devel-[0-9]*
 
-USE_AUTOTOOLS=	autoconf:259
-USE_BISON=	yes
 USE_BZIP2=	yes
 USE_FAM=	yes
 USE_GCC=	3.4+
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libglade2 desktopfileutils
+USE_GNOME=	glib20 gtk20 libglade2 desktopfileutils librsvg2 pkgconfig libxml2
 INSTALLS_ICONS=	yes
 USE_GSTREAMER=	good mad ogg vorbis
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
-			--with-dbus-services-dir="${PREFIX}/share/dbus-1/services" \
-			--with-libintl-prefix="${LOCALBASE}"
+CONFIGURE_ARGS=	--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
+		--with-dbus-services-dir="${PREFIX}/share/dbus-1/services" \
+		--with-libintl-prefix="${LOCALBASE}" \
+		--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \
+		--enable-sid --enable-modplug --enable-mp4v2 --enable-hal --enable-sn \
+		--enable-ofa --enable-sm --enable-fam --enable-moodriver
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include \
-			--x-libraries=${X11BASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		beep-media-player-2.1
 
@@ -61,4 +71,18 @@
 PLIST_SUB+=		NLS=""
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e '/index/s|index|idx|g' ${WRKSRC}/libhal++/device.hh
+
+create-plist:
+	${FIND} -sE ${PREFIX} -not -type d -regex '.*(bmp(-|x|2$$)|beep(-|m)).*'|\
+	${SED} -e 's|^${DATADIR}|%%DATADIR%%|;s|^${PREFIX}/||' -e '/^man\//d'\
+		-e '/locale/s|^|%%NLS%%|' > ${PLIST}
+	${FIND} -dsE ${PREFIX} -type d -regex '.*(bmp(-|x|2$$)|beep(-|m)).*'|\
+	${SED} -e 's|^${DATADIR}|%%DATADIR%%|;s|^${PREFIX}/||' -e '/^man\//d'\
+		-e '/locale/s|^|%%NLS%%|' -e 's|^|@dirrm |' >> ${PLIST}
+	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
+	@${ECHO_CMD} '%%NLS%%@dirrmtry share/locale/th_TH/LC_MESSAGES' >> ${PLIST}
+	@${ECHO_CMD} '%%NLS%%@dirrmtry share/locale/th_TH' >> ${PLIST}
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/multimedia/bmpx/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	9 Oct 2006 18:01:54 -0000	1.7
+++ distinfo	3 Dec 2006 23:09:55 -0000
@@ -1,3 +1,3 @@
-MD5 (bmpx-0.32.0.tar.bz2) = 52c5694f2702c0fc1c9b6fdba603ba7c
-SHA256 (bmpx-0.32.0.tar.bz2) = 0bdcc0b874ac5c022c45a6f24d37fbea5881eab8f3ee2e8f35319f82c66a136f
-SIZE (bmpx-0.32.0.tar.bz2) = 2385257
+MD5 (bmpx-0.34.9.tar.bz2) = 6c124e9bb3cb80e9e16d2e050886093a
+SHA256 (bmpx-0.34.9.tar.bz2) = 50223df99fc596d37ee4dc74bdae39b174029ce6dbe9274779512a90f8b3c834
+SIZE (bmpx-0.34.9.tar.bz2) = 2225001
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/multimedia/bmpx/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr	26 Nov 2005 16:38:55 -0000	1.2
+++ pkg-descr	3 Dec 2006 23:09:55 -0000
@@ -5,4 +5,4 @@
 plain UNIX terminal as a daemon (in which case it requires a 
 different frontend connecting to it via DBus).
 
-WWW:	http://beep-media-player.org/
+WWW:	http://bmpx.beep-media-player.org/
Index: pkg-message
===================================================================
RCS file: /home/pcvs/ports/multimedia/bmpx/pkg-message,v
retrieving revision 1.1
diff -u -r1.1 pkg-message
--- pkg-message	7 May 2006 18:04:38 -0000	1.1
+++ pkg-message	3 Dec 2006 23:09:55 -0000
@@ -1,3 +1,5 @@
 After installation BMPx will be able to playback mp3 and ogg
 files only. If you need support for additional formats, you
 should install appropriate GStreamer plugin.
+
+You need hald running in order for audio library to work.
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/multimedia/bmpx/pkg-plist,v
retrieving revision 1.10
diff -u -r1.10 pkg-plist
--- pkg-plist	17 Oct 2006 18:16:58 -0000	1.10
+++ pkg-plist	3 Dec 2006 23:09:55 -0000
@@ -4,6 +4,7 @@
 bin/bmp-play-files-2.0
 bin/bmp-play-lastfm-2.0
 bin/bmp2
+include/bmp-2.0/bmp/bmp.h
 include/bmp-2.0/bmp/dbus.h
 lib/bmpx/plugins/vfs/container/libcontainer_folder.la
 lib/bmpx/plugins/vfs/container/libcontainer_folder.so
@@ -31,24 +32,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-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-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-trackinfo.glade
+%%DATADIR%%/glade/dialog-lyrics.glade
 %%DATADIR%%/glade/library-ui-create-collection.glade
-%%DATADIR%%/glade/library-ui-modify-albums.glade
-%%DATADIR%%/glade/library-ui-modify.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/widget.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
@@ -123,33 +125,51 @@
 %%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/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/cdda/header-logo-left.png
-%%DATADIR%%/images/cdda/header-logo-right.png
-%%DATADIR%%/images/cdda/header-logo-slice.png
-%%DATADIR%%/images/collection.png
-%%DATADIR%%/images/downloads/header-logo-left.png
-%%DATADIR%%/images/downloads/header-logo-right.png
-%%DATADIR%%/images/downloads/header-logo-slice.png
-%%DATADIR%%/images/emblem-new.png
+%%DATADIR%%/images/collections/collection.png
 %%DATADIR%%/images/hal/dev-cdrom.png
 %%DATADIR%%/images/hal/dev-volume-1394.png
 %%DATADIR%%/images/hal/dev-volume-ide.png
 %%DATADIR%%/images/hal/dev-volume-usb.png
+%%DATADIR%%/images/hal/device-camera.png
+%%DATADIR%%/images/hal/device-cdrom.png
+%%DATADIR%%/images/hal/device-cf-card.png
+%%DATADIR%%/images/hal/device-floppy.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-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
 %%DATADIR%%/images/lastfm/header-logo-left.png
 %%DATADIR%%/images/lastfm/header-logo-right.png
 %%DATADIR%%/images/lastfm/header-logo-slice.png
 %%DATADIR%%/images/lastfm/lastfm-album.png
 %%DATADIR%%/images/lastfm/lastfm-artist.png
+%%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-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
@@ -160,23 +180,22 @@
 %%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/preferences/library.png
 %%DATADIR%%/images/preferences/misc.png
 %%DATADIR%%/images/preferences/musicbrainz.png
 %%DATADIR%%/images/preferences/playback.png
+%%DATADIR%%/images/preferences/podcasts.png
 %%DATADIR%%/images/rating/stars_0.png
 %%DATADIR%%/images/rating/stars_1.png
 %%DATADIR%%/images/rating/stars_2.png
 %%DATADIR%%/images/rating/stars_3.png
 %%DATADIR%%/images/rating/stars_4.png
 %%DATADIR%%/images/rating/stars_5.png
-%%DATADIR%%/images/splash.png
-%%DATADIR%%/images/stock/amazon.png
 %%DATADIR%%/images/stock/approve-partial.png
 %%DATADIR%%/images/stock/approve.png
 %%DATADIR%%/images/stock/audio.png
 %%DATADIR%%/images/stock/bmp.png
-%%DATADIR%%/images/stock/bookmarks.png
 %%DATADIR%%/images/stock/cdrom.png
 %%DATADIR%%/images/stock/entry-clear.png
 %%DATADIR%%/images/stock/lastfm-ban.png
@@ -187,10 +206,10 @@
 %%DATADIR%%/images/stock/museek.png
 %%DATADIR%%/images/stock/musicbrainz.png
 %%DATADIR%%/images/stock/playlist.png
-%%DATADIR%%/images/stock/search.png
 %%DATADIR%%/images/stock/shoutcast.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
@@ -201,31 +220,30 @@
 %%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-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-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/stock-table.png
-%%DATADIR%%/images/stock/streams.png
-%%DATADIR%%/images/stock/tachikoma.png
 %%DATADIR%%/images/stock/tag.png
 %%DATADIR%%/images/stock/xiph.png
-%%DATADIR%%/images/streams/header-logo-left.png
-%%DATADIR%%/images/streams/header-logo-right.png
-%%DATADIR%%/images/streams/header-logo-slice.png
+%%DATADIR%%/images/svg/button-background.svg
+%%DATADIR%%/images/svg/button-glow-overlay.svg
+%%DATADIR%%/images/svg/button-outline.svg
 %%DATADIR%%/images/throbber.gif
-%%DATADIR%%/musicbrainz/musicbrainz_mmd-1.0.rng
-%%DATADIR%%/ui/albums-tracklist.ui
-%%DATADIR%%/ui/modify.ui
-%%DATADIR%%/ui/playlist.ui
-%%DATADIR%%/ui/trayicon.ui
 share/dbus-1/services/org.beepmediaplayer.bmp.service
+share/dbus-1/services/org.beepmediaplayer.sentinel.service
 share/icons/hicolor/48x48/apps/bmpx.png
-share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-media-library-query.png
 %%NLS%%share/locale/af/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/bmpx.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/bmpx.mo
@@ -247,37 +265,36 @@
 %%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
-share/mime/packages/bmp-2.0.xml
-%%NLS%%@dirrmtry share/locale/th_TH/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/th_TH
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/musicbrainz
-@dirrm %%DATADIR%%/images/streams
-@dirrm %%DATADIR%%/images/stock
-@dirrm %%DATADIR%%/images/rating
-@dirrm %%DATADIR%%/images/preferences
-@dirrm %%DATADIR%%/images/main
-@dirrm %%DATADIR%%/images/lastfm
-@dirrm %%DATADIR%%/images/hal
-@dirrm %%DATADIR%%/images/downloads
-@dirrm %%DATADIR%%/images/cdda
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/icons/tray-icons
-@dirrm %%DATADIR%%/icons/themes/tango
-@dirrm %%DATADIR%%/icons/themes/red
-@dirrm %%DATADIR%%/icons/themes/plastic
-@dirrm %%DATADIR%%/icons/themes/display
+@dirrm include/bmp-2.0/bmp
+@dirrm include/bmp-2.0
+@dirrm lib/bmpx/plugins/vfs/container
+@dirrm lib/bmpx/plugins/vfs/transport
+@dirrm lib/bmpx/plugins/vfs
+@dirrm lib/bmpx/plugins
+@dirrm lib/bmpx
+@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/tango
 @dirrm %%DATADIR%%/icons/themes
+@dirrm %%DATADIR%%/icons/tray-icons
 @dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/glade
-@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/images/cdda
+@dirrm %%DATADIR%%/images/collections
+@dirrm %%DATADIR%%/images/hal
+@dirrm %%DATADIR%%/images/lastfm
+@dirrm %%DATADIR%%/images/library
+@dirrm %%DATADIR%%/images/main
+@dirrm %%DATADIR%%/images/podcast
+@dirrm %%DATADIR%%/images/preferences
+@dirrm %%DATADIR%%/images/rating
+@dirrm %%DATADIR%%/images/stock
+@dirrm %%DATADIR%%/images/svg
+@dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrm lib/bmpx/plugins/vfs/transport
-@dirrm lib/bmpx/plugins/vfs/container
-@dirrm lib/bmpx/plugins/vfs
-@dirrm lib/bmpx/plugins
-@dirrm lib/bmpx
-@dirrm include/bmp-2.0/bmp
-@dirrm include/bmp-2.0
+%%NLS%%@dirrmtry share/locale/th_TH/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/th_TH
Index: files/patch-m4-gettext.m4
===================================================================
RCS file: files/patch-m4-gettext.m4
diff -N files/patch-m4-gettext.m4
--- files/patch-m4-gettext.m4	10 Sep 2006 11:27:53 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- m4/gettext.m4.orig	Sat Sep  9 14:56:32 2006
-+++ m4/gettext.m4	Sat Sep  9 14:57:19 2006
-@@ -172,7 +172,7 @@
- #ifdef __cplusplus
- "C"
- #endif
--const char *_nl_expand_alias ();],
-+const char *_nl_expand_alias (const char *);],
-               [bindtextdomain ("", "");
- return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-               gt_cv_func_gnugettext_libintl=yes,
-@@ -193,7 +193,7 @@
- #ifdef __cplusplus
- "C"
- #endif
--const char *_nl_expand_alias ();],
-+const char *_nl_expand_alias (const char *);],
-                 [bindtextdomain ("", "");
- return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-                [LIBINTL="$LIBINTL $LIBICONV"