diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index c3e415edd34..ad4ab825528 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2005/09/07 01:27:55 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2005/09/18 12:21:41 espie Exp $
 
 CATEGORIES=	audio x11 x11/kde
 COMMENT=	'music player for kde'
@@ -31,10 +31,8 @@ WANTLIB+=	gtk gmodule gdk glib
 SHARED_ONLY=Yes
 MODULES=	x11/kde
 MODKDE_LIBTOOL=		Yes
-MODKDE_VERSION=		
+MODKDE_VERSION=		3.5
 CONFIGURE_STYLE=	autoconf
-AUTOCONF=		/bin/sh ${WRKDIST}/admin/cvs.sh configure
-LIB_DEPENDS+=		lib/qt3/qt-mt.3.33::x11/qt3,mt
 AUTOCONF_VERSION=	2.59
 CONFIGURE_ARGS+=	${MODKDE_CONFIGURE_ARGS}
 USE_GMAKE?=		Yes
diff --git a/audio/amarok/patches/patch-acinclude_m4 b/audio/amarok/patches/patch-acinclude_m4
deleted file mode 100644
index 5473d564ea5..00000000000
--- a/audio/amarok/patches/patch-acinclude_m4
+++ /dev/null
@@ -1,69 +0,0 @@
-$OpenBSD: patch-acinclude_m4,v 1.1 2005/09/07 01:27:55 espie Exp $
---- acinclude.m4.orig	Sun Sep  4 22:47:19 2005
-+++ acinclude.m4	Tue Sep  6 22:06:47 2005
-@@ -6559,6 +6559,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-+  netbsd* | freebsd* | openbsd* | darwin* )
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    ;;
-+
-  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-@@ -8099,13 +8112,7 @@ nto-qnx*)
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
--  else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
--  fi
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- osf3* | osf4* | osf5*)
-@@ -9079,6 +9086,22 @@ case $host_os in
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+      # C++ shared libraries are fairly broken
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+  openbsd*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      fi
-+      output_verbose_link_cmd='echo'
-+      ;;
-   osf3*)
-     case $cc_basename in
-       KCC)
-@@ -11407,6 +11430,7 @@ EOF
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
diff --git a/audio/amarok/patches/patch-admin_cvs_sh b/audio/amarok/patches/patch-admin_cvs_sh
deleted file mode 100644
index 75367f18a3d..00000000000
--- a/audio/amarok/patches/patch-admin_cvs_sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-admin_cvs_sh,v 1.1 2005/09/07 01:27:55 espie Exp $
---- admin/cvs.sh.orig	Sun Sep  4 22:47:19 2005
-+++ admin/cvs.sh	Tue Sep  6 22:08:26 2005
-@@ -630,7 +630,10 @@ fi
- 
- # Call script to find autoconf and friends.  Uses eval since the script outputs
- # sh-compatible code.
--eval `$admindir/detect-autoconf.pl`
-+AUTOCONF=autoconf
-+AUTOHEADER=autoheader
-+AUTOM4TE=autom4te-2.59
-+ACLOCAL=aclocal
- 
- ###
- ### Main
diff --git a/audio/amarok/patches/patch-admin_libtool_m4_in b/audio/amarok/patches/patch-admin_libtool_m4_in
deleted file mode 100644
index 4ea512b4d9b..00000000000
--- a/audio/amarok/patches/patch-admin_libtool_m4_in
+++ /dev/null
@@ -1,69 +0,0 @@
-$OpenBSD: patch-admin_libtool_m4_in,v 1.1 2005/09/07 01:27:55 espie Exp $
---- admin/libtool.m4.in.orig	Sun Sep  4 22:47:19 2005
-+++ admin/libtool.m4.in	Tue Sep  6 22:06:47 2005
-@@ -672,6 +672,19 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
-+  netbsd* | freebsd* | openbsd* | darwin* )
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    ;;
-+
-  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-@@ -2212,13 +2225,7 @@ nto-qnx*)
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
--  else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
--  fi
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
- osf3* | osf4* | osf5*)
-@@ -3192,6 +3199,22 @@ case $host_os in
-     # Workaround some broken pre-1.5 toolchains
-     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-     ;;
-+  openbsd2*)
-+      # C++ shared libraries are fairly broken
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+  openbsd*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      fi
-+      output_verbose_link_cmd='echo'
-+      ;;
-   osf3*)
-     case $cc_basename in
-       KCC)
-@@ -5520,6 +5543,7 @@ EOF
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-       else
diff --git a/audio/amarok/patches/patch-admin_ltmain_sh b/audio/amarok/patches/patch-admin_ltmain_sh
deleted file mode 100644
index 8e399807462..00000000000
--- a/audio/amarok/patches/patch-admin_ltmain_sh
+++ /dev/null
@@ -1,52 +0,0 @@
-$OpenBSD: patch-admin_ltmain_sh,v 1.1 2005/09/07 01:27:55 espie Exp $
---- admin/ltmain.sh.orig	Sun Sep  4 22:47:19 2005
-+++ admin/ltmain.sh	Tue Sep  6 22:06:47 2005
-@@ -1307,6 +1307,17 @@ EOF
- 	continue
- 	;;
- 
-+      -pthread)
-+        case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -2003,6 +2014,30 @@ EOF
- 	  fi
- 	  continue
- 	  ;;
-+	-pthread)
-+	  case $linkmode in
-+	  lib)
-+	    deplibs="$deplib $deplibs"
-+	    test "$pass" = conv && continue
-+	    newdependency_libs="$deplib $newdependency_libs"
-+	    ;;
-+	  prog)
-+	    if test "$pass" = conv; then
-+	      deplibs="$deplib $deplibs"
-+	      continue
-+	    fi
-+	    if test "$pass" = scan; then
-+	      deplibs="$deplib $deplibs"
-+	    else
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    fi
-+	    ;;
-+	  *)
-+	    ;;
-+	  esac # linkmode
-+	  continue
-+	  ;; # -pthread
- 	%DEPLIBS%)
- 	  alldeplibs=yes
- 	  continue