diff --git a/audio/audacious-plugins/Makefile b/audio/audacious-plugins/Makefile
index 5691b122c7e..d6984652cc0 100644
--- a/audio/audacious-plugins/Makefile
+++ b/audio/audacious-plugins/Makefile
@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.11 2008/03/24 06:39:55 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.12 2008/04/02 00:39:19 fgsch Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT-main=	input and output plugins for audacious
 COMMENT-arts=	arts helper and plugin for audacious
 
-V=		1.3.5
+V=		1.5.0
 DISTNAME=	audacious-plugins-$V
-PKGNAME-main=	${DISTNAME}p2
-PKGNAME-arts=	audacious-arts-$Vp0
+PKGNAME-main=	${DISTNAME}
+PKGNAME-arts=	audacious-arts-$V
+
 CATEGORIES=	audio multimedia
 
 HOMEPAGE=	http://audacious-media-player.org/
@@ -19,11 +20,45 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
-MASTER_SITES=	http://static.audacious-media-player.org/release/
+WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+		Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
+		freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz \
+		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 png stdc++ z
+WANTLIB-main=	${WANTLIB} dbus-1 dbus-glib-1 mowgli ogg samplerate ossaudio \
+		xml2
+WANTLIB-arts=	${WANTLIB} c pthread
+
+MASTER_SITES=	http://distfiles.atheme.org/
+
 EXTRACT_SUFX=	.tgz
 
 MULTI_PACKAGES=	-main
 
+BUILD_DEPENDS=	${RUN_DEPENDS-main}
+
+RUN_DEPENDS-main=	:audacious->=1.4:audio/audacious
+RUN_DEPENDS-arts=	::audio/audacious-plugins,-main
+
+LIB_DEPENDS-main=	esd.>=2::audio/esound \
+			faad.>=1,mp4ff::audio/faad \
+			FLAC.>=7::audio/flac \
+			jack::audio/jack \
+			mp3lame::audio/lame \
+			mad::audio/libmad \
+			mpcdec.>=2::audio/libmpcdec \
+			sndfile.>=2::audio/libsndfile \
+			vorbis.>=5,vorbisfile.>=4,vorbisenc::audio/libvorbis \
+			tag.>=6:taglib->=1.4:audio/taglib \
+			audiofile::devel/libaudiofile \
+			SDL.>=6::devel/sdl \
+			curl.>=5::net/curl \
+			neon.>=26::net/neon
+LIB_DEPENDS-arts=	artsc.>=1::x11/kde/arts3
+
+USE_X11=	Yes
+USE_GMAKE=	Yes
+
 PSEUDO_FLAVORS=	no_arts
 FLAVOR?=
 
@@ -33,43 +68,32 @@ CONFIGURE_ARGS+=--disable-arts
 MULTI_PACKAGES+=-arts
 .endif
 
-USE_X11=	Yes
-NO_REGRESS=	Yes
+AUTOCONF_VERSION=	2.61
 
-WANTLIB=	X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \
-	 	Xcomposite Xdamage m z expat fontconfig freetype iconv intl \
-		pango-1.0 pangocairo-1.0 pangoft2-1.0 atk-1.0 cairo \
-		glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 \
-		gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 glitz png
-
-WANTLIB-main=	${WANTLIB} ossaudio stdc++ ogg xml2
-WANTLIB-arts=	${WANTLIB} Xext c pthread
-
-BUILD_DEPENDS=	${RUN_DEPENDS-main}
-
-RUN_DEPENDS-main=	:audacious->=1.2:audio/audacious
-RUN_DEPENDS-arts=	::audio/audacious-plugins,-main
-
-LIB_DEPENDS-main=	tag.>=6:taglib->=1.4:audio/taglib \
-			faad.>=1,mp4ff::audio/faad \
-			audiofile::devel/libaudiofile \
-			curl.>=5::net/curl \
-			SDL.>=6::devel/sdl \
-			vorbis.>=5,vorbisfile.>=4::audio/libvorbis \
-			mpcdec.>=2::audio/libmpcdec \
-			mad::audio/libmad \
-			mp3lame::audio/lame \
-			esd.>=2::audio/esound \
-			sndfile.>=1::audio/libsndfile
-LIB_DEPENDS-arts=	artsc.>=1::x11/kde/arts3
-
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autoconf
 CONFIGURE_ARGS+=	--enable-ipv6 \
 			--with-dev-dsp=/dev/audio \
-			--disable-flac \
-			--disable-jack
+			--disable-pulse \
+			--disable-altivec \
+			--disable-lirc \
+			--disable-rootvis \
+			--disable-adplug \
+			--disable-wavpack \
+			--disable-sid \
+			--disable-alsa \
+			--disable-amidiplug \
+			--disable-cdaudio \
+			--disable-mms \
+			--disable-mtp_up \
+			--disable-projectm \
+			--disable-projectm-1.0
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib" \
-			ac_cv_header_altivec_h=no
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+.if ${MACHINE_ARCH} != "amd64"
+CONFIGURE_ARGS+=	--disable-sse2
+.endif
+
+NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/audio/audacious-plugins/distinfo b/audio/audacious-plugins/distinfo
index 3b36e62b0ac..7ee7a3d46b5 100644
--- a/audio/audacious-plugins/distinfo
+++ b/audio/audacious-plugins/distinfo
@@ -1,5 +1,5 @@
-MD5 (audacious-plugins-1.3.5.tgz) = /2tZATZzN/gUnhXI+x/flQ==
-RMD160 (audacious-plugins-1.3.5.tgz) = U3zSQMVWDVfqYV0yLktmAnRIS+k=
-SHA1 (audacious-plugins-1.3.5.tgz) = jp2zarzs33+HkplFtA+0AzLbVyU=
-SHA256 (audacious-plugins-1.3.5.tgz) = quctiRNeeYmyFJ1Roe0/ui0rgpPEhS4ta/jqy3kRP3A=
-SIZE (audacious-plugins-1.3.5.tgz) = 2983930
+MD5 (audacious-plugins-1.5.0.tgz) = Qsgv//1XrKYSFBvBBrn1Hg==
+RMD160 (audacious-plugins-1.5.0.tgz) = CkTN2ZgZuXabWyYNxB1UYnimQDk=
+SHA1 (audacious-plugins-1.5.0.tgz) = fNFXsGY2dObCccsDU/uR4Gj5H34=
+SHA256 (audacious-plugins-1.5.0.tgz) = VmvIy3OWf4X8CMudbekP1OBm+n+hN2FLPHGpPq2vZVI=
+SIZE (audacious-plugins-1.5.0.tgz) = 2961507
diff --git a/audio/audacious-plugins/patches/patch-aclocal_m4 b/audio/audacious-plugins/patches/patch-aclocal_m4
new file mode 100644
index 00000000000..b2f593465d9
--- /dev/null
+++ b/audio/audacious-plugins/patches/patch-aclocal_m4
@@ -0,0 +1,11 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- aclocal.m4.orig	Mon Mar 31 21:44:46 2008
++++ aclocal.m4	Mon Mar 31 21:44:53 2008
+@@ -419,7 +419,6 @@ m4_include([m4/buildsys.m4])
+ m4_include([m4/gettext.m4])
+ m4_include([m4/iconv.m4])
+ m4_include([m4/isc-posix.m4])
+-m4_include([m4/jack.m4])
+ m4_include([m4/lib-ld.m4])
+ m4_include([m4/lib-link.m4])
+ m4_include([m4/lib-prefix.m4])
diff --git a/audio/audacious-plugins/patches/patch-buildsys_mk_in b/audio/audacious-plugins/patches/patch-buildsys_mk_in
new file mode 100644
index 00000000000..3a04c5ff50c
--- /dev/null
+++ b/audio/audacious-plugins/patches/patch-buildsys_mk_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-buildsys_mk_in,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- buildsys.mk.in.orig	Thu Mar 13 22:22:35 2008
++++ buildsys.mk.in	Sun Mar 23 17:23:07 2008
+@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam}
+ OBJS += ${OBJS5:.m=.o}
+ DEPS += ${OBJS:.o=.dep}
+ 
+-.SILENT:
++#.SILENT:
+ .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m
+ .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean
+ 
diff --git a/audio/audacious-plugins/patches/patch-configure b/audio/audacious-plugins/patches/patch-configure
deleted file mode 100644
index 0b76aeba72e..00000000000
--- a/audio/audacious-plugins/patches/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2007/06/26 17:11:39 steven Exp $
---- configure.orig	Thu Jun  7 17:44:42 2007
-+++ configure	Tue Jun 26 16:46:13 2007
-@@ -5357,7 +5357,7 @@ _ACEOF
- fi;
- 
- 
--INPUT_PLUGINS="tonegen console sexypsf wav cue alac metronom vtx"
-+INPUT_PLUGINS="tonegen console sexypsf wav alac metronom vtx"
- OUTPUT_PLUGINS="disk_writer null"
- EFFECT_PLUGINS="audiocompress ladspa voice_removal sndstretch stereo_plugin echo_plugin"
- GENERAL_PLUGINS="song_change alarm"
-@@ -7015,11 +7015,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-   echo "$as_me:$LINENO: result: SSE2 yes" >&5
- echo "${ECHO_T}SSE2 yes" >&6
- 
--cat >>confdefs.h <<\_ACEOF
-+#cat >>confdefs.h <<\_ACEOF
- #define HAVE_SSE2 1
--_ACEOF
-+#_ACEOF
- 
--  SIMD_CFLAGS=-msse2
-+#  SIMD_CFLAGS=-msse2
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
diff --git a/audio/audacious-plugins/patches/patch-configure_ac b/audio/audacious-plugins/patches/patch-configure_ac
new file mode 100644
index 00000000000..de3dadceb7c
--- /dev/null
+++ b/audio/audacious-plugins/patches/patch-configure_ac
@@ -0,0 +1,37 @@
+$OpenBSD: patch-configure_ac,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- configure.ac.orig	Thu Mar 13 22:22:35 2008
++++ configure.ac	Mon Mar 31 23:08:49 2008
+@@ -811,13 +811,21 @@ AC_ARG_ENABLE( jack,
+                 [enable_jack="yes"])
+ 
+ if test "x$enable_jack" = xyes; then
+-        AM_PATH_JACK(have_jack=yes, have_jack=no)
++	PKG_CHECK_MODULES(JACK, jack >= 0.109.10, , [AC_MSG_WARN(
++	[*** Cannot find jack 0.109.10 or newer, jack will not be built ***])
++	enable_jack=no])
+ else
+         AC_MSG_RESULT([*** jack plugin disabled per user request ***])
+-        have_jack=no
++        enable_jack=no
+ fi
+ 
+-if test "$have_jack" = yes; then
++if test "x$enable_jack" = xyes; then
++	PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.15, , [AC_MSG_WARN(
++	[Could not find libsamplerate, necessary for jack output plugin.])
++	enable_jack=no])
++fi
++
++if test "x$enable_jack" = xyes; then
+ 	OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
+ fi
+ 
+@@ -1636,7 +1644,7 @@ echo "  Open Sound System (oss):                $have_
+ echo "  Open Sound System v4 (oss4):            $have_oss4"
+ echo "  Advanced Linux Sound Arch. (alsa):      $have_alsa"
+ echo "  Enlightenment Sound Daemon (esd):       $have_esd"
+-echo "  Jack Audio Connection Kit (jack):       $have_jack"
++echo "  Jack Audio Connection Kit (jack):       $enable_jack"
+ echo "  Analog Realtime Synthesizer (arts):     $have_arts"
+ echo "  BSD/SUN audio output (sun):             $have_sun"
+ echo "  PulseAudio sound server (pulse_audio):  $have_pulse"
diff --git a/audio/audacious-plugins/patches/patch-m4_arts_m4 b/audio/audacious-plugins/patches/patch-m4_arts_m4
new file mode 100644
index 00000000000..917113e6ff7
--- /dev/null
+++ b/audio/audacious-plugins/patches/patch-m4_arts_m4
@@ -0,0 +1,12 @@
+$OpenBSD: patch-m4_arts_m4,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- m4/arts.m4.orig	Mon Mar 31 16:28:15 2008
++++ m4/arts.m4	Mon Mar 31 16:29:16 2008
+@@ -85,7 +85,7 @@ if test "$ARTSC_CONFIG" = "no"; then
+     no_artsc=yes
+ else
+     ARTSC_CFLAGS=`$ARTSC_CONFIG $artsc_config_args --cflags`
+-    ARTSC_LIBS=`$ARTSC_CONFIG $artsc_config_args --libs`
++    ARTSC_LIBS="`$ARTSC_CONFIG $artsc_config_args --libs` -lstdc++ -lm"
+     ARTSC_VERSION=`$ARTSC_CONFIG $artsc_config_args --version`
+ 
+     ARTSC_TEST_VERSION($ARTSC_VERSION, $min_artsc_version, ,no_artsc=version)
diff --git a/audio/audacious-plugins/patches/patch-m4_libFLAC_m4 b/audio/audacious-plugins/patches/patch-m4_libFLAC_m4
new file mode 100644
index 00000000000..9651f797804
--- /dev/null
+++ b/audio/audacious-plugins/patches/patch-m4_libFLAC_m4
@@ -0,0 +1,12 @@
+$OpenBSD: patch-m4_libFLAC_m4,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- m4/libFLAC.m4.orig	Mon Mar 31 23:57:52 2008
++++ m4/libFLAC.m4	Mon Mar 31 23:58:32 2008
+@@ -22,7 +22,7 @@ AC_ARG_ENABLE(libFLACtest, [  --disable-libFLACtest   
+     LIBFLAC_LIBS="-L$libdir"
+   fi
+ 
+-  LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
++  LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -logg -lm"
+ 
+   if test "x$libFLAC_includes" != "x" ; then
+     LIBFLAC_CFLAGS="-I$libFLAC_includes"
diff --git a/audio/audacious-plugins/patches/patch-mk_init_mk b/audio/audacious-plugins/patches/patch-mk_init_mk
deleted file mode 100644
index 0cdbcdd087a..00000000000
--- a/audio/audacious-plugins/patches/patch-mk_init_mk
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-mk_init_mk,v 1.1.1.1 2006/12/27 16:49:25 steven Exp $
---- mk/init.mk.orig	Mon Dec 25 09:36:45 2006
-+++ mk/init.mk	Mon Dec 25 09:36:56 2006
-@@ -1,5 +1,5 @@
- # Shut up GNU make
--.SILENT:
-+#.SILENT:
- 
- OBJECTIVE_DIRECTORIES = 
- OBJECTIVE_LIBS = 
-@@ -16,5 +16,5 @@ SHOW_CFLAGS ?= $(VERBOSE)
- LIBDIR = $(libdir)
- BINDIR = $(bindir)
- INCLUDEDIR = $(pkgincludedir)
--CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
--CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
-+CFLAGS += -DHAVE_CONFIG_H
-+CXXFLAGS += -DHAVE_CONFIG_H
diff --git a/audio/audacious-plugins/patches/patch-src_aac_Makefile b/audio/audacious-plugins/patches/patch-src_aac_Makefile
index 191b3439df3..636d24e4e88 100644
--- a/audio/audacious-plugins/patches/patch-src_aac_Makefile
+++ b/audio/audacious-plugins/patches/patch-src_aac_Makefile
@@ -1,11 +1,62 @@
-$OpenBSD: patch-src_aac_Makefile,v 1.1.1.1 2006/12/27 16:49:25 steven Exp $
---- src/aac/Makefile.orig	Mon Dec 25 10:09:37 2006
-+++ src/aac/Makefile	Mon Dec 25 10:10:53 2006
-@@ -1,6 +1,6 @@
- include ../../mk/rules.mk
- include ../../mk/init.mk
+$OpenBSD: patch-src_aac_Makefile,v 1.2 2008/04/02 00:39:19 fgsch Exp $
+--- src/aac/Makefile.orig	Wed Jan 30 03:29:49 2008
++++ src/aac/Makefile	Wed Jan 30 03:32:21 2008
+@@ -3,51 +3,7 @@ PLUGIN = aac${PLUGIN_SUFFIX}
+ SRCS = libmp4.c			\
+        mp4_utils.c		\
+        aac_utils.c		\
+-       tagging_mp4.c		\
+-       libfaad2/bits.c		\
+-       libfaad2/cfft.c		\
+-       libfaad2/decoder.c	\
+-       libfaad2/drc.c		\
+-       libfaad2/drm_dec.c	\
+-       libfaad2/error.c		\
+-       libfaad2/filtbank.c	\
+-       libfaad2/ic_predict.c	\
+-       libfaad2/is.c		\
+-       libfaad2/lt_predict.c	\
+-       libfaad2/mdct.c		\
+-       libfaad2/mp4.c		\
+-       libfaad2/ms.c		\
+-       libfaad2/output.c	\
+-       libfaad2/pns.c		\
+-       libfaad2/ps_dec.c	\
+-       libfaad2/ps_syntax.c	\
+-       libfaad2/pulse.c		\
+-       libfaad2/specrec.c	\
+-       libfaad2/syntax.c	\
+-       libfaad2/tns.c		\
+-       libfaad2/hcr.c		\
+-       libfaad2/huffman.c	\
+-       libfaad2/rvlc.c		\
+-       libfaad2/ssr.c		\
+-       libfaad2/ssr_fb.c	\
+-       libfaad2/ssr_ipqf.c	\
+-       libfaad2/common.c	\
+-       libfaad2/sbr_dct.c	\
+-       libfaad2/sbr_e_nf.c	\
+-       libfaad2/sbr_fbt.c	\
+-       libfaad2/sbr_hfadj.c	\
+-       libfaad2/sbr_hfgen.c	\
+-       libfaad2/sbr_huff.c	\
+-       libfaad2/sbr_qmf.c	\
+-       libfaad2/sbr_syntax.c	\
+-       libfaad2/sbr_tf_grid.c	\
+-       libfaad2/sbr_dec.c	\
+-       mp4ff/mp4ff.c		\
+-       mp4ff/mp4atom.c		\
+-       mp4ff/mp4meta.c		\
+-       mp4ff/mp4sample.c	\
+-       mp4ff/mp4util.c		\
+-       mp4ff/mp4tagupdate.c
++       tagging_mp4.c
  
--SUBDIRS = mp4ff libfaad2 src
-+SUBDIRS = src
+ include ../../buildsys.mk
+ include ../../extra.mk
+@@ -56,4 +12,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
  
- include ../../mk/objective.mk
+ CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
+ CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
+-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm
++LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MOWGLI_LIBS} -lm -L$(LOCALBASE)/lib -lfaad -lmp4ff
diff --git a/audio/audacious-plugins/patches/patch-src_aac_src_libmp4_c b/audio/audacious-plugins/patches/patch-src_aac_libmp4_c
similarity index 55%
rename from audio/audacious-plugins/patches/patch-src_aac_src_libmp4_c
rename to audio/audacious-plugins/patches/patch-src_aac_libmp4_c
index 3a12bc950a0..a2a5c184a31 100644
--- a/audio/audacious-plugins/patches/patch-src_aac_src_libmp4_c
+++ b/audio/audacious-plugins/patches/patch-src_aac_libmp4_c
@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_aac_src_libmp4_c,v 1.1 2007/06/29 06:05:46 jakemsr Exp $
---- src/aac/src/libmp4.c.orig	Thu May 31 17:12:45 2007
-+++ src/aac/src/libmp4.c	Thu May 31 17:20:57 2007
-@@ -388,13 +388,13 @@ static TitleInput *mp4_get_song_tuple(char *fn)
+$OpenBSD: patch-src_aac_libmp4_c,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- src/aac/libmp4.c.orig	Wed Jan 30 04:43:44 2008
++++ src/aac/libmp4.c	Wed Jan 30 04:46:43 2008
+@@ -347,13 +347,13 @@ static Tuple *mp4_get_song_tuple_base(char *filename, 
          gint mp4track= getAACTrack(mp4file);
          gint numSamples = mp4ff_num_samples(mp4file, mp4track);
          guint framesize = 1024;
--        gulong samplerate;
--        guchar channels;
-+        guint32 samplerate;
-+        guint8 channels;
+-        guint samplerate = 0;
+-        guchar channels = 0;
++        guint32 samplerate = 0;
++        guint8 channels = 0;
          gint msDuration;
          mp4AudioSpecificConfig mp4ASC;
          gchar *tmpval;
@@ -18,23 +18,23 @@ $OpenBSD: patch-src_aac_src_libmp4_c,v 1.1 2007/06/29 06:05:46 jakemsr Exp $
 +        guint32 bufferSize = 0;
          faacDecHandle decoder;
  
-         if (mp4track == -1)
-@@ -525,10 +525,10 @@ static int my_decode_mp4( InputPlayback *playback, cha
+         if (mp4track == -1) {
+@@ -479,10 +479,10 @@ static int my_decode_mp4( InputPlayback *playback, cha
      gint mp4track= getAACTrack(mp4file);
      faacDecHandle   decoder;
      mp4AudioSpecificConfig mp4ASC;
 -    guchar      *buffer = NULL;
 -    guint       bufferSize = 0;
--    gulong      samplerate;
--    guchar      channels;
+-    guint       samplerate = 0;
+-    guchar      channels = 0;
 +    guint8      *buffer = NULL;
-+    guint32       bufferSize = 0;
-+    guint32      samplerate;
-+    guint8      channels;
++    guint32     bufferSize = 0;
++    guint32     samplerate = 0;
++    guint8      channels = 0;
      gulong      msDuration;
-     gulong      numSamples;
+     guint       numSamples;
      gulong      sampleID = 1;
-@@ -674,11 +674,11 @@ static int my_decode_mp4( InputPlayback *playback, cha
+@@ -627,11 +627,11 @@ static int my_decode_mp4( InputPlayback *playback, cha
  void my_decode_aac( InputPlayback *playback, char *filename, VFSFile *file )
  {
      faacDecHandle   decoder = 0;
@@ -42,11 +42,11 @@ $OpenBSD: patch-src_aac_src_libmp4_c,v 1.1 2007/06/29 06:05:46 jakemsr Exp $
 +    guint8      streambuffer[BUFFER_SIZE];
      gulong      bufferconsumed = 0;
 -    gulong      samplerate = 0;
--    guchar      channels;
+-    guchar      channels = 0;
 -    gulong      buffervalid = 0;
-+    guint32      samplerate = 0;
-+    guint8      channels;
-+    guint32      buffervalid = 0;
-     TitleInput* input;
++    guint32     samplerate = 0;
++    guint8      channels = 0;
++    guint32     buffervalid = 0;
      gchar       *ttemp = NULL, *stemp = NULL;
      gchar       *temp = g_strdup(filename);
+     gchar       *xmmstitle = NULL;
diff --git a/audio/audacious-plugins/patches/patch-src_aac_src_Makefile b/audio/audacious-plugins/patches/patch-src_aac_src_Makefile
deleted file mode 100644
index f3eb831e79d..00000000000
--- a/audio/audacious-plugins/patches/patch-src_aac_src_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_aac_src_Makefile,v 1.3 2007/06/01 18:19:45 jakemsr Exp $
---- src/aac/src/Makefile.orig	Wed Apr  4 20:38:00 2007
-+++ src/aac/src/Makefile	Sun Apr  8 11:28:33 2007
-@@ -8,7 +8,7 @@ CFLAGS += $(PICFLAGS)
- # override objective make's LIBDIR
- LIBDIR = $(plugindir)/$(INPUT_PLUGIN_DIR)
- LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
--LDFLAGS += ../libfaad2/libfaad.a ../mp4ff/libmp4ff.a -lstdc++
-+LDFLAGS += -L$(LOCALBASE)/lib -lfaad -lmp4ff -lstdc++
- 
- SOURCES = libmp4.c mp4_utils.c aac_utils.c tagging_mp4.c
- 
diff --git a/audio/audacious-plugins/patches/patch-src_cdaudio_Makefile b/audio/audacious-plugins/patches/patch-src_cdaudio_Makefile
deleted file mode 100644
index 0f4202a0fb9..00000000000
--- a/audio/audacious-plugins/patches/patch-src_cdaudio_Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-$OpenBSD: patch-src_cdaudio_Makefile,v 1.2 2007/05/21 11:34:07 steven Exp $
---- src/cdaudio/Makefile.orig	Tue Jan 30 17:04:43 2007
-+++ src/cdaudio/Makefile	Sun Apr  8 11:19:45 2007
-@@ -11,5 +11,6 @@ SOURCES = cdaudio.c cddb.c cdinfo.c configure.c http.c
- OBJECTS = ${SOURCES:.c=.o}
- 
- CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../.. -I../..
-+LDFLAGS += -lossaudio
- 
- include ../../mk/objective.mk
diff --git a/audio/audacious-plugins/patches/patch-src_sun_audio_c b/audio/audacious-plugins/patches/patch-src_sun_audio_c
new file mode 100644
index 00000000000..213086e623d
--- /dev/null
+++ b/audio/audacious-plugins/patches/patch-src_sun_audio_c
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_sun_audio_c,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- src/sun/audio.c.orig	Mon Mar 31 02:47:49 2008
++++ src/sun/audio.c	Mon Mar 31 02:48:03 2008
+@@ -122,14 +122,12 @@ static void sun_setformat(AFormat fmt, int rate, int n
+ 	
+ 	sun = sun_format(fmt);
+ 
+-	effect.format.sun = sun;
+ 	effect.format.xmms = fmt;
+ 	effect.frequency = rate;
+ 	effect.channels = nch;
+ 	effect.bps = sun_bps(sun, rate, nch);
+ 
+ 	output.format.sun = sun;
+-	output.format.xmms = fmt;
+ 	output.frequency = rate;
+ 	output.channels = nch;
+ 	sun_setparams();
diff --git a/audio/audacious-plugins/pkg/PLIST-arts b/audio/audacious-plugins/pkg/PLIST-arts
index bd5f1f0b31d..bc6a33de11e 100644
--- a/audio/audacious-plugins/pkg/PLIST-arts
+++ b/audio/audacious-plugins/pkg/PLIST-arts
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST-arts,v 1.1.1.1 2006/12/27 16:49:25 steven Exp $
+@comment $OpenBSD: PLIST-arts,v 1.2 2008/04/02 00:39:19 fgsch Exp $
 bin/audacious-arts-helper
-lib/audacious/Output/libarts.so
+lib/audacious/Output/arts.so
diff --git a/audio/audacious-plugins/pkg/PLIST-main b/audio/audacious-plugins/pkg/PLIST-main
index 03ac3b80abf..7f9d51b7025 100644
--- a/audio/audacious-plugins/pkg/PLIST-main
+++ b/audio/audacious-plugins/pkg/PLIST-main
@@ -1,98 +1,105 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2007/05/21 11:34:07 steven Exp $
-include/audacious-plugins/
+@comment $OpenBSD: PLIST-main,v 1.3 2008/04/02 00:39:19 fgsch Exp $
+lib/audacious/
 lib/audacious/Container/
-lib/audacious/Container/libm3u.so
-lib/audacious/Container/libpls.so
-lib/audacious/Container/libstdio.so
-lib/audacious/Container/libxspf.so
+lib/audacious/Container/m3u.so
+lib/audacious/Container/pls.so
+lib/audacious/Container/xspf.so
 lib/audacious/Effect/
-lib/audacious/Effect/libaudiocompress.so
-lib/audacious/Effect/libecho.so
-lib/audacious/Effect/libladspa.so
-lib/audacious/Effect/libsndstretch.so
-lib/audacious/Effect/libstereo.so
-lib/audacious/Effect/libvoice_removal.so
+lib/audacious/Effect/audiocompress.so
+lib/audacious/Effect/echo.so
+lib/audacious/Effect/ladspa.so
+lib/audacious/Effect/sndstretch.so
+lib/audacious/Effect/stereo.so
+lib/audacious/Effect/voice_removal.so
 lib/audacious/General/
-lib/audacious/General/libalarm.so
-lib/audacious/General/libaosd.so
-lib/audacious/General/libcurl.so
-lib/audacious/General/libscrobbler.so
-lib/audacious/General/libsong_change.so
-lib/audacious/General/libstatusicon.so
+lib/audacious/General/alarm.so
+lib/audacious/General/aosd.so
+lib/audacious/General/gnomeshortcuts.so
+lib/audacious/General/hotkey.so
+lib/audacious/General/scrobbler.so
+lib/audacious/General/song_change.so
+lib/audacious/General/statusicon.so
 lib/audacious/Input/
-lib/audacious/Input/libaac.so
-lib/audacious/Input/libalac.so
-lib/audacious/Input/libcdaudio.so
-lib/audacious/Input/libconsole.so
-lib/audacious/Input/libmadplug.so
-lib/audacious/Input/libmetronom.so
-lib/audacious/Input/libmodplug.so
-lib/audacious/Input/libmpc.so
-lib/audacious/Input/libsexypsf.so
-lib/audacious/Input/libtimidity.so
-lib/audacious/Input/libtonegen.so
-lib/audacious/Input/libtta.so
-lib/audacious/Input/libvorbis.so
-lib/audacious/Input/libvtx.so
-lib/audacious/Input/libwav.so
-lib/audacious/Input/libwma.so
+lib/audacious/Input/aac.so
+lib/audacious/Input/alac.so
+lib/audacious/Input/console.so
+lib/audacious/Input/cuesheet.so
+lib/audacious/Input/demac.so
+lib/audacious/Input/flacng.so
+lib/audacious/Input/madplug.so
+lib/audacious/Input/metronom.so
+lib/audacious/Input/modplug.so
+lib/audacious/Input/musepack.so
+lib/audacious/Input/sexypsf.so
+lib/audacious/Input/sndfile.so
+lib/audacious/Input/timidity.so
+lib/audacious/Input/tonegen.so
+lib/audacious/Input/tta.so
+lib/audacious/Input/vorbis.so
+lib/audacious/Input/vtx.so
+lib/audacious/Input/wma.so
 lib/audacious/Output/
-lib/audacious/Output/libESD.so
-lib/audacious/Output/libOSS.so
-lib/audacious/Output/libdisk_writer.so
-lib/audacious/Output/liblame.so
-lib/audacious/Output/libnull.so
-lib/audacious/Output/libsun.so
+lib/audacious/Output/ESD.so
+lib/audacious/Output/OSS.so
+lib/audacious/Output/filewriter.so
+lib/audacious/Output/jackout.so
+lib/audacious/Output/null.so
+lib/audacious/Output/sun.so
+lib/audacious/Transport/
+lib/audacious/Transport/lastfm.so
+lib/audacious/Transport/neon.so
+lib/audacious/Transport/stdio.so
 lib/audacious/Visualization/
-lib/audacious/Visualization/libbscope.so
-lib/audacious/Visualization/libparanormal.so
-lib/audacious/Visualization/librocklight.so
-lib/audacious/Visualization/librovascope.so
-lib/audacious/Visualization/libspectrum.so
-share/audacious-plugins/
-share/audacious-plugins/paranormal/
-share/audacious-plugins/paranormal/Presets/
-share/audacious-plugins/paranormal/Presets/aerdan_-_bloody_vortex.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_cloudscape.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_cloudscape2.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_dancing_snow.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_portal_to_hell.pnv
-share/audacious-plugins/paranormal/Presets/aerdan_-_telestatic.pnv
-share/audacious-plugins/paranormal/Presets/nazca_-_smoke_on_the_water.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_3d_wave.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_aquamarine_dream.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_beatscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_branchscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_bumblebees.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_cubism.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_flying_into_pastels.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_interlaced.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_kaliedoscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_phosphor_flame.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_psuedo_starfield.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_purple_flower.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_quakingscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_quasar.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_retroscope.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_rush.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_scopefun.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_smoke.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_swarm.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_transform_fun.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_trapped.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_tunnel_vision.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_value_replace_fun.pnv
-share/audacious-plugins/paranormal/Presets/nenolod_-_worms.pnv
-share/audacious-plugins/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
+lib/audacious/Visualization/blur_scope.so
+lib/audacious/Visualization/paranormal.so
+lib/audacious/Visualization/rocklight.so
+lib/audacious/Visualization/spectrum.so
 share/audacious/images/audioscrobbler.png
 share/audacious/images/audioscrobbler_badge.png
+share/audacious/paranormal/
+share/audacious/paranormal/Presets/
+share/audacious/paranormal/Presets/aerdan_-_bloody_vortex.pnv
+share/audacious/paranormal/Presets/aerdan_-_cloudscape.pnv
+share/audacious/paranormal/Presets/aerdan_-_cloudscape2.pnv
+share/audacious/paranormal/Presets/aerdan_-_dancing_snow.pnv
+share/audacious/paranormal/Presets/aerdan_-_portal_to_hell.pnv
+share/audacious/paranormal/Presets/aerdan_-_telestatic.pnv
+share/audacious/paranormal/Presets/nazca_-_smoke_on_the_water.pnv
+share/audacious/paranormal/Presets/nenolod_-_3d_wave.pnv
+share/audacious/paranormal/Presets/nenolod_-_aquamarine_dream.pnv
+share/audacious/paranormal/Presets/nenolod_-_beatscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_branchscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_bumblebees.pnv
+share/audacious/paranormal/Presets/nenolod_-_cubism.pnv
+share/audacious/paranormal/Presets/nenolod_-_flying_into_pastels.pnv
+share/audacious/paranormal/Presets/nenolod_-_interlaced.pnv
+share/audacious/paranormal/Presets/nenolod_-_kaliedoscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_phosphor_flame.pnv
+share/audacious/paranormal/Presets/nenolod_-_psuedo_starfield.pnv
+share/audacious/paranormal/Presets/nenolod_-_purple_flower.pnv
+share/audacious/paranormal/Presets/nenolod_-_quakingscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_quasar.pnv
+share/audacious/paranormal/Presets/nenolod_-_retroscope.pnv
+share/audacious/paranormal/Presets/nenolod_-_rush.pnv
+share/audacious/paranormal/Presets/nenolod_-_scopefun.pnv
+share/audacious/paranormal/Presets/nenolod_-_simple_yet_pretty.pnv
+share/audacious/paranormal/Presets/nenolod_-_smoke.pnv
+share/audacious/paranormal/Presets/nenolod_-_swarm.pnv
+share/audacious/paranormal/Presets/nenolod_-_technicolour_nightmare.pnv
+share/audacious/paranormal/Presets/nenolod_-_transform_fun.pnv
+share/audacious/paranormal/Presets/nenolod_-_trapped.pnv
+share/audacious/paranormal/Presets/nenolod_-_tunnel_vision.pnv
+share/audacious/paranormal/Presets/nenolod_-_value_replace_fun.pnv
+share/audacious/paranormal/Presets/nenolod_-_worms.pnv
+share/audacious/paranormal/Presets/ticpu_-_colored_beat-o-scope.pnv
 share/locale/ca/LC_MESSAGES/audacious-plugins.mo
 share/locale/cs/LC_MESSAGES/audacious-plugins.mo
 share/locale/cy/LC_MESSAGES/audacious-plugins.mo
 share/locale/de/LC_MESSAGES/audacious-plugins.mo
+share/locale/et/LC_MESSAGES/audacious-plugins.mo
+share/locale/fr/LC_MESSAGES/audacious-plugins.mo
 share/locale/ja/LC_MESSAGES/audacious-plugins.mo
+share/locale/ro/LC_MESSAGES/audacious-plugins.mo
 share/locale/ru/LC_MESSAGES/audacious-plugins.mo
 share/locale/sk/LC_MESSAGES/audacious-plugins.mo
 share/locale/tr/LC_MESSAGES/audacious-plugins.mo
diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile
index 5f5eec9aca5..a1e306d2d3a 100644
--- a/audio/audacious/Makefile
+++ b/audio/audacious/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.7 2007/12/15 18:56:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2008/04/02 00:39:19 fgsch Exp $
 
 SHARED_ONLY=	Yes
 
-COMMENT=	GTK+-2 media player based on BMP and XMMS
+COMMENT=	gtk+2 media player based on BMP and XMMS
 
-DISTNAME=	audacious-1.3.2
-PKGNAME=	${DISTNAME}p1
-SHARED_LIBS=	audacious	5.0
-CATEGORIES=	audio
+DISTNAME=	audacious-1.5.0
+SHARED_LIBS=	audclient	0.0
+
+CATEGORIES=	audio multimedia
 
 HOMEPAGE=	http://audacious-media-player.org/
 
@@ -17,26 +17,41 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
-MASTER_SITES=	http://static.audacious-media-player.org/release/
-EXTRACT_SUFX=	.tgz
+WANTLIB=	ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+		Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
+		fontconfig freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
+		gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+		png pthread z
 
-USE_X11=	Yes
-NO_REGRESS=	Yes
+MASTER_SITES=	http://distfiles.atheme.org/
+
+EXTRACT_SUFX=	.tgz
 
 MODULES=	devel/gettext
 
-WANTLIB=	X11 Xau Xdmcp Xrender Xcursor Xext Xfixes Xi Xinerama Xrandr \
-		Xcomposite Xdamage expat fontconfig freetype m z c pthread \
-		glib-2.0 gthread-2.0 gmodule-2.0 gobject-2.0 gdk_pixbuf-2.0 \
-		gdk-x11-2.0 gtk-x11-2.0 atk-1.0 cairo glitz png \
-		pango-1.0 pangocairo-1.0 pangoft2-1.0 stdc++ xml2
-
+BUILD_DEPENDS=	:libxml-*:textproc/libxml
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS=	glade-2.0.>=0.3::devel/libglade2 \
-		mcs::devel/mcs
+LIB_DEPENDS=	samplerate::audio/libsamplerate \
+		mcs::devel/mcs \
+		mowgli::devel/mowgli \
+		dbus-glib-1::x11/dbus-glib \
+		dbus-1.>=6::x11/dbus \
+		gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
 
-MAKE_ENV=	LIBaudacious_VERSION=${LIBaudacious_VERSION}
+MAKE_ENV=	LIBaudclient_VERSION=${LIBaudclient_VERSION}
 
-CONFIGURE_STYLE=gnu
+USE_X11=	Yes
+USE_GMAKE=	Yes
+
+AUTOCONF_VERSION=2.61
+CONFIGURE_STYLE= autoconf
+CONFIGURE_ARGS=	--enable-samplerate
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+
+.if ${MACHINE_ARCH} != "amd64"
+CONFIGURE_ARGS+=	--disable-sse2
+.endif
+
+NO_REGRESS=	Yes
 
 .include <bsd.port.mk>
diff --git a/audio/audacious/distinfo b/audio/audacious/distinfo
index 67e5b72b2f4..40dd8875003 100644
--- a/audio/audacious/distinfo
+++ b/audio/audacious/distinfo
@@ -1,5 +1,5 @@
-MD5 (audacious-1.3.2.tgz) = t4SjBgSi+dhOnaMQBp9D+Q==
-RMD160 (audacious-1.3.2.tgz) = +PqTPdlZzgIEe9J7Aam4vGyrCLg=
-SHA1 (audacious-1.3.2.tgz) = j8WRLNijrJi5Xm+5zSwjfPanjOg=
-SHA256 (audacious-1.3.2.tgz) = zMihkNbptfYDuuVfxkLdsm+rKFtednBFkrfpXYL+7u8=
-SIZE (audacious-1.3.2.tgz) = 1730554
+MD5 (audacious-1.5.0.tgz) = 6mMbaetU6X1gvzxSrmx+Yg==
+RMD160 (audacious-1.5.0.tgz) = vB//JHHuH45+2E9K7QYLVyQJhT8=
+SHA1 (audacious-1.5.0.tgz) = Ng9ppjgjSTYglTWhYQVRs9ChEiY=
+SHA256 (audacious-1.5.0.tgz) = JaTnLKRMIii0EkbfZirmqWt+vNVhr/rNwN2D697gIyI=
+SIZE (audacious-1.5.0.tgz) = 1946403
diff --git a/audio/audacious/patches/patch-buildsys_mk_in b/audio/audacious/patches/patch-buildsys_mk_in
new file mode 100644
index 00000000000..31ac4dfc81b
--- /dev/null
+++ b/audio/audacious/patches/patch-buildsys_mk_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-buildsys_mk_in,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- buildsys.mk.in.orig	Thu Mar 13 22:19:27 2008
++++ buildsys.mk.in	Sun Mar 23 05:55:30 2008
+@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam}
+ OBJS += ${OBJS5:.m=.o}
+ DEPS += ${OBJS:.o=.dep}
+ 
+-.SILENT:
++#.SILENT:
+ .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m
+ .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean
+ 
diff --git a/audio/audacious/patches/patch-m4_buildsys_m4 b/audio/audacious/patches/patch-m4_buildsys_m4
new file mode 100644
index 00000000000..a6c089d28a3
--- /dev/null
+++ b/audio/audacious/patches/patch-m4_buildsys_m4
@@ -0,0 +1,20 @@
+$OpenBSD: patch-m4_buildsys_m4,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- m4/buildsys.m4.orig	Thu Mar 13 22:19:27 2008
++++ m4/buildsys.m4	Wed Apr  2 01:35:47 2008
+@@ -106,14 +106,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
+ 			AC_MSG_RESULT(POSIX)
+ 			LIB_CPPFLAGS='-DPIC'
+ 			LIB_CFLAGS='-fPIC'
+-			LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}.${LIB_MAJOR}'
++			LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}'
+ 			LIB_PREFIX='lib'
+ 			LIB_SUFFIX='.so'
+ 			PLUGIN_CPPFLAGS='-DPIC'
+ 			PLUGIN_CFLAGS='-fPIC'
+ 			PLUGIN_LDFLAGS='-shared -fPIC'
+ 			PLUGIN_SUFFIX='.so'
+-			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
++			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
+ 			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
+ 			CLEAN_LIB=''
+ 			;;
diff --git a/audio/audacious/patches/patch-mk_init_mk b/audio/audacious/patches/patch-mk_init_mk
deleted file mode 100644
index a39ba79ce52..00000000000
--- a/audio/audacious/patches/patch-mk_init_mk
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-mk_init_mk,v 1.1.1.1 2006/12/27 16:46:09 steven Exp $
---- mk/init.mk.orig	Mon Dec 25 09:32:33 2006
-+++ mk/init.mk	Mon Dec 25 09:33:12 2006
-@@ -1,5 +1,5 @@
- # Shut up GNU make
--.SILENT:
-+#.SILENT:
- 
- OBJECTIVE_DIRECTORIES = 
- OBJECTIVE_LIBS = 
-@@ -16,5 +16,5 @@ SHOW_CFLAGS ?= $(VERBOSE)
- LIBDIR = $(libdir)
- BINDIR = $(bindir)
- INCLUDEDIR = $(pkgincludedir)
--CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
--CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/xorg/include
-+CFLAGS += -DHAVE_CONFIG_H
-+CXXFLAGS += -DHAVE_CONFIG_H
diff --git a/audio/audacious/patches/patch-src_audacious_playlist_c b/audio/audacious/patches/patch-src_audacious_playlist_c
new file mode 100644
index 00000000000..22ed0a51df6
--- /dev/null
+++ b/audio/audacious/patches/patch-src_audacious_playlist_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_audacious_playlist_c,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- src/audacious/playlist.c.orig	Sun Mar 23 07:30:06 2008
++++ src/audacious/playlist.c	Sun Mar 23 07:30:38 2008
+@@ -2534,7 +2534,7 @@ playlist_fileinfo_current(Playlist *playlist)
+ 
+     PLAYLIST_UNLOCK(playlist);
+ 
+-    if (playlist->position->decoder != NULL && playlist->position->decoder->update_song_tuple != NULL &&
++    if (playlist->position != NULL && playlist->position->decoder != NULL && playlist->position->decoder->update_song_tuple != NULL &&
+         playlist->position->decoder->file_info_box == NULL && path != NULL && !vfs_is_remote(path)) {
+ 
+         fileinfo_show_editor_for_path(path, playlist->position->decoder);
diff --git a/audio/audacious/patches/patch-src_libaudacious_Makefile b/audio/audacious/patches/patch-src_libaudacious_Makefile
deleted file mode 100644
index 289701a7879..00000000000
--- a/audio/audacious/patches/patch-src_libaudacious_Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_libaudacious_Makefile,v 1.1 2007/05/21 11:30:26 steven Exp $
---- src/libaudacious/Makefile.orig	Mon Feb 26 15:14:54 2007
-+++ src/libaudacious/Makefile	Sun Apr  8 11:03:40 2007
-@@ -3,9 +3,7 @@ include ../../mk/init.mk
- 
- PICLDFLAGS = $(LIBLDFLAGS)
- 
--OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX)
--OBJECTIVE_SONAME_SUFFIX = 5
--LIBAUDACIOUS_SUFFIX = 5.0.0
-+OBJECTIVE_LIBS = libaudacious$(SHARED_SUFFIX).${LIBaudacious_VERSION}
- 
- LIBADD = \
- 	$(GTK_LIBS) \
-@@ -33,8 +31,3 @@ HEADERS = \
- include ../../mk/objective.mk
- 
- install-posthook:
--	@mv ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX) ${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).$(LIBAUDACIOUS_SUFFIX)
--	@ln -sf libaudacious$(SHARED_SUFFIX).$(LIBAUDACIOUS_SUFFIX) \
--		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX).5
--	@ln -sf libaudacious$(SHARED_SUFFIX).5 \
--		${DESTDIR}/${LIBDIR}/libaudacious$(SHARED_SUFFIX)
diff --git a/audio/audacious/patches/patch-src_libaudclient_Makefile b/audio/audacious/patches/patch-src_libaudclient_Makefile
new file mode 100644
index 00000000000..cc218451d24
--- /dev/null
+++ b/audio/audacious/patches/patch-src_libaudclient_Makefile
@@ -0,0 +1,9 @@
+$OpenBSD: patch-src_libaudclient_Makefile,v 1.1 2008/04/02 00:39:19 fgsch Exp $
+--- src/libaudclient/Makefile.orig	Wed Jan 30 01:51:39 2008
++++ src/libaudclient/Makefile	Wed Jan 30 01:52:13 2008
+@@ -1,4 +1,4 @@
+-LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}
++LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}.${LIBaudclient_VERSION}
+ LIB_MAJOR = 1
+ LIB_MINOR = 0
+ 
diff --git a/audio/audacious/pkg/PLIST b/audio/audacious/pkg/PLIST
index b525fb4a38f..6159609721f 100644
--- a/audio/audacious/pkg/PLIST
+++ b/audio/audacious/pkg/PLIST
@@ -1,36 +1,50 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/12/15 18:56:35 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.4 2008/04/02 00:39:19 fgsch Exp $
 bin/audacious
 bin/audtool
 include/audacious/
-include/audacious/beepctrl.h
+include/audacious/audctrl.h
+include/audacious/auddrct.h
 include/audacious/configdb.h
+include/audacious/custom_uri.h
+include/audacious/dbus-service.h
+include/audacious/dbus.h
+include/audacious/discovery.h
+include/audacious/eventqueue.h
+include/audacious/flow.h
 include/audacious/formatter.h
 include/audacious/hook.h
 include/audacious/i18n.h
 include/audacious/id3tag.h
 include/audacious/input.h
 include/audacious/main.h
+include/audacious/mime.h
 include/audacious/output.h
+include/audacious/playback.h
 include/audacious/playlist.h
 include/audacious/playlist_container.h
 include/audacious/plugin.h
 include/audacious/rcfile.h
 include/audacious/strings.h
-include/audacious/titlestring.h
+include/audacious/tuple.h
+include/audacious/tuple_compiler.h
+include/audacious/tuple_formatter.h
 include/audacious/ui_fileinfopopup.h
+include/audacious/ui_plugin_menu.h
 include/audacious/ui_preferences.h
 include/audacious/util.h
 include/audacious/vfs.h
 include/audacious/vfs_buffer.h
 include/audacious/vfs_buffered_file.h
-include/audacious/xconvert.h
-lib/audacious/
-lib/audacious/libaudid3tag.so
-@lib lib/libaudacious.so.${LIBaudacious_VERSION}
+include/libSAD/
+include/libSAD/common.h
+include/libSAD/dither.h
+include/libSAD/libSAD.h
+@lib lib/libaudclient.so.${LIBaudclient_VERSION}
+lib/libaudid3tag.so
 lib/pkgconfig/audacious.pc
+lib/pkgconfig/audclient.pc
 @man man/man1/audacious.1
 @man man/man1/audtool.1
-share/applications/
 share/applications/audacious.desktop
 share/audacious/
 share/audacious/Skins/
@@ -47,16 +61,148 @@ share/audacious/Skins/Classic/pledit.png
 share/audacious/Skins/Classic/pledit.txt
 share/audacious/Skins/Classic/posbar.png
 share/audacious/Skins/Classic/shufrep.png
+share/audacious/Skins/Classic/skin-classic.hints
 share/audacious/Skins/Classic/skin.hints
 share/audacious/Skins/Classic/text.png
 share/audacious/Skins/Classic/titlebar.png
 share/audacious/Skins/Classic/viscolor.txt
 share/audacious/Skins/Classic/volume.png
+share/audacious/Skins/Classic1.3/
+share/audacious/Skins/Classic1.3/balance.png
+share/audacious/Skins/Classic1.3/cbuttons.png
+share/audacious/Skins/Classic1.3/eq_ex.png
+share/audacious/Skins/Classic1.3/eqmain.png
+share/audacious/Skins/Classic1.3/main.png
+share/audacious/Skins/Classic1.3/monoster.png
+share/audacious/Skins/Classic1.3/nums_ex.png
+share/audacious/Skins/Classic1.3/playpaus.png
+share/audacious/Skins/Classic1.3/pledit.png
+share/audacious/Skins/Classic1.3/pledit.txt
+share/audacious/Skins/Classic1.3/posbar.png
+share/audacious/Skins/Classic1.3/shufrep.png
+share/audacious/Skins/Classic1.3/skin-classic.hints
+share/audacious/Skins/Classic1.3/skin.hints
+share/audacious/Skins/Classic1.3/text.png
+share/audacious/Skins/Classic1.3/titlebar.png
+share/audacious/Skins/Classic1.3/viscolor.txt
+share/audacious/Skins/Classic1.3/volume.png
 share/audacious/Skins/Default/
-share/audacious/Skins/Default/balance.png
 share/audacious/Skins/Default/cbuttons.png
 share/audacious/Skins/Default/eq_ex.png
 share/audacious/Skins/Default/eqmain.png
+share/audacious/Skins/Default/gtk-2.0/
+share/audacious/Skins/Default/gtk-2.0/Arrows/
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-down.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-insens.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-left.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-right.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-up.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-insensitive.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-normal.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check1.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check2.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check3.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check4.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check5.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check6.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option1.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option2.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option3.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option4.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option5.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option6.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame.png
+share/audacious/Skins/Default/gtk-2.0/Handles/
+share/audacious/Skins/Default/gtk-2.0/Handles/handle-h.png
+share/audacious/Skins/Default/gtk-2.0/Handles/handle-v.png
+share/audacious/Skins/Default/gtk-2.0/Lines/
+share/audacious/Skins/Default/gtk-2.0/Lines/line-h.png
+share/audacious/Skins/Default/gtk-2.0/Lines/line-v.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menu.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png
+share/audacious/Skins/Default/gtk-2.0/Others/
+share/audacious/Skins/Default/gtk-2.0/Others/null.png
+share/audacious/Skins/Default/gtk-2.0/Others/ruler.png
+share/audacious/Skins/Default/gtk-2.0/Panel/
+share/audacious/Skins/Default/gtk-2.0/Panel/panel-bg.png
+share/audacious/Skins/Default/gtk-2.0/ProgressBar/
+share/audacious/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Range/
+share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-vert.png
+share/audacious/Skins/Default/gtk-2.0/Range/trough-horizontal.png
+share/audacious/Skins/Default/gtk-2.0/Range/trough-vertical.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/
+share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-in.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-out.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/text-.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/text-entry.png
+share/audacious/Skins/Default/gtk-2.0/Spin/
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-disable.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-disable.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-top.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-top.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-current.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/notebook.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top.png
+share/audacious/Skins/Default/gtk-2.0/Toolbar/
+share/audacious/Skins/Default/gtk-2.0/Toolbar/toolbar.png
+share/audacious/Skins/Default/gtk-2.0/gtkrc
+share/audacious/Skins/Default/gtk-2.0/panel.rc
 share/audacious/Skins/Default/main.png
 share/audacious/Skins/Default/monoster.png
 share/audacious/Skins/Default/nums_ex.png
@@ -106,6 +252,23 @@ share/audacious/Skins/Osmosis/text.png
 share/audacious/Skins/Osmosis/titlebar.png
 share/audacious/Skins/Osmosis/viscolor.txt
 share/audacious/Skins/Osmosis/volume.png
+share/audacious/Skins/Refugee/
+share/audacious/Skins/Refugee/cbuttons.png
+share/audacious/Skins/Refugee/eq_ex.png
+share/audacious/Skins/Refugee/eqmain.png
+share/audacious/Skins/Refugee/main.png
+share/audacious/Skins/Refugee/monoster.png
+share/audacious/Skins/Refugee/nums_ex.png
+share/audacious/Skins/Refugee/playpaus.png
+share/audacious/Skins/Refugee/pledit.png
+share/audacious/Skins/Refugee/pledit.txt
+share/audacious/Skins/Refugee/posbar.png
+share/audacious/Skins/Refugee/shufrep.png
+share/audacious/Skins/Refugee/skin.hints
+share/audacious/Skins/Refugee/text.png
+share/audacious/Skins/Refugee/titlebar.png
+share/audacious/Skins/Refugee/viscolor.txt
+share/audacious/Skins/Refugee/volume.png
 share/audacious/Skins/TinyPlayer/
 share/audacious/Skins/TinyPlayer/balance.png
 share/audacious/Skins/TinyPlayer/cbuttons.png
@@ -124,20 +287,25 @@ share/audacious/Skins/TinyPlayer/text.png
 share/audacious/Skins/TinyPlayer/titlebar.png
 share/audacious/Skins/TinyPlayer/viscolor.txt
 share/audacious/Skins/TinyPlayer/volume.png
-share/audacious/glade/
-share/audacious/glade/fileinfo.glade
-share/audacious/glade/prefswin.glade
 share/audacious/images/
 share/audacious/images/about-logo.png
 share/audacious/images/appearance.png
+share/audacious/images/audacious_eq.xpm
 share/audacious/images/audacious_player.xpm
+share/audacious/images/audacious_playlist.xpm
 share/audacious/images/audio.png
 share/audacious/images/connectivity.png
-share/audacious/images/eq.png
+share/audacious/images/menu_playlist.png
+share/audacious/images/menu_plugin.png
+share/audacious/images/menu_queue_toggle.png
+share/audacious/images/menu_randomize_playlist.png
 share/audacious/images/mouse.png
+share/audacious/images/playback.png
 share/audacious/images/playlist.png
 share/audacious/images/plugins.png
+share/audacious/images/replay_gain.png
 share/audacious/ui/
+share/audacious/ui/carbon-menubar.ui
 share/audacious/ui/equalizer.ui
 share/audacious/ui/mainwin.ui
 share/audacious/ui/playlist.ui
@@ -149,6 +317,7 @@ share/locale/cy/LC_MESSAGES/audacious.mo
 share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
 share/locale/es/LC_MESSAGES/audacious.mo
+share/locale/et/LC_MESSAGES/audacious.mo
 share/locale/fi/LC_MESSAGES/audacious.mo
 share/locale/fr/LC_MESSAGES/audacious.mo
 share/locale/hi/LC_MESSAGES/audacious.mo