3 files changed, 34 insertions, 21 deletions

diff --git a/multimedia/bmpx/Makefile b/multimedia/bmpx/Makefile
index 2d6daf0b3882..4ee2c591306f 100644
--- a/multimedia/bmpx/Makefile
+++ b/multimedia/bmpx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bmpx
 PORTVERSION=	0.14.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	beepmp
@@ -27,8 +28,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gtk20 libglade2 desktopfileutils
 LIBTOOLFILES=	configure libhrel/configure \
 		libchroma/configure libskinned/configure
-USE_GSTREAMER=	mad ogg
-USE_GETTEXT=	yes
+USE_GSTREAMER=	bad good ugly mad ogg
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
@@ -47,6 +47,7 @@ CONFIGURE_ARGS+=	--enable-amazon
 CONFIGURE_ARGS+=	--disable-dbus
 PLIST_SUB+=	DBUS="@comment "
 .else
+CONFIGURE_ARGS+=	--with-dbus-services-dir="${PREFIX}/share/dbus-1/services"
 LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
 PLIST_SUB+=	DBUS=""
 .endif
@@ -69,6 +70,14 @@ CONFIGURE_ARGS+=	--disable-sn
 LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 .endif
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=		NLS="@comment "
+.else
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
diff --git a/multimedia/bmpx/pkg-message b/multimedia/bmpx/pkg-message
new file mode 100644
index 000000000000..3a28e37a7e3f
--- /dev/null
+++ b/multimedia/bmpx/pkg-message
@@ -0,0 +1,3 @@
+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.
diff --git a/multimedia/bmpx/pkg-plist b/multimedia/bmpx/pkg-plist
index 8a481164827c..7dc05f0ff819 100644
--- a/multimedia/bmpx/pkg-plist
+++ b/multimedia/bmpx/pkg-plist
@@ -73,6 +73,7 @@ share/libhrel/examples/hrel-demo
 share/applications/bmp-2.0.desktop
 share/applications/bmp-enqueue-2.0.desktop
 share/applications/bmp-play-2.0.desktop
+share/icons/hicolor/48x48/apps/bmpx.png
 %%DATADIR%%/data/GPL.txt
 %%DATADIR%%/glade/dialog_add_files.glade
 %%DATADIR%%/glade/dialog_bookmarks.glade
@@ -172,25 +173,25 @@ share/applications/bmp-play-2.0.desktop
 %%DATADIR%%/ui/plmanager.ui
 %%DATADIR%%/ui/tracklist.ui
 %%DATADIR%%/ui/trayicon.ui
-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
-%%DBUS%%%%LOCALBASE%%/share/dbus-1/services/org.beepmediaplayer.bmp.service
+%%NLS%%share/locale/af/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/de/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/el/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/es/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/et/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/bmpx.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/bmpx.mo
+%%DBUS%%share/dbus-1/services/org.beepmediaplayer.bmp.service
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%/icons/themes/darksphere