Update KDE to 3.1.2.

Changes: kdemultimedia: * Ogg Vorbis Info List view column titles were incorrect. * kmix: Vertical label widget to sliders in replacement of large horizontal labels * kmix: Fixed alsa 0.9x to restore current volumes * kmix: Fixed multiple alsa 0.9x cards detection
author: markd <markd> 2003-05-22 03:05:38 +0000
committer: markd <markd> 2003-05-22 03:05:38 +0000
commit: cd03aac1dda302b3f34a0e632f70e9914ceec755 (patch)
tree: bffd31882a9f80298271a160703a685a3d75d428 /audio
parent: f1bbe05ed4c99c8fc0ca39957581b0c60eab0f50 (diff)
download: pkgsrc-cd03aac1dda302b3f34a0e632f70e9914ceec755.tar.gz
20 files changed, 334 insertions, 327 deletions
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index 630fd048106..0a91405047d 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2003/05/02 11:53:37 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/05/22 03:05:38 markd Exp $
 
-DISTNAME=	arts-1.1.1
-PKGREVISION=	1
+DISTNAME=	arts-1.1.2
 CATEGORIES=	audio
 COMMENT=	Analog Real-Time Synthesizer
 
diff --git a/audio/arts/buildlink2.mk b/audio/arts/buildlink2.mk
index 558bafa7d1a..340157c0066 100644
--- a/audio/arts/buildlink2.mk
+++ b/audio/arts/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/05/02 11:53:37 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/05/22 03:05:38 markd Exp $
 
 .if !defined(ARTS_BUILDLINK2_MK)
 ARTS_BUILDLINK2_MK=	# defined
@@ -6,7 +6,7 @@ ARTS_BUILDLINK2_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_PACKAGES+=		arts
-BUILDLINK_DEPENDS.arts?=	arts>=1.1.1nb1
+BUILDLINK_DEPENDS.arts?=	arts>=1.1.2
 BUILDLINK_PKGSRCDIR.arts?=	../../audio/arts
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.arts=arts
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index 64de23a4690..c9f150a057f 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2003/04/01 12:27:04 markd Exp $
+$NetBSD: distinfo,v 1.10 2003/05/22 03:05:38 markd Exp $
 
-SHA1 (arts-1.1.1.tar.bz2) = 6451d1adca5e8a900626086fcbdae12803b5edd2
-Size (arts-1.1.1.tar.bz2) = 974608 bytes
+SHA1 (arts-1.1.2.tar.bz2) = e3c7f9bb16de12d272f552e16614ff98b31ce039
+Size (arts-1.1.2.tar.bz2) = 985602 bytes
 SHA1 (patch-aa) = 55a91d3a0e3be942c741e77c2a6b8833208d691e
 SHA1 (patch-ab) = 06265879020edf24ff51403565fd422c3b7a17e5
 SHA1 (patch-ac) = 73cc8b5398d4191dfbf817d4b2e03917ab2ba6f6
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 9f5cd436bf5..8414900ce59 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2003/05/02 11:53:43 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2003/05/22 03:05:39 markd Exp $
 
-DISTNAME=	kdemultimedia-3.1.1
-PKGREVISION=	2
+DISTNAME=	kdemultimedia-3.1.2
 CATEGORIES=	audio
 COMMENT=	Audio tools for the KDE integrated X11 desktop
 
diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index b7eb94aad34..cb862b52d13 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1,38 +1,38 @@
-$NetBSD: distinfo,v 1.13 2003/04/01 12:27:06 markd Exp $
+$NetBSD: distinfo,v 1.14 2003/05/22 03:05:39 markd Exp $
 
-SHA1 (kdemultimedia-3.1.1.tar.bz2) = 95472cc93278a4c5a134ea74766e02da1a517a04
-Size (kdemultimedia-3.1.1.tar.bz2) = 5874375 bytes
-SHA1 (patch-aa) = 4335268e770fa302b708ca2673f1e3404682bca9
+SHA1 (kdemultimedia-3.1.2.tar.bz2) = eb37e8224c4ce59d53d3b9eae37a38e82972e05b
+Size (kdemultimedia-3.1.2.tar.bz2) = 5927084 bytes
+SHA1 (patch-aa) = 90e7cc0a6a505a2c69b25eadf5ca9050afd8afd0
 SHA1 (patch-ab) = 4f022376559ea30fee9f88aebb65d7f2b89c6c25
-SHA1 (patch-ac) = 63b2d73b200725b7cb6f8363e624e4c8834682b7
+SHA1 (patch-ac) = 4dc3d78f992089c88687244140f02d880ae973b0
 SHA1 (patch-ae) = 17fdcfa2d0861bf53404d7ce315a2a315a68a459
 SHA1 (patch-af) = 95bf9890b803b49e102d4248c0fbd52427a8c6c0
-SHA1 (patch-ag) = 8063a62c4c5a2fa5f9cedef0758092d3e06cee2a
-SHA1 (patch-aj) = 8e8c418b247fb67b17f625ba22a09150edcb5526
-SHA1 (patch-ak) = 0d71901467f29c225020e53e0ba75ea8d840500c
+SHA1 (patch-ag) = 69b25f891e96f470282140a031eb34a7352aeefe
+SHA1 (patch-aj) = 0b6ac2ade3559a34b54d171aace55af64caa376b
+SHA1 (patch-ak) = 2fe3866f2700869fb70386c2b6ce8452464c9379
 SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa
 SHA1 (patch-ao) = a31e51c87c76664188515fd1640608cef3a33927
 SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472
 SHA1 (patch-ay) = 2ce3604aef6a9d79b58fda7e969f79d3e48b6ce8
-SHA1 (patch-az) = 0da639b495d188d45317ceae0b0708dcd198bcf9
+SHA1 (patch-az) = 5b6bbc2382ee7381f756065576602697453a8303
 SHA1 (patch-ba) = 5a096a6639867541b8ad11baa798b1ba8c856e10
-SHA1 (patch-bb) = 191486a8559bcf6e0d958b6943c8fd390274c2dd
+SHA1 (patch-bb) = 9d7a0443ded398e3d8357610716643ebcb7f2c9d
 SHA1 (patch-bc) = 82424e524f316f55524c5367ce42fe4194f935c6
 SHA1 (patch-bd) = 7cd66c4d019bb2c944ae94fd9b600d9131797047
 SHA1 (patch-be) = 5cee048125a71eb5a1358966c0a61c4553eff24c
 SHA1 (patch-bf) = 1f8b40c914d27c34b0fff876682b9402c6815d42
 SHA1 (patch-bg) = 2b421f103773c6f2bb3ce6c51134a78c5ac20412
-SHA1 (patch-bh) = 3b2f7af8209caccd4e73565d1d94a1e534e50740
+SHA1 (patch-bh) = 48c97da42fc2f8caf30b07c76ed625b6f2a73ca8
 SHA1 (patch-bi) = 92fd0e6d2883d715b49e32c28dcdcfa23272b78e
 SHA1 (patch-bj) = 160aebbe402d7ecfc91a22717a3a3813be0c29e9
 SHA1 (patch-bk) = e594440c63e8038b660dcd75e89f61c6cf62a766
 SHA1 (patch-bl) = 6d2f6026fb233b43352d53acc7c82ec699cc6337
 SHA1 (patch-bm) = a50a8d722ebc48fce19d7052749795efbe543303
-SHA1 (patch-bn) = 1aacb47569c217dea5d8610fc5a739c896c6450d
+SHA1 (patch-bn) = 43fd7a739f5733c27295267d8fd0c5473b831d94
 SHA1 (patch-bo) = b67167bfe6e9810208f1f74d3e3fea2ddfb32f88
 SHA1 (patch-bp) = b59ce7619ea0bdfdd375cf5691650026ef27e176
 SHA1 (patch-bq) = 996c97dd2da67b481cf5101a220e35850009abc8
-SHA1 (patch-br) = 48d543fadeb5a6a559788fe9f4d0ddd616880719
+SHA1 (patch-br) = 1bf20994151774f13b96f4502b1a583b87d9db23
 SHA1 (patch-bs) = fb23d5297589b87946642bfbfd857c04f81027e3
 SHA1 (patch-bt) = b59041f0f87e2b92e8838f9868e5d33ae97fa689
 SHA1 (patch-bu) = 6e183a9c5caf7641304efdb409ac414de4b88947
@@ -44,15 +44,15 @@ SHA1 (patch-bz) = 1f24fa478f7f7544719e04a427d4d61a0eef9f1e
 SHA1 (patch-ca) = a1fedc7a4a507e71b0e6fff34056e414b7f119c7
 SHA1 (patch-cb) = 3a82b1fc52e8e32fb99e7427e24bd497ad323334
 SHA1 (patch-cc) = af970c41d730fe1b7e2403942ab39746b3b0e2af
-SHA1 (patch-cd) = 9a3e9c285221cca769f2431fa10d991d093590b8
+SHA1 (patch-cd) = 34759bc7ec13df4d915fe902d23dbadac9b52a45
 SHA1 (patch-ce) = 4f2c176ef04efa22ae034c5c5bd85eab329e187b
-SHA1 (patch-cf) = 46d1e9cf52a3a0bd48069064f2692cb59094f54c
+SHA1 (patch-cf) = 4bbc5e2eb01bd71e354d43cc92fb38e0b125c3c8
 SHA1 (patch-cg) = 0e7f0cdcd55a06bc60c5c617f9ad33201bda1f9d
 SHA1 (patch-ch) = 78d86400c2b4d51fe1363ccc770b4cbab56b45eb
 SHA1 (patch-ci) = 905b15e9e8de4954174dab769b3a2c634b094288
-SHA1 (patch-cj) = 5e2a992726b0a861218e70903855e76b0db048f9
+SHA1 (patch-cj) = 51f7a4369abfa7f76021951f86f8c070a2e0878c
 SHA1 (patch-cm) = 2d539df6011c977c0b984233f45b99eeb838e7b3
-SHA1 (patch-cn) = 7c85df6d35477d2bec38b16efb884f89f791fb69
+SHA1 (patch-cn) = 2f063015327d40d77b764397819db9260152407b
 SHA1 (patch-co) = b484ad7c770a3bd9554051af64e2545fac5a677f
 SHA1 (patch-cp) = 8b16a472b150d54810c09126a01723d9a9d9f0d5
-SHA1 (patch-cq) = 76106cf3fabff4df4f8bc7bb642336707e2d57f2
+SHA1 (patch-cq) = 19783ae56e3d894d4c2d08a3a44260e8c7e9fd54
diff --git a/audio/kdemultimedia3/patches/patch-aa b/audio/kdemultimedia3/patches/patch-aa
index c45380fa563..a85c111f0af 100644
--- a/audio/kdemultimedia3/patches/patch-aa
+++ b/audio/kdemultimedia3/patches/patch-aa
@@ -1,49 +1,49 @@
-$NetBSD: patch-aa,v 1.4 2003/03/11 13:33:47 markd Exp $
+$NetBSD: patch-aa,v 1.5 2003/05/22 03:05:40 markd Exp $
 
---- configure.orig	Fri Jan 17 08:49:45 2003
+--- configure.orig	Thu May  8 00:05:31 2003
 +++ configure
-@@ -26406,6 +26406,40 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -27200,6 +27200,40 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    eval "ac_cv_lib_vm='-lXxf86dga -lXxf86vm'"
-+
-+	lib=Xxf86dga
-+	shared_lib_found=no
-+	for i in ${LDFLAGS}; do
-+		case "$i" in
-+		-L*)
-+			dir=`echo $i | sed "s,^-L,,"`
-+			if [ -e $dir/lib${lib}.so ] ||
-+			   [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+				shared_lib_found=yes
-+				break;
-+			fi
-+		esac
-+	done
-+	if [ "$shared_lib_found" = "no" ]; then
-+		eval "ac_cv_lib_vm=no"
-+	fi
-+
-+	lib=Xxf86vm
-+	shared_lib_found=no
-+	for i in ${LDFLAGS}; do
-+		case "$i" in
-+		-L*)
-+			dir=`echo $i | sed "s,^-L,,"`
-+			if [ -e $dir/lib${lib}.so ] ||
-+			   [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+				shared_lib_found=yes
-+				break;
-+			fi
-+		esac
-+	done
-+	if [ "$shared_lib_found" = "no" ]; then
-+		eval "ac_cv_lib_vm=no"
-+	fi
++ 
++ 	lib=Xxf86dga
++ 	shared_lib_found=no
++ 	for i in ${LDFLAGS}; do
++ 		case "$i" in
++ 		-L*)
++ 			dir=`echo $i | sed "s,^-L,,"`
++ 			if [ -e $dir/lib${lib}.so ] ||
++ 			   [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
++ 				shared_lib_found=yes
++ 				break;
++ 			fi
++ 		esac
++ 	done
++ 	if [ "$shared_lib_found" = "no" ]; then
++ 		eval "ac_cv_lib_vm=no"
++ 	fi
++ 
++ 	lib=Xxf86vm
++ 	shared_lib_found=no
++ 	for i in ${LDFLAGS}; do
++ 		case "$i" in
++ 		-L*)
++ 			dir=`echo $i | sed "s,^-L,,"`
++ 			if [ -e $dir/lib${lib}.so ] ||
++ 			   [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
++ 				shared_lib_found=yes
++ 				break;
++ 			fi
++ 		esac
++ 	done
++ 	if [ "$shared_lib_found" = "no" ]; then
++ 		eval "ac_cv_lib_vm=no"
++ 	fi
  else
    echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-@@ -28047,7 +28081,7 @@ fi;
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -28947,7 +28981,7 @@ fi;
  
  if test "x$au_enable_default" = xyes; then
    case "$target" in
@@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.4 2003/03/11 13:33:47 markd Exp $
        au_enable_oss=yes
        ;;
      *-*-bsdi2.0)
-@@ -32038,7 +32072,7 @@ fi
+@@ -33020,7 +33054,7 @@ fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
  echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6
  if test $ac_cv_lib_ossaudio_main = yes; then
@@ -61,33 +61,33 @@ $NetBSD: patch-aa,v 1.4 2003/03/11 13:33:47 markd Exp $
  fi
  
  
-@@ -33074,8 +33108,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -34105,8 +34139,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
 -                x11_dga2=yes
 -
-+	lib=Xxf86dga
-+	shared_lib_found=no
-+	for i in ${LDFLAGS}; do
-+		case "$i" in
-+		-L*)
-+			dir=`echo $i | sed "s,^-L,,"`
-+			if [ -e $dir/lib${lib}.so ] ||
-+			   [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+				shared_lib_found=yes
-+				break;
-+			fi
-+		esac
-+	done
-+	if [ "$shared_lib_found" = "yes" ]; then
-+		x11_dga2=yes
-+	fi
-+  
++ 	lib=Xxf86dga
++ 	shared_lib_found=no
++ 	for i in ${LDFLAGS}; do
++ 		case "$i" in
++ 		-L*)
++ 			dir=`echo $i | sed "s,^-L,,"`
++ 			if [ -e $dir/lib${lib}.so ] ||
++ 			   [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
++ 				shared_lib_found=yes
++ 				break;
++ 			fi
++ 		esac
++ 	done
++ 	if [ "$shared_lib_found" = "yes" ]; then
++ 		x11_dga2=yes
++ 	fi
++   
  else
    echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
-@@ -33130,7 +33179,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -34160,7 +34209,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -110,7 +110,7 @@ $NetBSD: patch-aa,v 1.4 2003/03/11 13:33:47 markd Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -33186,7 +33250,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -34215,7 +34279,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -133,7 +133,7 @@ $NetBSD: patch-aa,v 1.4 2003/03/11 13:33:47 markd Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -33785,10 +33864,10 @@ _ACEOF
+@@ -34807,10 +34886,10 @@ _ACEOF
      ;;
  
    NetBSD)
diff --git a/audio/kdemultimedia3/patches/patch-ac b/audio/kdemultimedia3/patches/patch-ac
index bd7b2af241d..afab1ec7e7b 100644
--- a/audio/kdemultimedia3/patches/patch-ac
+++ b/audio/kdemultimedia3/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
+$NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 markd Exp $
 
---- kaboodle/Makefile.in.orig	Fri Jan 17 08:49:39 2003
+--- kaboodle/Makefile.in.orig	Thu May  8 00:05:27 2003
 +++ kaboodle/Makefile.in
-@@ -328,7 +328,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
+@@ -379,7 +379,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
  
  SUBDIRS = pics actions
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  
  kde_module_LTLIBRARIES = libkaboodlepart.la
  
-@@ -343,24 +343,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \
+@@ -394,24 +394,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \
  libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
  libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer
  
@@ -44,7 +44,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  applnk_DATA = kaboodle.desktop
  applnkdir = $(kde_appsdir)/Multimedia
  
-@@ -373,14 +375,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -424,14 +426,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
  
@@ -70,7 +70,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  libkaboodlepart_la_DEPENDENCIES =
  am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \
  	kaboodle_factory.lo player.lo view.lo
-@@ -394,11 +401,11 @@ libkaboodlepart_la_nofinal_OBJECTS = con
+@@ -445,31 +452,37 @@ libkaboodlepart_la_nofinal_OBJECTS = con
  bin_PROGRAMS = kaboodle$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -83,9 +83,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
 +kaboodle_OBJECTS = kaboodle_main.$(OBJEXT)
 +kaboodle_DEPENDENCIES = libkaboodle_main.la
  
- DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -407,21 +414,27 @@ LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/conf.Plo ./$(DEPDIR)/controls.Plo \
@@ -118,10 +116,10 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kaboodleapp.Plo ./$(DEPDIR)/main.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/player.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/userinterface.Plo ./$(DEPDIR)/view.Plo
-@@ -445,8 +458,8 @@ CXXLD = $(CXX)
+@@ -492,8 +505,8 @@ CXXLD = $(CXX)
+ #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
 -DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) \
 -	$(kaboodle_SOURCES)
 +DIST_SOURCES = $(kaboodle_la_SOURCES) $(libkaboodle_main_la_SOURCES) \
@@ -129,8 +127,8 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA)
  
  
-@@ -456,7 +469,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- 	uninstall-recursive check-recursive installcheck-recursive
+@@ -504,7 +517,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ 	check-recursive installcheck-recursive
  DIST_COMMON = AUTHORS Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
 -SOURCES = $(kaboodle_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES)
@@ -138,7 +136,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -531,6 +544,8 @@ clean-libLTLIBRARIES:
+@@ -579,6 +592,8 @@ clean-libLTLIBRARIES:
  	done
  kaboodle.la: $(kaboodle_la_OBJECTS) $(kaboodle_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kaboodle_la_LDFLAGS) $(kaboodle_la_OBJECTS) $(kaboodle_la_LIBADD) $(LIBS)
@@ -147,7 +145,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  #>- libkaboodlepart.la: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) 
  #>+ 2
  @KDE_USE_CLOSURE_TRUE@libkaboodlepart.la: libkaboodlepart.la.closure $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) 
-@@ -577,9 +592,10 @@ distclean-compile:
+@@ -625,9 +640,10 @@ distclean-compile:
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controls.Plo@am__quote@
@@ -159,16 +157,16 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaboodleapp.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Plo@am__quote@
-@@ -769,7 +785,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -853,7 +869,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=engine.h kaboodleengine.desktop kaboodle_factory.h kaboodleapp.h userinterface.h controls.h conf.h player.h kaboodleui.rc kaboodle.desktop view.h kaboodlepartui.rc uninstall.desktop kaboodle_component.desktop 
-+KDE_DIST=view.h kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc kaboodle.desktop kaboodle_component.desktop kaboodleengine.desktop conf.h uninstall.desktop player.h userinterface.h 
++KDE_DIST=view.h kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc kaboodle.desktop kaboodle_component.desktop Makefile.in.rej kaboodleengine.desktop conf.h uninstall.desktop player.h userinterface.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -837,7 +853,6 @@ install-strip:
+@@ -927,7 +943,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -176,8 +174,8 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -924,9 +939,6 @@ uninstall-info: uninstall-info-recursive
- 	uninstall-recursive
+@@ -1023,9 +1038,6 @@ uninstall-info: uninstall-info-recursive
+ 	uninstall-libLTLIBRARIES uninstall-recursive
  
  
 -dummy.cpp:
@@ -186,7 +184,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  install-data-local: uninstall.desktop
  	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia/More
  	$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/More/kaboodle.desktop
-@@ -947,40 +959,40 @@ libkaboodlepart.la.closure: $(libkaboodl
+@@ -1046,40 +1058,40 @@ libkaboodlepart.la.closure: $(libkaboodl
  
  
  #>+ 3
@@ -240,7 +238,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -997,19 +1009,19 @@ force-reedit:
+@@ -1096,19 +1108,19 @@ force-reedit:
  
  
  #>+ 11
@@ -269,7 +267,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  	@echo 'creating libkaboodlepart_la.all_cpp.cpp ...'; \
  	rm -f libkaboodlepart_la.all_cpp.files libkaboodlepart_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkaboodlepart_la.all_cpp.final; \
-@@ -1022,20 +1034,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir
+@@ -1121,20 +1133,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir
  
  #>+ 3
  clean-final:
@@ -295,7 +293,7 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:33:48 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1045,19 +1057,19 @@ kde-rpo-clean:
+@@ -1144,19 +1156,19 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 17
diff --git a/audio/kdemultimedia3/patches/patch-ag b/audio/kdemultimedia3/patches/patch-ag
index 9b775d8c574..9f570e0a772 100644
--- a/audio/kdemultimedia3/patches/patch-ag
+++ b/audio/kdemultimedia3/patches/patch-ag
@@ -1,23 +1,30 @@
-$NetBSD: patch-ag,v 1.2 2003/03/11 13:33:48 markd Exp $
+$NetBSD: patch-ag,v 1.3 2003/05/22 03:05:40 markd Exp $
 
---- kmidi/TIMIDITY/Makefile.in.orig	Fri Jan 17 08:49:40 2003
+--- kmidi/TIMIDITY/Makefile.in.orig	Thu May  8 00:05:28 2003
 +++ kmidi/TIMIDITY/Makefile.in
-@@ -337,8 +337,8 @@ x_libraries = @x_libraries@
+@@ -149,7 +149,6 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET
+ LAME_INCS = @LAME_INCS@
+ LAME_LIBS = @LAME_LIBS@
+ LAME_RPATH = @LAME_RPATH@
+-LDFLAGS = `$(ARTSCCONFIG) --libs`
+ LIBALIB = @LIBALIB@
+ LIBASOUND = @LIBASOUND@
+ LIBAUDIO = @LIBAUDIO@
+@@ -388,7 +387,8 @@ xine_artsplugin_SUBDIR_included_TRUE = @
  
  INCLUDES = $(X_INCLUDES) `$(ARTSCCONFIG) --cflags`
  AM_CFLAGS = -DDEFAULT_PATH=\"$(TIMID_DIR)\" $(EXTRATDEFS) $(EXTRATCFLAGS)
--LDFLAGS = `$(ARTSCCONFIG) --libs`
 -LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lkdefakes -lm
 +timidity_LDFLAGS = `$(ARTSCCONFIG) --libs`
 +LDADD = $(LIBOSSAUDIO) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lkdefakes -lm
  
  # Where to install the patches, config files, and MIDI files.
  # If you change this, it's a good idea to recompile the binary,
-@@ -420,7 +420,6 @@ timidity_nofinal_OBJECTS = timidity.$(OB
+@@ -470,7 +470,6 @@ timidity_nofinal_OBJECTS = timidity.$(OB
  @KDE_USE_FINAL_TRUE@timidity_OBJECTS = $(timidity_final_OBJECTS)
  timidity_LDADD = $(LDADD)
  timidity_DEPENDENCIES =
 -timidity_LDFLAGS =
  
- DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
diff --git a/audio/kdemultimedia3/patches/patch-aj b/audio/kdemultimedia3/patches/patch-aj
index 21e2a91a0b7..08b41f5f535 100644
--- a/audio/kdemultimedia3/patches/patch-aj
+++ b/audio/kdemultimedia3/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.2 2003/03/11 13:33:49 markd Exp $
+$NetBSD: patch-aj,v 1.3 2003/05/22 03:05:40 markd Exp $
 
---- kmix/Makefile.am.orig	Sun Oct 27 11:20:17 2002
+--- kmix/Makefile.am.orig	Wed May  7 23:46:50 2003
 +++ kmix/Makefile.am
 @@ -2,7 +2,7 @@ SUBDIRS = control pics
  INCLUDES= $(all_includes)
@@ -17,7 +17,7 @@ $NetBSD: patch-aj,v 1.2 2003/03/11 13:33:49 markd Exp $
  METASOURCES = AUTO
 -kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
 +libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
- 	kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \
+ 	kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \
  	volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface.skel
 -kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
 +libkmix_main_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
diff --git a/audio/kdemultimedia3/patches/patch-ak b/audio/kdemultimedia3/patches/patch-ak
index 45b379ac36f..6e4bb26881d 100644
--- a/audio/kdemultimedia3/patches/patch-ak
+++ b/audio/kdemultimedia3/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
+$NetBSD: patch-ak,v 1.5 2003/05/22 03:05:40 markd Exp $
 
---- kmix/Makefile.in.orig	Fri Jan 17 08:49:40 2003
+--- kmix/Makefile.in.orig	Thu May  8 00:05:28 2003
 +++ kmix/Makefile.in
-@@ -328,7 +328,7 @@ SUBDIRS = control pics
+@@ -379,7 +379,7 @@ SUBDIRS = control pics
  INCLUDES = $(all_includes)
  
  bin_PROGRAMS = kmix kmixctrl
@@ -11,18 +11,18 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  kde_module_LTLIBRARIES = kmix_panelapplet.la
  
  noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \
-@@ -337,29 +337,37 @@ noinst_HEADERS = kmix.h kmixdockwidget.h
+@@ -388,29 +388,37 @@ noinst_HEADERS = kmix.h kmixdockwidget.h
  
  
  #>- METASOURCES = AUTO
 -#>- kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
 +#>- libkmix_main_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
- #>- 	kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \
+ #>- 	kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \
  #>- 	volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface.skel
  #>+ 3
 -kmix_la_SOURCES=main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
 +libkmix_main_la_SOURCES=main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
- 	kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp \
+ 	kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp \
  	volume.cpp kledbutton.cpp mixdevicewidget.cpp  mixerIface_skel.cpp
  
 -kmix_la_LIBADD = $(LIB_KDEUI) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
@@ -59,22 +59,22 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  #>- kmix_panelapplet_la_SOURCES = kmixapplet.cpp kmixerwidget.cpp channel.cpp \
-@@ -392,18 +400,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -443,18 +451,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
  
 -kmix_la_DEPENDENCIES =
 -am_kmix_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \
--	kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \
--	kledbutton.lo mixdevicewidget.lo
+-	kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo \
+-	VerticalText.lo volume.lo kledbutton.lo mixdevicewidget.lo
 +kmix_la_DEPENDENCIES = libkmix_main.la
 +am_kmix_la_OBJECTS = kmix_main.lo
  #>- kmix_la_OBJECTS = $(am_kmix_la_OBJECTS)
 -#>+ 6
 -kmix_la_final_OBJECTS = kmix_la.all_cpp.lo 
 -kmix_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \
--	kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \
--	kledbutton.lo mixdevicewidget.lo mixerIface_skel.lo
+-	kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo \
+-	VerticalText.lo volume.lo kledbutton.lo mixdevicewidget.lo mixerIface_skel.lo
 -@KDE_USE_FINAL_FALSE@kmix_la_OBJECTS = $(kmix_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@kmix_la_OBJECTS = $(kmix_la_final_OBJECTS)
 +#>+ 1
@@ -82,8 +82,8 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  kmix_panelapplet_la_DEPENDENCIES =
  am_kmix_panelapplet_la_OBJECTS = kmixapplet.lo kmixerwidget.lo \
  	channel.lo mixer.lo ksmallslider.lo volume.lo kledbutton.lo \
-@@ -416,27 +417,46 @@ kmix_panelapplet_la_nofinal_OBJECTS = km
- 	mixdevicewidget.lo mixerIface_skel.lo colorwidget.lo
+@@ -467,46 +468,73 @@ kmix_panelapplet_la_nofinal_OBJECTS = km
+ 	VerticalText.lo mixdevicewidget.lo mixerIface_skel.lo colorwidget.lo
  @KDE_USE_FINAL_FALSE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_final_OBJECTS)
 -kmixctrl_la_DEPENDENCIES =
@@ -101,13 +101,15 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
 +libkmix_main_la_DEPENDENCIES =
 +am_libkmix_main_la_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \
 +	kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \
-+	ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo
++	ksmallslider.lo VerticalText.lo volume.lo kledbutton.lo \
++	mixdevicewidget.lo
 +#>- libkmix_main_la_OBJECTS = $(am_libkmix_main_la_OBJECTS)
-+#>+ 6
++#>+ 7
 +libkmix_main_la_final_OBJECTS = libkmix_main_la.all_cpp.lo 
 +libkmix_main_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \
 +	kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \
-+	ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo mixerIface_skel.lo
++	ksmallslider.lo VerticalText.lo volume.lo kledbutton.lo \
++	mixdevicewidget.lo mixerIface_skel.lo
 +@KDE_USE_FINAL_FALSE@libkmix_main_la_OBJECTS = $(libkmix_main_la_nofinal_OBJECTS)
 +@KDE_USE_FINAL_TRUE@libkmix_main_la_OBJECTS = $(libkmix_main_la_final_OBJECTS)
 +libkmixctrl_main_la_DEPENDENCIES =
@@ -140,17 +142,17 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
 +kmixctrl_OBJECTS = kmixctrl_main.$(OBJEXT)
 +kmixctrl_DEPENDENCIES = libkmixctrl_main.la
  
- DEFS = @DEFS@
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-@@ -444,28 +464,37 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
--#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \
-+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/channel.Plo \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \
+ #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/VerticalText.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/kmixctrl.Plo \
 +#>- @AMDEP_TRUE@	./$(DEPDIR)/kmixctrl_main.Plo \
 +#>- @AMDEP_TRUE@	./$(DEPDIR)/kmixctrl_main.Po \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/kmixdockwidget.Plo \
@@ -159,34 +161,41 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  #>- @AMDEP_TRUE@	./$(DEPDIR)/ksmallslider.Plo ./$(DEPDIR)/main.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/mixdevicewidget.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/mixer.Plo ./$(DEPDIR)/volume.Plo
--#>+ 19
--@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P  $(DEPDIR)/kmix_la.all_cpp.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/kmixctrl_la.all_cpp.P  ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \
-+#>+ 25
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P  $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/libkmix_main_la.all_cpp.P $(DEPDIR)/libkmixctrl_main_la.all_cpp.P  ./$(DEPDIR)/channel.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \
+-#>+ 21
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P  $(DEPDIR)/kmix_la.all_cpp.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/kmixctrl_la.all_cpp.P  ./$(DEPDIR)/VerticalText.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \
++#>+ 27
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P  $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/libkmix_main_la.all_cpp.P $(DEPDIR)/libkmixctrl_main_la.all_cpp.P  ./$(DEPDIR)/VerticalText.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixctrl.Plo \
 +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixctrl_main.Plo \
 +@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixctrl_main.Po \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixdockwidget.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixerwidget.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixprefdlg.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ksmallslider.Plo ./$(DEPDIR)/main.Plo \
+@@ -514,9 +542,12 @@ am__depfiles_maybe = depfiles
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/mixdevicewidget.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/mixer.Plo ./$(DEPDIR)/volume.Plo
--@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P  ./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P  ./$(DEPDIR)/channel.Plo \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
-+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmix_main.Plo ./$(DEPDIR)/kmix_main.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/mixerIface_skel.P $(DEPDIR)/colorwidget.P  ./$(DEPDIR)/VerticalText.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/channel.Plo ./$(DEPDIR)/dummy.Po \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kledbutton.Plo ./$(DEPDIR)/kmix.Plo \
+-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixapplet.Plo ./$(DEPDIR)/kmixctrl.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/channel.Plo ./$(DEPDIR)/kledbutton.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmix.Plo ./$(DEPDIR)/kmix_main.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmix_main.Po ./$(DEPDIR)/kmixapplet.Plo \
++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixctrl.Plo \
 +@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixctrl_main.Plo \
 +@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixctrl_main.Po \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixdockwidget.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixerwidget.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kmixprefdlg.Plo \
-@@ -493,7 +522,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
+@@ -543,7 +574,9 @@ CXXLD = $(CXX)
+ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
  DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
 -	$(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES)
 +	$(kmixctrl_la_SOURCES) $(libkmix_main_la_SOURCES) \
@@ -195,8 +204,8 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA)
  
  HEADERS = $(noinst_HEADERS)
-@@ -505,7 +536,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- 	uninstall-recursive check-recursive installcheck-recursive
+@@ -556,7 +589,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ 	check-recursive installcheck-recursive
  DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
 -SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES)
@@ -204,7 +213,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -587,6 +618,10 @@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE
+@@ -638,6 +671,10 @@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE
  	$(CXXLINK) -rpath $(kde_moduledir) $(kmix_panelapplet_la_LDFLAGS) $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_LIBADD) $(LIBS)
  kmixctrl.la: $(kmixctrl_la_OBJECTS) $(kmixctrl_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(kmixctrl_la_LDFLAGS) $(kmixctrl_la_OBJECTS) $(kmixctrl_la_LIBADD) $(LIBS)
@@ -215,9 +224,9 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -630,11 +665,14 @@ distclean-compile:
- 	-rm -f *.tab.c
+@@ -682,11 +719,14 @@ distclean-compile:
  
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VerticalText.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel.Plo@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kledbutton.Plo@am__quote@
@@ -231,16 +240,16 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixdockwidget.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixerwidget.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmixprefdlg.Plo@am__quote@
-@@ -845,7 +883,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -933,7 +973,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=mixer_hpux.h mixer_irix.h resource.h kmixui.rc kledbutton.cpp kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_none.cpp mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop ksmallslider.cpp mixdevicewidget.cpp mixer_irix.cpp mixer_alsa5.cpp mixer_sun.cpp configure.in.in kmixctrl_restore.desktop mixer_oss.cpp mixer_none.h mixer_alsa9.cpp mixer_oss.h 
-+KDE_DIST=mixer_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h kledbutton.cpp mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_alsa5.cpp mixer_sun.cpp ksmallslider.cpp mixer_none.cpp mixer_none.h mixdevicewidget.cpp mixer_oss.h kmixapplet.desktop mixer_alsa.h 
+-KDE_DIST=mixer_hpux.h mixer_irix.h resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_none.cpp mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop mixer_irix.cpp mixer_alsa5.cpp mixer_sun.cpp configure.in.in kmixctrl_restore.desktop mixer_oss.cpp mixer_none.h mixer_alsa9.cpp mixer_oss.h 
++KDE_DIST=mixer_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_alsa5.cpp mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h kmixapplet.desktop mixer_alsa.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -1005,54 +1043,51 @@ $(srcdir)/version.h: VERSION
+@@ -1108,54 +1148,51 @@ $(srcdir)/version.h: VERSION
  
  messages: rc.cpp
  	$(XGETTEXT) *.cpp -o $(podir)/kmix.pot
@@ -317,7 +326,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  
  #>+ 8
  kmix_panelapplet.la.closure: $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_DEPENDENCIES)
-@@ -1080,7 +1115,7 @@ colorwidget.moc: colorwidget.h
+@@ -1183,7 +1220,7 @@ colorwidget.moc: colorwidget.h
  
  #>+ 3
  clean-metasources:
@@ -326,15 +335,15 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  
  #>+ 6
  clean-idl:
-@@ -1109,19 +1144,7 @@ force-reedit:
+@@ -1212,19 +1249,7 @@ force-reedit:
  
  
  #>+ 11
--kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp  kmix.moc kmixdockwidget.moc ksmallslider.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc kmixprefdlg.moc
+-kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/VerticalText.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp  kmix.moc kmixdockwidget.moc ksmallslider.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc kmixprefdlg.moc
 -	@echo 'creating kmix_la.all_cpp.cpp ...'; \
 -	rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \
 -	echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \
--	for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \
+-	for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \
 -	  echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \
 -	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \
 -	done; \
@@ -342,12 +351,12 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
 -	rm -f kmix_la.all_cpp.final kmix_la.all_cpp.files
 -
 -#>+ 11
--kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp  kmixapplet.moc ksmallslider.moc colorwidget.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc
-+kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp  mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc
+-kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/VerticalText.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp  kmixapplet.moc ksmallslider.moc colorwidget.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc
++kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/VerticalText.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp colorwidget.cpp  mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc
  	@echo 'creating kmix_panelapplet_la.all_cpp.cpp ...'; \
  	rm -f kmix_panelapplet_la.all_cpp.files kmix_panelapplet_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kmix_panelapplet_la.all_cpp.final; \
-@@ -1133,33 +1156,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi
+@@ -1236,33 +1261,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi
  	rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files
  
  #>+ 11
@@ -355,11 +364,11 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
 -	@echo 'creating kmixctrl_la.all_cpp.cpp ...'; \
 -	rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \
 -	echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \
-+libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp  kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc
++libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/VerticalText.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp mixerIface_skel.cpp  kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc
 +	@echo 'creating libkmix_main_la.all_cpp.cpp ...'; \
 +	rm -f libkmix_main_la.all_cpp.files libkmix_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libkmix_main_la.all_cpp.final; \
-+	for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \
++	for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp VerticalText.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp mixerIface_skel.cpp ; do \
 +	  echo "#include \"$$file\"" >> libkmix_main_la.all_cpp.files; \
 +	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmix_main_la.all_cpp.final; \
 +	done; \
@@ -406,10 +415,10 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1169,29 +1204,29 @@ kde-rpo-clean:
+@@ -1272,30 +1309,30 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
- #>+ 27
+ #>+ 28
 -$(srcdir)/mixdevicewidget.cpp: colorwidget.h 
 -kledbutton.lo: kledbutton.moc 
 -mixer.o: mixer.moc 
@@ -437,6 +446,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
 +$(srcdir)/channel.cpp: colorwidget.h 
 +kmixprefdlg.o: kmixprefdlg.moc 
  $(srcdir)/kledbutton.cpp: colorwidget.h 
+-$(srcdir)/VerticalText.cpp: colorwidget.h 
 +mixdevicewidget.lo: mixdevicewidget.moc 
  ksmallslider.o: ksmallslider.moc 
 -mixdevicewidget.o: mixdevicewidget.moc 
@@ -446,6 +456,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:33:50 markd Exp $
 -$(srcdir)/volume.cpp: colorwidget.h 
 +mixer.o: mixer.moc 
 +kledbutton.o: kledbutton.moc 
++$(srcdir)/VerticalText.cpp: colorwidget.h 
 +kmixprefdlg.lo: kmixprefdlg.moc 
  kmixapplet.o: kmixapplet.moc 
 -ksmallslider.lo: ksmallslider.moc 
diff --git a/audio/kdemultimedia3/patches/patch-az b/audio/kdemultimedia3/patches/patch-az
index cbacd7e85c9..7e87f7322c8 100644
--- a/audio/kdemultimedia3/patches/patch-az
+++ b/audio/kdemultimedia3/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
+$NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
 
---- noatun/Makefile.in.orig	Fri Jan 17 08:49:41 2003
+--- noatun/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/Makefile.in
-@@ -330,22 +330,25 @@ SUBDIRS = pics library modules  .
+@@ -381,22 +381,25 @@ SUBDIRS = pics library modules  .
  
  KDE_ICON = AUTO
  
@@ -35,7 +35,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  applnk_DATA = noatun.desktop
  applnkdir = $(kde_appsdir)/Multimedia
  
-@@ -363,25 +366,31 @@ subdir = noatun
+@@ -414,25 +417,31 @@ subdir = noatun
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -78,8 +78,8 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
  #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
  #>+ 1
-@@ -394,13 +403,19 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
+@@ -442,13 +451,19 @@ noatun20update_DEPENDENCIES =
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
 -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/joinhandler.Plo \
@@ -105,10 +105,10 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -421,8 +436,8 @@ CXXLD = $(CXX)
+@@ -468,8 +483,8 @@ CXXLD = $(CXX)
+ #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
 -DIST_SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) \
 -	$(noatun20update_SOURCES)
 +DIST_SOURCES = $(libnoatun_main_la_SOURCES) $(noatun_la_SOURCES) \
@@ -116,8 +116,8 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  DATA = $(applnk_DATA) $(presets_DATA) $(update_DATA)
  
  
-@@ -432,7 +447,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- 	uninstall-recursive check-recursive installcheck-recursive
+@@ -480,7 +495,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ 	check-recursive installcheck-recursive
  DIST_COMMON = COPYING Makefile.am Makefile.in TODO
  DIST_SUBDIRS = $(SUBDIRS)
 -SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) $(noatun20update_SOURCES)
@@ -125,7 +125,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -477,6 +492,36 @@ clean-kde_moduleLTLIBRARIES:
+@@ -525,6 +540,36 @@ clean-kde_moduleLTLIBRARIES:
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
@@ -153,7 +153,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
 +	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 +	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 +	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-+	  test -z "$dir" && dir=.; \
++	  test "$$dir" = "$$p" && dir=.; \
 +	  echo "rm -f \"$${dir}/so_locations\""; \
 +	  rm -f "$${dir}/so_locations"; \
 +	done
@@ -162,7 +162,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  noatun.la: $(noatun_la_OBJECTS) $(noatun_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(kde_moduledir) $(noatun_la_LDFLAGS) $(noatun_la_OBJECTS) $(noatun_la_LIBADD) $(LIBS)
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -550,10 +595,11 @@ mostlyclean-compile:
+@@ -598,10 +643,11 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -175,8 +175,8 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  distclean-depend:
  	-rm -rf ./$(DEPDIR)
-@@ -738,7 +784,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -822,7 +868,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=artsvideo.idl preset.jazz cr48-app-noatun.png preset.trance joinhandler.h preset.eclecticguitar FILES cr128-app-noatun.png avideoframe.h CHANGES preset.metal cr22-app-noatun.png configure.in.in noatun.upd noatun.desktop preset.dance cr32-app-noatun.png preset.zero avideoframe.cc cr16-app-noatun.png cr64-app-noatun.png 
@@ -184,7 +184,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -783,9 +829,11 @@ distdir: $(DISTFILES)
+@@ -873,9 +919,11 @@ distdir: $(DISTFILES)
  check-am: all-am
  check: check-recursive
  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
@@ -197,7 +197,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  install: install-recursive
  install-exec: install-exec-recursive
-@@ -804,7 +852,6 @@ install-strip:
+@@ -894,7 +942,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -205,7 +205,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  distclean-generic:
  	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -817,10 +864,12 @@ maintainer-clean-generic:
+@@ -907,10 +954,12 @@ maintainer-clean-generic:
  clean: kde-rpo-clean  clean-recursive
  
  #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
@@ -221,7 +221,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  distclean: distclean-recursive
  
-@@ -841,9 +890,9 @@ info-am:
+@@ -931,9 +980,9 @@ info-am:
  install-data-am: install-kde-icons   install-applnkDATA \
  	install-presetsDATA install-updateDATA install-updatePROGRAMS
  
@@ -233,7 +233,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  install-info: install-info-recursive
  
-@@ -862,43 +911,42 @@ mostlyclean-am: mostlyclean-compile most
+@@ -960,27 +1009,28 @@ ps-am:
  
  #>- uninstall-am: uninstall-applnkDATA uninstall-binPROGRAMS \
  #>- 	uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
@@ -251,44 +251,37 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  
  uninstall-info: uninstall-info-recursive
  
- .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
  	clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \
--	clean-libtool clean-recursive clean-updatePROGRAMS distclean \
--	distclean-compile distclean-depend distclean-generic \
--	distclean-libtool distclean-recursive distclean-tags distdir \
--	dvi dvi-am dvi-recursive info info-am info-recursive install \
--	install-am install-applnkDATA install-binPROGRAMS install-data \
+-	clean-libtool clean-recursive clean-updatePROGRAMS ctags \
+-	ctags-recursive distclean distclean-compile distclean-depend \
+-	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+-	info-recursive install install-am install-applnkDATA \
+-	install-binPROGRAMS install-data install-data-am \
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-kde_moduleLTLIBRARIES \
 +	clean-libLTLIBRARIES clean-libtool clean-recursive \
-+	clean-updatePROGRAMS distclean distclean-compile \
-+	distclean-depend distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-applnkDATA install-binPROGRAMS install-data \
- 	install-data-am install-data-recursive install-exec \
- 	install-exec-am install-exec-recursive install-info \
- 	install-info-am install-info-recursive \
--	install-kde_moduleLTLIBRARIES install-man install-presetsDATA \
--	install-recursive install-strip install-updateDATA \
--	install-updatePROGRAMS installcheck installcheck-am installdirs \
--	installdirs-am installdirs-recursive maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
--	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive tags tags-recursive uninstall \
--	uninstall-am uninstall-applnkDATA uninstall-binPROGRAMS \
--	uninstall-info-am uninstall-info-recursive \
--	uninstall-kde_moduleLTLIBRARIES uninstall-presetsDATA \
++	clean-updatePROGRAMS ctags ctags-recursive distclean \
++	distclean-compile distclean-depend distclean-generic \
++	distclean-libtool distclean-recursive distclean-tags distdir \
++	dvi dvi-am dvi-recursive info info-am info-recursive install \
++	install-am install-applnkDATA install-binPROGRAMS install-data \
++	install-data-am install-data-recursive install-exec \
++	install-exec-am install-exec-recursive install-info \
++	install-info-am install-info-recursive \
 +	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
-+	install-man install-presetsDATA install-recursive install-strip \
-+	install-updateDATA install-updatePROGRAMS installcheck \
-+	installcheck-am installdirs installdirs-am \
-+	installdirs-recursive maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	tags tags-recursive uninstall uninstall-am uninstall-applnkDATA \
-+	uninstall-binPROGRAMS uninstall-info-am \
-+	uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
+ 	install-man install-presetsDATA install-recursive install-strip \
+ 	install-updateDATA install-updatePROGRAMS installcheck \
+ 	installcheck-am installdirs installdirs-am \
+@@ -991,13 +1041,11 @@ uninstall-info: uninstall-info-recursive
+ 	tags-recursive uninstall uninstall-am uninstall-applnkDATA \
+ 	uninstall-binPROGRAMS uninstall-info-am \
+ 	uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
+-	uninstall-presetsDATA uninstall-recursive uninstall-updateDATA \
 +	uninstall-libLTLIBRARIES uninstall-presetsDATA \
- 	uninstall-recursive uninstall-updateDATA \
++	uninstall-recursive uninstall-updateDATA \
  	uninstall-updatePROGRAMS
  
  
@@ -298,7 +291,7 @@ $NetBSD: patch-az,v 1.4 2003/03/11 13:33:54 markd Exp $
  messages:
  	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` > rc.cpp
  	$(XGETTEXT) rc.cpp `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/noatun.pot
-@@ -951,33 +999,33 @@ force-reedit:
+@@ -1050,33 +1098,33 @@ force-reedit:
  
  
  #>+ 11
diff --git a/audio/kdemultimedia3/patches/patch-bb b/audio/kdemultimedia3/patches/patch-bb
index 65f1d300dba..f3546fe4a48 100644
--- a/audio/kdemultimedia3/patches/patch-bb
+++ b/audio/kdemultimedia3/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
+$NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
 
---- noatun/library/Makefile.in.orig	Fri Jan 17 08:49:41 2003
+--- noatun/library/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/library/Makefile.in
-@@ -336,9 +336,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
+@@ -387,9 +387,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
  
  SUBDIRS = noatunarts noatun . noatuntags
  
@@ -14,7 +14,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  	playlist.cpp pref.cpp \
  	player.cpp playlistsaver.cpp app.cpp \
  	pluginloader.cpp plugin.cpp \
-@@ -351,15 +351,15 @@ libnoatun_la_SOURCES = pluginmodule.cpp 
+@@ -402,15 +402,15 @@ libnoatun_la_SOURCES = pluginmodule.cpp 
  
  include_HEADERS = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h
  
@@ -33,7 +33,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  	-lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIBPNG)
  
  
-@@ -381,27 +381,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -432,27 +432,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -70,7 +70,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  libnoatuncontrols_la_DEPENDENCIES =
  am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo
  #>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS)
-@@ -444,7 +445,7 @@ am__depfiles_maybe = depfiles
+@@ -492,7 +493,7 @@ am__depfiles_maybe = depfiles
  #>- @AMDEP_TRUE@	./$(DEPDIR)/stereobuttonaction.Plo \
  #>- @AMDEP_TRUE@	./$(DEPDIR)/video.Plo
  #>+ 35
@@ -79,10 +79,10 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/controls.Plo ./$(DEPDIR)/conversion.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/downloader.Plo ./$(DEPDIR)/effects.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/effectview.Plo ./$(DEPDIR)/engine.Plo \
-@@ -498,8 +499,8 @@ CXXLD = $(CXX)
+@@ -545,8 +546,8 @@ CXXLD = $(CXX)
+ #>+ 2
  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) \
@@ -90,8 +90,8 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  DATA = $(magictable_DATA)
  
  HEADERS = $(include_HEADERS)
-@@ -511,7 +512,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
- 	uninstall-recursive check-recursive installcheck-recursive
+@@ -559,7 +560,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+ 	check-recursive installcheck-recursive
  DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
 -SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
@@ -99,7 +99,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  
  #>- all: all-recursive
  #>+ 1
-@@ -556,8 +557,8 @@ clean-libLTLIBRARIES:
+@@ -604,8 +605,8 @@ clean-libLTLIBRARIES:
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
@@ -110,8 +110,8 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS)
  
-@@ -768,7 +769,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -852,7 +853,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=fft.c globalvideo.h pluginmodule.h noatunlistview.h fft.h 
@@ -119,7 +119,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -916,28 +917,28 @@ magictable: gentable
+@@ -1015,28 +1016,28 @@ magictable: gentable
  .NOEXPORT:
  
  #>+ 3
@@ -158,7 +158,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  
  #>+ 3
  globalvideo.moc: $(srcdir)/globalvideo.h
-@@ -945,7 +946,7 @@ globalvideo.moc: $(srcdir)/globalvideo.h
+@@ -1044,7 +1045,7 @@ globalvideo.moc: $(srcdir)/globalvideo.h
  
  #>+ 3
  clean-metasources:
@@ -167,7 +167,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  
  #>+ 2
  docs-am:
-@@ -958,16 +959,16 @@ force-reedit:
+@@ -1057,16 +1058,16 @@ force-reedit:
  
  
  #>+ 11
@@ -192,7 +192,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  
  #>+ 11
  libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp 
-@@ -983,20 +984,20 @@ libnoatuncontrols_la.all_cpp.cpp: $(srcd
+@@ -1082,20 +1083,20 @@ libnoatuncontrols_la.all_cpp.cpp: $(srcd
  
  #>+ 3
  clean-final:
@@ -218,7 +218,7 @@ $NetBSD: patch-bb,v 1.5 2003/03/11 13:33:54 markd Exp $
  #>+ 3
  cvs-clean:
  	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1006,17 +1007,17 @@ kde-rpo-clean:
+@@ -1105,17 +1106,17 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 15
diff --git a/audio/kdemultimedia3/patches/patch-bh b/audio/kdemultimedia3/patches/patch-bh
index 6500de600c8..a9a35db62fd 100644
--- a/audio/kdemultimedia3/patches/patch-bh
+++ b/audio/kdemultimedia3/patches/patch-bh
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.3 2003/03/11 13:33:55 markd Exp $
+$NetBSD: patch-bh,v 1.4 2003/05/22 03:05:41 markd Exp $
 
---- noatun/modules/excellent/Makefile.in.orig	Fri Jan 17 08:49:42 2003
+--- noatun/modules/excellent/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/modules/excellent/Makefile.in
-@@ -333,7 +333,7 @@ noatun_excellent_la_SOURCES = noatunui.c
+@@ -384,7 +384,7 @@ noatun_excellent_la_SOURCES = noatunui.c
  
  noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
  noatun_excellent_la_LIBADD = $(LIB_KFILE) \
@@ -11,7 +11,7 @@ $NetBSD: patch-bh,v 1.3 2003/03/11 13:33:55 markd Exp $
  	$(top_builddir)/noatun/library/libnoatuncontrols.la \
  	-lqtmcop -lkmedia2_idl -lsoundserver_idl
  
-@@ -350,7 +350,7 @@ CONFIG_CLEAN_FILES =
+@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
  noatun_excellent_la_DEPENDENCIES = \
@@ -20,8 +20,8 @@ $NetBSD: patch-bh,v 1.3 2003/03/11 13:33:55 markd Exp $
  	$(top_builddir)/noatun/library/libnoatuncontrols.la
  am_noatun_excellent_la_OBJECTS = noatunui.lo userinterface.lo
  #>- noatun_excellent_la_OBJECTS = $(am_noatun_excellent_la_OBJECTS)
-@@ -546,7 +546,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -625,7 +625,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=excellentui.rc excellent.plugin 
diff --git a/audio/kdemultimedia3/patches/patch-bn b/audio/kdemultimedia3/patches/patch-bn
index 2d699e55bf2..34135eee85e 100644
--- a/audio/kdemultimedia3/patches/patch-bn
+++ b/audio/kdemultimedia3/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.3 2003/03/11 13:33:55 markd Exp $
+$NetBSD: patch-bn,v 1.4 2003/05/22 03:05:41 markd Exp $
 
---- noatun/modules/kaiman/Makefile.in.orig	Fri Jan 17 08:49:42 2003
+--- noatun/modules/kaiman/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/modules/kaiman/Makefile.in
-@@ -336,7 +336,7 @@ noatun_kaiman_la_SOURCES = \
+@@ -387,7 +387,7 @@ noatun_kaiman_la_SOURCES = \
  
  
  noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-bn,v 1.3 2003/03/11 13:33:55 markd Exp $
                          -lqtmcop -lkmedia2_idl -lsoundserver_idl
  
  
-@@ -356,7 +356,7 @@ CONFIG_CLEAN_FILES =
+@@ -407,7 +407,7 @@ CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
  noatun_kaiman_la_DEPENDENCIES = \
@@ -20,8 +20,8 @@ $NetBSD: patch-bn,v 1.3 2003/03/11 13:33:55 markd Exp $
  am_noatun_kaiman_la_OBJECTS = noatunui.lo style.lo userinterface.lo \
  	pref.lo
  #>- noatun_kaiman_la_OBJECTS = $(am_noatun_kaiman_la_OBJECTS)
-@@ -621,7 +621,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -705,7 +705,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=kaiman.plugin kaimanui.rc SKIN-SPECS 
@@ -29,7 +29,7 @@ $NetBSD: patch-bn,v 1.3 2003/03/11 13:33:55 markd Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -778,20 +778,20 @@ noatun_kaiman.la.closure: $(noatun_kaima
+@@ -877,20 +877,20 @@ noatun_kaiman.la.closure: $(noatun_kaima
  
  
  #>+ 3
@@ -55,7 +55,7 @@ $NetBSD: patch-bn,v 1.3 2003/03/11 13:33:55 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -808,7 +808,7 @@ force-reedit:
+@@ -907,7 +907,7 @@ force-reedit:
  
  
  #>+ 11
@@ -64,7 +64,7 @@ $NetBSD: patch-bn,v 1.3 2003/03/11 13:33:55 markd Exp $
  	@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; \
-@@ -844,9 +844,9 @@ kde-rpo-clean:
+@@ -943,9 +943,9 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 7
diff --git a/audio/kdemultimedia3/patches/patch-br b/audio/kdemultimedia3/patches/patch-br
index c5e0088c7fd..b1cccfa43ac 100644
--- a/audio/kdemultimedia3/patches/patch-br
+++ b/audio/kdemultimedia3/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.3 2003/03/11 13:33:55 markd Exp $
+$NetBSD: patch-br,v 1.4 2003/05/22 03:05:41 markd Exp $
 
---- noatun/modules/kjofol-skin/Makefile.in.orig	Fri Jan 17 08:49:42 2003
+--- noatun/modules/kjofol-skin/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/modules/kjofol-skin/Makefile.in
-@@ -348,7 +348,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj
+@@ -399,7 +399,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj
  
  
  noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-br,v 1.3 2003/03/11 13:33:55 markd Exp $
                          $(LIB_KIO) -lm \
                          $(top_builddir)/arts/modules/libartsmodules.la
  
-@@ -369,7 +369,7 @@ CONFIG_CLEAN_FILES =
+@@ -420,7 +420,7 @@ CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
  noatun_kjofol_la_DEPENDENCIES = \
@@ -20,16 +20,16 @@ $NetBSD: patch-br,v 1.3 2003/03/11 13:33:55 markd Exp $
  	$(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 \
-@@ -664,7 +664,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -748,7 +748,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=helpers.cpp kjfont.cpp kjprefs.cpp kjofolui.plugin kjskinselectorwidget.ui kjsliders.cpp parser.cpp noatunui.cpp kjequalizer.cpp kjbackground.cpp kjguisettingswidget.ui kjvis.cpp kjtextdisplay.cpp 
-+KDE_DIST=kjtextdisplay.cpp parser.cpp kjsliders.cpp kjbackground.cpp kjvis.cpp kjequalizer.cpp kjskinselectorwidget.ui kjofolui.plugin kjprefs.cpp noatunui.cpp helpers.cpp kjfont.cpp kjguisettingswidget.ui 
+-KDE_DIST=helpers.cpp kjofolui.plugin kjskinselectorwidget.ui kjguisettingswidget.ui 
++KDE_DIST=kjskinselectorwidget.ui kjofolui.plugin helpers.cpp kjguisettingswidget.ui 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -849,24 +849,24 @@ kjguisettingswidget.moc: kjguisettingswi
+@@ -948,24 +948,24 @@ kjguisettingswidget.moc: kjguisettingswi
  	$(MOC) kjguisettingswidget.h -o kjguisettingswidget.moc
  
  #>+ 3
@@ -63,7 +63,7 @@ $NetBSD: patch-br,v 1.3 2003/03/11 13:33:55 markd Exp $
  
  #>+ 5
  clean-ui:
-@@ -889,7 +889,7 @@ force-reedit:
+@@ -988,7 +988,7 @@ force-reedit:
  
  
  #>+ 11
@@ -72,7 +72,7 @@ $NetBSD: patch-br,v 1.3 2003/03/11 13:33:55 markd Exp $
  	@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; \
-@@ -925,24 +925,24 @@ kde-rpo-clean:
+@@ -1024,24 +1024,24 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 22
diff --git a/audio/kdemultimedia3/patches/patch-cd b/audio/kdemultimedia3/patches/patch-cd
index 5817fbac168..c0d741ecddf 100644
--- a/audio/kdemultimedia3/patches/patch-cd
+++ b/audio/kdemultimedia3/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.3 2003/03/11 13:33:55 markd Exp $
+$NetBSD: patch-cd,v 1.4 2003/05/22 03:05:41 markd Exp $
 
---- noatun/modules/splitplaylist/Makefile.in.orig	Fri Jan 17 08:49:42 2003
+--- noatun/modules/splitplaylist/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/modules/splitplaylist/Makefile.in
-@@ -330,7 +330,7 @@ kde_module_LTLIBRARIES = noatun_splitpla
+@@ -381,7 +381,7 @@ kde_module_LTLIBRARIES = noatun_splitpla
  noatun_splitplaylist_la_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp
  
  noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-cd,v 1.3 2003/03/11 13:33:55 markd Exp $
  
  #>- noatun_splitplaylist_la_METASOURCES = AUTO
  
-@@ -347,7 +347,7 @@ CONFIG_CLEAN_FILES =
+@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
  noatun_splitplaylist_la_DEPENDENCIES = \
@@ -20,8 +20,8 @@ $NetBSD: patch-cd,v 1.3 2003/03/11 13:33:55 markd Exp $
  am_noatun_splitplaylist_la_OBJECTS = splitplaylist.lo playlist.lo \
  	view.lo find.lo
  #>- noatun_splitplaylist_la_OBJECTS = $(am_noatun_splitplaylist_la_OBJECTS)
-@@ -564,7 +564,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -643,7 +643,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=splui.rc LICENSE splitplaylist.plugin 
@@ -29,7 +29,7 @@ $NetBSD: patch-cd,v 1.3 2003/03/11 13:33:55 markd Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -703,20 +703,20 @@ noatun_splitplaylist.la.closure: $(noatu
+@@ -796,20 +796,20 @@ noatun_splitplaylist.la.closure: $(noatu
  
  
  #>+ 3
@@ -55,7 +55,7 @@ $NetBSD: patch-cd,v 1.3 2003/03/11 13:33:55 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -733,7 +733,7 @@ force-reedit:
+@@ -826,7 +826,7 @@ force-reedit:
  
  
  #>+ 11
@@ -64,7 +64,7 @@ $NetBSD: patch-cd,v 1.3 2003/03/11 13:33:55 markd Exp $
  	@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; \
-@@ -769,9 +769,9 @@ kde-rpo-clean:
+@@ -862,9 +862,9 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 7
diff --git a/audio/kdemultimedia3/patches/patch-cf b/audio/kdemultimedia3/patches/patch-cf
index 3c93623a221..1ff8be86629 100644
--- a/audio/kdemultimedia3/patches/patch-cf
+++ b/audio/kdemultimedia3/patches/patch-cf
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf,v 1.3 2003/03/11 13:33:55 markd Exp $
+$NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
 
---- noatun/modules/systray/Makefile.in.orig	Fri Jan 17 08:49:42 2003
+--- noatun/modules/systray/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/modules/systray/Makefile.in
-@@ -330,7 +330,7 @@ kde_module_LTLIBRARIES = noatun_systray.
+@@ -381,7 +381,7 @@ kde_module_LTLIBRARIES = noatun_systray.
  noatun_systray_la_SOURCES = systray.cpp noatunui.cpp kitsystemtray.cpp cmodule.cpp
  
  noatun_systray_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-cf,v 1.3 2003/03/11 13:33:55 markd Exp $
                          -lqtmcop -lkmedia2_idl -lsoundserver_idl
  
  
-@@ -349,7 +349,7 @@ CONFIG_CLEAN_FILES =
+@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
  noatun_systray_la_DEPENDENCIES = \
@@ -20,8 +20,8 @@ $NetBSD: patch-cf,v 1.3 2003/03/11 13:33:55 markd Exp $
  am_noatun_systray_la_OBJECTS = systray.lo noatunui.lo kitsystemtray.lo \
  	cmodule.lo
  #>- noatun_systray_la_OBJECTS = $(am_noatun_systray_la_OBJECTS)
-@@ -551,7 +551,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -630,7 +630,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=cr16-action-noatuntrayplay.png cr16-action-noatuntray.png systray.plugin systrayui.rc cr16-action-noatuntraystop.png cr16-action-noatuntraypause.png 
@@ -29,7 +29,7 @@ $NetBSD: patch-cf,v 1.3 2003/03/11 13:33:55 markd Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -690,20 +690,20 @@ noatun_systray.la.closure: $(noatun_syst
+@@ -783,20 +783,20 @@ noatun_systray.la.closure: $(noatun_syst
  
  
  #>+ 3
@@ -55,7 +55,7 @@ $NetBSD: patch-cf,v 1.3 2003/03/11 13:33:55 markd Exp $
  
  #>+ 3
  clean-closures:
-@@ -734,7 +734,7 @@ force-reedit:
+@@ -827,7 +827,7 @@ force-reedit:
  
  
  #>+ 11
@@ -64,7 +64,7 @@ $NetBSD: patch-cf,v 1.3 2003/03/11 13:33:55 markd Exp $
  	@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; \
-@@ -770,9 +770,9 @@ kde-rpo-clean:
+@@ -863,9 +863,9 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 7
diff --git a/audio/kdemultimedia3/patches/patch-cj b/audio/kdemultimedia3/patches/patch-cj
index 64aa5002c18..e909199a33d 100644
--- a/audio/kdemultimedia3/patches/patch-cj
+++ b/audio/kdemultimedia3/patches/patch-cj
@@ -1,8 +1,8 @@
-$NetBSD: patch-cj,v 1.3 2003/03/11 13:33:56 markd Exp $
+$NetBSD: patch-cj,v 1.4 2003/05/22 03:05:41 markd Exp $
 
---- noatun/modules/winskin/Makefile.in.orig	Fri Jan 17 08:49:42 2003
+--- noatun/modules/winskin/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/modules/winskin/Makefile.in
-@@ -393,7 +393,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar
+@@ -444,7 +444,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar
  					-module -avoid-version -no-undefined 
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-cj,v 1.3 2003/03/11 13:33:56 markd Exp $
  					$(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la
  
  
-@@ -405,7 +405,7 @@ CONFIG_CLEAN_FILES =
+@@ -456,7 +456,7 @@ CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
  noatun_winskin_la_DEPENDENCIES = \
@@ -20,16 +20,16 @@ $NetBSD: patch-cj,v 1.3 2003/03/11 13:33:56 markd Exp $
  	$(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 \
-@@ -748,7 +748,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -832,7 +832,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=skinMap.h waJumpSlider.cpp waIndicator.cpp waSkinManager.h waInfo.cpp waSkin.h guiSpectrumAnalyser.cpp winskin.plugin waClutterbar.cpp waRegion.h waSkinManager.cpp waColor.cpp waMain.h waButton.cpp waBalanceSlider.cpp waVolumeSlider.cpp waSkin.cpp waInfo.h waJumpSlider.h waDigit.cpp guiSpectrumAnalyser.h waWidget.h plugin.cpp waColor.h winSkinVis.h fileInfo.h waTitleBar.h waLabel.h waWidget.cpp waSkinModel.cpp winSkinVis.cpp waSkinMapping.h winSkinConfig.h waBalanceSlider.h waStatus.cpp waStatus.h waClutterbar.h waIndicator.h waVolumeSlider.h waTitleBar.cpp waMain.cpp waDigit.h waLabel.cpp waSkins.h waSkinModel.h waSlider.h winSkinConfig.cpp waRegion.cpp waButton.h waShadeMapping.h waSlider.cpp 
-+KDE_DIST=winSkinConfig.h waClutterbar.h waBalanceSlider.h waTitleBar.cpp waMain.cpp waDigit.h waVolumeSlider.cpp waIndicator.cpp waStatus.h winSkinVis.h waDigit.cpp waJumpSlider.cpp waLabel.h waSlider.h fileInfo.h waWidget.h winskin.plugin waLabel.cpp waColor.cpp waShadeMapping.h waSkinManager.cpp waStatus.cpp waSkins.h waMain.h waInfo.h guiSpectrumAnalyser.cpp waWidget.cpp waRegion.h waSkinModel.h winSkinConfig.cpp waSkinMapping.h skinMap.h winSkinVis.cpp waRegion.cpp waJumpSlider.h waIndicator.h plugin.cpp waSkin.h waVolumeSlider.h waButton.cpp waSkinModel.cpp waColor.h waSkinManager.h waClutterbar.cpp waTitleBar.h waInfo.cpp waButton.h waSlider.cpp guiSpectrumAnalyser.h waBalanceSlider.cpp waSkin.cpp 
+-KDE_DIST=skinMap.h waSkinManager.h waSkin.h winskin.plugin waRegion.h waMain.h waInfo.h waJumpSlider.h guiSpectrumAnalyser.h waWidget.h waColor.h winSkinVis.h fileInfo.h waTitleBar.h waLabel.h waSkinMapping.h winSkinConfig.h waBalanceSlider.h waStatus.h waClutterbar.h waIndicator.h waVolumeSlider.h waDigit.h waSkins.h waSkinModel.h waSlider.h waButton.h waShadeMapping.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 waSkinManager.h waTitleBar.h waButton.h guiSpectrumAnalyser.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -911,88 +911,88 @@ noatun_winskin.la.closure: $(noatun_wins
+@@ -1010,88 +1010,88 @@ noatun_winskin.la.closure: $(noatun_wins
  
  
  #>+ 3
@@ -157,7 +157,7 @@ $NetBSD: patch-cj,v 1.3 2003/03/11 13:33:56 markd Exp $
  
  #>+ 4
  clean-idl:
-@@ -1014,7 +1014,7 @@ force-reedit:
+@@ -1113,7 +1113,7 @@ force-reedit:
  
  
  #>+ 11
@@ -166,7 +166,7 @@ $NetBSD: patch-cj,v 1.3 2003/03/11 13:33:56 markd Exp $
  	@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; \
-@@ -1050,43 +1050,43 @@ kde-rpo-clean:
+@@ -1149,43 +1149,43 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 41
diff --git a/audio/kdemultimedia3/patches/patch-cn b/audio/kdemultimedia3/patches/patch-cn
index 54a942cf0b5..11306d97ee2 100644
--- a/audio/kdemultimedia3/patches/patch-cn
+++ b/audio/kdemultimedia3/patches/patch-cn
@@ -1,8 +1,8 @@
-$NetBSD: patch-cn,v 1.3 2003/03/11 13:33:56 markd Exp $
+$NetBSD: patch-cn,v 1.4 2003/05/22 03:05:42 markd Exp $
 
---- noatun/modules/artseffects/Makefile.in.orig	Fri Jan 17 08:49:41 2003
+--- noatun/modules/artseffects/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/modules/artseffects/Makefile.in
-@@ -332,7 +332,7 @@ libartseffects_la_SOURCES = artseffects.
+@@ -383,7 +383,7 @@ libartseffects_la_SOURCES = artseffects.
  libartseffects_la_LDFLAGS = -L$(top_builddir)/arts/gui/common $(all_libraries) \
                              -module -avoid-version -no-undefined
  
@@ -11,7 +11,7 @@ $NetBSD: patch-cn,v 1.3 2003/03/11 13:33:56 markd Exp $
  
  mcoptypedir = $(libdir)/mcop
  mcoptype_DATA = artseffects.mcoptype artseffects.mcopclass
-@@ -345,7 +345,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -396,7 +396,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -21,8 +21,8 @@ $NetBSD: patch-cn,v 1.3 2003/03/11 13:33:56 markd Exp $
  am_libartseffects_la_OBJECTS = artseffects.lo extrastereo_impl.lo
  #>- libartseffects_la_OBJECTS = $(am_libartseffects_la_OBJECTS)
  #>+ 4
-@@ -556,7 +557,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -635,7 +636,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=artseffects.mcoptype effect.cpp artseffects.idl artseffects.h VoiceRemoval.mcopclass RawWriter.mcopclass artseffects.mcopclass ExtraStereo.mcopclass ExtraStereoGuiFactory.mcopclass extrastereogui_impl.cc extrastereogui_impl.h 
diff --git a/audio/kdemultimedia3/patches/patch-cq b/audio/kdemultimedia3/patches/patch-cq
index 1dfec3b58a1..823af211328 100644
--- a/audio/kdemultimedia3/patches/patch-cq
+++ b/audio/kdemultimedia3/patches/patch-cq
@@ -1,8 +1,8 @@
-$NetBSD: patch-cq,v 1.1 2003/03/11 13:33:56 markd Exp $
+$NetBSD: patch-cq,v 1.2 2003/05/22 03:05:42 markd Exp $
 
---- noatun/modules/simple/Makefile.in.orig	Thu Feb  6 16:22:53 2003
+--- noatun/modules/simple/Makefile.in.orig	Thu May  8 00:05:29 2003
 +++ noatun/modules/simple/Makefile.in
-@@ -332,7 +332,7 @@ kde_module_LTLIBRARIES = noatunsimple.la
+@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatunsimple.la
  #>+ 1
  noatunsimple_la_SOURCES= noatunui.cpp userinterface.cpp propertiesdialog.cpp
  noatunsimple_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
@@ -11,7 +11,7 @@ $NetBSD: patch-cq,v 1.1 2003/03/11 13:33:56 markd Exp $
  			  $(top_builddir)/noatun/library/libnoatuncontrols.la \
  			 -lkmedia2_idl -lsoundserver_idl -lartskde
  
-@@ -349,7 +349,7 @@ CONFIG_CLEAN_FILES =
+@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES)
  
  noatunsimple_la_DEPENDENCIES = \
@@ -20,8 +20,8 @@ $NetBSD: patch-cq,v 1.1 2003/03/11 13:33:56 markd Exp $
  	$(top_builddir)/noatun/library/libnoatuncontrols.la
  am_noatunsimple_la_OBJECTS = noatunui.lo userinterface.lo
  #>- noatunsimple_la_OBJECTS = $(am_noatunsimple_la_OBJECTS)
-@@ -545,7 +545,7 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+@@ -624,7 +624,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
 -KDE_DIST=play.xpm pause.xpm simple.plugin propertiesdialog.ui propertiesdialog.ui.h back.xpm forward.xpm stop.xpm eject.xpm 
@@ -29,16 +29,16 @@ $NetBSD: patch-cq,v 1.1 2003/03/11 13:33:56 markd Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -723,7 +723,7 @@ force-reedit:
+@@ -816,7 +816,7 @@ force-reedit:
  
  
  #>+ 11
 -noatunsimple_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp propertiesdialog.cpp  propertiesdialog.moc userinterface.moc
-+noatunsimple_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp $(srcdir)/propertiesdialog.cpp  userinterface.moc propertiesdialog.moc
++noatunsimple_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp propertiesdialog.cpp  userinterface.moc propertiesdialog.moc
  	@echo 'creating noatunsimple_la.all_cpp.cpp ...'; \
  	rm -f noatunsimple_la.all_cpp.files noatunsimple_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> noatunsimple_la.all_cpp.final; \
-@@ -759,7 +759,7 @@ kde-rpo-clean:
+@@ -852,7 +852,7 @@ kde-rpo-clean:
  	-rm -f *.rpo
  
  #>+ 5
author	markd <markd>	2003-05-22 03:05:38 +0000
committer	markd <markd>	2003-05-22 03:05:38 +0000
commit	cd03aac1dda302b3f34a0e632f70e9914ceec755 (patch)
tree	bffd31882a9f80298271a160703a685a3d75d428 /audio
parent	f1bbe05ed4c99c8fc0ca39957581b0c60eab0f50 (diff)
download	pkgsrc-cd03aac1dda302b3f34a0e632f70e9914ceec755.tar.gz