6 files changed, 15 insertions, 39 deletions

diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile
index c484ed958113..0f9d7049a66f 100644
--- a/multimedia/beep-media-player/Makefile
+++ b/multimedia/beep-media-player/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	beep-media-player
-PORTVERSION=	0.9.7.r2
-PORTREVISION=	1
+PORTVERSION=	0.9.7
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	beepmp
-DISTNAME=	bmp-${PORTVERSION:R}rc${PORTVERSION:C/^.*r//}
+DISTNAME=	bmp-${PORTVERSION}
 
 MAINTAINER=	flynn@energyhq.es.eu.org
 COMMENT=	GTK2 mp3 player
diff --git a/multimedia/beep-media-player/distinfo b/multimedia/beep-media-player/distinfo
index 4eac176d48ff..a6db27f6ecb0 100644
--- a/multimedia/beep-media-player/distinfo
+++ b/multimedia/beep-media-player/distinfo
@@ -1,2 +1,2 @@
-MD5 (bmp-0.9.7rc2.tar.gz) = 1fcf7b7d8964f26cb5c0ebddc95d1a7d
-SIZE (bmp-0.9.7rc2.tar.gz) = 1705197
+MD5 (bmp-0.9.7.tar.gz) = 5d74113f5de3d11a400d1d6c118d41c0
+SIZE (bmp-0.9.7.tar.gz) = 1974397
diff --git a/multimedia/beep-media-player/files/patch-Output::OSS::audio.c b/multimedia/beep-media-player/files/patch-Output::OSS::audio.c
deleted file mode 100644
index 39849db1cb20..000000000000
--- a/multimedia/beep-media-player/files/patch-Output::OSS::audio.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- Output/OSS/audio.c.orig	Tue Aug 24 22:26:01 2004
-+++ Output/OSS/audio.c	Tue Aug 24 22:26:17 2004
-@@ -26,6 +26,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/ioctl.h>
-+#include <sys/time.h>
- 
- #include "OSS.h"
- 
diff --git a/multimedia/beep-media-player/files/patch-beep::controlsocket.c b/multimedia/beep-media-player/files/patch-beep::controlsocket.c
deleted file mode 100644
index 705363c30764..000000000000
--- a/multimedia/beep-media-player/files/patch-beep::controlsocket.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- beep/controlsocket.c.orig	Mon Aug 23 21:23:19 2004
-+++ beep/controlsocket.c	Mon Aug 23 21:27:43 2004
-@@ -26,6 +26,7 @@
- 
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
diff --git a/multimedia/beep-media-player/pkg-message b/multimedia/beep-media-player/pkg-message
index 68939c3e9245..f08e7f569df6 100644
--- a/multimedia/beep-media-player/pkg-message
+++ b/multimedia/beep-media-player/pkg-message
@@ -1,14 +1,2 @@
 beep supports Gzipped and uncompressed skins.  If you would like to use
 Zip format skins you will need to ensure archivers/unzip is installed.
-
-FreeBSD 5.x users should add the following to their /etc/libmap.conf
-
-# Might crash if used with libpthread
-[beep-media-player]
-libpthread.so.1		libc_r.so.5
-libpthread.so		libc_r.so
-
-[/usr/X11R6/bin/beep-media-player]
-libpthread.so.1		libc_r.so.5
-libpthread.so		libc_r.so
-
diff --git a/multimedia/beep-media-player/pkg-plist b/multimedia/beep-media-player/pkg-plist
index 63fe4102fe7e..dd9849275525 100644
--- a/multimedia/beep-media-player/pkg-plist
+++ b/multimedia/beep-media-player/pkg-plist
@@ -42,26 +42,35 @@ share/bmp/Skins/Default/readme.txt
 share/bmp/Skins/Default/screenshot.bmp
 share/bmp/Skins/Default/vIscolor.txt
 share/icons/bmp.svg
-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/mouse.png
 share/bmp/images/playlist.png
 share/bmp/images/plugins.png
 share/bmp/images/eq.png
-share/locale/fr/LC_MESSAGES/bmp.mo
+share/locale/br/LC_MESSAGES/bmp.mo
+share/locale/cs/LC_MESSAGES/bmp.mo
 share/locale/cy/LC_MESSAGES/bmp.mo
 share/locale/de/LC_MESSAGES/bmp.mo
+share/locale/el/LC_MESSAGES/bmp.mo
 share/locale/es/LC_MESSAGES/bmp.mo
+share/locale/fr/LC_MESSAGES/bmp.mo
+share/locale/hu/LC_MESSAGES/bmp.mo
 share/locale/it/LC_MESSAGES/bmp.mo
 share/locale/ja/LC_MESSAGES/bmp.mo
 share/locale/ko/LC_MESSAGES/bmp.mo
 share/locale/lt/LC_MESSAGES/bmp.mo
+share/locale/mk/LC_MESSAGES/bmp.mo
 share/locale/nl/LC_MESSAGES/bmp.mo
 share/locale/pl/LC_MESSAGES/bmp.mo
+share/locale/pt_BR/LC_MESSAGES/bmp.mo
+share/locale/ro/LC_MESSAGES/bmp.mo
 share/locale/ru/LC_MESSAGES/bmp.mo
+share/locale/sk/LC_MESSAGES/bmp.mo
 share/locale/sv/LC_MESSAGES/bmp.mo
 share/locale/zh_CN/LC_MESSAGES/bmp.mo
+@unexec rmdir %D/share/applications 2>/dev/null || true
 @dirrm share/beep/Skins
 @dirrm share/beep
 @dirrm share/bmp/Skins/Default