summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2003-07-30 14:55:59 +0000
committermarkd <markd@pkgsrc.org>2003-07-30 14:55:59 +0000
commit7300249f3cd0d9055980ad6d4138fbb50e48e522 (patch)
tree43bf9796e1d44d8b8574a58124a6cede9ddee7c2 /audio
parentdc987ce281fcb0dcc4e2859c76baa24d6eb88b73 (diff)
downloadpkgsrc-7300249f3cd0d9055980ad6d4138fbb50e48e522.tar.gz
Update kdemultimedia to 3.1.3.
Changes: * kscd: add method to determine if KsCD is playing * noatun: memory leak and memory corruption fixes * noatun: Add volume slider for "simple" module * artsbuilder: fix several corruptsions and other crashes
Diffstat (limited to 'audio')
-rw-r--r--audio/kdemultimedia3/Makefile11
-rw-r--r--audio/kdemultimedia3/PLIST25
-rw-r--r--audio/kdemultimedia3/distinfo28
-rw-r--r--audio/kdemultimedia3/patches/patch-ac58
-rw-r--r--audio/kdemultimedia3/patches/patch-ak70
-rw-r--r--audio/kdemultimedia3/patches/patch-bb54
-rw-r--r--audio/kdemultimedia3/patches/patch-bl33
-rw-r--r--audio/kdemultimedia3/patches/patch-bn28
-rw-r--r--audio/kdemultimedia3/patches/patch-br30
-rw-r--r--audio/kdemultimedia3/patches/patch-bv29
-rw-r--r--audio/kdemultimedia3/patches/patch-cd26
-rw-r--r--audio/kdemultimedia3/patches/patch-cf28
-rw-r--r--audio/kdemultimedia3/patches/patch-cj83
-rw-r--r--audio/kdemultimedia3/patches/patch-cq18
14 files changed, 345 insertions, 176 deletions
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index 045dfd52c65..21ddda1bc05 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2003/07/14 08:22:09 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2003/07/30 14:55:59 markd Exp $
-DISTNAME= kdemultimedia-3.1.2
-PKGREVISION= 2
+DISTNAME= kdemultimedia-3.1.3
CATEGORIES= audio
COMMENT= Audio tools for the KDE integrated X11 desktop
-.include "../../x11/kde3/Makefile.kde3"
+.include "../../meta-pkgs/kde3/Makefile.kde3"
DEPENDS+= xanim>=2.80.0:../../graphics/xanim
@@ -34,11 +33,11 @@ FOO_MAIN_FILES= \
kmix/kmixctrl_main.cpp \
noatun/noatun_main.cpp
-.include "../../x11/kde3/Makefile.foo_main"
+.include "../../meta-pkgs/kde3/Makefile.foo_main"
.include "../../audio/arts/buildlink2.mk"
.include "../../graphics/xine-lib/buildlink2.mk"
-.include "../../x11/kde3/buildlink2.mk"
+.include "../../meta-pkgs/kde3/buildlink2.mk"
.include "../../x11/kdebase3/buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/ossaudio.buildlink2.mk"
diff --git a/audio/kdemultimedia3/PLIST b/audio/kdemultimedia3/PLIST
index 181842490e9..f2988f8da51 100644
--- a/audio/kdemultimedia3/PLIST
+++ b/audio/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/04/09 13:45:17 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/07/30 14:55:59 markd Exp $
bin/aktion
bin/artsbuilder
bin/artscontrol
@@ -1008,6 +1008,7 @@ share/kde/mimelnk/audio/x-karaoke.desktop
share/kde/mimelnk/interface/x-winamp-skin.desktop
share/kde/mimelnk/text/xmcd.desktop
share/kde/services/kaboodle_component.desktop
+share/kde/services/kaboodleengine.desktop
share/kde/services/kfile_au.desktop
share/kde/services/kfile_avi.desktop
share/kde/services/kfile_m3u.desktop
@@ -1057,28 +1058,6 @@ share/kde/servicetypes/audiomidi.desktop
@dirrm share/kde/apps/noatun/eq.preset
@dirrm share/kde/apps/noatun
@dirrm share/kde/apps/kscd/pics
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/soundtrack
-@dirrm share/kde/apps/kscd/cddb/soundtrack
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/rock
-@dirrm share/kde/apps/kscd/cddb/rock
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/reggae
-@dirrm share/kde/apps/kscd/cddb/reggae
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/newage
-@dirrm share/kde/apps/kscd/cddb/newage
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/misc
-@dirrm share/kde/apps/kscd/cddb/misc
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/jazz
-@dirrm share/kde/apps/kscd/cddb/jazz
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/folk
-@dirrm share/kde/apps/kscd/cddb/folk
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/data
-@dirrm share/kde/apps/kscd/cddb/data
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/country
-@dirrm share/kde/apps/kscd/cddb/country
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/classical
-@dirrm share/kde/apps/kscd/cddb/classical
-@exec ${MKDIR} %D/share/kde/apps/kscd/cddb/blues
-@dirrm share/kde/apps/kscd/cddb/blues
@dirrm share/kde/apps/kscd
@dirrm share/kde/apps/krec/icons/crystalsvg/32x32/mimetypes
@dirrm share/kde/apps/krec/icons/crystalsvg/32x32/actions
diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index ba6ac12bc86..c3c5f1da457 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1,22 +1,22 @@
-$NetBSD: distinfo,v 1.18 2003/07/13 11:43:39 wulf Exp $
+$NetBSD: distinfo,v 1.19 2003/07/30 14:56:00 markd Exp $
-SHA1 (kdemultimedia-3.1.2.tar.bz2) = eb37e8224c4ce59d53d3b9eae37a38e82972e05b
-Size (kdemultimedia-3.1.2.tar.bz2) = 5927084 bytes
+SHA1 (kdemultimedia-3.1.3.tar.bz2) = cf7b5e4d08c7ca2071315fba532eac6ebdfe6601
+Size (kdemultimedia-3.1.3.tar.bz2) = 5932079 bytes
SHA1 (patch-aa) = 90e7cc0a6a505a2c69b25eadf5ca9050afd8afd0
SHA1 (patch-ab) = 4f022376559ea30fee9f88aebb65d7f2b89c6c25
-SHA1 (patch-ac) = 4dc3d78f992089c88687244140f02d880ae973b0
+SHA1 (patch-ac) = 3daad6de448c274d7832842aff04c7fb9625263d
SHA1 (patch-ae) = 17fdcfa2d0861bf53404d7ce315a2a315a68a459
SHA1 (patch-af) = 95bf9890b803b49e102d4248c0fbd52427a8c6c0
SHA1 (patch-ag) = 69b25f891e96f470282140a031eb34a7352aeefe
SHA1 (patch-aj) = 0b6ac2ade3559a34b54d171aace55af64caa376b
-SHA1 (patch-ak) = 2fe3866f2700869fb70386c2b6ce8452464c9379
+SHA1 (patch-ak) = 7f43d0915bb65a506e42d8bdc2c59eeb1920f8ad
SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa
SHA1 (patch-ao) = a31e51c87c76664188515fd1640608cef3a33927
SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472
SHA1 (patch-ay) = 2ce3604aef6a9d79b58fda7e969f79d3e48b6ce8
SHA1 (patch-az) = 5b6bbc2382ee7381f756065576602697453a8303
SHA1 (patch-ba) = 5a096a6639867541b8ad11baa798b1ba8c856e10
-SHA1 (patch-bb) = 9d7a0443ded398e3d8357610716643ebcb7f2c9d
+SHA1 (patch-bb) = 0ad79b0a9f79fc2a822dab4f670dbe89b0cb1d6d
SHA1 (patch-bc) = 82424e524f316f55524c5367ce42fe4194f935c6
SHA1 (patch-bd) = 7cd66c4d019bb2c944ae94fd9b600d9131797047
SHA1 (patch-be) = 5cee048125a71eb5a1358966c0a61c4553eff24c
@@ -26,17 +26,17 @@ SHA1 (patch-bh) = 7098211c3bde4e695cbc2d71454312ca2cf6f4b4
SHA1 (patch-bi) = 92fd0e6d2883d715b49e32c28dcdcfa23272b78e
SHA1 (patch-bj) = 160aebbe402d7ecfc91a22717a3a3813be0c29e9
SHA1 (patch-bk) = e594440c63e8038b660dcd75e89f61c6cf62a766
-SHA1 (patch-bl) = 6d2f6026fb233b43352d53acc7c82ec699cc6337
+SHA1 (patch-bl) = 408edc055cd0bc4b1aea6ae37f6c367c4cfe2652
SHA1 (patch-bm) = a50a8d722ebc48fce19d7052749795efbe543303
-SHA1 (patch-bn) = 43fd7a739f5733c27295267d8fd0c5473b831d94
+SHA1 (patch-bn) = 606b92c31d475b81db00f8b009ae568c900653b0
SHA1 (patch-bo) = b67167bfe6e9810208f1f74d3e3fea2ddfb32f88
SHA1 (patch-bp) = b59ce7619ea0bdfdd375cf5691650026ef27e176
SHA1 (patch-bq) = 996c97dd2da67b481cf5101a220e35850009abc8
-SHA1 (patch-br) = 1bf20994151774f13b96f4502b1a583b87d9db23
+SHA1 (patch-br) = 57cfac7398a59ab663f10eb478a6b8f65d28994b
SHA1 (patch-bs) = fb23d5297589b87946642bfbfd857c04f81027e3
SHA1 (patch-bt) = b59041f0f87e2b92e8838f9868e5d33ae97fa689
SHA1 (patch-bu) = 6e183a9c5caf7641304efdb409ac414de4b88947
-SHA1 (patch-bv) = 97e804f6968eed8a5be467457a69a9921599d1a0
+SHA1 (patch-bv) = 3c3fb414627ad6fed3028ca7e0babe7dcfce4953
SHA1 (patch-bw) = a28609eb68746f45013dae50556fb19829f890f4
SHA1 (patch-bx) = a53f70f46fbb61c25b60494ec5f60942b87e49a7
SHA1 (patch-by) = e451c595628e500f86085744798af78ef70c28df
@@ -44,16 +44,16 @@ SHA1 (patch-bz) = 1f24fa478f7f7544719e04a427d4d61a0eef9f1e
SHA1 (patch-ca) = a1fedc7a4a507e71b0e6fff34056e414b7f119c7
SHA1 (patch-cb) = 3a82b1fc52e8e32fb99e7427e24bd497ad323334
SHA1 (patch-cc) = af970c41d730fe1b7e2403942ab39746b3b0e2af
-SHA1 (patch-cd) = 34759bc7ec13df4d915fe902d23dbadac9b52a45
+SHA1 (patch-cd) = 82ea75f6ee917936506e4dd703b5eda73d48d5e0
SHA1 (patch-ce) = 4f2c176ef04efa22ae034c5c5bd85eab329e187b
-SHA1 (patch-cf) = 4bbc5e2eb01bd71e354d43cc92fb38e0b125c3c8
+SHA1 (patch-cf) = cb13c0c77a22586871764c69f8914cb0ea644b84
SHA1 (patch-cg) = 0e7f0cdcd55a06bc60c5c617f9ad33201bda1f9d
SHA1 (patch-ch) = 78d86400c2b4d51fe1363ccc770b4cbab56b45eb
SHA1 (patch-ci) = 905b15e9e8de4954174dab769b3a2c634b094288
-SHA1 (patch-cj) = 51f7a4369abfa7f76021951f86f8c070a2e0878c
+SHA1 (patch-cj) = 002687434b44b1d78528ad49d454311dd118a2e4
SHA1 (patch-cm) = 2d539df6011c977c0b984233f45b99eeb838e7b3
SHA1 (patch-cn) = 2f063015327d40d77b764397819db9260152407b
SHA1 (patch-co) = b484ad7c770a3bd9554051af64e2545fac5a677f
SHA1 (patch-cp) = 8b16a472b150d54810c09126a01723d9a9d9f0d5
-SHA1 (patch-cq) = 19783ae56e3d894d4c2d08a3a44260e8c7e9fd54
+SHA1 (patch-cq) = ad009ff763b321eaa07c8e23a9ad386040c4e897
SHA1 (patch-cr) = 6159763aaf0ae2b738e31c06ada0da5c47d0692c
diff --git a/audio/kdemultimedia3/patches/patch-ac b/audio/kdemultimedia3/patches/patch-ac
index afab1ec7e7b..4bad02a3d27 100644
--- a/audio/kdemultimedia3/patches/patch-ac
+++ b/audio/kdemultimedia3/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 markd Exp $
+$NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
---- kaboodle/Makefile.in.orig Thu May 8 00:05:27 2003
+--- kaboodle/Makefile.in.orig 2003-07-15 22:13:57.000000000 +1200
+++ kaboodle/Makefile.in
-@@ -379,7 +379,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
+@@ -380,7 +380,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
SUBDIRS = pics actions
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 markd Exp $
kde_module_LTLIBRARIES = libkaboodlepart.la
-@@ -394,24 +394,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \
+@@ -395,24 +395,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.4 2003/05/22 03:05:40 markd Exp $
applnk_DATA = kaboodle.desktop
applnkdir = $(kde_appsdir)/Multimedia
-@@ -424,14 +426,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -425,14 +427,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.4 2003/05/22 03:05:40 markd Exp $
libkaboodlepart_la_DEPENDENCIES =
am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \
kaboodle_factory.lo player.lo view.lo
-@@ -445,31 +452,37 @@ libkaboodlepart_la_nofinal_OBJECTS = con
+@@ -446,31 +453,37 @@ libkaboodlepart_la_nofinal_OBJECTS = con
bin_PROGRAMS = kaboodle$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -116,7 +116,7 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 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
-@@ -492,8 +505,8 @@ CXXLD = $(CXX)
+@@ -493,8 +506,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.4 2003/05/22 03:05:40 markd Exp $
DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA)
-@@ -504,7 +517,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -505,7 +518,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.4 2003/05/22 03:05:40 markd Exp $
#>- all: all-recursive
#>+ 1
-@@ -579,6 +592,8 @@ clean-libLTLIBRARIES:
+@@ -580,6 +593,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.4 2003/05/22 03:05:40 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)
-@@ -625,9 +640,10 @@ distclean-compile:
+@@ -626,9 +641,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,7 +157,7 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 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@
-@@ -853,7 +869,7 @@ distclean-tags:
+@@ -854,7 +870,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
@@ -166,7 +166,7 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 markd Exp $
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -927,7 +943,6 @@ install-strip:
+@@ -928,7 +944,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
@@ -174,7 +174,7 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 markd Exp $
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -1023,9 +1038,6 @@ uninstall-info: uninstall-info-recursive
+@@ -1024,9 +1039,6 @@ uninstall-info: uninstall-info-recursive
uninstall-libLTLIBRARIES uninstall-recursive
@@ -184,53 +184,75 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 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
-@@ -1046,40 +1058,40 @@ libkaboodlepart.la.closure: $(libkaboodl
+@@ -1047,23 +1059,17 @@ libkaboodlepart.la.closure: $(libkaboodl
#>+ 3
-engine.moc: $(srcdir)/engine.h
- $(MOC) $(srcdir)/engine.h -o engine.moc
-
+-#>+ 1
+-mocs: engine.moc
-#>+ 3
view.moc: $(srcdir)/view.h
$(MOC) $(srcdir)/view.h -o view.moc
+ #>+ 1
+ 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
+ #>+ 1
+-mocs: userinterface.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
+ #>+ 1
+ mocs: kaboodleapp.moc
#>+ 3
+userinterface.moc: $(srcdir)/userinterface.h
+ $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
+
++#>+ 1
++mocs: userinterface.moc
+#>+ 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
+ #>+ 1
+-mocs: controls.moc
++mocs: player.moc
#>+ 3
-conf.moc: $(srcdir)/conf.h
- $(MOC) $(srcdir)/conf.h -o conf.moc
+engine.moc: $(srcdir)/engine.h
+ $(MOC) $(srcdir)/engine.h -o engine.moc
+ #>+ 1
+-mocs: conf.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
@@ -238,7 +260,7 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 markd Exp $
#>+ 3
clean-closures:
-@@ -1096,19 +1108,19 @@ force-reedit:
+@@ -1113,19 +1125,19 @@ force-reedit:
#>+ 11
@@ -267,7 +289,7 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 markd Exp $
@echo 'creating libkaboodlepart_la.all_cpp.cpp ...'; \
rm -f libkaboodlepart_la.all_cpp.files libkaboodlepart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkaboodlepart_la.all_cpp.final; \
-@@ -1121,20 +1133,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir
+@@ -1138,20 +1150,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir
#>+ 3
clean-final:
@@ -293,7 +315,7 @@ $NetBSD: patch-ac,v 1.4 2003/05/22 03:05:40 markd Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1144,19 +1156,19 @@ kde-rpo-clean:
+@@ -1161,19 +1173,19 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 17
diff --git a/audio/kdemultimedia3/patches/patch-ak b/audio/kdemultimedia3/patches/patch-ak
index 6e4bb26881d..8dc68a5aee9 100644
--- a/audio/kdemultimedia3/patches/patch-ak
+++ b/audio/kdemultimedia3/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.5 2003/05/22 03:05:40 markd Exp $
+$NetBSD: patch-ak,v 1.6 2003/07/30 14:56:02 markd Exp $
---- kmix/Makefile.in.orig Thu May 8 00:05:28 2003
+--- kmix/Makefile.in.orig 2003-07-15 22:13:58.000000000 +1200
+++ kmix/Makefile.in
-@@ -379,7 +379,7 @@ SUBDIRS = control pics
+@@ -380,7 +380,7 @@ SUBDIRS = control pics
INCLUDES = $(all_includes)
bin_PROGRAMS = kmix kmixctrl
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 03:05:40 markd Exp $
kde_module_LTLIBRARIES = kmix_panelapplet.la
noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \
-@@ -388,29 +388,37 @@ noinst_HEADERS = kmix.h kmixdockwidget.h
+@@ -389,29 +389,37 @@ noinst_HEADERS = kmix.h kmixdockwidget.h
#>- METASOURCES = AUTO
@@ -59,7 +59,7 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 03:05:40 markd Exp $
kmixctrl_LDFLAGS = $(all_libraries) $(KDE_RPATH)
#>- kmix_panelapplet_la_SOURCES = kmixapplet.cpp kmixerwidget.cpp channel.cpp \
-@@ -443,18 +451,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -444,18 +452,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.5 2003/05/22 03:05:40 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 \
-@@ -467,46 +468,73 @@ kmix_panelapplet_la_nofinal_OBJECTS = km
+@@ -468,46 +469,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.5 2003/05/22 03:05:40 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 \
-@@ -514,9 +542,12 @@ am__depfiles_maybe = depfiles
+@@ -515,9 +543,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.5 2003/05/22 03:05:40 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 \
-@@ -543,7 +574,9 @@ CXXLD = $(CXX)
+@@ -544,7 +575,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.5 2003/05/22 03:05:40 markd Exp $
DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA)
HEADERS = $(noinst_HEADERS)
-@@ -556,7 +589,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -557,7 +590,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.5 2003/05/22 03:05:40 markd Exp $
#>- all: all-recursive
#>+ 1
-@@ -638,6 +671,10 @@ kmix.la: $(kmix_la_OBJECTS) $(kmix_la_DE
+@@ -639,6 +672,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.5 2003/05/22 03:05:40 markd Exp $
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -682,11 +719,14 @@ distclean-compile:
+@@ -683,11 +720,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.5 2003/05/22 03:05:40 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@
-@@ -933,7 +973,7 @@ distclean-tags:
+@@ -934,7 +974,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_alsa9.cpp colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h mixer_irix.h mixer_hpux.cpp kmixui.rc kmixctrl_restore.desktop resource.h mixer_oss.cpp mixer_irix.cpp mixer_sun.h mixer_alsa5.cpp mixer_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h kmixapplet.desktop mixer_alsa.h
++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)
-@@ -1108,54 +1148,51 @@ $(srcdir)/version.h: VERSION
+@@ -1109,37 +1149,34 @@ $(srcdir)/version.h: VERSION
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kmix.pot
@@ -262,71 +262,99 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 03:05:40 markd Exp $
-#>+ 5
-mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES)
-- $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; /bin/false )
+- $(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
+kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
+ $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
++#>+ 1
++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
+ #>+ 1
+-mocs: ksmallslider.moc
++mocs: mixdevicewidget.moc
#>+ 3
-kmixapplet.moc: $(srcdir)/kmixapplet.h
- $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
+ksmallslider.moc: $(srcdir)/ksmallslider.h
+ $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc
+ #>+ 1
+-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
+ #>+ 1
+-mocs: kmix.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
+ #>+ 1
+ mocs: mixer.moc
#>+ 3
-kmixerwidget.moc: $(srcdir)/kmixerwidget.h
- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
+kmix.moc: $(srcdir)/kmix.h
+ $(MOC) $(srcdir)/kmix.h -o kmix.moc
+ #>+ 1
+-mocs: kmixerwidget.moc
++mocs: kmix.moc
#>+ 3
-kledbutton.moc: $(srcdir)/kledbutton.h
- $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc
+kmixapplet.moc: $(srcdir)/kmixapplet.h
+ $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
+ #>+ 1
+-mocs: kledbutton.moc
++mocs: kmixapplet.moc
#>+ 3
-kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
- $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
+kledbutton.moc: $(srcdir)/kledbutton.h
+ $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc
+ #>+ 1
+-mocs: kmixdockwidget.moc
++mocs: kledbutton.moc
#>+ 3
-mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
- $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
+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
++mocs: kmixerwidget.moc
+#>+ 5
+mixerIface.kidl: $(srcdir)/mixerIface.h $(DCOP_DEPENDENCIES)
-+ $(DCOPIDL) $(srcdir)/mixerIface.h > mixerIface.kidl || ( rm -f mixerIface.kidl ; /bin/false )
++ $(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)
-@@ -1183,7 +1220,7 @@ colorwidget.moc: colorwidget.h
+ @echo "int main() {return 0;}" > kmix_panelapplet_la_closure.cpp
+@@ -1202,7 +1239,7 @@ colorwidget.moc: colorwidget.h
#>+ 3
clean-metasources:
@@ -335,7 +363,7 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 03:05:40 markd Exp $
#>+ 6
clean-idl:
-@@ -1212,19 +1249,7 @@ force-reedit:
+@@ -1231,19 +1268,7 @@ force-reedit:
#>+ 11
@@ -356,7 +384,7 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 03:05:40 markd Exp $
@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; \
-@@ -1236,33 +1261,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi
+@@ -1255,33 +1280,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi
rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files
#>+ 11
@@ -415,7 +443,7 @@ $NetBSD: patch-ak,v 1.5 2003/05/22 03:05:40 markd Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1272,30 +1309,30 @@ kde-rpo-clean:
+@@ -1291,30 +1328,30 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 28
diff --git a/audio/kdemultimedia3/patches/patch-bb b/audio/kdemultimedia3/patches/patch-bb
index f3546fe4a48..4802bc6f4bf 100644
--- a/audio/kdemultimedia3/patches/patch-bb
+++ b/audio/kdemultimedia3/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
+$NetBSD: patch-bb,v 1.7 2003/07/30 14:56:03 markd Exp $
---- noatun/library/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/library/Makefile.in.orig 2003-07-15 22:13:59.000000000 +1200
+++ noatun/library/Makefile.in
-@@ -387,9 +387,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
+@@ -388,9 +388,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar
SUBDIRS = noatunarts noatun . noatuntags
@@ -14,7 +14,7 @@ $NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
playlist.cpp pref.cpp \
player.cpp playlistsaver.cpp app.cpp \
pluginloader.cpp plugin.cpp \
-@@ -402,15 +402,15 @@ libnoatun_la_SOURCES = pluginmodule.cpp
+@@ -403,15 +403,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.6 2003/05/22 03:05:41 markd Exp $
-lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIBPNG)
-@@ -432,27 +432,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -433,27 +433,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -70,7 +70,7 @@ $NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
libnoatuncontrols_la_DEPENDENCIES =
am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo
#>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS)
-@@ -492,7 +493,7 @@ am__depfiles_maybe = depfiles
+@@ -493,7 +494,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.6 2003/05/22 03:05:41 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 \
-@@ -545,8 +546,8 @@ CXXLD = $(CXX)
+@@ -546,8 +547,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.6 2003/05/22 03:05:41 markd Exp $
DATA = $(magictable_DATA)
HEADERS = $(include_HEADERS)
-@@ -559,7 +560,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -560,7 +561,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.6 2003/05/22 03:05:41 markd Exp $
#>- all: all-recursive
#>+ 1
-@@ -604,8 +605,8 @@ clean-libLTLIBRARIES:
+@@ -605,8 +606,8 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@@ -110,16 +110,16 @@ $NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS)
-@@ -852,7 +853,7 @@ distclean-tags:
+@@ -853,7 +854,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 noatunlistview.h pluginmodule.h globalvideo.h fft.c
++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)
-@@ -1015,28 +1016,28 @@ magictable: gentable
+@@ -1016,29 +1017,29 @@ magictable: gentable
.NOEXPORT:
#>+ 3
@@ -128,38 +128,56 @@ $NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
+equalizerview.moc: $(srcdir)/equalizerview.h
+ $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc
+ #>+ 1
+-mocs: plugin_deps.moc
++mocs: equalizerview.moc
#>+ 3
-mimetypetree.moc: $(srcdir)/mimetypetree.h
- $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc
+plugin_deps.moc: $(srcdir)/plugin_deps.h
+ $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc
+ #>+ 1
+-mocs: mimetypetree.moc
++mocs: plugin_deps.moc
#>+ 3
-effectview.moc: $(srcdir)/effectview.h
- $(MOC) $(srcdir)/effectview.h -o effectview.moc
+cmodule.moc: $(srcdir)/cmodule.h
+ $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+ #>+ 1
+-mocs: effectview.moc
++mocs: cmodule.moc
#>+ 3
-equalizerview.moc: $(srcdir)/equalizerview.h
- $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc
+mimetypetree.moc: $(srcdir)/mimetypetree.h
+ $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc
+ #>+ 1
+-mocs: equalizerview.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
+ #>+ 1
+ mocs: pluginmodule.moc
#>+ 3
-cmodule.moc: $(srcdir)/cmodule.h
- $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+effectview.moc: $(srcdir)/effectview.h
+ $(MOC) $(srcdir)/effectview.h -o effectview.moc
+ #>+ 1
+-mocs: cmodule.moc
++mocs: effectview.moc
#>+ 3
globalvideo.moc: $(srcdir)/globalvideo.h
-@@ -1044,7 +1045,7 @@ globalvideo.moc: $(srcdir)/globalvideo.h
-
+ $(MOC) $(srcdir)/globalvideo.h -o globalvideo.moc
+@@ -1059,7 +1060,7 @@ globalvideo.moc: $(srcdir)/globalvideo.h
+ mocs: globalvideo.moc
#>+ 3
clean-metasources:
- -rm -f plugin_deps.moc mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc globalvideo.moc
@@ -167,7 +185,7 @@ $NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
#>+ 2
docs-am:
-@@ -1057,16 +1058,16 @@ force-reedit:
+@@ -1072,16 +1073,16 @@ force-reedit:
#>+ 11
@@ -192,7 +210,7 @@ $NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
#>+ 11
libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp
-@@ -1082,20 +1083,20 @@ libnoatuncontrols_la.all_cpp.cpp: $(srcd
+@@ -1097,20 +1098,20 @@ libnoatuncontrols_la.all_cpp.cpp: $(srcd
#>+ 3
clean-final:
@@ -218,7 +236,7 @@ $NetBSD: patch-bb,v 1.6 2003/05/22 03:05:41 markd Exp $
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -1105,17 +1106,17 @@ kde-rpo-clean:
+@@ -1120,17 +1121,17 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 15
diff --git a/audio/kdemultimedia3/patches/patch-bl b/audio/kdemultimedia3/patches/patch-bl
index 6a6015429cd..c13d48c8939 100644
--- a/audio/kdemultimedia3/patches/patch-bl
+++ b/audio/kdemultimedia3/patches/patch-bl
@@ -1,8 +1,8 @@
-$NetBSD: patch-bl,v 1.2 2003/01/02 09:12:22 skrll Exp $
+$NetBSD: patch-bl,v 1.3 2003/07/30 14:56:03 markd Exp $
---- noatun/modules/infrared/Makefile.in.orig Sat Dec 28 14:04:00 2002
+--- noatun/modules/infrared/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/infrared/Makefile.in
-@@ -295,7 +295,7 @@ noatun_infrared_la_SOURCES = infrared.cp
+@@ -384,7 +384,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.2 2003/01/02 09:12:22 skrll Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
-@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES =
+@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_infrared_la_DEPENDENCIES = \
@@ -20,24 +20,37 @@ $NetBSD: patch-bl,v 1.2 2003/01/02 09:12:22 skrll Exp $
am_noatun_infrared_la_OBJECTS = infrared.lo lirc.lo irprefs.lo
#>- noatun_infrared_la_OBJECTS = $(am_noatun_infrared_la_OBJECTS)
#>+ 4
-@@ -624,10 +624,6 @@ noatun_infrared.la.closure: $(noatun_inf
+@@ -622,7 +622,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=infrared.plugin
++KDE_DIST=infrared.plugin Makefile.in.rej
+
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+
+@@ -772,12 +772,6 @@ noatun_infrared.la.closure: $(noatun_inf
#>+ 3
-lirc.moc: $(srcdir)/lirc.h
- $(MOC) $(srcdir)/lirc.h -o lirc.moc
-
+-#>+ 1
+-mocs: lirc.moc
-#>+ 3
irprefs.moc: $(srcdir)/irprefs.h
$(MOC) $(srcdir)/irprefs.h -o irprefs.moc
-@@ -636,8 +632,12 @@ 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
+lirc.moc: $(srcdir)/lirc.h
+ $(MOC) $(srcdir)/lirc.h -o lirc.moc
+
++#>+ 1
++mocs: lirc.moc
+#>+ 3
clean-metasources:
- -rm -f lirc.moc irprefs.moc infrared.moc
@@ -45,7 +58,7 @@ $NetBSD: patch-bl,v 1.2 2003/01/02 09:12:22 skrll Exp $
#>+ 3
clean-closures:
-@@ -654,7 +654,7 @@ force-reedit:
+@@ -808,7 +808,7 @@ force-reedit:
#>+ 11
@@ -54,7 +67,7 @@ $NetBSD: patch-bl,v 1.2 2003/01/02 09:12:22 skrll Exp $
@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; \
-@@ -690,9 +690,9 @@ kde-rpo-clean:
+@@ -844,9 +844,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
diff --git a/audio/kdemultimedia3/patches/patch-bn b/audio/kdemultimedia3/patches/patch-bn
index 34135eee85e..6743a652841 100644
--- a/audio/kdemultimedia3/patches/patch-bn
+++ b/audio/kdemultimedia3/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.4 2003/05/22 03:05:41 markd Exp $
+$NetBSD: patch-bn,v 1.5 2003/07/30 14:56:03 markd Exp $
---- noatun/modules/kaiman/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/kaiman/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/kaiman/Makefile.in
-@@ -387,7 +387,7 @@ noatun_kaiman_la_SOURCES = \
+@@ -388,7 +388,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.4 2003/05/22 03:05:41 markd Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
-@@ -407,7 +407,7 @@ CONFIG_CLEAN_FILES =
+@@ -408,7 +408,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_kaiman_la_DEPENDENCIES = \
@@ -20,16 +20,16 @@ $NetBSD: patch-bn,v 1.4 2003/05/22 03:05:41 markd Exp $
am_noatun_kaiman_la_OBJECTS = noatunui.lo style.lo userinterface.lo \
pref.lo
#>- noatun_kaiman_la_OBJECTS = $(am_noatun_kaiman_la_OBJECTS)
-@@ -705,7 +705,7 @@ distclean-tags:
+@@ -706,7 +706,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)
-@@ -877,20 +877,20 @@ noatun_kaiman.la.closure: $(noatun_kaima
+@@ -878,11 +878,11 @@ noatun_kaiman.la.closure: $(noatun_kaima
#>+ 3
@@ -38,16 +38,24 @@ $NetBSD: patch-bn,v 1.4 2003/05/22 03:05:41 markd Exp $
+style.moc: $(srcdir)/style.h
+ $(MOC) $(srcdir)/style.h -o style.moc
+ #>+ 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
+ #>+ 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
++mocs: userinterface.moc
#>+ 3
clean-metasources:
- -rm -f userinterface.moc pref.moc style.moc
@@ -55,7 +63,7 @@ $NetBSD: patch-bn,v 1.4 2003/05/22 03:05:41 markd Exp $
#>+ 3
clean-closures:
-@@ -907,7 +907,7 @@ force-reedit:
+@@ -914,7 +914,7 @@ force-reedit:
#>+ 11
@@ -64,7 +72,7 @@ $NetBSD: patch-bn,v 1.4 2003/05/22 03:05:41 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; \
-@@ -943,9 +943,9 @@ kde-rpo-clean:
+@@ -950,9 +950,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
diff --git a/audio/kdemultimedia3/patches/patch-br b/audio/kdemultimedia3/patches/patch-br
index b1cccfa43ac..59c81a57b3f 100644
--- a/audio/kdemultimedia3/patches/patch-br
+++ b/audio/kdemultimedia3/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.4 2003/05/22 03:05:41 markd Exp $
+$NetBSD: patch-br,v 1.5 2003/07/30 14:56:04 markd Exp $
---- noatun/modules/kjofol-skin/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/kjofol-skin/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/kjofol-skin/Makefile.in
-@@ -399,7 +399,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj
+@@ -400,7 +400,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.4 2003/05/22 03:05:41 markd Exp $
$(LIB_KIO) -lm \
$(top_builddir)/arts/modules/libartsmodules.la
-@@ -420,7 +420,7 @@ CONFIG_CLEAN_FILES =
+@@ -421,7 +421,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_kjofol_la_DEPENDENCIES = \
@@ -20,42 +20,54 @@ $NetBSD: patch-br,v 1.4 2003/05/22 03:05:41 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 \
-@@ -748,7 +748,7 @@ distclean-tags:
+@@ -749,7 +749,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=kjskinselectorwidget.ui kjofolui.plugin 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)
-@@ -948,24 +948,24 @@ kjguisettingswidget.moc: kjguisettingswi
+@@ -949,32 +949,32 @@ kjguisettingswidget.moc: kjguisettingswi
$(MOC) kjguisettingswidget.h -o kjguisettingswidget.moc
#>+ 3
-kjequalizer.moc: $(srcdir)/kjequalizer.h
- $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc
-
+-#>+ 1
+-mocs: kjequalizer.moc
-#>+ 3
-kjloader.moc: $(srcdir)/kjloader.h
- $(MOC) $(srcdir)/kjloader.h -o kjloader.moc
-
+-#>+ 1
+-mocs: kjloader.moc
-#>+ 3
kjtextdisplay.moc: $(srcdir)/kjtextdisplay.h
$(MOC) $(srcdir)/kjtextdisplay.h -o kjtextdisplay.moc
+ #>+ 1
+ mocs: kjtextdisplay.moc
#>+ 3
+kjequalizer.moc: $(srcdir)/kjequalizer.h
+ $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc
+
++#>+ 1
++mocs: kjequalizer.moc
+#>+ 3
kjprefs.moc: $(srcdir)/kjprefs.h
$(MOC) $(srcdir)/kjprefs.h -o kjprefs.moc
+ #>+ 1
+ mocs: kjprefs.moc
#>+ 3
+kjloader.moc: $(srcdir)/kjloader.h
+ $(MOC) $(srcdir)/kjloader.h -o kjloader.moc
+
++#>+ 1
++mocs: kjloader.moc
+#>+ 3
clean-metasources:
- -rm -f kjequalizer.moc kjloader.moc kjtextdisplay.moc kjprefs.moc
@@ -63,7 +75,7 @@ $NetBSD: patch-br,v 1.4 2003/05/22 03:05:41 markd Exp $
#>+ 5
clean-ui:
-@@ -988,7 +988,7 @@ force-reedit:
+@@ -997,7 +997,7 @@ force-reedit:
#>+ 11
@@ -72,7 +84,7 @@ $NetBSD: patch-br,v 1.4 2003/05/22 03:05:41 markd Exp $
@echo 'creating noatun_kjofol_la.all_cpp.cpp ...'; \
rm -f noatun_kjofol_la.all_cpp.files noatun_kjofol_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatun_kjofol_la.all_cpp.final; \
-@@ -1024,24 +1024,24 @@ kde-rpo-clean:
+@@ -1033,24 +1033,24 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 22
diff --git a/audio/kdemultimedia3/patches/patch-bv b/audio/kdemultimedia3/patches/patch-bv
index d580c3d24b5..948dcbbe734 100644
--- a/audio/kdemultimedia3/patches/patch-bv
+++ b/audio/kdemultimedia3/patches/patch-bv
@@ -1,8 +1,8 @@
-$NetBSD: patch-bv,v 1.2 2003/01/02 09:12:22 skrll Exp $
+$NetBSD: patch-bv,v 1.3 2003/07/30 14:56:04 markd Exp $
---- noatun/modules/metatag/Makefile.in.orig Sat Dec 28 14:04:00 2002
+--- noatun/modules/metatag/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/metatag/Makefile.in
-@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_metatag.
+@@ -382,7 +382,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.2 2003/01/02 09:12:22 skrll Exp $
$(top_builddir)/noatun/library/noatuntags/libnoatuntags.la
-@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES =
+@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_metatag_la_DEPENDENCIES = \
@@ -20,21 +20,36 @@ $NetBSD: patch-bv,v 1.2 2003/01/02 09:12:22 skrll 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)
-@@ -622,16 +622,16 @@ noatun_metatag.la.closure: $(noatun_meta
+@@ -619,7 +619,7 @@ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=HANDLED_ITEMS metatag.plugin
++KDE_DIST=HANDLED_ITEMS Makefile.in.rej metatag.plugin
+
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+
+@@ -769,20 +769,20 @@ noatun_metatag.la.closure: $(noatun_meta
#>+ 3
-metatag.moc: $(srcdir)/metatag.h
- $(MOC) $(srcdir)/metatag.h -o metatag.moc
-
+-#>+ 1
+-mocs: metatag.moc
-#>+ 3
edit.moc: $(srcdir)/edit.h
$(MOC) $(srcdir)/edit.h -o edit.moc
+ #>+ 1
+ mocs: edit.moc
#>+ 3
+metatag.moc: $(srcdir)/metatag.h
+ $(MOC) $(srcdir)/metatag.h -o metatag.moc
+
++#>+ 1
++mocs: metatag.moc
+#>+ 3
clean-metasources:
- -rm -f metatag.moc edit.moc
@@ -42,7 +57,7 @@ $NetBSD: patch-bv,v 1.2 2003/01/02 09:12:22 skrll Exp $
#>+ 3
clean-closures:
-@@ -648,7 +648,7 @@ force-reedit:
+@@ -799,7 +799,7 @@ force-reedit:
#>+ 11
@@ -51,7 +66,7 @@ $NetBSD: patch-bv,v 1.2 2003/01/02 09:12:22 skrll Exp $
@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; \
-@@ -685,6 +685,6 @@ kde-rpo-clean:
+@@ -836,6 +836,6 @@ kde-rpo-clean:
#>+ 5
metatag.o: metatag.moc
diff --git a/audio/kdemultimedia3/patches/patch-cd b/audio/kdemultimedia3/patches/patch-cd
index c0d741ecddf..6a6e8ba31bf 100644
--- a/audio/kdemultimedia3/patches/patch-cd
+++ b/audio/kdemultimedia3/patches/patch-cd
@@ -1,8 +1,8 @@
-$NetBSD: patch-cd,v 1.4 2003/05/22 03:05:41 markd Exp $
+$NetBSD: patch-cd,v 1.5 2003/07/30 14:56:04 markd Exp $
---- noatun/modules/splitplaylist/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/splitplaylist/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/splitplaylist/Makefile.in
-@@ -381,7 +381,7 @@ kde_module_LTLIBRARIES = noatun_splitpla
+@@ -382,7 +382,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.4 2003/05/22 03:05:41 markd Exp $
#>- noatun_splitplaylist_la_METASOURCES = AUTO
-@@ -398,7 +398,7 @@ CONFIG_CLEAN_FILES =
+@@ -399,7 +399,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_splitplaylist_la_DEPENDENCIES = \
@@ -20,34 +20,42 @@ $NetBSD: patch-cd,v 1.4 2003/05/22 03:05:41 markd Exp $
am_noatun_splitplaylist_la_OBJECTS = splitplaylist.lo playlist.lo \
view.lo find.lo
#>- noatun_splitplaylist_la_OBJECTS = $(am_noatun_splitplaylist_la_OBJECTS)
-@@ -643,7 +643,7 @@ distclean-tags:
+@@ -644,7 +644,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=splui.rc LICENSE splitplaylist.plugin
-+KDE_DIST=splitplaylist.plugin LICENSE splui.rc
++KDE_DIST=splitplaylist.plugin LICENSE splui.rc Makefile.in.rej
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -796,20 +796,20 @@ noatun_splitplaylist.la.closure: $(noatu
+@@ -797,18 +797,18 @@ noatun_splitplaylist.la.closure: $(noatu
#>+ 3
-view.moc: $(srcdir)/view.h
- $(MOC) $(srcdir)/view.h -o view.moc
-
+-#>+ 1
+-mocs: view.moc
-#>+ 3
find.moc: $(srcdir)/find.h
$(MOC) $(srcdir)/find.h -o find.moc
+ #>+ 1
+ mocs: find.moc
#>+ 3
+view.moc: $(srcdir)/view.h
+ $(MOC) $(srcdir)/view.h -o view.moc
+
++#>+ 1
++mocs: view.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
@@ -55,7 +63,7 @@ $NetBSD: patch-cd,v 1.4 2003/05/22 03:05:41 markd Exp $
#>+ 3
clean-closures:
-@@ -826,7 +826,7 @@ force-reedit:
+@@ -833,7 +833,7 @@ force-reedit:
#>+ 11
@@ -64,7 +72,7 @@ $NetBSD: patch-cd,v 1.4 2003/05/22 03:05:41 markd Exp $
@echo 'creating noatun_splitplaylist_la.all_cpp.cpp ...'; \
rm -f noatun_splitplaylist_la.all_cpp.files noatun_splitplaylist_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatun_splitplaylist_la.all_cpp.final; \
-@@ -862,9 +862,9 @@ kde-rpo-clean:
+@@ -869,9 +869,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
diff --git a/audio/kdemultimedia3/patches/patch-cf b/audio/kdemultimedia3/patches/patch-cf
index 1ff8be86629..177b2726c63 100644
--- a/audio/kdemultimedia3/patches/patch-cf
+++ b/audio/kdemultimedia3/patches/patch-cf
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
+$NetBSD: patch-cf,v 1.5 2003/07/30 14:56:04 markd Exp $
---- noatun/modules/systray/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/systray/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/systray/Makefile.in
-@@ -381,7 +381,7 @@ kde_module_LTLIBRARIES = noatun_systray.
+@@ -382,7 +382,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.4 2003/05/22 03:05:41 markd Exp $
-lqtmcop -lkmedia2_idl -lsoundserver_idl
-@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES =
+@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_systray_la_DEPENDENCIES = \
@@ -20,16 +20,16 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
am_noatun_systray_la_OBJECTS = systray.lo noatunui.lo kitsystemtray.lo \
cmodule.lo
#>- noatun_systray_la_OBJECTS = $(am_noatun_systray_la_OBJECTS)
-@@ -630,7 +630,7 @@ distclean-tags:
+@@ -631,7 +631,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-noatuntrayplay.png systray.plugin cr16-action-noatuntray.png cr16-action-noatuntraystop.png systrayui.rc cr16-action-noatuntraypause.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)
-@@ -783,20 +783,20 @@ noatun_systray.la.closure: $(noatun_syst
+@@ -784,11 +784,11 @@ noatun_systray.la.closure: $(noatun_syst
#>+ 3
@@ -38,16 +38,24 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
+cmodule.moc: $(srcdir)/cmodule.h
+ $(MOC) $(srcdir)/cmodule.h -o cmodule.moc
+ #>+ 1
+-mocs: kitsystemtray.moc
++mocs: cmodule.moc
#>+ 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
++mocs: kitsystemtray.moc
#>+ 3
clean-metasources:
- -rm -f kitsystemtray.moc systray.moc cmodule.moc
@@ -55,7 +63,7 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
#>+ 3
clean-closures:
-@@ -827,7 +827,7 @@ force-reedit:
+@@ -834,7 +834,7 @@ force-reedit:
#>+ 11
@@ -64,7 +72,7 @@ $NetBSD: patch-cf,v 1.4 2003/05/22 03:05:41 markd Exp $
@echo 'creating noatun_systray_la.all_cpp.cpp ...'; \
rm -f noatun_systray_la.all_cpp.files noatun_systray_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatun_systray_la.all_cpp.final; \
-@@ -863,9 +863,9 @@ kde-rpo-clean:
+@@ -870,9 +870,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
diff --git a/audio/kdemultimedia3/patches/patch-cj b/audio/kdemultimedia3/patches/patch-cj
index e909199a33d..26d9e24e948 100644
--- a/audio/kdemultimedia3/patches/patch-cj
+++ b/audio/kdemultimedia3/patches/patch-cj
@@ -1,8 +1,8 @@
-$NetBSD: patch-cj,v 1.4 2003/05/22 03:05:41 markd Exp $
+$NetBSD: patch-cj,v 1.5 2003/07/30 14:56:05 markd Exp $
---- noatun/modules/winskin/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/winskin/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/winskin/Makefile.in
-@@ -444,7 +444,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar
+@@ -445,7 +445,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar
-module -avoid-version -no-undefined
@@ -11,7 +11,7 @@ $NetBSD: patch-cj,v 1.4 2003/05/22 03:05:41 markd Exp $
$(top_builddir)/noatun/modules/winskin/vis/libwinskinvis.la
-@@ -456,7 +456,7 @@ CONFIG_CLEAN_FILES =
+@@ -457,7 +457,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatun_winskin_la_DEPENDENCIES = \
@@ -20,136 +20,195 @@ $NetBSD: patch-cj,v 1.4 2003/05/22 03:05:41 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 \
-@@ -832,7 +832,7 @@ distclean-tags:
+@@ -833,7 +833,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=winSkinConfig.h waClutterbar.h waBalanceSlider.h waDigit.h waStatus.h winSkinVis.h waLabel.h waSlider.h fileInfo.h waWidget.h winskin.plugin waShadeMapping.h waSkins.h waMain.h waInfo.h waRegion.h waSkinModel.h waSkinMapping.h skinMap.h waJumpSlider.h waIndicator.h waSkin.h waVolumeSlider.h waColor.h waSkinManager.h waTitleBar.h waButton.h guiSpectrumAnalyser.h
++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)
-@@ -1010,88 +1010,88 @@ noatun_winskin.la.closure: $(noatun_wins
+@@ -1011,23 +1011,17 @@ 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
+ #>+ 1
+ mocs: waVolumeSlider.moc
#>+ 3
-waMain.moc: $(srcdir)/waMain.h
- $(MOC) $(srcdir)/waMain.h -o waMain.moc
+guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
+ $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
+ #>+ 1
+-mocs: waMain.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
+ #>+ 1
+ mocs: winSkinConfig.moc
#>+ 3
-waWidget.moc: $(srcdir)/waWidget.h
- $(MOC) $(srcdir)/waWidget.h -o waWidget.moc
+waButton.moc: $(srcdir)/waButton.h
+ $(MOC) $(srcdir)/waButton.h -o waButton.moc
+ #>+ 1
+-mocs: waWidget.moc
++mocs: waButton.moc
#>+ 3
-waSkin.moc: $(srcdir)/waSkin.h
- $(MOC) $(srcdir)/waSkin.h -o waSkin.moc
+waInfo.moc: $(srcdir)/waInfo.h
+ $(MOC) $(srcdir)/waInfo.h -o waInfo.moc
+ #>+ 1
+-mocs: waSkin.moc
++mocs: waInfo.moc
#>+ 3
-waSlider.moc: $(srcdir)/waSlider.h
- $(MOC) $(srcdir)/waSlider.h -o waSlider.moc
+waStatus.moc: $(srcdir)/waStatus.h
+ $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
+ #>+ 1
+-mocs: waSlider.moc
++mocs: waStatus.moc
#>+ 3
-waLabel.moc: $(srcdir)/waLabel.h
- $(MOC) $(srcdir)/waLabel.h -o waLabel.moc
+waTitleBar.moc: $(srcdir)/waTitleBar.h
+ $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
+ #>+ 1
+-mocs: waLabel.moc
++mocs: waTitleBar.moc
#>+ 3
-waJumpSlider.moc: $(srcdir)/waJumpSlider.h
- $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc
+waSkin.moc: $(srcdir)/waSkin.h
+ $(MOC) $(srcdir)/waSkin.h -o waSkin.moc
+ #>+ 1
+-mocs: waJumpSlider.moc
++mocs: waSkin.moc
#>+ 3
-waIndicator.moc: $(srcdir)/waIndicator.h
- $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
+waDigit.moc: $(srcdir)/waDigit.h
+ $(MOC) $(srcdir)/waDigit.h -o waDigit.moc
+ #>+ 1
+-mocs: waIndicator.moc
++mocs: waDigit.moc
#>+ 3
-waButton.moc: $(srcdir)/waButton.h
- $(MOC) $(srcdir)/waButton.h -o waButton.moc
+waWidget.moc: $(srcdir)/waWidget.h
+ $(MOC) $(srcdir)/waWidget.h -o waWidget.moc
+ #>+ 1
+-mocs: waButton.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
+ #>+ 1
+-mocs: guiSpectrumAnalyser.moc
++mocs: waSlider.moc
#>+ 3
-waInfo.moc: $(srcdir)/waInfo.h
- $(MOC) $(srcdir)/waInfo.h -o waInfo.moc
+waClutterbar.moc: $(srcdir)/waClutterbar.h
+ $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc
+ #>+ 1
+-mocs: waInfo.moc
++mocs: waClutterbar.moc
#>+ 3
-waDigit.moc: $(srcdir)/waDigit.h
- $(MOC) $(srcdir)/waDigit.h -o waDigit.moc
+waJumpSlider.moc: $(srcdir)/waJumpSlider.h
+ $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc
+ #>+ 1
+-mocs: waDigit.moc
++mocs: waJumpSlider.moc
#>+ 3
-winSkinVis.moc: $(srcdir)/winSkinVis.h
- $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc
+waMain.moc: $(srcdir)/waMain.h
+ $(MOC) $(srcdir)/waMain.h -o waMain.moc
+ #>+ 1
+-mocs: winSkinVis.moc
++mocs: waMain.moc
#>+ 3
-waSkinModel.moc: $(srcdir)/waSkinModel.h
- $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc
+waLabel.moc: $(srcdir)/waLabel.h
+ $(MOC) $(srcdir)/waLabel.h -o waLabel.moc
+ #>+ 1
+-mocs: waSkinModel.moc
++mocs: waLabel.moc
#>+ 3
-waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h
- $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc
+winSkinVis.moc: $(srcdir)/winSkinVis.h
+ $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc
+ #>+ 1
+-mocs: waBalanceSlider.moc
++mocs: winSkinVis.moc
#>+ 3
-waTitleBar.moc: $(srcdir)/waTitleBar.h
- $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
+waSkinManager.moc: $(srcdir)/waSkinManager.h
+ $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc
+ #>+ 1
+-mocs: waTitleBar.moc
++mocs: waSkinManager.moc
#>+ 3
-waStatus.moc: $(srcdir)/waStatus.h
- $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
+waIndicator.moc: $(srcdir)/waIndicator.h
+ $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc
+ #>+ 1
+-mocs: waStatus.moc
++mocs: waIndicator.moc
#>+ 3
-waSkinManager.moc: $(srcdir)/waSkinManager.h
- $(MOC) $(srcdir)/waSkinManager.h -o waSkinManager.moc
+waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h
+ $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc
-+
+
+ #>+ 1
+-mocs: waSkinManager.moc
++mocs: waBalanceSlider.moc
+#>+ 3
+waSkinModel.moc: $(srcdir)/waSkinModel.h
+ $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc
-
++
++#>+ 1
++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
@@ -157,7 +216,7 @@ $NetBSD: patch-cj,v 1.4 2003/05/22 03:05:41 markd Exp $
#>+ 4
clean-idl:
-@@ -1113,7 +1113,7 @@ force-reedit:
+@@ -1154,7 +1154,7 @@ force-reedit:
#>+ 11
@@ -166,7 +225,7 @@ $NetBSD: patch-cj,v 1.4 2003/05/22 03:05:41 markd Exp $
@echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \
rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \
-@@ -1149,43 +1149,43 @@ kde-rpo-clean:
+@@ -1190,43 +1190,43 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 41
diff --git a/audio/kdemultimedia3/patches/patch-cq b/audio/kdemultimedia3/patches/patch-cq
index 823af211328..d396631af06 100644
--- a/audio/kdemultimedia3/patches/patch-cq
+++ b/audio/kdemultimedia3/patches/patch-cq
@@ -1,8 +1,8 @@
-$NetBSD: patch-cq,v 1.2 2003/05/22 03:05:42 markd Exp $
+$NetBSD: patch-cq,v 1.3 2003/07/30 14:56:05 markd Exp $
---- noatun/modules/simple/Makefile.in.orig Thu May 8 00:05:29 2003
+--- noatun/modules/simple/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200
+++ noatun/modules/simple/Makefile.in
-@@ -383,7 +383,7 @@ kde_module_LTLIBRARIES = noatunsimple.la
+@@ -384,7 +384,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.2 2003/05/22 03:05:42 markd Exp $
$(top_builddir)/noatun/library/libnoatuncontrols.la \
-lkmedia2_idl -lsoundserver_idl -lartskde
-@@ -400,7 +400,7 @@ CONFIG_CLEAN_FILES =
+@@ -401,7 +401,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
noatunsimple_la_DEPENDENCIES = \
@@ -20,16 +20,16 @@ $NetBSD: patch-cq,v 1.2 2003/05/22 03:05:42 markd Exp $
$(top_builddir)/noatun/library/libnoatuncontrols.la
am_noatunsimple_la_OBJECTS = noatunui.lo userinterface.lo
#>- noatunsimple_la_OBJECTS = $(am_noatunsimple_la_OBJECTS)
-@@ -624,7 +624,7 @@ distclean-tags:
+@@ -625,7 +625,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
--KDE_DIST=play.xpm pause.xpm simple.plugin propertiesdialog.ui propertiesdialog.ui.h back.xpm forward.xpm stop.xpm eject.xpm
-+KDE_DIST=pause.xpm stop.xpm back.xpm propertiesdialog.ui.h simple.plugin forward.xpm propertiesdialog.ui play.xpm eject.xpm
+-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=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)
-@@ -816,7 +816,7 @@ force-reedit:
+@@ -819,7 +819,7 @@ force-reedit:
#>+ 11
@@ -38,7 +38,7 @@ $NetBSD: patch-cq,v 1.2 2003/05/22 03:05:42 markd Exp $
@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; \
-@@ -852,7 +852,7 @@ kde-rpo-clean:
+@@ -855,7 +855,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 04:34:28 +0000