Fix the noatun.la lossage.

42 files changed, 1147 insertions, 64 deletions

diff --git a/audio/kdemultimedia3/PLIST b/audio/kdemultimedia3/PLIST
index 5664b5db463..1fd559e565e 100644
--- a/audio/kdemultimedia3/PLIST
+++ b/audio/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/06/25 06:34:32 skrll Exp $
 bin/aktion
 bin/artsbuilder
 bin/artscontrol
@@ -296,11 +296,11 @@ lib/libmpeg-0.3.0.so
 lib/libmpeg.a
 lib/libmpeg.la
 lib/libmpeg.so
-lib/libnoatun.a
-lib/libnoatun.la
-lib/libnoatun.so
-lib/libnoatun.so.0
-lib/libnoatun.so.0.0
+lib/libnoatun_core.a
+lib/libnoatun_core.la
+lib/libnoatun_core.so
+lib/libnoatun_core.so.0
+lib/libnoatun_core.so.0.0
 lib/libnoatun_main.a
 lib/libnoatun_main.la
 lib/libnoatun_main.so
diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index e282056e881..dbe58eb22d6 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 14:46:47 skrll Exp $
+$NetBSD: distinfo,v 1.2 2002/06/25 06:34:33 skrll Exp $
 
 SHA1 (kdemultimedia-3.0.1.tar.bz2) = 0d957474431d636d429f64003f38beee48dd97f3
 Size (kdemultimedia-3.0.1.tar.bz2) = 5789849 bytes
@@ -26,7 +26,43 @@ SHA1 (patch-au) = 877c2150000dc7c7344f5e4ab86ebc3b691f3e34
 SHA1 (patch-av) = 1b14a5c0bb9ae5979cc6e07c34dffe0fbefdc2be
 SHA1 (patch-aw) = 87444988e9109f2d59dc7168c4f2337d0c1a7168
 SHA1 (patch-ax) = efd01de997033aa2cebd0ba5d875b4d547bfd624
-SHA1 (patch-ay) = d4f6d85e802d9b05b00a659bf9b4fbf96d3b81bc
-SHA1 (patch-az) = 90f457bb6d4c5b7186533c168aefde4abd4ba94b
-SHA1 (patch-ba) = 5cee048125a71eb5a1358966c0a61c4553eff24c
-SHA1 (patch-bb) = f8d2ad72945566dd575f21c7f3f25ca7a720ecb3
+SHA1 (patch-ay) = 2ce3604aef6a9d79b58fda7e969f79d3e48b6ce8
+SHA1 (patch-az) = 3e0a89a16e9a21ed1aafffac84882506344d6f37
+SHA1 (patch-ba) = 1ae7ccac4caaf5fc3cd63a7f5a1da054ae1f0e6e
+SHA1 (patch-bb) = b27e1dde7793f1c08acc673915234e7324c8c1e5
+SHA1 (patch-bc) = 82424e524f316f55524c5367ce42fe4194f935c6
+SHA1 (patch-bd) = ace100c1effb71354c2e4ee1ea25ad8f0b0bdada
+SHA1 (patch-be) = 5cee048125a71eb5a1358966c0a61c4553eff24c
+SHA1 (patch-bf) = 1f8b40c914d27c34b0fff876682b9402c6815d42
+SHA1 (patch-bg) = b9a91e196fb873d61207a6efea2fbeb4d603fe07
+SHA1 (patch-bh) = 3d6f54d490f21548df8e7824a112b7411f31b197
+SHA1 (patch-bi) = 92fd0e6d2883d715b49e32c28dcdcfa23272b78e
+SHA1 (patch-bj) = cffda4602042e6d77fbdb34f11d210de00e15d12
+SHA1 (patch-bk) = e594440c63e8038b660dcd75e89f61c6cf62a766
+SHA1 (patch-bl) = 615b7d47420fbc1f376ba67674405cfe8c6293ad
+SHA1 (patch-bm) = a50a8d722ebc48fce19d7052749795efbe543303
+SHA1 (patch-bn) = 97cc6ecddd238efc8a2e699fb75f66b0f0eed1fb
+SHA1 (patch-bo) = b67167bfe6e9810208f1f74d3e3fea2ddfb32f88
+SHA1 (patch-bp) = 26653372ed565d5ac3940519fd9b679589d40159
+SHA1 (patch-bq) = 98d57a7c1c9b7c061ae44aad27edbedb8eaee4d9
+SHA1 (patch-br) = 5e295c9c347a935707c1469d85c48c0311b59deb
+SHA1 (patch-bs) = fb23d5297589b87946642bfbfd857c04f81027e3
+SHA1 (patch-bt) = 6ab9037f5c1e0eba0bdafe222da0ca8104cbe21f
+SHA1 (patch-bu) = 6e183a9c5caf7641304efdb409ac414de4b88947
+SHA1 (patch-bv) = 4b2d80b10f50c1c2b1219d98f41e8dd37f9fa3e3
+SHA1 (patch-bw) = a28609eb68746f45013dae50556fb19829f890f4
+SHA1 (patch-bx) = 886f18bfcaa793a56b27053550ce7974249eeaf0
+SHA1 (patch-by) = e451c595628e500f86085744798af78ef70c28df
+SHA1 (patch-bz) = 79001beb8c6402276a237456906c55720333e69d
+SHA1 (patch-ca) = a1fedc7a4a507e71b0e6fff34056e414b7f119c7
+SHA1 (patch-cb) = 95d3518d94d0616a1a78f49ddf4db07603071365
+SHA1 (patch-cc) = af970c41d730fe1b7e2403942ab39746b3b0e2af
+SHA1 (patch-cd) = b39907193f94320877b8608578ff3c4c41e09665
+SHA1 (patch-ce) = 4f2c176ef04efa22ae034c5c5bd85eab329e187b
+SHA1 (patch-cf) = a0dccb6a82212ec746007f2837f5068571807d5a
+SHA1 (patch-cg) = 0e7f0cdcd55a06bc60c5c617f9ad33201bda1f9d
+SHA1 (patch-ch) = 86e18855242a489661371228fd8691897464181b
+SHA1 (patch-ci) = 49d1caddd97ba8f00a78561f7fd3813c109b95ed
+SHA1 (patch-cj) = 163aad2ee9120a3754e4b94c8c775058b370d2ba
+SHA1 (patch-ck) = 4afe5b8ffca5a1989e5bf34f73b7b7ca8f64726c
+SHA1 (patch-cl) = d4017218fc3782b01322aae2077f143a3a0e8b3b
diff --git a/audio/kdemultimedia3/patches/patch-ay b/audio/kdemultimedia3/patches/patch-ay
index 6ce5da26836..70bf535cdf4 100644
--- a/audio/kdemultimedia3/patches/patch-ay
+++ b/audio/kdemultimedia3/patches/patch-ay
@@ -1,4 +1,4 @@
-$NetBSD: patch-ay,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
+$NetBSD: patch-ay,v 1.2 2002/06/25 06:34:33 skrll Exp $
 
 --- noatun/Makefile.am.orig	Sun Mar  3 07:50:51 2002
 +++ noatun/Makefile.am
@@ -11,7 +11,7 @@ $NetBSD: patch-ay,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
 -noatun_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel
 +libnoatun_main_la_SOURCES = main.cpp joinhandler.cpp joinhandler.skel
 +libnoatun_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-+libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la
++libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun_core.la
 +
 +noatun_la_SOURCES = noatun_main.cpp
  noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
diff --git a/audio/kdemultimedia3/patches/patch-az b/audio/kdemultimedia3/patches/patch-az
index 640b4fd9767..d215dff6e50 100644
--- a/audio/kdemultimedia3/patches/patch-az
+++ b/audio/kdemultimedia3/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
+$NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $
 
 --- noatun/Makefile.in.orig	Tue May 14 01:53:28 2002
 +++ noatun/Makefile.in
@@ -14,7 +14,7 @@ $NetBSD: patch-az,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
 -noatun_la_SOURCES=main.cpp joinhandler.cpp  joinhandler_skel.cpp
 +libnoatun_main_la_SOURCES=main.cpp joinhandler.cpp  joinhandler_skel.cpp
 +libnoatun_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-+libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun.la
++libnoatun_main_la_LIBADD = -lqtmcop -lkmedia2_idl -lsoundserver_idl $(top_builddir)/noatun/library/libnoatun_core.la
 +
 +noatun_la_SOURCES = noatun_main.cpp
  noatun_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
@@ -46,7 +46,7 @@ $NetBSD: patch-az,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
 -am_noatun_la_OBJECTS = main.lo joinhandler.lo
 -#>- noatun_la_OBJECTS = $(am_noatun_la_OBJECTS)
 +libnoatun_main_la_DEPENDENCIES = \
-+	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
 +am_libnoatun_main_la_OBJECTS = main.lo joinhandler.lo
 +#>- libnoatun_main_la_OBJECTS = $(am_libnoatun_main_la_OBJECTS)
  #>+ 4
@@ -156,7 +156,7 @@ $NetBSD: patch-az,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=avideoframe.cc hi22-app-noatun.png hi48-app-noatun.png noatun.desktop hi32-app-noatun.png preset.dance CHANGES preset.jazz FILES preset.metal hi16-app-noatun.png preset.trance joinhandler.h noatun.upd configure.in.in avideoframe.h preset.zero artsvideo.idl 
-+KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png noatun hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal joinhandler.kidl hi16-app-noatun.png noatun20update preset.zero hi32-app-noatun.png preset.dance dummy.cpp 
++KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png noatun hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal joinhandler.kidl hi16-app-noatun.png noatun20update preset.zero hi32-app-noatun.png preset.dance 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
@@ -205,7 +205,7 @@ $NetBSD: patch-az,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
 +#>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
  #>+ 1
 -install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS
-+install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES
++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
  
  install-info: install-info-recursive
  
diff --git a/audio/kdemultimedia3/patches/patch-ba b/audio/kdemultimedia3/patches/patch-ba
index 9d8b0d86005..7b6093b9e99 100644
--- a/audio/kdemultimedia3/patches/patch-ba
+++ b/audio/kdemultimedia3/patches/patch-ba
@@ -1,15 +1,30 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
+$NetBSD: patch-ba,v 1.2 2002/06/25 06:34:34 skrll Exp $
 
---- noatun/main.cpp.orig	Wed May  8 19:29:25 2002
-+++ noatun/main.cpp
-@@ -24,7 +24,9 @@
- 	{ 0, 0, 0}
- };
- 
--int main(int argc, char **argv)
-+extern "C" int kdemain(int, char **);
-+
-+int kdemain(int argc, char **argv)
- {
- 	KAboutData aboutData("noatun", I18N_NOOP("Noatun"),
- 	                     version, description, KAboutData::License_BSD,
+--- noatun/library/Makefile.am.orig	Wed May  8 19:29:25 2002
++++ noatun/library/Makefile.am
+@@ -9,9 +9,9 @@
+ 
+ SUBDIRS=noatunarts noatun . noatuntags
+ 
+-lib_LTLIBRARIES = libnoatun.la libnoatuncontrols.la
++lib_LTLIBRARIES = libnoatun_core.la libnoatuncontrols.la
+ 
+-libnoatun_la_SOURCES = pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp \
++libnoatun_core_la_SOURCES = pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp \
+ 	playlist.cpp pref.cpp \
+ 	player.cpp playlistsaver.cpp app.cpp \
+ 	pluginloader.cpp plugin.cpp \
+@@ -22,11 +22,11 @@
+ 
+ include_HEADERS  = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h
+ 
+-libnoatun_la_LDFLAGS     = -L$(top_builddir)/noatun/library/noatunarts \
++libnoatun_core_la_LDFLAGS     = -L$(top_builddir)/noatun/library/noatunarts \
+ $(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \
+ -L$(top_builddir)/arts/gui/kde
+ 	
+-libnoatun_la_LIBADD      = $(top_builddir)/arts/gui/common/libartsgui.la	\
++libnoatun_core_la_LIBADD      = $(top_builddir)/arts/gui/common/libartsgui.la	\
+ 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la			\
+ 	$(top_builddir)/arts/modules/libartsmodules.la			\
+ 	-lkio -lqtmcop -lkmedia2_idl -lnoatunarts			\
diff --git a/audio/kdemultimedia3/patches/patch-bb b/audio/kdemultimedia3/patches/patch-bb
index 0c7be05ddc0..cd97a4bb642 100644
--- a/audio/kdemultimedia3/patches/patch-bb
+++ b/audio/kdemultimedia3/patches/patch-bb
@@ -1,33 +1,186 @@
-$NetBSD: patch-bb,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
+$NetBSD: patch-bb,v 1.2 2002/06/25 06:34:34 skrll Exp $
 
---- noatun/noatun_main.cpp.orig	Thu May 30 20:46:08 2002
-+++ noatun/noatun_main.cpp
-@@ -0,0 +1,28 @@
-+/*
-+ *
-+ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ * 
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ * 
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+extern "C" int kdemain(int, char* []);
-+
-+int main( int argc, char* argv[] )
-+{
-+	return kdemain(argc, argv);
-+}
+--- noatun/library/Makefile.in.orig	Sun Jun  9 10:13:00 2002
++++ noatun/library/Makefile.in
+@@ -301,9 +301,9 @@
+ 
+ SUBDIRS = noatunarts noatun . noatuntags
+ 
+-lib_LTLIBRARIES = libnoatun.la libnoatuncontrols.la
++lib_LTLIBRARIES = libnoatun_core.la libnoatuncontrols.la
+ 
+-libnoatun_la_SOURCES = pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp \
++libnoatun_core_la_SOURCES = pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp \
+ 	playlist.cpp pref.cpp \
+ 	player.cpp playlistsaver.cpp app.cpp \
+ 	pluginloader.cpp plugin.cpp \
+@@ -315,12 +315,12 @@
+ 
+ include_HEADERS = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h
+ 
+-libnoatun_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \
++libnoatun_core_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \
+ 	$(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \
+ 	-L$(top_builddir)/arts/gui/kde
+ 
+ 
+-libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la	\
++libnoatun_core_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la	\
+ 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la			\
+ 	$(top_builddir)/arts/modules/libartsmodules.la			\
+ 	-lkio -lqtmcop -lkmedia2_idl -lnoatunarts			\
+@@ -345,27 +345,27 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-libnoatun_la_DEPENDENCIES = \
++libnoatun_core_la_DEPENDENCIES = \
+ 	$(top_builddir)/arts/gui/common/libartsgui.la \
+ 	$(top_builddir)/arts/gui/kde/libartsgui_kde.la \
+ 	$(top_builddir)/arts/modules/libartsmodules.la
+-am_libnoatun_la_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \
++am_libnoatun_core_la_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \
+ 	engine.lo playlist.lo pref.lo player.lo playlistsaver.lo app.lo \
+ 	pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \
+ 	noatunui.lo effectview.lo equalizerview.lo equalizer.lo \
+ 	effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo
+-#>- libnoatun_la_OBJECTS = $(am_libnoatun_la_OBJECTS)
++#>- libnoatun_core_la_OBJECTS = $(am_libnoatun_core_la_OBJECTS)
+ #>+ 10
+-libnoatun_la_final_OBJECTS = libnoatun_la.all_cpp.lo 
+-libnoatun_la_nofinal_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \
++libnoatun_core_la_final_OBJECTS = libnoatun_core_la.all_cpp.lo 
++libnoatun_core_la_nofinal_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \
+ 	engine.lo playlist.lo pref.lo player.lo playlistsaver.lo app.lo \
+ 	pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \
+ 	noatunui.lo effectview.lo equalizerview.lo equalizer.lo \
+ 	effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo\
+ 	plugin_deps.moc.lo  \
+-	libnoatun_la_meta_unload.lo 
+-@KDE_USE_FINAL_FALSE@libnoatun_la_OBJECTS = $(libnoatun_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@libnoatun_la_OBJECTS = $(libnoatun_la_final_OBJECTS)
++	libnoatun_core_la_meta_unload.lo 
++@KDE_USE_FINAL_FALSE@libnoatun_core_la_OBJECTS = $(libnoatun_core_la_nofinal_OBJECTS)
++@KDE_USE_FINAL_TRUE@libnoatun_core_la_OBJECTS = $(libnoatun_core_la_final_OBJECTS)
+ libnoatuncontrols_la_DEPENDENCIES =
+ am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo
+ #>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS)
+@@ -423,8 +423,8 @@
+ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ CXXFLAGS = @CXXFLAGS@
+-DIST_SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) \
+-	$(gentable_SOURCES)
++DIST_SOURCES = $(libnoatun_core_la_SOURCES) \
++	$(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
+ DATA = $(magictable_DATA)
+ 
+ HEADERS = $(include_HEADERS)
+@@ -436,7 +436,7 @@
+ 	uninstall-recursive check-recursive installcheck-recursive
+ DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
+ DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
++SOURCES = $(libnoatun_core_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
+ 
+ #>- all: all-recursive
+ #>+ 1
+@@ -483,8 +483,8 @@
+ 
+ clean-libLTLIBRARIES:
+ 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+-libnoatun.la: $(libnoatun_la_OBJECTS) $(libnoatun_la_DEPENDENCIES) 
+-	$(CXXLINK) -rpath $(libdir) $(libnoatun_la_LDFLAGS) $(libnoatun_la_OBJECTS) $(libnoatun_la_LIBADD) $(LIBS)
++libnoatun_core.la: $(libnoatun_core_la_OBJECTS) $(libnoatun_core_la_DEPENDENCIES) 
++	$(CXXLINK) -rpath $(libdir) $(libnoatun_core_la_LDFLAGS) $(libnoatun_core_la_OBJECTS) $(libnoatun_core_la_LIBADD) $(LIBS)
+ libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES) 
+ 	$(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS)
+ 
+@@ -676,7 +676,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=fft.h noatunlistview.h pluginmodule.h video.cpp fft.c 
++KDE_DIST=video.cpp fft.h noatunlistview.h pluginmodule.h magictable fft.c 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -856,33 +856,33 @@
+ 
+ 
+ #>+ 12
+-libnoatun_la_meta_unload.cpp:  equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc
+-	@echo 'creating libnoatun_la_meta_unload.cpp'
+-	@-rm -f libnoatun_la_meta_unload.cpp
++libnoatun_core_la_meta_unload.cpp:  equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc
++	@echo 'creating libnoatun_core_la_meta_unload.cpp'
++	@-rm -f libnoatun_core_la_meta_unload.cpp
+ 	@if test ${kde_qtver} = 2; then \
+-		echo 'static const char * _metalist_libnoatun_la[] = {' > libnoatun_la_meta_unload.cpp ;\
+-		cat  equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libnoatun_la_meta_unload.cpp ;\
+-		echo '0};' >> libnoatun_la_meta_unload.cpp ;\
+-		echo '#include <kunload.h>' >> libnoatun_la_meta_unload.cpp ;\
+-		echo '_UNLOAD(libnoatun_la)' >> libnoatun_la_meta_unload.cpp ;\
+-	else echo > libnoatun_la_meta_unload.cpp; fi
++		echo 'static const char * _metalist_libnoatun_core_la[] = {' > libnoatun_core_la_meta_unload.cpp ;\
++		cat  equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libnoatun_core_la_meta_unload.cpp ;\
++		echo '0};' >> libnoatun_core_la_meta_unload.cpp ;\
++		echo '#include <kunload.h>' >> libnoatun_core_la_meta_unload.cpp ;\
++		echo '_UNLOAD(libnoatun_core_la)' >> libnoatun_core_la_meta_unload.cpp ;\
++	else echo > libnoatun_core_la_meta_unload.cpp; fi
+ 
+ 
+ #>+ 3
+ clean-moc-classes:
+-	-rm -f  libnoatun_la_meta_unload.cpp
++	-rm -f  libnoatun_core_la_meta_unload.cpp
+ 
+ #>+ 11
+-libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp libnoatun_la_meta_unload.cpp  plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc 
+-	@echo 'creating libnoatun_la.all_cpp.cpp ...'; \
+-	rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \
+-	echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
+-	for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp libnoatun_la_meta_unload.cpp  plugin_deps.moc.cpp; do \
+-	  echo "#include \"$$file\"" >> libnoatun_la.all_cpp.files; \
+-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_la.all_cpp.final; \
++libnoatun_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp libnoatun_core_la_meta_unload.cpp  plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc 
++	@echo 'creating libnoatun_core_la.all_cpp.cpp ...'; \
++	rm -f libnoatun_core_la.all_cpp.files libnoatun_core_la.all_cpp.final; \
++	echo "#define KDE_USE_FINAL 1" >> libnoatun_core_la.all_cpp.final; \
++	for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp libnoatun_core_la_meta_unload.cpp  plugin_deps.moc.cpp; do \
++	  echo "#include \"$$file\"" >> libnoatun_core_la.all_cpp.files; \
++	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_core_la.all_cpp.final; \
+ 	done; \
+-	cat libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files  > libnoatun_la.all_cpp.cpp; \
+-	rm -f libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files
++	cat libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files  > libnoatun_core_la.all_cpp.cpp; \
++	rm -f libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files
+ 
+ #>+ 11
+ libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp  
+@@ -910,20 +910,20 @@
+ 
+ #>+ 3
+ clean-final:
+-	-rm -f libnoatun_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp gentable.all_cpp.cpp
++	-rm -f libnoatun_core_la.all_cpp.cpp libnoatuncontrols_la.all_cpp.cpp gentable.all_cpp.cpp
+ 
+ #>+ 2
+ final:
+-	$(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" all-am
++	$(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" all-am
+ #>+ 2
+ final-install:
+-	$(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" install-am
++	$(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_final_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_final_OBJECTS)" install-am
+ #>+ 2
+ no-final:
+-	$(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" all-am
++	$(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" all-am
+ #>+ 2
+ no-final-install:
+-	$(MAKE) libnoatun_la_OBJECTS="$(libnoatun_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" install-am
++	$(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" install-am
+ #>+ 3
+ cvs-clean:
+ 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
diff --git a/audio/kdemultimedia3/patches/patch-bc b/audio/kdemultimedia3/patches/patch-bc
new file mode 100644
index 00000000000..124d9cd9af1
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2002/06/25 06:34:34 skrll Exp $
+
+--- noatun/library/noatuntags/Makefile.am.orig	Wed Oct 24 02:59:44 2001
++++ noatun/library/noatuntags/Makefile.am
+@@ -4,7 +4,7 @@
+ 
+ libnoatuntags_la_SOURCES = tags.cpp
+ libnoatuntags_la_LDFLAGS = -L$(top_builddir)/noatun/library
+-libnoatuntags_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la
++libnoatuntags_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ libnoatuntags_la_METASOURCES = AUTO
+ 
diff --git a/audio/kdemultimedia3/patches/patch-bd b/audio/kdemultimedia3/patches/patch-bd
new file mode 100644
index 00000000000..ed9611592ad
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bd
@@ -0,0 +1,31 @@
+$NetBSD: patch-bd,v 1.1 2002/06/25 06:34:34 skrll Exp $
+
+--- noatun/library/noatuntags/Makefile.in.orig	Sun Jun  9 10:23:40 2002
++++ noatun/library/noatuntags/Makefile.in
+@@ -295,7 +295,7 @@
+ 
+ libnoatuntags_la_SOURCES = tags.cpp
+ libnoatuntags_la_LDFLAGS = -L$(top_builddir)/noatun/library
+-libnoatuntags_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la
++libnoatuntags_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ #>- libnoatuntags_la_METASOURCES = AUTO
+ 
+@@ -308,7 +308,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+ libnoatuntags_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_libnoatuntags_la_OBJECTS = tags.lo
+ #>- libnoatuntags_la_OBJECTS = $(am_libnoatuntags_la_OBJECTS)
+ #>+ 5
+@@ -633,7 +633,7 @@
+ 	-rm -f  libnoatuntags_la_meta_unload.cpp
+ 
+ #>+ 11
+-libnoatuntags_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/tags.cpp libnoatuntags_la_meta_unload.cpp   tagsgetter.moc 
++libnoatuntags_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/tags.cpp $(srcdir)/libnoatuntags_la_meta_unload.cpp   tagsgetter.moc 
+ 	@echo 'creating libnoatuntags_la.all_cpp.cpp ...'; \
+ 	rm -f libnoatuntags_la.all_cpp.files libnoatuntags_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libnoatuntags_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-be b/audio/kdemultimedia3/patches/patch-be
new file mode 100644
index 00000000000..38cd31457b3
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-be
@@ -0,0 +1,15 @@
+$NetBSD: patch-be,v 1.1 2002/06/25 06:34:34 skrll Exp $
+
+--- noatun/main.cpp.orig	Wed May  8 19:29:25 2002
++++ noatun/main.cpp
+@@ -24,7 +24,9 @@
+ 	{ 0, 0, 0}
+ };
+ 
+-int main(int argc, char **argv)
++extern "C" int kdemain(int, char **);
++
++int kdemain(int argc, char **argv)
+ {
+ 	KAboutData aboutData("noatun", I18N_NOOP("Noatun"),
+ 	                     version, description, KAboutData::License_BSD,
diff --git a/audio/kdemultimedia3/patches/patch-bf b/audio/kdemultimedia3/patches/patch-bf
new file mode 100644
index 00000000000..7b19af0370a
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bf
@@ -0,0 +1,13 @@
+$NetBSD: patch-bf,v 1.1 2002/06/25 06:34:34 skrll Exp $
+
+--- noatun/modules/dcopiface/Makefile.am.orig	Wed May  8 19:29:26 2002
++++ noatun/modules/dcopiface/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_dcopiface_la_SOURCES = dcopiface.cpp dcopiface.skel
+ 
+ noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ noatun_dcopiface_la_METASOURCES = AUTO
+ 
diff --git a/audio/kdemultimedia3/patches/patch-bg b/audio/kdemultimedia3/patches/patch-bg
new file mode 100644
index 00000000000..d1dbd411649
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bg
@@ -0,0 +1,40 @@
+$NetBSD: patch-bg,v 1.1 2002/06/25 06:34:35 skrll Exp $
+
+--- noatun/modules/dcopiface/Makefile.in.orig	Sun Jun  9 10:26:47 2002
++++ noatun/modules/dcopiface/Makefile.in
+@@ -297,7 +297,7 @@
+ noatun_dcopiface_la_SOURCES=dcopiface.cpp  dcopiface_skel.cpp
+ 
+ noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_dcopiface_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ #>- noatun_dcopiface_la_METASOURCES = AUTO
+ 
+@@ -311,7 +311,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_dcopiface_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_dcopiface_la_OBJECTS = dcopiface.lo
+ #>- noatun_dcopiface_la_OBJECTS = $(am_noatun_dcopiface_la_OBJECTS)
+ #>+ 4
+@@ -487,7 +487,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=dcopiface.plugin 
++KDE_DIST=dcopiface.kidl dcopiface.plugin 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -642,7 +642,7 @@
+ 
+ 
+ #>+ 11
+-noatun_dcopiface_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopiface.cpp dcopiface_skel.cpp  
++noatun_dcopiface_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopiface.cpp $(srcdir)/dcopiface_skel.cpp  
+ 	@echo 'creating noatun_dcopiface_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_dcopiface_la.all_cpp.files noatun_dcopiface_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_dcopiface_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bh b/audio/kdemultimedia3/patches/patch-bh
new file mode 100644
index 00000000000..6cb1ab69b3e
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bh
@@ -0,0 +1,40 @@
+$NetBSD: patch-bh,v 1.1 2002/06/25 06:34:35 skrll Exp $
+
+--- noatun/modules/excellent/Makefile.in.orig	Sun Jun  9 11:25:34 2002
++++ noatun/modules/excellent/Makefile.in
+@@ -298,7 +298,7 @@
+ 
+ noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+ noatun_excellent_la_LIBADD = $(LIB_KFILE) \
+-	$(top_builddir)/noatun/library/libnoatun.la \
++	$(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/noatun/library/libnoatuncontrols.la \
+ 	-lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+@@ -315,7 +315,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_excellent_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la \
++	$(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/noatun/library/libnoatuncontrols.la
+ am_noatun_excellent_la_OBJECTS = noatunui.lo userinterface.lo
+ #>- noatun_excellent_la_OBJECTS = $(am_noatun_excellent_la_OBJECTS)
+@@ -495,7 +495,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=excellentui.rc excellent.plugin 
++KDE_DIST=excellent.plugin excellentui.rc 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -664,7 +664,7 @@
+ 	-rm -f  noatun_excellent_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_excellent_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp noatun_excellent_la_meta_unload.cpp   userinterface.moc 
++noatun_excellent_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp $(srcdir)/noatun_excellent_la_meta_unload.cpp   userinterface.moc 
+ 	@echo 'creating noatun_excellent_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_excellent_la.all_cpp.files noatun_excellent_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_excellent_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bi b/audio/kdemultimedia3/patches/patch-bi
new file mode 100644
index 00000000000..3777ff662ae
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bi
@@ -0,0 +1,13 @@
+$NetBSD: patch-bi,v 1.1 2002/06/25 06:34:35 skrll Exp $
+
+--- noatun/modules/htmlexport/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/htmlexport/Makefile.am
+@@ -6,7 +6,7 @@
+ noinst_HEADERS = htmlexport.h
+ 
+ noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+                         -lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ noatun_htmlexport_la_METASOURCES = AUTO
diff --git a/audio/kdemultimedia3/patches/patch-bj b/audio/kdemultimedia3/patches/patch-bj
new file mode 100644
index 00000000000..1238f619dc6
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bj
@@ -0,0 +1,31 @@
+$NetBSD: patch-bj,v 1.1 2002/06/25 06:34:35 skrll Exp $
+
+--- noatun/modules/htmlexport/Makefile.in.orig	Sun Jun  9 12:12:25 2002
++++ noatun/modules/htmlexport/Makefile.in
+@@ -296,7 +296,7 @@
+ noinst_HEADERS = htmlexport.h
+ 
+ noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	-lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ 
+@@ -310,7 +310,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_htmlexport_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_htmlexport_la_OBJECTS = htmlexport.lo
+ #>- noatun_htmlexport_la_OBJECTS = $(am_noatun_htmlexport_la_OBJECTS)
+ #>+ 5
+@@ -656,7 +656,7 @@
+ 	-rm -f  noatun_htmlexport_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_htmlexport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/htmlexport.cpp noatun_htmlexport_la_meta_unload.cpp   htmlexport.moc 
++noatun_htmlexport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/htmlexport.cpp $(srcdir)/noatun_htmlexport_la_meta_unload.cpp   htmlexport.moc 
+ 	@echo 'creating noatun_htmlexport_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_htmlexport_la.all_cpp.files noatun_htmlexport_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_htmlexport_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bk b/audio/kdemultimedia3/patches/patch-bk
new file mode 100644
index 00000000000..fd6804321d3
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bk
@@ -0,0 +1,13 @@
+$NetBSD: patch-bk,v 1.1 2002/06/25 06:34:36 skrll Exp $
+
+--- noatun/modules/infrared/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/infrared/Makefile.am
+@@ -6,7 +6,7 @@
+ noinst_HEADERS = infrared.h lirc.h irprefs.h
+ 
+ noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+                         -lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ noatun_infrared_la_METASOURCES = AUTO
diff --git a/audio/kdemultimedia3/patches/patch-bl b/audio/kdemultimedia3/patches/patch-bl
new file mode 100644
index 00000000000..185d996ca16
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bl
@@ -0,0 +1,31 @@
+$NetBSD: patch-bl,v 1.1 2002/06/25 06:34:36 skrll Exp $
+
+--- noatun/modules/infrared/Makefile.in.orig	Sun Jun  9 12:19:30 2002
++++ noatun/modules/infrared/Makefile.in
+@@ -296,7 +296,7 @@
+ noinst_HEADERS = infrared.h lirc.h irprefs.h
+ 
+ noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	-lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ 
+@@ -310,7 +310,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_infrared_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_infrared_la_OBJECTS = infrared.lo lirc.lo irprefs.lo
+ #>- noatun_infrared_la_OBJECTS = $(am_noatun_infrared_la_OBJECTS)
+ #>+ 5
+@@ -667,7 +667,7 @@
+ 	-rm -f  noatun_infrared_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp noatun_infrared_la_meta_unload.cpp   irprefs.moc infrared.moc lirc.moc 
++noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp $(srcdir)/noatun_infrared_la_meta_unload.cpp   irprefs.moc infrared.moc lirc.moc 
+ 	@echo 'creating noatun_infrared_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_infrared_la.all_cpp.files noatun_infrared_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_infrared_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bm b/audio/kdemultimedia3/patches/patch-bm
new file mode 100644
index 00000000000..f955ad69593
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bm
@@ -0,0 +1,13 @@
+$NetBSD: patch-bm,v 1.1 2002/06/25 06:34:36 skrll Exp $
+
+--- noatun/modules/kaiman/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/kaiman/Makefile.am
+@@ -9,7 +9,7 @@
+ 	pref.cpp
+ 
+ noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+                         -lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ noatun_kaiman_la_METASOURCES = AUTO
diff --git a/audio/kdemultimedia3/patches/patch-bn b/audio/kdemultimedia3/patches/patch-bn
new file mode 100644
index 00000000000..a5039e59989
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bn
@@ -0,0 +1,40 @@
+$NetBSD: patch-bn,v 1.1 2002/06/25 06:34:36 skrll Exp $
+
+--- noatun/modules/kaiman/Makefile.in.orig	Sun Jun  9 12:21:18 2002
++++ noatun/modules/kaiman/Makefile.in
+@@ -301,7 +301,7 @@
+ 
+ 
+ noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	-lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ 
+@@ -321,7 +321,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_kaiman_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_kaiman_la_OBJECTS = noatunui.lo style.lo userinterface.lo \
+ 	pref.lo
+ #>- noatun_kaiman_la_OBJECTS = $(am_noatun_kaiman_la_OBJECTS)
+@@ -570,7 +570,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=kaimanui.rc kaiman.plugin SKIN-SPECS 
++KDE_DIST=kaimanui.rc SKIN-SPECS kaiman.plugin 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -768,7 +768,7 @@
+ 	-rm -f  noatun_kaiman_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp noatun_kaiman_la_meta_unload.cpp   style.moc pref.moc userinterface.moc 
++noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp $(srcdir)/noatun_kaiman_la_meta_unload.cpp   style.moc pref.moc userinterface.moc 
+ 	@echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bo b/audio/kdemultimedia3/patches/patch-bo
new file mode 100644
index 00000000000..aad2c60780d
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bo
@@ -0,0 +1,13 @@
+$NetBSD: patch-bo,v 1.1 2002/06/25 06:34:37 skrll Exp $
+
+--- noatun/modules/keyz/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/keyz/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_keyz_la_SOURCES = keyz.cpp
+ 
+ noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ noatun_keyz_la_METASOURCES = AUTO
+ 
diff --git a/audio/kdemultimedia3/patches/patch-bp b/audio/kdemultimedia3/patches/patch-bp
new file mode 100644
index 00000000000..5271741b62a
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bp
@@ -0,0 +1,31 @@
+$NetBSD: patch-bp,v 1.1 2002/06/25 06:34:37 skrll Exp $
+
+--- noatun/modules/keyz/Makefile.in.orig	Sun Jun  9 12:22:33 2002
++++ noatun/modules/keyz/Makefile.in
+@@ -295,7 +295,7 @@
+ noatun_keyz_la_SOURCES = keyz.cpp
+ 
+ noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_keyz_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ #>- noatun_keyz_la_METASOURCES = AUTO
+ 
+@@ -309,7 +309,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_keyz_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_keyz_la_OBJECTS = keyz.lo
+ #>- noatun_keyz_la_OBJECTS = $(am_noatun_keyz_la_OBJECTS)
+ #>+ 5
+@@ -655,7 +655,7 @@
+ 	-rm -f  noatun_keyz_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_keyz_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keyz.cpp noatun_keyz_la_meta_unload.cpp   keyz.moc 
++noatun_keyz_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keyz.cpp $(srcdir)/noatun_keyz_la_meta_unload.cpp   keyz.moc 
+ 	@echo 'creating noatun_keyz_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_keyz_la.all_cpp.files noatun_keyz_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_keyz_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bq b/audio/kdemultimedia3/patches/patch-bq
new file mode 100644
index 00000000000..fd6ef3a290d
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bq
@@ -0,0 +1,13 @@
+$NetBSD: patch-bq,v 1.1 2002/06/25 06:34:37 skrll Exp $
+
+--- noatun/modules/kjofol-skin/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/kjofol-skin/Makefile.am
+@@ -13,7 +13,7 @@
+                          noatunui.cpp parser.cpp kjprefs.cpp kjprefswidget.ui
+ 
+ noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+                         $(LIB_KIO) -lm \
+                         $(top_builddir)/arts/modules/libartsmodules.la
+ 
diff --git a/audio/kdemultimedia3/patches/patch-br b/audio/kdemultimedia3/patches/patch-br
new file mode 100644
index 00000000000..6d30ee15c26
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-br
@@ -0,0 +1,40 @@
+$NetBSD: patch-br,v 1.1 2002/06/25 06:34:37 skrll Exp $
+
+--- noatun/modules/kjofol-skin/Makefile.in.orig	Sun Jun  9 12:26:23 2002
++++ noatun/modules/kjofol-skin/Makefile.in
+@@ -311,7 +311,7 @@
+ 
+ 
+ noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(LIB_KIO) -lm \
+ 	$(top_builddir)/arts/modules/libartsmodules.la
+ 
+@@ -332,7 +332,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_kjofol_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la \
++	$(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/arts/modules/libartsmodules.la
+ am_noatun_kjofol_la_OBJECTS = kjloader.lo kjwidget.lo kjbutton.lo \
+ 	kjseeker.lo kjsliders.lo kjfont.lo kjtextdisplay.lo kjvis.lo \
+@@ -598,7 +598,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=kjsliders.cpp kjbackground.cpp kjequalizer.cpp kjofolui.plugin kjprefs.cpp helpers.cpp kjprefswidget.ui kjtextdisplay.cpp parser.cpp kjvis.cpp noatunui.cpp kjfont.cpp 
++KDE_DIST=kjprefswidget.ui kjtextdisplay.cpp parser.cpp kjsliders.cpp kjfont.cpp kjbackground.cpp kjvis.cpp kjequalizer.cpp kjprefswidget.cpp kjofolui.plugin kjprefs.cpp noatunui.cpp helpers.cpp 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -818,7 +818,7 @@
+ 	-rm -f  noatun_kjofol_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp kjprefswidget.cpp noatun_kjofol_la_meta_unload.cpp   kjprefswidget.moc kjtextdisplay.moc kjequalizer.moc kjprefs.moc kjloader.moc 
++noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp $(srcdir)/kjprefswidget.cpp $(srcdir)/noatun_kjofol_la_meta_unload.cpp   kjprefswidget.moc kjtextdisplay.moc kjequalizer.moc kjprefs.moc kjloader.moc 
+ 	@echo 'creating noatun_kjofol_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_kjofol_la.all_cpp.files noatun_kjofol_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_kjofol_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bs b/audio/kdemultimedia3/patches/patch-bs
new file mode 100644
index 00000000000..c8b610453d5
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bs
@@ -0,0 +1,13 @@
+$NetBSD: patch-bs,v 1.1 2002/06/25 06:34:38 skrll Exp $
+
+--- noatun/modules/marquis/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/marquis/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp
+ 
+ noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+                         -lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ noatun_marquis_la_METASOURCES = AUTO
diff --git a/audio/kdemultimedia3/patches/patch-bt b/audio/kdemultimedia3/patches/patch-bt
new file mode 100644
index 00000000000..fd4f5e7a0e3
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bt
@@ -0,0 +1,31 @@
+$NetBSD: patch-bt,v 1.1 2002/06/25 06:34:38 skrll Exp $
+
+--- noatun/modules/marquis/Makefile.in.orig	Sun Jun  9 12:27:48 2002
++++ noatun/modules/marquis/Makefile.in
+@@ -295,7 +295,7 @@
+ noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp
+ 
+ noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	-lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ 
+@@ -311,7 +311,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_marquis_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_marquis_la_OBJECTS = marquis.lo plugin.lo
+ #>- noatun_marquis_la_OBJECTS = $(am_noatun_marquis_la_OBJECTS)
+ #>+ 5
+@@ -658,7 +658,7 @@
+ 	-rm -f  noatun_marquis_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_marquis_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/marquis.cpp $(srcdir)/plugin.cpp noatun_marquis_la_meta_unload.cpp   marquis.moc 
++noatun_marquis_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/marquis.cpp $(srcdir)/plugin.cpp $(srcdir)/noatun_marquis_la_meta_unload.cpp   marquis.moc 
+ 	@echo 'creating noatun_marquis_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_marquis_la.all_cpp.files noatun_marquis_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_marquis_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bu b/audio/kdemultimedia3/patches/patch-bu
new file mode 100644
index 00000000000..5bdfdc7840f
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bu
@@ -0,0 +1,13 @@
+$NetBSD: patch-bu,v 1.1 2002/06/25 06:34:38 skrll Exp $
+
+--- noatun/modules/metatag/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/metatag/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_metatag_la_SOURCES = metatag.cpp edit.cpp
+ 
+ noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/noatun/library/noatuntags/libnoatuntags.la
+ 
+ noatun_metatag_la_METASOURCES = AUTO
diff --git a/audio/kdemultimedia3/patches/patch-bv b/audio/kdemultimedia3/patches/patch-bv
new file mode 100644
index 00000000000..bb51709b26a
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bv
@@ -0,0 +1,40 @@
+$NetBSD: patch-bv,v 1.1 2002/06/25 06:34:38 skrll Exp $
+
+--- noatun/modules/metatag/Makefile.in.orig	Sun Jun  9 12:28:50 2002
++++ noatun/modules/metatag/Makefile.in
+@@ -295,7 +295,7 @@
+ noatun_metatag_la_SOURCES = metatag.cpp edit.cpp
+ 
+ noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/noatun/library/noatuntags/libnoatuntags.la
+ 
+ 
+@@ -311,7 +311,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_metatag_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la \
++	$(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/noatun/library/noatuntags/libnoatuntags.la
+ am_noatun_metatag_la_OBJECTS = metatag.lo edit.lo
+ #>- noatun_metatag_la_OBJECTS = $(am_noatun_metatag_la_OBJECTS)
+@@ -490,7 +490,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=metatag.plugin HANDLED_ITEMS 
++KDE_DIST=HANDLED_ITEMS metatag.plugin 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -663,7 +663,7 @@
+ 	-rm -f  noatun_metatag_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_metatag_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metatag.cpp $(srcdir)/edit.cpp noatun_metatag_la_meta_unload.cpp   edit.moc metatag.moc 
++noatun_metatag_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metatag.cpp $(srcdir)/edit.cpp $(srcdir)/noatun_metatag_la_meta_unload.cpp   edit.moc metatag.moc 
+ 	@echo 'creating noatun_metatag_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_metatag_la.all_cpp.files noatun_metatag_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_metatag_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-bw b/audio/kdemultimedia3/patches/patch-bw
new file mode 100644
index 00000000000..e2600a55414
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bw
@@ -0,0 +1,13 @@
+$NetBSD: patch-bw,v 1.1 2002/06/25 06:34:39 skrll Exp $
+
+--- noatun/modules/monoscope/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/monoscope/Makefile.am
+@@ -5,7 +5,7 @@
+ #prefs.cpp
+ 
+ noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm
++noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la -lm
+ 
+ noatun_monoscope_la_METASOURCES = AUTO
+ 
diff --git a/audio/kdemultimedia3/patches/patch-bx b/audio/kdemultimedia3/patches/patch-bx
new file mode 100644
index 00000000000..b33d8073dc4
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bx
@@ -0,0 +1,31 @@
+$NetBSD: patch-bx,v 1.1 2002/06/25 06:34:39 skrll Exp $
+
+--- noatun/modules/monoscope/Makefile.in.orig	Sun Jun  9 12:29:39 2002
++++ noatun/modules/monoscope/Makefile.in
+@@ -296,7 +296,7 @@
+ 
+ #prefs.cpp
+ noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm
++noatun_monoscope_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la -lm
+ 
+ #>- noatun_monoscope_la_METASOURCES = AUTO
+ 
+@@ -311,7 +311,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_monoscope_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_monoscope_la_OBJECTS = monoscope.lo
+ #>- noatun_monoscope_la_OBJECTS = $(am_noatun_monoscope_la_OBJECTS)
+ #>+ 5
+@@ -657,7 +657,7 @@
+ 	-rm -f  noatun_monoscope_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_monoscope_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/monoscope.cpp noatun_monoscope_la_meta_unload.cpp   monoscope.moc 
++noatun_monoscope_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/monoscope.cpp $(srcdir)/noatun_monoscope_la_meta_unload.cpp   monoscope.moc 
+ 	@echo 'creating noatun_monoscope_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_monoscope_la.all_cpp.files noatun_monoscope_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_monoscope_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-by b/audio/kdemultimedia3/patches/patch-by
new file mode 100644
index 00000000000..a2c65e25c3f
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-by
@@ -0,0 +1,13 @@
+$NetBSD: patch-by,v 1.1 2002/06/25 06:34:39 skrll Exp $
+
+--- noatun/modules/net/Makefile.am.orig	Wed May  8 19:29:29 2002
++++ noatun/modules/net/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_net_la_SOURCES = net.cpp
+ 
+ noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ noatun_net_la_METASOURCES = AUTO
+ 
diff --git a/audio/kdemultimedia3/patches/patch-bz b/audio/kdemultimedia3/patches/patch-bz
new file mode 100644
index 00000000000..b75736d9bb1
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-bz
@@ -0,0 +1,32 @@
+$NetBSD: patch-bz,v 1.1 2002/06/25 06:34:39 skrll Exp $
+
+--- noatun/modules/net/Makefile.in.orig	Sun Jun  9 12:30:16 2002
++++ noatun/modules/net/Makefile.in
+@@ -295,7 +295,7 @@
+ noatun_net_la_SOURCES = net.cpp
+ 
+ noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la
++noatun_net_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ #>- noatun_net_la_METASOURCES = AUTO
+ 
+@@ -308,7 +308,8 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+-noatun_net_la_DEPENDENCIES = $(top_builddir)/noatun/library/libnoatun.la
++noatun_net_la_DEPENDENCIES = \
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_net_la_OBJECTS = net.lo
+ #>- noatun_net_la_OBJECTS = $(am_noatun_net_la_OBJECTS)
+ #>+ 5
+@@ -654,7 +655,7 @@
+ 	-rm -f  noatun_net_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_net_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/net.cpp noatun_net_la_meta_unload.cpp   net.moc 
++noatun_net_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/net.cpp $(srcdir)/noatun_net_la_meta_unload.cpp   net.moc 
+ 	@echo 'creating noatun_net_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_net_la.all_cpp.files noatun_net_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_net_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-ca b/audio/kdemultimedia3/patches/patch-ca
new file mode 100644
index 00000000000..9a2168865b1
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-ca
@@ -0,0 +1,13 @@
+$NetBSD: patch-ca,v 1.1 2002/06/25 06:34:40 skrll Exp $
+
+--- noatun/modules/noatunui/Makefile.am.orig	Wed May  8 19:29:30 2002
++++ noatun/modules/noatunui/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp
+ 
+ noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+                         $(top_builddir)/noatun/library/libnoatuncontrols.la \
+                         -lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
diff --git a/audio/kdemultimedia3/patches/patch-cb b/audio/kdemultimedia3/patches/patch-cb
new file mode 100644
index 00000000000..57454eed712
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cb
@@ -0,0 +1,32 @@
+$NetBSD: patch-cb,v 1.1 2002/06/25 06:34:40 skrll Exp $
+
+--- noatun/modules/noatunui/Makefile.in.orig	Sun Jun  9 12:31:12 2002
++++ noatun/modules/noatunui/Makefile.in
+@@ -295,7 +295,7 @@
+ noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp
+ 
+ noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/noatun/library/libnoatuncontrols.la \
+ 	-lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+@@ -311,7 +311,8 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+-noatun_ui_la_DEPENDENCIES = $(top_builddir)/noatun/library/libnoatun.la \
++noatun_ui_la_DEPENDENCIES = \
++	$(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/noatun/library/libnoatuncontrols.la
+ am_noatun_ui_la_OBJECTS = noatunui.lo userinterface.lo
+ #>- noatun_ui_la_OBJECTS = $(am_noatun_ui_la_OBJECTS)
+@@ -660,7 +661,7 @@
+ 	-rm -f  noatun_ui_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp noatun_ui_la_meta_unload.cpp   userinterface.moc 
++noatun_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp $(srcdir)/noatun_ui_la_meta_unload.cpp   userinterface.moc 
+ 	@echo 'creating noatun_ui_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_ui_la.all_cpp.files noatun_ui_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_ui_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-cc b/audio/kdemultimedia3/patches/patch-cc
new file mode 100644
index 00000000000..2e7533af370
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-cc,v 1.1 2002/06/25 06:34:40 skrll Exp $
+
+--- noatun/modules/splitplaylist/Makefile.am.orig	Wed May  8 19:29:30 2002
++++ noatun/modules/splitplaylist/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_splitplaylist_la_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp
+ 
+ noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la
++noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ noatun_splitplaylist_la_METASOURCES = AUTO
+ 
diff --git a/audio/kdemultimedia3/patches/patch-cd b/audio/kdemultimedia3/patches/patch-cd
new file mode 100644
index 00000000000..8bc5fa3ba1b
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cd
@@ -0,0 +1,40 @@
+$NetBSD: patch-cd,v 1.1 2002/06/25 06:34:40 skrll Exp $
+
+--- noatun/modules/splitplaylist/Makefile.in.orig	Sun Jun  9 12:33:15 2002
++++ noatun/modules/splitplaylist/Makefile.in
+@@ -295,7 +295,7 @@
+ noatun_splitplaylist_la_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp
+ 
+ noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la
++noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun_core.la
+ 
+ #>- noatun_splitplaylist_la_METASOURCES = AUTO
+ 
+@@ -309,7 +309,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_splitplaylist_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_splitplaylist_la_OBJECTS = splitplaylist.lo playlist.lo \
+ 	view.lo find.lo
+ #>- noatun_splitplaylist_la_OBJECTS = $(am_noatun_splitplaylist_la_OBJECTS)
+@@ -492,7 +492,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=LICENSE splitplaylist.plugin 
++KDE_DIST=splitplaylist.plugin LICENSE 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -669,7 +669,7 @@
+ 	-rm -f  noatun_splitplaylist_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_splitplaylist_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/splitplaylist.cpp $(srcdir)/playlist.cpp $(srcdir)/view.cpp $(srcdir)/find.cpp noatun_splitplaylist_la_meta_unload.cpp   find.moc view.moc playlist.moc 
++noatun_splitplaylist_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/splitplaylist.cpp $(srcdir)/playlist.cpp $(srcdir)/view.cpp $(srcdir)/find.cpp $(srcdir)/noatun_splitplaylist_la_meta_unload.cpp   find.moc view.moc playlist.moc 
+ 	@echo 'creating noatun_splitplaylist_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_splitplaylist_la.all_cpp.files noatun_splitplaylist_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_splitplaylist_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-ce b/audio/kdemultimedia3/patches/patch-ce
new file mode 100644
index 00000000000..e9447b2b834
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-ce
@@ -0,0 +1,13 @@
+$NetBSD: patch-ce,v 1.1 2002/06/25 06:34:41 skrll Exp $
+
+--- noatun/modules/systray/Makefile.am.orig	Wed May  8 19:29:31 2002
++++ noatun/modules/systray/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_systray_la_SOURCES = systray.cpp noatunui.cpp kitsystemtray.cpp cmodule.cpp
+ 
+ noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+                         -lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ noatun_systray_la_METASOURCES = AUTO
diff --git a/audio/kdemultimedia3/patches/patch-cf b/audio/kdemultimedia3/patches/patch-cf
new file mode 100644
index 00000000000..d4b23992716
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cf
@@ -0,0 +1,40 @@
+$NetBSD: patch-cf,v 1.1 2002/06/25 06:34:41 skrll Exp $
+
+--- noatun/modules/systray/Makefile.in.orig	Sun Jun  9 12:37:35 2002
++++ noatun/modules/systray/Makefile.in
+@@ -295,7 +295,7 @@
+ noatun_systray_la_SOURCES = systray.cpp noatunui.cpp kitsystemtray.cpp cmodule.cpp
+ 
+ noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \
++noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	-lqtmcop -lkmedia2_idl -lsoundserver_idl
+ 
+ 
+@@ -314,7 +314,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_systray_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_systray_la_OBJECTS = systray.lo noatunui.lo kitsystemtray.lo \
+ 	cmodule.lo
+ #>- noatun_systray_la_OBJECTS = $(am_noatun_systray_la_OBJECTS)
+@@ -498,7 +498,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=systray.plugin hi16-action-noatuntraypause.png systrayui.rc hi16-action-noatuntray.png hi16-action-noatuntraystop.png hi16-action-noatuntrayplay.png 
++KDE_DIST=hi16-action-noatuntrayplay.png systray.plugin hi16-action-noatuntray.png hi16-action-noatuntraypause.png hi16-action-noatuntraystop.png systrayui.rc 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -694,7 +694,7 @@
+ 	-rm -f  noatun_systray_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_systray_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/systray.cpp $(srcdir)/noatunui.cpp $(srcdir)/kitsystemtray.cpp $(srcdir)/cmodule.cpp noatun_systray_la_meta_unload.cpp   cmodule.moc systray.moc kitsystemtray.moc 
++noatun_systray_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/systray.cpp $(srcdir)/noatunui.cpp $(srcdir)/kitsystemtray.cpp $(srcdir)/cmodule.cpp $(srcdir)/noatun_systray_la_meta_unload.cpp   cmodule.moc systray.moc kitsystemtray.moc 
+ 	@echo 'creating noatun_systray_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_systray_la.all_cpp.files noatun_systray_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_systray_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-cg b/audio/kdemultimedia3/patches/patch-cg
new file mode 100644
index 00000000000..adf098892b0
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cg
@@ -0,0 +1,13 @@
+$NetBSD: patch-cg,v 1.1 2002/06/25 06:34:41 skrll Exp $
+
+--- noatun/modules/voiceprint/Makefile.am.orig	Wed May  8 19:29:31 2002
++++ noatun/modules/voiceprint/Makefile.am
+@@ -4,7 +4,7 @@
+ noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp
+ 
+ noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm
++noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la -lm
+ 
+ noatun_voiceprint_la_METASOURCES = AUTO
+ 
diff --git a/audio/kdemultimedia3/patches/patch-ch b/audio/kdemultimedia3/patches/patch-ch
new file mode 100644
index 00000000000..ef2caace13f
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-ch
@@ -0,0 +1,31 @@
+$NetBSD: patch-ch,v 1.1 2002/06/25 06:34:41 skrll Exp $
+
+--- noatun/modules/voiceprint/Makefile.in.orig	Sun Jun  9 12:43:40 2002
++++ noatun/modules/voiceprint/Makefile.in
+@@ -295,7 +295,7 @@
+ noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp
+ 
+ noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la -lm
++noatun_voiceprint_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la -lm
+ 
+ #>- noatun_voiceprint_la_METASOURCES = AUTO
+ 
+@@ -309,7 +309,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_voiceprint_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la
++	$(top_builddir)/noatun/library/libnoatun_core.la
+ am_noatun_voiceprint_la_OBJECTS = voiceprint.lo prefs.lo
+ #>- noatun_voiceprint_la_OBJECTS = $(am_noatun_voiceprint_la_OBJECTS)
+ #>+ 5
+@@ -660,7 +660,7 @@
+ 	-rm -f  noatun_voiceprint_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_voiceprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/voiceprint.cpp $(srcdir)/prefs.cpp noatun_voiceprint_la_meta_unload.cpp   voiceprint.moc prefs.moc 
++noatun_voiceprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/voiceprint.cpp $(srcdir)/prefs.cpp $(srcdir)/noatun_voiceprint_la_meta_unload.cpp   voiceprint.moc prefs.moc 
+ 	@echo 'creating noatun_voiceprint_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_voiceprint_la.all_cpp.files noatun_voiceprint_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_voiceprint_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-ci b/audio/kdemultimedia3/patches/patch-ci
new file mode 100644
index 00000000000..a62c2cf4985
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-ci
@@ -0,0 +1,13 @@
+$NetBSD: patch-ci,v 1.1 2002/06/25 06:34:42 skrll Exp $
+
+--- noatun/modules/winskin/Makefile.am.orig	Wed May  8 19:29:31 2002
++++ noatun/modules/winskin/Makefile.am
+@@ -61,7 +61,7 @@
+ noatun_winskin_la_LDFLAGS		= 	$(all_libraries) \
+ 					-module -avoid-version -no-undefined 
+ 
+-noatun_winskin_la_LIBADD		= $(top_builddir)/noatun/library/libnoatun.la \
++noatun_winskin_la_LIBADD		= $(top_builddir)/noatun/library/libnoatun_core.la \
+ 					$(WINSKINVIS_LIB) 
+ 
+ noatun_winskin_la_METASOURCES	=	AUTO
diff --git a/audio/kdemultimedia3/patches/patch-cj b/audio/kdemultimedia3/patches/patch-cj
new file mode 100644
index 00000000000..8eef99b819d
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cj
@@ -0,0 +1,40 @@
+$NetBSD: patch-cj,v 1.1 2002/06/25 06:34:42 skrll Exp $
+
+--- noatun/modules/winskin/Makefile.in.orig	Sun Jun  9 12:49:22 2002
++++ noatun/modules/winskin/Makefile.in
+@@ -345,7 +345,7 @@
+ 	-module -avoid-version -no-undefined 
+ 
+ 
+-noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \
++noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(WINSKINVIS_LIB) 
+ 
+ 
+@@ -357,7 +357,7 @@
+ LTLIBRARIES = $(kde_module_LTLIBRARIES)
+ 
+ noatun_winskin_la_DEPENDENCIES = \
+-	$(top_builddir)/noatun/library/libnoatun.la \
++	$(top_builddir)/noatun/library/libnoatun_core.la \
+ 	$(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la
+ am_noatun_winskin_la_OBJECTS = fileInfo.lo guiSpectrumAnalyser.lo \
+ 	plugin.lo waBalanceSlider.lo waButton.lo waClutterbar.lo \
+@@ -645,7 +645,7 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=waClutterbar.h waDigit.h winSkinVis.h waLabel.h waWidget.h fileInfo.h waSkins.h waSkinModel.h skinMap.h waSkinMapping.h waIndicator.h guiSpectrumAnalyser.h winSkinConfig.h waBalanceSlider.h waStatus.h waSlider.h winskin.plugin waShadeMapping.h waMain.h waInfo.h waRegion.h waJumpSlider.h waVolumeSlider.h waSkin.h waColor.h waTitleBar.h waButton.h 
++KDE_DIST=winSkinConfig.h waClutterbar.h waBalanceSlider.h waDigit.h waStatus.h winSkinVis.h waLabel.h waSlider.h fileInfo.h waWidget.h winskin.plugin waShadeMapping.h waSkins.h waMain.h waInfo.h waRegion.h waSkinModel.h waSkinMapping.h skinMap.h waJumpSlider.h waIndicator.h waSkin.h waVolumeSlider.h waColor.h waTitleBar.h waButton.h guiSpectrumAnalyser.h 
+ 
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+@@ -907,7 +907,7 @@
+ 	-rm -f  noatun_winskin_la_meta_unload.cpp
+ 
+ #>+ 11
+-noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp noatun_winskin_la_meta_unload.cpp  waClutterbar.moc.cpp waVolumeSlider.moc guiSpectrumAnalyser.moc winSkinConfig.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc 
++noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/noatun_winskin_la_meta_unload.cpp  waClutterbar.moc.cpp waVolumeSlider.moc guiSpectrumAnalyser.moc winSkinConfig.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc 
+ 	@echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \
+ 	rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-ck b/audio/kdemultimedia3/patches/patch-ck
new file mode 100644
index 00000000000..761b12b5986
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-ck
@@ -0,0 +1,33 @@
+$NetBSD: patch-ck,v 1.1 2002/06/25 06:34:42 skrll Exp $
+
+--- noatun/noatun_main.cpp.orig	Sat Jun  8 12:07:50 2002
++++ noatun/noatun_main.cpp
+@@ -0,0 +1,28 @@
++/*
++ *
++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org>
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ * 
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ * 
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++extern "C" int kdemain(int, char* []);
++
++int main( int argc, char* argv[] )
++{
++	return kdemain(argc, argv);
++}
diff --git a/audio/kdemultimedia3/patches/patch-cl b/audio/kdemultimedia3/patches/patch-cl
new file mode 100644
index 00000000000..c4126946130
--- /dev/null
+++ b/audio/kdemultimedia3/patches/patch-cl
@@ -0,0 +1,22 @@
+$NetBSD: patch-cl,v 1.1 2002/06/25 06:34:42 skrll Exp $
+
+--- admin/am_edit.orig	Mon Jun 24 18:10:00 2002
++++ admin/am_edit
+@@ -384,7 +384,16 @@
+     # all modules are installed.  automake doesn't know this, so we need to move
+     # this here from install-data to install-exec.
+     if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) {
+-      $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES";
++      my $lookup2 = 'install-exec-am:\s*(.*)';
++      if ($MakefileData =~ /\n$lookup2\n/) {
++        my $newdeps = $1;
++        if ($newdeps =~ m/.*install-libLTLIBRARIES.*/) {
++	  $newdeps =~ s/install-libLTLIBRARIES/install-libLTLIBRARIES install-kde_moduleLTLIBRARIES/g;
++        } else {
++          $newdeps .= "kde_module_LTLIBRARIES";
++        }
++	substituteLine($lookup2, "install-exec-am: " . $newdeps);
++      }
+       my $lookup = 'install-data-am:\s*(.*)';
+       if ($MakefileData =~ /\n$lookup\n/) {
+         my $newdeps = $1;