diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 2955634d215..24bbc8371d1 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,19 +1,19 @@
-# $OpenBSD: Makefile,v 1.38 2010/11/15 00:22:49 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2010/12/21 18:06:05 shadchin Exp $
+
+SHARED_ONLY=		Yes
 
 COMMENT-main=		extended module player
 COMMENT-audacious=	extended module player plugin for Audacious
 COMMENT-bmp=		extended module player plugin for BMP
 COMMENT-xmms=		extended module player plugin for XMMS
-DISTNAME=		xmp-3.2.0
+
+DISTNAME=		xmp-3.3.0
 PKGNAME-main=		${DISTNAME}
 PKGNAME-audacious=	audacious-${DISTNAME}
 PKGNAME-bmp=		bmp-${DISTNAME}
 PKGNAME-xmms=		xmms-${DISTNAME}
 CATEGORIES=		audio
 
-REVISION-bmp=	0
-REVISION-audacious=	0
-
 HOMEPAGE=		http://xmp.sourceforge.net/
 
 # GPLv2
@@ -24,8 +24,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xmp/}
 
-SHARED_ONLY=		Yes
-
 MULTI_PACKAGES=		-main -audacious -bmp -xmms
 
 USE_GMAKE=		Yes
@@ -35,27 +33,22 @@ NO_REGRESS=		Yes
 
 WANTLIB-main=		c m sndio
 
-LIB_DEPENDS-audacious=	audio/audacious \
-			devel/pango \
-			x11/gtk+2
-WANTLIB-audacious=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-			Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 dbus-glib-1 \
-			expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \
-			gobject-2.0 gthread-2.0 iconv intl m mcs mowgli pixman-1 \
-			png pthread-stubs samplerate xcb xcb-render xcb-render-util \
-			z audclient>=1 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-			gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
+LIB_DEPENDS-audacious=	audio/audacious>=2.4.2
+WANTLIB-audacious=	GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+			Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo dbus-1 \
+			dbus-glib-1 drm expat fontconfig freetype gdk-x11-2.0 \
+			gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
+			gthread-2.0 gtk-x11-2.0 iconv intl m mcs mowgli pango-1.0 \
+			pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs \
+			xcb xcb-render xcb-shm z
 
-LIB_DEPENDS-bmp=	audio/bmp \
-			devel/pango \
-			x11/gtk+2
-WANTLIB-bmp=		X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-			Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
-			freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
-			gthread-2.0 iconv intl m pixman-1 png pthread-stubs \
-			xcb xcb-render xcb-render-util z beep>=2 pango-1.0 \
-			pangocairo-1.0 pangoft2-1.0 gdk-x11-2.0 gdk_pixbuf-2.0 \
-			gtk-x11-2.0
+LIB_DEPENDS-bmp=	audio/bmp
+WANTLIB-bmp=		GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+			Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 beep cairo \
+			drm expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
+			gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+			gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+			pixman-1 png pthread-stubs xcb xcb-render xcb-shm z
 
 LIB_DEPENDS-xmms=	audio/xmms
 WANTLIB-xmms=		X11 Xext Xi gdk glib gmodule gtk iconv intl m xmms
diff --git a/audio/xmp/distinfo b/audio/xmp/distinfo
index 76cab26418d..9d80fbe8321 100644
--- a/audio/xmp/distinfo
+++ b/audio/xmp/distinfo
@@ -1,5 +1,5 @@
-MD5 (xmp-3.2.0.tar.gz) = w/iI+0B6hb6YMs7aSxCbSg==
-RMD160 (xmp-3.2.0.tar.gz) = 0TevDX8JuXDeAXp+s++eXTgH/go=
-SHA1 (xmp-3.2.0.tar.gz) = wRyZ4h0P1qzkNvV43oX602nDpB8=
-SHA256 (xmp-3.2.0.tar.gz) = uamgqaoXVRh7beYGYQhzGcofLRrp0rt+Z0zGkVj8Eo8=
-SIZE (xmp-3.2.0.tar.gz) = 835651
+MD5 (xmp-3.3.0.tar.gz) = CsFc22jPCgj0GNN7TBhDvQ==
+RMD160 (xmp-3.3.0.tar.gz) = YOf0OhPP7jr8wxL3lFO3CXgqJZY=
+SHA1 (xmp-3.3.0.tar.gz) = eN7oWZA9CszW2KD2NzqVv1DQI9s=
+SHA256 (xmp-3.3.0.tar.gz) = nd/BlUqfr0hj8VyrIwn5DYe4qtEZaPiIp/IazMQrDFQ=
+SIZE (xmp-3.3.0.tar.gz) = 848652