diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 91a1404fc56..a86358a29cf 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2005/09/16 09:51:26 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2005/11/13 21:17:56 wilfried Exp $
 
 COMMENT=	"gtk+2 media player based on XMMS"
 COMMENT-mp3=	"MP3 input plugin for bmp"
 COMMENT-vorbis=	"Ogg Vorbis input plugin for bmp"
 V=		0.9.7
 DISTNAME=	bmp-$V
-PKGNAME=	bmp-$Vp3
-PKGNAME-mp3=	bmp-mp3-$Vp3
-PKGNAME-vorbis=	bmp-vorbis-$Vp2
+PKGNAME=	bmp-$Vp4
+PKGNAME-mp3=	bmp-mp3-$Vp4
+PKGNAME-vorbis=	bmp-vorbis-$Vp3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=beepmp/}
 
@@ -28,14 +28,13 @@ USE_X11=	Yes
 
 MODULES=	devel/gettext
 
-WANTLIB=	X11 Xft Xrender fontconfig freetype m
+WANTLIB=	X11 Xext Xrender fontconfig freetype m z
 
-BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig
-LIB_DEPENDS=	gdk_pixbuf-2.0.400.3,gdk-x11-2.0.400.3::x11/gtk+2 \
-		gtk-x11-2.0.0.5::x11/gtk+2 \
+BUILD_DEPENDS=	::devel/pkgconfig
+LIB_DEPENDS=	gdk_pixbuf-2.0.400.3,gdk-x11-2.0.400.3,gtk-x11-2.0.0.5::x11/gtk+2 \
 		glib-2.0.400.2,gthread-2.0.400.2::devel/glib2
-WANTLIB+=	gmodule-2.0.0.0 pangoxft-1.0.0.0 atk-1.0.0.0 gobject-2.0.0.0 \
-		pangox-1.0.0.0 pango-1.0.0.0 pangoft2-1.0.0.0
+WANTLIB+=	cairo glitz gmodule-2.0.0.0 atk-1.0.0.0 gobject-2.0.0.0 \
+		pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0 png
 
 MULTI_PACKAGES=
 PSEUDO_FLAVORS=	no_mp3 no_vorbis
@@ -78,7 +77,7 @@ WANTLIB+=	gthread-2.0.0.0 gtk-x11-2.0.0.0 gdk-x11-2.0.0.0 glib-2.0.0.0 \
 		ogg gdk_pixbuf-2.0.0.0
 RUN_DEPENDS=	::audio/bmp
 . else
-WANTLIB+=	pthread ICE audiofile c SM z
+WANTLIB+=	pthread ICE audiofile c SM
 . endif
 .endif