summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2004-01-15 10:30:03 +0000
committermarkd <markd@pkgsrc.org>2004-01-15 10:30:03 +0000
commit9d8e49a4269e6681265c3e096f0e252a314e7dff (patch)
treea42b85ba19fea6e062c546a74c5fca17e8f4861a /audio
parent1bf8a5c8a49fe9987a189cf135fc94645d2c01ce (diff)
downloadpkgsrc-9d8e49a4269e6681265c3e096f0e252a314e7dff.tar.gz
Update to KDE-3.1.5.
Also move patch-bh to patch-da so it applies after patch-co so autoconf doesn't kick in to redo it.
Diffstat (limited to 'audio')
-rw-r--r--audio/kdemultimedia3/Makefile6
-rw-r--r--audio/kdemultimedia3/distinfo40
-rw-r--r--audio/kdemultimedia3/patches/patch-ac144
-rw-r--r--audio/kdemultimedia3/patches/patch-ak175
-rw-r--r--audio/kdemultimedia3/patches/patch-az38
-rw-r--r--audio/kdemultimedia3/patches/patch-bb120
-rw-r--r--audio/kdemultimedia3/patches/patch-bl44
-rw-r--r--audio/kdemultimedia3/patches/patch-bn54
-rw-r--r--audio/kdemultimedia3/patches/patch-bp22
-rw-r--r--audio/kdemultimedia3/patches/patch-br71
-rw-r--r--audio/kdemultimedia3/patches/patch-bv30
-rw-r--r--audio/kdemultimedia3/patches/patch-bz22
-rw-r--r--audio/kdemultimedia3/patches/patch-cd52
-rw-r--r--audio/kdemultimedia3/patches/patch-cf57
-rw-r--r--audio/kdemultimedia3/patches/patch-ch59
-rw-r--r--audio/kdemultimedia3/patches/patch-cj252
-rw-r--r--audio/kdemultimedia3/patches/patch-cn14
-rw-r--r--audio/kdemultimedia3/patches/patch-cq33
-rw-r--r--audio/kdemultimedia3/patches/patch-da (renamed from audio/kdemultimedia3/patches/patch-bh)14
19 files changed, 616 insertions, 631 deletions
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 8b794b57c68..0488eac4cb4 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2004/01/03 18:49:34 reed Exp $
+# $NetBSD: Makefile,v 1.32 2004/01/15 10:30:03 markd Exp $
-DISTNAME= kdemultimedia-3.1.4
-PKGREVISION= 1
+DISTNAME= kdemultimedia-3.1.5
CATEGORIES= audio
COMMENT= Audio tools for the KDE integrated X11 desktop
-PKGREVISION= 1
CONFLICTS= timidity-[0-9]*
diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index 4bcb80fdcd0..5727d58c9a1 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1,61 +1,60 @@
-$NetBSD: distinfo,v 1.21 2003/11/08 16:05:49 jdolecek Exp $
+$NetBSD: distinfo,v 1.22 2004/01/15 10:30:03 markd Exp $
-SHA1 (kdemultimedia-3.1.4.tar.bz2) = 62263f8d12a460043114ea87da0171497efff511
-Size (kdemultimedia-3.1.4.tar.bz2) = 5932776 bytes
+SHA1 (kdemultimedia-3.1.5.tar.bz2) = 82e0e811e8fcfbffd29c4d8784d0ba91ac5edba3
+Size (kdemultimedia-3.1.5.tar.bz2) = 5925820 bytes
SHA1 (patch-aa) = 90e7cc0a6a505a2c69b25eadf5ca9050afd8afd0
SHA1 (patch-ab) = 4f022376559ea30fee9f88aebb65d7f2b89c6c25
-SHA1 (patch-ac) = 3daad6de448c274d7832842aff04c7fb9625263d
+SHA1 (patch-ac) = 531f71710ee4e441172eb4f3f2c51839cae55de4
SHA1 (patch-ae) = 17fdcfa2d0861bf53404d7ce315a2a315a68a459
SHA1 (patch-af) = 95bf9890b803b49e102d4248c0fbd52427a8c6c0
SHA1 (patch-ag) = de3a0ae4e93423a89f2d1ee161b51db2aa265ed3
SHA1 (patch-aj) = 0b6ac2ade3559a34b54d171aace55af64caa376b
-SHA1 (patch-ak) = 7f43d0915bb65a506e42d8bdc2c59eeb1920f8ad
+SHA1 (patch-ak) = 0d96ae3218b2c58ebcbec9d725cc016634863140
SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa
SHA1 (patch-ao) = a31e51c87c76664188515fd1640608cef3a33927
SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472
SHA1 (patch-ay) = 2ce3604aef6a9d79b58fda7e969f79d3e48b6ce8
-SHA1 (patch-az) = 5b6bbc2382ee7381f756065576602697453a8303
+SHA1 (patch-az) = e5432b7f2320b4ff33e48f528936d9cd98ee88a5
SHA1 (patch-ba) = 5a096a6639867541b8ad11baa798b1ba8c856e10
-SHA1 (patch-bb) = 0ad79b0a9f79fc2a822dab4f670dbe89b0cb1d6d
+SHA1 (patch-bb) = 536ed336465e510b901e4eb549f24ff74abb6c42
SHA1 (patch-bc) = 82424e524f316f55524c5367ce42fe4194f935c6
SHA1 (patch-bd) = 7cd66c4d019bb2c944ae94fd9b600d9131797047
SHA1 (patch-be) = 5cee048125a71eb5a1358966c0a61c4553eff24c
SHA1 (patch-bf) = 1f8b40c914d27c34b0fff876682b9402c6815d42
SHA1 (patch-bg) = 2b421f103773c6f2bb3ce6c51134a78c5ac20412
-SHA1 (patch-bh) = 7098211c3bde4e695cbc2d71454312ca2cf6f4b4
SHA1 (patch-bi) = 92fd0e6d2883d715b49e32c28dcdcfa23272b78e
SHA1 (patch-bj) = 160aebbe402d7ecfc91a22717a3a3813be0c29e9
SHA1 (patch-bk) = e594440c63e8038b660dcd75e89f61c6cf62a766
-SHA1 (patch-bl) = 408edc055cd0bc4b1aea6ae37f6c367c4cfe2652
+SHA1 (patch-bl) = 28b79be3001edc665310ecf111c2aca715ebe37c
SHA1 (patch-bm) = a50a8d722ebc48fce19d7052749795efbe543303
-SHA1 (patch-bn) = 606b92c31d475b81db00f8b009ae568c900653b0
+SHA1 (patch-bn) = c40dbacaeb81c4f78bb1453b1da7042ee1c44188
SHA1 (patch-bo) = b67167bfe6e9810208f1f74d3e3fea2ddfb32f88
-SHA1 (patch-bp) = b59ce7619ea0bdfdd375cf5691650026ef27e176
+SHA1 (patch-bp) = e72743bbfad78f9ba657c1a947b09dc7f72ed140
SHA1 (patch-bq) = 996c97dd2da67b481cf5101a220e35850009abc8
-SHA1 (patch-br) = 57cfac7398a59ab663f10eb478a6b8f65d28994b
+SHA1 (patch-br) = b06b333f72e621bd2298613653d328e99036fd4b
SHA1 (patch-bs) = fb23d5297589b87946642bfbfd857c04f81027e3
SHA1 (patch-bt) = b59041f0f87e2b92e8838f9868e5d33ae97fa689
SHA1 (patch-bu) = 6e183a9c5caf7641304efdb409ac414de4b88947
-SHA1 (patch-bv) = 3c3fb414627ad6fed3028ca7e0babe7dcfce4953
+SHA1 (patch-bv) = 7c5bb24dc5d6f159af9b3f02687603f3572a0791
SHA1 (patch-bw) = a28609eb68746f45013dae50556fb19829f890f4
SHA1 (patch-bx) = a53f70f46fbb61c25b60494ec5f60942b87e49a7
SHA1 (patch-by) = e451c595628e500f86085744798af78ef70c28df
-SHA1 (patch-bz) = 1f24fa478f7f7544719e04a427d4d61a0eef9f1e
+SHA1 (patch-bz) = 5e7708a2582b7cb500e52787b5e684734809b2c0
SHA1 (patch-ca) = a1fedc7a4a507e71b0e6fff34056e414b7f119c7
SHA1 (patch-cb) = 3a82b1fc52e8e32fb99e7427e24bd497ad323334
SHA1 (patch-cc) = af970c41d730fe1b7e2403942ab39746b3b0e2af
-SHA1 (patch-cd) = 82ea75f6ee917936506e4dd703b5eda73d48d5e0
+SHA1 (patch-cd) = 67a34f19a22016bbc27dd1a8fc15eceff8bf2eca
SHA1 (patch-ce) = 4f2c176ef04efa22ae034c5c5bd85eab329e187b
-SHA1 (patch-cf) = cb13c0c77a22586871764c69f8914cb0ea644b84
+SHA1 (patch-cf) = 7cb4374ec3cc92ae4d0316339ecbb808e98d50b5
SHA1 (patch-cg) = 0e7f0cdcd55a06bc60c5c617f9ad33201bda1f9d
-SHA1 (patch-ch) = 78d86400c2b4d51fe1363ccc770b4cbab56b45eb
+SHA1 (patch-ch) = e8ce01b5df11cf36d805e5fe766a82f63f8ae4ce
SHA1 (patch-ci) = 905b15e9e8de4954174dab769b3a2c634b094288
-SHA1 (patch-cj) = 002687434b44b1d78528ad49d454311dd118a2e4
+SHA1 (patch-cj) = 706a10730e8b078775703222477c7d1616eda58c
SHA1 (patch-cm) = 2d539df6011c977c0b984233f45b99eeb838e7b3
-SHA1 (patch-cn) = 2f063015327d40d77b764397819db9260152407b
+SHA1 (patch-cn) = 93fa0422c206053ebb3ec9e95fd483c1f8f02144
SHA1 (patch-co) = b484ad7c770a3bd9554051af64e2545fac5a677f
SHA1 (patch-cp) = 8b16a472b150d54810c09126a01723d9a9d9f0d5
-SHA1 (patch-cq) = ad009ff763b321eaa07c8e23a9ad386040c4e897
+SHA1 (patch-cq) = 54f8022c66ac49591e978c6a23f71ae2f65d2d3e
SHA1 (patch-cr) = 6159763aaf0ae2b738e31c06ada0da5c47d0692c
SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
@@ -65,3 +64,4 @@ SHA1 (patch-cw) = 280c2743c48f78c96b05ef9f7f703c822ef482e1
SHA1 (patch-cx) = ea42ab342abf2c2cff4c13fa71ab6e01bab5736c
SHA1 (patch-cy) = 949d3ae7b9037213f5a737018a0dcabe2200dd57
SHA1 (patch-cz) = 5f4909bbc6f0828aa1d69ed4437622e35e116c46
+SHA1 (patch-da) = e75c5be1e86c8e8214d4c38882efd4da8e6164ec
diff --git a/audio/kdemultimedia3/patches/patch-ac b/audio/kdemultimedia3/patches/patch-ac
index 4bad02a3d27..9e072f897ca 100644
--- a/audio/kdemultimedia3/patches/patch-ac
+++ b/audio/kdemultimedia3/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
+$NetBSD: patch-ac,v 1.6 2004/01/15 10:30:03 markd Exp $
---- kaboodle/Makefile.in.orig 2003-07-15 22:13:57.000000000 +1200
+--- kaboodle/Makefile.in.orig 2003-12-29 11:29:36.000000000 +1300
+++ kaboodle/Makefile.in
-@@ -380,7 +380,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
+@@ -381,7 +381,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
SUBDIRS = pics actions
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
kde_module_LTLIBRARIES = libkaboodlepart.la
-@@ -395,24 +395,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \
+@@ -396,24 +396,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.5 2003/07/30 14:56:01 markd Exp $
applnk_DATA = kaboodle.desktop
applnkdir = $(kde_appsdir)/Multimedia
-@@ -425,14 +427,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -427,14 +429,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.5 2003/07/30 14:56:01 markd Exp $
libkaboodlepart_la_DEPENDENCIES =
am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \
kaboodle_factory.lo player.lo view.lo
-@@ -446,31 +453,37 @@ libkaboodlepart_la_nofinal_OBJECTS = con
+@@ -448,31 +455,37 @@ libkaboodlepart_la_nofinal_OBJECTS = con
bin_PROGRAMS = kaboodle$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -116,7 +116,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 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
-@@ -493,8 +506,8 @@ CXXLD = $(CXX)
+@@ -495,8 +508,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -127,7 +127,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA)
-@@ -505,7 +518,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -507,7 +520,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = AUTHORS Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
@@ -136,7 +136,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
#>- all: all-recursive
#>+ 1
-@@ -580,6 +593,8 @@ clean-libLTLIBRARIES:
+@@ -582,6 +595,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)
@@ -145,7 +145,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 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)
-@@ -626,9 +641,10 @@ distclean-compile:
+@@ -628,9 +643,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@
@@ -157,16 +157,16 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 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@
-@@ -854,7 +870,7 @@ distclean-tags:
+@@ -862,7 +878,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=uninstall.desktop kaboodle.desktop player.h controls.h kaboodle_component.desktop conf.h kaboodleengine.desktop kaboodle_factory.h kaboodleapp.h view.h kaboodleui.rc engine.h userinterface.h kaboodlepartui.rc
+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)
-@@ -928,7 +944,6 @@ install-strip:
+@@ -936,7 +952,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
@@ -174,7 +174,7 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -1024,9 +1039,6 @@ uninstall-info: uninstall-info-recursive
+@@ -1032,9 +1047,6 @@ uninstall-info: uninstall-info-recursive
uninstall-libLTLIBRARIES uninstall-recursive
@@ -184,83 +184,68 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 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
-@@ -1047,23 +1059,17 @@ libkaboodlepart.la.closure: $(libkaboodl
+@@ -1055,17 +1067,11 @@ libkaboodlepart.la.closure: $(libkaboodl
#>+ 3
--engine.moc: $(srcdir)/engine.h
-- $(MOC) $(srcdir)/engine.h -o engine.moc
+-userinterface.moc: $(srcdir)/userinterface.h
+- $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
-
-#>+ 1
--mocs: engine.moc
+-mocs: userinterface.moc
-#>+ 3
- view.moc: $(srcdir)/view.h
- $(MOC) $(srcdir)/view.h -o view.moc
+-kaboodleapp.moc: $(srcdir)/kaboodleapp.h
+- $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc
++view.moc: $(srcdir)/view.h
++ $(MOC) $(srcdir)/view.h -o view.moc
#>+ 1
- mocs: view.moc
+-mocs: kaboodleapp.moc
++mocs: view.moc
#>+ 3
--userinterface.moc: $(srcdir)/userinterface.h
-- $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
-+controls.moc: $(srcdir)/controls.h
-+ $(MOC) $(srcdir)/controls.h -o controls.moc
-
+ controls.moc: $(srcdir)/controls.h
+ $(MOC) $(srcdir)/controls.h -o controls.moc
+@@ -1073,11 +1079,17 @@ controls.moc: $(srcdir)/controls.h
#>+ 1
--mocs: userinterface.moc
-+mocs: controls.moc
+ mocs: controls.moc
#>+ 3
- kaboodleapp.moc: $(srcdir)/kaboodleapp.h
- $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc
-@@ -1071,32 +1077,38 @@ kaboodleapp.moc: $(srcdir)/kaboodleapp.h
+-engine.moc: $(srcdir)/engine.h
+- $(MOC) $(srcdir)/engine.h -o engine.moc
++kaboodleapp.moc: $(srcdir)/kaboodleapp.h
++ $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc
+
#>+ 1
- mocs: kaboodleapp.moc
- #>+ 3
+-mocs: engine.moc
++mocs: kaboodleapp.moc
++#>+ 3
+userinterface.moc: $(srcdir)/userinterface.h
+ $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
+
+#>+ 1
+mocs: userinterface.moc
-+#>+ 3
+ #>+ 3
kaboodle_factory.moc: $(srcdir)/kaboodle_factory.h
$(MOC) $(srcdir)/kaboodle_factory.h -o kaboodle_factory.moc
-
- #>+ 1
- mocs: kaboodle_factory.moc
- #>+ 3
--player.moc: $(srcdir)/player.h
-- $(MOC) $(srcdir)/player.h -o player.moc
-+conf.moc: $(srcdir)/conf.h
-+ $(MOC) $(srcdir)/conf.h -o conf.moc
-
- #>+ 1
--mocs: player.moc
-+mocs: conf.moc
- #>+ 3
--controls.moc: $(srcdir)/controls.h
-- $(MOC) $(srcdir)/controls.h -o controls.moc
-+player.moc: $(srcdir)/player.h
-+ $(MOC) $(srcdir)/player.h -o player.moc
-
+@@ -1097,14 +1109,14 @@ player.moc: $(srcdir)/player.h
#>+ 1
--mocs: controls.moc
-+mocs: player.moc
+ mocs: player.moc
#>+ 3
--conf.moc: $(srcdir)/conf.h
-- $(MOC) $(srcdir)/conf.h -o conf.moc
+-view.moc: $(srcdir)/view.h
+- $(MOC) $(srcdir)/view.h -o view.moc
+engine.moc: $(srcdir)/engine.h
+ $(MOC) $(srcdir)/engine.h -o engine.moc
#>+ 1
--mocs: conf.moc
+-mocs: view.moc
+mocs: engine.moc
#>+ 3
clean-metasources:
-- -rm -f engine.moc view.moc userinterface.moc kaboodleapp.moc kaboodle_factory.moc player.moc controls.moc conf.moc
+- -rm -f userinterface.moc kaboodleapp.moc controls.moc engine.moc kaboodle_factory.moc conf.moc player.moc view.moc
+ -rm -f view.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc engine.moc
#>+ 3
clean-closures:
-@@ -1113,19 +1125,19 @@ force-reedit:
+@@ -1121,19 +1133,19 @@ force-reedit:
#>+ 11
@@ -284,12 +269,12 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
+ rm -f libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files
#>+ 11
--libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp kaboodle_factory.moc player.moc conf.moc engine.moc view.moc controls.moc
+-libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp controls.moc engine.moc kaboodle_factory.moc conf.moc view.moc player.moc
+libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/player.cpp $(srcdir)/view.cpp view.moc controls.moc kaboodle_factory.moc conf.moc player.moc engine.moc
@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; \
-@@ -1138,20 +1150,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir
+@@ -1146,20 +1158,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir
#>+ 3
clean-final:
@@ -315,32 +300,33 @@ $NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1161,19 +1173,19 @@ kde-rpo-clean:
+@@ -1169,19 +1181,19 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 17
--controls.o: controls.moc
+-kaboodleapp.lo: kaboodleapp.moc
+-kaboodle_factory.o: kaboodle_factory.moc
+-player.lo: player.moc
+-engine.o: engine.moc
+ conf.o: conf.moc
-userinterface.lo: userinterface.moc
-+conf.o: conf.moc
-+player.o: player.moc
-+userinterface.o: userinterface.moc
- view.o: view.moc
+-engine.lo: engine.moc
+-controls.lo: controls.moc
+ player.o: player.moc
+-view.o: view.moc
+-view.lo: view.moc
+ userinterface.o: userinterface.moc
+-conf.lo: conf.moc
++view.o: view.moc
kaboodleapp.o: kaboodleapp.moc
--kaboodleapp.lo: kaboodleapp.moc
- kaboodle_factory.o: kaboodle_factory.moc
++kaboodle_factory.o: kaboodle_factory.moc
+controls.lo: controls.moc
- engine.lo: engine.moc
++engine.lo: engine.moc
kaboodle_factory.lo: kaboodle_factory.moc
--conf.o: conf.moc
--view.lo: view.moc
--player.o: player.moc
--player.lo: player.moc
--userinterface.o: userinterface.moc
--controls.lo: controls.moc
- engine.o: engine.moc
++engine.o: engine.moc
+view.lo: view.moc
-+controls.o: controls.moc
- conf.lo: conf.moc
+ controls.o: controls.moc
++conf.lo: conf.moc
+kaboodleapp.lo: kaboodleapp.moc
+player.lo: player.moc
+userinterface.lo: userinterface.moc
diff --git a/audio/kdemultimedia3/patches/patch-ak b/audio/kdemultimedia3/patches/patch-ak
index 8dc68a5aee9..a2104aeeeea 100644
--- a/audio/kdemultimedia3/patches/patch-ak
+++ b/audio/kdemultimedia3/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
+$NetBSD: patch-ak,v 1.7 2004/01/15 10:30:03 markd Exp $
---- kmix/Makefile.in.orig 2003-07-15 22:13:58.000000000 +1200
+--- kmix/Makefile.in.orig 2003-12-29 11:29:37.000000000 +1300
+++ kmix/Makefile.in
-@@ -380,7 +380,7 @@ SUBDIRS = control pics
+@@ -381,7 +381,7 @@ SUBDIRS = control pics
INCLUDES = $(all_includes)
bin_PROGRAMS = kmix kmixctrl
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
kde_module_LTLIBRARIES = kmix_panelapplet.la
noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \
-@@ -389,29 +389,37 @@ noinst_HEADERS = kmix.h kmixdockwidget.h
+@@ -390,29 +390,37 @@ noinst_HEADERS = kmix.h kmixdockwidget.h
#>- METASOURCES = AUTO
@@ -59,7 +59,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH)
#>- kmix_panelapplet_la_SOURCES = kmixapplet.cpp kmixerwidget.cpp channel.cpp \
-@@ -444,18 +452,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -446,18 +454,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
@@ -82,7 +82,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 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 \
-@@ -468,46 +469,73 @@ kmix_panelapplet_la_nofinal_OBJECTS = km
+@@ -470,46 +471,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)
@@ -177,7 +177,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
@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 \
-@@ -515,9 +543,12 @@ am__depfiles_maybe = depfiles
+@@ -517,9 +545,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)/VerticalText.Plo \
@@ -193,7 +193,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
@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 \
-@@ -544,7 +575,9 @@ CXXLD = $(CXX)
+@@ -546,7 +577,9 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
@@ -204,7 +204,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA)
HEADERS = $(noinst_HEADERS)
-@@ -557,7 +590,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -559,7 +592,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
@@ -213,7 +213,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
#>- all: all-recursive
#>+ 1
-@@ -639,6 +672,10 @@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE
+@@ -641,6 +674,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)
@@ -224,7 +224,7 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -683,11 +720,14 @@ distclean-compile:
+@@ -685,11 +722,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@
@@ -240,16 +240,16 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 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@
-@@ -934,7 +974,7 @@ distclean-tags:
+@@ -942,7 +982,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 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_irix.h configure.in.in mixer_sun.h kmixui.rc kmixctrl_restore.desktop mixer_oss.cpp resource.h mixer_alsa.h mixer_none.h kmix-platforms.cpp mixer_alsa5.cpp mixer_alsa9.cpp mixer_irix.cpp colorwidget.ui mixer_hpux.cpp kmixapplet.desktop mixer_none.cpp mixer_oss.h mixer_hpux.h mixer_sun.cpp
+KDE_DIST=mixer_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc Makefile.in.rej 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)
-@@ -1109,37 +1149,34 @@ $(srcdir)/version.h: VERSION
+@@ -1117,25 +1157,16 @@ $(srcdir)/version.h: VERSION
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kmix.pot
@@ -265,22 +265,29 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
- $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; false )
-mixerIface_skel.cpp: mixerIface.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub mixerIface.kidl
-+#>+ 3
+-
+ #>+ 3
+-kmix.moc: $(srcdir)/kmix.h
+- $(MOC) $(srcdir)/kmix.h -o kmix.moc
+kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
+ $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
-+#>+ 1
+ #>+ 1
+-mocs: kmix.moc
+mocs: kmixdockwidget.moc
#>+ 3
--ksmallslider.moc: $(srcdir)/ksmallslider.h
-- $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc
-+mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
-+ $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
-
+ mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
+ $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
+@@ -1143,17 +1174,11 @@ mixdevicewidget.moc: $(srcdir)/mixdevice
#>+ 1
--mocs: ksmallslider.moc
-+mocs: mixdevicewidget.moc
+ mocs: mixdevicewidget.moc
#>+ 3
+-kmixerwidget.moc: $(srcdir)/kmixerwidget.h
+- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
+-
+-#>+ 1
+-mocs: kmixerwidget.moc
+-#>+ 3
-kmixapplet.moc: $(srcdir)/kmixapplet.h
- $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
+ksmallslider.moc: $(srcdir)/ksmallslider.h
@@ -290,37 +297,37 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
-mocs: kmixapplet.moc
+mocs: ksmallslider.moc
#>+ 3
--kmix.moc: $(srcdir)/kmix.h
-- $(MOC) $(srcdir)/kmix.h -o kmix.moc
-+kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
-+ $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
-
+ kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
+ $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
+@@ -1161,29 +1186,41 @@ kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
#>+ 1
--mocs: kmix.moc
-+mocs: kmixprefdlg.moc
+ mocs: kmixprefdlg.moc
#>+ 3
- mixer.moc: $(srcdir)/mixer.h
- $(MOC) $(srcdir)/mixer.h -o mixer.moc
-@@ -1147,35 +1184,35 @@ mixer.moc: $(srcdir)/mixer.h
+-kledbutton.moc: $(srcdir)/kledbutton.h
+- $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc
++mixer.moc: $(srcdir)/mixer.h
++ $(MOC) $(srcdir)/mixer.h -o mixer.moc
+
#>+ 1
- mocs: mixer.moc
+-mocs: kledbutton.moc
++mocs: mixer.moc
#>+ 3
--kmixerwidget.moc: $(srcdir)/kmixerwidget.h
-- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
+-ksmallslider.moc: $(srcdir)/ksmallslider.h
+- $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc
+kmix.moc: $(srcdir)/kmix.h
+ $(MOC) $(srcdir)/kmix.h -o kmix.moc
#>+ 1
--mocs: kmixerwidget.moc
+-mocs: ksmallslider.moc
+mocs: kmix.moc
#>+ 3
--kledbutton.moc: $(srcdir)/kledbutton.h
-- $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc
+-mixer.moc: $(srcdir)/mixer.h
+- $(MOC) $(srcdir)/mixer.h -o mixer.moc
+kmixapplet.moc: $(srcdir)/kmixapplet.h
+ $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
#>+ 1
--mocs: kledbutton.moc
+-mocs: mixer.moc
+mocs: kmixapplet.moc
#>+ 3
-kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
@@ -331,43 +338,35 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
#>+ 1
-mocs: kmixdockwidget.moc
+mocs: kledbutton.moc
- #>+ 3
--mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
-- $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
++#>+ 3
+kmixerwidget.moc: $(srcdir)/kmixerwidget.h
+ $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
-
- #>+ 1
--mocs: mixdevicewidget.moc
--#>+ 3
--kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h
-- $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc
++
++#>+ 1
+mocs: kmixerwidget.moc
+#>+ 5
+mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; false )
+mixerIface_skel.cpp: mixerIface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub mixerIface.kidl
-
--#>+ 1
--mocs: kmixprefdlg.moc
++
#>+ 8
kmix_panelapplet.la.closure: $(kmix_panelapplet_la_OBJECTS) $(kmix_panelapplet_la_DEPENDENCIES)
@echo "int main() {return 0;}" > kmix_panelapplet_la_closure.cpp
-@@ -1202,7 +1239,7 @@ colorwidget.moc: colorwidget.h
+@@ -1210,7 +1247,7 @@ colorwidget.moc: colorwidget.h
#>+ 3
clean-metasources:
-- -rm -f ksmallslider.moc kmixapplet.moc kmix.moc mixer.moc kmixerwidget.moc kledbutton.moc kmixdockwidget.moc mixdevicewidget.moc kmixprefdlg.moc
+- -rm -f kmix.moc mixdevicewidget.moc kmixerwidget.moc kmixapplet.moc kmixprefdlg.moc kledbutton.moc ksmallslider.moc mixer.moc kmixdockwidget.moc
+ -rm -f kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc
#>+ 6
clean-idl:
-@@ -1231,19 +1268,7 @@ force-reedit:
+@@ -1239,19 +1276,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)/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
+-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 kmixerwidget.moc mixdevicewidget.moc kmixprefdlg.moc kledbutton.moc ksmallslider.moc mixer.moc kmixdockwidget.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; \
@@ -379,12 +378,12 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 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)/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 kmixerwidget.moc mixdevicewidget.moc kmixapplet.moc kledbutton.moc ksmallslider.moc colorwidget.moc mixer.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; \
-@@ -1255,33 +1280,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi
+@@ -1263,33 +1288,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi
rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files
#>+ 11
@@ -443,54 +442,52 @@ $NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1291,30 +1328,30 @@ kde-rpo-clean:
+@@ -1299,30 +1336,30 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 28
-$(srcdir)/mixdevicewidget.cpp: colorwidget.h
--kledbutton.lo: kledbutton.moc
--mixer.o: mixer.moc
--$(srcdir)/channel.cpp: colorwidget.h
--$(srcdir)/ksmallslider.cpp: colorwidget.h
--kmixprefdlg.o: kmixprefdlg.moc
--kledbutton.o: kledbutton.moc
--$(srcdir)/kmixapplet.cpp: colorwidget.h
- kmixerwidget.lo: kmixerwidget.moc
+-kmixapplet.o: kmixapplet.moc
+-$(srcdir)/kledbutton.cpp: colorwidget.h
+-$(srcdir)/VerticalText.cpp: colorwidget.h
++kmixerwidget.lo: kmixerwidget.moc
++mixer.lo: mixer.moc
++kmixapplet.lo: kmixapplet.moc
+ ksmallslider.lo: ksmallslider.moc
-kmixprefdlg.lo: kmixprefdlg.moc
--kmix.lo: kmix.moc
- mixer.lo: mixer.moc
-mixdevicewidget.lo: mixdevicewidget.moc
-+kmixapplet.lo: kmixapplet.moc
-+ksmallslider.lo: ksmallslider.moc
+-mixdevicewidget.o: mixdevicewidget.moc
kmixerwidget.o: kmixerwidget.moc
--kmixdockwidget.o: kmixdockwidget.moc
+-kmix.lo: kmix.moc
+mixdevicewidget.o: mixdevicewidget.moc
-+kmixdockwidget.lo: kmixdockwidget.moc
+ kmixdockwidget.lo: kmixdockwidget.moc
+-kmixerwidget.lo: kmixerwidget.moc
+-kmixapplet.lo: kmixapplet.moc
+-kmixprefdlg.o: kmixprefdlg.moc
+-kmixdockwidget.o: kmixdockwidget.moc
+$(srcdir)/mixdevicewidget.cpp: colorwidget.h
$(srcdir)/kmixerwidget.cpp: colorwidget.h
+kmix.o: kmix.moc
-+$(srcdir)/mixer.cpp: colorwidget.h
+ $(srcdir)/mixer.cpp: colorwidget.h
+-kledbutton.lo: kledbutton.moc
+-ksmallslider.o: ksmallslider.moc
+kmix.lo: kmix.moc
-+$(srcdir)/channel.cpp: colorwidget.h
+ $(srcdir)/channel.cpp: colorwidget.h
+-kledbutton.o: kledbutton.moc
+kmixprefdlg.o: kmixprefdlg.moc
- $(srcdir)/kledbutton.cpp: colorwidget.h
--$(srcdir)/VerticalText.cpp: colorwidget.h
++$(srcdir)/kledbutton.cpp: colorwidget.h
+mixdevicewidget.lo: mixdevicewidget.moc
- ksmallslider.o: ksmallslider.moc
--mixdevicewidget.o: mixdevicewidget.moc
--$(srcdir)/mixer.cpp: colorwidget.h
--kmix.o: kmix.moc
--kmixapplet.lo: kmixapplet.moc
--$(srcdir)/volume.cpp: colorwidget.h
-+mixer.o: mixer.moc
++ksmallslider.o: ksmallslider.moc
+ 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
--kmixdockwidget.lo: kmixdockwidget.moc
++kmixapplet.o: kmixapplet.moc
+kledbutton.lo: kledbutton.moc
-+$(srcdir)/volume.cpp: colorwidget.h
-+$(srcdir)/ksmallslider.cpp: colorwidget.h
+ $(srcdir)/volume.cpp: colorwidget.h
+-mixer.lo: mixer.moc
+-$(srcdir)/kmixapplet.cpp: colorwidget.h
+ $(srcdir)/ksmallslider.cpp: colorwidget.h
+-kmix.o: kmix.moc
+$(srcdir)/kmixapplet.cpp: colorwidget.h
+kmixdockwidget.o: kmixdockwidget.moc
diff --git a/audio/kdemultimedia3/patches/patch-az b/audio/kdemultimedia3/patches/patch-az
index 7e87f7322c8..f3b79b35af4 100644
--- a/audio/kdemultimedia3/patches/patch-az
+++ b/audio/kdemultimedia3/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
+$NetBSD: patch-az,v 1.6 2004/01/15 10:30:03 markd Exp $
---- noatun/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/Makefile.in
-@@ -381,22 +381,25 @@ SUBDIRS = pics library modules .
+@@ -383,22 +383,25 @@ SUBDIRS = pics library modules .
KDE_ICON = AUTO
@@ -35,7 +35,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
applnk_DATA = noatun.desktop
applnkdir = $(kde_appsdir)/Multimedia
-@@ -414,25 +417,31 @@ subdir = noatun
+@@ -417,25 +420,31 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -78,7 +78,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
#>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
#>+ 1
-@@ -442,13 +451,19 @@ noatun20update_DEPENDENCIES =
+@@ -445,13 +454,19 @@ noatun20update_DEPENDENCIES =
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
@@ -105,7 +105,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-@@ -468,8 +483,8 @@ CXXLD = $(CXX)
+@@ -471,8 +486,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -116,7 +116,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
DATA = $(applnk_DATA) $(presets_DATA) $(update_DATA)
-@@ -480,7 +495,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -483,7 +498,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = COPYING Makefile.am Makefile.in TODO
DIST_SUBDIRS = $(SUBDIRS)
@@ -125,7 +125,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
#>- all: all-recursive
#>+ 1
-@@ -525,6 +540,36 @@ clean-kde_moduleLTLIBRARIES:
+@@ -528,6 +543,36 @@ clean-kde_moduleLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@@ -162,7 +162,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 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)
-@@ -598,10 +643,11 @@ mostlyclean-compile:
+@@ -601,10 +646,11 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -175,16 +175,16 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
distclean-depend:
-rm -rf ./$(DEPDIR)
-@@ -822,7 +868,7 @@ distclean-tags:
+@@ -831,7 +877,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
-+KDE_DIST=preset.trance preset.eclecticguitar artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz cr22-app-noatun.png noatun.desktop FILES cr48-app-noatun.png avideoframe.h cr64-app-noatun.png preset.metal cr128-app-noatun.png preset.zero cr16-app-noatun.png cr32-app-noatun.png preset.dance
+-KDE_DIST=preset.eclecticguitar configure.in.in preset.dance preset.trance cr64-app-noatun.png cr128-app-noatun.png preset.zero cr32-app-noatun.png CHANGES preset.metal joinhandler.h avideoframe.cc cr16-app-noatun.png artsvideo.idl cr22-app-noatun.png noatun.desktop preset.jazz avideoframe.h noatun.upd FILES cr48-app-noatun.png
++KDE_DIST=preset.trance preset.eclecticguitar artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz cr22-app-noatun.png noatun.desktop FILES cr48-app-noatun.png avideoframe.h cr64-app-noatun.png preset.metal cr128-app-noatun.png Makefile.in.rej preset.zero cr16-app-noatun.png cr32-app-noatun.png preset.dance
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -873,9 +919,11 @@ distdir: $(DISTFILES)
+@@ -882,9 +928,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.5 2003/05/22 03:05:40 markd Exp $
install: install-recursive
install-exec: install-exec-recursive
-@@ -894,7 +942,6 @@ install-strip:
+@@ -903,7 +951,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
@@ -205,7 +205,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -907,10 +954,12 @@ maintainer-clean-generic:
+@@ -916,10 +963,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.5 2003/05/22 03:05:40 markd Exp $
distclean: distclean-recursive
-@@ -931,9 +980,9 @@ info-am:
+@@ -940,9 +989,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.5 2003/05/22 03:05:40 markd Exp $
install-info: install-info-recursive
-@@ -960,27 +1009,28 @@ ps-am:
+@@ -969,27 +1018,28 @@ ps-am:
#>- uninstall-am: uninstall-applnkDATA uninstall-binPROGRAMS \
#>- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \
@@ -275,7 +275,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 markd Exp $
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
+@@ -1000,13 +1050,11 @@ uninstall-info: uninstall-info-recursive
tags-recursive uninstall uninstall-am uninstall-applnkDATA \
uninstall-binPROGRAMS uninstall-info-am \
uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
@@ -291,7 +291,7 @@ $NetBSD: patch-az,v 1.5 2003/05/22 03:05:40 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
-@@ -1050,33 +1098,33 @@ force-reedit:
+@@ -1059,33 +1107,33 @@ force-reedit:
#>+ 11
diff --git a/audio/kdemultimedia3/patches/patch-bb b/audio/kdemultimedia3/patches/patch-bb
index 4802bc6f4bf..ba4b1efc4e1 100644
--- a/audio/kdemultimedia3/patches/patch-bb
+++ b/audio/kdemultimedia3/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
+$NetBSD: patch-bb,v 1.8 2004/01/15 10:30:03 markd Exp $
---- noatun/library/Makefile.in.orig 2003-07-15 22:13:59.000000000 +1200
+--- noatun/library/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/library/Makefile.in
-@@ -388,9 +388,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
+@@ -389,9 +389,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
SUBDIRS = noatunarts noatun . noatuntags
@@ -14,7 +14,7 @@ $NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
playlist.cpp pref.cpp \
player.cpp playlistsaver.cpp app.cpp \
pluginloader.cpp plugin.cpp \
-@@ -403,15 +403,15 @@ libnoatun_la_SOURCES = pluginmodule.cpp
+@@ -404,15 +404,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.7 2003/07/30 14:56:03 markd Exp $
-lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIBPNG)
-@@ -433,27 +433,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -435,27 +435,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -70,7 +70,7 @@ $NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
libnoatuncontrols_la_DEPENDENCIES =
am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo
#>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS)
-@@ -493,7 +494,7 @@ am__depfiles_maybe = depfiles
+@@ -495,7 +496,7 @@ am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@ ./$(DEPDIR)/stereobuttonaction.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/video.Plo
#>+ 35
@@ -79,7 +79,7 @@ $NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 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 \
-@@ -546,8 +547,8 @@ CXXLD = $(CXX)
+@@ -548,8 +549,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -90,7 +90,7 @@ $NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
DATA = $(magictable_DATA)
HEADERS = $(include_HEADERS)
-@@ -560,7 +561,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -562,7 +563,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
@@ -99,7 +99,7 @@ $NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
#>- all: all-recursive
#>+ 1
-@@ -605,8 +606,8 @@ clean-libLTLIBRARIES:
+@@ -607,8 +608,8 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@@ -110,86 +110,93 @@ $NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS)
-@@ -853,7 +854,7 @@ distclean-tags:
+@@ -861,7 +862,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
+-KDE_DIST=fft.h pluginmodule.h fft.c noatunlistview.h globalvideo.h
+KDE_DIST=fft.h Makefile.in.rej noatunlistview.h pluginmodule.h globalvideo.h fft.c
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -1016,29 +1017,29 @@ magictable: gentable
+@@ -1024,50 +1025,50 @@ magictable: gentable
.NOEXPORT:
#>+ 3
--plugin_deps.moc: $(srcdir)/plugin_deps.h
-- $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
+-cmodule.moc: $(srcdir)/cmodule.h
+- $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+equalizerview.moc: $(srcdir)/equalizerview.h
+ $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc
#>+ 1
--mocs: plugin_deps.moc
+-mocs: cmodule.moc
+mocs: equalizerview.moc
#>+ 3
--mimetypetree.moc: $(srcdir)/mimetypetree.h
-- $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc
+-effectview.moc: $(srcdir)/effectview.h
+- $(MOC) $(srcdir)/effectview.h -o effectview.moc
+plugin_deps.moc: $(srcdir)/plugin_deps.h
+ $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
#>+ 1
--mocs: mimetypetree.moc
+-mocs: effectview.moc
+mocs: plugin_deps.moc
#>+ 3
--effectview.moc: $(srcdir)/effectview.h
-- $(MOC) $(srcdir)/effectview.h -o effectview.moc
+-globalvideo.moc: $(srcdir)/globalvideo.h
+- $(MOC) $(srcdir)/globalvideo.h -o globalvideo.moc
+cmodule.moc: $(srcdir)/cmodule.h
+ $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
#>+ 1
--mocs: effectview.moc
+-mocs: globalvideo.moc
+mocs: cmodule.moc
#>+ 3
--equalizerview.moc: $(srcdir)/equalizerview.h
-- $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc
+-pluginmodule.moc: $(srcdir)/pluginmodule.h
+- $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
+mimetypetree.moc: $(srcdir)/mimetypetree.h
+ $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc
#>+ 1
--mocs: equalizerview.moc
+-mocs: pluginmodule.moc
+mocs: mimetypetree.moc
#>+ 3
- pluginmodule.moc: $(srcdir)/pluginmodule.h
- $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
-@@ -1046,11 +1047,11 @@ pluginmodule.moc: $(srcdir)/pluginmodule
+-equalizerview.moc: $(srcdir)/equalizerview.h
+- $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc
++pluginmodule.moc: $(srcdir)/pluginmodule.h
++ $(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
+
#>+ 1
- mocs: pluginmodule.moc
+-mocs: equalizerview.moc
++mocs: pluginmodule.moc
#>+ 3
--cmodule.moc: $(srcdir)/cmodule.h
-- $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+-mimetypetree.moc: $(srcdir)/mimetypetree.h
+- $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc
+effectview.moc: $(srcdir)/effectview.h
+ $(MOC) $(srcdir)/effectview.h -o effectview.moc
#>+ 1
--mocs: cmodule.moc
+-mocs: mimetypetree.moc
+mocs: effectview.moc
#>+ 3
- globalvideo.moc: $(srcdir)/globalvideo.h
- $(MOC) $(srcdir)/globalvideo.h -o globalvideo.moc
-@@ -1059,7 +1060,7 @@ globalvideo.moc: $(srcdir)/globalvideo.h
- mocs: globalvideo.moc
+-plugin_deps.moc: $(srcdir)/plugin_deps.h
+- $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
++globalvideo.moc: $(srcdir)/globalvideo.h
++ $(MOC) $(srcdir)/globalvideo.h -o globalvideo.moc
+
+ #>+ 1
+-mocs: plugin_deps.moc
++mocs: globalvideo.moc
#>+ 3
clean-metasources:
-- -rm -f plugin_deps.moc mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc globalvideo.moc
+- -rm -f cmodule.moc effectview.moc globalvideo.moc pluginmodule.moc equalizerview.moc mimetypetree.moc plugin_deps.moc
+ -rm -f equalizerview.moc plugin_deps.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc globalvideo.moc
#>+ 2
docs-am:
-@@ -1072,16 +1073,16 @@ force-reedit:
+@@ -1080,16 +1081,16 @@ force-reedit:
#>+ 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 $(srcdir)/video.cpp plugin_deps.moc mimetypetree.moc effectview.moc cmodule.moc pluginmodule.moc equalizerview.moc globalvideo.moc
+-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 $(srcdir)/video.cpp cmodule.moc globalvideo.moc effectview.moc pluginmodule.moc plugin_deps.moc mimetypetree.moc equalizerview.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; \
@@ -210,7 +217,7 @@ $NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
#>+ 11
libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp
-@@ -1097,20 +1098,20 @@ libnoatuncontrols_la.all_cpp.cpp: $(srcd
+@@ -1105,20 +1106,20 @@ libnoatuncontrols_la.all_cpp.cpp: $(srcd
#>+ 3
clean-final:
@@ -236,31 +243,30 @@ $NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1120,17 +1121,17 @@ kde-rpo-clean:
+@@ -1128,17 +1129,17 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 15
--mimetypetree.o: mimetypetree.moc
+-plugin.lo: plugin_deps.moc
-effectview.lo: effectview.moc
--equalizerview.o: equalizerview.moc
--effectview.o: effectview.moc
--video.lo: globalvideo.moc
+-pluginmodule.o: pluginmodule.moc
+equalizerview.lo: equalizerview.moc
- pluginmodule.lo: pluginmodule.moc
- video.o: globalvideo.moc
--plugin.lo: plugin_deps.moc
++pluginmodule.lo: pluginmodule.moc
++video.o: globalvideo.moc
++cmodule.lo: cmodule.moc
+ video.lo: globalvideo.moc
+ effectview.o: effectview.moc
+-mimetypetree.o: mimetypetree.moc
++pluginmodule.o: pluginmodule.moc
+ plugin.o: plugin_deps.moc
-cmodule.o: cmodule.moc
--equalizerview.lo: equalizerview.moc
--plugin.o: plugin_deps.moc
--mimetypetree.lo: mimetypetree.moc
- cmodule.lo: cmodule.moc
-+video.lo: globalvideo.moc
-+effectview.o: effectview.moc
- pluginmodule.o: pluginmodule.moc
-+plugin.o: plugin_deps.moc
-+equalizerview.o: equalizerview.moc
+-video.o: globalvideo.moc
+-pluginmodule.lo: pluginmodule.moc
+-cmodule.lo: cmodule.moc
+ equalizerview.o: equalizerview.moc
+cmodule.o: cmodule.moc
+mimetypetree.o: mimetypetree.moc
+effectview.lo: effectview.moc
-+mimetypetree.lo: mimetypetree.moc
+ mimetypetree.lo: mimetypetree.moc
+-equalizerview.lo: equalizerview.moc
+plugin.lo: plugin_deps.moc
diff --git a/audio/kdemultimedia3/patches/patch-bl b/audio/kdemultimedia3/patches/patch-bl
index c13d48c8939..5d7222d18a0 100644
--- a/audio/kdemultimedia3/patches/patch-bl
+++ b/audio/kdemultimedia3/patches/patch-bl
@@ -1,8 +1,8 @@
-$NetBSD: patch-bl,v 1.3 2003/07/30 14:56:03 markd Exp $
+$NetBSD: patch-bl,v 1.4 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/infrared/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+--- noatun/modules/infrared/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/modules/infrared/Makefile.in
-@@ -384,7 +384,7 @@ noatun_infrared_la_SOURCES = infrared.cp
+@@ -385,7 +385,7 @@ noatun_infrared_la_SOURCES = infrared.cp
noinst_HEADERS = infrared.h lirc.h irprefs.h
noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-bl,v 1.3 2003/07/30 14:56:03 markd Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
-@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES =
+@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_infrared_la_DEPENDENCIES = \
@@ -20,7 +20,7 @@ $NetBSD: patch-bl,v 1.3 2003/07/30 14:56:03 markd Exp $
am_noatun_infrared_la_OBJECTS = infrared.lo lirc.lo irprefs.lo
#>- noatun_infrared_la_OBJECTS = $(am_noatun_infrared_la_OBJECTS)
#>+ 4
-@@ -622,7 +622,7 @@ distclean-tags:
+@@ -624,7 +624,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
@@ -29,9 +29,9 @@ $NetBSD: patch-bl,v 1.3 2003/07/30 14:56:03 markd Exp $
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -772,12 +772,6 @@ noatun_infrared.la.closure: $(noatun_inf
-
-
+@@ -779,20 +779,20 @@ irprefs.moc: $(srcdir)/irprefs.h
+ #>+ 1
+ mocs: irprefs.moc
#>+ 3
-lirc.moc: $(srcdir)/lirc.h
- $(MOC) $(srcdir)/lirc.h -o lirc.moc
@@ -39,10 +39,9 @@ $NetBSD: patch-bl,v 1.3 2003/07/30 14:56:03 markd Exp $
-#>+ 1
-mocs: lirc.moc
-#>+ 3
- irprefs.moc: $(srcdir)/irprefs.h
- $(MOC) $(srcdir)/irprefs.h -o irprefs.moc
+ infrared.moc: $(srcdir)/infrared.h
+ $(MOC) $(srcdir)/infrared.h -o infrared.moc
-@@ -790,8 +784,14 @@ infrared.moc: $(srcdir)/infrared.h
#>+ 1
mocs: infrared.moc
#>+ 3
@@ -53,30 +52,21 @@ $NetBSD: patch-bl,v 1.3 2003/07/30 14:56:03 markd Exp $
+mocs: lirc.moc
+#>+ 3
clean-metasources:
-- -rm -f lirc.moc irprefs.moc infrared.moc
+- -rm -f irprefs.moc lirc.moc infrared.moc
+ -rm -f irprefs.moc infrared.moc lirc.moc
#>+ 3
clean-closures:
-@@ -808,7 +808,7 @@ force-reedit:
-
-
- #>+ 11
--noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp lirc.moc irprefs.moc infrared.moc
-+noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.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; \
-@@ -844,9 +844,9 @@ kde-rpo-clean:
+@@ -845,9 +845,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
+infrared.o: infrared.moc
-+lirc.o: lirc.moc
- irprefs.lo: irprefs.moc
- infrared.lo: infrared.moc
+ lirc.o: lirc.moc
-irprefs.o: irprefs.moc
--lirc.o: lirc.moc
--infrared.o: infrared.moc
+-infrared.lo: infrared.moc
+ irprefs.lo: irprefs.moc
++infrared.lo: infrared.moc
lirc.lo: lirc.moc
+-infrared.o: infrared.moc
+irprefs.o: irprefs.moc
diff --git a/audio/kdemultimedia3/patches/patch-bn b/audio/kdemultimedia3/patches/patch-bn
index 6743a652841..c1f36cac7dc 100644
--- a/audio/kdemultimedia3/patches/patch-bn
+++ b/audio/kdemultimedia3/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.5 2003/07/30 14:56:03 markd Exp $
+$NetBSD: patch-bn,v 1.6 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/kaiman/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+--- noatun/modules/kaiman/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/modules/kaiman/Makefile.in
-@@ -388,7 +388,7 @@ noatun_kaiman_la_SOURCES = \
+@@ -389,7 +389,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.5 2003/07/30 14:56:03 markd Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
-@@ -408,7 +408,7 @@ CONFIG_CLEAN_FILES =
+@@ -410,7 +410,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_kaiman_la_DEPENDENCIES = \
@@ -20,50 +20,45 @@ $NetBSD: patch-bn,v 1.5 2003/07/30 14:56:03 markd Exp $
am_noatun_kaiman_la_OBJECTS = noatunui.lo style.lo userinterface.lo \
pref.lo
#>- noatun_kaiman_la_OBJECTS = $(am_noatun_kaiman_la_OBJECTS)
-@@ -706,7 +706,7 @@ distclean-tags:
+@@ -714,7 +714,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
+-KDE_DIST=kaimanui.rc SKIN-SPECS kaiman.plugin
+KDE_DIST=kaimanui.rc SKIN-SPECS Makefile.in.rej kaiman.plugin
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -878,11 +878,11 @@ noatun_kaiman.la.closure: $(noatun_kaima
+@@ -886,12 +886,6 @@ noatun_kaiman.la.closure: $(noatun_kaima
#>+ 3
-userinterface.moc: $(srcdir)/userinterface.h
- $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
-+style.moc: $(srcdir)/style.h
-+ $(MOC) $(srcdir)/style.h -o style.moc
-
- #>+ 1
+-
+-#>+ 1
-mocs: userinterface.moc
-+mocs: style.moc
- #>+ 3
- pref.moc: $(srcdir)/pref.h
- $(MOC) $(srcdir)/pref.h -o pref.moc
-@@ -890,14 +890,14 @@ pref.moc: $(srcdir)/pref.h
+-#>+ 3
+ style.moc: $(srcdir)/style.h
+ $(MOC) $(srcdir)/style.h -o style.moc
+
+@@ -904,8 +898,14 @@ pref.moc: $(srcdir)/pref.h
#>+ 1
mocs: pref.moc
#>+ 3
--style.moc: $(srcdir)/style.h
-- $(MOC) $(srcdir)/style.h -o style.moc
+userinterface.moc: $(srcdir)/userinterface.h
+ $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
-
- #>+ 1
--mocs: style.moc
++
++#>+ 1
+mocs: userinterface.moc
- #>+ 3
++#>+ 3
clean-metasources:
-- -rm -f userinterface.moc pref.moc style.moc
+- -rm -f userinterface.moc style.moc pref.moc
+ -rm -f style.moc pref.moc userinterface.moc
#>+ 3
clean-closures:
-@@ -914,7 +914,7 @@ force-reedit:
+@@ -922,7 +922,7 @@ force-reedit:
#>+ 11
@@ -72,15 +67,16 @@ $NetBSD: patch-bn,v 1.5 2003/07/30 14:56:03 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; \
-@@ -950,9 +950,9 @@ kde-rpo-clean:
+@@ -958,9 +958,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
+-style.o: style.moc
++pref.lo: pref.moc
+ style.lo: style.moc
-userinterface.lo: userinterface.moc
--style.lo: style.moc
- pref.lo: pref.moc
-+style.lo: style.moc
userinterface.o: userinterface.moc
- style.o: style.moc
++style.o: style.moc
pref.o: pref.moc
+-pref.lo: pref.moc
+userinterface.lo: userinterface.moc
diff --git a/audio/kdemultimedia3/patches/patch-bp b/audio/kdemultimedia3/patches/patch-bp
index e275404088e..1d78e3e7798 100644
--- a/audio/kdemultimedia3/patches/patch-bp
+++ b/audio/kdemultimedia3/patches/patch-bp
@@ -1,8 +1,8 @@
-$NetBSD: patch-bp,v 1.2 2003/01/02 09:12:22 skrll Exp $
+$NetBSD: patch-bp,v 1.3 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/keyz/Makefile.in.orig Sat Dec 28 14:04:00 2002
+--- noatun/modules/keyz/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/modules/keyz/Makefile.in
-@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_keyz.la
+@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_keyz.la
noatun_keyz_la_SOURCES = keyz.cpp
noatun_keyz_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-bp,v 1.2 2003/01/02 09:12:22 skrll Exp $
#>- noatun_keyz_la_METASOURCES = AUTO
-@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES =
+@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_keyz_la_DEPENDENCIES = \
@@ -20,10 +20,12 @@ $NetBSD: patch-bp,v 1.2 2003/01/02 09:12:22 skrll Exp $
am_noatun_keyz_la_OBJECTS = keyz.lo
#>- noatun_keyz_la_OBJECTS = $(am_noatun_keyz_la_OBJECTS)
#>+ 1
-@@ -656,5 +656,5 @@ kde-rpo-clean:
- -rm -f *.rpo
+@@ -613,7 +613,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=keyz.plugin
++KDE_DIST=Makefile.in.rej keyz.plugin
+
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- #>+ 3
--keyz.lo: keyz.moc
- keyz.o: keyz.moc
-+keyz.lo: keyz.moc
diff --git a/audio/kdemultimedia3/patches/patch-br b/audio/kdemultimedia3/patches/patch-br
index 59c81a57b3f..1e510cad1fd 100644
--- a/audio/kdemultimedia3/patches/patch-br
+++ b/audio/kdemultimedia3/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.5 2003/07/30 14:56:04 markd Exp $
+$NetBSD: patch-br,v 1.6 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/kjofol-skin/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+--- noatun/modules/kjofol-skin/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/modules/kjofol-skin/Makefile.in
-@@ -400,7 +400,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj
+@@ -401,7 +401,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.5 2003/07/30 14:56:04 markd Exp $
$(LIB_KIO) -lm \
$(top_builddir)/arts/modules/libartsmodules.la
-@@ -421,7 +421,7 @@ CONFIG_CLEAN_FILES =
+@@ -423,7 +423,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_kjofol_la_DEPENDENCIES = \
@@ -20,16 +20,16 @@ $NetBSD: patch-br,v 1.5 2003/07/30 14:56:04 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 \
-@@ -749,7 +749,7 @@ distclean-tags:
+@@ -757,7 +757,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 kjofolui.plugin kjskinselectorwidget.ui kjguisettingswidget.ui
+-KDE_DIST=kjofolui.plugin kjskinselectorwidget.ui helpers.cpp kjguisettingswidget.ui
+KDE_DIST=kjskinselectorwidget.ui kjofolui.plugin Makefile.in.rej helpers.cpp kjguisettingswidget.ui
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -949,32 +949,32 @@ kjguisettingswidget.moc: kjguisettingswi
+@@ -957,32 +957,32 @@ kjguisettingswidget.moc: kjguisettingswi
$(MOC) kjguisettingswidget.h -o kjguisettingswidget.moc
#>+ 3
@@ -75,53 +75,50 @@ $NetBSD: patch-br,v 1.5 2003/07/30 14:56:04 markd Exp $
#>+ 5
clean-ui:
-@@ -997,7 +997,7 @@ force-reedit:
+@@ -1005,7 +1005,7 @@ force-reedit:
#>+ 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 kjskinselectorwidget.cpp kjguisettingswidget.cpp kjloader.moc kjequalizer.moc kjskinselectorwidget.moc kjguisettingswidget.moc kjtextdisplay.moc kjprefs.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 kjskinselectorwidget.cpp kjguisettingswidget.cpp kjskinselectorwidget.moc kjequalizer.moc kjguisettingswidget.moc kjloader.moc kjtextdisplay.moc kjprefs.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 kjskinselectorwidget.cpp kjguisettingswidget.cpp kjtextdisplay.moc kjguisettingswidget.moc kjequalizer.moc kjskinselectorwidget.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; \
-@@ -1033,24 +1033,24 @@ kde-rpo-clean:
+@@ -1041,24 +1041,24 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 22
--kjloader.lo: kjloader.moc
--kjequalizer.o: kjequalizer.moc
--$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
--kjprefs.lo: kjprefs.moc
--$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
- kjprefs.o: kjprefs.moc
--$(srcdir)/kjfont.cpp: kjskinselectorwidget.h kjguisettingswidget.h
--kjtextdisplay.lo: kjtextdisplay.moc
+-$(srcdir)/kjbackground.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-$(srcdir)/noatunui.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+-$(srcdir)/kjtextdisplay.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+ kjprefs.o: kjprefs.moc
+-$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+-kjtextdisplay.o: kjtextdisplay.moc
+$(srcdir)/kjtextdisplay.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-+$(srcdir)/kjseeker.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-+$(srcdir)/kjloader.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-+kjequalizer.lo: kjequalizer.moc
- $(srcdir)/kjbutton.cpp: kjskinselectorwidget.h kjguisettingswidget.h
--$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+ $(srcdir)/kjseeker.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+ $(srcdir)/kjloader.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+ kjequalizer.lo: kjequalizer.moc
++$(srcdir)/kjbutton.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-+kjtextdisplay.lo: kjtextdisplay.moc
+ kjtextdisplay.lo: kjtextdisplay.moc
+-kjprefs.lo: kjprefs.moc
+$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjloader.lo: kjloader.moc
- $(srcdir)/parser.cpp: kjskinselectorwidget.h kjguisettingswidget.h
--$(srcdir)/kjloader.cpp: kjskinselectorwidget.h kjguisettingswidget.h
--$(srcdir)/kjbackground.cpp: kjskinselectorwidget.h kjguisettingswidget.h
- $(srcdir)/kjwidget.cpp: kjskinselectorwidget.h kjguisettingswidget.h
--kjloader.o: kjloader.moc
--$(srcdir)/kjtextdisplay.cpp: kjskinselectorwidget.h kjguisettingswidget.h
--$(srcdir)/kjsliders.cpp: kjskinselectorwidget.h kjguisettingswidget.h
++$(srcdir)/parser.cpp: kjskinselectorwidget.h kjguisettingswidget.h
++$(srcdir)/kjwidget.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjequalizer.o: kjequalizer.moc
-+$(srcdir)/kjfont.cpp: kjskinselectorwidget.h kjguisettingswidget.h
- kjtextdisplay.o: kjtextdisplay.moc
--kjequalizer.lo: kjequalizer.moc
--$(srcdir)/kjseeker.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-+$(srcdir)/kjsliders.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+ $(srcdir)/kjfont.cpp: kjskinselectorwidget.h kjguisettingswidget.h
++kjtextdisplay.o: kjtextdisplay.moc
+ $(srcdir)/kjsliders.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/kjbackground.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+$(srcdir)/noatunui.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+kjprefs.lo: kjprefs.moc
-+kjloader.o: kjloader.moc
+ kjloader.o: kjloader.moc
+-kjequalizer.o: kjequalizer.moc
+-$(srcdir)/kjbutton.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+-$(srcdir)/kjequalizer.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+-$(srcdir)/kjwidget.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+-kjloader.lo: kjloader.moc
+-$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
+-$(srcdir)/parser.cpp: kjskinselectorwidget.h kjguisettingswidget.h
diff --git a/audio/kdemultimedia3/patches/patch-bv b/audio/kdemultimedia3/patches/patch-bv
index 948dcbbe734..0ae7519c001 100644
--- a/audio/kdemultimedia3/patches/patch-bv
+++ b/audio/kdemultimedia3/patches/patch-bv
@@ -1,8 +1,8 @@
-$NetBSD: patch-bv,v 1.3 2003/07/30 14:56:04 markd Exp $
+$NetBSD: patch-bv,v 1.4 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/metatag/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+--- noatun/modules/metatag/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300
+++ noatun/modules/metatag/Makefile.in
-@@ -382,7 +382,7 @@ kde_module_LTLIBRARIES = noatun_metatag.
+@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_metatag.
noatun_metatag_la_SOURCES = metatag.cpp edit.cpp
noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-bv,v 1.3 2003/07/30 14:56:04 markd Exp $
$(top_builddir)/noatun/library/noatuntags/libnoatuntags.la
-@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES =
+@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_metatag_la_DEPENDENCIES = \
@@ -20,7 +20,7 @@ $NetBSD: patch-bv,v 1.3 2003/07/30 14:56:04 markd Exp $
$(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)
-@@ -619,7 +619,7 @@ distclean-tags:
+@@ -621,7 +621,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
@@ -29,7 +29,7 @@ $NetBSD: patch-bv,v 1.3 2003/07/30 14:56:04 markd Exp $
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -769,20 +769,20 @@ noatun_metatag.la.closure: $(noatun_meta
+@@ -770,20 +770,20 @@ noatun_metatag.la.closure: $(noatun_meta
#>+ 3
@@ -57,20 +57,12 @@ $NetBSD: patch-bv,v 1.3 2003/07/30 14:56:04 markd Exp $
#>+ 3
clean-closures:
-@@ -799,7 +799,7 @@ force-reedit:
-
-
- #>+ 11
--noatun_metatag_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metatag.cpp $(srcdir)/edit.cpp metatag.moc edit.moc
-+noatun_metatag_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metatag.cpp $(srcdir)/edit.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; \
-@@ -836,6 +836,6 @@ kde-rpo-clean:
+@@ -836,7 +836,7 @@ kde-rpo-clean:
+ -rm -f *.rpo
#>+ 5
- metatag.o: metatag.moc
--metatag.lo: metatag.moc
++metatag.o: metatag.moc
edit.lo: edit.moc
-+metatag.lo: metatag.moc
+ metatag.lo: metatag.moc
edit.o: edit.moc
+-metatag.o: metatag.moc
diff --git a/audio/kdemultimedia3/patches/patch-bz b/audio/kdemultimedia3/patches/patch-bz
index d725cd43822..4577735dfc0 100644
--- a/audio/kdemultimedia3/patches/patch-bz
+++ b/audio/kdemultimedia3/patches/patch-bz
@@ -1,8 +1,8 @@
-$NetBSD: patch-bz,v 1.2 2003/01/02 09:12:23 skrll Exp $
+$NetBSD: patch-bz,v 1.3 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/net/Makefile.in.orig Sat Dec 28 14:04:00 2002
+--- noatun/modules/net/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300
+++ noatun/modules/net/Makefile.in
-@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_net.la
+@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_net.la
noatun_net_la_SOURCES = net.cpp
noatun_net_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-bz,v 1.2 2003/01/02 09:12:23 skrll Exp $
#>- noatun_net_la_METASOURCES = AUTO
-@@ -307,7 +307,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -397,7 +397,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
@@ -21,10 +21,12 @@ $NetBSD: patch-bz,v 1.2 2003/01/02 09:12:23 skrll Exp $
am_noatun_net_la_OBJECTS = net.lo
#>- noatun_net_la_OBJECTS = $(am_noatun_net_la_OBJECTS)
#>+ 1
-@@ -655,5 +656,5 @@ kde-rpo-clean:
- -rm -f *.rpo
+@@ -612,7 +613,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=net.plugin
++KDE_DIST=Makefile.in.rej net.plugin
+
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- #>+ 3
--net.o: net.moc
- net.lo: net.moc
-+net.o: net.moc
diff --git a/audio/kdemultimedia3/patches/patch-cd b/audio/kdemultimedia3/patches/patch-cd
index 6a6e8ba31bf..56c2910a679 100644
--- a/audio/kdemultimedia3/patches/patch-cd
+++ b/audio/kdemultimedia3/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.5 2003/07/30 14:56:04 markd Exp $
+$NetBSD: patch-cd,v 1.6 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/splitplaylist/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+--- noatun/modules/splitplaylist/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300
+++ noatun/modules/splitplaylist/Makefile.in
-@@ -382,7 +382,7 @@ kde_module_LTLIBRARIES = noatun_splitpla
+@@ -383,7 +383,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.5 2003/07/30 14:56:04 markd Exp $
#>- noatun_splitplaylist_la_METASOURCES = AUTO
-@@ -399,7 +399,7 @@ CONFIG_CLEAN_FILES =
+@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_splitplaylist_la_DEPENDENCIES = \
@@ -20,7 +20,7 @@ $NetBSD: patch-cd,v 1.5 2003/07/30 14:56:04 markd Exp $
am_noatun_splitplaylist_la_OBJECTS = splitplaylist.lo playlist.lo \
view.lo find.lo
#>- noatun_splitplaylist_la_OBJECTS = $(am_noatun_splitplaylist_la_OBJECTS)
-@@ -644,7 +644,7 @@ distclean-tags:
+@@ -646,7 +646,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
@@ -29,60 +29,50 @@ $NetBSD: patch-cd,v 1.5 2003/07/30 14:56:04 markd Exp $
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -797,18 +797,18 @@ noatun_splitplaylist.la.closure: $(noatu
+@@ -798,12 +798,6 @@ noatun_splitplaylist.la.closure: $(noatu
#>+ 3
--view.moc: $(srcdir)/view.h
-- $(MOC) $(srcdir)/view.h -o view.moc
+-playlist.moc: $(srcdir)/playlist.h
+- $(MOC) $(srcdir)/playlist.h -o playlist.moc
-
-#>+ 1
--mocs: view.moc
+-mocs: playlist.moc
-#>+ 3
find.moc: $(srcdir)/find.h
$(MOC) $(srcdir)/find.h -o find.moc
+@@ -816,8 +810,14 @@ view.moc: $(srcdir)/view.h
#>+ 1
- mocs: find.moc
+ mocs: view.moc
#>+ 3
-+view.moc: $(srcdir)/view.h
-+ $(MOC) $(srcdir)/view.h -o view.moc
++playlist.moc: $(srcdir)/playlist.h
++ $(MOC) $(srcdir)/playlist.h -o playlist.moc
+
+#>+ 1
-+mocs: view.moc
++mocs: playlist.moc
+#>+ 3
- playlist.moc: $(srcdir)/playlist.h
- $(MOC) $(srcdir)/playlist.h -o playlist.moc
-
-@@ -816,7 +816,7 @@ playlist.moc: $(srcdir)/playlist.h
- mocs: playlist.moc
- #>+ 3
clean-metasources:
-- -rm -f view.moc find.moc playlist.moc
+- -rm -f playlist.moc find.moc view.moc
+ -rm -f find.moc view.moc playlist.moc
#>+ 3
clean-closures:
-@@ -833,7 +833,7 @@ force-reedit:
+@@ -834,7 +834,7 @@ force-reedit:
#>+ 11
--noatun_splitplaylist_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/splitplaylist.cpp $(srcdir)/playlist.cpp $(srcdir)/view.cpp $(srcdir)/find.cpp view.moc find.moc playlist.moc
+-noatun_splitplaylist_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/splitplaylist.cpp $(srcdir)/playlist.cpp $(srcdir)/view.cpp $(srcdir)/find.cpp playlist.moc find.moc view.moc
+noatun_splitplaylist_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/splitplaylist.cpp $(srcdir)/playlist.cpp $(srcdir)/view.cpp $(srcdir)/find.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; \
-@@ -869,9 +869,9 @@ kde-rpo-clean:
- -rm -f *.rpo
-
+@@ -872,7 +872,7 @@ kde-rpo-clean:
#>+ 7
+ find.o: find.moc
+ playlist.lo: playlist.moc
-find.lo: find.moc
-+find.o: find.moc
-+playlist.lo: playlist.moc
-+view.o: view.moc
+ view.o: view.moc
playlist.o: playlist.moc
+find.lo: find.moc
view.lo: view.moc
--view.o: view.moc
--playlist.lo: playlist.moc
--find.o: find.moc
diff --git a/audio/kdemultimedia3/patches/patch-cf b/audio/kdemultimedia3/patches/patch-cf
index 177b2726c63..18b454c8be7 100644
--- a/audio/kdemultimedia3/patches/patch-cf
+++ b/audio/kdemultimedia3/patches/patch-cf
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf,v 1.5 2003/07/30 14:56:04 markd Exp $
+$NetBSD: patch-cf,v 1.6 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/systray/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+--- noatun/modules/systray/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300
+++ noatun/modules/systray/Makefile.in
-@@ -382,7 +382,7 @@ kde_module_LTLIBRARIES = noatun_systray.
+@@ -383,7 +383,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.5 2003/07/30 14:56:04 markd Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
-@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES =
+@@ -403,7 +403,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_systray_la_DEPENDENCIES = \
@@ -20,68 +20,63 @@ $NetBSD: patch-cf,v 1.5 2003/07/30 14:56:04 markd Exp $
am_noatun_systray_la_OBJECTS = systray.lo noatunui.lo kitsystemtray.lo \
cmodule.lo
#>- noatun_systray_la_OBJECTS = $(am_noatun_systray_la_OBJECTS)
-@@ -631,7 +631,7 @@ distclean-tags:
+@@ -633,7 +633,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
+-KDE_DIST=cr16-action-noatuntraypause.png systray.plugin cr16-action-noatuntraystop.png systrayui.rc cr16-action-noatuntray.png cr16-action-noatuntrayplay.png
+KDE_DIST=cr16-action-noatuntrayplay.png Makefile.in.rej systray.plugin cr16-action-noatuntray.png cr16-action-noatuntraystop.png systrayui.rc cr16-action-noatuntraypause.png
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -784,11 +784,11 @@ noatun_systray.la.closure: $(noatun_syst
-
-
+@@ -791,20 +791,20 @@ cmodule.moc: $(srcdir)/cmodule.h
+ #>+ 1
+ mocs: cmodule.moc
#>+ 3
-kitsystemtray.moc: $(srcdir)/kitsystemtray.h
- $(MOC) $(srcdir)/kitsystemtray.h -o kitsystemtray.moc
-+cmodule.moc: $(srcdir)/cmodule.h
-+ $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
-
- #>+ 1
+-
+-#>+ 1
-mocs: kitsystemtray.moc
-+mocs: cmodule.moc
- #>+ 3
+-#>+ 3
systray.moc: $(srcdir)/systray.h
$(MOC) $(srcdir)/systray.h -o systray.moc
-@@ -796,14 +796,14 @@ systray.moc: $(srcdir)/systray.h
+
#>+ 1
mocs: systray.moc
#>+ 3
--cmodule.moc: $(srcdir)/cmodule.h
-- $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+kitsystemtray.moc: $(srcdir)/kitsystemtray.h
+ $(MOC) $(srcdir)/kitsystemtray.h -o kitsystemtray.moc
-
- #>+ 1
--mocs: cmodule.moc
++
++#>+ 1
+mocs: kitsystemtray.moc
- #>+ 3
++#>+ 3
clean-metasources:
-- -rm -f kitsystemtray.moc systray.moc cmodule.moc
+- -rm -f cmodule.moc kitsystemtray.moc systray.moc
+ -rm -f cmodule.moc systray.moc kitsystemtray.moc
#>+ 3
clean-closures:
-@@ -834,7 +834,7 @@ force-reedit:
+@@ -835,7 +835,7 @@ force-reedit:
#>+ 11
--noatun_systray_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/systray.cpp $(srcdir)/noatunui.cpp $(srcdir)/kitsystemtray.cpp $(srcdir)/cmodule.cpp kitsystemtray.moc systray.moc cmodule.moc
+-noatun_systray_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/systray.cpp $(srcdir)/noatunui.cpp $(srcdir)/kitsystemtray.cpp $(srcdir)/cmodule.cpp cmodule.moc kitsystemtray.moc systray.moc
+noatun_systray_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/systray.cpp $(srcdir)/noatunui.cpp $(srcdir)/kitsystemtray.cpp $(srcdir)/cmodule.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; \
-@@ -870,9 +870,9 @@ kde-rpo-clean:
+@@ -871,9 +871,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
--cmodule.o: cmodule.moc
--kitsystemtray.lo: kitsystemtray.moc
-systray.lo: systray.moc
- kitsystemtray.o: kitsystemtray.moc
- systray.o: systray.moc
-+cmodule.o: cmodule.moc
++kitsystemtray.o: kitsystemtray.moc
++systray.o: systray.moc
+ cmodule.o: cmodule.moc
+-kitsystemtray.lo: kitsystemtray.moc
cmodule.lo: cmodule.moc
+-systray.o: systray.moc
+-kitsystemtray.o: kitsystemtray.moc
+kitsystemtray.lo: kitsystemtray.moc
+systray.lo: systray.moc
diff --git a/audio/kdemultimedia3/patches/patch-ch b/audio/kdemultimedia3/patches/patch-ch
index 2ed1806e78c..6553905a4e7 100644
--- a/audio/kdemultimedia3/patches/patch-ch
+++ b/audio/kdemultimedia3/patches/patch-ch
@@ -1,8 +1,8 @@
-$NetBSD: patch-ch,v 1.2 2003/01/02 09:12:23 skrll Exp $
+$NetBSD: patch-ch,v 1.3 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/voiceprint/Makefile.in.orig Sat Dec 28 14:04:00 2002
+--- noatun/modules/voiceprint/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300
+++ noatun/modules/voiceprint/Makefile.in
-@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_voicepri
+@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatun_voicepri
noatun_voiceprint_la_SOURCES = voiceprint.cpp prefs.cpp
noatun_voiceprint_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-ch,v 1.2 2003/01/02 09:12:23 skrll Exp $
#>- noatun_voiceprint_la_METASOURCES = AUTO
-@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES =
+@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_voiceprint_la_DEPENDENCIES = \
@@ -20,14 +20,59 @@ $NetBSD: patch-ch,v 1.2 2003/01/02 09:12:23 skrll Exp $
am_noatun_voiceprint_la_OBJECTS = voiceprint.lo prefs.lo
#>- noatun_voiceprint_la_OBJECTS = $(am_noatun_voiceprint_la_OBJECTS)
#>+ 4
-@@ -681,7 +681,7 @@ kde-rpo-clean:
+@@ -618,7 +618,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=voiceprint.plugin
++KDE_DIST=voiceprint.plugin Makefile.in.rej
+
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+
+@@ -767,20 +767,20 @@ noatun_voiceprint.la.closure: $(noatun_v
+
+
+ #>+ 3
+-prefs.moc: $(srcdir)/prefs.h
+- $(MOC) $(srcdir)/prefs.h -o prefs.moc
+-
+-#>+ 1
+-mocs: prefs.moc
+-#>+ 3
+ voiceprint.moc: $(srcdir)/voiceprint.h
+ $(MOC) $(srcdir)/voiceprint.h -o voiceprint.moc
+
+ #>+ 1
+ mocs: voiceprint.moc
+ #>+ 3
++prefs.moc: $(srcdir)/prefs.h
++ $(MOC) $(srcdir)/prefs.h -o prefs.moc
++
++#>+ 1
++mocs: prefs.moc
++#>+ 3
+ clean-metasources:
+- -rm -f prefs.moc voiceprint.moc
++ -rm -f voiceprint.moc prefs.moc
+
+ #>+ 3
+ clean-closures:
+@@ -797,7 +797,7 @@ force-reedit:
+
+
+ #>+ 11
+-noatun_voiceprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/voiceprint.cpp $(srcdir)/prefs.cpp prefs.moc voiceprint.moc
++noatun_voiceprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/voiceprint.cpp $(srcdir)/prefs.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; \
+@@ -833,7 +833,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
-prefs.o: prefs.moc
--voiceprint.lo: voiceprint.moc
-voiceprint.o: voiceprint.moc
prefs.lo: prefs.moc
+voiceprint.o: voiceprint.moc
-+voiceprint.lo: voiceprint.moc
+ voiceprint.lo: voiceprint.moc
+prefs.o: prefs.moc
diff --git a/audio/kdemultimedia3/patches/patch-cj b/audio/kdemultimedia3/patches/patch-cj
index 26d9e24e948..ae688d13369 100644
--- a/audio/kdemultimedia3/patches/patch-cj
+++ b/audio/kdemultimedia3/patches/patch-cj
@@ -1,8 +1,8 @@
-$NetBSD: patch-cj,v 1.5 2003/07/30 14:56:05 markd Exp $
+$NetBSD: patch-cj,v 1.6 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/winskin/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+--- noatun/modules/winskin/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300
+++ noatun/modules/winskin/Makefile.in
-@@ -445,7 +445,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar
+@@ -446,7 +446,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar
-module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-cj,v 1.5 2003/07/30 14:56:05 markd Exp $
$(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la
-@@ -457,7 +457,7 @@ CONFIG_CLEAN_FILES =
+@@ -459,7 +459,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_winskin_la_DEPENDENCIES = \
@@ -20,53 +20,53 @@ $NetBSD: patch-cj,v 1.5 2003/07/30 14:56:05 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 \
-@@ -833,7 +833,7 @@ distclean-tags:
+@@ -841,7 +841,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 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=waVolumeSlider.h waIndicator.h waSkinModel.h waSkinMapping.h waSlider.h waBalanceSlider.h waColor.h waButton.h skinMap.h fileInfo.h waWidget.h waSkins.h guiSpectrumAnalyser.h winskin.plugin waDigit.h waSkin.h waJumpSlider.h waMain.h waTitleBar.h waShadeMapping.h waSkinManager.h waLabel.h waClutterbar.h winSkinConfig.h winSkinVis.h waRegion.h waInfo.h waStatus.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 Makefile.in.rej 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)
-@@ -1011,23 +1011,17 @@ noatun_winskin.la.closure: $(noatun_wins
+@@ -1019,65 +1019,65 @@ noatun_winskin.la.closure: $(noatun_wins
#>+ 3
--waClutterbar.moc: $(srcdir)/waClutterbar.h
-- $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc
--
--#>+ 1
--mocs: waClutterbar.moc
--#>+ 3
- waVolumeSlider.moc: $(srcdir)/waVolumeSlider.h
- $(MOC) $(srcdir)/waVolumeSlider.h -o waVolumeSlider.moc
+-waTitleBar.moc: $(srcdir)/waTitleBar.h
+- $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
++waVolumeSlider.moc: $(srcdir)/waVolumeSlider.h
++ $(MOC) $(srcdir)/waVolumeSlider.h -o waVolumeSlider.moc
#>+ 1
- mocs: waVolumeSlider.moc
+-mocs: waTitleBar.moc
++mocs: waVolumeSlider.moc
#>+ 3
--waMain.moc: $(srcdir)/waMain.h
-- $(MOC) $(srcdir)/waMain.h -o waMain.moc
+-waInfo.moc: $(srcdir)/waInfo.h
+- $(MOC) $(srcdir)/waInfo.h -o waInfo.moc
+guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
+ $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
#>+ 1
--mocs: waMain.moc
+-mocs: waInfo.moc
+mocs: guiSpectrumAnalyser.moc
#>+ 3
- winSkinConfig.moc: $(srcdir)/winSkinConfig.h
- $(MOC) $(srcdir)/winSkinConfig.h -o winSkinConfig.moc
-@@ -1035,104 +1029,110 @@ winSkinConfig.moc: $(srcdir)/winSkinConf
+-waDigit.moc: $(srcdir)/waDigit.h
+- $(MOC) $(srcdir)/waDigit.h -o waDigit.moc
++winSkinConfig.moc: $(srcdir)/winSkinConfig.h
++ $(MOC) $(srcdir)/winSkinConfig.h -o winSkinConfig.moc
+
#>+ 1
- mocs: winSkinConfig.moc
+-mocs: waDigit.moc
++mocs: winSkinConfig.moc
#>+ 3
--waWidget.moc: $(srcdir)/waWidget.h
-- $(MOC) $(srcdir)/waWidget.h -o waWidget.moc
+-waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h
+- $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc
+waButton.moc: $(srcdir)/waButton.h
+ $(MOC) $(srcdir)/waButton.h -o waButton.moc
#>+ 1
--mocs: waWidget.moc
+-mocs: waBalanceSlider.moc
+mocs: waButton.moc
#>+ 3
-waSkin.moc: $(srcdir)/waSkin.h
@@ -78,223 +78,223 @@ $NetBSD: patch-cj,v 1.5 2003/07/30 14:56:05 markd Exp $
-mocs: waSkin.moc
+mocs: waInfo.moc
#>+ 3
--waSlider.moc: $(srcdir)/waSlider.h
-- $(MOC) $(srcdir)/waSlider.h -o waSlider.moc
+-waSkinManager.moc: $(srcdir)/waSkinManager.h
+- $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc
+waStatus.moc: $(srcdir)/waStatus.h
+ $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
#>+ 1
--mocs: waSlider.moc
+-mocs: waSkinManager.moc
+mocs: waStatus.moc
#>+ 3
--waLabel.moc: $(srcdir)/waLabel.h
-- $(MOC) $(srcdir)/waLabel.h -o waLabel.moc
+-winSkinVis.moc: $(srcdir)/winSkinVis.h
+- $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc
+waTitleBar.moc: $(srcdir)/waTitleBar.h
+ $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
#>+ 1
--mocs: waLabel.moc
+-mocs: winSkinVis.moc
+mocs: waTitleBar.moc
#>+ 3
--waJumpSlider.moc: $(srcdir)/waJumpSlider.h
-- $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc
+-waSkinModel.moc: $(srcdir)/waSkinModel.h
+- $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc
+waSkin.moc: $(srcdir)/waSkin.h
+ $(MOC) $(srcdir)/waSkin.h -o waSkin.moc
#>+ 1
--mocs: waJumpSlider.moc
+-mocs: waSkinModel.moc
+mocs: waSkin.moc
#>+ 3
--waIndicator.moc: $(srcdir)/waIndicator.h
-- $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
+-waVolumeSlider.moc: $(srcdir)/waVolumeSlider.h
+- $(MOC) $(srcdir)/waVolumeSlider.h -o waVolumeSlider.moc
+waDigit.moc: $(srcdir)/waDigit.h
+ $(MOC) $(srcdir)/waDigit.h -o waDigit.moc
#>+ 1
--mocs: waIndicator.moc
+-mocs: waVolumeSlider.moc
+mocs: waDigit.moc
#>+ 3
--waButton.moc: $(srcdir)/waButton.h
-- $(MOC) $(srcdir)/waButton.h -o waButton.moc
+-winSkinConfig.moc: $(srcdir)/winSkinConfig.h
+- $(MOC) $(srcdir)/winSkinConfig.h -o winSkinConfig.moc
+waWidget.moc: $(srcdir)/waWidget.h
+ $(MOC) $(srcdir)/waWidget.h -o waWidget.moc
#>+ 1
--mocs: waButton.moc
+-mocs: winSkinConfig.moc
+mocs: waWidget.moc
#>+ 3
--guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
-- $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
-+waSlider.moc: $(srcdir)/waSlider.h
-+ $(MOC) $(srcdir)/waSlider.h -o waSlider.moc
-
+ waSlider.moc: $(srcdir)/waSlider.h
+ $(MOC) $(srcdir)/waSlider.h -o waSlider.moc
+@@ -1085,62 +1085,62 @@ waSlider.moc: $(srcdir)/waSlider.h
#>+ 1
--mocs: guiSpectrumAnalyser.moc
-+mocs: waSlider.moc
+ mocs: waSlider.moc
#>+ 3
--waInfo.moc: $(srcdir)/waInfo.h
-- $(MOC) $(srcdir)/waInfo.h -o waInfo.moc
+-guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
+- $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
+waClutterbar.moc: $(srcdir)/waClutterbar.h
+ $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc
#>+ 1
--mocs: waInfo.moc
+-mocs: guiSpectrumAnalyser.moc
+mocs: waClutterbar.moc
#>+ 3
--waDigit.moc: $(srcdir)/waDigit.h
-- $(MOC) $(srcdir)/waDigit.h -o waDigit.moc
+-waLabel.moc: $(srcdir)/waLabel.h
+- $(MOC) $(srcdir)/waLabel.h -o waLabel.moc
+waJumpSlider.moc: $(srcdir)/waJumpSlider.h
+ $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc
#>+ 1
--mocs: waDigit.moc
+-mocs: waLabel.moc
+mocs: waJumpSlider.moc
#>+ 3
--winSkinVis.moc: $(srcdir)/winSkinVis.h
-- $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc
+-waButton.moc: $(srcdir)/waButton.h
+- $(MOC) $(srcdir)/waButton.h -o waButton.moc
+waMain.moc: $(srcdir)/waMain.h
+ $(MOC) $(srcdir)/waMain.h -o waMain.moc
#>+ 1
--mocs: winSkinVis.moc
+-mocs: waButton.moc
+mocs: waMain.moc
#>+ 3
--waSkinModel.moc: $(srcdir)/waSkinModel.h
-- $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc
+-waWidget.moc: $(srcdir)/waWidget.h
+- $(MOC) $(srcdir)/waWidget.h -o waWidget.moc
+waLabel.moc: $(srcdir)/waLabel.h
+ $(MOC) $(srcdir)/waLabel.h -o waLabel.moc
#>+ 1
--mocs: waSkinModel.moc
+-mocs: waWidget.moc
+mocs: waLabel.moc
#>+ 3
--waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h
-- $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc
+-waMain.moc: $(srcdir)/waMain.h
+- $(MOC) $(srcdir)/waMain.h -o waMain.moc
+winSkinVis.moc: $(srcdir)/winSkinVis.h
+ $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc
#>+ 1
--mocs: waBalanceSlider.moc
+-mocs: waMain.moc
+mocs: winSkinVis.moc
#>+ 3
--waTitleBar.moc: $(srcdir)/waTitleBar.h
-- $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
+-waIndicator.moc: $(srcdir)/waIndicator.h
+- $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
+waSkinManager.moc: $(srcdir)/waSkinManager.h
+ $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc
#>+ 1
--mocs: waTitleBar.moc
+-mocs: waIndicator.moc
+mocs: waSkinManager.moc
#>+ 3
--waStatus.moc: $(srcdir)/waStatus.h
-- $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
+-waJumpSlider.moc: $(srcdir)/waJumpSlider.h
+- $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc
+waIndicator.moc: $(srcdir)/waIndicator.h
+ $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
#>+ 1
--mocs: waStatus.moc
+-mocs: waJumpSlider.moc
+mocs: waIndicator.moc
#>+ 3
--waSkinManager.moc: $(srcdir)/waSkinManager.h
-- $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc
+-waStatus.moc: $(srcdir)/waStatus.h
+- $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
+waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h
+ $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc
#>+ 1
--mocs: waSkinManager.moc
+-mocs: waStatus.moc
+mocs: waBalanceSlider.moc
-+#>+ 3
+ #>+ 3
+-waClutterbar.moc: $(srcdir)/waClutterbar.h
+- $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc
+waSkinModel.moc: $(srcdir)/waSkinModel.h
+ $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc
-+
-+#>+ 1
+
+ #>+ 1
+-mocs: waClutterbar.moc
+mocs: waSkinModel.moc
#>+ 3
clean-metasources:
-- -rm -f waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc waButton.moc guiSpectrumAnalyser.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
+- -rm -f waTitleBar.moc waInfo.moc waDigit.moc waBalanceSlider.moc waSkin.moc waSkinManager.moc winSkinVis.moc waSkinModel.moc waVolumeSlider.moc winSkinConfig.moc waSlider.moc guiSpectrumAnalyser.moc waLabel.moc waButton.moc waWidget.moc waMain.moc waIndicator.moc waJumpSlider.moc waStatus.moc waClutterbar.moc
+ -rm -f waVolumeSlider.moc guiSpectrumAnalyser.moc winSkinConfig.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waClutterbar.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waSkinManager.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc
#>+ 4
clean-idl:
-@@ -1154,7 +1154,7 @@ force-reedit:
+@@ -1162,7 +1162,7 @@ force-reedit:
#>+ 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 $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc waIndicator.moc waButton.moc guiSpectrumAnalyser.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.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)/waSkinManager.cpp waSkinManager_skel.cpp waLabel.moc waTitleBar.moc waButton.moc waWidget.moc waInfo.moc waDigit.moc waIndicator.moc waMain.moc waSkin.moc waBalanceSlider.moc waSkinManager.moc waJumpSlider.moc winSkinVis.moc waStatus.moc waSkinModel.moc waVolumeSlider.moc winSkinConfig.moc waSlider.moc waClutterbar.moc guiSpectrumAnalyser.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)/waSkinManager.cpp waSkinManager_skel.cpp waVolumeSlider.moc winSkinConfig.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waClutterbar.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waSkinManager.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; \
-@@ -1190,43 +1190,43 @@ kde-rpo-clean:
+@@ -1198,43 +1198,43 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 41
--waSkin.o: waSkin.moc
--waIndicator.lo: waIndicator.moc
--waInfo.lo: waInfo.moc
--waMain.lo: waMain.moc
--waBalanceSlider.o: waBalanceSlider.moc
--winSkinVis.o: winSkinVis.moc
--winSkinConfig.o: winSkinConfig.moc
--waDigit.lo: waDigit.moc
--waSkinManager.lo: waSkinManager.moc
--waTitleBar.lo: waTitleBar.moc
--guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc
--waInfo.o: waInfo.moc
+-waWidget.o: waWidget.moc
+-waVolumeSlider.lo: waVolumeSlider.moc
-waTitleBar.o: waTitleBar.moc
+-waInfo.o: waInfo.moc
+-waClutterbar.o: waClutterbar.moc
+-waStatus.o: waStatus.moc
+waClutterbar.lo: waClutterbar.moc
waWidget.lo: waWidget.moc
--waButton.lo: waButton.moc
--waButton.o: waButton.moc
+-waInfo.lo: waInfo.moc
+-waMain.o: waMain.moc
+guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc
+guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc
- waClutterbar.o: waClutterbar.moc
--waSkin.lo: waSkin.moc
--waWidget.o: waWidget.moc
--waSkinManager.o: waSkinManager.moc
++waClutterbar.o: waClutterbar.moc
+winSkinConfig.o: winSkinConfig.moc
+waMain.lo: waMain.moc
-+winSkinConfig.lo: winSkinConfig.moc
-+waSkinManager.lo: waSkinManager.moc
-+waBalanceSlider.o: waBalanceSlider.moc
+ winSkinConfig.lo: winSkinConfig.moc
+ waSkinManager.lo: waSkinManager.moc
+-waSkin.lo: waSkin.moc
+-waStatus.lo: waStatus.moc
+-waIndicator.lo: waIndicator.moc
+-winSkinVis.lo: winSkinVis.moc
+-waSlider.lo: waSlider.moc
+-winSkinConfig.o: winSkinConfig.moc
+-waBalanceSlider.lo: waBalanceSlider.moc
+-waDigit.lo: waDigit.moc
+-waDigit.o: waDigit.moc
+-guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc
+-waVolumeSlider.o: waVolumeSlider.moc
+ waBalanceSlider.o: waBalanceSlider.moc
+-waSkinManager.o: waSkinManager.moc
+-waIndicator.o: waIndicator.moc
+waInfo.lo: waInfo.moc
-+waSkinModel.lo: waSkinModel.moc
- waDigit.o: waDigit.moc
+ waSkinModel.lo: waSkinModel.moc
+-waButton.lo: waButton.moc
+-waButton.o: waButton.moc
+-waClutterbar.lo: waClutterbar.moc
+-waJumpSlider.o: waJumpSlider.moc
++waDigit.o: waDigit.moc
+waIndicator.lo: waIndicator.moc
+winSkinVis.o: winSkinVis.moc
- waStatus.o: waStatus.moc
--guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc
--waJumpSlider.o: waJumpSlider.moc
--waClutterbar.lo: waClutterbar.moc
-+waJumpSlider.lo: waJumpSlider.moc
-+waLabel.o: waLabel.moc
- waSlider.o: waSlider.moc
--waBalanceSlider.lo: waBalanceSlider.moc
++waStatus.o: waStatus.moc
+ waJumpSlider.lo: waJumpSlider.moc
+-waLabel.lo: waLabel.moc
+ waLabel.o: waLabel.moc
++waSlider.o: waSlider.moc
+waWidget.o: waWidget.moc
+waButton.lo: waButton.moc
- waMain.o: waMain.moc
++waMain.o: waMain.moc
+waInfo.o: waInfo.moc
+waDigit.lo: waDigit.moc
-+waSkinModel.o: waSkinModel.moc
+ waSkinModel.o: waSkinModel.moc
+waSkin.lo: waSkin.moc
+winSkinVis.lo: winSkinVis.moc
-+waTitleBar.lo: waTitleBar.moc
- waVolumeSlider.lo: waVolumeSlider.moc
--waJumpSlider.lo: waJumpSlider.moc
--waSlider.lo: waSlider.moc
- waIndicator.o: waIndicator.moc
--waSkinModel.lo: waSkinModel.moc
+ waTitleBar.lo: waTitleBar.moc
+-guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc
+-winSkinVis.o: winSkinVis.moc
+-waMain.lo: waMain.moc
+-waSlider.o: waSlider.moc
++waVolumeSlider.lo: waVolumeSlider.moc
++waIndicator.o: waIndicator.moc
+waJumpSlider.o: waJumpSlider.moc
+waBalanceSlider.lo: waBalanceSlider.moc
-+waSkin.o: waSkin.moc
+ waSkin.o: waSkin.moc
+waVolumeSlider.o: waVolumeSlider.moc
- waStatus.lo: waStatus.moc
--winSkinVis.lo: winSkinVis.moc
- waLabel.lo: waLabel.moc
--waLabel.o: waLabel.moc
--winSkinConfig.lo: winSkinConfig.moc
--waVolumeSlider.o: waVolumeSlider.moc
--waSkinModel.o: waSkinModel.moc
++waStatus.lo: waStatus.moc
++waLabel.lo: waLabel.moc
+waSkinManager.o: waSkinManager.moc
+waTitleBar.o: waTitleBar.moc
+waSlider.lo: waSlider.moc
diff --git a/audio/kdemultimedia3/patches/patch-cn b/audio/kdemultimedia3/patches/patch-cn
index 11306d97ee2..9ddef67a923 100644
--- a/audio/kdemultimedia3/patches/patch-cn
+++ b/audio/kdemultimedia3/patches/patch-cn
@@ -1,8 +1,8 @@
-$NetBSD: patch-cn,v 1.4 2003/05/22 03:05:42 markd Exp $
+$NetBSD: patch-cn,v 1.5 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/artseffects/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/artseffects/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/modules/artseffects/Makefile.in
-@@ -383,7 +383,7 @@ libartseffects_la_SOURCES = artseffects.
+@@ -385,7 +385,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.4 2003/05/22 03:05:42 markd Exp $
mcoptypedir = $(libdir)/mcop
mcoptype_DATA = artseffects.mcoptype artseffects.mcopclass
-@@ -396,7 +396,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -399,7 +399,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -21,12 +21,12 @@ $NetBSD: patch-cn,v 1.4 2003/05/22 03:05:42 markd Exp $
am_libartseffects_la_OBJECTS = artseffects.lo extrastereo_impl.lo
#>- libartseffects_la_OBJECTS = $(am_libartseffects_la_OBJECTS)
#>+ 4
-@@ -635,7 +636,7 @@ distclean-tags:
+@@ -638,7 +639,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
-+KDE_DIST=effect.cpp ExtraStereo.mcopclass artseffects.idl artseffects.mcoptype artseffects.h ExtraStereoGuiFactory.mcopclass RawWriter.mcopclass artseffects.mcopclass VoiceRemoval.mcopclass extrastereogui_impl.cc extrastereogui_impl.h
+-KDE_DIST=artseffects.mcoptype extrastereogui_impl.h RawWriter.mcopclass artseffects.mcopclass extrastereogui_impl.cc ExtraStereoGuiFactory.mcopclass effect.cpp VoiceRemoval.mcopclass artseffects.idl artseffects.h ExtraStereo.mcopclass
++KDE_DIST=effect.cpp ExtraStereo.mcopclass artseffects.idl Makefile.in.rej artseffects.mcoptype artseffects.h ExtraStereoGuiFactory.mcopclass RawWriter.mcopclass artseffects.mcopclass VoiceRemoval.mcopclass extrastereogui_impl.cc extrastereogui_impl.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
diff --git a/audio/kdemultimedia3/patches/patch-cq b/audio/kdemultimedia3/patches/patch-cq
index d396631af06..9973d4c1f03 100644
--- a/audio/kdemultimedia3/patches/patch-cq
+++ b/audio/kdemultimedia3/patches/patch-cq
@@ -1,8 +1,8 @@
-$NetBSD: patch-cq,v 1.3 2003/07/30 14:56:05 markd Exp $
+$NetBSD: patch-cq,v 1.4 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/simple/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+--- noatun/modules/simple/Makefile.in.orig 2003-12-29 11:29:40.000000000 +1300
+++ noatun/modules/simple/Makefile.in
-@@ -384,7 +384,7 @@ kde_module_LTLIBRARIES = noatunsimple.la
+@@ -385,7 +385,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.3 2003/07/30 14:56:05 markd Exp $
$(top_builddir)/noatun/library/libnoatuncontrols.la \
-lkmedia2_idl -lsoundserver_idl -lartskde
-@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES =
+@@ -403,7 +403,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatunsimple_la_DEPENDENCIES = \
@@ -20,31 +20,20 @@ $NetBSD: patch-cq,v 1.3 2003/07/30 14:56:05 markd Exp $
$(top_builddir)/noatun/library/libnoatuncontrols.la
am_noatunsimple_la_OBJECTS = noatunui.lo userinterface.lo
#>- noatunsimple_la_OBJECTS = $(am_noatunsimple_la_OBJECTS)
-@@ -625,7 +625,7 @@ distclean-tags:
+@@ -627,7 +627,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 playlist.xpm forward.xpm volume.xpm stop.xpm
+-KDE_DIST=propertiesdialog.ui.h back.xpm forward.xpm simple.plugin pause.xpm playlist.xpm stop.xpm volume.xpm propertiesdialog.ui play.xpm
+KDE_DIST=pause.xpm stop.xpm back.xpm propertiesdialog.ui.h simple.plugin Makefile.in.rej playlist.xpm forward.xpm volume.xpm propertiesdialog.ui play.xpm
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -819,7 +819,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 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; \
-@@ -855,7 +855,7 @@ kde-rpo-clean:
- -rm -f *.rpo
+@@ -857,6 +857,6 @@ kde-rpo-clean:
#>+ 5
--userinterface.o: userinterface.moc
-+$(srcdir)/noatunui.cpp: propertiesdialog.h
+ $(srcdir)/noatunui.cpp: propertiesdialog.h
+-userinterface.lo: userinterface.moc
$(srcdir)/userinterface.cpp: propertiesdialog.h
-+userinterface.o: userinterface.moc
- userinterface.lo: userinterface.moc
--$(srcdir)/noatunui.cpp: propertiesdialog.h
+ userinterface.o: userinterface.moc
++userinterface.lo: userinterface.moc
diff --git a/audio/kdemultimedia3/patches/patch-bh b/audio/kdemultimedia3/patches/patch-da
index a9a35db62fd..ef13b8d41d9 100644
--- a/audio/kdemultimedia3/patches/patch-bh
+++ b/audio/kdemultimedia3/patches/patch-da
@@ -1,8 +1,8 @@
-$NetBSD: patch-bh,v 1.4 2003/05/22 03:05:41 markd Exp $
+$NetBSD: patch-da,v 1.1 2004/01/15 10:30:03 markd Exp $
---- noatun/modules/excellent/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/excellent/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300
+++ noatun/modules/excellent/Makefile.in
-@@ -384,7 +384,7 @@ noatun_excellent_la_SOURCES = noatunui.c
+@@ -386,7 +386,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.4 2003/05/22 03:05:41 markd Exp $
$(top_builddir)/noatun/library/libnoatuncontrols.la \
-lqtmcop -lkmedia2_idl -lsoundserver_idl
-@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES =
+@@ -404,7 +404,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_excellent_la_DEPENDENCIES = \
@@ -20,12 +20,12 @@ $NetBSD: patch-bh,v 1.4 2003/05/22 03:05:41 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)
-@@ -625,7 +625,7 @@ distclean-tags:
+@@ -628,7 +628,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
-+KDE_DIST=excellent.plugin excellentui.rc
+-KDE_DIST=excellent.plugin excellentui.rc
++KDE_DIST=Makefile.in.rej excellent.plugin excellentui.rc
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-13 05:16:28 +0000