diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile
index a185dfbffe4..b60b35c8c9d 100644
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.77 2008/09/15 22:14:23 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.78 2009/01/16 04:11:18 jakemsr Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT-main=	videolan client; multimedia player
 
 V=		0.8.6i
 DISTNAME=	vlc-${V}
-PKGNAME-main=	${DISTNAME}p2
+PKGNAME-main=	${DISTNAME}p3
 CATEGORIES=	x11
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${V}/
 
@@ -48,7 +48,7 @@ RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 
 WANTLIB-main=	ICE SM X11 Xext Xinerama Xv Xxf86vm c freetype m ncurses \
 		pthread stdc++ usbhid z Xau Xdmcp Xrandr Xrender \
-		SDL jpeg tiff bz2 ogg vorbis vorbisenc faac mp3lame
+		SDL jpeg tiff bz2 ogg vorbis vorbisenc faac mp3lame sndio
 
 CONFIGURE_STYLE=autoconf
 AUTOCONF_VERSION=2.61
@@ -166,7 +166,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
 MULTI_PACKAGES=-main
 
 FLAVORS=altivec
-PSEUDO_FLAVORS=no_web no_arts no_esd no_jack
+PSEUDO_FLAVORS=no_web no_jack
 FLAVOR?=
 
 .if !${FLAVOR:L:Mno_web}
@@ -186,32 +186,6 @@ WANTLIB-web=	ICE SM X11 Xau Xdmcp Xext Xinerama Xt Xv Xxf86vm dvbpsi m \
 CONFIGURE_ARGS+=--disable-mozilla
 .endif
 
-.if !${FLAVOR:L:Mno_arts}
-MULTI_PACKAGES+=-arts
-COMMENT-arts=	artsd audio output module for vlc
-FULLPKGNAME-arts=vlc-arts-${V}
-CONFIGURE_ARGS+=--enable-arts
-LIB_DEPENDS-arts=${LIB_DEPENDS} artsc.>=1::x11/kde/arts3
-# any FLAVOR of vlc will do
-RUN_DEPENDS-arts=::x11/vlc
-WANTLIB-arts=	glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pcre
-.else
-CONFIGURE_ARGS+=--disable-arts
-.endif
-
-.if !${FLAVOR:L:Mno_esd}
-MULTI_PACKAGES+=-esd
-COMMENT-esd=	esound audio output module for vlc
-FULLPKGNAME-esd=vlc-esd-${V}
-CONFIGURE_ARGS+=--enable-esd
-LIB_DEPENDS-esd=esd.>=2::audio/esound
-# any FLAVOR of vlc will do
-RUN_DEPENDS-esd=::x11/vlc
-WANTLIB-esd=	audiofile m
-.else
-CONFIGURE_ARGS+=--disable-esd
-.endif
-
 .if !${FLAVOR:L:Mno_jack}
 MULTI_PACKAGES+=-jack
 COMMENT-jack=	jackd audio output module for vlc
diff --git a/x11/vlc/patches/patch-modules_audio_output_Makefile_in b/x11/vlc/patches/patch-modules_audio_output_Makefile_in
index 23d6f60be22..1610f4128c1 100644
--- a/x11/vlc/patches/patch-modules_audio_output_Makefile_in
+++ b/x11/vlc/patches/patch-modules_audio_output_Makefile_in
@@ -1,15 +1,7 @@
-$OpenBSD: patch-modules_audio_output_Makefile_in,v 1.5 2008/07/15 16:19:15 brad Exp $
+$OpenBSD: patch-modules_audio_output_Makefile_in,v 1.6 2009/01/16 04:11:18 jakemsr Exp $
 --- modules/audio_output/Makefile.in.orig	Tue Jul  8 17:35:44 2008
-+++ modules/audio_output/Makefile.in	Sun Jul 13 03:38:04 2008
-@@ -717,6 +717,7 @@ libarts_plugin_la_LDFLAGS = `$(VLC_CONFIG) --libs plug
- 	-rpath '$(libvlcdir)' -avoid-version -module -shrext $(LIBEXT)
- 
- libarts_plugin_la_LIBADD = $(LTLIBVLC)
-+libarts_plugin_la_EXTRALIBS = -lstdc++
- libarts_a_SOURCES = $(SOURCES_arts)
- libarts_builtin_la_SOURCES = $(SOURCES_arts)
- libarts_a_CFLAGS = `$(VLC_CONFIG) --cflags builtin pic arts`
-@@ -2069,7 +2070,7 @@ all-modules:
++++ modules/audio_output/Makefile.in	Tue Dec 30 03:57:22 2008
+@@ -2069,7 +2069,7 @@ all-modules:
  
  # Build a plugin with the adequate linker and linker's flags
  _plugin.a_plugin$(LIBEXT):
diff --git a/x11/vlc/pkg/DESCR-arts b/x11/vlc/pkg/DESCR-arts
deleted file mode 100644
index d5102e1664d..00000000000
--- a/x11/vlc/pkg/DESCR-arts
+++ /dev/null
@@ -1 +0,0 @@
-aRTs sound server output module for vlc.
diff --git a/x11/vlc/pkg/DESCR-esd b/x11/vlc/pkg/DESCR-esd
deleted file mode 100644
index 098ee4981ec..00000000000
--- a/x11/vlc/pkg/DESCR-esd
+++ /dev/null
@@ -1 +0,0 @@
-Esound sound server output module for vlc.
diff --git a/x11/vlc/pkg/PLIST-arts b/x11/vlc/pkg/PLIST-arts
deleted file mode 100644
index 3ff8599195e..00000000000
--- a/x11/vlc/pkg/PLIST-arts
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-arts,v 1.1 2007/11/11 01:37:54 jakemsr Exp $
-lib/vlc/audio_output/libarts_plugin.so
diff --git a/x11/vlc/pkg/PLIST-esd b/x11/vlc/pkg/PLIST-esd
deleted file mode 100644
index 3d77543b123..00000000000
--- a/x11/vlc/pkg/PLIST-esd
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-esd,v 1.1 2007/11/11 01:37:54 jakemsr Exp $
-lib/vlc/audio_output/libesd_plugin.so