Update bmp and bmp-esound to 0.9.7; from Stefan Krüger in PR pkg/28672.

Enhancements
* Multiple encoding support for trying ID3 title conversion
* GUI refinement tweaks
* New logo and icons
* New command line option to bring BMP to desktop foreground (--activate).
* New compile-time option select XMMS equalization (--with-xmms-eq).
* New translations (Brazilian Portuguese, Breton, Czech, Greek, Hungarian,
  Macedonian, Romanian, Slovak)
* Running beep-media-player --version now prints built-in optional components

Bugfixes
* Fixed removal of dead playlist entries
* Fixed dependency information in pkg-config file (bmp.pc)
* Fixed and disambiguated playlist editor accelerators
* Hacked around playlist editor shade bug (now always unshades on launch)
* Many others (see Bugzilla and ChangeLog)

8 files changed, 36 insertions, 31 deletions

diff --git a/audio/bmp-esound/Makefile b/audio/bmp-esound/Makefile
index d72728add86..0d031ca07f9 100644
--- a/audio/bmp-esound/Makefile
+++ b/audio/bmp-esound/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:05 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/25 15:22:37 jmmv Exp $
 #
 
 .include "../../audio/bmp/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/bmp/bmp-esound/}
-PKGREVISION=	1
 CATEGORIES+=		gnome
 
-DEPENDS+=		bmp>=0.9.7rc2:../../audio/bmp
+DEPENDS+=		bmp>=0.9.7:../../audio/bmp
 
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-esd/--enable-esd/}
 
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index fc258dd6693..34e9e2d7b15 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2004/11/14 19:26:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/12/25 15:22:36 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		4
-
 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/}
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 4e3d668ea92..5aea40c71bd 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2004/08/31 15:47:56 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/12/25 15:22:36 jmmv Exp $
 #
 
-DISTNAME=	bmp-0.9.7rc2
+DISTNAME=	bmp-0.9.7
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=beepmp/}
 
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--disable-opengl
 CONFIGURE_ARGS+=	--disable-oss
 CONFIGURE_ARGS+=	--disable-vorbis
 
-PKGCONFIG_OVERRIDE+=	beep.pc
+PKGCONFIG_OVERRIDE+=	bmp.pc
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bmp
 PKG_SUPPORTED_OPTIONS=	gnome
diff --git a/audio/bmp/PLIST b/audio/bmp/PLIST
index a5d87cc8bb1..1ae1b12eb6d 100644
--- a/audio/bmp/PLIST
+++ b/audio/bmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/12/25 15:22:36 jmmv Exp $
 bin/beep-media-player
 include/bmp/beepctrl.h
 include/bmp/configdb.h
@@ -41,7 +41,7 @@ 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/glade/equalizerwin_preset_menu.glade
+share/bmp/glade/addfiles.glade
 share/bmp/glade/prefswin.glade
 share/bmp/images/appearance.png
 share/bmp/images/eq.png
@@ -49,17 +49,25 @@ share/bmp/images/mouse.png
 share/bmp/images/playlist.png
 share/bmp/images/plugins.png
 share/icons/bmp.svg
+${PKGLOCALEDIR}/locale/br/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/bmp.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/bmp.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/bmp.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bmp.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/hu/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/mk/LC_MESSAGES/bmp.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/bmp.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/bmp.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/bmp.mo
+${PKGLOCALEDIR}/locale/sk/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
diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo
index fdaf12a388c..525c4474cb0 100644
--- a/audio/bmp/distinfo
+++ b/audio/bmp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2004/09/08 12:06:28 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/12/25 15:22:36 jmmv Exp $
 
-SHA1 (bmp-0.9.7rc2.tar.gz) = a2e3d72adb20e91cc3a8731314c5983c1d5303b6
-Size (bmp-0.9.7rc2.tar.gz) = 1705197 bytes
+SHA1 (bmp-0.9.7.tar.gz) = a60ac337efb00f6a50ce019e8a07370a4df040c2
+Size (bmp-0.9.7.tar.gz) = 1974397 bytes
 SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f
 SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2
 SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa
-SHA1 (patch-aq) = 4ac4232954c423dcb5a444020e9a900f3b36a6df
-SHA1 (patch-ar) = cef5065b03db792d1290e74165acc34dcd655e70
-SHA1 (patch-as) = 3277fb3113fe00cecec82e1fdef91a470416c21e
+SHA1 (patch-aq) = 842f76201b891b94da7385a895b3a721441cbd34
+SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67
+SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604
diff --git a/audio/bmp/patches/patch-aq b/audio/bmp/patches/patch-aq
index 66d22dab3f4..232333b9781 100644
--- a/audio/bmp/patches/patch-aq
+++ b/audio/bmp/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.2 2004/08/31 15:47:56 jmmv Exp $
+$NetBSD: patch-aq,v 1.3 2004/12/25 15:22:37 jmmv Exp $
 
---- Output/OSS/Makefile.in.orig	2004-08-22 15:36:43.000000000 +0200
+--- Output/OSS/Makefile.in.orig	2004-12-11 21:22:35.000000000 +0100
 +++ Output/OSS/Makefile.in
-@@ -250,7 +250,7 @@ EXTRA_DIST = $(osssources)
+@@ -305,7 +305,7 @@ soundcard.h
+ EXTRA_DIST = $(osssources)
  lib_LTLIBRARIES = $(ossltlibs)
- 
  libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
 -libOSS_la_LIBADD = @GTK_LIBS@
 +libOSS_la_LIBADD = @GTK_LIBS@ $(LIBOSSAUDIO)
  libOSS_la_SOURCES = $(ossbuildsources)
  INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
- subdir = Output/OSS
+ all: all-am
diff --git a/audio/bmp/patches/patch-ar b/audio/bmp/patches/patch-ar
index 14f28cae849..49eaf92aada 100644
--- a/audio/bmp/patches/patch-ar
+++ b/audio/bmp/patches/patch-ar
@@ -1,13 +1,13 @@
-$NetBSD: patch-ar,v 1.2 2004/08/31 15:47:56 jmmv Exp $
+$NetBSD: patch-ar,v 1.3 2004/12/25 15:22:37 jmmv Exp $
 
---- Input/cdaudio/Makefile.in.orig	2004-08-22 15:36:43.000000000 +0200
+--- Input/cdaudio/Makefile.in.orig	2004-12-11 21:22:34.000000000 +0100
 +++ Input/cdaudio/Makefile.in
-@@ -252,7 +252,7 @@ lib_LTLIBRARIES = $(cdaudioltlibs)
- 
+@@ -306,7 +306,7 @@ EXTRA_DIST = $(cdaudiosources)
+ lib_LTLIBRARIES = $(cdaudioltlibs)
  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)
  libcdaudio_la_SOURCES = $(cdaudiobuildsources)
- subdir = Input/cdaudio
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ all: all-am
+ 
diff --git a/audio/bmp/patches/patch-as b/audio/bmp/patches/patch-as
index 9adf2d9c8c3..7292649f6ea 100644
--- a/audio/bmp/patches/patch-as
+++ b/audio/bmp/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1 2004/08/31 15:47:56 jmmv Exp $
+$NetBSD: patch-as,v 1.2 2004/12/25 15:22:37 jmmv Exp $
 
---- beep/controlsocket.c.orig	2004-06-26 10:25:00.000000000 +0200
+--- beep/controlsocket.c.orig	2004-12-04 13:05:16.000000000 +0100
 +++ beep/controlsocket.c
-@@ -29,6 +29,7 @@
+@@ -31,6 +31,7 @@
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/un.h>