diff options
| author | skrll <skrll> | 2003-01-02 09:12:19 +0000 |
|---|---|---|
| committer | skrll <skrll> | 2003-01-02 09:12:19 +0000 |
| commit | e363476635e9eee4a430e78b3847c3312bcb03c9 (patch) | |
| tree | 1ab9a94a1fd0409896e232322846793727e9e77a /audio | |
| parent | 8b9ca9a66258f215a9ebf4b60397e0e3dea6ed6e (diff) | |
| download | pkgsrc-e363476635e9eee4a430e78b3847c3312bcb03c9.tar.gz | |
Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or
1.0.5.1 accordingly.
Fixes and changes are:
Multiple vulnerabilities.
kdelibs
KHTML : Fixed several crashes and misrenderings.
rlogin.protocol: fixed command execution in specially crafted
urls.
kdebase
KAddressbook: Don't squeeze columns on startup/properly restore
column width settings.
kdenetwork
lisa, reslisa: Fixed several security vulnerabilities.
kdesdk
Cervisia: Show long lines in diff view always completely.
Diffstat (limited to 'audio')
30 files changed, 1269 insertions, 743 deletions
diff --git a/audio/arts/Makefile b/audio/arts/Makefile index 3424dd5e28c..be0a30ab628 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2002/10/14 09:13:45 skrll Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:20 skrll Exp $ -DISTNAME= arts-1.0.4 +DISTNAME= arts-1.0.5a CATEGORIES= audio COMMENT= Analog Real-Time Synthesizer diff --git a/audio/arts/distinfo b/audio/arts/distinfo index 6df2c5ee3fa..bba9fe8625b 100644 --- a/audio/arts/distinfo +++ b/audio/arts/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2002/10/14 09:13:45 skrll Exp $ +$NetBSD: distinfo,v 1.7 2003/01/02 09:12:20 skrll Exp $ -SHA1 (arts-1.0.4.tar.bz2) = eef00a086272bc984cc24999e516a1534115b5fe -Size (arts-1.0.4.tar.bz2) = 1021219 bytes +SHA1 (arts-1.0.5a.tar.bz2) = 93e884e4b657b7a61bae51d4ffd30b1050ae2943 +Size (arts-1.0.5a.tar.bz2) = 1021229 bytes SHA1 (patch-aa) = 23dd79c83f7e0905cef66e002387f44c18438fed SHA1 (patch-ab) = 06265879020edf24ff51403565fd422c3b7a17e5 SHA1 (patch-ac) = 73cc8b5398d4191dfbf817d4b2e03917ab2ba6f6 diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index 3f624e0f711..6ebc6027850 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2002/12/24 06:09:44 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:21 skrll Exp $ -DISTNAME= kdemultimedia-3.0.4 -PKGREVISION= 1 +DISTNAME= kdemultimedia-3.0.5a CATEGORIES= audio COMMENT= Audio tools for the KDE integrated X11 desktop diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo index 0debb61c0ca..87c57cd7e10 100644 --- a/audio/kdemultimedia3/distinfo +++ b/audio/kdemultimedia3/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.8 2002/10/14 09:13:46 skrll Exp $ +$NetBSD: distinfo,v 1.9 2003/01/02 09:12:21 skrll Exp $ -SHA1 (kdemultimedia-3.0.4.tar.bz2) = 81a8813034217036c67b31899e2c6d6cdc778a27 -Size (kdemultimedia-3.0.4.tar.bz2) = 5791734 bytes -SHA1 (patch-aa) = ee1ba5de96f584dc14c762d785be22a5662d2c0a +SHA1 (kdemultimedia-3.0.5a.tar.bz2) = c6e9a02b318281e2a1c10210fda8150674f641c9 +Size (kdemultimedia-3.0.5a.tar.bz2) = 5791676 bytes +SHA1 (patch-aa) = 5a5947018fa205554fbc5848a9480199b873cfc6 SHA1 (patch-ab) = 85b8216b50ab22435835b07e068d326563d0e217 -SHA1 (patch-ac) = ffc738496170c34c8c3ee84544ec1eeac27992ec +SHA1 (patch-ac) = aa414e044517ef2cd97a99af8acde09e1d24608c SHA1 (patch-ad) = 7821e0466fb29f7ca9692df817fcdd833a12b791 SHA1 (patch-ae) = 23ccdd4f77aae953bc0ab3ab88c73dbcb3d2ba62 -SHA1 (patch-af) = 07038f3523e1fbc44aa999c9d7ba7b4e9d4f3367 +SHA1 (patch-af) = 95bf9890b803b49e102d4248c0fbd52427a8c6c0 SHA1 (patch-ag) = aee2716c219e7e6c977cf74b0640ae7528f0755e SHA1 (patch-ah) = 1dd023976df014a217fcaf39f7ea4280b9f011d8 SHA1 (patch-ai) = 6d4ff2feecbe66380dc3d08f7a95076c0b0524e2 SHA1 (patch-aj) = 4da67d4d4a509f933335baa4395d08ae406958ab -SHA1 (patch-ak) = 1506500cee20b4bc304a4c16acd1e18c9e7c66ca +SHA1 (patch-ak) = 2e16f0a9cfb8da9790b80135392382b57dd2044a SHA1 (patch-al) = dece03fdff70a1414fb2bb566170092188285536 SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa SHA1 (patch-an) = 2ec87bdfea4d19c71bfece3a58ce2bd8c5c1eee6 @@ -27,44 +27,44 @@ SHA1 (patch-av) = 1b14a5c0bb9ae5979cc6e07c34dffe0fbefdc2be SHA1 (patch-aw) = 87444988e9109f2d59dc7168c4f2337d0c1a7168 SHA1 (patch-ax) = efd01de997033aa2cebd0ba5d875b4d547bfd624 SHA1 (patch-ay) = 2ce3604aef6a9d79b58fda7e969f79d3e48b6ce8 -SHA1 (patch-az) = 3e0a89a16e9a21ed1aafffac84882506344d6f37 +SHA1 (patch-az) = 95fdda7ebda3acc658767cf7e8a2eff6d87761dc SHA1 (patch-ba) = 0ba40584fd1859bf809c1ecb8b2493a01b6328df -SHA1 (patch-bb) = 6f0ce74db0de2f981692046978a765b2631a4d4a +SHA1 (patch-bb) = fed6648c8bdae43b9fde3e58466a9e25ad5bc458 SHA1 (patch-bc) = 82424e524f316f55524c5367ce42fe4194f935c6 -SHA1 (patch-bd) = ace100c1effb71354c2e4ee1ea25ad8f0b0bdada +SHA1 (patch-bd) = 7cd66c4d019bb2c944ae94fd9b600d9131797047 SHA1 (patch-be) = 5cee048125a71eb5a1358966c0a61c4553eff24c SHA1 (patch-bf) = 1f8b40c914d27c34b0fff876682b9402c6815d42 -SHA1 (patch-bg) = b9a91e196fb873d61207a6efea2fbeb4d603fe07 -SHA1 (patch-bh) = 3d6f54d490f21548df8e7824a112b7411f31b197 +SHA1 (patch-bg) = 2b421f103773c6f2bb3ce6c51134a78c5ac20412 +SHA1 (patch-bh) = c1eba941456abe7a313c5e9b80f8adadd27439f5 SHA1 (patch-bi) = 92fd0e6d2883d715b49e32c28dcdcfa23272b78e -SHA1 (patch-bj) = cffda4602042e6d77fbdb34f11d210de00e15d12 +SHA1 (patch-bj) = 160aebbe402d7ecfc91a22717a3a3813be0c29e9 SHA1 (patch-bk) = e594440c63e8038b660dcd75e89f61c6cf62a766 -SHA1 (patch-bl) = 615b7d47420fbc1f376ba67674405cfe8c6293ad +SHA1 (patch-bl) = 6d2f6026fb233b43352d53acc7c82ec699cc6337 SHA1 (patch-bm) = a50a8d722ebc48fce19d7052749795efbe543303 -SHA1 (patch-bn) = 97cc6ecddd238efc8a2e699fb75f66b0f0eed1fb +SHA1 (patch-bn) = ffa3312c5a08a53b5583db13e2ab3cda82214b35 SHA1 (patch-bo) = b67167bfe6e9810208f1f74d3e3fea2ddfb32f88 -SHA1 (patch-bp) = 26653372ed565d5ac3940519fd9b679589d40159 +SHA1 (patch-bp) = b59ce7619ea0bdfdd375cf5691650026ef27e176 SHA1 (patch-bq) = 98d57a7c1c9b7c061ae44aad27edbedb8eaee4d9 -SHA1 (patch-br) = 5e295c9c347a935707c1469d85c48c0311b59deb +SHA1 (patch-br) = 66141727f687fffa91ab4c2f00037452dd60f191 SHA1 (patch-bs) = fb23d5297589b87946642bfbfd857c04f81027e3 -SHA1 (patch-bt) = 6ab9037f5c1e0eba0bdafe222da0ca8104cbe21f +SHA1 (patch-bt) = b59041f0f87e2b92e8838f9868e5d33ae97fa689 SHA1 (patch-bu) = 6e183a9c5caf7641304efdb409ac414de4b88947 -SHA1 (patch-bv) = 4b2d80b10f50c1c2b1219d98f41e8dd37f9fa3e3 +SHA1 (patch-bv) = 97e804f6968eed8a5be467457a69a9921599d1a0 SHA1 (patch-bw) = a28609eb68746f45013dae50556fb19829f890f4 -SHA1 (patch-bx) = 886f18bfcaa793a56b27053550ce7974249eeaf0 +SHA1 (patch-bx) = a53f70f46fbb61c25b60494ec5f60942b87e49a7 SHA1 (patch-by) = e451c595628e500f86085744798af78ef70c28df -SHA1 (patch-bz) = 79001beb8c6402276a237456906c55720333e69d +SHA1 (patch-bz) = 1f24fa478f7f7544719e04a427d4d61a0eef9f1e SHA1 (patch-ca) = a1fedc7a4a507e71b0e6fff34056e414b7f119c7 -SHA1 (patch-cb) = 95d3518d94d0616a1a78f49ddf4db07603071365 +SHA1 (patch-cb) = 3a82b1fc52e8e32fb99e7427e24bd497ad323334 SHA1 (patch-cc) = af970c41d730fe1b7e2403942ab39746b3b0e2af -SHA1 (patch-cd) = b39907193f94320877b8608578ff3c4c41e09665 +SHA1 (patch-cd) = ec47a25e246432d212b29e821ad428f788d40343 SHA1 (patch-ce) = 4f2c176ef04efa22ae034c5c5bd85eab329e187b -SHA1 (patch-cf) = a0dccb6a82212ec746007f2837f5068571807d5a +SHA1 (patch-cf) = 889bb230e3e83f4738c4a565b9101de6d23ae4cb SHA1 (patch-cg) = 0e7f0cdcd55a06bc60c5c617f9ad33201bda1f9d -SHA1 (patch-ch) = 86e18855242a489661371228fd8691897464181b +SHA1 (patch-ch) = 78d86400c2b4d51fe1363ccc770b4cbab56b45eb SHA1 (patch-ci) = 49d1caddd97ba8f00a78561f7fd3813c109b95ed -SHA1 (patch-cj) = 163aad2ee9120a3754e4b94c8c775058b370d2ba +SHA1 (patch-cj) = eac82dbcb32a28dd51cc59227214b4988e53d07a SHA1 (patch-ck) = 4afe5b8ffca5a1989e5bf34f73b7b7ca8f64726c -SHA1 (patch-cl) = 1c918a14435bde2d50c2de15d2db75534bde5591 SHA1 (patch-cm) = 2d539df6011c977c0b984233f45b99eeb838e7b3 -SHA1 (patch-cn) = ef3a680a6e8d90f456edafa3d58fe8b802e2a5bb +SHA1 (patch-cn) = f6f1f196f1a17cc9135f0d7f1fa9555592185ed1 +SHA1 (patch-co) = b484ad7c770a3bd9554051af64e2545fac5a677f diff --git a/audio/kdemultimedia3/patches/patch-aa b/audio/kdemultimedia3/patches/patch-aa index 3b78dacca3d..5646c235ff6 100644 --- a/audio/kdemultimedia3/patches/patch-aa +++ b/audio/kdemultimedia3/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2003/01/02 09:12:21 skrll Exp $ ---- configure.orig Wed Aug 7 11:02:50 2002 +--- configure.orig Sat Dec 21 07:07:59 2002 +++ configure -@@ -22016,6 +22016,40 @@ if { (eval echo "$as_me:22007: \"$ac_lin - echo "$as_me:22016: \$? = $ac_status" >&5 +@@ -21913,6 +21913,40 @@ if { (eval echo "$as_me:21904: \"$ac_lin + echo "$as_me:21913: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "ac_cv_lib_vm='-lXxf86dga -lXxf86vm'" + @@ -43,7 +43,7 @@ $NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -@@ -22767,7 +22801,7 @@ if test "x$au_enable_default" = xyes; th +@@ -22664,7 +22698,7 @@ if test "x$au_enable_default" = xyes; th au_enable_sun=yes ;; *-*-netbsd*) @@ -52,25 +52,25 @@ $NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ ;; *-*-openbsd*) au_enable_sun=yes -@@ -22788,7 +22822,7 @@ if test "x$au_enable_oss" = xyes; then +@@ -22685,7 +22719,7 @@ if test "x$au_enable_oss" = xyes; then echo "${ECHO_T}yes - <sys/soundcard.h>" >&6 else case "$target" in - *linux*|*freebsd*|*bsdi*) + *linux*|*freebsd*|*bsdi*|*netbsd*) - echo "$as_me:22792: result: yes" >&5 + echo "$as_me:22689: result: yes" >&5 echo "${ECHO_T}yes" >&6 ;; -@@ -26278,7 +26312,7 @@ fi - echo "$as_me:26278: result: $ac_cv_lib_ossaudio_main" >&5 +@@ -26223,7 +26257,7 @@ fi + echo "$as_me:26223: result: $ac_cv_lib_ossaudio_main" >&5 echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6 if test $ac_cv_lib_ossaudio_main = yes; then - LIBOSSAUDIO="-lossaudio" + LIBOSSAUDIO="${LIBOSSAUDIO}" fi - echo "$as_me:26284: checking for main in -lasound" >&5 -@@ -26625,6 +26659,7 @@ case "$host" in + echo "$as_me:26229: checking for main in -lasound" >&5 +@@ -26570,6 +26604,7 @@ case "$host" in *-*-*bsdi*) kscd_compile=yes;; *-*-*freebsd*) kscd_compile=yes;; *-*-*openbsd*) kscd_compile=yes;; @@ -78,7 +78,7 @@ $NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ *-*-*bsd*) kscd_compile=no;; *) kscd_compile=yes;; esac -@@ -26688,7 +26723,7 @@ EOF +@@ -26633,7 +26668,7 @@ EOF fi done @@ -86,38 +86,41 @@ $NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ +for ac_header in soundcard.h sys/soundcard.h machine/soundcard.h linux/soundcard.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - echo "$as_me:26694: checking for $ac_header" >&5 -@@ -27007,7 +27042,22 @@ if { (eval echo "$as_me:26998: \"$ac_com - echo "$as_me:27007: \$? = $ac_status" >&5 + echo "$as_me:26639: checking for $ac_header" >&5 +@@ -26952,8 +26987,23 @@ if { (eval echo "$as_me:26943: \"$ac_com + echo "$as_me:26952: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -+ lib=Xxf86dga -+ shared_lib_found=no -+ for i in ${LDFLAGS}; do -+ case "$i" in -+ -L*) -+ dir=`echo $i | sed "s,^-L,,"` -+ if [ -e $dir/lib${lib}.so ] || -+ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then -+ shared_lib_found=yes -+ break; -+ fi -+ esac -+ done -+ if [ "$shared_lib_found" = "yes" ]; then - x11_dga2=yes -+ fi - +- x11_dga2=yes +- ++ lib=Xxf86dga ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "yes" ]; then ++ x11_dga2=yes ++ fi ++ else echo "$as_me: failed program was:" >&5 -@@ -27056,7 +27106,22 @@ if { (eval echo "$as_me:27047: \"$ac_com - echo "$as_me:27056: \$? = $ac_status" >&5 + cat conftest.$ac_ext >&5 +@@ -27001,7 +27051,22 @@ if { (eval echo "$as_me:26992: \"$ac_com + echo "$as_me:27001: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + lib=Xv + shared_lib_found=no -+ for i in ${LDFLAGS}; do -+ case "$i" in ++ for i in ${LDFLAGS}; do ++ case "$i" in + -L*) + dir=`echo $i | sed "s,^-L,,"` + if [ -e $dir/lib${lib}.so ] || @@ -126,21 +129,21 @@ $NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ + break; + fi + esac -+ done ++ done + if [ "$shared_lib_found" = "yes" ]; then x11_xv=yes + fi else echo "$as_me: failed program was:" >&5 -@@ -27105,7 +27170,22 @@ if { (eval echo "$as_me:27096: \"$ac_com - echo "$as_me:27105: \$? = $ac_status" >&5 +@@ -27050,7 +27115,22 @@ if { (eval echo "$as_me:27041: \"$ac_com + echo "$as_me:27050: \$? = $ac_status" >&5 (exit $ac_status); }; }; then + lib=Xxf86vm + shared_lib_found=no + for i in ${LDFLAGS}; do -+ case "$i" in ++ case "$i" in + -L*) + dir=`echo $i | sed "s,^-L,,"` + if [ -e $dir/lib${lib}.so ] || @@ -156,7 +159,7 @@ $NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ else echo "$as_me: failed program was:" >&5 -@@ -27381,6 +27461,9 @@ esac +@@ -27326,6 +27406,9 @@ esac kde_mpeglib_compiles=no case "$OS_TYPE" in @@ -166,16 +169,18 @@ $NetBSD: patch-aa,v 1.2 2002/10/07 00:36:35 jlam Exp $ FreeBSD) kde_mpeglib_compiles=yes ;; -@@ -27647,9 +27730,10 @@ EOF +@@ -27592,10 +27675,10 @@ EOF ;; NetBSD) -- echo "$as_me:27650: result: NetBSD :Unknown hardware. You will have problems!!" >&5 +- echo "$as_me:27595: result: NetBSD :Unknown hardware. You will have problems!!" >&5 -echo "${ECHO_T}NetBSD :Unknown hardware. You will have problems!!" >&6 -+ echo "$as_me:27650: result: using -lpthread" >&5 -+echo $ECHO_N "using -lpthread... $ECHO_C" >&6 - OS_TYPE="BSD" -+ LIBPTHREAD="-lpthread" - +- OS_TYPE="BSD" +- ++ echo "$as_me:27650: result: using -lpthread" >&5 ++ echo $ECHO_N "using -lpthread... $ECHO_C" >&6 ++ OS_TYPE="BSD" ++ LIBPTHREAD="-lpthread" cat >>confdefs.h <<\EOF #define OS_BSD 1 + EOF diff --git a/audio/kdemultimedia3/patches/patch-ac b/audio/kdemultimedia3/patches/patch-ac index 0252c81ac58..55ecc5519bd 100644 --- a/audio/kdemultimedia3/patches/patch-ac +++ b/audio/kdemultimedia3/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ +$NetBSD: patch-ac,v 1.2 2003/01/02 09:12:21 skrll Exp $ ---- kaboodle/Makefile.in.orig Tue May 14 01:53:25 2002 +--- kaboodle/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ kaboodle/Makefile.in -@@ -293,7 +293,7 @@ +@@ -292,7 +292,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde SUBDIRS = pics actions @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ libkaboodlepart_la_SOURCES = conf.cpp \ controls.cpp \ -@@ -307,24 +307,26 @@ +@@ -306,24 +306,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \ libkaboodlepart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde @@ -21,8 +21,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ +kaboodle_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +libkaboodle_main_la_SOURCES = main.cpp \ - kaboodleapp.cpp \ - userinterface.cpp + kaboodleapp.cpp \ + userinterface.cpp -kaboodle_la_LIBADD = libkaboodlepart.la @@ -45,7 +45,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ applnk_DATA = kaboodle.desktop applnkdir = $(kde_appsdir)/Multimedia -@@ -337,15 +339,20 @@ +@@ -336,14 +338,19 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -59,21 +59,19 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ +libkaboodle_main_la_DEPENDENCIES = libkaboodlepart.la +am_libkaboodle_main_la_OBJECTS = main.lo kaboodleapp.lo userinterface.lo +#>- libkaboodle_main_la_OBJECTS = $(am_libkaboodle_main_la_OBJECTS) - #>+ 5 + #>+ 4 -kaboodle_la_final_OBJECTS = kaboodle_la.all_cpp.lo --kaboodle_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ -- kaboodle_la_meta_unload.lo +-kaboodle_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo -@KDE_USE_FINAL_FALSE@kaboodle_la_OBJECTS = $(kaboodle_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kaboodle_la_OBJECTS = $(kaboodle_la_final_OBJECTS) +libkaboodle_main_la_final_OBJECTS = libkaboodle_main_la.all_cpp.lo -+libkaboodle_main_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo \ -+ libkaboodle_main_la_meta_unload.lo ++libkaboodle_main_la_nofinal_OBJECTS = main.lo kaboodleapp.lo userinterface.lo +@KDE_USE_FINAL_FALSE@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkaboodle_main_la_OBJECTS = $(libkaboodle_main_la_final_OBJECTS) libkaboodlepart_la_DEPENDENCIES = am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \ kaboodle_factory.lo kaboodle_part.lo player.lo videoembed.lo -@@ -360,11 +367,11 @@ +@@ -357,11 +364,11 @@ libkaboodlepart_la_nofinal_OBJECTS = con bin_PROGRAMS = kaboodle$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -88,19 +86,42 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -373,8 +380,9 @@ +@@ -370,23 +377,26 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_factory.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/kaboodle_part.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \ -@@ -398,8 +406,8 @@ + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_factory.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kaboodle_part.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/videoembed.Plo +-#>+ 15 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kaboodle_la.all_cpp.P $(DEPDIR)/libkaboodlepart_la.all_cpp.P $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_factory.Plo \ ++#>+ 17 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkaboodle_main_la.all_cpp.P $(DEPDIR)/libkaboodlepart_la.all_cpp.P $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_part.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodleapp.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/player.Plo $(DEPDIR)/userinterface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/videoembed.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/conf.Plo $(DEPDIR)/controls.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/engine.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_factory.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/engine.Plo $(DEPDIR)/kaboodle_factory.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaboodle_part.Plo \ + @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 $(DEPDIR)/userinterface.Plo \ +@@ -411,8 +421,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -111,7 +132,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA) -@@ -409,7 +417,7 @@ +@@ -422,7 +432,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = AUTHORS Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -120,7 +141,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -458,6 +466,8 @@ +@@ -471,6 +481,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kaboodle.la: $(kaboodle_la_OBJECTS) $(kaboodle_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kaboodle_la_LDFLAGS) $(kaboodle_la_OBJECTS) $(kaboodle_la_LIBADD) $(LIBS) @@ -129,7 +150,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll 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) -@@ -499,9 +509,10 @@ +@@ -512,9 +524,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@ @@ -141,16 +162,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodle_part.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaboodleapp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -677,7 +688,7 @@ +@@ -690,7 +703,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=README-USERS kaboodle.desktop kaboodle_part.h conf.h kaboodle_factory.h engine.h kaboodlepartui.rc kaboodle_component.desktop videoembed.h player.h kaboodleapp.h kaboodleui.rc controls.h userinterface.h -+KDE_DIST=kaboodleapp.h kaboodle_factory.h libkaboodlepart.la.closure engine.h controls.h kaboodlepartui.rc kaboodleui.rc README-USERS kaboodle.desktop kaboodle_component.desktop kaboodle_part.h conf.h videoembed.h player.h dummy.cpp userinterface.h +-KDE_DIST=engine.h kaboodle_factory.h kaboodleapp.h kaboodle_part.h userinterface.h controls.h conf.h player.h kaboodleui.rc videoembed.h kaboodle.desktop README-USERS kaboodlepartui.rc kaboodle_component.desktop ++KDE_DIST=kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc README-USERS kaboodle.desktop kaboodle_component.desktop kaboodle_part.h conf.h videoembed.h player.h userinterface.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -739,7 +750,6 @@ +@@ -752,7 +765,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -158,7 +179,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -818,9 +828,6 @@ +@@ -831,9 +843,6 @@ uninstall-info: uninstall-info-recursive uninstall-libLTLIBRARIES uninstall-recursive @@ -168,91 +189,98 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp *.h -o $(podir)/kaboodle.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. -@@ -891,16 +898,16 @@ - - - #>+ 12 --kaboodle_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc -- @echo 'creating kaboodle_la_meta_unload.cpp' -- @-rm -f kaboodle_la_meta_unload.cpp -+libkaboodle_main_la_meta_unload.cpp: kaboodleapp.moc userinterface.moc -+ @echo 'creating libkaboodle_main_la_meta_unload.cpp' -+ @-rm -f libkaboodle_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kaboodle_la[] = {' > kaboodle_la_meta_unload.cpp ;\ -- cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaboodle_la_meta_unload.cpp ;\ -- echo '0};' >> kaboodle_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kaboodle_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kaboodle_la)' >> kaboodle_la_meta_unload.cpp ;\ -- else echo > kaboodle_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkaboodle_main_la[] = {' > libkaboodle_main_la_meta_unload.cpp ;\ -+ cat kaboodleapp.moc userinterface.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaboodle_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkaboodle_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkaboodle_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkaboodle_main_la)' >> libkaboodle_main_la_meta_unload.cpp ;\ -+ else echo > libkaboodle_main_la_meta_unload.cpp; fi - - - #>+ 12 -@@ -918,14 +925,14 @@ +@@ -850,26 +859,30 @@ libkaboodlepart.la.closure: $(libkaboodl + #>+ 3 - clean-moc-classes: -- -rm -f kaboodle_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp -+ -rm -f libkaboodle_main_la_meta_unload.cpp libkaboodlepart_la_meta_unload.cpp +-engine.moc: $(srcdir)/engine.h +- $(MOC) $(srcdir)/engine.h -o engine.moc ++kaboodle_part.moc: $(srcdir)/kaboodle_part.h ++ $(MOC) $(srcdir)/kaboodle_part.h -o kaboodle_part.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 + + #>+ 3 + kaboodleapp.moc: $(srcdir)/kaboodleapp.h + $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc + + #>+ 3 +-kaboodle_part.moc: $(srcdir)/kaboodle_part.h +- $(MOC) $(srcdir)/kaboodle_part.h -o kaboodle_part.moc ++userinterface.moc: $(srcdir)/userinterface.h ++ $(MOC) $(srcdir)/userinterface.h -o userinterface.moc + + #>+ 3 + kaboodle_factory.moc: $(srcdir)/kaboodle_factory.h + $(MOC) $(srcdir)/kaboodle_factory.h -o kaboodle_factory.moc + + #>+ 3 ++conf.moc: $(srcdir)/conf.h ++ $(MOC) $(srcdir)/conf.h -o conf.moc ++ ++#>+ 3 + player.moc: $(srcdir)/player.h + $(MOC) $(srcdir)/player.h -o player.moc + +@@ -878,16 +891,12 @@ videoembed.moc: $(srcdir)/videoembed.h + $(MOC) $(srcdir)/videoembed.h -o videoembed.moc + + #>+ 3 +-controls.moc: $(srcdir)/controls.h +- $(MOC) $(srcdir)/controls.h -o controls.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 + + #>+ 3 + clean-metasources: +- -rm -f engine.moc userinterface.moc kaboodleapp.moc kaboodle_part.moc kaboodle_factory.moc player.moc videoembed.moc controls.moc conf.moc ++ -rm -f kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc + + #>+ 3 + clean-closures: +@@ -904,19 +913,19 @@ force-reedit: - #>+ 11 --kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp kaboodle_la_meta_unload.cpp -+kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp - @echo 'creating kaboodle_la.all_cpp.cpp ...'; \ - rm -f kaboodle_la.all_cpp.files kaboodle_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaboodle_la.all_cpp.final; \ -- for file in main.cpp kaboodleapp.cpp userinterface.cpp kaboodle_la_meta_unload.cpp ; do \ -+ for file in kaboodle_main.cpp ; do \ - echo "#include \"$$file\"" >> kaboodle_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle_la.all_cpp.final; \ - done; \ -@@ -933,7 +940,19 @@ - rm -f kaboodle_la.all_cpp.final kaboodle_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)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc -+libkaboodle_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp libkaboodle_main_la_meta_unload.cpp +-kaboodle_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp userinterface.moc kaboodleapp.moc +- @echo 'creating kaboodle_la.all_cpp.cpp ...'; \ +- rm -f kaboodle_la.all_cpp.files kaboodle_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kaboodle_la.all_cpp.final; \ ++libkaboodle_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaboodleapp.cpp $(srcdir)/userinterface.cpp kaboodleapp.moc userinterface.moc + @echo 'creating libkaboodle_main_la.all_cpp.cpp ...'; \ + rm -f libkaboodle_main_la.all_cpp.files libkaboodle_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkaboodle_main_la.all_cpp.final; \ -+ for file in main.cpp kaboodleapp.cpp userinterface.cpp libkaboodle_main_la_meta_unload.cpp ; do \ + for file in main.cpp kaboodleapp.cpp userinterface.cpp ; do \ +- echo "#include \"$$file\"" >> kaboodle_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkaboodle_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaboodle_main_la.all_cpp.final; \ -+ done; \ -+ cat libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files > libkaboodle_main_la.all_cpp.cpp; \ + done; \ +- cat kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files > kaboodle_la.all_cpp.cpp; \ +- rm -f kaboodle_la.all_cpp.final kaboodle_la.all_cpp.files ++ cat libkaboodle_main_la.all_cpp.final libkaboodle_main_la.all_cpp.files > libkaboodle_main_la.all_cpp.cpp; \ + 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)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp $(srcdir)/libkaboodlepart_la_meta_unload.cpp kaboodle_part.moc controls.moc kaboodleapp.moc userinterface.moc kaboodle_factory.moc conf.moc player.moc videoembed.moc engine.moc + + #>+ 11 +-libkaboodlepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/conf.cpp $(srcdir)/controls.cpp $(srcdir)/engine.cpp $(srcdir)/kaboodle_factory.cpp $(srcdir)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp kaboodle_factory.moc kaboodle_part.moc player.moc conf.moc engine.moc videoembed.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)/kaboodle_part.cpp $(srcdir)/player.cpp $(srcdir)/videoembed.cpp kaboodle_part.moc controls.moc kaboodle_factory.moc conf.moc player.moc videoembed.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; \ -@@ -945,11 +964,11 @@ - rm -f libkaboodlepart_la.all_cpp.final libkaboodlepart_la.all_cpp.files - - #>+ 11 --kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kaboodle.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaboodle_main.cpp - @echo 'creating kaboodle.all_cpp.cpp ...'; \ - rm -f kaboodle.all_cpp.files kaboodle.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaboodle.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kaboodle_main.cpp ; do \ - echo "#include \"$$file\"" >> kaboodle.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaboodle.all_cpp.final; \ - done; \ -@@ -958,20 +977,20 @@ +@@ -929,20 +938,20 @@ libkaboodlepart_la.all_cpp.cpp: $(srcdir #>+ 3 clean-final: -- -rm -f kaboodle_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp -+ -rm -f kaboodle_la.all_cpp.cpp libkaboodle_main_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp kaboodle.all_cpp.cpp +- -rm -f kaboodle_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp ++ -rm -f libkaboodle_main_la.all_cpp.cpp libkaboodlepart_la.all_cpp.cpp #>+ 2 final: @@ -272,4 +300,36 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ + $(MAKE) libkaboodle_main_la_OBJECTS="$(libkaboodle_main_la_nofinal_OBJECTS)" libkaboodlepart_la_OBJECTS="$(libkaboodlepart_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -952,21 +961,21 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 19 +-controls.o: controls.moc +-userinterface.lo: userinterface.moc +-kaboodle_part.o: kaboodle_part.moc + videoembed.lo: videoembed.moc +-kaboodleapp.o: kaboodleapp.moc +-kaboodleapp.lo: kaboodleapp.moc + videoembed.o: videoembed.moc +-kaboodle_factory.o: kaboodle_factory.moc +-engine.lo: engine.moc +-kaboodle_factory.lo: kaboodle_factory.moc + conf.o: conf.moc +-kaboodle_part.lo: kaboodle_part.moc + player.o: player.moc +-player.lo: player.moc + userinterface.o: userinterface.moc ++kaboodleapp.o: kaboodleapp.moc ++kaboodle_factory.o: kaboodle_factory.moc + controls.lo: controls.moc ++engine.lo: engine.moc ++kaboodle_factory.lo: kaboodle_factory.moc + engine.o: engine.moc ++controls.o: controls.moc + conf.lo: conf.moc ++kaboodleapp.lo: kaboodleapp.moc ++player.lo: player.moc ++kaboodle_part.o: kaboodle_part.moc ++userinterface.lo: userinterface.moc ++kaboodle_part.lo: kaboodle_part.moc diff --git a/audio/kdemultimedia3/patches/patch-af b/audio/kdemultimedia3/patches/patch-af index 0728c3f861c..0a17f319ab1 100644 --- a/audio/kdemultimedia3/patches/patch-af +++ b/audio/kdemultimedia3/patches/patch-af @@ -1,13 +1,14 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 14:46:48 skrll Exp $ +$NetBSD: patch-af,v 1.2 2003/01/02 09:12:21 skrll Exp $ ---- kmidi/Makefile.in.orig Tue May 14 01:53:26 2002 +--- kmidi/Makefile.in.orig Sat Dec 21 07:07:51 2002 +++ kmidi/Makefile.in -@@ -409,7 +409,7 @@ +@@ -407,7 +407,8 @@ kmidi_OBJECTS = kmidi.$(OBJEXT) playlist + resample_f.$(OBJEXT) midiapplication.$(OBJEXT) \ kmidiframe.$(OBJEXT) kmidifiledlg.$(OBJEXT) \ - qttableview.$(OBJEXT) \ - kmidi_meta_unload.o + qttableview.$(OBJEXT) -kmidi_LDADD = $(LDADD) +kmidi_LDADD = $(LIBOSSAUDIO) $(LDADD) ++ kmidi_DEPENDENCIES = kmidi_LDFLAGS = am_sf2cfg_OBJECTS = sf2cfg.$(OBJEXT) readsbk.$(OBJEXT) diff --git a/audio/kdemultimedia3/patches/patch-ak b/audio/kdemultimedia3/patches/patch-ak index 978c9f13669..cb0c84aedcc 100644 --- a/audio/kdemultimedia3/patches/patch-ak +++ b/audio/kdemultimedia3/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ +$NetBSD: patch-ak,v 1.3 2003/01/02 09:12:21 skrll Exp $ ---- kmix/Makefile.in.orig Tue May 14 01:53:26 2002 +--- kmix/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ kmix/Makefile.in -@@ -293,7 +293,7 @@ +@@ -292,7 +292,7 @@ SUBDIRS = control pics INCLUDES = $(all_includes) bin_PROGRAMS = kmix kmixctrl @@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ kde_module_LTLIBRARIES = kmix_panelapplet.la noinst_HEADERS = kmix.h kmixdockwidget.h kmixprefdlg.h kmixerwidget.h \ -@@ -302,23 +302,31 @@ +@@ -301,23 +301,31 @@ noinst_HEADERS = kmix.h kmixdockwidget.h METASOURCES = AUTO @@ -51,7 +51,7 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version #>- kmix_panelapplet_la_METASOURCES = AUTO -@@ -352,19 +360,11 @@ +@@ -351,18 +359,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -62,12 +62,11 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ +kmix_la_DEPENDENCIES = libkmix_main.la +am_kmix_la_OBJECTS = kmix_main.lo #>- kmix_la_OBJECTS = $(am_kmix_la_OBJECTS) --#>+ 7 +-#>+ 6 -kmix_la_final_OBJECTS = kmix_la.all_cpp.lo -kmix_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo kmixprefdlg.lo \ - kmixerwidget.lo channel.lo mixer.lo ksmallslider.lo volume.lo \ -- kledbutton.lo mixdevicewidget.lo \ -- kmix_la_meta_unload.lo +- kledbutton.lo mixdevicewidget.lo -@KDE_USE_FINAL_FALSE@kmix_la_OBJECTS = $(kmix_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kmix_la_OBJECTS = $(kmix_la_final_OBJECTS) +#>+ 1 @@ -75,8 +74,8 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ kmix_panelapplet_la_DEPENDENCIES = am_kmix_panelapplet_la_OBJECTS = kmixapplet.lo kmixerwidget.lo \ channel.lo mixer.lo ksmallslider.lo volume.lo kledbutton.lo \ -@@ -378,28 +378,48 @@ - kmix_panelapplet_la_meta_unload.lo +@@ -375,27 +376,46 @@ kmix_panelapplet_la_nofinal_OBJECTS = km + mixdevicewidget.lo colorwidget.lo @KDE_USE_FINAL_FALSE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kmix_panelapplet_la_OBJECTS = $(kmix_panelapplet_la_final_OBJECTS) -kmixctrl_la_DEPENDENCIES = @@ -84,10 +83,9 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ +kmixctrl_la_DEPENDENCIES = libkmixctrl_main.la +am_kmixctrl_la_OBJECTS = kmixctrl_main.lo #>- kmixctrl_la_OBJECTS = $(am_kmixctrl_la_OBJECTS) --#>+ 5 +-#>+ 4 -kmixctrl_la_final_OBJECTS = kmixctrl_la.all_cpp.lo --kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo \ -- kmixctrl_la_meta_unload.lo +-kmixctrl_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo volume.lo -@KDE_USE_FINAL_FALSE@kmixctrl_la_OBJECTS = $(kmixctrl_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kmixctrl_la_OBJECTS = $(kmixctrl_la_final_OBJECTS) +#>+ 1 @@ -97,23 +95,21 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ + kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ + ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo +#>- libkmix_main_la_OBJECTS = $(am_libkmix_main_la_OBJECTS) -+#>+ 7 ++#>+ 6 +libkmix_main_la_final_OBJECTS = libkmix_main_la.all_cpp.lo +libkmix_main_la_nofinal_OBJECTS = main.lo kmix.lo kmixdockwidget.lo \ + kmixprefdlg.lo kmixerwidget.lo channel.lo mixer.lo \ -+ ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo \ -+ libkmix_main_la_meta_unload.lo ++ ksmallslider.lo volume.lo kledbutton.lo mixdevicewidget.lo +@KDE_USE_FINAL_FALSE@libkmix_main_la_OBJECTS = $(libkmix_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkmix_main_la_OBJECTS = $(libkmix_main_la_final_OBJECTS) +libkmixctrl_main_la_DEPENDENCIES = +am_libkmixctrl_main_la_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ + volume.lo +#>- libkmixctrl_main_la_OBJECTS = $(am_libkmixctrl_main_la_OBJECTS) -+#>+ 6 ++#>+ 5 +libkmixctrl_main_la_final_OBJECTS = libkmixctrl_main_la.all_cpp.lo +libkmixctrl_main_la_nofinal_OBJECTS = kmixctrl.lo channel.lo mixer.lo \ -+ volume.lo \ -+ libkmixctrl_main_la_meta_unload.lo ++ volume.lo +@KDE_USE_FINAL_FALSE@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkmixctrl_main_la_OBJECTS = $(libkmixctrl_main_la_final_OBJECTS) bin_PROGRAMS = kmix$(EXEEXT) kmixctrl$(EXEEXT) @@ -138,22 +134,52 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -407,9 +427,11 @@ +@@ -403,28 +423,34 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/kmixdockwidget.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kmixerwidget.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kmixprefdlg.Plo \ -@@ -436,7 +458,9 @@ +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kmixctrl_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kmixdockwidget.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kmixerwidget.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kmixprefdlg.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/ksmallslider.Plo $(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/mixdevicewidget.Plo $(DEPDIR)/mixer.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/volume.Plo +-#>+ 19 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_la.all_cpp.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/kmixctrl_la.all_cpp.P $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ ++#>+ 23 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/kmix_panelapplet_la.all_cpp.P $(DEPDIR)/libkmix_main_la.all_cpp.P $(DEPDIR)/libkmixctrl_main_la.all_cpp.P $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmixdockwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmixerwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmixprefdlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksmallslider.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/mixdevicewidget.Plo $(DEPDIR)/mixer.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/volume.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/channel.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kledbutton.Plo $(DEPDIR)/kmix.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmixapplet.Plo $(DEPDIR)/kmixctrl.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/colorwidget.P $(DEPDIR)/channel.Plo $(DEPDIR)/kledbutton.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmix.Plo $(DEPDIR)/kmix_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmix_main.Po $(DEPDIR)/kmixapplet.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl.Plo $(DEPDIR)/kmixctrl_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmixctrl_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmixdockwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmixerwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmixprefdlg.Plo \ +@@ -452,7 +478,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \ @@ -164,7 +190,7 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ DATA = $(apps_DATA) $(lnk_DATA) $(rc_DATA) $(services_DATA) HEADERS = $(noinst_HEADERS) -@@ -448,7 +472,7 @@ +@@ -464,7 +492,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -173,7 +199,7 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -523,6 +547,10 @@ +@@ -539,6 +567,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) @@ -184,7 +210,7 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -561,11 +589,14 @@ +@@ -577,11 +609,14 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/channel.Plo@am__quote@ @@ -200,25 +226,16 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll 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@ -@@ -760,7 +791,7 @@ +@@ -776,7 +811,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=mixer_irix.h mixer_hpux.cpp resource.h mixer_irix.cpp mixer_sun.h mixer_none.cpp mixer_none.h mixer_alsa.cpp kmixapplet.desktop colorwidget.ui kmix-platforms.cpp configure.in.in mixer_hpux.h kmixui.rc kmixctrl_restore.desktop mixer_oss.cpp mixer_sun.cpp mixer_oss.h mixer_alsa.h +-KDE_DIST=mixer_hpux.h mixer_irix.h resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_none.cpp mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop mixer_alsa.cpp mixer_irix.cpp mixer_sun.cpp configure.in.in kmixctrl_restore.desktop mixer_oss.cpp mixer_none.h mixer_oss.h +KDE_DIST=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_sun.cpp mixer_none.cpp mixer_none.h mixer_oss.h mixer_alsa.cpp kmixapplet.desktop mixer_alsa.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -860,7 +891,7 @@ - - #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES - #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES -+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES - - install-info: install-info-recursive - -@@ -914,9 +945,6 @@ +@@ -930,9 +965,6 @@ $(srcdir)/version.h: VERSION messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kmix.pot @@ -228,152 +245,130 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -1003,19 +1031,6 @@ - - - #>+ 12 --kmix_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc -- @echo 'creating kmix_la_meta_unload.cpp' -- @-rm -f kmix_la_meta_unload.cpp -- @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kmix_la[] = {' > kmix_la_meta_unload.cpp ;\ -- cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmix_la_meta_unload.cpp ;\ -- echo '0};' >> kmix_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kmix_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kmix_la)' >> kmix_la_meta_unload.cpp ;\ -- else echo > kmix_la_meta_unload.cpp; fi -- -- --#>+ 12 - kmix_panelapplet_la_meta_unload.cpp: mixdevicewidget.moc ksmallslider.moc colorwidget.moc mixer.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc - @echo 'creating kmix_panelapplet_la_meta_unload.cpp' - @-rm -f kmix_panelapplet_la_meta_unload.cpp -@@ -1029,28 +1044,41 @@ - - - #>+ 12 --kmixctrl_la_meta_unload.cpp: mixer.moc -- @echo 'creating kmixctrl_la_meta_unload.cpp' -- @-rm -f kmixctrl_la_meta_unload.cpp -+libkmix_main_la_meta_unload.cpp: kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc -+ @echo 'creating libkmix_main_la_meta_unload.cpp' -+ @-rm -f libkmix_main_la_meta_unload.cpp -+ @if test ${kde_qtver} = 2; then \ -+ echo 'static const char * _metalist_libkmix_main_la[] = {' > libkmix_main_la_meta_unload.cpp ;\ -+ cat kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmix_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkmix_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkmix_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkmix_main_la)' >> libkmix_main_la_meta_unload.cpp ;\ -+ else echo > libkmix_main_la_meta_unload.cpp; fi -+ -+ -+#>+ 12 -+libkmixctrl_main_la_meta_unload.cpp: mixer.moc -+ @echo 'creating libkmixctrl_main_la_meta_unload.cpp' -+ @-rm -f libkmixctrl_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kmixctrl_la[] = {' > kmixctrl_la_meta_unload.cpp ;\ -- cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmixctrl_la_meta_unload.cpp ;\ -- echo '0};' >> kmixctrl_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kmixctrl_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kmixctrl_la)' >> kmixctrl_la_meta_unload.cpp ;\ -- else echo > kmixctrl_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkmixctrl_main_la[] = {' > libkmixctrl_main_la_meta_unload.cpp ;\ -+ cat mixer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmixctrl_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkmixctrl_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkmixctrl_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkmixctrl_main_la)' >> libkmixctrl_main_la_meta_unload.cpp ;\ -+ else echo > libkmixctrl_main_la_meta_unload.cpp; fi +@@ -962,44 +994,44 @@ colorwidget.moc: colorwidget.h + $(MOC) colorwidget.h -o colorwidget.moc + #>+ 3 +-ksmallslider.moc: $(srcdir)/ksmallslider.h +- $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc ++kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h ++ $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc #>+ 3 - clean-moc-classes: -- -rm -f kmix_la_meta_unload.cpp kmix_panelapplet_la_meta_unload.cpp kmixctrl_la_meta_unload.cpp -+ -rm -f kmix_panelapplet_la_meta_unload.cpp libkmix_main_la_meta_unload.cpp libkmixctrl_main_la_meta_unload.cpp +-kmixapplet.moc: $(srcdir)/kmixapplet.h +- $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc ++mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h ++ $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc + + #>+ 3 +-kmix.moc: $(srcdir)/kmix.h +- $(MOC) $(srcdir)/kmix.h -o kmix.moc ++ksmallslider.moc: $(srcdir)/ksmallslider.h ++ $(MOC) $(srcdir)/ksmallslider.h -o ksmallslider.moc + + #>+ 3 +-mixer.moc: $(srcdir)/mixer.h +- $(MOC) $(srcdir)/mixer.h -o mixer.moc ++kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h ++ $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc + + #>+ 3 +-kmixerwidget.moc: $(srcdir)/kmixerwidget.h +- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc ++mixer.moc: $(srcdir)/mixer.h ++ $(MOC) $(srcdir)/mixer.h -o mixer.moc + + #>+ 3 +-kledbutton.moc: $(srcdir)/kledbutton.h +- $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc ++kmix.moc: $(srcdir)/kmix.h ++ $(MOC) $(srcdir)/kmix.h -o kmix.moc + + #>+ 3 +-kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h +- $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc ++kmixapplet.moc: $(srcdir)/kmixapplet.h ++ $(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc + + #>+ 3 +-mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h +- $(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc ++kledbutton.moc: $(srcdir)/kledbutton.h ++ $(MOC) $(srcdir)/kledbutton.h -o kledbutton.moc + + #>+ 3 +-kmixprefdlg.moc: $(srcdir)/kmixprefdlg.h +- $(MOC) $(srcdir)/kmixprefdlg.h -o kmixprefdlg.moc ++kmixerwidget.moc: $(srcdir)/kmixerwidget.h ++ $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc + + #>+ 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 kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kmixapplet.moc kledbutton.moc kmixerwidget.moc + + #>+ 4 + clean-ui: +@@ -1021,19 +1053,7 @@ force-reedit: - #>+ 11 --kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix_la_meta_unload.cpp -+kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmix_main.cpp - @echo 'creating kmix_la.all_cpp.cpp ...'; \ - rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \ -- for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp kmix_la_meta_unload.cpp ; do \ -+ for file in kmix_main.cpp ; do \ - echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \ - done; \ -@@ -1070,11 +1098,11 @@ - rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files #>+ 11 --kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp kmixctrl_la_meta_unload.cpp -+kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl_main.cpp - @echo 'creating kmixctrl_la.all_cpp.cpp ...'; \ - rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \ -- for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp kmixctrl_la_meta_unload.cpp ; do \ -+ for file in kmixctrl_main.cpp ; do \ - echo "#include \"$$file\"" >> kmixctrl_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl_la.all_cpp.final; \ - done; \ -@@ -1082,11 +1110,35 @@ - rm -f kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files +-kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix.moc kmixdockwidget.moc ksmallslider.moc mixer.moc kmixerwidget.moc kledbutton.moc kmixprefdlg.moc mixdevicewidget.moc +- @echo 'creating kmix_la.all_cpp.cpp ...'; \ +- rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \ +- for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp ; do \ +- echo "#include \"$$file\"" >> kmix_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix_la.all_cpp.final; \ +- done; \ +- cat kmix_la.all_cpp.final kmix_la.all_cpp.files > kmix_la.all_cpp.cpp; \ +- rm -f kmix_la.all_cpp.final kmix_la.all_cpp.files +- +-#>+ 11 +-kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp colorwidget.cpp kmixapplet.moc ksmallslider.moc colorwidget.moc mixer.moc kmixerwidget.moc kledbutton.moc mixdevicewidget.moc ++kmix_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixapplet.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp 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; \ +@@ -1045,33 +1065,45 @@ kmix_panelapplet_la.all_cpp.cpp: $(srcdi + rm -f kmix_panelapplet_la.all_cpp.final kmix_panelapplet_la.all_cpp.files #>+ 11 --kmix.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp +-kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp mixer.moc +- @echo 'creating kmixctrl_la.all_cpp.cpp ...'; \ +- rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \ ++libkmix_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmixdockwidget.moc mixdevicewidget.moc ksmallslider.moc kmixprefdlg.moc mixer.moc kmix.moc kledbutton.moc kmixerwidget.moc + @echo 'creating libkmix_main_la.all_cpp.cpp ...'; \ + rm -f libkmix_main_la.all_cpp.files libkmix_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmix_main_la.all_cpp.final; \ -+ for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp libkmix_main_la_meta_unload.cpp ; do \ ++ for file in main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp kmixerwidget.cpp channel.cpp mixer.cpp ksmallslider.cpp volume.cpp kledbutton.cpp mixdevicewidget.cpp ; do \ + echo "#include \"$$file\"" >> libkmix_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmix_main_la.all_cpp.final; \ + done; \ -+ cat libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files > libkmix_main_la.all_cpp.cpp; \ ++ cat libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files > libkmix_main_la.all_cpp.cpp; \ + rm -f libkmix_main_la.all_cpp.final libkmix_main_la.all_cpp.files + +#>+ 11 -+libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp libkmixctrl_main_la_meta_unload.cpp ++libkmixctrl_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp mixer.moc + @echo 'creating libkmixctrl_main_la.all_cpp.cpp ...'; \ + rm -f libkmixctrl_main_la.all_cpp.files libkmixctrl_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmixctrl_main_la.all_cpp.final; \ -+ for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp libkmixctrl_main_la_meta_unload.cpp ; do \ + for file in kmixctrl.cpp channel.cpp mixer.cpp volume.cpp ; do \ +- echo "#include \"$$file\"" >> kmixctrl_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkmixctrl_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmixctrl_main_la.all_cpp.final; \ -+ done; \ -+ cat libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files > libkmixctrl_main_la.all_cpp.cpp; \ -+ rm -f libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files -+ -+#>+ 11 -+kmix.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmix_main.cpp - @echo 'creating kmix.all_cpp.cpp ...'; \ - rm -f kmix.all_cpp.files kmix.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmix.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kmix_main.cpp ; do \ - echo "#include \"$$file\"" >> kmix.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmix.all_cpp.final; \ done; \ -@@ -1094,11 +1146,11 @@ - rm -f kmix.all_cpp.final kmix.all_cpp.files - - #>+ 11 --kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl_main.cpp - @echo 'creating kmixctrl.all_cpp.cpp ...'; \ - rm -f kmixctrl.all_cpp.files kmixctrl.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmixctrl.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kmixctrl_main.cpp ; do \ - echo "#include \"$$file\"" >> kmixctrl.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmixctrl.all_cpp.final; \ - done; \ -@@ -1107,20 +1159,20 @@ +- cat kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files > kmixctrl_la.all_cpp.cpp; \ +- rm -f kmixctrl_la.all_cpp.final kmixctrl_la.all_cpp.files ++ cat libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files > libkmixctrl_main_la.all_cpp.cpp; \ ++ rm -f libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp -+ -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp libkmix_main_la.all_cpp.cpp libkmixctrl_main_la.all_cpp.cpp kmix.all_cpp.cpp kmixctrl.all_cpp.cpp +- -rm -f kmix_la.all_cpp.cpp kmix_panelapplet_la.all_cpp.cpp kmixctrl_la.all_cpp.cpp ++ -rm -f kmix_panelapplet_la.all_cpp.cpp libkmix_main_la.all_cpp.cpp libkmixctrl_main_la.all_cpp.cpp #>+ 2 final: @@ -393,4 +388,53 @@ $NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $ + $(MAKE) kmix_panelapplet_la_OBJECTS="$(kmix_panelapplet_la_nofinal_OBJECTS)" libkmix_main_la_OBJECTS="$(libkmix_main_la_nofinal_OBJECTS)" libkmixctrl_main_la_OBJECTS="$(libkmixctrl_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -1081,29 +1113,29 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 27 +-$(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 +-kmixprefdlg.lo: kmixprefdlg.moc +-kmix.lo: kmix.moc + mixer.lo: mixer.moc +-mixdevicewidget.lo: mixdevicewidget.moc ++kmixapplet.lo: kmixapplet.moc ++ksmallslider.lo: ksmallslider.moc + kmixerwidget.o: kmixerwidget.moc +-kmixdockwidget.o: kmixdockwidget.moc ++mixdevicewidget.o: mixdevicewidget.moc ++kmixdockwidget.lo: kmixdockwidget.moc ++$(srcdir)/mixdevicewidget.cpp: colorwidget.h + $(srcdir)/kmixerwidget.cpp: colorwidget.h ++kmix.o: kmix.moc ++$(srcdir)/mixer.cpp: colorwidget.h ++kmix.lo: kmix.moc ++$(srcdir)/channel.cpp: colorwidget.h ++kmixprefdlg.o: kmixprefdlg.moc + $(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 ++kledbutton.o: kledbutton.moc ++kmixprefdlg.lo: kmixprefdlg.moc + kmixapplet.o: kmixapplet.moc +-ksmallslider.lo: ksmallslider.moc +-kmixdockwidget.lo: kmixdockwidget.moc ++kledbutton.lo: kledbutton.moc ++$(srcdir)/volume.cpp: colorwidget.h ++$(srcdir)/ksmallslider.cpp: colorwidget.h ++$(srcdir)/kmixapplet.cpp: colorwidget.h ++kmixdockwidget.o: kmixdockwidget.moc diff --git a/audio/kdemultimedia3/patches/patch-az b/audio/kdemultimedia3/patches/patch-az index d215dff6e50..d7be4923e9f 100644 --- a/audio/kdemultimedia3/patches/patch-az +++ b/audio/kdemultimedia3/patches/patch-az @@ -1,8 +1,8 @@ -$NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ +$NetBSD: patch-az,v 1.3 2003/01/02 09:12:21 skrll Exp $ ---- noatun/Makefile.in.orig Tue May 14 01:53:28 2002 +--- noatun/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/Makefile.in -@@ -295,22 +295,25 @@ +@@ -294,22 +294,25 @@ SUBDIRS = pics library modules . KDE_ICON = AUTO @@ -35,7 +35,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ applnk_DATA = noatun.desktop applnkdir = $(kde_appsdir)/Multimedia -@@ -328,25 +331,31 @@ +@@ -327,25 +330,31 @@ subdir = noatun mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -78,19 +78,31 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ am_noatun20update_OBJECTS = noatun20update.$(OBJEXT) #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS) #>+ 1 -@@ -359,8 +368,9 @@ +@@ -358,13 +367,16 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po +-#>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/noatun_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/joinhandler.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/noatun20update.Po ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po ++#>+ 7 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/libnoatun_main_la.all_cpp.P $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/joinhandler_skel.P $(DEPDIR)/joinhandler.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/noatun20update.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/noatun_main.Plo $(DEPDIR)/noatun_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -380,8 +390,8 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -385,8 +397,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -101,7 +113,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ DATA = $(applnk_DATA) $(presets_DATA) $(update_DATA) -@@ -391,7 +401,7 @@ +@@ -396,7 +408,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = COPYING Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -110,7 +122,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -438,6 +448,27 @@ +@@ -443,6 +455,27 @@ uninstall-kde_moduleLTLIBRARIES: clean-kde_moduleLTLIBRARIES: -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) @@ -118,17 +130,17 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ if test -f $$p; then \ -+ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ -+ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ -+ else :; fi; \ ++ if test -f $$p; then \ ++ echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ ++ else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ -+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ ++ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \ ++ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +clean-libLTLIBRARIES: @@ -138,7 +150,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ noatun.la: $(noatun_la_OBJECTS) $(noatun_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(noatun_la_LDFLAGS) $(noatun_la_OBJECTS) $(noatun_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) -@@ -501,10 +532,11 @@ +@@ -506,10 +539,11 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -151,16 +163,16 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ distclean-depend: -rm -rf $(DEPDIR) -@@ -674,7 +706,7 @@ +@@ -679,7 +713,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=avideoframe.cc hi22-app-noatun.png hi48-app-noatun.png noatun.desktop hi32-app-noatun.png preset.dance CHANGES preset.jazz FILES preset.metal hi16-app-noatun.png preset.trance joinhandler.h noatun.upd configure.in.in avideoframe.h preset.zero artsvideo.idl -+KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png noatun hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal joinhandler.kidl hi16-app-noatun.png noatun20update preset.zero hi32-app-noatun.png preset.dance +-KDE_DIST=artsvideo.idl preset.jazz hi22-app-noatun.png preset.trance joinhandler.h hi16-app-noatun.png FILES hi48-app-noatun.png avideoframe.h CHANGES preset.metal configure.in.in noatun.upd noatun.desktop preset.dance hi32-app-noatun.png preset.zero avideoframe.cc ++KDE_DIST=preset.trance artsvideo.idl joinhandler.h CHANGES avideoframe.cc noatun.upd configure.in.in preset.jazz hi22-app-noatun.png hi48-app-noatun.png noatun.desktop FILES avideoframe.h preset.metal hi16-app-noatun.png preset.zero hi32-app-noatun.png preset.dance DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -714,9 +746,11 @@ +@@ -719,9 +753,11 @@ distdir: $(DISTFILES) check-am: all-am check: check-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) @@ -173,7 +185,7 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ install: install-recursive install-exec: install-exec-recursive -@@ -734,7 +768,6 @@ +@@ -739,7 +775,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -181,14 +193,14 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -747,10 +780,12 @@ +@@ -752,10 +787,12 @@ maintainer-clean-generic: clean: kde-rpo-clean clean-recursive #>- clean-am: clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ --#>- clean-libtool clean-updatePROGRAMS mostlyclean-am +-#>- clean-libtool clean-updatePROGRAMS mostlyclean-am -#>+ 2 -+#>- clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ -+#>- mostlyclean-am ++#>- clean-libLTLIBRARIES clean-libtool clean-updatePROGRAMS \ ++#>- mostlyclean-am +#>+ 3 clean-am: clean-idl clean-final clean-binPROGRAMS clean-generic clean-kde_moduleLTLIBRARIES \ - clean-libtool clean-updatePROGRAMS mostlyclean-am @@ -197,26 +209,26 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ distclean: distclean-recursive -@@ -773,9 +808,9 @@ - install-data-am: install-kde-icons install-applnkDATA \ +@@ -776,9 +813,9 @@ info-am: + install-data-am: install-kde-icons install-applnkDATA \ install-presetsDATA install-updateDATA install-updatePROGRAMS -#>- install-exec-am: install-binPROGRAMS +#>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS -+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES +-install-exec-am: install-binPROGRAMS install-kde_moduleLTLIBRARIES ++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES install-info: install-info-recursive -@@ -794,43 +829,42 @@ +@@ -797,43 +834,42 @@ mostlyclean-am: mostlyclean-compile most #>- uninstall-am: uninstall-applnkDATA uninstall-binPROGRAMS \ - #>- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ --#>- uninstall-presetsDATA uninstall-updateDATA \ --#>- uninstall-updatePROGRAMS -+#>- uninstall-libLTLIBRARIES uninstall-presetsDATA \ -+#>- uninstall-updateDATA uninstall-updatePROGRAMS + #>- uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +-#>- uninstall-presetsDATA uninstall-updateDATA \ +-#>- uninstall-updatePROGRAMS ++#>- uninstall-libLTLIBRARIES uninstall-presetsDATA \ ++#>- uninstall-updateDATA uninstall-updatePROGRAMS #>+ 4 uninstall-am: uninstall-kde-icons uninstall-applnkDATA uninstall-binPROGRAMS \ uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ @@ -274,52 +286,33 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ messages: $(EXTRACTRC) `find . -name "*.rc"` > rc.cpp $(XGETTEXT) rc.cpp `find . -name "*.cc" -o -name "*.cpp" -print` -o $(podir)/noatun.pot -@@ -877,11 +911,23 @@ +@@ -880,33 +916,33 @@ force-reedit: #>+ 11 --noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp joinhandler_skel.cpp -+libnoatun_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp $(srcdir)/joinhandler_skel.cpp +-noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp joinhandler_skel.cpp +- @echo 'creating noatun_la.all_cpp.cpp ...'; \ +- rm -f noatun_la.all_cpp.files noatun_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> noatun_la.all_cpp.final; \ ++libnoatun_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/joinhandler.cpp joinhandler_skel.cpp + @echo 'creating libnoatun_main_la.all_cpp.cpp ...'; \ + rm -f libnoatun_main_la.all_cpp.files libnoatun_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libnoatun_main_la.all_cpp.final; \ -+ for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ + for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ +- echo "#include \"$$file\"" >> noatun_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libnoatun_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_main_la.all_cpp.final; \ -+ done; \ -+ cat libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files > libnoatun_main_la.all_cpp.cpp; \ -+ rm -f libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files -+ -+#>+ 11 -+noatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatun_main.cpp - @echo 'creating noatun_la.all_cpp.cpp ...'; \ - rm -f noatun_la.all_cpp.files noatun_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_la.all_cpp.final; \ -- for file in main.cpp joinhandler.cpp joinhandler_skel.cpp ; do \ -+ for file in noatun_main.cpp ; do \ - echo "#include \"$$file\"" >> noatun_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun_la.all_cpp.final; \ done; \ -@@ -889,11 +935,11 @@ - rm -f noatun_la.all_cpp.final noatun_la.all_cpp.files - - #>+ 11 --noatun.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+noatun.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatun_main.cpp - @echo 'creating noatun.all_cpp.cpp ...'; \ - rm -f noatun.all_cpp.files noatun.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in noatun_main.cpp ; do \ - echo "#include \"$$file\"" >> noatun.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> noatun.all_cpp.final; \ - done; \ -@@ -914,20 +960,20 @@ +- cat noatun_la.all_cpp.final noatun_la.all_cpp.files > noatun_la.all_cpp.cpp; \ +- rm -f noatun_la.all_cpp.final noatun_la.all_cpp.files ++ cat libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files > libnoatun_main_la.all_cpp.cpp; \ ++ rm -f libnoatun_main_la.all_cpp.final libnoatun_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f noatun_la.all_cpp.cpp noatun.all_cpp.cpp noatun20update.all_cpp.cpp -+ -rm -f libnoatun_main_la.all_cpp.cpp noatun_la.all_cpp.cpp noatun.all_cpp.cpp noatun20update.all_cpp.cpp +- -rm -f noatun_la.all_cpp.cpp ++ -rm -f libnoatun_main_la.all_cpp.cpp #>+ 2 final: @@ -339,4 +332,4 @@ $NetBSD: patch-az,v 1.2 2002/06/25 06:34:33 skrll Exp $ + $(MAKE) libnoatun_main_la_OBJECTS="$(libnoatun_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/audio/kdemultimedia3/patches/patch-bb b/audio/kdemultimedia3/patches/patch-bb index 7a822c5dfde..9c4bdf05294 100644 --- a/audio/kdemultimedia3/patches/patch-bb +++ b/audio/kdemultimedia3/patches/patch-bb @@ -1,8 +1,8 @@ -$NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ +$NetBSD: patch-bb,v 1.4 2003/01/02 09:12:21 skrll Exp $ ---- noatun/library/Makefile.in.orig Sun Jun 9 10:13:00 2002 +--- noatun/library/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/library/Makefile.in -@@ -301,9 +301,9 @@ +@@ -300,9 +300,9 @@ INCLUDES = -I$(top_srcdir)/noatun/librar SUBDIRS = noatunarts noatun . noatuntags @@ -14,14 +14,14 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ playlist.cpp pref.cpp \ player.cpp playlistsaver.cpp app.cpp \ pluginloader.cpp plugin.cpp \ -@@ -315,15 +315,15 @@ +@@ -314,15 +314,15 @@ libnoatun_la_SOURCES = pluginmodule.cpp include_HEADERS = cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h ksaver.h -libnoatun_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \ +libnoatun_core_la_LDFLAGS = -L$(top_builddir)/noatun/library/noatunarts \ - $(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \ - -L$(top_builddir)/arts/gui/kde + $(KDE_RPATH) $(all_libraries) -L$(top_builddir)/arts/gui/common \ + -L$(top_builddir)/arts/gui/kde -libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \ @@ -33,7 +33,7 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ -lartsflow -lsoundserver_idl -lartskde $(LIBDL) -@@ -345,27 +345,27 @@ +@@ -344,26 +344,27 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -41,8 +41,10 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ +libnoatun_core_la_DEPENDENCIES = \ $(top_builddir)/arts/gui/common/libartsgui.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la \ - $(top_builddir)/arts/modules/libartsmodules.la +- $(top_builddir)/arts/modules/libartsmodules.la -am_libnoatun_la_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \ ++ $(top_builddir)/arts/modules/libartsmodules.la \ ++ $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la +am_libnoatun_core_la_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \ engine.lo playlist.lo pref.lo player.lo playlistsaver.lo app.lo \ pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \ @@ -50,7 +52,7 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo -#>- libnoatun_la_OBJECTS = $(am_libnoatun_la_OBJECTS) +#>- libnoatun_core_la_OBJECTS = $(am_libnoatun_core_la_OBJECTS) - #>+ 10 + #>+ 9 -libnoatun_la_final_OBJECTS = libnoatun_la.all_cpp.lo -libnoatun_la_nofinal_OBJECTS = pluginmodule.lo cmodule.lo downloader.lo \ +libnoatun_core_la_final_OBJECTS = libnoatun_core_la.all_cpp.lo @@ -59,17 +61,24 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ pluginloader.lo plugin.lo noatunstdaction.lo conversion.lo \ noatunui.lo effectview.lo equalizerview.lo equalizer.lo \ effects.lo mimetypetree.lo stereobuttonaction.lo ksaver.lo\ - plugin_deps.moc.lo \ -- libnoatun_la_meta_unload.lo + plugin_deps.moc.lo -@KDE_USE_FINAL_FALSE@libnoatun_la_OBJECTS = $(libnoatun_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@libnoatun_la_OBJECTS = $(libnoatun_la_final_OBJECTS) -+ libnoatun_core_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libnoatun_core_la_OBJECTS = $(libnoatun_core_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libnoatun_core_la_OBJECTS = $(libnoatun_core_la_final_OBJECTS) libnoatuncontrols_la_DEPENDENCIES = am_libnoatuncontrols_la_OBJECTS = controls.lo scrollinglabel.lo #>- libnoatuncontrols_la_OBJECTS = $(am_libnoatuncontrols_la_OBJECTS) -@@ -423,8 +423,8 @@ +@@ -403,7 +404,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@ $(DEPDIR)/scrollinglabel.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/stereobuttonaction.Plo + #>+ 29 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/plugin_deps.moc.P $(DEPDIR)/libnoatun_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P $(DEPDIR)/gentable.all_cpp.P $(DEPDIR)/app.Plo $(DEPDIR)/cmodule.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/plugin_deps.moc.P $(DEPDIR)/libnoatun_core_la.all_cpp.P $(DEPDIR)/libnoatuncontrols_la.all_cpp.P $(DEPDIR)/gentable.all_cpp.P $(DEPDIR)/app.Plo $(DEPDIR)/cmodule.Plo \ + @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 \ +@@ -451,8 +452,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -80,7 +89,7 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ DATA = $(magictable_DATA) HEADERS = $(include_HEADERS) -@@ -436,7 +436,7 @@ +@@ -464,7 +465,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -89,7 +98,7 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -483,8 +483,8 @@ +@@ -511,8 +512,8 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @@ -100,69 +109,85 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ libnoatuncontrols.la: $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libnoatuncontrols_la_LDFLAGS) $(libnoatuncontrols_la_OBJECTS) $(libnoatuncontrols_la_LIBADD) $(LIBS) -@@ -676,7 +676,7 @@ +@@ -704,7 +705,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=fft.h noatunlistview.h pluginmodule.h video.cpp fft.c -+KDE_DIST=video.cpp fft.h noatunlistview.h pluginmodule.h magictable fft.c +-KDE_DIST=fft.c pluginmodule.h noatunlistview.h video.cpp fft.h ++KDE_DIST=video.cpp fft.h noatunlistview.h pluginmodule.h fft.c DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -856,33 +856,33 @@ - - - #>+ 12 --libnoatun_la_meta_unload.cpp: equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc -- @echo 'creating libnoatun_la_meta_unload.cpp' -- @-rm -f libnoatun_la_meta_unload.cpp -+libnoatun_core_la_meta_unload.cpp: equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc -+ @echo 'creating libnoatun_core_la_meta_unload.cpp' -+ @-rm -f libnoatun_core_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_libnoatun_la[] = {' > libnoatun_la_meta_unload.cpp ;\ -- cat equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libnoatun_la_meta_unload.cpp ;\ -- echo '0};' >> libnoatun_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> libnoatun_la_meta_unload.cpp ;\ -- echo '_UNLOAD(libnoatun_la)' >> libnoatun_la_meta_unload.cpp ;\ -- else echo > libnoatun_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libnoatun_core_la[] = {' > libnoatun_core_la_meta_unload.cpp ;\ -+ cat equalizerview.moc cmodule.moc plugin_deps.moc.cpp mimetypetree.moc pluginmodule.moc effectview.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libnoatun_core_la_meta_unload.cpp ;\ -+ echo '0};' >> libnoatun_core_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libnoatun_core_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libnoatun_core_la)' >> libnoatun_core_la_meta_unload.cpp ;\ -+ else echo > libnoatun_core_la_meta_unload.cpp; fi +@@ -846,32 +847,32 @@ magictable: gentable + .NOEXPORT: + #>+ 3 +-plugin_deps.moc.cpp: $(srcdir)/plugin_deps.h +- $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc.cpp ++equalizerview.moc: $(srcdir)/equalizerview.h ++ $(MOC) $(srcdir)/equalizerview.h -o equalizerview.moc + + #>+ 3 +-mimetypetree.moc: $(srcdir)/mimetypetree.h +- $(MOC) $(srcdir)/mimetypetree.h -o mimetypetree.moc ++plugin_deps.moc.cpp: $(srcdir)/plugin_deps.h ++ $(MOC) $(srcdir)/plugin_deps.h -o plugin_deps.moc.cpp + + #>+ 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 + + #>+ 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 + + #>+ 3 + pluginmodule.moc: $(srcdir)/pluginmodule.h + $(MOC) $(srcdir)/pluginmodule.h -o 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 #>+ 3 - clean-moc-classes: -- -rm -f libnoatun_la_meta_unload.cpp -+ -rm -f libnoatun_core_la_meta_unload.cpp + clean-metasources: +- -rm -f plugin_deps.moc.cpp mimetypetree.moc effectview.moc equalizerview.moc pluginmodule.moc cmodule.moc ++ -rm -f equalizerview.moc plugin_deps.moc.cpp cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc + + #>+ 2 + docs-am: +@@ -884,16 +885,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 libnoatun_la_meta_unload.cpp plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.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 plugin_deps.moc.cpp mimetypetree.moc effectview.moc cmodule.moc pluginmodule.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; \ -- for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp libnoatun_la_meta_unload.cpp plugin_deps.moc.cpp; do \ -- echo "#include \"$$file\"" >> libnoatun_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_la.all_cpp.final; \ -+libnoatun_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp libnoatun_core_la_meta_unload.cpp plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc ++libnoatun_core_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp plugin_deps.moc.cpp equalizerview.moc cmodule.moc mimetypetree.moc pluginmodule.moc effectview.moc + @echo 'creating libnoatun_core_la.all_cpp.cpp ...'; \ + rm -f libnoatun_core_la.all_cpp.files libnoatun_core_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libnoatun_core_la.all_cpp.final; \ -+ for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp libnoatun_core_la_meta_unload.cpp plugin_deps.moc.cpp; do \ + for file in pluginmodule.cpp cmodule.cpp downloader.cpp engine.cpp playlist.cpp pref.cpp player.cpp playlistsaver.cpp app.cpp pluginloader.cpp plugin.cpp noatunstdaction.cpp conversion.cpp noatunui.cpp effectview.cpp equalizerview.cpp equalizer.cpp effects.cpp mimetypetree.cpp stereobuttonaction.cpp ksaver.cpp plugin_deps.moc.cpp ; do \ +- echo "#include \"$$file\"" >> libnoatun_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libnoatun_core_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libnoatun_core_la.all_cpp.final; \ done; \ -- cat libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files > libnoatun_la.all_cpp.cpp; \ +- cat libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files > libnoatun_la.all_cpp.cpp; \ - rm -f libnoatun_la.all_cpp.final libnoatun_la.all_cpp.files -+ cat libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files > libnoatun_core_la.all_cpp.cpp; \ ++ cat libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files > libnoatun_core_la.all_cpp.cpp; \ + rm -f libnoatun_core_la.all_cpp.final libnoatun_core_la.all_cpp.files #>+ 11 - libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp -@@ -910,20 +910,20 @@ + libnoatuncontrols_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/controls.cpp $(srcdir)/scrollinglabel.cpp plugin_deps.moc.cpp +@@ -921,20 +922,20 @@ gentable.all_cpp.cpp: $(srcdir)/Makefile #>+ 3 clean-final: @@ -187,4 +212,24 @@ $NetBSD: patch-bb,v 1.3 2002/10/03 11:21:29 markd Exp $ + $(MAKE) libnoatun_core_la_OBJECTS="$(libnoatun_core_la_nofinal_OBJECTS)" libnoatuncontrols_la_OBJECTS="$(libnoatuncontrols_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -944,13 +945,13 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 11 +-cmodule.o: cmodule.moc +-mimetypetree.o: mimetypetree.moc +-effectview.lo: effectview.moc + equalizerview.lo: equalizerview.moc +-equalizerview.o: equalizerview.moc +-effectview.o: effectview.moc +-mimetypetree.lo: mimetypetree.moc ++cmodule.o: cmodule.moc + pluginmodule.lo: pluginmodule.moc + cmodule.lo: cmodule.moc ++effectview.o: effectview.moc + pluginmodule.o: pluginmodule.moc ++effectview.lo: effectview.moc ++mimetypetree.o: mimetypetree.moc ++equalizerview.o: equalizerview.moc ++mimetypetree.lo: mimetypetree.moc diff --git a/audio/kdemultimedia3/patches/patch-bd b/audio/kdemultimedia3/patches/patch-bd index ed9611592ad..c92b8e2b095 100644 --- a/audio/kdemultimedia3/patches/patch-bd +++ b/audio/kdemultimedia3/patches/patch-bd @@ -1,8 +1,8 @@ -$NetBSD: patch-bd,v 1.1 2002/06/25 06:34:34 skrll Exp $ +$NetBSD: patch-bd,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/library/noatuntags/Makefile.in.orig Sun Jun 9 10:23:40 2002 +--- noatun/library/noatuntags/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/library/noatuntags/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,7 @@ lib_LTLIBRARIES = libnoatuntags.la libnoatuntags_la_SOURCES = tags.cpp libnoatuntags_la_LDFLAGS = -L$(top_builddir)/noatun/library @@ -11,7 +11,7 @@ $NetBSD: patch-bd,v 1.1 2002/06/25 06:34:34 skrll Exp $ #>- libnoatuntags_la_METASOURCES = AUTO -@@ -308,7 +308,7 @@ +@@ -307,7 +307,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) libnoatuntags_la_DEPENDENCIES = \ @@ -19,13 +19,4 @@ $NetBSD: patch-bd,v 1.1 2002/06/25 06:34:34 skrll Exp $ + $(top_builddir)/noatun/library/libnoatun_core.la am_libnoatuntags_la_OBJECTS = tags.lo #>- libnoatuntags_la_OBJECTS = $(am_libnoatuntags_la_OBJECTS) - #>+ 5 -@@ -633,7 +633,7 @@ - -rm -f libnoatuntags_la_meta_unload.cpp - - #>+ 11 --libnoatuntags_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/tags.cpp libnoatuntags_la_meta_unload.cpp tagsgetter.moc -+libnoatuntags_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/tags.cpp $(srcdir)/libnoatuntags_la_meta_unload.cpp tagsgetter.moc - @echo 'creating libnoatuntags_la.all_cpp.cpp ...'; \ - rm -f libnoatuntags_la.all_cpp.files libnoatuntags_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libnoatuntags_la.all_cpp.final; \ + #>+ 1 diff --git a/audio/kdemultimedia3/patches/patch-bg b/audio/kdemultimedia3/patches/patch-bg index d1dbd411649..a4304d00474 100644 --- a/audio/kdemultimedia3/patches/patch-bg +++ b/audio/kdemultimedia3/patches/patch-bg @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.1 2002/06/25 06:34:35 skrll Exp $ +$NetBSD: patch-bg,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/dcopiface/Makefile.in.orig Sun Jun 9 10:26:47 2002 +--- noatun/modules/dcopiface/Makefile.in.orig Sat Nov 30 12:05:10 2002 +++ noatun/modules/dcopiface/Makefile.in -@@ -297,7 +297,7 @@ +@@ -297,7 +297,7 @@ kde_module_LTLIBRARIES = noatun_dcopifac noatun_dcopiface_la_SOURCES=dcopiface.cpp dcopiface_skel.cpp noatun_dcopiface_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -11,7 +11,7 @@ $NetBSD: patch-bg,v 1.1 2002/06/25 06:34:35 skrll Exp $ #>- noatun_dcopiface_la_METASOURCES = AUTO -@@ -311,7 +311,7 @@ +@@ -311,7 +311,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_dcopiface_la_DEPENDENCIES = \ @@ -20,21 +20,3 @@ $NetBSD: patch-bg,v 1.1 2002/06/25 06:34:35 skrll Exp $ am_noatun_dcopiface_la_OBJECTS = dcopiface.lo #>- noatun_dcopiface_la_OBJECTS = $(am_noatun_dcopiface_la_OBJECTS) #>+ 4 -@@ -487,7 +487,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=dcopiface.plugin -+KDE_DIST=dcopiface.kidl dcopiface.plugin - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -642,7 +642,7 @@ - - - #>+ 11 --noatun_dcopiface_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopiface.cpp dcopiface_skel.cpp -+noatun_dcopiface_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopiface.cpp $(srcdir)/dcopiface_skel.cpp - @echo 'creating noatun_dcopiface_la.all_cpp.cpp ...'; \ - rm -f noatun_dcopiface_la.all_cpp.files noatun_dcopiface_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_dcopiface_la.all_cpp.final; \ diff --git a/audio/kdemultimedia3/patches/patch-bh b/audio/kdemultimedia3/patches/patch-bh index 6cb1ab69b3e..a7148e9a7dc 100644 --- a/audio/kdemultimedia3/patches/patch-bh +++ b/audio/kdemultimedia3/patches/patch-bh @@ -1,8 +1,8 @@ -$NetBSD: patch-bh,v 1.1 2002/06/25 06:34:35 skrll Exp $ +$NetBSD: patch-bh,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/excellent/Makefile.in.orig Sun Jun 9 11:25:34 2002 +--- noatun/modules/excellent/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/excellent/Makefile.in -@@ -298,7 +298,7 @@ +@@ -297,7 +297,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.1 2002/06/25 06:34:35 skrll Exp $ $(top_builddir)/noatun/library/libnoatuncontrols.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -315,7 +315,7 @@ +@@ -314,7 +314,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_excellent_la_DEPENDENCIES = \ @@ -20,7 +20,7 @@ $NetBSD: patch-bh,v 1.1 2002/06/25 06:34:35 skrll 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) -@@ -495,7 +495,7 @@ +@@ -499,7 +499,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 @@ -29,12 +29,3 @@ $NetBSD: patch-bh,v 1.1 2002/06/25 06:34:35 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -664,7 +664,7 @@ - -rm -f noatun_excellent_la_meta_unload.cpp - - #>+ 11 --noatun_excellent_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp noatun_excellent_la_meta_unload.cpp userinterface.moc -+noatun_excellent_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp $(srcdir)/noatun_excellent_la_meta_unload.cpp userinterface.moc - @echo 'creating noatun_excellent_la.all_cpp.cpp ...'; \ - rm -f noatun_excellent_la.all_cpp.files noatun_excellent_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_excellent_la.all_cpp.final; \ diff --git a/audio/kdemultimedia3/patches/patch-bj b/audio/kdemultimedia3/patches/patch-bj index 1238f619dc6..ed6e61cbaf6 100644 --- a/audio/kdemultimedia3/patches/patch-bj +++ b/audio/kdemultimedia3/patches/patch-bj @@ -1,17 +1,17 @@ -$NetBSD: patch-bj,v 1.1 2002/06/25 06:34:35 skrll Exp $ +$NetBSD: patch-bj,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/htmlexport/Makefile.in.orig Sun Jun 9 12:12:25 2002 +--- noatun/modules/htmlexport/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/htmlexport/Makefile.in -@@ -296,7 +296,7 @@ +@@ -295,7 +295,7 @@ noatun_htmlexport_la_SOURCES = htmlexpor noinst_HEADERS = htmlexport.h noatun_htmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_htmlexport_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -310,7 +310,7 @@ +@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_htmlexport_la_DEPENDENCIES = \ @@ -19,13 +19,11 @@ $NetBSD: patch-bj,v 1.1 2002/06/25 06:34:35 skrll Exp $ + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_htmlexport_la_OBJECTS = htmlexport.lo #>- noatun_htmlexport_la_OBJECTS = $(am_noatun_htmlexport_la_OBJECTS) - #>+ 5 -@@ -656,7 +656,7 @@ - -rm -f noatun_htmlexport_la_meta_unload.cpp + #>+ 1 +@@ -657,5 +657,5 @@ kde-rpo-clean: + -rm -f *.rpo - #>+ 11 --noatun_htmlexport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/htmlexport.cpp noatun_htmlexport_la_meta_unload.cpp htmlexport.moc -+noatun_htmlexport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/htmlexport.cpp $(srcdir)/noatun_htmlexport_la_meta_unload.cpp htmlexport.moc - @echo 'creating noatun_htmlexport_la.all_cpp.cpp ...'; \ - rm -f noatun_htmlexport_la.all_cpp.files noatun_htmlexport_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_htmlexport_la.all_cpp.final; \ + #>+ 3 +-htmlexport.lo: htmlexport.moc + htmlexport.o: htmlexport.moc ++htmlexport.lo: htmlexport.moc diff --git a/audio/kdemultimedia3/patches/patch-bl b/audio/kdemultimedia3/patches/patch-bl index 185d996ca16..6a6015429cd 100644 --- a/audio/kdemultimedia3/patches/patch-bl +++ b/audio/kdemultimedia3/patches/patch-bl @@ -1,17 +1,17 @@ -$NetBSD: patch-bl,v 1.1 2002/06/25 06:34:36 skrll Exp $ +$NetBSD: patch-bl,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/infrared/Makefile.in.orig Sun Jun 9 12:19:30 2002 +--- noatun/modules/infrared/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/infrared/Makefile.in -@@ -296,7 +296,7 @@ +@@ -295,7 +295,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 -noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -310,7 +310,7 @@ +@@ -309,7 +309,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_infrared_la_DEPENDENCIES = \ @@ -19,13 +19,51 @@ $NetBSD: patch-bl,v 1.1 2002/06/25 06:34:36 skrll Exp $ + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_infrared_la_OBJECTS = infrared.lo lirc.lo irprefs.lo #>- noatun_infrared_la_OBJECTS = $(am_noatun_infrared_la_OBJECTS) - #>+ 5 -@@ -667,7 +667,7 @@ - -rm -f noatun_infrared_la_meta_unload.cpp + #>+ 4 +@@ -624,10 +624,6 @@ noatun_infrared.la.closure: $(noatun_inf + + + #>+ 3 +-lirc.moc: $(srcdir)/lirc.h +- $(MOC) $(srcdir)/lirc.h -o 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 + + #>+ 3 ++lirc.moc: $(srcdir)/lirc.h ++ $(MOC) $(srcdir)/lirc.h -o lirc.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f lirc.moc irprefs.moc infrared.moc ++ -rm -f irprefs.moc infrared.moc lirc.moc + + #>+ 3 + clean-closures: +@@ -654,7 +654,7 @@ force-reedit: + #>+ 11 --noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp noatun_infrared_la_meta_unload.cpp irprefs.moc infrared.moc lirc.moc -+noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp $(srcdir)/noatun_infrared_la_meta_unload.cpp irprefs.moc infrared.moc lirc.moc +-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; \ +@@ -690,9 +690,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 ++infrared.o: infrared.moc ++lirc.o: lirc.moc + irprefs.lo: irprefs.moc + infrared.lo: infrared.moc +-irprefs.o: irprefs.moc +-lirc.o: lirc.moc +-infrared.o: infrared.moc + lirc.lo: lirc.moc ++irprefs.o: irprefs.moc diff --git a/audio/kdemultimedia3/patches/patch-bn b/audio/kdemultimedia3/patches/patch-bn index a5039e59989..5f8d6567fda 100644 --- a/audio/kdemultimedia3/patches/patch-bn +++ b/audio/kdemultimedia3/patches/patch-bn @@ -1,17 +1,17 @@ -$NetBSD: patch-bn,v 1.1 2002/06/25 06:34:36 skrll Exp $ +$NetBSD: patch-bn,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/kaiman/Makefile.in.orig Sun Jun 9 12:21:18 2002 +--- noatun/modules/kaiman/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/kaiman/Makefile.in -@@ -301,7 +301,7 @@ +@@ -300,7 +300,7 @@ noatun_kaiman_la_SOURCES = \ noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -321,7 +321,7 @@ +@@ -320,7 +320,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_kaiman_la_DEPENDENCIES = \ @@ -20,21 +20,59 @@ $NetBSD: patch-bn,v 1.1 2002/06/25 06:34:36 skrll Exp $ am_noatun_kaiman_la_OBJECTS = noatunui.lo style.lo userinterface.lo \ pref.lo #>- noatun_kaiman_la_OBJECTS = $(am_noatun_kaiman_la_OBJECTS) -@@ -570,7 +570,7 @@ +@@ -574,7 +574,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kaimanui.rc kaiman.plugin SKIN-SPECS +-KDE_DIST=kaiman.plugin kaimanui.rc SKIN-SPECS +KDE_DIST=kaimanui.rc SKIN-SPECS kaiman.plugin DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -768,7 +768,7 @@ - -rm -f noatun_kaiman_la_meta_unload.cpp +@@ -725,20 +725,20 @@ 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 + + #>+ 3 + pref.moc: $(srcdir)/pref.h + $(MOC) $(srcdir)/pref.h -o 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 + + #>+ 3 + clean-metasources: +- -rm -f userinterface.moc pref.moc style.moc ++ -rm -f style.moc pref.moc userinterface.moc + + #>+ 3 + clean-closures: +@@ -755,7 +755,7 @@ force-reedit: + #>+ 11 --noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp noatun_kaiman_la_meta_unload.cpp style.moc pref.moc userinterface.moc -+noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp $(srcdir)/noatun_kaiman_la_meta_unload.cpp style.moc pref.moc userinterface.moc +-noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp userinterface.moc style.moc pref.moc ++noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp style.moc pref.moc userinterface.moc @echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \ rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \ +@@ -791,9 +791,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-userinterface.lo: userinterface.moc +-style.lo: style.moc + pref.lo: pref.moc ++style.lo: style.moc + userinterface.o: userinterface.moc + style.o: style.moc + pref.o: pref.moc ++userinterface.lo: userinterface.moc diff --git a/audio/kdemultimedia3/patches/patch-bp b/audio/kdemultimedia3/patches/patch-bp index 5271741b62a..e275404088e 100644 --- a/audio/kdemultimedia3/patches/patch-bp +++ b/audio/kdemultimedia3/patches/patch-bp @@ -1,8 +1,8 @@ -$NetBSD: patch-bp,v 1.1 2002/06/25 06:34:37 skrll Exp $ +$NetBSD: patch-bp,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/keyz/Makefile.in.orig Sun Jun 9 12:22:33 2002 +--- noatun/modules/keyz/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/keyz/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,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.1 2002/06/25 06:34:37 skrll Exp $ #>- noatun_keyz_la_METASOURCES = AUTO -@@ -309,7 +309,7 @@ +@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_keyz_la_DEPENDENCIES = \ @@ -19,13 +19,11 @@ $NetBSD: patch-bp,v 1.1 2002/06/25 06:34:37 skrll Exp $ + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_keyz_la_OBJECTS = keyz.lo #>- noatun_keyz_la_OBJECTS = $(am_noatun_keyz_la_OBJECTS) - #>+ 5 -@@ -655,7 +655,7 @@ - -rm -f noatun_keyz_la_meta_unload.cpp + #>+ 1 +@@ -656,5 +656,5 @@ kde-rpo-clean: + -rm -f *.rpo - #>+ 11 --noatun_keyz_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keyz.cpp noatun_keyz_la_meta_unload.cpp keyz.moc -+noatun_keyz_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keyz.cpp $(srcdir)/noatun_keyz_la_meta_unload.cpp keyz.moc - @echo 'creating noatun_keyz_la.all_cpp.cpp ...'; \ - rm -f noatun_keyz_la.all_cpp.files noatun_keyz_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_keyz_la.all_cpp.final; \ + #>+ 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 6d30ee15c26..3f5c18c449e 100644 --- a/audio/kdemultimedia3/patches/patch-br +++ b/audio/kdemultimedia3/patches/patch-br @@ -1,17 +1,17 @@ -$NetBSD: patch-br,v 1.1 2002/06/25 06:34:37 skrll Exp $ +$NetBSD: patch-br,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/kjofol-skin/Makefile.in.orig Sun Jun 9 12:26:23 2002 +--- noatun/modules/kjofol-skin/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/kjofol-skin/Makefile.in -@@ -311,7 +311,7 @@ +@@ -310,7 +310,7 @@ noatun_kjofol_la_SOURCES=kjloader.cpp kj noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_kjofol_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ - $(LIB_KIO) -lm \ - $(top_builddir)/arts/modules/libartsmodules.la + $(LIB_KIO) -lm \ + $(top_builddir)/arts/modules/libartsmodules.la -@@ -332,7 +332,7 @@ +@@ -331,7 +331,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_kjofol_la_DEPENDENCIES = \ @@ -20,21 +20,95 @@ $NetBSD: patch-br,v 1.1 2002/06/25 06:34:37 skrll 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 \ -@@ -598,7 +598,7 @@ +@@ -612,7 +612,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kjsliders.cpp kjbackground.cpp kjequalizer.cpp kjofolui.plugin kjprefs.cpp helpers.cpp kjprefswidget.ui kjtextdisplay.cpp parser.cpp kjvis.cpp noatunui.cpp kjfont.cpp -+KDE_DIST=kjprefswidget.ui kjtextdisplay.cpp parser.cpp kjsliders.cpp kjfont.cpp kjbackground.cpp kjvis.cpp kjequalizer.cpp kjprefswidget.cpp kjofolui.plugin kjprefs.cpp noatunui.cpp helpers.cpp +-KDE_DIST=helpers.cpp kjfont.cpp kjprefs.cpp kjofolui.plugin kjsliders.cpp parser.cpp noatunui.cpp kjequalizer.cpp kjbackground.cpp kjprefswidget.ui kjvis.cpp kjtextdisplay.cpp ++KDE_DIST=kjprefswidget.ui kjtextdisplay.cpp parser.cpp kjsliders.cpp kjfont.cpp kjbackground.cpp kjvis.cpp kjequalizer.cpp kjofolui.plugin kjprefs.cpp noatunui.cpp helpers.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -818,7 +818,7 @@ - -rm -f noatun_kjofol_la_meta_unload.cpp +@@ -778,24 +778,24 @@ kjprefswidget.moc: kjprefswidget.h + $(MOC) kjprefswidget.h -o kjprefswidget.moc + + #>+ 3 +-kjequalizer.moc: $(srcdir)/kjequalizer.h +- $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc +- +-#>+ 3 +-kjloader.moc: $(srcdir)/kjloader.h +- $(MOC) $(srcdir)/kjloader.h -o kjloader.moc +- +-#>+ 3 + kjtextdisplay.moc: $(srcdir)/kjtextdisplay.h + $(MOC) $(srcdir)/kjtextdisplay.h -o kjtextdisplay.moc + + #>+ 3 ++kjequalizer.moc: $(srcdir)/kjequalizer.h ++ $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc ++ ++#>+ 3 + kjprefs.moc: $(srcdir)/kjprefs.h + $(MOC) $(srcdir)/kjprefs.h -o kjprefs.moc + + #>+ 3 ++kjloader.moc: $(srcdir)/kjloader.h ++ $(MOC) $(srcdir)/kjloader.h -o kjloader.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f kjequalizer.moc kjloader.moc kjtextdisplay.moc kjprefs.moc ++ -rm -f kjtextdisplay.moc kjequalizer.moc kjprefs.moc kjloader.moc + + #>+ 4 + clean-ui: +@@ -817,7 +817,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 kjprefswidget.cpp noatun_kjofol_la_meta_unload.cpp kjprefswidget.moc kjtextdisplay.moc kjequalizer.moc kjprefs.moc kjloader.moc -+noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp $(srcdir)/kjprefswidget.cpp $(srcdir)/noatun_kjofol_la_meta_unload.cpp kjprefswidget.moc kjtextdisplay.moc kjequalizer.moc kjprefs.moc kjloader.moc +-noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp kjprefswidget.cpp kjloader.moc kjequalizer.moc kjprefswidget.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 kjprefswidget.cpp kjtextdisplay.moc kjequalizer.moc kjprefswidget.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; \ +@@ -853,24 +853,24 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 22 +-kjloader.lo: kjloader.moc +-kjequalizer.o: kjequalizer.moc +-$(srcdir)/kjvis.cpp: kjprefswidget.h +-kjprefs.lo: kjprefs.moc +-$(srcdir)/kjprefs.cpp: kjprefswidget.h + kjprefs.o: kjprefs.moc +-$(srcdir)/kjfont.cpp: kjprefswidget.h +-kjtextdisplay.lo: kjtextdisplay.moc +-$(srcdir)/noatunui.cpp: kjprefswidget.h ++$(srcdir)/kjtextdisplay.cpp: kjprefswidget.h ++$(srcdir)/kjseeker.cpp: kjprefswidget.h ++$(srcdir)/kjloader.cpp: kjprefswidget.h ++kjequalizer.lo: kjequalizer.moc + $(srcdir)/kjbutton.cpp: kjprefswidget.h +-$(srcdir)/kjequalizer.cpp: kjprefswidget.h ++$(srcdir)/kjprefs.cpp: kjprefswidget.h ++kjtextdisplay.lo: kjtextdisplay.moc ++$(srcdir)/kjvis.cpp: kjprefswidget.h ++kjloader.lo: kjloader.moc + $(srcdir)/parser.cpp: kjprefswidget.h +-$(srcdir)/kjloader.cpp: kjprefswidget.h + $(srcdir)/kjwidget.cpp: kjprefswidget.h +-$(srcdir)/kjbackground.cpp: kjprefswidget.h +-kjloader.o: kjloader.moc +-$(srcdir)/kjtextdisplay.cpp: kjprefswidget.h ++$(srcdir)/kjfont.cpp: kjprefswidget.h ++kjequalizer.o: kjequalizer.moc ++$(srcdir)/kjequalizer.cpp: kjprefswidget.h + $(srcdir)/kjsliders.cpp: kjprefswidget.h + kjtextdisplay.o: kjtextdisplay.moc +-kjequalizer.lo: kjequalizer.moc +-$(srcdir)/kjseeker.cpp: kjprefswidget.h ++$(srcdir)/kjbackground.cpp: kjprefswidget.h ++$(srcdir)/noatunui.cpp: kjprefswidget.h ++kjprefs.lo: kjprefs.moc ++kjloader.o: kjloader.moc diff --git a/audio/kdemultimedia3/patches/patch-bt b/audio/kdemultimedia3/patches/patch-bt index fd4f5e7a0e3..98dcb24825e 100644 --- a/audio/kdemultimedia3/patches/patch-bt +++ b/audio/kdemultimedia3/patches/patch-bt @@ -1,17 +1,17 @@ -$NetBSD: patch-bt,v 1.1 2002/06/25 06:34:38 skrll Exp $ +$NetBSD: patch-bt,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/marquis/Makefile.in.orig Sun Jun 9 12:27:48 2002 +--- noatun/modules/marquis/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/marquis/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_marquis. noatun_marquis_la_SOURCES = marquis.cpp plugin.cpp noatun_marquis_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_marquis_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -311,7 +311,7 @@ +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_marquis_la_DEPENDENCIES = \ @@ -19,13 +19,4 @@ $NetBSD: patch-bt,v 1.1 2002/06/25 06:34:38 skrll Exp $ + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_marquis_la_OBJECTS = marquis.lo plugin.lo #>- noatun_marquis_la_OBJECTS = $(am_noatun_marquis_la_OBJECTS) - #>+ 5 -@@ -658,7 +658,7 @@ - -rm -f noatun_marquis_la_meta_unload.cpp - - #>+ 11 --noatun_marquis_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/marquis.cpp $(srcdir)/plugin.cpp noatun_marquis_la_meta_unload.cpp marquis.moc -+noatun_marquis_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/marquis.cpp $(srcdir)/plugin.cpp $(srcdir)/noatun_marquis_la_meta_unload.cpp marquis.moc - @echo 'creating noatun_marquis_la.all_cpp.cpp ...'; \ - rm -f noatun_marquis_la.all_cpp.files noatun_marquis_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_marquis_la.all_cpp.final; \ + #>+ 4 diff --git a/audio/kdemultimedia3/patches/patch-bv b/audio/kdemultimedia3/patches/patch-bv index bb51709b26a..d580c3d24b5 100644 --- a/audio/kdemultimedia3/patches/patch-bv +++ b/audio/kdemultimedia3/patches/patch-bv @@ -1,8 +1,8 @@ -$NetBSD: patch-bv,v 1.1 2002/06/25 06:34:38 skrll Exp $ +$NetBSD: patch-bv,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/metatag/Makefile.in.orig Sun Jun 9 12:28:50 2002 +--- noatun/modules/metatag/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/metatag/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,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.1 2002/06/25 06:34:38 skrll Exp $ $(top_builddir)/noatun/library/noatuntags/libnoatuntags.la -@@ -311,7 +311,7 @@ +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_metatag_la_DEPENDENCIES = \ @@ -20,21 +20,42 @@ $NetBSD: patch-bv,v 1.1 2002/06/25 06:34:38 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) -@@ -490,7 +490,7 @@ +@@ -622,16 +622,16 @@ noatun_metatag.la.closure: $(noatun_meta - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=metatag.plugin HANDLED_ITEMS -+KDE_DIST=HANDLED_ITEMS metatag.plugin - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + #>+ 3 +-metatag.moc: $(srcdir)/metatag.h +- $(MOC) $(srcdir)/metatag.h -o metatag.moc +- +-#>+ 3 + edit.moc: $(srcdir)/edit.h + $(MOC) $(srcdir)/edit.h -o edit.moc + + #>+ 3 ++metatag.moc: $(srcdir)/metatag.h ++ $(MOC) $(srcdir)/metatag.h -o metatag.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f metatag.moc edit.moc ++ -rm -f edit.moc metatag.moc + + #>+ 3 + clean-closures: +@@ -648,7 +648,7 @@ force-reedit: -@@ -663,7 +663,7 @@ - -rm -f noatun_metatag_la_meta_unload.cpp #>+ 11 --noatun_metatag_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metatag.cpp $(srcdir)/edit.cpp noatun_metatag_la_meta_unload.cpp edit.moc metatag.moc -+noatun_metatag_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/metatag.cpp $(srcdir)/edit.cpp $(srcdir)/noatun_metatag_la_meta_unload.cpp edit.moc metatag.moc +-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; \ +@@ -685,6 +685,6 @@ kde-rpo-clean: + + #>+ 5 + metatag.o: metatag.moc +-metatag.lo: metatag.moc + edit.lo: edit.moc ++metatag.lo: metatag.moc + edit.o: edit.moc diff --git a/audio/kdemultimedia3/patches/patch-bx b/audio/kdemultimedia3/patches/patch-bx index b33d8073dc4..ff40210cba3 100644 --- a/audio/kdemultimedia3/patches/patch-bx +++ b/audio/kdemultimedia3/patches/patch-bx @@ -1,8 +1,8 @@ -$NetBSD: patch-bx,v 1.1 2002/06/25 06:34:39 skrll Exp $ +$NetBSD: patch-bx,v 1.2 2003/01/02 09:12:22 skrll Exp $ ---- noatun/modules/monoscope/Makefile.in.orig Sun Jun 9 12:29:39 2002 +--- noatun/modules/monoscope/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/monoscope/Makefile.in -@@ -296,7 +296,7 @@ +@@ -295,7 +295,7 @@ noatun_monoscope_la_SOURCES = monoscope. #prefs.cpp noatun_monoscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -11,7 +11,7 @@ $NetBSD: patch-bx,v 1.1 2002/06/25 06:34:39 skrll Exp $ #>- noatun_monoscope_la_METASOURCES = AUTO -@@ -311,7 +311,7 @@ +@@ -310,7 +310,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_monoscope_la_DEPENDENCIES = \ @@ -19,13 +19,4 @@ $NetBSD: patch-bx,v 1.1 2002/06/25 06:34:39 skrll Exp $ + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_monoscope_la_OBJECTS = monoscope.lo #>- noatun_monoscope_la_OBJECTS = $(am_noatun_monoscope_la_OBJECTS) - #>+ 5 -@@ -657,7 +657,7 @@ - -rm -f noatun_monoscope_la_meta_unload.cpp - - #>+ 11 --noatun_monoscope_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/monoscope.cpp noatun_monoscope_la_meta_unload.cpp monoscope.moc -+noatun_monoscope_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/monoscope.cpp $(srcdir)/noatun_monoscope_la_meta_unload.cpp monoscope.moc - @echo 'creating noatun_monoscope_la.all_cpp.cpp ...'; \ - rm -f noatun_monoscope_la.all_cpp.files noatun_monoscope_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_monoscope_la.all_cpp.final; \ + #>+ 1 diff --git a/audio/kdemultimedia3/patches/patch-bz b/audio/kdemultimedia3/patches/patch-bz index b75736d9bb1..d725cd43822 100644 --- a/audio/kdemultimedia3/patches/patch-bz +++ b/audio/kdemultimedia3/patches/patch-bz @@ -1,8 +1,8 @@ -$NetBSD: patch-bz,v 1.1 2002/06/25 06:34:39 skrll Exp $ +$NetBSD: patch-bz,v 1.2 2003/01/02 09:12:23 skrll Exp $ ---- noatun/modules/net/Makefile.in.orig Sun Jun 9 12:30:16 2002 +--- noatun/modules/net/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/net/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,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.1 2002/06/25 06:34:39 skrll Exp $ #>- noatun_net_la_METASOURCES = AUTO -@@ -308,7 +308,8 @@ +@@ -307,7 +307,8 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,13 +20,11 @@ $NetBSD: patch-bz,v 1.1 2002/06/25 06:34:39 skrll Exp $ + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_net_la_OBJECTS = net.lo #>- noatun_net_la_OBJECTS = $(am_noatun_net_la_OBJECTS) - #>+ 5 -@@ -654,7 +655,7 @@ - -rm -f noatun_net_la_meta_unload.cpp + #>+ 1 +@@ -655,5 +656,5 @@ kde-rpo-clean: + -rm -f *.rpo - #>+ 11 --noatun_net_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/net.cpp noatun_net_la_meta_unload.cpp net.moc -+noatun_net_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/net.cpp $(srcdir)/noatun_net_la_meta_unload.cpp net.moc - @echo 'creating noatun_net_la.all_cpp.cpp ...'; \ - rm -f noatun_net_la.all_cpp.files noatun_net_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_net_la.all_cpp.final; \ + #>+ 3 +-net.o: net.moc + net.lo: net.moc ++net.o: net.moc diff --git a/audio/kdemultimedia3/patches/patch-cb b/audio/kdemultimedia3/patches/patch-cb index 57454eed712..440715448fb 100644 --- a/audio/kdemultimedia3/patches/patch-cb +++ b/audio/kdemultimedia3/patches/patch-cb @@ -1,17 +1,17 @@ -$NetBSD: patch-cb,v 1.1 2002/06/25 06:34:40 skrll Exp $ +$NetBSD: patch-cb,v 1.2 2003/01/02 09:12:23 skrll Exp $ ---- noatun/modules/noatunui/Makefile.in.orig Sun Jun 9 12:31:12 2002 +--- noatun/modules/noatunui/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/noatunui/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,7 @@ kde_module_LTLIBRARIES = noatun_ui.la noatun_ui_la_SOURCES = noatunui.cpp userinterface.cpp noatun_ui_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_ui_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ - $(top_builddir)/noatun/library/libnoatuncontrols.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -311,7 +311,8 @@ +@@ -310,7 +310,8 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -21,12 +21,3 @@ $NetBSD: patch-cb,v 1.1 2002/06/25 06:34:40 skrll Exp $ $(top_builddir)/noatun/library/libnoatuncontrols.la am_noatun_ui_la_OBJECTS = noatunui.lo userinterface.lo #>- noatun_ui_la_OBJECTS = $(am_noatun_ui_la_OBJECTS) -@@ -660,7 +661,7 @@ - -rm -f noatun_ui_la_meta_unload.cpp - - #>+ 11 --noatun_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp noatun_ui_la_meta_unload.cpp userinterface.moc -+noatun_ui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/userinterface.cpp $(srcdir)/noatun_ui_la_meta_unload.cpp userinterface.moc - @echo 'creating noatun_ui_la.all_cpp.cpp ...'; \ - rm -f noatun_ui_la.all_cpp.files noatun_ui_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_ui_la.all_cpp.final; \ diff --git a/audio/kdemultimedia3/patches/patch-cd b/audio/kdemultimedia3/patches/patch-cd index 8bc5fa3ba1b..9c36041e962 100644 --- a/audio/kdemultimedia3/patches/patch-cd +++ b/audio/kdemultimedia3/patches/patch-cd @@ -1,8 +1,8 @@ -$NetBSD: patch-cd,v 1.1 2002/06/25 06:34:40 skrll Exp $ +$NetBSD: patch-cd,v 1.2 2003/01/02 09:12:23 skrll Exp $ ---- noatun/modules/splitplaylist/Makefile.in.orig Sun Jun 9 12:33:15 2002 +--- noatun/modules/splitplaylist/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/splitplaylist/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,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.1 2002/06/25 06:34:40 skrll Exp $ #>- noatun_splitplaylist_la_METASOURCES = AUTO -@@ -309,7 +309,7 @@ +@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_splitplaylist_la_DEPENDENCIES = \ @@ -20,7 +20,7 @@ $NetBSD: patch-cd,v 1.1 2002/06/25 06:34:40 skrll Exp $ am_noatun_splitplaylist_la_OBJECTS = splitplaylist.lo playlist.lo \ view.lo find.lo #>- noatun_splitplaylist_la_OBJECTS = $(am_noatun_splitplaylist_la_OBJECTS) -@@ -492,7 +492,7 @@ +@@ -496,7 +496,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 @@ -29,12 +29,52 @@ $NetBSD: patch-cd,v 1.1 2002/06/25 06:34:40 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -669,7 +669,7 @@ - -rm -f noatun_splitplaylist_la_meta_unload.cpp +@@ -626,20 +626,20 @@ noatun_splitplaylist.la.closure: $(noatu + + + #>+ 3 +-view.moc: $(srcdir)/view.h +- $(MOC) $(srcdir)/view.h -o view.moc +- +-#>+ 3 + find.moc: $(srcdir)/find.h + $(MOC) $(srcdir)/find.h -o find.moc + + #>+ 3 ++view.moc: $(srcdir)/view.h ++ $(MOC) $(srcdir)/view.h -o view.moc ++ ++#>+ 3 + playlist.moc: $(srcdir)/playlist.h + $(MOC) $(srcdir)/playlist.h -o playlist.moc + + #>+ 3 + clean-metasources: +- -rm -f view.moc find.moc playlist.moc ++ -rm -f find.moc view.moc playlist.moc + + #>+ 3 + clean-closures: +@@ -656,7 +656,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 noatun_splitplaylist_la_meta_unload.cpp find.moc view.moc playlist.moc -+noatun_splitplaylist_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/splitplaylist.cpp $(srcdir)/playlist.cpp $(srcdir)/view.cpp $(srcdir)/find.cpp $(srcdir)/noatun_splitplaylist_la_meta_unload.cpp find.moc view.moc playlist.moc +-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 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; \ +@@ -692,9 +692,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-find.lo: find.moc ++find.o: find.moc ++playlist.lo: playlist.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 d4b23992716..46e03260033 100644 --- a/audio/kdemultimedia3/patches/patch-cf +++ b/audio/kdemultimedia3/patches/patch-cf @@ -1,17 +1,17 @@ -$NetBSD: patch-cf,v 1.1 2002/06/25 06:34:41 skrll Exp $ +$NetBSD: patch-cf,v 1.2 2003/01/02 09:12:23 skrll Exp $ ---- noatun/modules/systray/Makefile.in.orig Sun Jun 9 12:37:35 2002 +--- noatun/modules/systray/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/systray/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,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 -noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_systray_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ - -lqtmcop -lkmedia2_idl -lsoundserver_idl + -lqtmcop -lkmedia2_idl -lsoundserver_idl -@@ -314,7 +314,7 @@ +@@ -313,7 +313,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_systray_la_DEPENDENCIES = \ @@ -20,21 +20,60 @@ $NetBSD: patch-cf,v 1.1 2002/06/25 06:34:41 skrll Exp $ am_noatun_systray_la_OBJECTS = systray.lo noatunui.lo kitsystemtray.lo \ cmodule.lo #>- noatun_systray_la_OBJECTS = $(am_noatun_systray_la_OBJECTS) -@@ -498,7 +498,7 @@ +@@ -504,7 +504,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=systray.plugin hi16-action-noatuntraypause.png systrayui.rc hi16-action-noatuntray.png hi16-action-noatuntraystop.png hi16-action-noatuntrayplay.png -+KDE_DIST=hi16-action-noatuntrayplay.png systray.plugin hi16-action-noatuntray.png hi16-action-noatuntraypause.png hi16-action-noatuntraystop.png systrayui.rc +-KDE_DIST=hi16-action-noatuntray.png hi16-action-noatuntraypause.png hi16-action-noatuntrayplay.png systray.plugin systrayui.rc hi16-action-noatuntraystop.png ++KDE_DIST=hi16-action-noatuntrayplay.png systray.plugin hi16-action-noatuntraystop.png hi16-action-noatuntray.png hi16-action-noatuntraypause.png systrayui.rc DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -694,7 +694,7 @@ - -rm -f noatun_systray_la_meta_unload.cpp +@@ -637,20 +637,20 @@ noatun_systray.la.closure: $(noatun_syst + + + #>+ 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 + + #>+ 3 + systray.moc: $(srcdir)/systray.h + $(MOC) $(srcdir)/systray.h -o 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 + + #>+ 3 + clean-metasources: +- -rm -f kitsystemtray.moc systray.moc cmodule.moc ++ -rm -f cmodule.moc systray.moc kitsystemtray.moc + + #>+ 3 + clean-closures: +@@ -681,7 +681,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 noatun_systray_la_meta_unload.cpp cmodule.moc systray.moc kitsystemtray.moc -+noatun_systray_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/systray.cpp $(srcdir)/noatunui.cpp $(srcdir)/kitsystemtray.cpp $(srcdir)/cmodule.cpp $(srcdir)/noatun_systray_la_meta_unload.cpp cmodule.moc systray.moc kitsystemtray.moc +-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 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; \ +@@ -717,9 +717,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 + cmodule.lo: cmodule.moc ++kitsystemtray.lo: kitsystemtray.moc ++systray.lo: systray.moc diff --git a/audio/kdemultimedia3/patches/patch-ch b/audio/kdemultimedia3/patches/patch-ch index ef2caace13f..2ed1806e78c 100644 --- a/audio/kdemultimedia3/patches/patch-ch +++ b/audio/kdemultimedia3/patches/patch-ch @@ -1,8 +1,8 @@ -$NetBSD: patch-ch,v 1.1 2002/06/25 06:34:41 skrll Exp $ +$NetBSD: patch-ch,v 1.2 2003/01/02 09:12:23 skrll Exp $ ---- noatun/modules/voiceprint/Makefile.in.orig Sun Jun 9 12:43:40 2002 +--- noatun/modules/voiceprint/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/voiceprint/Makefile.in -@@ -295,7 +295,7 @@ +@@ -294,7 +294,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.1 2002/06/25 06:34:41 skrll Exp $ #>- noatun_voiceprint_la_METASOURCES = AUTO -@@ -309,7 +309,7 @@ +@@ -308,7 +308,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_voiceprint_la_DEPENDENCIES = \ @@ -19,13 +19,15 @@ $NetBSD: patch-ch,v 1.1 2002/06/25 06:34:41 skrll Exp $ + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_voiceprint_la_OBJECTS = voiceprint.lo prefs.lo #>- noatun_voiceprint_la_OBJECTS = $(am_noatun_voiceprint_la_OBJECTS) - #>+ 5 -@@ -660,7 +660,7 @@ - -rm -f noatun_voiceprint_la_meta_unload.cpp + #>+ 4 +@@ -681,7 +681,7 @@ kde-rpo-clean: + -rm -f *.rpo - #>+ 11 --noatun_voiceprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/voiceprint.cpp $(srcdir)/prefs.cpp noatun_voiceprint_la_meta_unload.cpp voiceprint.moc prefs.moc -+noatun_voiceprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/voiceprint.cpp $(srcdir)/prefs.cpp $(srcdir)/noatun_voiceprint_la_meta_unload.cpp voiceprint.moc prefs.moc - @echo 'creating noatun_voiceprint_la.all_cpp.cpp ...'; \ - rm -f noatun_voiceprint_la.all_cpp.files noatun_voiceprint_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> noatun_voiceprint_la.all_cpp.final; \ + #>+ 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 ++prefs.o: prefs.moc diff --git a/audio/kdemultimedia3/patches/patch-cj b/audio/kdemultimedia3/patches/patch-cj index 8eef99b819d..269b4e52080 100644 --- a/audio/kdemultimedia3/patches/patch-cj +++ b/audio/kdemultimedia3/patches/patch-cj @@ -1,17 +1,17 @@ -$NetBSD: patch-cj,v 1.1 2002/06/25 06:34:42 skrll Exp $ +$NetBSD: patch-cj,v 1.2 2003/01/02 09:12:23 skrll Exp $ ---- noatun/modules/winskin/Makefile.in.orig Sun Jun 9 12:49:22 2002 +--- noatun/modules/winskin/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/winskin/Makefile.in -@@ -345,7 +345,7 @@ - -module -avoid-version -no-undefined +@@ -344,7 +344,7 @@ noatun_winskin_la_LDFLAGS = $(all_librar + -module -avoid-version -no-undefined -noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun.la \ +noatun_winskin_la_LIBADD = $(top_builddir)/noatun/library/libnoatun_core.la \ - $(WINSKINVIS_LIB) + $(WINSKINVIS_LIB) -@@ -357,7 +357,7 @@ +@@ -356,7 +356,7 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_winskin_la_DEPENDENCIES = \ @@ -20,21 +20,207 @@ $NetBSD: patch-cj,v 1.1 2002/06/25 06:34:42 skrll 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 \ -@@ -645,7 +645,7 @@ +@@ -673,7 +673,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=waClutterbar.h waDigit.h winSkinVis.h waLabel.h waWidget.h fileInfo.h waSkins.h waSkinModel.h skinMap.h waSkinMapping.h waIndicator.h guiSpectrumAnalyser.h winSkinConfig.h waBalanceSlider.h waStatus.h waSlider.h winskin.plugin waShadeMapping.h waMain.h waInfo.h waRegion.h waJumpSlider.h waVolumeSlider.h waSkin.h waColor.h waTitleBar.h waButton.h +-KDE_DIST=skinMap.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 waTitleBar.h waButton.h guiSpectrumAnalyser.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -907,7 +907,7 @@ - -rm -f noatun_winskin_la_meta_unload.cpp +@@ -824,84 +824,84 @@ noatun_winskin.la.closure: $(noatun_wins + + + #>+ 3 +-waClutterbar.moc.cpp: $(srcdir)/waClutterbar.h +- $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc.cpp +- +-#>+ 3 + waVolumeSlider.moc: $(srcdir)/waVolumeSlider.h + $(MOC) $(srcdir)/waVolumeSlider.h -o 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 + + #>+ 3 + winSkinConfig.moc: $(srcdir)/winSkinConfig.h + $(MOC) $(srcdir)/winSkinConfig.h -o 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 + + #>+ 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 + + #>+ 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 + + #>+ 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 + + #>+ 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 + + #>+ 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 + + #>+ 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 + + #>+ 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 + + #>+ 3 +-waInfo.moc: $(srcdir)/waInfo.h +- $(MOC) $(srcdir)/waInfo.h -o waInfo.moc ++waClutterbar.moc.cpp: $(srcdir)/waClutterbar.h ++ $(MOC) $(srcdir)/waClutterbar.h -o waClutterbar.moc.cpp + + #>+ 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 ++ ++#>+ 3 ++waMain.moc: $(srcdir)/waMain.h ++ $(MOC) $(srcdir)/waMain.h -o waMain.moc ++ ++#>+ 3 ++waLabel.moc: $(srcdir)/waLabel.h ++ $(MOC) $(srcdir)/waLabel.h -o waLabel.moc + + #>+ 3 + winSkinVis.moc: $(srcdir)/winSkinVis.h + $(MOC) $(srcdir)/winSkinVis.h -o winSkinVis.moc + + #>+ 3 +-waSkinModel.moc: $(srcdir)/waSkinModel.h +- $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc ++waIndicator.moc: $(srcdir)/waIndicator.h ++ $(MOC) $(srcdir)/waIndicator.h -o waIndicator.moc + + #>+ 3 + waBalanceSlider.moc: $(srcdir)/waBalanceSlider.h + $(MOC) $(srcdir)/waBalanceSlider.h -o waBalanceSlider.moc + + #>+ 3 +-waTitleBar.moc: $(srcdir)/waTitleBar.h +- $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc +- +-#>+ 3 +-waStatus.moc: $(srcdir)/waStatus.h +- $(MOC) $(srcdir)/waStatus.h -o waStatus.moc ++waSkinModel.moc: $(srcdir)/waSkinModel.h ++ $(MOC) $(srcdir)/waSkinModel.h -o waSkinModel.moc + + #>+ 3 + clean-metasources: +- -rm -f waClutterbar.moc.cpp 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 ++ -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.cpp waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc + + #>+ 3 + clean-closures: +@@ -918,7 +918,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 noatun_winskin_la_meta_unload.cpp waClutterbar.moc.cpp waVolumeSlider.moc guiSpectrumAnalyser.moc winSkinConfig.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc -+noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/noatun_winskin_la_meta_unload.cpp waClutterbar.moc.cpp waVolumeSlider.moc guiSpectrumAnalyser.moc winSkinConfig.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc +-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 waClutterbar.moc.cpp 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 ++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 waClutterbar.moc.cpp waVolumeSlider.moc winSkinConfig.moc guiSpectrumAnalyser.moc waButton.moc waInfo.moc waStatus.moc waTitleBar.moc waSkin.moc waDigit.moc waWidget.moc waSlider.moc waJumpSlider.moc waMain.moc waLabel.moc winSkinVis.moc waIndicator.moc waBalanceSlider.moc waSkinModel.moc @echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \ rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \ +@@ -954,39 +954,39 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 37 +-waSkin.o: waSkin.moc +-waIndicator.lo: waIndicator.moc +-waInfo.lo: waInfo.moc ++waWidget.lo: waWidget.moc ++guiSpectrumAnalyser.o: guiSpectrumAnalyser.moc ++guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc ++winSkinConfig.o: winSkinConfig.moc + waMain.lo: waMain.moc ++winSkinConfig.lo: winSkinConfig.moc + waBalanceSlider.o: waBalanceSlider.moc +-winSkinVis.o: winSkinVis.moc +-winSkinConfig.o: winSkinConfig.moc +-waDigit.lo: waDigit.moc +-waTitleBar.lo: waTitleBar.moc +-guiSpectrumAnalyser.lo: guiSpectrumAnalyser.moc +-waInfo.o: waInfo.moc +-waTitleBar.o: waTitleBar.moc +-waWidget.lo: waWidget.moc +-waButton.lo: waButton.moc +-waButton.o: waButton.moc +-waSkin.lo: waSkin.moc +-waWidget.o: waWidget.moc ++waInfo.lo: waInfo.moc ++waSkinModel.lo: waSkinModel.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 ++waJumpSlider.lo: waJumpSlider.moc ++waLabel.o: waLabel.moc + waSlider.o: waSlider.moc ++waWidget.o: waWidget.moc ++waButton.lo: waButton.moc + waMain.o: waMain.moc +-waBalanceSlider.lo: waBalanceSlider.moc ++waInfo.o: waInfo.moc ++waDigit.lo: waDigit.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 ++waJumpSlider.o: waJumpSlider.moc + waIndicator.o: waIndicator.moc +-waSkinModel.lo: waSkinModel.moc ++waBalanceSlider.lo: waBalanceSlider.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 ++waTitleBar.o: waTitleBar.moc ++waSlider.lo: waSlider.moc ++waButton.o: waButton.moc diff --git a/audio/kdemultimedia3/patches/patch-cl b/audio/kdemultimedia3/patches/patch-cl deleted file mode 100644 index 7fa70add4f8..00000000000 --- a/audio/kdemultimedia3/patches/patch-cl +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-cl,v 1.2 2002/06/25 19:38:30 skrll Exp $ - ---- admin/am_edit.orig Wed May 8 19:28:50 2002 -+++ admin/am_edit -@@ -384,7 +384,16 @@ - # all modules are installed. automake doesn't know this, so we need to move - # this here from install-data to install-exec. - if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) { -- $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES"; -+ my $lookup2 = 'install-exec-am:\s*([^\n]*)'; -+ if ($MakefileData =~ /\n$lookup2\n/) { -+ my $newdeps = $1; -+ if ($newdeps =~ m/\s*install-libLTLIBRARIES\s*/) { -+ $newdeps =~ s/(install-libLTLIBRARIES)/$1 install-kde_moduleLTLIBRARIES/g; -+ substituteLine($lookup2, "install-exec-am: " . $newdeps); -+ } else { -+ $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES"; -+ } -+ } - my $lookup = 'install-data-am:\s*(.*)'; - if ($MakefileData =~ /\n$lookup\n/) { - my $newdeps = $1; diff --git a/audio/kdemultimedia3/patches/patch-cn b/audio/kdemultimedia3/patches/patch-cn index 51057c7f361..86a3b784801 100644 --- a/audio/kdemultimedia3/patches/patch-cn +++ b/audio/kdemultimedia3/patches/patch-cn @@ -1,13 +1,32 @@ -$NetBSD: patch-cn,v 1.1 2002/10/03 11:21:29 markd Exp $ +$NetBSD: patch-cn,v 1.2 2003/01/02 09:12:23 skrll Exp $ ---- noatun/modules/artseffects/Makefile.in.orig Thu Aug 8 06:02:32 2002 +--- noatun/modules/artseffects/Makefile.in.orig Sat Dec 28 14:04:00 2002 +++ noatun/modules/artseffects/Makefile.in -@@ -297,7 +297,7 @@ +@@ -296,7 +296,7 @@ libartseffects_la_SOURCES = artseffects. libartseffects_la_LDFLAGS = -L$(top_builddir)/arts/gui/common $(all_libraries) \ - -module -avoid-version -no-undefined + -module -avoid-version -no-undefined -libartseffects_la_LIBADD = -lartsgui_idl -lkmedia2_idl -lsoundserver_idl -lartsflow +libartseffects_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la -lkmedia2_idl -lsoundserver_idl -lartsflow #libartseffectsui_la_SOURCES = artseffects.cc +@@ -315,7 +315,8 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-libartseffects_la_DEPENDENCIES = ++libartseffects_la_DEPENDENCIES = \ ++ $(top_builddir)/arts/gui/common/libartsgui_idl.la + am_libartseffects_la_OBJECTS = artseffects.lo extrastereo_impl.lo + #>- libartseffects_la_OBJECTS = $(am_libartseffects_la_OBJECTS) + #>+ 4 +@@ -516,7 +517,7 @@ distclean-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 + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/audio/kdemultimedia3/patches/patch-co b/audio/kdemultimedia3/patches/patch-co new file mode 100644 index 00000000000..663d9110126 --- /dev/null +++ b/audio/kdemultimedia3/patches/patch-co @@ -0,0 +1,13 @@ +$NetBSD: patch-co,v 1.1 2003/01/02 09:12:24 skrll Exp $ + +--- noatun/modules/excellent/Makefile.am.orig Sun Dec 1 13:45:29 2002 ++++ noatun/modules/excellent/Makefile.am +@@ -6,7 +6,7 @@ noatun_excellent_la_SOURCES = noatunui.c + + noatun_excellent_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined + noatun_excellent_la_LIBADD = $(LIB_KFILE) \ +- $(top_builddir)/noatun/library/libnoatun.la \ ++ $(top_builddir)/noatun/library/libnoatun_core.la \ + $(top_builddir)/noatun/library/libnoatuncontrols.la \ + -lqtmcop -lkmedia2_idl -lsoundserver_idl + |