Update bmp and bmp-esound to 0.9.7rc2 (what a PITA):

BMP 0.9.7 rc2

Bugfixes
* Include the file "beep/build.list" in the distribution.

BMP 0.9.7 rc1

Enhancements
* Revised GUI according to GNOME HIG
* New window icons
* New About and Preferences dialog
* New file/folder selector using GTK+ 2.4's file chooser
* Skin cursor support
* New equalizer using IIR filtering
* ID3v2 editing support using id3lib
* ID3 character encoding to assume may now be overrided
* New title formatting tag for conditional fields eg. %{n:text%}
* Experimental GConf and GNOME VFS support
* New translations (Dutch, German, Italian, Japanese, Korean, Lithuanian,
  Russian, Simplified Chinese, Spanish, Swedish, Welsh)
* Merged configure scripts for shorter build time

Miscellaneous
* Removed EasyMove and DoubleSize
* Removed real-time priority support
* Removed AM_PATH_BMP m4 macro in favour of PKG_CHECK_MODULES
* Removed beep-config in favour of 'pkg-config bmp'

Bugfixes
* Memory leaks
* i18n and l10n
* Many others (see Bugzilla and ChangeLog)

20 files changed, 101 insertions, 540 deletions

diff --git a/audio/bmp-esound/Makefile b/audio/bmp-esound/Makefile
index 9e719263977..7ed6e7438fd 100644
--- a/audio/bmp-esound/Makefile
+++ b/audio/bmp-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/11 18:13:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/08/31 15:47:56 jmmv Exp $
 #
 
 .include "../../audio/bmp/Makefile.common"
@@ -6,7 +6,7 @@
 PKGNAME=		${DISTNAME:S/bmp/bmp-esound/}
 CATEGORIES+=		gnome
 
-DEPENDS+=		bmp>=0.9.6:../../audio/bmp
+DEPENDS+=		bmp>=0.9.7rc2:../../audio/bmp
 
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-esd/--enable-esd/}
 
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index f50f92ddac7..feab669fc82 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2004/06/26 22:12:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/08/31 15:47:56 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		1
-
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-mp3/--enable-mp3/}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-oss/--enable-oss/}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-vorbis/--enable-vorbis/}
 
+.include "../../audio/id3lib/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 850706c8154..4e3d668ea92 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2004/06/26 22:12:28 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/08/31 15:47:56 jmmv Exp $
 #
 
-DISTNAME=	bmp-0.9.6.1
+DISTNAME=	bmp-0.9.7rc2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=beepmp/}
 
@@ -22,15 +22,25 @@ USE_X11=		yes
 
 CONFIGURE_ARGS+=	--disable-alsa
 CONFIGURE_ARGS+=	--disable-esd
+CONFIGURE_ARGS+=	--disable-mp3
 CONFIGURE_ARGS+=	--disable-opengl
 CONFIGURE_ARGS+=	--disable-oss
 CONFIGURE_ARGS+=	--disable-vorbis
 
 PKGCONFIG_OVERRIDE+=	beep.pc
 
+PKG_OPTIONS_VAR=	PKG_OPTIONS.bmp
+PKG_SUPPORTED_OPTIONS=	gnome
+
+.include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.prefs.mk"
 
-PTHREAD_OPTS+=		require
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+=	--enable-gconf
+CONFIGURE_ARGS+=	--enable-gnome-vfs
+.  include "../../devel/GConf2/buildlink3.mk"
+.  include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.endif
 
 .if ${OPSYS} == "NetBSD"
 RAWPART!=		/sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j
@@ -57,8 +67,8 @@ post-patch:
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
 .include "../../mk/ossaudio.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/bmp/PLIST b/audio/bmp/PLIST
index ab2cee4f32b..564f7cdfff7 100644
--- a/audio/bmp/PLIST
+++ b/audio/bmp/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/11 18:10:59 jmmv Exp $
-bin/beep-config
+@comment $NetBSD: PLIST,v 1.2 2004/08/31 15:47:56 jmmv Exp $
 bin/beep-media-player
-include/beep/beepctrl.h
-include/beep/configfile.h
-include/beep/dirbrowser.h
-include/beep/formatter.h
-include/beep/titlestring.h
-include/beep/util.h
+include/bmp/beepctrl.h
+include/bmp/configdb.h
+include/bmp/configfile.h
+include/bmp/dirbrowser.h
+include/bmp/formatter.h
 include/bmp/fullscreen.h
 include/bmp/plugin.h
+include/bmp/rcfile.h
+include/bmp/titlestring.h
+include/bmp/util.h
+include/bmp/vfs.h
 lib/bmp/Input/libcdaudio.a
 lib/bmp/Input/libcdaudio.la
 lib/bmp/Input/libcdaudio.so
@@ -30,12 +32,11 @@ lib/bmp/Visualization/libbscope.so
 lib/libbeep.a
 lib/libbeep.la
 lib/libbeep.so
-lib/libbeep.so.1
-lib/libbeep.so.1.0
-lib/pkgconfig/beep.pc
+lib/libbeep.so.2
+lib/libbeep.so.2.0
+lib/pkgconfig/bmp.pc
 man/man1/beep-media-player.1
-share/aclocal/beep.m4
-share/applications/beep.desktop
+share/applications/bmp.desktop
 share/bmp/Skins/Default/Avs.bmp
 share/bmp/Skins/Default/Balance.bmp
 share/bmp/Skins/Default/Eq_ex.bmp
@@ -56,9 +57,30 @@ share/bmp/Skins/Default/pLedit.txt
 share/bmp/Skins/Default/readme.txt
 share/bmp/Skins/Default/screenshot.bmp
 share/bmp/Skins/Default/vIscolor.txt
-share/bmp/beep.svg
-share/bmp/beep_logo.xpm
+share/bmp/glade/equalizerwin_preset_menu.glade
+share/bmp/glade/prefswin.glade
+share/bmp/images/appearance.png
+share/bmp/images/eq.png
+share/bmp/images/mouse.png
+share/bmp/images/playlist.png
+share/bmp/images/plugins.png
+share/icons/bmp.svg
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bmp.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/bmp.mo
+@comment in xdg-dirs: @dirrm share/icons
+@dirrm share/bmp/images
+@dirrm share/bmp/glade
 @dirrm share/bmp/Skins/Default
 @dirrm share/bmp/Skins
 @dirrm share/bmp
@@ -68,4 +90,3 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bmp.mo
 @dirrm lib/bmp/Input
 @dirrm lib/bmp
 @dirrm include/bmp
-@dirrm include/beep
diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo
index c59df796778..5df50457073 100644
--- a/audio/bmp/distinfo
+++ b/audio/bmp/distinfo
@@ -1,20 +1,11 @@
-$NetBSD: distinfo,v 1.6 2004/06/26 22:12:28 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2004/08/31 15:47:56 jmmv Exp $
 
-SHA1 (bmp-0.9.6.1.tar.gz) = c07b55c7fa3e965ff07bf7794b1ca03d00606197
-Size (bmp-0.9.6.1.tar.gz) = 1472078 bytes
-SHA1 (patch-ab) = 04eb21affbcefa34645a05b0c95bfa906202d7cf
-SHA1 (patch-ac) = 3e374fe2143a8fefcd84ff2499f97e170587ca8d
-SHA1 (patch-ad) = f51902a47efaf2423f86e5fc4c6ea7a7850b5034
-SHA1 (patch-ae) = 9461bcf2a238d44f6e0d92a465f7297c952e0182
-SHA1 (patch-ag) = 8ac4b5b1568c35c8a2d6bc9382e968c998ee04a4
-SHA1 (patch-ah) = 78a14f18656b79abd1250c659bcb4f7991396c42
-SHA1 (patch-ai) = 040adc1f20b7f283c6af1334117a26b76a293000
-SHA1 (patch-aj) = e6d354777dd4c8c5bf3b0bf08bdb1a6bfa4855dc
-SHA1 (patch-ak) = 33c0a13036271b817a82dac7c0275130dc1dcede
-SHA1 (patch-al) = 3887309232a926fa689e4d996ab4747eff38cde8
-SHA1 (patch-am) = b1b15fe6deeee7e9d51ce3cb8739baf9886e3812
+SHA1 (bmp-0.9.7rc2.tar.gz) = a2e3d72adb20e91cc3a8731314c5983c1d5303b6
+Size (bmp-0.9.7rc2.tar.gz) = 1705197 bytes
+SHA1 (patch-ag) = 5d8fc1b296c02165d1e65f3158bd38482d284ab8
 SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f
-SHA1 (patch-ao) = 9043ce4618715ff2cfe12df0d31806a9745c25ed
+SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2
 SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa
-SHA1 (patch-aq) = 37f42a5bc9eca8568f5b3889580580997c3c6fc1
-SHA1 (patch-ar) = 2d519625a427cd54fa9af376bda80c085b617ea2
+SHA1 (patch-aq) = 4ac4232954c423dcb5a444020e9a900f3b36a6df
+SHA1 (patch-ar) = cef5065b03db792d1290e74165acc34dcd655e70
+SHA1 (patch-as) = 3277fb3113fe00cecec82e1fdef91a470416c21e
diff --git a/audio/bmp/patches/patch-ab b/audio/bmp/patches/patch-ab
deleted file mode 100644
index 7be3b2d644a..00000000000
--- a/audio/bmp/patches/patch-ab
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
-
---- Input/mpg123/fileinfo.c.orig	Wed Dec 24 13:55:45 2003
-+++ Input/mpg123/fileinfo.c
-@@ -308,6 +308,11 @@ void mpg123_file_info_box(char *filename
-     bool_label[1] = _("Yes");
- 
-     if (!window) {
-+	GtkWidget *pixmapwid, *test_table;
-+	GtkWidget *urk, *blark;
-+	GdkPixbuf *pixbuf;
-+	PangoAttrList *attrs;
-+	PangoAttribute *attr;
- 
- 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
-@@ -323,8 +328,6 @@ void mpg123_file_info_box(char *filename
- 	filename_vbox = gtk_hbox_new(FALSE, 5);
- 	gtk_box_pack_start(GTK_BOX(vbox), filename_vbox, FALSE, TRUE, 0);
- 
--	GtkWidget *pixmapwid;
--	GdkPixbuf *pixbuf;
- 	pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)
- 					      gnome_mime_audio_xpm);
- 	pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
-@@ -335,8 +338,6 @@ void mpg123_file_info_box(char *filename
- 
- 	label = gtk_label_new(NULL);
- 
--	PangoAttrList *attrs;
--	PangoAttribute *attr;
- 
- 	attrs = pango_attr_list_new();
- 
-@@ -382,7 +383,7 @@ void mpg123_file_info_box(char *filename
- 	//// MPEG Layer Info
- 
- 	// FIXME: Obvious...
--	GtkWidget *test_table = gtk_table_new(2, 10, FALSE);
-+	test_table = gtk_table_new(2, 10, FALSE);
- 	gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);
- 	gtk_container_add(GTK_CONTAINER(mpeg_box), test_table);
- 
-@@ -457,8 +458,6 @@ void mpg123_file_info_box(char *filename
- 	gtk_table_attach(GTK_TABLE(test_table), mpeg_filesize_val, 1, 2, 4,
- 			 5, GTK_FILL, GTK_FILL, 10, 2);
- 
--	GtkWidget *urk, *blark;
--
- 	urk = gtk_label_new("");
- 	blark = gtk_label_new("");
- 	gtk_misc_set_alignment(GTK_MISC(urk), 1, 0.5);
-@@ -756,10 +755,12 @@ void mpg123_file_info_box(char *filename
- 	return;
-     }
- 
-+    {
-     struct stat mstat;
-     stat(filename, &mstat);
-     gtk_widget_set_sensitive(id3_frame,
- 			     ((mstat.st_mode & S_IWRITE) == S_IWRITE));
-+    }
-     /* FIXME: Check for UID/GID too? */
- 
-     fill_entries(NULL, NULL);
diff --git a/audio/bmp/patches/patch-ac b/audio/bmp/patches/patch-ac
deleted file mode 100644
index e57340d03ef..00000000000
--- a/audio/bmp/patches/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
-
---- Input/mpg123/mpg123.c.orig	Wed Dec 24 13:55:45 2003
-+++ Input/mpg123/mpg123.c
-@@ -669,12 +669,13 @@ void mpg123_return_tag_value_by_name(gch
- 	if (!id3) {
- 
- 
-+	    int result_read;
- 	    int result_seek = fseek(file, -1 * sizeof(id3v1tag), SEEK_END);
- 	    if (result_seek)
- 		return;
- 
- 
--	    int result_read = fread(&id3v1tag, 1, sizeof(id3v1tag), file);
-+	    result_read = fread(&id3v1tag, 1, sizeof(id3v1tag), file);
- 	    if (result_read != sizeof(id3v1tag))
- 		return;
- 	    if (strncmp(id3v1tag.tag, "TAG", 3) != 0)
-@@ -1111,6 +1112,7 @@ static void *decode_loop(void *arg)
- 
- static void play_file(char *filename)
- {
-+    pthread_attr_t pta;
-     memset(&fr, 0, sizeof(struct frame));
-     memset(&temp_fr, 0, sizeof(struct frame));
- 
-@@ -1124,9 +1126,10 @@ static void play_file(char *filename)
-     output_opened = FALSE;
-     dopause = FALSE;
- 
--    pthread_attr_t pta;
-     (void) pthread_attr_init(&pta);
-+#if defined(_POSIX_PRIORITY_SCHEDULING)
-     (void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED);
-+#endif
-     (void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM);
- 
-     pthread_create(&decode_thread, &pta, decode_loop, g_strdup(filename));
diff --git a/audio/bmp/patches/patch-ad b/audio/bmp/patches/patch-ad
deleted file mode 100644
index 19733c89783..00000000000
--- a/audio/bmp/patches/patch-ad
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
-
---- Input/vorbis/fileinfo.c.orig	Wed Dec 24 13:57:29 2003
-+++ Input/vorbis/fileinfo.c
-@@ -494,6 +494,11 @@ void vorbis_file_info_box(char *fn)
-     if (!window) {
- 	GtkWidget *hbox, *label, *filename_hbox, *vbox, *left_vbox;
- 	GtkWidget *table, *bbox, *cancel_button;
-+	GtkWidget *pixmapwid, *test_table, *boxx;
-+	GtkImage *img;
-+	GdkPixbuf *pixbuf;
-+	PangoAttrList *attrs;
-+	PangoAttribute *attr;
- 
- 	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
-@@ -508,16 +513,13 @@ void vorbis_file_info_box(char *fn)
- 	filename_hbox = gtk_hbox_new(FALSE, 5);
- 	gtk_box_pack_start(GTK_BOX(vbox), filename_hbox, FALSE, TRUE, 0);
- 
--	GtkWidget *pixmapwid;
--	GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)
-+	pixbuf = gdk_pixbuf_new_from_xpm_data((const char **)
- 							 gnome_mime_audio_ogg_xpm);
- 	pixmapwid = gtk_image_new_from_pixbuf(pixbuf);
- 	gtk_misc_set_alignment(GTK_MISC(pixmapwid), 0, 0);
- 	gtk_box_pack_start(GTK_BOX(filename_hbox), pixmapwid, FALSE, FALSE,
- 			   0);
- 
--	PangoAttrList *attrs;
--	PangoAttribute *attr;
- 
- 	attrs = pango_attr_list_new();
- 
-@@ -722,7 +724,6 @@ void vorbis_file_info_box(char *fn)
- 			 GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
- #endif
- 
--	GtkWidget *boxx;
- 	boxx = gtk_hbutton_box_new();
- 	gtk_hbutton_box_set_layout_default(GTK_BUTTONBOX_SPREAD);
- 
-@@ -739,7 +740,7 @@ void vorbis_file_info_box(char *fn)
- 	gtk_table_attach(table, boxx, 0, 5, 6, 7, GTK_FILL, 0, 0, 8);
- 
- 	rg_show_button = gtk_toggle_button_new();
--	GtkImage *img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD,
-+	img = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD,
- 						 GTK_ICON_SIZE_MENU);
- 	gtk_container_add(rg_show_button, img);
- 	g_signal_connect(G_OBJECT(rg_show_button), "toggled",
-@@ -832,7 +833,7 @@ void vorbis_file_info_box(char *fn)
- 	gtk_box_set_spacing(GTK_BOX(info_box), 0);
- 
- 	// FIXME: Obvious...
--	GtkWidget *test_table = gtk_table_new(2, 10, FALSE);
-+	test_table = gtk_table_new(2, 10, FALSE);
- 	gtk_container_set_border_width(GTK_CONTAINER(test_table), 0);
- 	gtk_container_add(GTK_CONTAINER(info_box), test_table);
- 
-@@ -1073,10 +1074,12 @@ void vorbis_file_info_box(char *fn)
-     gtk_window_set_title(GTK_WINDOW(window), tmp);
- //      rg_show_cb(rg_show_button, NULL);
- 
-+    {
-     struct stat mstat;
-     stat(fn, &mstat);
-     gtk_widget_set_sensitive(tag_frame,
- 			     ((mstat.st_mode & S_IWRITE) == S_IWRITE));
-+    }
- 
-     g_signal_connect_swapped(title_entry, "changed", change_buttons,
- 			     save_button);
diff --git a/audio/bmp/patches/patch-ae b/audio/bmp/patches/patch-ae
deleted file mode 100644
index dc956c8ad64..00000000000
--- a/audio/bmp/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
-
---- Input/vorbis/vorbis.c.orig	Wed Dec 24 13:57:29 2003
-+++ Input/vorbis/vorbis.c
-@@ -521,14 +521,16 @@ static void *vorbis_play_loop(void *arg)
- 
- static void vorbis_play(char *filename)
- {
-+    pthread_attr_t pta;
-     vorbis_playing = 1;
-     vorbis_bytes_streamed = 0;
-     vorbis_eos = 0;
-     output_error = FALSE;
- 
--    pthread_attr_t pta;
-     (void) pthread_attr_init(&pta);
-+#if defined(_POSIX_PRIORITY_SCHEDULING)
-     (void) pthread_attr_setschedpolicy(&pta, PTHREAD_INHERIT_SCHED);
-+#endif
-     (void) pthread_attr_setscope(&pta, PTHREAD_SCOPE_SYSTEM);
- 
-     pthread_create(&tid, &pta, vorbis_play_loop, g_strdup(filename));
diff --git a/audio/bmp/patches/patch-ag b/audio/bmp/patches/patch-ag
index cb2eb190a64..16f671732ff 100644
--- a/audio/bmp/patches/patch-ag
+++ b/audio/bmp/patches/patch-ag
@@ -1,15 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
+$NetBSD: patch-ag,v 1.2 2004/08/31 15:47:56 jmmv Exp $
 
---- beep/beep.desktop.in.orig	Sat Nov 29 04:13:49 2003
-+++ beep/beep.desktop.in
-@@ -2,8 +2,8 @@
- Name=Beep
- Comment=Beep media player
+--- beep/bmp.desktop.in.orig	2004-07-07 09:56:34.000000000 +0200
++++ beep/bmp.desktop.in
+@@ -2,7 +2,7 @@
+ Name=Beep Media Player
+ Comment=Play music
  Exec=beep-media-player
--Icon=beep.svg
-+Icon=@prefix@/share/bmp/beep.svg
+-Icon=bmp.svg
++Icon=@prefix@/share/bmp/bmp.svg
  MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg
--Categories=GTK;AudioVideo;Player
-+Categories=Application;AudioVideo;
- Terminal=0
- Type=Application
+ Categories=Application;GTK;AudioVideo;Player;
+ Terminal=false
diff --git a/audio/bmp/patches/patch-ah b/audio/bmp/patches/patch-ah
deleted file mode 100644
index e3d2208fc25..00000000000
--- a/audio/bmp/patches/patch-ah
+++ /dev/null
@@ -1,159 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/04/11 18:11:14 jmmv Exp $
-
---- beep/dirbrowser.c.orig	Wed Dec 24 17:17:01 2003
-+++ beep/dirbrowser.c
-@@ -263,15 +263,16 @@ static guint64 bmp_db_get_nodeidx_from_i
- static gchar *bmp_db_sanify_tag(gchar * value)
- {
- 
--    if (!value)
--	return "(unknown)";
--
-     gchar *frag = NULL;
-     gchar **branches;
-     guint ctr = 0;
-     gboolean bracket_open = FALSE;
-+    GString *chunk;
-+
-+    if (!value)
-+	return "(unknown)";
- 
--    GString *chunk = g_string_new(NULL);
-+    chunk = g_string_new(NULL);
-     branches = g_strsplit(g_strstrip(value), " ", 0);
- 
-     while (frag || (ctr == 0)) {
-@@ -346,6 +347,7 @@ static void bmp_db_create_dirtree(GtkTre
-     GList *list = NULL;
-     gboolean first = TRUE;
-     gchar *from_real;
-+    GdkPixbuf *buf_dir, *buf_file, *buf_cda;
- 
-     from = g_locale_from_utf8(from, -1, NULL, NULL, NULL);
-     from_real = bmp_db_get_path_real(from, model, &parent_iter);
-@@ -354,17 +356,17 @@ static void bmp_db_create_dirtree(GtkTre
-     /* It's not really a waste creating both beforehand since we will
-      * certainly need the folder one at least once, and most probably
-      * the audio one too anyway */
--    GdkPixbuf *buf_dir = gdk_pixbuf_new_from_inline(sizeof(folder_pixbuf),
-+    buf_dir = gdk_pixbuf_new_from_inline(sizeof(folder_pixbuf),
- 						    folder_pixbuf,
- 						    TRUE,
- 						    NULL);
- 
--    GdkPixbuf *buf_file = gdk_pixbuf_new_from_inline(sizeof(audio_pixbuf),
-+    buf_file = gdk_pixbuf_new_from_inline(sizeof(audio_pixbuf),
- 						     audio_pixbuf,
- 						     TRUE,
- 						     NULL);
- 
--    GdkPixbuf *buf_cda = gdk_pixbuf_new_from_inline(sizeof(cda_pixbuf),
-+    buf_cda = gdk_pixbuf_new_from_inline(sizeof(cda_pixbuf),
- 						    cda_pixbuf,
- 						    TRUE,
- 						    NULL);
-@@ -647,6 +649,7 @@ static void bmp_db_row_activated(GtkTree
-     GtkTreeIter iter;
-     GList *paths = NULL;
-     GList *paths_f = NULL;
-+    GtkWidget *store;
- 
-     gchar *node_name;
-     gchar *path;
-@@ -681,7 +684,7 @@ static void bmp_db_row_activated(GtkTree
- 	paths = paths->next;
-     }
- 
--    GtkWidget *store =
-+    store =
- 	GTK_WIDGET(bmp_db_return_filestore_model_fresh(paths_f));
- 
-     gtk_tree_view_set_model(user_data, GTK_TREE_MODEL(store));
-@@ -733,9 +736,9 @@ static void bmp_db_filestore_row_activat
- 
- 	if (entry_type == IS_ALBUM) {
- 	    if (gtk_tree_model_iter_children(model, &iter_child, &iter)) {
-+		gboolean valid = TRUE;
- 		if (click_play)
- 		    playlist_clear();
--		gboolean valid = TRUE;
- 		while (valid) {
- 		    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter_child,
- 				       FILENAME_COL, &node_name, -1);
-@@ -1308,12 +1311,15 @@ static GtkTreeModel *bmp_db_return_files
- {
- 
-     GtkTreeStore *file_store;
-+    GtkTreeModel *sort_model;
-+    gdouble length_pl;
-+    int ctr = 0;
- 
- 
-     file_store =
- 	gtk_tree_store_new(5, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT,
- 			   G_TYPE_STRING, G_TYPE_INT);
--    GtkTreeModel *sort_model =
-+    sort_model =
- 	gtk_tree_model_sort_new_with_model(GTK_TREE_MODEL(file_store));
- 
- 
-@@ -1321,17 +1327,16 @@ static GtkTreeModel *bmp_db_return_files
- 					    bmp_db_mdb_sort_func, NULL, NULL);
- 
- 
--    gdouble length_pl = g_list_length(paths);
-+    length_pl = g_list_length(paths);
-     gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_db), 0.0);
- 
--    int ctr = 0;
--
-     while (paths) {
- 
- 	gchar *path = paths->data;
--	ctr++;
- 
- 	GList *files = bmp_db_return_files_from_path(path);
-+        gdouble frac;
-+	ctr++;
- 
- 	while (files) {
- 	    gchar *title;
-@@ -1356,7 +1361,7 @@ static GtkTreeModel *bmp_db_return_files
- 	    files = files->next;
- 	}
- 
--	gdouble frac = 1 / length_pl;
-+	frac = 1 / length_pl;
- 	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar_db),
- 				      frac * ctr);
- 	while (gtk_events_pending()) {
-@@ -1413,6 +1418,9 @@ GtkWidget *bmp_db_create(gchar * current
-     GtkWidget *paned;
- 
-     if (!window) {
-+	GtkWidget *fstore;
-+	GList *paths;
-+	GtkTreeSelection *sel;
- 
- 	/* create window, etc */
- 	/* yes this is all messed up */
-@@ -1489,17 +1497,16 @@ GtkWidget *bmp_db_create(gchar * current
- 			 G_CALLBACK(bmp_db_keypress), window);
- 
- 	gtk_container_add(GTK_CONTAINER(sw), treeview);
--	GtkWidget *fstore;
- 
- 	/* FIXME: clean up variables, move them to start */
- 
- 	/* FIXME: paths is not freed, and is resetted every iteration */
--	GList *paths = NULL;
-+	paths = NULL;
- 	paths = g_list_append(paths, g_strdup(g_get_home_dir()));
- 	fstore = bmp_db_return_filestore_fresh(paths);
- 	gtk_container_add(GTK_CONTAINER(sw_right), fstore);
- 
--	GtkTreeSelection *sel =
-+	sel =
- 	    gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
- 	g_signal_connect(G_OBJECT(sel), "changed",
- 			 G_CALLBACK(bmp_db_row_activated), fstore);
diff --git a/audio/bmp/patches/patch-ai b/audio/bmp/patches/patch-ai
deleted file mode 100644
index 8de8cc9e685..00000000000
--- a/audio/bmp/patches/patch-ai
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/04/11 18:11:14 jmmv Exp $
-
---- beep/playlist_list.c.orig	Wed Dec 24 14:03:17 2003
-+++ beep/playlist_list.c
-@@ -449,6 +449,7 @@ void playlist_list_draw(Widget * w)
- 	    guint t_width;
- 	    guint len_tail;
- 	    guint len;
-+	    gchar **frags;
- 
- 	    tail = g_strdup_printf("%s%s", qstr, length);
- 
-@@ -507,7 +508,7 @@ void playlist_list_draw(Widget * w)
- 
- 
- 
--	    gchar **frags = g_strsplit(tail, ":", 0);
-+	    frags = g_strsplit(tail, ":", 0);
- 
- 	    layout =
- 		gtk_widget_create_pango_layout(GTK_WIDGET(playlistwin),
diff --git a/audio/bmp/patches/patch-aj b/audio/bmp/patches/patch-aj
deleted file mode 100644
index 22be2cff9e0..00000000000
--- a/audio/bmp/patches/patch-aj
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/04/11 18:11:14 jmmv Exp $
-
---- beep/skin.c.orig	Wed Dec 24 14:03:17 2003
-+++ beep/skin.c
-@@ -168,6 +168,7 @@ static gboolean skin_load_pixmap_id(Skin
-     const SMID_Mapping *sm_inf;
-     GdkPixmap *gpm;
-     gboolean retval = FALSE;
-+    SkinPixmap *pm;
- 
-     if (id >= SKIN_PMID_LAST) {
- 	g_warning("skin pixmap id out of range (%u).", id);
-@@ -201,7 +202,7 @@ static gboolean skin_load_pixmap_id(Skin
-     }
-     g_free(tmpstr);
- 
--    SkinPixmap *pm = &sk->pixmaps[id];
-+    pm = &sk->pixmaps[id];
-     gpm = read_bmp(filename);
- 
-     if (!gpm) {
-@@ -733,10 +734,10 @@ static SkinPixmap *get_skin_pixmap(SkinI
- GdkBitmap *skin_get_mask(MaskIndex mi, gboolean doublesize,
- 			 gboolean shaded)
- {
--    g_assert(skin != NULL);
--
-     GdkBitmap **masks;
- 
-+    g_assert(skin != NULL);
-+
-     g_assert(mi < SKIN_MID_LAST);
-     masks = (doublesize ? skin->ds_masks : skin->masks);
-     return masks[mi];
-@@ -813,8 +814,9 @@ void skin_get_eq_spline_colors(guint32(*
-     gint i;
-     GdkPixmap *pixmap;
-     GdkImage *img;
-+    SkinPixmap *eqmainpm;
-     g_assert(skin != NULL);
--    SkinPixmap *eqmainpm = &skin->pixmaps[SKIN_EQMAIN];
-+    eqmainpm = &skin->pixmaps[SKIN_EQMAIN];
-     if (eqmainpm->pixmap != NULL &&
- 	eqmainpm->current_width >= 116 && eqmainpm->current_height >= 313)
- 	pixmap = eqmainpm->pixmap;
diff --git a/audio/bmp/patches/patch-ak b/audio/bmp/patches/patch-ak
deleted file mode 100644
index a7477c2d125..00000000000
--- a/audio/bmp/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2004/04/11 18:11:14 jmmv Exp $
-
---- beep/skinwin.c.orig	Wed Dec 24 14:03:17 2003
-+++ beep/skinwin.c
-@@ -217,10 +217,10 @@ void update_skins(GtkWidget * w, gpointe
-     char *str, *skinsdir;
-     gchar **list;
- 
--    gtk_widget_set_sensitive(scrolled_win, FALSE);
-     GtkTreeView *treeview = GTK_TREE_VIEW(data);
-     GtkTreeSelection *selection = NULL;
-     GtkListStore *store;
-+    gtk_widget_set_sensitive(scrolled_win, FALSE);
- 
-     selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-     store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
diff --git a/audio/bmp/patches/patch-al b/audio/bmp/patches/patch-al
deleted file mode 100644
index acddc74c51a..00000000000
--- a/audio/bmp/patches/patch-al
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2004/04/11 18:11:14 jmmv Exp $
-
---- beep/softvolume.c.orig	Wed Dec 24 14:03:17 2003
-+++ beep/softvolume.c
-@@ -27,11 +27,11 @@ gint soft_volume_right;
- void soft_volume_load(char *section, SoftVolumeConfig * c)
- {
-     ConfigFile *cfgfile;
-+    char *sec = (section == NULL ? "xmms" : section);
- 
-     if (c == NULL)
- 	return;
- 
--    char *sec = (section == NULL ? "xmms" : section);
- 
-     c->enabled = FALSE;
-     c->volume_left = 0;
diff --git a/audio/bmp/patches/patch-am b/audio/bmp/patches/patch-am
deleted file mode 100644
index 9cf6dbc535b..00000000000
--- a/audio/bmp/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2004/04/11 18:11:06 jmmv Exp $
-
---- beep/textbox.c.orig	Wed Dec 24 14:03:17 2003
-+++ beep/textbox.c
-@@ -143,8 +143,8 @@ static gboolean textbox_should_scroll(Te
- void textbox_set_text(TextBox * tb, gchar * text)
- {
- 
--    lock_widget(tb);
-     gchar *utf8text;
-+    lock_widget(tb);
-     if (tb->tb_text) {
- 	if (!strcmp(text, tb->tb_text)) {
- 	    unlock_widget(tb);
diff --git a/audio/bmp/patches/patch-ao b/audio/bmp/patches/patch-ao
index d690b6e3932..8101101932c 100644
--- a/audio/bmp/patches/patch-ao
+++ b/audio/bmp/patches/patch-ao
@@ -1,10 +1,10 @@
-$NetBSD: patch-ao,v 1.1 2004/05/15 09:34:53 jmmv Exp $
+$NetBSD: patch-ao,v 1.2 2004/08/31 15:47:56 jmmv Exp $
 
---- config.h.in.orig	2003-12-24 20:16:48.000000000 +0100
+--- config.h.in.orig	2004-08-22 15:50:43.000000000 +0200
 +++ config.h.in
-@@ -195,6 +195,9 @@
- /* Define to 1 if you have the `srandomdev' function. */
- #undef HAVE_SRANDOMDEV
+@@ -180,6 +180,9 @@
+ /* Define to 1 if you have the `setlocale' function. */
+ #undef HAVE_SETLOCALE
  
 +/* Define to 1 if you have the `statvfs' function. */
 +#undef HAVE_STATVFS
diff --git a/audio/bmp/patches/patch-aq b/audio/bmp/patches/patch-aq
index ade9a857551..66d22dab3f4 100644
--- a/audio/bmp/patches/patch-aq
+++ b/audio/bmp/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.1 2004/06/26 22:12:28 jmmv Exp $
+$NetBSD: patch-aq,v 1.2 2004/08/31 15:47:56 jmmv Exp $
 
---- Output/OSS/Makefile.in.orig	2004-06-26 23:46:20.000000000 +0200
+--- Output/OSS/Makefile.in.orig	2004-08-22 15:36:43.000000000 +0200
 +++ Output/OSS/Makefile.in
-@@ -239,7 +239,7 @@ EXTRA_DIST = $(osssources)
+@@ -250,7 +250,7 @@ EXTRA_DIST = $(osssources)
  lib_LTLIBRARIES = $(ossltlibs)
  
  libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
--libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
-+libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ $(LIBOSSAUDIO)
+-libOSS_la_LIBADD = @GTK_LIBS@
++libOSS_la_LIBADD = @GTK_LIBS@ $(LIBOSSAUDIO)
  libOSS_la_SOURCES = $(ossbuildsources)
- INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
+ INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
  subdir = Output/OSS
diff --git a/audio/bmp/patches/patch-ar b/audio/bmp/patches/patch-ar
index a089a2c5056..14f28cae849 100644
--- a/audio/bmp/patches/patch-ar
+++ b/audio/bmp/patches/patch-ar
@@ -1,10 +1,10 @@
-$NetBSD: patch-ar,v 1.1 2004/06/26 22:12:28 jmmv Exp $
+$NetBSD: patch-ar,v 1.2 2004/08/31 15:47:56 jmmv Exp $
 
---- Input/cdaudio/Makefile.in.orig	2004-06-26 23:51:20.000000000 +0200
+--- Input/cdaudio/Makefile.in.orig	2004-08-22 15:36:43.000000000 +0200
 +++ Input/cdaudio/Makefile.in
-@@ -241,7 +241,7 @@ lib_LTLIBRARIES = $(cdaudioltlibs)
+@@ -252,7 +252,7 @@ lib_LTLIBRARIES = $(cdaudioltlibs)
  
- INCLUDES = @GTK_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
+ INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
  libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@
 -libcdaudio_la_LIBADD = @GTK_LIBS@
 +libcdaudio_la_LIBADD = @GTK_LIBS@ $(LIBOSSAUDIO)
diff --git a/audio/bmp/patches/patch-as b/audio/bmp/patches/patch-as
new file mode 100644
index 00000000000..9adf2d9c8c3
--- /dev/null
+++ b/audio/bmp/patches/patch-as
@@ -0,0 +1,12 @@
+$NetBSD: patch-as,v 1.1 2004/08/31 15:47:56 jmmv Exp $
+
+--- beep/controlsocket.c.orig	2004-06-26 10:25:00.000000000 +0200
++++ beep/controlsocket.c
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
++#include <time.h>
+ 
+ #include "main.h"
+ #include "equalizer.h"