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 | |
| 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.
135 files changed, 6363 insertions, 5286 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 + diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index f79bba65329..592c1bd12e9 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2002/12/24 06:09:54 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2003/01/02 09:12:24 skrll Exp $ -DISTNAME= kdesdk-3.0.4 -PKGREVISION= 1 +DISTNAME= kdesdk-3.0.5a CATEGORIES= devel COMMENT= Support applications and tools used by KDE developers diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo index b5af4256a30..c273706442e 100644 --- a/devel/kdesdk3/distinfo +++ b/devel/kdesdk3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2002/10/14 09:13:46 skrll Exp $ +$NetBSD: distinfo,v 1.4 2003/01/02 09:12:24 skrll Exp $ -SHA1 (kdesdk-3.0.4.tar.bz2) = 5565298ba23109a06c84227e216e23fb15a9737a -Size (kdesdk-3.0.4.tar.bz2) = 1842876 bytes +SHA1 (kdesdk-3.0.5a.tar.bz2) = ef7efae29b49d8c71b121c31e23f7aa67ce4124c +Size (kdesdk-3.0.5a.tar.bz2) = 1847289 bytes SHA1 (patch-aa) = 769ed077dedc4fef0c3fbcfaa34f2e8d9c282c00 SHA1 (patch-ab) = a975fd30cbee8107856774161f9216cde2548a10 SHA1 (patch-ac) = 86d3e639fe15e88dad41b590e5399b3d50207307 diff --git a/doc/CHANGES b/doc/CHANGES index 063150a6082..5fef4763603 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.970 2003/01/02 06:42:08 jlam Exp $ +$NetBSD: CHANGES,v 1.971 2003/01/02 09:12:19 skrll Exp $ Changes to the packages collection and infrastructure in 2003: @@ -12,3 +12,19 @@ Changes to the packages collection and infrastructure in 2003: Updated gnome-vfs to 1.0.3nb1 [rh 2003-01-02] Updated gnome-mime-data to 2.0.1nb2 [rh 2003-01-02] Updated iasp to 2.1.1nb1 [jlam 2003-01-02] + Updated arts to 1.0.5.1 [skrll 2003-01-02] + Updated kde3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdeaddons3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdeadmin3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdeartwork3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdebase3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdeedu3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdegames3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdegraphics3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdelibs3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdemultimedia3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdenetwork3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdepim3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdetoys3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdeutils3 to 3.0.5.1 [skrll 2003-01-02] + Updated kdesdk3 to 3.0.5.1 [skrll 2003-01-02] @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.119 2003/01/01 09:56:50 tron Exp $ +$NetBSD: TODO,v 1.120 2003/01/02 09:12:20 skrll Exp $ Suggested new packages ====================== @@ -152,7 +152,6 @@ Suggested package updates o joe-2.9 [pkg/18022] o johntheripper-1.6.32 o jpilot-0.99.2 [dillo] - o kde-3.0.5a [skrll] o kdevelop-2.1.4 [3.0alpha1] o koffice-1.2.1 o lbreakout2-2.4 diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 2f8b6137390..2f00d857088 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2002/12/24 06:10:03 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2003/01/02 09:12:24 skrll Exp $ -DISTNAME= kdegames-3.0.4 -PKGREVISION= 1 +DISTNAME= kdegames-3.0.5a CATEGORIES= games COMMENT= Games for the KDE integrated X11 desktop diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo index 62fcc68781e..dde01b392e7 100644 --- a/games/kdegames3/distinfo +++ b/games/kdegames3/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:46 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:24 skrll Exp $ -SHA1 (kdegames-3.0.4.tar.bz2) = b1c9256e3ae36375402d7e4e93a79b5b1f3e6db6 -Size (kdegames-3.0.4.tar.bz2) = 7239970 bytes +SHA1 (kdegames-3.0.5a.tar.bz2) = 340253ebfe393f3f1e4d8d70f2b536837471820f +Size (kdegames-3.0.5a.tar.bz2) = 7250288 bytes SHA1 (patch-aa) = c0103abe8c12e83800c09b3e87048a0bb86b365f -SHA1 (patch-ab) = 68875cb7ddd517bd65a2490143b9600001c359d2 +SHA1 (patch-ab) = 239eaff9f0a7a38857f95317ac40054f0fc8ce31 SHA1 (patch-ac) = 8fb1279b5ffc348bf2c54186f8156c9f9680c559 SHA1 (patch-ad) = aa0658f3523f0f5b6d41f61748900c413e704f69 diff --git a/games/kdegames3/patches/patch-ab b/games/kdegames3/patches/patch-ab index 85f4876c1aa..378c12ff40c 100644 --- a/games/kdegames3/patches/patch-ab +++ b/games/kdegames3/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ +$NetBSD: patch-ab,v 1.2 2003/01/02 09:12:25 skrll Exp $ ---- kbackgammon/Makefile.in.orig Fri May 10 15:29:29 2002 +--- kbackgammon/Makefile.in.orig Mon Dec 30 20:02:01 2002 +++ kbackgammon/Makefile.in -@@ -229,24 +229,25 @@ +@@ -228,24 +228,25 @@ x_libraries = @x_libraries@ INCLUDES = -I$(top_srcdir)/libkdegames -I$(top_srcdir)/libkdegames/kgame/ -I$(srcdir)/engines $(all_includes) bin_PROGRAMS = kbackgammon @@ -13,11 +13,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ - -kbackgammon_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lkdeprint \ +libkbackgammon_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -lkdeprint \ - ./engines/libkbgengines.la + ./engines/libkbgengines.la -kbackgammon_la_SOURCES = main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp \ +libkbackgammon_main_la_SOURCES = main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp \ - kbgstatus.cpp + kbgstatus.cpp +kbackgammon_la_LIBADD = libkbackgammon_main.la @@ -28,14 +28,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ -kbackgammon_LDADD = kbackgammon.la $(top_builddir)/libkdegames/libkdegames.la \ +kbackgammon_LDADD = libkbackgammon_main.la $(top_builddir)/libkdegames/libkdegames.la \ - $(LIB_KSYCOCA) + $(LIB_KSYCOCA) -kbackgammon_SOURCES = dummy.cpp +kbackgammon_SOURCES = kbackgammon_main.cpp kbackgammon_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = version.h kbg.h kbgboard.h kbgtextview.h kbgstatus.h -@@ -266,25 +267,31 @@ +@@ -265,24 +266,30 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -52,17 +52,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ +am_libkbackgammon_main_la_OBJECTS = main.lo kbg.lo kbgboard.lo \ + kbgtextview.lo kbgstatus.lo +#>- libkbackgammon_main_la_OBJECTS = $(am_libkbackgammon_main_la_OBJECTS) - #>+ 6 + #>+ 5 -kbackgammon_la_final_OBJECTS = kbackgammon_la.all_cpp.lo -kbackgammon_la_nofinal_OBJECTS = main.lo kbg.lo kbgboard.lo kbgtextview.lo \ -- kbgstatus.lo \ -- kbackgammon_la_meta_unload.lo +- kbgstatus.lo -@KDE_USE_FINAL_FALSE@kbackgammon_la_OBJECTS = $(kbackgammon_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kbackgammon_la_OBJECTS = $(kbackgammon_la_final_OBJECTS) +libkbackgammon_main_la_final_OBJECTS = libkbackgammon_main_la.all_cpp.lo +libkbackgammon_main_la_nofinal_OBJECTS = main.lo kbg.lo kbgboard.lo \ -+ kbgtextview.lo kbgstatus.lo \ -+ libkbackgammon_main_la_meta_unload.lo ++ kbgtextview.lo kbgstatus.lo +@KDE_USE_FINAL_FALSE@libkbackgammon_main_la_OBJECTS = $(libkbackgammon_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkbackgammon_main_la_OBJECTS = $(libkbackgammon_main_la_final_OBJECTS) bin_PROGRAMS = kbackgammon$(EXEEXT) @@ -79,17 +77,29 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ $(top_builddir)/libkdegames/libkdegames.la DEFS = @DEFS@ -@@ -293,7 +300,8 @@ +@@ -291,14 +298,17 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbackgammon_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -315,7 +323,8 @@ +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbackgammon_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo +-#>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kbackgammon_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \ ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkbackgammon_main_la.all_cpp.P $(DEPDIR)/kbackgammon_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kbg.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kbackgammon_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbackgammon_main.Po $(DEPDIR)/kbg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbgboard.Plo $(DEPDIR)/kbgstatus.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbgtextview.Plo $(DEPDIR)/main.Plo + +@@ -321,7 +331,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -99,7 +109,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ DATA = $(applnk_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) -@@ -328,7 +337,7 @@ +@@ -334,7 +345,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(noinst_HEADERS) AUTHORS Makefile.am Makefile.in \ TODO DIST_SUBDIRS = $(SUBDIRS) @@ -108,7 +118,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -377,6 +386,8 @@ +@@ -383,6 +394,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kbackgammon.la: $(kbackgammon_la_OBJECTS) $(kbackgammon_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kbackgammon_la_LDFLAGS) $(kbackgammon_la_OBJECTS) $(kbackgammon_la_LIBADD) $(LIBS) @@ -117,7 +127,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -411,7 +422,8 @@ +@@ -417,7 +430,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -127,16 +137,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbgboard.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kbgstatus.Plo@am__quote@ -@@ -569,7 +581,7 @@ +@@ -575,7 +589,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kbackgammon.desktop kbackgammonui.rc eventsrc -+KDE_DIST=kbackgammon.desktop kbackgammonui.rc eventsrc kbackgammon dummy.cpp +-KDE_DIST=eventsrc kbackgammonui.rc kbackgammon.desktop ++KDE_DIST=kbackgammon.desktop kbackgammonui.rc eventsrc DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -631,7 +643,6 @@ +@@ -637,7 +651,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -144,7 +154,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -712,9 +723,6 @@ +@@ -718,9 +731,6 @@ messages: rc.cpp LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ $(XGETTEXT) $$LIST -o $(podir)/kbackgammon.pot @@ -154,79 +164,58 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ install-data-local: #>- rm -rf $(kde_appsdir)/Games/kbackgammon.desktop #>+ 1 -@@ -754,28 +762,28 @@ - - - #>+ 12 --kbackgammon_la_meta_unload.cpp: kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc -- @echo 'creating kbackgammon_la_meta_unload.cpp' -- @-rm -f kbackgammon_la_meta_unload.cpp -+libkbackgammon_main_la_meta_unload.cpp: kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc -+ @echo 'creating libkbackgammon_main_la_meta_unload.cpp' -+ @-rm -f libkbackgammon_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kbackgammon_la[] = {' > kbackgammon_la_meta_unload.cpp ;\ -- cat kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbackgammon_la_meta_unload.cpp ;\ -- echo '0};' >> kbackgammon_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kbackgammon_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kbackgammon_la)' >> kbackgammon_la_meta_unload.cpp ;\ -- else echo > kbackgammon_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkbackgammon_main_la[] = {' > libkbackgammon_main_la_meta_unload.cpp ;\ -+ cat kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbackgammon_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkbackgammon_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkbackgammon_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkbackgammon_main_la)' >> libkbackgammon_main_la_meta_unload.cpp ;\ -+ else echo > libkbackgammon_main_la_meta_unload.cpp; fi +@@ -730,10 +740,6 @@ install-data-local: + .NOEXPORT: + #>+ 3 +-kbg.moc: $(srcdir)/kbg.h +- $(MOC) $(srcdir)/kbg.h -o kbg.moc +- +-#>+ 3 + kbgboard.moc: $(srcdir)/kbgboard.h + $(MOC) $(srcdir)/kbgboard.h -o kbgboard.moc + +@@ -746,8 +752,12 @@ kbgstatus.moc: $(srcdir)/kbgstatus.h + $(MOC) $(srcdir)/kbgstatus.h -o kbgstatus.moc #>+ 3 - clean-moc-classes: -- -rm -f kbackgammon_la_meta_unload.cpp -+ -rm -f libkbackgammon_main_la_meta_unload.cpp ++kbg.moc: $(srcdir)/kbg.h ++ $(MOC) $(srcdir)/kbg.h -o kbg.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f kbg.moc kbgboard.moc kbgtextview.moc kbgstatus.moc ++ -rm -f kbgboard.moc kbgtextview.moc kbgstatus.moc kbg.moc + + #>+ 2 + docs-am: +@@ -760,33 +770,33 @@ force-reedit: - #>+ 11 --kbackgammon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp kbackgammon_la_meta_unload.cpp kbgboard.moc kbgtextview.moc kbgstatus.moc kbg.moc -+kbackgammon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbackgammon_main.cpp kbgboard.moc kbgtextview.moc kbgstatus.moc kbg.moc - @echo 'creating kbackgammon_la.all_cpp.cpp ...'; \ - rm -f kbackgammon_la.all_cpp.files kbackgammon_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kbackgammon_la.all_cpp.final; \ -- for file in main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp kbgstatus.cpp kbackgammon_la_meta_unload.cpp ; do \ -+ for file in kbackgammon_main.cpp ; do \ - echo "#include \"$$file\"" >> kbackgammon_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbackgammon_la.all_cpp.final; \ - done; \ -@@ -783,11 +791,23 @@ - rm -f kbackgammon_la.all_cpp.final kbackgammon_la.all_cpp.files #>+ 11 --kbackgammon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkbackgammon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp libkbackgammon_main_la_meta_unload.cpp +-kbackgammon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp kbg.moc kbgtextview.moc kbgboard.moc kbgstatus.moc +- @echo 'creating kbackgammon_la.all_cpp.cpp ...'; \ +- rm -f kbackgammon_la.all_cpp.files kbackgammon_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kbackgammon_la.all_cpp.final; \ ++libkbackgammon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kbg.cpp $(srcdir)/kbgboard.cpp $(srcdir)/kbgtextview.cpp $(srcdir)/kbgstatus.cpp kbgboard.moc kbgtextview.moc kbg.moc kbgstatus.moc + @echo 'creating libkbackgammon_main_la.all_cpp.cpp ...'; \ + rm -f libkbackgammon_main_la.all_cpp.files libkbackgammon_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbackgammon_main_la.all_cpp.final; \ -+ for file in main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp kbgstatus.cpp libkbackgammon_main_la_meta_unload.cpp ; do \ + for file in main.cpp kbg.cpp kbgboard.cpp kbgtextview.cpp kbgstatus.cpp ; do \ +- echo "#include \"$$file\"" >> kbackgammon_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbackgammon_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkbackgammon_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbackgammon_main_la.all_cpp.final; \ -+ done; \ -+ cat libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files > libkbackgammon_main_la.all_cpp.cpp; \ -+ rm -f libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files -+ -+#>+ 11 -+kbackgammon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbackgammon_main.cpp - @echo 'creating kbackgammon.all_cpp.cpp ...'; \ - rm -f kbackgammon.all_cpp.files kbackgammon.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kbackgammon.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kbackgammon_main.cpp ; do \ - echo "#include \"$$file\"" >> kbackgammon.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbackgammon.all_cpp.final; \ done; \ -@@ -796,20 +816,20 @@ +- cat kbackgammon_la.all_cpp.final kbackgammon_la.all_cpp.files > kbackgammon_la.all_cpp.cpp; \ +- rm -f kbackgammon_la.all_cpp.final kbackgammon_la.all_cpp.files ++ cat libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files > libkbackgammon_main_la.all_cpp.cpp; \ ++ rm -f libkbackgammon_main_la.all_cpp.final libkbackgammon_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kbackgammon_la.all_cpp.cpp kbackgammon.all_cpp.cpp -+ -rm -f kbackgammon_la.all_cpp.cpp libkbackgammon_main_la.all_cpp.cpp kbackgammon.all_cpp.cpp +- -rm -f kbackgammon_la.all_cpp.cpp ++ -rm -f libkbackgammon_main_la.all_cpp.cpp #>+ 2 final: @@ -246,4 +235,21 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 14:02:55 skrll Exp $ + $(MAKE) libkbackgammon_main_la_OBJECTS="$(libkbackgammon_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 +@@ -796,11 +806,11 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 9 +-kbgstatus.o: kbgstatus.moc +-kbg.o: kbg.moc +-kbgboard.o: kbgboard.moc +-kbg.lo: kbg.moc +-kbgstatus.lo: kbgstatus.moc + kbgtextview.lo: kbgtextview.moc ++kbgboard.o: kbgboard.moc + kbgtextview.o: kbgtextview.moc ++kbgstatus.o: kbgstatus.moc ++kbgstatus.lo: kbgstatus.moc + kbgboard.lo: kbgboard.moc ++kbg.lo: kbg.moc ++kbg.o: kbg.moc diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile index 0115ec1deb2..db4ac28cc62 100644 --- a/games/kdetoys3/Makefile +++ b/games/kdetoys3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:04 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:25 skrll Exp $ -DISTNAME= kdetoys-3.0.4 -PKGREVISION= 1 +DISTNAME= kdetoys-3.0.5a CATEGORIES= games COMMENT= Toys for the KDE integrated X11 desktop diff --git a/games/kdetoys3/PLIST b/games/kdetoys3/PLIST index 22ebfabbcf6..64d5d068558 100644 --- a/games/kdetoys3/PLIST +++ b/games/kdetoys3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:49:16 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/01/02 09:12:25 skrll Exp $ bin/amor bin/kaphorism bin/kmoon @@ -586,8 +586,9 @@ share/kde/icons/locolor/32x32/apps/ktux.png @comment dirrm share/kde/icons/hicolor/32x32/apps @comment dirrm share/kde/icons/hicolor/16x16/apps @dirrm share/kde/apps/kworldclock/pics -@dirrm share/kde/apps/kworldclock/maps/depths -@comment dirrm share/kde/apps/kworldclock +@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps/depths >/dev/null || true +@unexec ${RMDIR} %D/share/kde/apps/kworldclock/maps >/dev/null || true +@unexec ${RMDIR} %D/share/kde/apps/kworldclock >/dev/null || true @dirrm share/kde/apps/kweather @dirrm share/kde/apps/ktux/sprites @dirrm share/kde/apps/ktux diff --git a/games/kdetoys3/distinfo b/games/kdetoys3/distinfo index dad116f5994..9bced7236b9 100644 --- a/games/kdetoys3/distinfo +++ b/games/kdetoys3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:47 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:25 skrll Exp $ -SHA1 (kdetoys-3.0.4.tar.bz2) = fc734331e3c7f29d1f72dcf1f976d47c7b172822 -Size (kdetoys-3.0.4.tar.bz2) = 1426222 bytes +SHA1 (kdetoys-3.0.5a.tar.bz2) = 06df8464b2b0c9ed6a9a65b1fa0e2c3bccfd1e60 +Size (kdetoys-3.0.5a.tar.bz2) = 1428350 bytes diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 54051f861d3..c90278e4d47 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2002/12/24 06:10:06 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:25 skrll Exp $ -DISTNAME= kdegraphics-3.0.4 -PKGREVISION= 1 +DISTNAME= kdegraphics-3.0.5a CATEGORIES= graphics COMMENT= Graphics programs for the KDE integrated X11 desktop diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index b75328b44d4..833197ed8ac 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:47 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:25 skrll Exp $ -SHA1 (kdegraphics-3.0.4.tar.bz2) = 859584b2c522402149887f7e23f14bc3b8c06c54 -Size (kdegraphics-3.0.4.tar.bz2) = 2665229 bytes +SHA1 (kdegraphics-3.0.5a.tar.bz2) = 2288b4ee8ce80ef8103baa3783749655fd9e19a5 +Size (kdegraphics-3.0.5a.tar.bz2) = 2664922 bytes SHA1 (patch-aa) = 6abaca67ea4d0fa0a5f9ac9126adb78cc15bc287 SHA1 (patch-ab) = 2797a41da3c39cca6d39369bba767728f973e245 SHA1 (patch-ac) = 64cd943b954af8f0b2b8875f56a43ec6d175f5c7 -SHA1 (patch-ad) = 5aadae5dda5ec9a6f66b3cf7870967291e73922b +SHA1 (patch-ad) = d66a8749a0c7c6ac76ba2e196f1bd6bb94d5f66a SHA1 (patch-ae) = f9ff03ea8e1ff92126312ef28e5d5df5a17b8e57 SHA1 (patch-af) = 9dd124174938f41124b98540da3d3548ebedbb48 SHA1 (patch-ag) = 81c4a846763534c9fe3366bf8d571208d337e2c4 -SHA1 (patch-ah) = 3a7984280e549bc0dcf05b01f80f8367747c78c9 +SHA1 (patch-ah) = 551a85ead5c295e9342134478062abfb9700b4d4 SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1 SHA1 (patch-aj) = 907f78831601897aa12de00f07c2978d09b72ad5 diff --git a/graphics/kdegraphics3/patches/patch-ad b/graphics/kdegraphics3/patches/patch-ad index 6a6a776883c..dcc4b2ab1b1 100644 --- a/graphics/kdegraphics3/patches/patch-ad +++ b/graphics/kdegraphics3/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ +$NetBSD: patch-ad,v 1.2 2003/01/02 09:12:26 skrll Exp $ ---- kview/Makefile.in.orig Wed May 8 20:05:35 2002 +--- kview/Makefile.in.orig Tue Dec 31 13:27:55 2002 +++ kview/Makefile.in -@@ -246,33 +246,37 @@ +@@ -245,33 +245,37 @@ INCLUDES = $(all_includes) #>- METASOURCES = AUTO @@ -21,20 +21,20 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ -#>- kview_la_SOURCES = main.cpp viewer.cpp kview.cpp colour.cpp \ +#>- libkview_main_la_SOURCES = main.cpp viewer.cpp kview.cpp colour.cpp \ - #>- filter.cpp filtlist.cpp \ - #>- kcproc.cpp kviewconfdialog_base.ui kviewconfdialog.cpp \ - #>- imagelistdialog_base.ui imagelistdialog.cpp \ - #>- knumdialog_base.ui knumdialog.cpp \ - #>- kfilteraction.cpp infowin_base.ui infowin.cpp + #>- filter.cpp filtlist.cpp \ + #>- kcproc.cpp kviewconfdialog_base.ui kviewconfdialog.cpp \ + #>- imagelistdialog_base.ui imagelistdialog.cpp \ + #>- knumdialog_base.ui knumdialog.cpp \ + #>- kfilteraction.cpp infowin_base.ui infowin.cpp #>+ 6 -kview_la_SOURCES=main.cpp viewer.cpp kview.cpp colour.cpp \ +libkview_main_la_SOURCES=main.cpp viewer.cpp kview.cpp colour.cpp \ filter.cpp filtlist.cpp \ kcproc.cpp kviewconfdialog.cpp \ - imagelistdialog.cpp \ - knumdialog.cpp \ -- kfilteraction.cpp infowin.cpp kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C -+ kfilteraction.cpp infowin.cpp kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc + imagelistdialog.cpp \ + knumdialog.cpp \ +- kfilteraction.cpp infowin.cpp kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C ++ kfilteraction.cpp infowin.cpp kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc -kview_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -48,7 +48,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ test_SOURCES = libkview.la test.cpp test_LDFLAGS = $(all_libraries) -module -avoid-version -@@ -296,24 +300,29 @@ +@@ -295,23 +299,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -66,31 +66,29 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ + filter.lo filtlist.lo kcproc.lo kviewconfdialog.lo \ + imagelistdialog.lo knumdialog.lo kfilteraction.lo infowin.lo +#>- libkview_main_la_OBJECTS = $(am_libkview_main_la_OBJECTS) - #>+ 7 --kview_la_final_OBJECTS = kview_la.all_cpp.lo kview_la.all_C.lo + #>+ 6 +-kview_la_final_OBJECTS = kview_la.all_C.lo kview_la.all_cpp.lo -kview_la_nofinal_OBJECTS = main.lo viewer.lo kview.lo colour.lo filter.lo \ - filtlist.lo kcproc.lo kviewconfdialog.lo imagelistdialog.lo \ -- knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo \ -- kview_la_meta_unload.lo +- knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo -@KDE_USE_FINAL_FALSE@kview_la_OBJECTS = $(kview_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kview_la_OBJECTS = $(kview_la_final_OBJECTS) +libkview_main_la_final_OBJECTS = libkview_main_la.all_cpp.lo libkview_main_la.all_cc.lo +libkview_main_la_nofinal_OBJECTS = main.lo viewer.lo kview.lo colour.lo \ + filter.lo filtlist.lo kcproc.lo kviewconfdialog.lo \ -+ imagelistdialog.lo knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo \ -+ libkview_main_la_meta_unload.lo ++ imagelistdialog.lo knumdialog.lo kfilteraction.lo infowin.lo kviewconfdialog_base.lo imagelistdialog_base.lo knumdialog_base.lo infowin_base.lo +@KDE_USE_FINAL_FALSE@libkview_main_la_OBJECTS = $(libkview_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkview_main_la_OBJECTS = $(libkview_main_la_final_OBJECTS) libkviewpart_la_DEPENDENCIES = am_libkviewpart_la_OBJECTS = canvas.lo kview_view.lo kview_asyncio.lo #>- libkviewpart_la_OBJECTS = $(am_libkviewpart_la_OBJECTS) - #>+ 5 --libkviewpart_la_final_OBJECTS = libkviewpart_la.all_cpp.lo libkviewpart_la.all_C.lo libkviewpart_la.all_cc.lo -+libkviewpart_la_final_OBJECTS = libkviewpart_la.all_cpp.lo libkviewpart_la.all_cc.lo - libkviewpart_la_nofinal_OBJECTS = canvas.lo kview_view.lo kview_asyncio.lo \ - libkviewpart_la_meta_unload.lo + #>+ 4 +-libkviewpart_la_final_OBJECTS = libkviewpart_la.all_cc.lo canvas.lo ++libkviewpart_la_final_OBJECTS = canvas.lo libkviewpart_la.all_cc.lo + libkviewpart_la_nofinal_OBJECTS = canvas.lo kview_view.lo kview_asyncio.lo @KDE_USE_FINAL_FALSE@libkviewpart_la_OBJECTS = $(libkviewpart_la_nofinal_OBJECTS) -@@ -322,11 +331,11 @@ + @KDE_USE_FINAL_TRUE@libkviewpart_la_OBJECTS = $(libkviewpart_la_final_OBJECTS) +@@ -319,11 +328,11 @@ bin_PROGRAMS = kview$(EXEEXT) check_PROGRAMS = test$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -105,22 +103,48 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ am_test_OBJECTS = test.$(OBJEXT) #>- test_OBJECTS = $(am_test_OBJECTS) #>+ 1 -@@ -340,12 +349,12 @@ +@@ -337,33 +346,33 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/filtlist.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kview_asyncio.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/kview_view.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo -@@ -376,8 +385,8 @@ + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/filtlist.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kview_asyncio.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kview_view.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo + #>+ 21 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kviewconfdialog_base.P $(DEPDIR)/imagelistdialog_base.P $(DEPDIR)/knumdialog_base.P $(DEPDIR)/infowin_base.P $(DEPDIR)/kview_la.all_C.P $(DEPDIR)/kview_la.all_cpp.P $(DEPDIR)/libkviewpart_la.all_cc.P $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/filtlist.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kviewconfdialog_base.P $(DEPDIR)/imagelistdialog_base.P $(DEPDIR)/knumdialog_base.P $(DEPDIR)/infowin_base.P $(DEPDIR)/libkview_main_la.all_cpp.P $(DEPDIR)/libkview_main_la.all_cc.P $(DEPDIR)/libkviewpart_la.all_cc.P $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kview_asyncio.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kview_view.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kviewconfdialog_base.P $(DEPDIR)/imagelistdialog_base.P $(DEPDIR)/knumdialog_base.P $(DEPDIR)/infowin_base.P $(DEPDIR)/canvas.Plo $(DEPDIR)/colour.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/filter.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/filtlist.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/filter.Plo $(DEPDIR)/filtlist.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/imagelistdialog.Plo $(DEPDIR)/infowin.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcproc.Plo $(DEPDIR)/kfilteraction.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/knumdialog.Plo $(DEPDIR)/kview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kview_asyncio.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kview_main.Plo $(DEPDIR)/kview_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kview_view.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kviewconfdialog.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/test.Po $(DEPDIR)/viewer.Plo +@@ -395,8 +404,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -131,7 +155,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ DATA = $(lnk_DATA) $(part_DATA) $(rc_DATA) -@@ -387,14 +396,14 @@ +@@ -406,14 +415,14 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README AUTHORS Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -148,7 +172,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ mostlyclean-libtool: -rm -f *.lo -@@ -436,6 +445,8 @@ +@@ -455,6 +464,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kview.la: $(kview_la_OBJECTS) $(kview_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kview_la_LDFLAGS) $(kview_la_OBJECTS) $(kview_la_LIBADD) $(LIBS) @@ -157,7 +181,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ #>- libkviewpart.la: $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) #>+ 2 @KDE_USE_CLOSURE_TRUE@libkviewpart.la: libkviewpart.la.closure $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) -@@ -483,7 +494,6 @@ +@@ -502,7 +513,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/canvas.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/colour.Plo@am__quote@ @@ -165,7 +189,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filter.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filtlist.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/imagelistdialog.Plo@am__quote@ -@@ -493,6 +503,8 @@ +@@ -512,6 +522,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knumdialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_asyncio.Plo@am__quote@ @@ -174,7 +198,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kview_view.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kviewconfdialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -502,25 +514,6 @@ +@@ -521,25 +533,6 @@ distclean-compile: distclean-depend: -rm -rf $(DEPDIR) @@ -200,7 +224,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ .cc.o: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@@ -538,6 +531,7 @@ +@@ -557,6 +550,7 @@ CXXDEPMODE = @CXXDEPMODE@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< @@ -208,16 +232,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ .cpp.o: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@@ -703,7 +697,7 @@ +@@ -722,7 +716,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=filter.h infowin.h viewer.h kview_popup.rc kfilteraction.h imagelistdialog.h kview_part.rc infowin.cpp kview.h kviewconfdialog.cpp kfilteraction.cpp hi32-app-kview.png imagelistdialog.cpp knumdialog.h kviewui.rc kcproc.h knumdialog_base.ui kview_asyncio.h hi16-app-kview.png colour.h kcproc.cpp hi48-app-kview.png kviewconfdialog.h infowin_base.ui filtlist.h canvas.h kviewconfdialog_base.ui filter.cpp kview_view.h filtlist.cpp kview.desktop knumdialog.cpp version.h imagelistdialog_base.ui -+KDE_DIST=filter.h imagelistdialog_base.cc infowin.h viewer.h kview_popup.rc kfilteraction.h imagelistdialog.h kview_part.rc infowin.cpp kview.h kviewconfdialog.cpp kfilteraction.cpp hi32-app-kview.png imagelistdialog.cpp knumdialog.h imagelistdialog_base.C kviewconfdialog_base.C kviewui.rc kcproc.h knumdialog_base.ui kview_asyncio.h hi16-app-kview.png colour.h kview kcproc.cpp knumdialog_base.cc knumdialog_base.C hi48-app-kview.png kviewconfdialog.h kview_la_closure.C kviewconfdialog_base.h imagelistdialog_base.h infowin_base.ui libkviewpart.la.closure infowin_base.C canvas.h filtlist.h kviewconfdialog_base.ui filter.cpp kview_view.h filtlist.cpp infowin_base.cc kview.desktop knumdialog.cpp knumdialog_base.h dummy.C imagelistdialog_base.ui version.h kviewconfdialog_base.cc infowin_base.h +-KDE_DIST=colour.h kview_asyncio.h kviewconfdialog.h hi32-app-kview.png filtlist.h kfilteraction.h kviewconfdialog.cpp kview_part.rc kviewui.rc filter.cpp imagelistdialog.cpp infowin.h imagelistdialog_base.ui knumdialog_base.ui kfilteraction.cpp hi48-app-kview.png knumdialog.cpp hi16-app-kview.png kview.h infowin.cpp filter.h imagelistdialog.h kviewconfdialog_base.ui viewer.h filtlist.cpp kview_popup.rc infowin_base.ui knumdialog.h kview_view.h canvas.h version.h kcproc.cpp kview.desktop kcproc.h ++KDE_DIST=kcproc.cpp filter.h infowin.h viewer.h hi48-app-kview.png kview_popup.rc kviewconfdialog.h kfilteraction.h imagelistdialog.h kview_part.rc infowin.cpp infowin_base.ui kview.h kviewconfdialog.cpp filtlist.h canvas.h kfilteraction.cpp hi32-app-kview.png kviewconfdialog_base.ui imagelistdialog.cpp knumdialog.h filter.cpp kview_view.h filtlist.cpp kview.desktop kviewui.rc kcproc.h knumdialog.cpp knumdialog_base.ui version.h imagelistdialog_base.ui kview_asyncio.h hi16-app-kview.png colour.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -857,9 +851,6 @@ +@@ -876,9 +870,6 @@ messages: rc.cpp srcdoc: kdoc -a -p -H -d $(HOME)/web/src/kview kview *.h -lqt -lkdecore -lkdeui -lkfile @@ -227,16 +251,18 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ ###KMAKE-start (don't edit or delete this block) ###KMAKE-end -@@ -867,52 +858,6 @@ +@@ -886,63 +877,13 @@ dummy.C: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --#>+ 45 +-#>+ 53 -kviewconfdialog_base.C: $(srcdir)/kviewconfdialog_base.ui kviewconfdialog_base.h kviewconfdialog_base.moc - rm -f kviewconfdialog_base.C - echo '#include <klocale.h>' > kviewconfdialog_base.C -- $(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_kviewconfdialog_base,g" >> kviewconfdialog_base.C || rm -f kviewconfdialog_base.C -- echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.C +- $(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui > kviewconfdialog_base.C.temp ; ret=$$?; \ +- sed -e "s,${UIC_TR}( \"\" ),QString::null,g" kviewconfdialog_base.C.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_kviewconfdialog_base,g" >> kviewconfdialog_base.C ;\ +- rm -f kviewconfdialog_base.C.temp ;\ +- if test "$$ret" = 0; then echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.C; else rm -f kviewconfdialog_base.C ; exit $$ret ; fi - -kviewconfdialog_base.h: $(srcdir)/kviewconfdialog_base.ui - $(UIC) -o kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui @@ -246,8 +272,10 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ -imagelistdialog_base.C: $(srcdir)/imagelistdialog_base.ui imagelistdialog_base.h imagelistdialog_base.moc - rm -f imagelistdialog_base.C - echo '#include <klocale.h>' > imagelistdialog_base.C -- $(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_imagelistdialog_base,g" >> imagelistdialog_base.C || rm -f imagelistdialog_base.C -- echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.C +- $(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui > imagelistdialog_base.C.temp ; ret=$$?; \ +- sed -e "s,${UIC_TR}( \"\" ),QString::null,g" imagelistdialog_base.C.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_imagelistdialog_base,g" >> imagelistdialog_base.C ;\ +- rm -f imagelistdialog_base.C.temp ;\ +- if test "$$ret" = 0; then echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.C; else rm -f imagelistdialog_base.C ; exit $$ret ; fi - -imagelistdialog_base.h: $(srcdir)/imagelistdialog_base.ui - $(UIC) -o imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui @@ -257,8 +285,10 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ -knumdialog_base.C: $(srcdir)/knumdialog_base.ui knumdialog_base.h knumdialog_base.moc - rm -f knumdialog_base.C - echo '#include <klocale.h>' > knumdialog_base.C -- $(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_knumdialog_base,g" >> knumdialog_base.C || rm -f knumdialog_base.C -- echo '#include "knumdialog_base.moc"' >> knumdialog_base.C +- $(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.ui > knumdialog_base.C.temp ; ret=$$?; \ +- sed -e "s,${UIC_TR}( \"\" ),QString::null,g" knumdialog_base.C.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_knumdialog_base,g" >> knumdialog_base.C ;\ +- rm -f knumdialog_base.C.temp ;\ +- if test "$$ret" = 0; then echo '#include "knumdialog_base.moc"' >> knumdialog_base.C; else rm -f knumdialog_base.C ; exit $$ret ; fi - -knumdialog_base.h: $(srcdir)/knumdialog_base.ui - $(UIC) -o knumdialog_base.h $(srcdir)/knumdialog_base.ui @@ -268,39 +298,81 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ -infowin_base.C: $(srcdir)/infowin_base.ui infowin_base.h infowin_base.moc - rm -f infowin_base.C - echo '#include <klocale.h>' > infowin_base.C -- $(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_infowin_base,g" >> infowin_base.C || rm -f infowin_base.C -- echo '#include "infowin_base.moc"' >> infowin_base.C +- $(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.ui > infowin_base.C.temp ; ret=$$?; \ +- sed -e "s,${UIC_TR}( \"\" ),QString::null,g" infowin_base.C.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_infowin_base,g" >> infowin_base.C ;\ +- rm -f infowin_base.C.temp ;\ +- if test "$$ret" = 0; then echo '#include "infowin_base.moc"' >> infowin_base.C; else rm -f infowin_base.C ; exit $$ret ; fi - -infowin_base.h: $(srcdir)/infowin_base.ui - $(UIC) -o infowin_base.h $(srcdir)/infowin_base.ui - -infowin_base.moc: infowin_base.h - $(MOC) infowin_base.h -o infowin_base.moc -- ++#>+ 3 ++kviewconfdialog.moc: $(srcdir)/kviewconfdialog.h ++ $(MOC) $(srcdir)/kviewconfdialog.h -o kviewconfdialog.moc + + #>+ 3 +-kfilteraction.moc: $(srcdir)/kfilteraction.h +- $(MOC) $(srcdir)/kfilteraction.h -o kfilteraction.moc ++canvas.moc: $(srcdir)/canvas.h ++ $(MOC) $(srcdir)/canvas.h -o canvas.moc + + #>+ 3 + infowin.moc: $(srcdir)/infowin.h +@@ -957,8 +898,16 @@ kview_view.moc: $(srcdir)/kview_view.h + $(MOC) $(srcdir)/kview_view.h -o kview_view.moc + + #>+ 3 +-kviewconfdialog.moc: $(srcdir)/kviewconfdialog.h +- $(MOC) $(srcdir)/kviewconfdialog.h -o kviewconfdialog.moc ++kfilteraction.moc: $(srcdir)/kfilteraction.h ++ $(MOC) $(srcdir)/kfilteraction.h -o kfilteraction.moc ++ ++#>+ 3 ++kview.moc: $(srcdir)/kview.h ++ $(MOC) $(srcdir)/kview.h -o kview.moc ++ ++#>+ 3 ++imagelistdialog.moc: $(srcdir)/imagelistdialog.h ++ $(MOC) $(srcdir)/imagelistdialog.h -o imagelistdialog.moc + #>+ 3 - kviewconfdialog.moc: $(srcdir)/kviewconfdialog.h - $(MOC) $(srcdir)/kviewconfdialog.h -o kviewconfdialog.moc -@@ -953,10 +898,56 @@ + filter.moc: $(srcdir)/filter.h +@@ -968,22 +917,64 @@ filter.moc: $(srcdir)/filter.h kview_asyncio.moc: $(srcdir)/kview_asyncio.h $(MOC) $(srcdir)/kview_asyncio.h -o kview_asyncio.moc -+#>+ 45 +-#>+ 3 +-imagelistdialog.moc: $(srcdir)/imagelistdialog.h +- $(MOC) $(srcdir)/imagelistdialog.h -o imagelistdialog.moc ++#>+ 53 +kviewconfdialog_base.cc: $(srcdir)/kviewconfdialog_base.ui kviewconfdialog_base.h kviewconfdialog_base.moc + rm -f kviewconfdialog_base.cc + echo '#include <klocale.h>' > kviewconfdialog_base.cc -+ $(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_kviewconfdialog_base,g" >> kviewconfdialog_base.cc || rm -f kviewconfdialog_base.cc -+ echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.cc -+ ++ $(UIC) -tr ${UIC_TR} -i kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui > kviewconfdialog_base.cc.temp ; ret=$$?; \ ++ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" kviewconfdialog_base.cc.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_kviewconfdialog_base,g" >> kviewconfdialog_base.cc ;\ ++ rm -f kviewconfdialog_base.cc.temp ;\ ++ if test "$$ret" = 0; then echo '#include "kviewconfdialog_base.moc"' >> kviewconfdialog_base.cc; else rm -f kviewconfdialog_base.cc ; exit $$ret ; fi + +-#>+ 3 +-kview.moc: $(srcdir)/kview.h +- $(MOC) $(srcdir)/kview.h -o kview.moc +kviewconfdialog_base.h: $(srcdir)/kviewconfdialog_base.ui + $(UIC) -o kviewconfdialog_base.h $(srcdir)/kviewconfdialog_base.ui -+ + +-#>+ 3 +-canvas.moc: $(srcdir)/canvas.h +- $(MOC) $(srcdir)/canvas.h -o canvas.moc +kviewconfdialog_base.moc: kviewconfdialog_base.h + $(MOC) kviewconfdialog_base.h -o kviewconfdialog_base.moc +imagelistdialog_base.cc: $(srcdir)/imagelistdialog_base.ui imagelistdialog_base.h imagelistdialog_base.moc + rm -f imagelistdialog_base.cc + echo '#include <klocale.h>' > imagelistdialog_base.cc -+ $(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_imagelistdialog_base,g" >> imagelistdialog_base.cc || rm -f imagelistdialog_base.cc -+ echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.cc ++ $(UIC) -tr ${UIC_TR} -i imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui > imagelistdialog_base.cc.temp ; ret=$$?; \ ++ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" imagelistdialog_base.cc.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_imagelistdialog_base,g" >> imagelistdialog_base.cc ;\ ++ rm -f imagelistdialog_base.cc.temp ;\ ++ if test "$$ret" = 0; then echo '#include "imagelistdialog_base.moc"' >> imagelistdialog_base.cc; else rm -f imagelistdialog_base.cc ; exit $$ret ; fi + +imagelistdialog_base.h: $(srcdir)/imagelistdialog_base.ui + $(UIC) -o imagelistdialog_base.h $(srcdir)/imagelistdialog_base.ui @@ -310,8 +382,10 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ +knumdialog_base.cc: $(srcdir)/knumdialog_base.ui knumdialog_base.h knumdialog_base.moc + rm -f knumdialog_base.cc + echo '#include <klocale.h>' > knumdialog_base.cc -+ $(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_knumdialog_base,g" >> knumdialog_base.cc || rm -f knumdialog_base.cc -+ echo '#include "knumdialog_base.moc"' >> knumdialog_base.cc ++ $(UIC) -tr ${UIC_TR} -i knumdialog_base.h $(srcdir)/knumdialog_base.ui > knumdialog_base.cc.temp ; ret=$$?; \ ++ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" knumdialog_base.cc.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_knumdialog_base,g" >> knumdialog_base.cc ;\ ++ rm -f knumdialog_base.cc.temp ;\ ++ if test "$$ret" = 0; then echo '#include "knumdialog_base.moc"' >> knumdialog_base.cc; else rm -f knumdialog_base.cc ; exit $$ret ; fi + +knumdialog_base.h: $(srcdir)/knumdialog_base.ui + $(UIC) -o knumdialog_base.h $(srcdir)/knumdialog_base.ui @@ -321,15 +395,17 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ +infowin_base.cc: $(srcdir)/infowin_base.ui infowin_base.h infowin_base.moc + rm -f infowin_base.cc + echo '#include <klocale.h>' > infowin_base.cc -+ $(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_infowin_base,g" >> infowin_base.cc || rm -f infowin_base.cc -+ echo '#include "infowin_base.moc"' >> infowin_base.cc ++ $(UIC) -tr ${UIC_TR} -i infowin_base.h $(srcdir)/infowin_base.ui > infowin_base.cc.temp ; ret=$$?; \ ++ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" infowin_base.cc.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_infowin_base,g" >> infowin_base.cc ;\ ++ rm -f infowin_base.cc.temp ;\ ++ if test "$$ret" = 0; then echo '#include "infowin_base.moc"' >> infowin_base.cc; else rm -f infowin_base.cc ; exit $$ret ; fi + +infowin_base.h: $(srcdir)/infowin_base.ui + $(UIC) -o infowin_base.h $(srcdir)/infowin_base.ui + +infowin_base.moc: infowin_base.h + $(MOC) infowin_base.h -o infowin_base.moc -+ + #>+ 8 libkviewpart.la.closure: $(libkviewpart_la_OBJECTS) $(libkviewpart_la_DEPENDENCIES) - @echo "int main() {return 0;}" > libkviewpart_la_closure.C @@ -339,7 +415,13 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ $(CXXLINK) libkviewpart_la_closure.lo $(libkviewpart_la_LDFLAGS) $(libkviewpart_la_OBJECTS) $(libkviewpart_la_LIBADD) $(LIBS) @rm -f libkviewpart_la_closure.* libkviewpart.la.closure @echo "timestamp" > libkviewpart.la.closure -@@ -969,10 +960,10 @@ +@@ -991,15 +982,15 @@ libkviewpart.la.closure: $(libkviewpart_ + + #>+ 3 + clean-metasources: +- -rm -f kfilteraction.moc infowin.moc viewer.moc kview_view.moc kviewconfdialog.moc filter.moc kview_asyncio.moc imagelistdialog.moc kview.moc canvas.moc ++ -rm -f kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc + #>+ 7 clean-ui: -rm -f \ @@ -354,165 +436,63 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ #>+ 3 clean-closures: -@@ -1003,41 +994,41 @@ - - - #>+ 12 --kview_la_meta_unload.C: kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc -- @echo 'creating kview_la_meta_unload.C' -- @-rm -f kview_la_meta_unload.C -+libkview_main_la_meta_unload.cc: kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc -+ @echo 'creating libkview_main_la_meta_unload.cc' -+ @-rm -f libkview_main_la_meta_unload.cc - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kview_la[] = {' > kview_la_meta_unload.C ;\ -- cat kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kview_la_meta_unload.C ;\ -- echo '0};' >> kview_la_meta_unload.C ;\ -- echo '#include <kunload.h>' >> kview_la_meta_unload.C ;\ -- echo '_UNLOAD(kview_la)' >> kview_la_meta_unload.C ;\ -- else echo > kview_la_meta_unload.C; fi -+ echo 'static const char * _metalist_libkview_main_la[] = {' > libkview_main_la_meta_unload.cc ;\ -+ cat kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkview_main_la_meta_unload.cc ;\ -+ echo '0};' >> libkview_main_la_meta_unload.cc ;\ -+ echo '#include <kunload.h>' >> libkview_main_la_meta_unload.cc ;\ -+ echo '_UNLOAD(libkview_main_la)' >> libkview_main_la_meta_unload.cc ;\ -+ else echo > libkview_main_la_meta_unload.cc; fi - - - #>+ 12 --libkviewpart_la_meta_unload.C: kview_asyncio.moc canvas.moc kview_view.moc -- @echo 'creating libkviewpart_la_meta_unload.C' -- @-rm -f libkviewpart_la_meta_unload.C -+libkviewpart_la_meta_unload.cc: kview_asyncio.moc canvas.moc kview_view.moc -+ @echo 'creating libkviewpart_la_meta_unload.cc' -+ @-rm -f libkviewpart_la_meta_unload.cc - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_libkviewpart_la[] = {' > libkviewpart_la_meta_unload.C ;\ -- cat kview_asyncio.moc canvas.moc kview_view.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkviewpart_la_meta_unload.C ;\ -- echo '0};' >> libkviewpart_la_meta_unload.C ;\ -- echo '#include <kunload.h>' >> libkviewpart_la_meta_unload.C ;\ -- echo '_UNLOAD(libkviewpart_la)' >> libkviewpart_la_meta_unload.C ;\ -- else echo > libkviewpart_la_meta_unload.C; fi -+ echo 'static const char * _metalist_libkviewpart_la[] = {' > libkviewpart_la_meta_unload.cc ;\ -+ cat kview_asyncio.moc canvas.moc kview_view.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkviewpart_la_meta_unload.cc ;\ -+ echo '0};' >> libkviewpart_la_meta_unload.cc ;\ -+ echo '#include <kunload.h>' >> libkviewpart_la_meta_unload.cc ;\ -+ echo '_UNLOAD(libkviewpart_la)' >> libkviewpart_la_meta_unload.cc ;\ -+ else echo > libkviewpart_la_meta_unload.cc; fi +@@ -1030,31 +1021,31 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f kview_la_meta_unload.C libkviewpart_la_meta_unload.C -+ -rm -f libkview_main_la_meta_unload.cc libkviewpart_la_meta_unload.cc - - #>+ 11 --kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc -+kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kview_main.cpp kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc - @echo 'creating kview_la.all_cpp.cpp ...'; \ - rm -f kview_la.all_cpp.files kview_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kview_la.all_cpp.final; \ -- for file in main.cpp viewer.cpp kview.cpp colour.cpp filter.cpp filtlist.cpp kcproc.cpp kviewconfdialog.cpp imagelistdialog.cpp knumdialog.cpp kfilteraction.cpp infowin.cpp ; do \ -+ for file in kview_main.cpp ; do \ - echo "#include \"$$file\"" >> kview_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_cpp.final; \ - done; \ -@@ -1045,16 +1036,28 @@ - rm -f kview_la.all_cpp.final kview_la.all_cpp.files - #>+ 11 --kview_la.all_C.C: $(srcdir)/Makefile.in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C kview_la_meta_unload.C kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc kviewconfdialog.moc canvas.moc infowin.moc viewer.moc kview_view.moc kfilteraction.moc kview.moc imagelistdialog.moc filter.moc kview_asyncio.moc +-kview_la.all_C.C: $(srcdir)/Makefile.in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C filter.moc kfilteraction.moc infowin.moc viewer.moc kviewconfdialog.moc kview.moc imagelistdialog.moc - @echo 'creating kview_la.all_C.C ...'; \ - rm -f kview_la.all_C.files kview_la.all_C.final; \ - echo "#define KDE_USE_FINAL 1" >> kview_la.all_C.final; \ -- for file in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C kview_la_meta_unload.C ; do \ +- for file in kviewconfdialog_base.C imagelistdialog_base.C knumdialog_base.C infowin_base.C ; do \ - echo "#include \"$$file\"" >> kview_la.all_C.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_C.final; \ -+libkview_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc ++libkview_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc + @echo 'creating libkview_main_la.all_cpp.cpp ...'; \ + rm -f libkview_main_la.all_cpp.files libkview_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkview_main_la.all_cpp.final; \ + for file in main.cpp viewer.cpp kview.cpp colour.cpp filter.cpp filtlist.cpp kcproc.cpp kviewconfdialog.cpp imagelistdialog.cpp knumdialog.cpp kfilteraction.cpp infowin.cpp ; do \ + echo "#include \"$$file\"" >> libkview_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkview_main_la.all_cpp.final; \ -+ done; \ -+ cat libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files > libkview_main_la.all_cpp.cpp; \ + done; \ +- cat kview_la.all_C.final kview_la.all_C.files > kview_la.all_C.C; \ +- rm -f kview_la.all_C.final kview_la.all_C.files ++ cat libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files > libkview_main_la.all_cpp.cpp; \ + rm -f libkview_main_la.all_cpp.final libkview_main_la.all_cpp.files -+ -+#>+ 11 -+libkview_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kviewconfdialog_base.cc $(srcdir)/imagelistdialog_base.cc $(srcdir)/knumdialog_base.cc $(srcdir)/infowin_base.cc $(srcdir)/libkview_main_la_meta_unload.cc kviewconfdialog_base.moc imagelistdialog_base.moc knumdialog_base.moc infowin_base.moc + + #>+ 11 +-kview_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/viewer.cpp $(srcdir)/kview.cpp $(srcdir)/colour.cpp $(srcdir)/filter.cpp $(srcdir)/filtlist.cpp $(srcdir)/kcproc.cpp $(srcdir)/kviewconfdialog.cpp $(srcdir)/imagelistdialog.cpp $(srcdir)/knumdialog.cpp $(srcdir)/kfilteraction.cpp $(srcdir)/infowin.cpp filter.moc kfilteraction.moc infowin.moc viewer.moc kviewconfdialog.moc kview.moc imagelistdialog.moc +- @echo 'creating kview_la.all_cpp.cpp ...'; \ +- rm -f kview_la.all_cpp.files kview_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kview_la.all_cpp.final; \ +- for file in main.cpp viewer.cpp kview.cpp colour.cpp filter.cpp filtlist.cpp kcproc.cpp kviewconfdialog.cpp imagelistdialog.cpp knumdialog.cpp kfilteraction.cpp infowin.cpp ; do \ +- echo "#include \"$$file\"" >> kview_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview_la.all_cpp.final; \ ++libkview_main_la.all_cc.cc: $(srcdir)/Makefile.in kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc kfilteraction.moc imagelistdialog.moc kviewconfdialog.moc infowin.moc viewer.moc kview.moc filter.moc + @echo 'creating libkview_main_la.all_cc.cc ...'; \ + rm -f libkview_main_la.all_cc.files libkview_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkview_main_la.all_cc.final; \ -+ for file in kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc libkview_main_la_meta_unload.cc ; do \ ++ for file in kviewconfdialog_base.cc imagelistdialog_base.cc knumdialog_base.cc infowin_base.cc ; do \ + echo "#include \"$$file\"" >> libkview_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkview_main_la.all_cc.final; \ done; \ -- cat kview_la.all_C.final kview_la.all_C.files > kview_la.all_C.C; \ -- rm -f kview_la.all_C.final kview_la.all_C.files -+ cat libkview_main_la.all_cc.final libkview_main_la.all_cc.files > libkview_main_la.all_cc.cc; \ +- cat kview_la.all_cpp.final kview_la.all_cpp.files > kview_la.all_cpp.cpp; \ +- rm -f kview_la.all_cpp.final kview_la.all_cpp.files ++ cat libkview_main_la.all_cc.final libkview_main_la.all_cc.files > libkview_main_la.all_cc.cc; \ + rm -f libkview_main_la.all_cc.final libkview_main_la.all_cc.files #>+ 11 - libkviewpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/canvas.cpp -@@ -1069,23 +1072,11 @@ - rm -f libkviewpart_la.all_cpp.final libkviewpart_la.all_cpp.files - - #>+ 11 --libkviewpart_la.all_C.C: $(srcdir)/Makefile.in libkviewpart_la_meta_unload.C -- @echo 'creating libkviewpart_la.all_C.C ...'; \ -- rm -f libkviewpart_la.all_C.files libkviewpart_la.all_C.final; \ -- echo "#define KDE_USE_FINAL 1" >> libkviewpart_la.all_C.final; \ -- for file in libkviewpart_la_meta_unload.C ; do \ -- echo "#include \"$$file\"" >> libkviewpart_la.all_C.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkviewpart_la.all_C.final; \ -- done; \ -- cat libkviewpart_la.all_C.final libkviewpart_la.all_C.files > libkviewpart_la.all_C.C; \ -- rm -f libkviewpart_la.all_C.final libkviewpart_la.all_C.files -- --#>+ 11 --libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc -+libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc $(srcdir)/libkviewpart_la_meta_unload.cc +-libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc kview_view.moc canvas.moc kview_asyncio.moc ++libkviewpart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kview_view.cc $(srcdir)/kview_asyncio.cc kview_asyncio.moc canvas.moc kview_view.moc @echo 'creating libkviewpart_la.all_cc.cc ...'; \ rm -f libkviewpart_la.all_cc.files libkviewpart_la.all_cc.final; \ echo "#define KDE_USE_FINAL 1" >> libkviewpart_la.all_cc.final; \ -- for file in kview_view.cc kview_asyncio.cc ; do \ -+ for file in kview_view.cc kview_asyncio.cc libkviewpart_la_meta_unload.cc ; do \ - echo "#include \"$$file\"" >> libkviewpart_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkviewpart_la.all_cc.final; \ - done; \ -@@ -1093,16 +1084,16 @@ - rm -f libkviewpart_la.all_cc.final libkviewpart_la.all_cc.files - - #>+ 11 --kview.all_C.C: $(srcdir)/Makefile.in dummy.C -- @echo 'creating kview.all_C.C ...'; \ -- rm -f kview.all_C.files kview.all_C.final; \ -- echo "#define KDE_USE_FINAL 1" >> kview.all_C.final; \ -- for file in dummy.C ; do \ -- echo "#include \"$$file\"" >> kview.all_C.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview.all_C.final; \ -+kview.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kview_main.cpp -+ @echo 'creating kview.all_cpp.cpp ...'; \ -+ rm -f kview.all_cpp.files kview.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> kview.all_cpp.final; \ -+ for file in kview_main.cpp ; do \ -+ echo "#include \"$$file\"" >> kview.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kview.all_cpp.final; \ - done; \ -- cat kview.all_C.final kview.all_C.files > kview.all_C.C; \ -- rm -f kview.all_C.final kview.all_C.files -+ cat kview.all_cpp.final kview.all_cpp.files > kview.all_cpp.cpp; \ -+ rm -f kview.all_cpp.final kview.all_cpp.files - - #>+ 11 - test.all_cpp.cpp: $(srcdir)/Makefile.in test.cpp -@@ -1118,20 +1109,20 @@ +@@ -1067,20 +1058,20 @@ libkviewpart_la.all_cc.cc: $(srcdir)/Mak #>+ 3 clean-final: -- -rm -f kview_la.all_cpp.cpp kview_la.all_C.C libkviewpart_la.all_cpp.cpp libkviewpart_la.all_C.C libkviewpart_la.all_cc.cc kview.all_C.C test.all_cpp.cpp -+ -rm -f kview_la.all_cpp.cpp libkview_main_la.all_cpp.cpp libkview_main_la.all_cc.cc libkviewpart_la.all_cpp.cpp libkviewpart_la.all_cc.cc kview.all_cpp.cpp test.all_cpp.cpp +- -rm -f kview_la.all_C.C kview_la.all_cpp.cpp libkviewpart_la.all_cc.cc ++ -rm -f libkview_main_la.all_cpp.cpp libkview_main_la.all_cc.cc libkviewpart_la.all_cc.cc #>+ 2 final: @@ -532,4 +512,63 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/06/05 08:58:02 skrll Exp $ + $(MAKE) libkview_main_la_OBJECTS="$(libkview_main_la_nofinal_OBJECTS)" libkviewpart_la_OBJECTS="$(libkviewpart_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 +@@ -1090,35 +1081,35 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 33 +-kview_asyncio.lo: kview_asyncio.moc +-kviewconfdialog.o: kviewconfdialog.moc +-viewer.lo: viewer.moc +-$(srcdir)/main.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++$(srcdir)/knumdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h + $(srcdir)/infowin.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h +-canvas.o: canvas.moc +-infowin.o: infowin.moc +-$(srcdir)/filter.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h + $(srcdir)/filtlist.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++filter.o: filter.moc + kfilteraction.lo: kfilteraction.moc +-$(srcdir)/kcproc.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h +-kview.lo: kview.moc +-$(srcdir)/knumdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h +-$(srcdir)/imagelistdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++imagelistdialog.lo: imagelistdialog.moc ++$(srcdir)/main.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++infowin.o: infowin.moc + viewer.o: viewer.moc +-filter.o: filter.moc +-filter.lo: filter.moc +-kview.o: kview.moc +-kfilteraction.o: kfilteraction.moc ++$(srcdir)/filter.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++kviewconfdialog.o: kviewconfdialog.moc + infowin.lo: infowin.moc +-kview_asyncio.o: kview_asyncio.moc +-$(srcdir)/kview.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h +-kview_view.lo: kview_view.moc ++kfilteraction.o: kfilteraction.moc + imagelistdialog.o: imagelistdialog.moc +-$(srcdir)/viewer.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h +-$(srcdir)/kfilteraction.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h +-imagelistdialog.lo: imagelistdialog.moc +-$(srcdir)/kviewconfdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h + kviewconfdialog.lo: kviewconfdialog.moc +-kview_view.o: kview_view.moc ++kview.o: kview.moc ++canvas.o: canvas.moc ++kview_asyncio.lo: kview_asyncio.moc + $(srcdir)/colour.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h + canvas.lo: canvas.moc ++kview.lo: kview.moc ++$(srcdir)/kviewconfdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++kview_view.o: kview_view.moc ++viewer.lo: viewer.moc ++$(srcdir)/viewer.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++$(srcdir)/kcproc.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++$(srcdir)/imagelistdialog.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++kview_view.lo: kview_view.moc ++$(srcdir)/kview.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++$(srcdir)/kfilteraction.cpp: kviewconfdialog_base.h imagelistdialog_base.h knumdialog_base.h infowin_base.h ++filter.lo: filter.moc ++kview_asyncio.o: kview_asyncio.moc diff --git a/graphics/kdegraphics3/patches/patch-ah b/graphics/kdegraphics3/patches/patch-ah index b8e664ce9df..8728fb9a1b0 100644 --- a/graphics/kdegraphics3/patches/patch-ah +++ b/graphics/kdegraphics3/patches/patch-ah @@ -1,9 +1,9 @@ -$NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ +$NetBSD: patch-ah,v 1.2 2003/01/02 09:12:26 skrll Exp $ ---- kuickshow/src/Makefile.in.orig Tue Aug 27 21:05:03 2002 +--- kuickshow/src/Makefile.in.orig Tue Dec 31 13:27:55 2002 +++ kuickshow/src/Makefile.in -@@ -238,16 +238,15 @@ x_libraries = @x_libraries@ - KDE_CXXFLAGS = $(IMLIB_CFLAGS) +@@ -237,17 +237,16 @@ x_includes = @x_includes@ + x_libraries = @x_libraries@ bin_PROGRAMS = kuickshow -lib_LTLIBRARIES = kuickshow.la @@ -11,6 +11,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ # set the include path for X, qt and KDE INCLUDES = $(all_includes) + KDE_CXXFLAGS = $(IMLIB_CFLAGS) -CLEANFILES = dummy.cpp #>- METASOURCES = AUTO @@ -39,7 +40,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH) # if you "make distclean", this files get removed. If you want to remove -@@ -273,31 +276,36 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -273,30 +276,35 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -61,14 +62,13 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ + filefinder.lo kurlwidget.lo logo.lo filewidget.lo \ + logotabdialog.lo kuickio.lo kuick.lo imlibwidget.lo +#>- libkuickshow_main_la_OBJECTS = $(am_libkuickshow_main_la_OBJECTS) - #>+ 9 + #>+ 8 -kuickshow_la_final_OBJECTS = kuickshow_la.all_cpp.lo -kuickshow_la_nofinal_OBJECTS = kuickshow.lo aboutwidget.lo generalwidget.lo \ - kuickconfigdlg.lo main.lo defaultswidget.lo imagewindow.lo \ - kuickdata.lo imdata.lo basewidget.lo filefinder.lo \ - kurlwidget.lo logo.lo filewidget.lo logotabdialog.lo kuickio.lo \ -- kuick.lo imlibwidget.lo \ -- kuickshow_la_meta_unload.lo +- kuick.lo imlibwidget.lo -@KDE_USE_FINAL_FALSE@kuickshow_la_OBJECTS = $(kuickshow_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kuickshow_la_OBJECTS = $(kuickshow_la_final_OBJECTS) +libkuickshow_main_la_final_OBJECTS = libkuickshow_main_la.all_cpp.lo @@ -76,8 +76,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ + generalwidget.lo kuickconfigdlg.lo main.lo defaultswidget.lo \ + imagewindow.lo kuickdata.lo imdata.lo basewidget.lo \ + filefinder.lo kurlwidget.lo logo.lo filewidget.lo \ -+ logotabdialog.lo kuickio.lo kuick.lo imlibwidget.lo \ -+ libkuickshow_main_la_meta_unload.lo ++ logotabdialog.lo kuickio.lo kuick.lo imlibwidget.lo +@KDE_USE_FINAL_FALSE@libkuickshow_main_la_OBJECTS = $(libkuickshow_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkuickshow_main_la_OBJECTS = $(libkuickshow_main_la_final_OBJECTS) bin_PROGRAMS = kuickshow$(EXEEXT) @@ -94,30 +93,69 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -307,16 +315,18 @@ LIBS = @LIBS@ +@@ -306,41 +314,47 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/basewidget.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/generalwidget.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kuickconfigdlg.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo -+ @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/basewidget.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/generalwidget.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kuickconfigdlg.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo +-#>+ 25 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kuickshow_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo ++#>+ 29 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkuickshow_main_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/basewidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/generalwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kuickconfigdlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/basewidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/generalwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kuickconfigdlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -336,11 +346,12 @@ CXXLD = $(CXX) + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -361,11 +375,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -132,7 +170,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ #>- all: all-am #>+ 1 -@@ -389,6 +400,8 @@ clean-libLTLIBRARIES: +@@ -414,6 +429,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kuickshow.la: $(kuickshow_la_OBJECTS) $(kuickshow_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kuickshow_la_LDFLAGS) $(kuickshow_la_OBJECTS) $(kuickshow_la_LIBADD) $(LIBS) @@ -141,7 +179,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -426,7 +439,6 @@ distclean-compile: +@@ -451,7 +468,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aboutwidget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/basewidget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/defaultswidget.Plo@am__quote@ @@ -149,7 +187,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filefinder.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filewidget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/generalwidget.Plo@am__quote@ -@@ -438,6 +450,8 @@ distclean-compile: +@@ -463,6 +479,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickdata.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickio.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickshow.Plo@am__quote@ @@ -158,16 +196,16 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kurlwidget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logotabdialog.Plo@am__quote@ -@@ -517,7 +531,7 @@ distclean-tags: +@@ -542,7 +560,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kuickshow.h kuickshow.desktop hi16-app-kuickshow.png filewidget.h imagewindow.h aboutwidget.h kuickio.h mainwidget.h mainwidget.cpp kuickconfigdlg.h logotabdialog.h kuickglobals.h basewidget.h lo32-app-kuickshow.png imdata.h logo.h kurlwidget.h imlibwidget.h version.h generalwidget.h lo16-app-kuickshow.png kuickdata.h hi32-app-kuickshow.png defaultswidget.h filefinder.h kuick.h -+KDE_DIST=kuickshow.h kuickshow.desktop kuickio.h kuickshow mainwidget.h lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png logo.h logotabdialog.h generalwidget.h hi32-app-kuickshow.png kurlwidget.h kuickdata.h kuickglobals.h defaultswidget.h basewidget.h filefinder.h hi16-app-kuickshow.png filewidget.h imagewindow.h kuick.h dummy.cpp aboutwidget.h +-KDE_DIST=kuickshow.h mainwidget.h lo32-app-kuickshow.png kuickglobals.h aboutwidget.h filewidget.h filefinder.h logo.h kurlwidget.h hi16-app-kuickshow.png imagewindow.h lo16-app-kuickshow.png defaultswidget.h imdata.h logotabdialog.h basewidget.h kuick.h imlibwidget.h mainwidget.cpp hi32-app-kuickshow.png kuickconfigdlg.h kuickio.h kuickdata.h version.h kuickshow.desktop generalwidget.h ++KDE_DIST=kuickshow.h kuickshow.desktop kuickio.h mainwidget.h lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png logo.h logotabdialog.h generalwidget.h hi32-app-kuickshow.png kurlwidget.h kuickdata.h kuickglobals.h defaultswidget.h basewidget.h filefinder.h hi16-app-kuickshow.png filewidget.h imagewindow.h kuick.h aboutwidget.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -566,7 +580,6 @@ install-strip: +@@ -591,7 +609,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -175,7 +213,7 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -644,9 +657,6 @@ messages: +@@ -669,72 +686,69 @@ messages: $(XGETTEXT) *.cpp *.h -o $(podir)/kuickshow.pot # this is where the kdelnk file will go @@ -185,79 +223,123 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15: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: -@@ -739,28 +749,28 @@ force-reedit: - - - #>+ 12 --kuickshow_la_meta_unload.cpp: kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc -- @echo 'creating kuickshow_la_meta_unload.cpp' -- @-rm -f kuickshow_la_meta_unload.cpp -+libkuickshow_main_la_meta_unload.cpp: kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc -+ @echo 'creating libkuickshow_main_la_meta_unload.cpp' -+ @-rm -f libkuickshow_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kuickshow_la[] = {' > kuickshow_la_meta_unload.cpp ;\ -- cat kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kuickshow_la_meta_unload.cpp ;\ -- echo '0};' >> kuickshow_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kuickshow_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kuickshow_la)' >> kuickshow_la_meta_unload.cpp ;\ -- else echo > kuickshow_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkuickshow_main_la[] = {' > libkuickshow_main_la_meta_unload.cpp ;\ -+ cat kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkuickshow_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkuickshow_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkuickshow_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkuickshow_main_la)' >> libkuickshow_main_la_meta_unload.cpp ;\ -+ else echo > libkuickshow_main_la_meta_unload.cpp; fi + #>+ 3 +-logotabdialog.moc: $(srcdir)/logotabdialog.h +- $(MOC) $(srcdir)/logotabdialog.h -o logotabdialog.moc ++mainwidget.moc: $(srcdir)/mainwidget.h ++ $(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc #>+ 3 - clean-moc-classes: -- -rm -f kuickshow_la_meta_unload.cpp -+ -rm -f libkuickshow_main_la_meta_unload.cpp +-filewidget.moc: $(srcdir)/filewidget.h +- $(MOC) $(srcdir)/filewidget.h -o filewidget.moc ++filefinder.moc: $(srcdir)/filefinder.h ++ $(MOC) $(srcdir)/filefinder.h -o filefinder.moc + + #>+ 3 +-aboutwidget.moc: $(srcdir)/aboutwidget.h +- $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc ++kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h ++ $(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc + + #>+ 3 +-filefinder.moc: $(srcdir)/filefinder.h +- $(MOC) $(srcdir)/filefinder.h -o filefinder.moc ++basewidget.moc: $(srcdir)/basewidget.h ++ $(MOC) $(srcdir)/basewidget.h -o basewidget.moc + + #>+ 3 +-imagewindow.moc: $(srcdir)/imagewindow.h +- $(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc ++imlibwidget.moc: $(srcdir)/imlibwidget.h ++ $(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc + + #>+ 3 + generalwidget.moc: $(srcdir)/generalwidget.h + $(MOC) $(srcdir)/generalwidget.h -o generalwidget.moc + + #>+ 3 +-mainwidget.moc: $(srcdir)/mainwidget.h +- $(MOC) $(srcdir)/mainwidget.h -o mainwidget.moc ++defaultswidget.moc: $(srcdir)/defaultswidget.h ++ $(MOC) $(srcdir)/defaultswidget.h -o defaultswidget.moc + + #>+ 3 +-kurlwidget.moc: $(srcdir)/kurlwidget.h +- $(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc ++aboutwidget.moc: $(srcdir)/aboutwidget.h ++ $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc + + #>+ 3 +-defaultswidget.moc: $(srcdir)/defaultswidget.h +- $(MOC) $(srcdir)/defaultswidget.h -o defaultswidget.moc ++logotabdialog.moc: $(srcdir)/logotabdialog.h ++ $(MOC) $(srcdir)/logotabdialog.h -o logotabdialog.moc + + #>+ 3 +-kuickio.moc: $(srcdir)/kuickio.h +- $(MOC) $(srcdir)/kuickio.h -o kuickio.moc ++kuickshow.moc: $(srcdir)/kuickshow.h ++ $(MOC) $(srcdir)/kuickshow.h -o kuickshow.moc + + #>+ 3 +-imlibwidget.moc: $(srcdir)/imlibwidget.h +- $(MOC) $(srcdir)/imlibwidget.h -o imlibwidget.moc ++kurlwidget.moc: $(srcdir)/kurlwidget.h ++ $(MOC) $(srcdir)/kurlwidget.h -o kurlwidget.moc + + #>+ 3 +-kuickconfigdlg.moc: $(srcdir)/kuickconfigdlg.h +- $(MOC) $(srcdir)/kuickconfigdlg.h -o kuickconfigdlg.moc ++filewidget.moc: $(srcdir)/filewidget.h ++ $(MOC) $(srcdir)/filewidget.h -o filewidget.moc + + #>+ 3 +-basewidget.moc: $(srcdir)/basewidget.h +- $(MOC) $(srcdir)/basewidget.h -o basewidget.moc ++imagewindow.moc: $(srcdir)/imagewindow.h ++ $(MOC) $(srcdir)/imagewindow.h -o imagewindow.moc + + #>+ 3 +-kuickshow.moc: $(srcdir)/kuickshow.h +- $(MOC) $(srcdir)/kuickshow.h -o kuickshow.moc ++kuickio.moc: $(srcdir)/kuickio.h ++ $(MOC) $(srcdir)/kuickio.h -o kuickio.moc + + #>+ 3 + clean-metasources: +- -rm -f logotabdialog.moc filewidget.moc aboutwidget.moc filefinder.moc imagewindow.moc generalwidget.moc mainwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc imlibwidget.moc kuickconfigdlg.moc basewidget.moc kuickshow.moc ++ -rm -f mainwidget.moc filefinder.moc kuickconfigdlg.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc kurlwidget.moc filewidget.moc imagewindow.moc kuickio.moc + + #>+ 2 + docs-am: +@@ -764,33 +778,33 @@ force-reedit: - #>+ 11 --kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp kuickshow_la_meta_unload.cpp mainwidget.moc filefinder.moc kuickconfigdlg.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc kurlwidget.moc filewidget.moc imagewindow.moc kuickio.moc -+kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow_main.cpp mainwidget.moc filefinder.moc kuickconfigdlg.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc kurlwidget.moc filewidget.moc imagewindow.moc kuickio.moc - @echo 'creating kuickshow_la.all_cpp.cpp ...'; \ - rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \ -- for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp basewidget.cpp filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp kuickshow_la_meta_unload.cpp ; do \ -+ for file in kuickshow_main.cpp ; do \ - echo "#include \"$$file\"" >> kuickshow_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow_la.all_cpp.final; \ - done; \ -@@ -768,11 +778,23 @@ kuickshow_la.all_cpp.cpp: $(srcdir)/Make - rm -f kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files #>+ 11 --kuickshow.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkuickshow_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp libkuickshow_main_la_meta_unload.cpp +-kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp logotabdialog.moc aboutwidget.moc filewidget.moc filefinder.moc imagewindow.moc generalwidget.moc kurlwidget.moc defaultswidget.moc kuickio.moc kuickconfigdlg.moc imlibwidget.moc basewidget.moc kuickshow.moc +- @echo 'creating kuickshow_la.all_cpp.cpp ...'; \ +- rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \ ++libkuickshow_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc + @echo 'creating libkuickshow_main_la.all_cpp.cpp ...'; \ + rm -f libkuickshow_main_la.all_cpp.files libkuickshow_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkuickshow_main_la.all_cpp.final; \ -+ for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp basewidget.cpp filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp libkuickshow_main_la_meta_unload.cpp ; do \ + for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp basewidget.cpp filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp ; do \ +- echo "#include \"$$file\"" >> kuickshow_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkuickshow_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkuickshow_main_la.all_cpp.final; \ -+ done; \ -+ cat libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files > libkuickshow_main_la.all_cpp.cpp; \ -+ rm -f libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files -+ -+#>+ 11 -+kuickshow.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow_main.cpp - @echo 'creating kuickshow.all_cpp.cpp ...'; \ - rm -f kuickshow.all_cpp.files kuickshow.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kuickshow.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kuickshow_main.cpp ; do \ - echo "#include \"$$file\"" >> kuickshow.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow.all_cpp.final; \ done; \ -@@ -781,20 +803,20 @@ kuickshow.all_cpp.cpp: $(srcdir)/Makefil +- cat kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files > kuickshow_la.all_cpp.cpp; \ +- rm -f kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files ++ cat libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files > libkuickshow_main_la.all_cpp.cpp; \ ++ rm -f libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kuickshow_la.all_cpp.cpp kuickshow.all_cpp.cpp -+ -rm -f kuickshow_la.all_cpp.cpp libkuickshow_main_la.all_cpp.cpp kuickshow.all_cpp.cpp +- -rm -f kuickshow_la.all_cpp.cpp ++ -rm -f libkuickshow_main_la.all_cpp.cpp #>+ 2 final: @@ -277,4 +359,56 @@ $NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ + $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_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 +@@ -800,31 +814,31 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 29 +-basewidget.lo: basewidget.moc +-filefinder.lo: filefinder.moc +-logotabdialog.o: logotabdialog.moc +-filefinder.o: filefinder.moc +-kuickconfigdlg.o: kuickconfigdlg.moc +-mainwidget.o: mainwidget.moc +-kuickio.o: kuickio.moc + basewidget.o: basewidget.moc +-kuickconfigdlg.lo: kuickconfigdlg.moc +-generalwidget.lo: generalwidget.moc ++filefinder.o: filefinder.moc ++filefinder.lo: filefinder.moc ++mainwidget.lo: mainwidget.moc + defaultswidget.lo: defaultswidget.moc +-kuickio.lo: kuickio.moc +-imagewindow.lo: imagewindow.moc ++generalwidget.lo: generalwidget.moc + kurlwidget.lo: kurlwidget.moc +-mainwidget.lo: mainwidget.moc +-kuickshow.lo: kuickshow.moc +-kurlwidget.o: kurlwidget.moc ++kuickshow.o: kuickshow.moc + aboutwidget.lo: aboutwidget.moc +-imlibwidget.lo: imlibwidget.moc ++filewidget.lo: filewidget.moc ++kurlwidget.o: kurlwidget.moc ++filewidget.o: filewidget.moc + imagewindow.o: imagewindow.moc ++kuickio.lo: kuickio.moc ++kuickconfigdlg.lo: kuickconfigdlg.moc + aboutwidget.o: aboutwidget.moc +-defaultswidget.o: defaultswidget.moc +-logotabdialog.lo: logotabdialog.moc +-kuickshow.o: kuickshow.moc ++imagewindow.lo: imagewindow.moc ++basewidget.lo: basewidget.moc ++kuickio.o: kuickio.moc ++kuickshow.lo: kuickshow.moc ++imlibwidget.lo: imlibwidget.moc ++mainwidget.o: mainwidget.moc + imlibwidget.o: imlibwidget.moc ++logotabdialog.o: logotabdialog.moc + generalwidget.o: generalwidget.moc +-filewidget.lo: filewidget.moc +-filewidget.o: filewidget.moc ++kuickconfigdlg.o: kuickconfigdlg.moc ++logotabdialog.lo: logotabdialog.moc ++defaultswidget.o: defaultswidget.moc diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile index 1e8da970d08..f57dcd6041e 100644 --- a/misc/kdeaddons3/Makefile +++ b/misc/kdeaddons3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:14 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:26 skrll Exp $ -DISTNAME= kdeaddons-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeaddons-3.0.5a CATEGORIES= misc COMMENT= Add ons for the KDE integrated X11 desktop diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo index fd3dbe180a0..062065a6df5 100644 --- a/misc/kdeaddons3/distinfo +++ b/misc/kdeaddons3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:48 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:26 skrll Exp $ -SHA1 (kdeaddons-3.0.4.tar.bz2) = 2f7707023b57820ad8aafbe94f6bf01770f5c35b -Size (kdeaddons-3.0.4.tar.bz2) = 938774 bytes +SHA1 (kdeaddons-3.0.5a.tar.bz2) = 9d9f8d72cb2918298232b113bac7f6e28cd0b391 +Size (kdeaddons-3.0.5a.tar.bz2) = 933612 bytes diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile index c32ea76ab9f..ef1cff5606d 100644 --- a/misc/kdeadmin3/Makefile +++ b/misc/kdeadmin3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:14 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:26 skrll Exp $ -DISTNAME= kdeadmin-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeadmin-3.0.5a CATEGORIES= misc COMMENT= System administration tools for the KDE integrated X11 desktop diff --git a/misc/kdeadmin3/distinfo b/misc/kdeadmin3/distinfo index 1101bfd40a8..d29c160b5e3 100644 --- a/misc/kdeadmin3/distinfo +++ b/misc/kdeadmin3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:48 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:26 skrll Exp $ -SHA1 (kdeadmin-3.0.4.tar.bz2) = 6902fbae53a329336761f8de6fd649752bf810bc -Size (kdeadmin-3.0.4.tar.bz2) = 1267550 bytes +SHA1 (kdeadmin-3.0.5a.tar.bz2) = 4884a08a2817aa0597cd0e300666c1d47f21ff73 +Size (kdeadmin-3.0.5a.tar.bz2) = 1266326 bytes diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile index c8d11f6464f..bda46b09c27 100644 --- a/misc/kdeartwork3/Makefile +++ b/misc/kdeartwork3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/12/24 06:10:14 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/01/02 09:12:27 skrll Exp $ -DISTNAME= kdeartwork-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeartwork-3.0.5a CATEGORIES= misc COMMENT= Artwork for the KDE integrated X11 desktop diff --git a/misc/kdeartwork3/PLIST b/misc/kdeartwork3/PLIST index 5fb4b1535ff..68743394658 100644 --- a/misc/kdeartwork3/PLIST +++ b/misc/kdeartwork3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/25 03:09:12 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/01/02 09:12:27 skrll Exp $ bin/kbanner.kss bin/kblob.kss bin/kbouboule.kss @@ -2868,9 +2868,12 @@ share/kde/wallpapers/winter_theme_1.jpg @dirrm share/kde/icons/Locolor @dirrm share/kde/apps/kworldclock/maps/rainfall @dirrm share/kde/apps/kworldclock/maps/mggd +@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock/maps/depths >/dev/null || true @dirrm share/kde/apps/kworldclock/maps/caida_bw @dirrm share/kde/apps/kworldclock/maps/caida @dirrm share/kde/apps/kworldclock/maps/bio @dirrm share/kde/apps/kworldclock/maps/alt +@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock/maps >/dev/null || true +@unexec ${RMDIR} -p %D hare/kde/apps/kworldclock >/dev/null || true @dirrm share/kde/apps/kwin/icewm-themes/Model @dirrm share/kde/apps/kwin/icewm-themes/MenschMaschine diff --git a/misc/kdeartwork3/distinfo b/misc/kdeartwork3/distinfo index 9fe1ce2e04d..8b1927d25bd 100644 --- a/misc/kdeartwork3/distinfo +++ b/misc/kdeartwork3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:49 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:27 skrll Exp $ -SHA1 (kdeartwork-3.0.4.tar.bz2) = 0f3318986981bfa25d3bcddda5dfe7b4989b2831 -Size (kdeartwork-3.0.4.tar.bz2) = 10910760 bytes +SHA1 (kdeartwork-3.0.5a.tar.bz2) = decc46a3c2be6ab564cc6dee2e3f1aea19655df9 +Size (kdeartwork-3.0.5a.tar.bz2) = 10915790 bytes diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index 27561f893c9..ef8660611e3 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2002/12/24 06:10:15 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/01/02 09:12:27 skrll Exp $ -DISTNAME= kdeedu-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeedu-3.0.5a CATEGORIES= misc COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo index 6b18bc8e640..c75db4c3d8c 100644 --- a/misc/kdeedu3/distinfo +++ b/misc/kdeedu3/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/10/14 09:13:49 skrll Exp $ +$NetBSD: distinfo,v 1.5 2003/01/02 09:12:27 skrll Exp $ -SHA1 (kdeedu-3.0.4.tar.bz2) = f64f1226d8b69d2fd6d407ba441ce95c35072785 -Size (kdeedu-3.0.4.tar.bz2) = 9104479 bytes +SHA1 (kdeedu-3.0.5a.tar.bz2) = a2f8ab56b0590d11cf0d33a749f2d5a539af5a59 +Size (kdeedu-3.0.5a.tar.bz2) = 9109155 bytes SHA1 (patch-aa) = ee916dc502be8b66c3d0a95e3cdec8f787284b9c -SHA1 (patch-ab) = 38336518e06cd7eb1c48c4a4dbc0667d82858bdf +SHA1 (patch-ab) = f814ff0a501530d5b17e6450d09b40eecef090ec diff --git a/misc/kdeedu3/patches/patch-ab b/misc/kdeedu3/patches/patch-ab index 79b35e0b428..f3e687256e4 100644 --- a/misc/kdeedu3/patches/patch-ab +++ b/misc/kdeedu3/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:20:58 skrll Exp $ +$NetBSD: patch-ab,v 1.2 2003/01/02 09:12:28 skrll Exp $ ---- kvoctrain/kvoctrain/Makefile.in.orig Mon May 27 08:01:18 2002 +--- kvoctrain/kvoctrain/Makefile.in.orig Mon Dec 30 13:25:46 2002 +++ kvoctrain/kvoctrain/Makefile.in -@@ -578,7 +578,7 @@ +@@ -590,7 +590,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kvoctrain.h kvoctrainview.h kvoctrain.lsm.tpl kvoctrain.dtd x-kvtml.desktop kvoctrain.desktop kv_resource.h rowtable.h -+KDE_DIST=kvoctrainview.h kvoctrain.h spotlight2kvtml x-kvtml.desktop kv_resource.h rowtable.h kvoctrain.lsm.tpl kvoctrain.dtd kvoctrain.desktop kvoctrain +-KDE_DIST=rowtable.h kvoctrainview.h x-kvtml.desktop kvoctrain.dtd kvoctrain.lsm.tpl kvoctrain.h kv_resource.h kvoctrain.desktop ++KDE_DIST=rowtable.h kvoctrainview.h kvoctrain.lsm.tpl kvoctrain.h kvoctrain.dtd kvoctrain.desktop x-kvtml.desktop kv_resource.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -712,7 +712,7 @@ +@@ -724,7 +724,7 @@ uninstall-info: uninstall-info-recursive install-data-local: $(mkinstalldirs) $(DESTDIR)$(kde_bindir) @@ -20,12 +20,42 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:20:58 skrll Exp $ $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Edutainment/ $(INSTALL_DATA) $(srcdir)/kvoctrain.desktop $(DESTDIR)$(kde_appsdir)/Edutainment/kvoctrain.desktop $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/ -@@ -839,7 +839,7 @@ - -rm -f kvoctrain_meta_unload.cpp - - #>+ 11 --kvoctrain.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kva_io.cpp $(srcdir)/kvoctrain.cpp $(srcdir)/kvoctrainview.cpp $(srcdir)/rowtable.cpp $(srcdir)/main.cpp $(srcdir)/kva_init.cpp $(srcdir)/kva_config.cpp $(srcdir)/kva_header.cpp $(srcdir)/kva_clip.cpp $(srcdir)/kva_query.cpp kvoctrain_meta_unload.cpp kvoctrainview.moc rowtable.moc kvoctrain.moc -+kvoctrain.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kva_io.cpp $(srcdir)/kvoctrain.cpp $(srcdir)/kvoctrainview.cpp $(srcdir)/rowtable.cpp $(srcdir)/main.cpp $(srcdir)/kva_init.cpp $(srcdir)/kva_config.cpp $(srcdir)/kva_header.cpp $(srcdir)/kva_clip.cpp $(srcdir)/kva_query.cpp $(srcdir)/kvoctrain_meta_unload.cpp kvoctrainview.moc rowtable.moc kvoctrain.moc - @echo 'creating kvoctrain.all_cpp.cpp ...'; \ - rm -f kvoctrain.all_cpp.files kvoctrain.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kvoctrain.all_cpp.final; \ +@@ -808,10 +808,6 @@ messages-local: + .NOEXPORT: + + #>+ 3 +-kvoctrain.moc: $(srcdir)/kvoctrain.h +- $(MOC) $(srcdir)/kvoctrain.h -o kvoctrain.moc +- +-#>+ 3 + kvoctrainview.moc: $(srcdir)/kvoctrainview.h + $(MOC) $(srcdir)/kvoctrainview.h -o kvoctrainview.moc + +@@ -820,8 +816,12 @@ rowtable.moc: $(srcdir)/rowtable.h + $(MOC) $(srcdir)/rowtable.h -o rowtable.moc + + #>+ 3 ++kvoctrain.moc: $(srcdir)/kvoctrain.h ++ $(MOC) $(srcdir)/kvoctrain.h -o kvoctrain.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f kvoctrain.moc kvoctrainview.moc rowtable.moc ++ -rm -f kvoctrainview.moc rowtable.moc kvoctrain.moc + + #>+ 2 + docs-am: +@@ -870,9 +870,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-kvoctrain.o: kvoctrain.moc +-rowtable.lo: rowtable.moc + rowtable.o: rowtable.moc +-kvoctrain.lo: kvoctrain.moc +-kvoctrainview.lo: kvoctrainview.moc + kvoctrainview.o: kvoctrainview.moc ++rowtable.lo: rowtable.moc ++kvoctrain.o: kvoctrain.moc ++kvoctrainview.lo: kvoctrainview.moc ++kvoctrain.lo: kvoctrain.moc diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index b5e3f6e88fb..59013e86b95 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2002/12/24 06:10:15 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2003/01/02 09:12:28 skrll Exp $ -DISTNAME= kdepim-3.0.4 -PKGREVISION= 1 +DISTNAME= kdepim-3.0.5a CATEGORIES= misc COMMENT= Personal Information Management tools for the KDE desktop diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST index aa3bfd3a050..43552bb1b92 100644 --- a/misc/kdepim3/PLIST +++ b/misc/kdepim3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/28 07:15:36 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/02 09:12:28 skrll Exp $ bin/ical2vcal bin/kabcfrontend bin/kalarm @@ -389,7 +389,7 @@ share/kde/servicetypes/calendarplugin.desktop share/kde/servicetypes/korganizerpart.desktop share/kde/servicetypes/kpilotconduit.desktop @comment dirrm share/kde/servicetypes -@comment dirrm share/kde/services/korganizer +@dirrm share/kde/services/korganizer @comment dirrm share/kde/services @comment dirrm share/kde/icons/locolor/32x32/apps @comment dirrm share/kde/icons/locolor/16x16/apps @@ -434,12 +434,22 @@ share/kde/servicetypes/kpilotconduit.desktop @dirrm share/kde/apps/kandy @dirrm share/kde/apps/kalarmdgui/icons/hicolor/22x22/actions @dirrm share/kde/apps/kalarm/icons/locolor/32x32/apps +@dirrm share/kde/apps/kalarm/icons/locolor/32x32 @dirrm share/kde/apps/kalarm/icons/locolor/16x16/apps +@dirrm share/kde/apps/kalarm/icons/locolor/16x16 +@dirrm share/kde/apps/kalarm/icons/locolor @dirrm share/kde/apps/kalarm/icons/hicolor/48x48/apps +@dirrm share/kde/apps/kalarm/icons/hicolor/48x48 @dirrm share/kde/apps/kalarm/icons/hicolor/32x32/apps +@dirrm share/kde/apps/kalarm/icons/hicolor/32x32 @dirrm share/kde/apps/kalarm/icons/hicolor/22x22/actions +@dirrm share/kde/apps/kalarm/icons/hicolor/22x22 @dirrm share/kde/apps/kalarm/icons/hicolor/16x16/apps @dirrm share/kde/apps/kalarm/icons/hicolor/16x16/actions +@dirrm share/kde/apps/kalarm/icons/hicolor/16x16 +@dirrm share/kde/apps/kalarm/icons/hicolor +@dirrm share/kde/apps/kalarm/icons +@dirrm share/kde/apps/kalarm @comment dirrm share/kde/apps @comment dirrm share/kde/applnk/Utilities @comment dirrm share/kde/applnk/Settings/System diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo index 651b7032bc6..0574693cf88 100644 --- a/misc/kdepim3/distinfo +++ b/misc/kdepim3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2002/10/14 09:13:50 skrll Exp $ +$NetBSD: distinfo,v 1.6 2003/01/02 09:12:28 skrll Exp $ -SHA1 (kdepim-3.0.4.tar.bz2) = 992f0a21681fa72348c57b101899d1aec4db6ef2 -Size (kdepim-3.0.4.tar.bz2) = 3182779 bytes +SHA1 (kdepim-3.0.5a.tar.bz2) = b25d27ef2cef2b375307775410daab80b5bf686d +Size (kdepim-3.0.5a.tar.bz2) = 3192923 bytes SHA1 (patch-aa) = 28d07a7e4063df62a055a40129338f9831b61c49 SHA1 (patch-ab) = 24a1da2c4ef1c7625e750a8bee958abe15bea717 SHA1 (patch-ac) = 86ab25fdb17ce974668946dcaab5417df33d8f96 @@ -9,4 +9,4 @@ SHA1 (patch-ad) = 636a472961d9869bf0792b6eea0e02ddadbd99fe SHA1 (patch-ae) = 04a75a4a00012fc9a03ae25755abb8580f166e98 SHA1 (patch-af) = 5e9e463878c145f4d0b21fe98eb2e16e83e51904 SHA1 (patch-ag) = 9d53fcf4f5b14cd979bc1c416951dec6796fc4c2 -SHA1 (patch-ah) = 5d3848a86ca9e4ba9204e3f7526cea0acfe52a62 +SHA1 (patch-ah) = f41a62dc725f5f65509d021f7dc14a3e323aeaff diff --git a/misc/kdepim3/patches/patch-ah b/misc/kdepim3/patches/patch-ah index e718082652e..f08c9bf005e 100644 --- a/misc/kdepim3/patches/patch-ah +++ b/misc/kdepim3/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1 2002/10/03 12:08:47 markd Exp $ +$NetBSD: patch-ah,v 1.2 2003/01/02 09:12:28 skrll Exp $ ---- kpilot/conduits/vcalconduit/Makefile.in.orig Thu Aug 8 06:10:09 2002 -+++ kpilot/conduits/vcalconduit/Makefile.in Thu Oct 3 15:27:32 2002 -@@ -255,7 +255,7 @@ +--- kpilot/conduits/vcalconduit/Makefile.in.orig Mon Dec 30 16:23:28 2002 ++++ kpilot/conduits/vcalconduit/Makefile.in +@@ -254,7 +254,7 @@ libvcalconduit_la_SOURCES= vcal-factoryb vcal-setup.cc vcal-conduitbase.cc vcal-conduit.cc korganizerConduit.cc libvcalconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal @@ -10,8 +10,8 @@ $NetBSD: patch-ah,v 1.1 2002/10/03 12:08:47 markd Exp $ +libvcalconduit_la_LIBADD = ../../lib/libkpilot.la ../../../libkcal/libkcal.la #>- libtodoconduit_la_SOURCES = korganizertodoConduit.ui vcal-factorybase.cc todo-factory.cc \ - #>- todo-setup.cc vcal-conduitbase.cc todo-conduit.cc -@@ -264,7 +264,7 @@ + #>- todo-setup.cc vcal-conduitbase.cc todo-conduit.cc +@@ -263,14 +263,15 @@ libtodoconduit_la_SOURCES= vcal-factoryb todo-setup.cc vcal-conduitbase.cc todo-conduit.cc korganizertodoConduit.cc libtodoconduit_la_LDFLAGS = $(KDE_RPATH) -L../../lib -L../../../libkcal @@ -20,3 +20,150 @@ $NetBSD: patch-ah,v 1.1 2002/10/03 12:08:47 markd Exp $ subdir = kpilot/conduits/vcalconduit mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-libtodoconduit_la_DEPENDENCIES = ++libtodoconduit_la_DEPENDENCIES = ../../lib/libkpilot.la \ ++ ../../../libkcal/libkcal.la + am_libtodoconduit_la_OBJECTS = vcal-factorybase.lo todo-factory.lo \ + todo-setup.lo vcal-conduitbase.lo todo-conduit.lo + #>- libtodoconduit_la_OBJECTS = $(am_libtodoconduit_la_OBJECTS) +@@ -280,7 +281,8 @@ libtodoconduit_la_nofinal_OBJECTS = vcal + todo-setup.lo vcal-conduitbase.lo todo-conduit.lo korganizertodoConduit.lo + @KDE_USE_FINAL_FALSE@libtodoconduit_la_OBJECTS = $(libtodoconduit_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libtodoconduit_la_OBJECTS = $(libtodoconduit_la_final_OBJECTS) +-libvcalconduit_la_DEPENDENCIES = ++libvcalconduit_la_DEPENDENCIES = ../../lib/libkpilot.la \ ++ ../../../libkcal/libkcal.la + am_libvcalconduit_la_OBJECTS = vcal-factorybase.lo vcal-factory.lo \ + vcal-setup.lo vcal-conduitbase.lo vcal-conduit.lo + #>- libvcalconduit_la_OBJECTS = $(am_libvcalconduit_la_OBJECTS) +@@ -484,7 +486,7 @@ distclean-tags: + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=todo-conduit.h vcal-conduit.desktop todo-factory.h vcal-conduitbase.h vcal-factory.h vcal-conduitbase.cc vcal-conduit.h todo-setup.cc vcal-setup.cc vcal-conduit.cc vcal-setup.h todo-conduit.cc todo-conduit.desktop korganizertodoConduit.ui korganizerConduit.ui todo-setup.h vcal-factorybase.h ++KDE_DIST=todo-setup.h todo-conduit.cc vcal-conduitbase.cc vcal-factory.h todo-setup.cc vcal-factorybase.h todo-factory.h vcal-conduit.cc vcal-conduitbase.h vcal-setup.cc vcal-conduit.h korganizerConduit.ui todo-conduit.h vcal-conduit.desktop vcal-setup.h todo-conduit.desktop korganizertodoConduit.ui + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -620,36 +622,36 @@ korganizertodoConduit.moc: korganizertod + $(MOC) korganizertodoConduit.h -o korganizertodoConduit.moc + + #>+ 3 +-vcal-conduit.moc: $(srcdir)/vcal-conduit.h +- $(MOC) $(srcdir)/vcal-conduit.h -o vcal-conduit.moc ++vcal-setup.moc: $(srcdir)/vcal-setup.h ++ $(MOC) $(srcdir)/vcal-setup.h -o vcal-setup.moc + + #>+ 3 +-vcal-factorybase.moc: $(srcdir)/vcal-factorybase.h +- $(MOC) $(srcdir)/vcal-factorybase.h -o vcal-factorybase.moc ++todo-factory.moc: $(srcdir)/todo-factory.h ++ $(MOC) $(srcdir)/todo-factory.h -o todo-factory.moc + + #>+ 3 + todo-conduit.moc: $(srcdir)/todo-conduit.h + $(MOC) $(srcdir)/todo-conduit.h -o todo-conduit.moc + + #>+ 3 +-todo-factory.moc: $(srcdir)/todo-factory.h +- $(MOC) $(srcdir)/todo-factory.h -o todo-factory.moc ++vcal-factorybase.moc: $(srcdir)/vcal-factorybase.h ++ $(MOC) $(srcdir)/vcal-factorybase.h -o vcal-factorybase.moc + + #>+ 3 + vcal-conduitbase.moc: $(srcdir)/vcal-conduitbase.h + $(MOC) $(srcdir)/vcal-conduitbase.h -o vcal-conduitbase.moc + + #>+ 3 +-vcal-setup.moc: $(srcdir)/vcal-setup.h +- $(MOC) $(srcdir)/vcal-setup.h -o vcal-setup.moc ++vcal-factory.moc: $(srcdir)/vcal-factory.h ++ $(MOC) $(srcdir)/vcal-factory.h -o vcal-factory.moc + + #>+ 3 + todo-setup.moc: $(srcdir)/todo-setup.h + $(MOC) $(srcdir)/todo-setup.h -o todo-setup.moc + + #>+ 3 +-vcal-factory.moc: $(srcdir)/vcal-factory.h +- $(MOC) $(srcdir)/vcal-factory.h -o vcal-factory.moc ++vcal-conduit.moc: $(srcdir)/vcal-conduit.h ++ $(MOC) $(srcdir)/vcal-conduit.h -o vcal-conduit.moc + + #>+ 14 + korganizerConduit.cc: $(srcdir)/korganizerConduit.ui korganizerConduit.h korganizerConduit.moc +@@ -668,7 +670,7 @@ korganizerConduit.moc: korganizerConduit + + #>+ 3 + clean-metasources: +- -rm -f vcal-conduit.moc vcal-factorybase.moc todo-conduit.moc todo-factory.moc vcal-conduitbase.moc vcal-setup.moc todo-setup.moc vcal-factory.moc ++ -rm -f vcal-setup.moc todo-factory.moc todo-conduit.moc vcal-factorybase.moc vcal-conduitbase.moc vcal-factory.moc todo-setup.moc vcal-conduit.moc + + #>+ 5 + clean-ui: +@@ -687,7 +689,7 @@ force-reedit: + + + #>+ 11 +-libtodoconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/todo-factory.cc $(srcdir)/todo-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/todo-conduit.cc korganizertodoConduit.cc todo-conduit.moc vcal-factorybase.moc todo-setup.moc todo-factory.moc vcal-conduitbase.moc ++libtodoconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/todo-factory.cc $(srcdir)/todo-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/todo-conduit.cc korganizertodoConduit.cc vcal-factorybase.moc todo-factory.moc todo-conduit.moc vcal-conduitbase.moc todo-setup.moc + @echo 'creating libtodoconduit_la.all_cc.cc ...'; \ + rm -f libtodoconduit_la.all_cc.files libtodoconduit_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libtodoconduit_la.all_cc.final; \ +@@ -699,7 +701,7 @@ libtodoconduit_la.all_cc.cc: $(srcdir)/M + rm -f libtodoconduit_la.all_cc.final libtodoconduit_la.all_cc.files + + #>+ 11 +-libvcalconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/vcal-factory.cc $(srcdir)/vcal-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/vcal-conduit.cc korganizerConduit.cc vcal-factorybase.moc vcal-setup.moc vcal-conduit.moc vcal-conduitbase.moc vcal-factory.moc ++libvcalconduit_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/vcal-factorybase.cc $(srcdir)/vcal-factory.cc $(srcdir)/vcal-setup.cc $(srcdir)/vcal-conduitbase.cc $(srcdir)/vcal-conduit.cc korganizerConduit.cc vcal-factorybase.moc vcal-factory.moc vcal-conduit.moc vcal-setup.moc vcal-conduitbase.moc + @echo 'creating libvcalconduit_la.all_cc.cc ...'; \ + rm -f libvcalconduit_la.all_cc.files libvcalconduit_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libvcalconduit_la.all_cc.final; \ +@@ -735,27 +737,27 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 25 +-todo-factory.o: todo-factory.moc +-todo-conduit.o: todo-conduit.moc +-vcal-conduit.lo: vcal-conduit.moc +-todo-setup.lo: todo-setup.moc +-$(srcdir)/vcal-factorybase.cc: korganizertodoConduit.h korganizerConduit.h +-$(srcdir)/todo-setup.cc: korganizertodoConduit.h +-vcal-conduitbase.lo: vcal-conduitbase.moc + $(srcdir)/vcal-setup.cc: korganizerConduit.h +-$(srcdir)/vcal-conduitbase.cc: korganizertodoConduit.h korganizerConduit.h +-vcal-factory.o: vcal-factory.moc + vcal-factory.lo: vcal-factory.moc +-$(srcdir)/todo-factory.cc: korganizertodoConduit.h +-vcal-conduit.o: vcal-conduit.moc + vcal-factorybase.lo: vcal-factorybase.moc +-vcal-setup.lo: vcal-setup.moc +-$(srcdir)/vcal-conduit.cc: korganizerConduit.h ++todo-conduit.lo: todo-conduit.moc ++vcal-setup.o: vcal-setup.moc ++vcal-conduitbase.lo: vcal-conduitbase.moc ++todo-setup.lo: todo-setup.moc + $(srcdir)/vcal-factory.cc: korganizerConduit.h ++$(srcdir)/todo-conduit.cc: korganizertodoConduit.h + todo-setup.o: todo-setup.moc ++vcal-conduit.lo: vcal-conduit.moc ++vcal-factory.o: vcal-factory.moc ++vcal-setup.lo: vcal-setup.moc ++todo-factory.o: todo-factory.moc ++vcal-factorybase.o: vcal-factorybase.moc ++$(srcdir)/vcal-conduit.cc: korganizerConduit.h ++$(srcdir)/vcal-factorybase.cc: korganizertodoConduit.h korganizerConduit.h ++$(srcdir)/todo-setup.cc: korganizertodoConduit.h ++$(srcdir)/vcal-conduitbase.cc: korganizertodoConduit.h korganizerConduit.h + todo-factory.lo: todo-factory.moc + vcal-conduitbase.o: vcal-conduitbase.moc +-vcal-factorybase.o: vcal-factorybase.moc +-$(srcdir)/todo-conduit.cc: korganizertodoConduit.h +-todo-conduit.lo: todo-conduit.moc +-vcal-setup.o: vcal-setup.moc ++vcal-conduit.o: vcal-conduit.moc ++$(srcdir)/todo-factory.cc: korganizertodoConduit.h ++todo-conduit.o: todo-conduit.moc diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 30eff858b87..ec7c70b2aad 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2002/12/24 06:10:15 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2003/01/02 09:12:28 skrll Exp $ -DISTNAME= kdeutils-3.0.4 -PKGREVISION= 1 +DISTNAME= kdeutils-3.0.5a COMMENT= Utilities for the KDE integrated X11 desktop .include "../../x11/kde3/Makefile.kde3" diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index e83fa465d8b..d75f480f767 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1,18 +1,18 @@ -$NetBSD: distinfo,v 1.6 2002/10/14 09:13:50 skrll Exp $ +$NetBSD: distinfo,v 1.7 2003/01/02 09:12:29 skrll Exp $ -SHA1 (kdeutils-3.0.4.tar.bz2) = c5a174a088a0d9ee4fdab6a4e2cd1d84ebb2b102 -Size (kdeutils-3.0.4.tar.bz2) = 1514778 bytes +SHA1 (kdeutils-3.0.5a.tar.bz2) = 63104afb1686c5eaed7939e1bd8b6ec6b2cda7fd +Size (kdeutils-3.0.5a.tar.bz2) = 1515962 bytes SHA1 (patch-aa) = ac87861b38a93564e79e57cf5c8dc0de7f8c720a -SHA1 (patch-ab) = 96c698f05666f61aa653528688535cdb33221842 +SHA1 (patch-ab) = 7e29e85c52c585b795f0a1a9f8c2a92bef6804a0 SHA1 (patch-ac) = bb2f28bb4bc5d84d19ebf3a1d19aa5e7d21f61d3 SHA1 (patch-ad) = 0661f7e149c704291d3c668384363bb1e8246c8f SHA1 (patch-ae) = 481cb84d321ab9d6cbe8c1723319f0899969cb82 -SHA1 (patch-af) = 7118c3f53ea1d5831c53c071cc0fba6317f6b2d9 +SHA1 (patch-af) = 4091778400aded8120d59707eeeeaa4e8864cd34 SHA1 (patch-ag) = 28d4e0e634f886df60212b4f54fc870217f5dbe6 SHA1 (patch-ah) = fe2b3a94957a2d9cf6a294cbd3a77d100af84164 SHA1 (patch-ai) = a7a6505e5cf5a9411a47a65ba6ff1d8c34203095 SHA1 (patch-aj) = 1e6833cfb320f353e62e7be5ccae18deac8b8aef -SHA1 (patch-ak) = 1199959fd27b5084094c065f377cd48747bd8102 +SHA1 (patch-ak) = c45e16590bcc44b08d58f28ef5144545fbdceabc SHA1 (patch-al) = 289d94cf7ae64565639250a0e29662074466c8b3 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e SHA1 (patch-an) = ffd5589988aaa4e581cdfa9bfb7bdb9067f505fe diff --git a/misc/kdeutils3/patches/patch-ab b/misc/kdeutils3/patches/patch-ab index bda279f740b..94c76fcd3d9 100644 --- a/misc/kdeutils3/patches/patch-ab +++ b/misc/kdeutils3/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ +$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:29 skrll Exp $ ---- kcalc/Makefile.in.orig Wed May 8 21:11:41 2002 +--- kcalc/Makefile.in.orig Mon Dec 30 16:23:59 2002 +++ kcalc/Makefile.in -@@ -228,22 +228,25 @@ +@@ -227,22 +227,25 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ bin_PROGRAMS = kcalc @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ -kcalc_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \ +libkcalc_main_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \ - optiondialog.cpp + optiondialog.cpp +libkcalc_main_la_LIBADD = $(LIB_KDEUI) -lm + @@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH) pics_DATA = -@@ -261,25 +264,31 @@ +@@ -260,24 +263,30 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -51,16 +51,14 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ +am_libkcalc_main_la_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \ + optiondialog.lo +#>- libkcalc_main_la_OBJECTS = $(am_libkcalc_main_la_OBJECTS) - #>+ 6 + #>+ 5 -kcalc_la_final_OBJECTS = kcalc_la.all_cpp.lo -kcalc_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \ +libkcalc_main_la_final_OBJECTS = libkcalc_main_la.all_cpp.lo +libkcalc_main_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \ - optiondialog.lo \ -- kcalc_la_meta_unload.lo + optiondialog.lo -@KDE_USE_FINAL_FALSE@kcalc_la_OBJECTS = $(kcalc_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcalc_la_OBJECTS = $(kcalc_la_final_OBJECTS) -+ libkcalc_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_final_OBJECTS) bin_PROGRAMS = kcalc$(EXEEXT) @@ -77,21 +75,37 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -287,9 +296,10 @@ +@@ -285,16 +294,19 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/stats.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo +-#>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcalc_la.all_cpp.P $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/stats.Plo ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkcalc_main_la.all_cpp.P $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/stats.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/stats.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -309,14 +319,15 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -315,14 +327,15 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -109,7 +123,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ #>- all: all-am #>+ 1 -@@ -365,6 +376,8 @@ +@@ -371,6 +384,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kcalc.la: $(kcalc_la_OBJECTS) $(kcalc_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kcalc_la_LDFLAGS) $(kcalc_la_OBJECTS) $(kcalc_la_LIBADD) $(LIBS) @@ -118,7 +132,7 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -400,9 +413,10 @@ +@@ -406,9 +421,10 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dlabel.Plo@am__quote@ @@ -130,16 +144,16 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/optiondialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stats.Plo@am__quote@ -@@ -497,7 +511,7 @@ +@@ -503,7 +519,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kcalclogo.xpm optiondialog.h hi32-app-kcalc.png ToDo configure.in.in hi16-app-kcalc.png kcalc.desktop hi48-app-kcalc.png version.h -+KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png kcalc version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png ToDo +-KDE_DIST=hi16-app-kcalc.png optiondialog.h kcalc.desktop hi48-app-kcalc.png kcalclogo.xpm configure.in.in hi32-app-kcalc.png ToDo version.h ++KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png ToDo DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -620,9 +634,6 @@ +@@ -626,9 +642,6 @@ uninstall-am: uninstall-kde-icons unins messages: $(XGETTEXT) *.cpp -o $(podir)/kcalc.pot @@ -149,79 +163,55 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 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: -@@ -668,28 +679,28 @@ - - - #>+ 12 --kcalc_la_meta_unload.cpp: kcalc.moc optiondialog.moc dlabel.moc -- @echo 'creating kcalc_la_meta_unload.cpp' -- @-rm -f kcalc_la_meta_unload.cpp -+libkcalc_main_la_meta_unload.cpp: kcalc.moc optiondialog.moc dlabel.moc -+ @echo 'creating libkcalc_main_la_meta_unload.cpp' -+ @-rm -f libkcalc_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcalc_la[] = {' > kcalc_la_meta_unload.cpp ;\ -- cat kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcalc_la_meta_unload.cpp ;\ -- echo '0};' >> kcalc_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcalc_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcalc_la)' >> kcalc_la_meta_unload.cpp ;\ -- else echo > kcalc_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcalc_main_la[] = {' > libkcalc_main_la_meta_unload.cpp ;\ -+ cat kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcalc_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcalc_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcalc_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcalc_main_la)' >> libkcalc_main_la_meta_unload.cpp ;\ -+ else echo > libkcalc_main_la_meta_unload.cpp; fi +@@ -638,16 +651,16 @@ kcalc.moc: $(srcdir)/kcalc.h + $(MOC) $(srcdir)/kcalc.h -o kcalc.moc + #>+ 3 +-dlabel.moc: $(srcdir)/dlabel.h +- $(MOC) $(srcdir)/dlabel.h -o dlabel.moc +- +-#>+ 3 + optiondialog.moc: $(srcdir)/optiondialog.h + $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc #>+ 3 - clean-moc-classes: -- -rm -f kcalc_la_meta_unload.cpp -+ -rm -f libkcalc_main_la_meta_unload.cpp ++dlabel.moc: $(srcdir)/dlabel.h ++ $(MOC) $(srcdir)/dlabel.h -o dlabel.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f kcalc.moc dlabel.moc optiondialog.moc ++ -rm -f kcalc.moc optiondialog.moc dlabel.moc + + #>+ 2 + docs-am: +@@ -674,33 +687,33 @@ force-reedit: - #>+ 11 --kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp kcalc_la_meta_unload.cpp kcalc.moc optiondialog.moc dlabel.moc -+kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp kcalc.moc optiondialog.moc dlabel.moc - @echo 'creating kcalc_la.all_cpp.cpp ...'; \ - rm -f kcalc_la.all_cpp.files kcalc_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcalc_la.all_cpp.final; \ -- for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp kcalc_la_meta_unload.cpp ; do \ -+ for file in kcalc_main.cpp ; do \ - echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \ - done; \ -@@ -697,11 +708,23 @@ - rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files #>+ 11 --kcalc.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkcalc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkcalc_main_la_meta_unload.cpp +-kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp kcalc.moc dlabel.moc optiondialog.moc +- @echo 'creating kcalc_la.all_cpp.cpp ...'; \ +- rm -f kcalc_la.all_cpp.files kcalc_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kcalc_la.all_cpp.final; \ ++libkcalc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp kcalc.moc optiondialog.moc dlabel.moc + @echo 'creating libkcalc_main_la.all_cpp.cpp ...'; \ + rm -f libkcalc_main_la.all_cpp.files libkcalc_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcalc_main_la.all_cpp.final; \ -+ for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp libkcalc_main_la_meta_unload.cpp ; do \ + for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp ; do \ +- echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcalc_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcalc_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files > libkcalc_main_la.all_cpp.cpp; \ -+ rm -f libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files -+ -+#>+ 11 -+kcalc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp - @echo 'creating kcalc.all_cpp.cpp ...'; \ - rm -f kcalc.all_cpp.files kcalc.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcalc.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcalc_main.cpp ; do \ - echo "#include \"$$file\"" >> kcalc.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc.all_cpp.final; \ done; \ -@@ -710,20 +733,20 @@ +- cat kcalc_la.all_cpp.final kcalc_la.all_cpp.files > kcalc_la.all_cpp.cpp; \ +- rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files ++ cat libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files > libkcalc_main_la.all_cpp.cpp; \ ++ rm -f libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcalc_la.all_cpp.cpp kcalc.all_cpp.cpp -+ -rm -f kcalc_la.all_cpp.cpp libkcalc_main_la.all_cpp.cpp kcalc.all_cpp.cpp +- -rm -f kcalc_la.all_cpp.cpp ++ -rm -f libkcalc_main_la.all_cpp.cpp #>+ 2 final: @@ -241,4 +231,12 @@ $NetBSD: patch-ab,v 1.2 2002/06/21 15:36:31 skrll Exp $ + $(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_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 +@@ -713,6 +726,6 @@ kde-rpo-clean: + optiondialog.o: optiondialog.moc + kcalc.lo: kcalc.moc + optiondialog.lo: optiondialog.moc +-dlabel.lo: dlabel.moc + kcalc.o: kcalc.moc ++dlabel.lo: dlabel.moc + dlabel.o: dlabel.moc diff --git a/misc/kdeutils3/patches/patch-af b/misc/kdeutils3/patches/patch-af index 5395b324c3a..d7cdbf2f2f0 100644 --- a/misc/kdeutils3/patches/patch-af +++ b/misc/kdeutils3/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +$NetBSD: patch-af,v 1.2 2003/01/02 09:12:29 skrll Exp $ ---- kedit/Makefile.in.orig Wed May 8 21:11:41 2002 +--- kedit/Makefile.in.orig Mon Dec 30 16:24:30 2002 +++ kedit/Makefile.in -@@ -237,16 +237,20 @@ +@@ -236,16 +236,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kedit @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ -kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\ +libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\ - mail.cpp optiondialog.cpp + mail.cpp optiondialog.cpp -kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) +libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) @@ -28,7 +28,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kedit.h ktextfiledlg.h\ -@@ -270,23 +274,30 @@ +@@ -269,22 +273,29 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -37,10 +37,9 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +kedit_la_DEPENDENCIES = libkedit_main.la +am_kedit_la_OBJECTS = kedit_main.lo #>- kedit_la_OBJECTS = $(am_kedit_la_OBJECTS) --#>+ 5 +-#>+ 4 -kedit_la_final_OBJECTS = kedit_la.all_cpp.lo --kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo \ -- kedit_la_meta_unload.lo +-kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo -@KDE_USE_FINAL_FALSE@kedit_la_OBJECTS = $(kedit_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kedit_la_OBJECTS = $(kedit_la_final_OBJECTS) +#>+ 1 @@ -49,11 +48,10 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +am_libkedit_main_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \ + optiondialog.lo +#>- libkedit_main_la_OBJECTS = $(am_libkedit_main_la_OBJECTS) -+#>+ 6 ++#>+ 5 +libkedit_main_la_final_OBJECTS = libkedit_main_la.all_cpp.lo +libkedit_main_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \ -+ optiondialog.lo \ -+ libkedit_main_la_meta_unload.lo ++ optiondialog.lo +@KDE_USE_FINAL_FALSE@libkedit_main_la_OBJECTS = $(libkedit_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkedit_main_la_OBJECTS = $(libkedit_main_la_final_OBJECTS) bin_PROGRAMS = kedit$(EXEEXT) @@ -70,20 +68,33 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -294,9 +305,9 @@ +@@ -292,16 +303,16 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo + #>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kedit_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkedit_main_la.all_cpp.P $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -316,7 +327,8 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -322,7 +333,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -93,7 +104,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ DATA = $(apps_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) -@@ -329,7 +341,7 @@ +@@ -335,7 +347,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \ Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -102,7 +113,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -378,6 +390,8 @@ +@@ -384,6 +396,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS) @@ -111,7 +122,7 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -412,8 +426,9 @@ +@@ -418,8 +432,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -122,16 +133,16 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ktextfiledlg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mail.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/optiondialog.Plo@am__quote@ -@@ -569,7 +584,7 @@ +@@ -575,7 +590,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=optionstate.h KEdit.desktop keditui.rc -+KDE_DIST=KEdit.desktop kedit keditui.rc dummy.cpp optionstate.h +-KDE_DIST=optionstate.h keditui.rc KEdit.desktop ++KDE_DIST=KEdit.desktop keditui.rc optionstate.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -708,9 +723,6 @@ +@@ -714,14 +729,15 @@ uninstall-info: uninstall-info-recursive messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot @@ -141,79 +152,56 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 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: -@@ -746,28 +758,28 @@ - - - #>+ 12 --kedit_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc -- @echo 'creating kedit_la_meta_unload.cpp' -- @-rm -f kedit_la_meta_unload.cpp -+libkedit_main_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc -+ @echo 'creating libkedit_main_la_meta_unload.cpp' -+ @-rm -f libkedit_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kedit_la[] = {' > kedit_la_meta_unload.cpp ;\ -- cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kedit_la_meta_unload.cpp ;\ -- echo '0};' >> kedit_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kedit_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kedit_la)' >> kedit_la_meta_unload.cpp ;\ -- else echo > kedit_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkedit_main_la[] = {' > libkedit_main_la_meta_unload.cpp ;\ -+ cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkedit_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkedit_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkedit_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkedit_main_la)' >> libkedit_main_la_meta_unload.cpp ;\ -+ else echo > libkedit_main_la_meta_unload.cpp; fi + #>+ 3 ++optiondialog.moc: $(srcdir)/optiondialog.h ++ $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc ++ ++#>+ 3 + mail.moc: $(srcdir)/mail.h + $(MOC) $(srcdir)/mail.h -o mail.moc + +@@ -734,12 +750,8 @@ kedit.moc: $(srcdir)/kedit.h + $(MOC) $(srcdir)/kedit.h -o kedit.moc #>+ 3 - clean-moc-classes: -- -rm -f kedit_la_meta_unload.cpp -+ -rm -f libkedit_main_la_meta_unload.cpp +-optiondialog.moc: $(srcdir)/optiondialog.h +- $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc +- +-#>+ 3 + clean-metasources: +- -rm -f mail.moc ktextfiledlg.moc kedit.moc optiondialog.moc ++ -rm -f optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc + + #>+ 2 + docs-am: +@@ -752,33 +764,33 @@ force-reedit: - #>+ 11 --kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp kedit_la_meta_unload.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc -+kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc - @echo 'creating kedit_la.all_cpp.cpp ...'; \ - rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \ -- for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp kedit_la_meta_unload.cpp ; do \ -+ for file in kedit_main.cpp ; do \ - echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \ - done; \ -@@ -775,11 +787,23 @@ - rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files #>+ 11 --kedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkedit_main_la_meta_unload.cpp +-kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp mail.moc kedit.moc ktextfiledlg.moc optiondialog.moc +- @echo 'creating kedit_la.all_cpp.cpp ...'; \ +- rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \ ++libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc + @echo 'creating libkedit_main_la.all_cpp.cpp ...'; \ + rm -f libkedit_main_la.all_cpp.files libkedit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkedit_main_la.all_cpp.final; \ -+ for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp libkedit_main_la_meta_unload.cpp ; do \ + for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp ; do \ +- echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkedit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkedit_main_la.all_cpp.final; \ -+ done; \ -+ cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \ -+ rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files -+ -+#>+ 11 -+kedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp - @echo 'creating kedit.all_cpp.cpp ...'; \ - rm -f kedit.all_cpp.files kedit.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kedit.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kedit_main.cpp ; do \ - echo "#include \"$$file\"" >> kedit.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit.all_cpp.final; \ done; \ -@@ -788,20 +812,20 @@ +- cat kedit_la.all_cpp.final kedit_la.all_cpp.files > kedit_la.all_cpp.cpp; \ +- rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files ++ cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \ ++ rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kedit_la.all_cpp.cpp kedit.all_cpp.cpp -+ -rm -f kedit_la.all_cpp.cpp libkedit_main_la.all_cpp.cpp kedit.all_cpp.cpp +- -rm -f kedit_la.all_cpp.cpp ++ -rm -f libkedit_main_la.all_cpp.cpp #>+ 2 final: @@ -233,4 +221,18 @@ $NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_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 +@@ -789,10 +801,10 @@ kde-rpo-clean: + + #>+ 9 + optiondialog.o: optiondialog.moc +-mail.o: mail.moc ++mail.lo: mail.moc + optiondialog.lo: optiondialog.moc ++mail.o: mail.moc + kedit.lo: kedit.moc +-ktextfiledlg.lo: ktextfiledlg.moc + ktextfiledlg.o: ktextfiledlg.moc +-mail.lo: mail.moc ++ktextfiledlg.lo: ktextfiledlg.moc + kedit.o: kedit.moc diff --git a/misc/kdeutils3/patches/patch-ak b/misc/kdeutils3/patches/patch-ak index 80184cdf168..cc41ec9cbc7 100644 --- a/misc/kdeutils3/patches/patch-ak +++ b/misc/kdeutils3/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +$NetBSD: patch-ak,v 1.2 2003/01/02 09:12:29 skrll Exp $ ---- klaptopdaemon/Makefile.in.orig Wed May 8 21:11:42 2002 +--- klaptopdaemon/Makefile.in.orig Mon Dec 30 16:24:30 2002 +++ klaptopdaemon/Makefile.in -@@ -227,18 +227,22 @@ +@@ -226,18 +226,22 @@ qt_libraries = @qt_libraries@ x_includes = @x_includes@ x_libraries = @x_libraries@ @@ -30,8 +30,8 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp portable.cpp -@@ -267,25 +271,31 @@ - kcm_laptop_la_meta_unload.lo +@@ -265,24 +269,30 @@ kcm_laptop_la_nofinal_OBJECTS = battery. + warning.lo portable.lo @KDE_USE_FINAL_FALSE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_final_OBJECTS) -klaptopdaemon_la_DEPENDENCIES = @@ -46,18 +46,16 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ +am_libklaptopdaemon_main_la_OBJECTS = laptop_daemon.lo kpcmcia.lo \ + kpcmciainfo.lo daemondock.lo notify.lo portable.lo +#>- libklaptopdaemon_main_la_OBJECTS = \ -+#>- $(am_libklaptopdaemon_main_la_OBJECTS) - #>+ 6 ++#>- $(am_libklaptopdaemon_main_la_OBJECTS) + #>+ 5 -klaptopdaemon_la_final_OBJECTS = klaptopdaemon_la.all_cpp.lo -klaptopdaemon_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \ -- daemondock.lo notify.lo portable.lo \ -- klaptopdaemon_la_meta_unload.lo +- daemondock.lo notify.lo portable.lo -@KDE_USE_FINAL_FALSE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_OBJECTS) +libklaptopdaemon_main_la_final_OBJECTS = libklaptopdaemon_main_la.all_cpp.lo +libklaptopdaemon_main_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo \ -+ kpcmciainfo.lo daemondock.lo notify.lo portable.lo \ -+ libklaptopdaemon_main_la_meta_unload.lo ++ kpcmciainfo.lo daemondock.lo notify.lo portable.lo +@KDE_USE_FINAL_FALSE@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_final_OBJECTS) bin_PROGRAMS = klaptopdaemon$(EXEEXT) @@ -74,19 +72,42 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -293,8 +303,9 @@ +@@ -290,23 +300,26 @@ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kpcmciainfo.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \ -@@ -319,7 +330,7 @@ + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kpcmciainfo.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/warning.Plo +-#>+ 15 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/klaptopdaemon_la.all_cpp.P $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kpcmciainfo.Plo \ ++#>+ 17 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/libklaptopdaemon_main_la.all_cpp.P $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/warning.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kpcmciainfo.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klaptopdaemon_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \ +@@ -332,7 +345,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \ @@ -95,7 +116,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-info-recursive all-recursive install-data-recursive \ -@@ -327,7 +338,7 @@ +@@ -340,7 +353,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -104,7 +125,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -400,6 +411,8 @@ +@@ -413,6 +426,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_laptop_la_LDFLAGS) $(kcm_laptop_la_OBJECTS) $(kcm_laptop_la_LIBADD) $(LIBS) klaptopdaemon.la: $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(klaptopdaemon_la_LDFLAGS) $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_LIBADD) $(LIBS) @@ -113,7 +134,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -436,7 +449,8 @@ +@@ -449,7 +464,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/battery.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/daemondock.Plo@am__quote@ @@ -123,16 +144,16 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kpcmcia.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kpcmciainfo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/laptop_daemon.Plo@am__quote@ -@@ -564,7 +578,7 @@ +@@ -577,7 +593,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=pcmcia.h configure.in.in battery.h notify.h power.h warning.h kpcmciainfo.h version.h daemondock.h portable.h kpcmcia.h laptop_daemon.h -+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h klaptopdaemon portable.h daemondock.h pcmcia.h kcm_laptop.la.closure kpcmcia.h laptop_daemon.h notify.h dummy.cpp +-KDE_DIST=pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h warning.h kpcmcia.h notify.h configure.in.in battery.h version.h ++KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h portable.h daemondock.h pcmcia.h kpcmcia.h laptop_daemon.h notify.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -708,9 +722,6 @@ +@@ -721,9 +737,6 @@ uninstall-info: uninstall-info-recursive messages: $(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot $(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot @@ -142,88 +163,97 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 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: -@@ -792,24 +803,24 @@ - - - #>+ 12 --klaptopdaemon_la_meta_unload.cpp: daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc -- @echo 'creating klaptopdaemon_la_meta_unload.cpp' -- @-rm -f klaptopdaemon_la_meta_unload.cpp -+libklaptopdaemon_main_la_meta_unload.cpp: daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc -+ @echo 'creating libklaptopdaemon_main_la_meta_unload.cpp' -+ @-rm -f libklaptopdaemon_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_klaptopdaemon_la[] = {' > klaptopdaemon_la_meta_unload.cpp ;\ -- cat daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klaptopdaemon_la_meta_unload.cpp ;\ -- echo '0};' >> klaptopdaemon_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> klaptopdaemon_la_meta_unload.cpp ;\ -- echo '_UNLOAD(klaptopdaemon_la)' >> klaptopdaemon_la_meta_unload.cpp ;\ -- else echo > klaptopdaemon_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libklaptopdaemon_main_la[] = {' > libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ cat daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libklaptopdaemon_main_la)' >> libklaptopdaemon_main_la_meta_unload.cpp ;\ -+ else echo > libklaptopdaemon_main_la_meta_unload.cpp; fi +@@ -738,20 +751,28 @@ kcm_laptop.la.closure: $(kcm_laptop_la_O + + + #>+ 3 ++kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h ++ $(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc ++ ++#>+ 3 + kpcmcia.moc: $(srcdir)/kpcmcia.h + $(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc + + #>+ 3 +-kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h +- $(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc ++pcmcia.moc: $(srcdir)/pcmcia.h ++ $(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc ++ ++#>+ 3 ++daemondock.moc: $(srcdir)/daemondock.h ++ $(MOC) $(srcdir)/daemondock.h -o daemondock.moc + + #>+ 3 + battery.moc: $(srcdir)/battery.h + $(MOC) $(srcdir)/battery.h -o battery.moc + + #>+ 3 +-daemondock.moc: $(srcdir)/daemondock.h +- $(MOC) $(srcdir)/daemondock.h -o daemondock.moc ++notify.moc: $(srcdir)/notify.h ++ $(MOC) $(srcdir)/notify.h -o notify.moc + + #>+ 3 + power.moc: $(srcdir)/power.h +@@ -762,20 +783,12 @@ warning.moc: $(srcdir)/warning.h + $(MOC) $(srcdir)/warning.h -o warning.moc + #>+ 3 +-pcmcia.moc: $(srcdir)/pcmcia.h +- $(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc +- +-#>+ 3 +-notify.moc: $(srcdir)/notify.h +- $(MOC) $(srcdir)/notify.h -o notify.moc +- +-#>+ 3 + laptop_daemon.moc: $(srcdir)/laptop_daemon.h + $(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc #>+ 3 - clean-moc-classes: -- -rm -f kcm_laptop_la_meta_unload.cpp klaptopdaemon_la_meta_unload.cpp -+ -rm -f kcm_laptop_la_meta_unload.cpp libklaptopdaemon_main_la_meta_unload.cpp + clean-metasources: +- -rm -f kpcmcia.moc kpcmciainfo.moc battery.moc daemondock.moc power.moc warning.moc pcmcia.moc notify.moc laptop_daemon.moc ++ -rm -f kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc + + #>+ 3 + clean-closures: +@@ -792,7 +805,7 @@ force-reedit: + #>+ 11 --kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp kcm_laptop_la_meta_unload.cpp kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc -+kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/kcm_laptop_la_meta_unload.cpp kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc +-kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp battery.moc pcmcia.moc warning.moc power.moc ++kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp pcmcia.moc battery.moc power.moc warning.moc @echo 'creating kcm_laptop_la.all_cpp.cpp ...'; \ rm -f kcm_laptop_la.all_cpp.files kcm_laptop_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kcm_laptop_la.all_cpp.final; \ -@@ -821,11 +832,11 @@ +@@ -804,33 +817,33 @@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak rm -f kcm_laptop_la.all_cpp.final kcm_laptop_la.all_cpp.files #>+ 11 --klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp klaptopdaemon_la_meta_unload.cpp -+klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp - @echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \ - rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \ -- for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp klaptopdaemon_la_meta_unload.cpp ; do \ -+ for file in klaptopdaemon_main.cpp ; do \ - echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \ - done; \ -@@ -833,11 +844,23 @@ - rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files - - #>+ 11 --klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp libklaptopdaemon_main_la_meta_unload.cpp +-klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp daemondock.moc kpcmcia.moc laptop_daemon.moc notify.moc kpcmciainfo.moc +- @echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \ +- rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \ ++libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc + @echo 'creating libklaptopdaemon_main_la.all_cpp.cpp ...'; \ + rm -f libklaptopdaemon_main_la.all_cpp.files libklaptopdaemon_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libklaptopdaemon_main_la.all_cpp.final; \ -+ for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp libklaptopdaemon_main_la_meta_unload.cpp ; do \ + for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp ; do \ +- echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libklaptopdaemon_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklaptopdaemon_main_la.all_cpp.final; \ -+ done; \ -+ cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files > libklaptopdaemon_main_la.all_cpp.cpp; \ -+ rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files -+ -+#>+ 11 -+klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp - @echo 'creating klaptopdaemon.all_cpp.cpp ...'; \ - rm -f klaptopdaemon.all_cpp.files klaptopdaemon.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klaptopdaemon.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in klaptopdaemon_main.cpp ; do \ - echo "#include \"$$file\"" >> klaptopdaemon.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon.all_cpp.final; \ done; \ -@@ -846,20 +869,20 @@ +- cat klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files > klaptopdaemon_la.all_cpp.cpp; \ +- rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files ++ cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files > libklaptopdaemon_main_la.all_cpp.cpp; \ ++ rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp -+ -rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp +- -rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp ++ -rm -f kcm_laptop_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp #>+ 2 final: @@ -243,4 +273,36 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $ + $(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_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 +@@ -841,20 +854,20 @@ kde-rpo-clean: + + #>+ 19 + kpcmcia.o: kpcmcia.moc +-battery.lo: battery.moc +-notify.o: notify.moc +-pcmcia.lo: pcmcia.moc + kpcmcia.lo: kpcmcia.moc +-laptop_daemon.lo: laptop_daemon.moc ++laptop_daemon.o: laptop_daemon.moc ++notify.o: notify.moc + power.o: power.moc +-daemondock.o: daemondock.moc +-power.lo: power.moc + notify.lo: notify.moc ++warning.lo: warning.moc ++warning.o: warning.moc ++laptop_daemon.lo: laptop_daemon.moc ++kpcmciainfo.o: kpcmciainfo.moc + battery.o: battery.moc +-pcmcia.o: pcmcia.moc ++pcmcia.lo: pcmcia.moc ++battery.lo: battery.moc + daemondock.lo: daemondock.moc +-warning.o: warning.moc ++daemondock.o: daemondock.moc ++pcmcia.o: pcmcia.moc + kpcmciainfo.lo: kpcmciainfo.moc +-laptop_daemon.o: laptop_daemon.moc +-warning.lo: warning.moc +-kpcmciainfo.o: kpcmciainfo.moc ++power.lo: power.moc diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 1d7a09c06c6..e9a006d84c9 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2002/12/24 06:10:18 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2003/01/02 09:12:29 skrll Exp $ -DISTNAME= kdenetwork-3.0.4 -PKGREVISION= 3 +DISTNAME= kdenetwork-3.0.5a CATEGORIES= net COMMENT= Network modules for the KDE integrated X11 desktop diff --git a/net/kdenetwork3/PLIST b/net/kdenetwork3/PLIST index 02d6671dc94..6dbf836ef14 100644 --- a/net/kdenetwork3/PLIST +++ b/net/kdenetwork3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:59:26 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/01/02 09:12:30 skrll Exp $ bin/dsirc bin/kdict bin/kit @@ -447,6 +447,8 @@ share/kde/apps/kppp/Provider/Taiwan/HiNet share/kde/apps/kppp/Provider/Taiwan/SeedNet share/kde/apps/kppp/Provider/Ukraine/.directory share/kde/apps/kppp/Provider/Ukraine/Adamant +share/kde/apps/kppp/Provider/Ukraine/IPTelecom +share/kde/apps/kppp/Provider/Ukraine/NuVse share/kde/apps/kppp/Provider/United_Kingdom/.directory share/kde/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666 share/kde/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666 @@ -727,6 +729,8 @@ share/kde/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst share/kde/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst share/kde/apps/kppp/Rules/TEMPLATE share/kde/apps/kppp/Rules/Turkey/Turk_Telekom_Internet.rst +share/kde/apps/kppp/Rules/Ukraine/IPTelecom_hourly.rst +share/kde/apps/kppp/Rules/Ukraine/NuVse_hourly.rst share/kde/apps/kppp/Rules/Ukraine/TEMPLATE.uk share/kde/apps/kppp/Rules/Ukraine/Utel_Unet.rst share/kde/apps/kppp/Rules/United_Kingdom/BirminghamCable_Local.rst diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index bdffec0ce65..a32a4b72e0b 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,20 +1,13 @@ -$NetBSD: distinfo,v 1.5 2002/12/04 21:20:06 skrll Exp $ +$NetBSD: distinfo,v 1.6 2003/01/02 09:12:30 skrll Exp $ -SHA1 (kdenetwork-3.0.4.tar.bz2) = 4288cde85cf157f442b71fa3cc3cc82917eadb6d -Size (kdenetwork-3.0.4.tar.bz2) = 3961252 bytes +SHA1 (kdenetwork-3.0.5a.tar.bz2) = 325800806aa027073b7f0523140ade65e86614f1 +Size (kdenetwork-3.0.5a.tar.bz2) = 3863844 bytes SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855 -SHA1 (patch-ad) = cb9f035a5df914550b691c7c056cc50b96182145 +SHA1 (patch-ad) = 916bcbe11ca71f7a0f5f03c91fa18a6af9197be2 SHA1 (patch-ae) = f223a5e3923d6d45866ea89119bacba5fd107eb9 -SHA1 (patch-af) = e8d93e1362343a6313297afdfb8fa00bd8993fe1 SHA1 (patch-ag) = 41838a86a06877deb2635470a79aeb104cd56474 SHA1 (patch-ah) = eca8369d447fa423e2ec0965e0a3bdd08a850dda SHA1 (patch-ai) = e4c5fa35a4731300d75067b7eebb6f0969775db6 -SHA1 (patch-aj) = e8cfe911eee70e6562d616ba374a3f8ce53c67cd SHA1 (patch-ak) = 018cff6d72916b528e8e4e47b8cc01cb36799e24 SHA1 (patch-al) = 13c6bfb20fc49ae22d30029044808c9b77747754 SHA1 (patch-am) = ea75731f5c51c7a4868f4e63e3b97b9a78d6d80c -SHA1 (patch-an) = 8d38aba40b2c05f4a5fcdbb83aa662187bf3dec8 -SHA1 (patch-ao) = 130417f82bdf5ef3f9e3aefa37aceebdde2857a7 -SHA1 (patch-ap) = 33441bf7af2e1c48a92d3b48c963fe9b98c77846 -SHA1 (patch-aq) = 30b5dc24d5899e79fa56ef9eb6a18fc30a3a0456 -SHA1 (patch-ar) = 964ffac4b98451c00999bcacbd92bb9ed747b6e0 diff --git a/net/kdenetwork3/patches/patch-ad b/net/kdenetwork3/patches/patch-ad index 2b0be0d0257..b09379da131 100644 --- a/net/kdenetwork3/patches/patch-ad +++ b/net/kdenetwork3/patches/patch-ad @@ -1,10 +1,10 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:59:28 skrll Exp $ +$NetBSD: patch-ad,v 1.2 2003/01/02 09:12:30 skrll Exp $ ---- kppp/pppstats.cpp.orig Wed May 8 19:30:04 2002 +--- kppp/pppstats.cpp.orig Mon Dec 16 03:02:45 2002 +++ kppp/pppstats.cpp -@@ -217,27 +217,29 @@ +@@ -218,27 +218,29 @@ bool PPPStats::initStats() { - strcpy(ifr.ifr_name, unitName); + strlcpy(ifr.ifr_name, unitName, sizeof(ifr.ifr_name)); + local_ip_address = ""; if (ioctl(s, SIOCGIFADDR, &ifr) < 0) { diff --git a/net/kdenetwork3/patches/patch-af b/net/kdenetwork3/patches/patch-af index b6add4bd624..7240fec2bcf 100644 --- a/net/kdenetwork3/patches/patch-af +++ b/net/kdenetwork3/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ +$NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ ---- ksirc/Makefile.in.orig Sat Oct 12 13:19:13 2002 +--- ksirc/Makefile.in.orig Sat Dec 28 08:53:51 2002 +++ ksirc/Makefile.in -@@ -251,13 +251,13 @@ testview_SOURCES = kstextview.cpp kstext +@@ -244,13 +244,13 @@ testview_SOURCES = kstextview.cpp kstext testview_LDADD = $(LIB_KDEUI) testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@ -15,19 +15,19 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ # Which sources should be compiled for ksirc. -#>- ksirc_la_SOURCES = \ +#>- libksirc_main_la_SOURCES = \ - #>- toplevel.cpp \ - #>- charSelector.cpp \ - #>- chanButtons.cpp \ -@@ -290,7 +290,7 @@ noinst_PROGRAMS = getdate - #>- kstextview.cpp \ - #>- colorpicker.cpp + #>- toplevel.cpp \ + #>- charSelector.cpp \ + #>- chanButtons.cpp \ +@@ -283,7 +283,7 @@ noinst_PROGRAMS = getdate + #>- kstextview.cpp \ + #>- colorpicker.cpp #>+ 32 -ksirc_la_SOURCES=\ +libksirc_main_la_SOURCES=\ toplevel.cpp \ charSelector.cpp \ chanButtons.cpp \ -@@ -325,6 +325,9 @@ ksirc_la_SOURCES=\ +@@ -318,6 +318,9 @@ ksirc_la_SOURCES=\ # the library search path @@ -37,7 +37,7 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ ksirc_la_LDFLAGS = $(all_libraries) -module -avoid-version all_ksirc_libraries = \ -@@ -336,10 +339,10 @@ all_ksirc_libraries = \ +@@ -329,10 +332,10 @@ all_ksirc_libraries = \ # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. @@ -51,7 +51,7 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH) getdate_SOURCES = getdate.c -@@ -398,9 +401,14 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -391,9 +394,14 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -68,13 +68,13 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \ NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \ ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \ -@@ -409,10 +417,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe +@@ -402,10 +410,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \ displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \ logfile.lo kstextview.lo colorpicker.lo -#>- ksirc_la_OBJECTS = $(am_ksirc_la_OBJECTS) +#>- libksirc_main_la_OBJECTS = $(am_libksirc_main_la_OBJECTS) - #>+ 13 + #>+ 12 -ksirc_la_final_OBJECTS = ksirc_la.all_cpp.lo -ksirc_la_nofinal_OBJECTS = toplevel.lo charSelector.lo chanButtons.lo \ +libksirc_main_la_final_OBJECTS = libksirc_main_la.all_cpp.lo @@ -82,20 +82,18 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \ NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \ ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \ -@@ -421,9 +429,9 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c +@@ -414,8 +422,8 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \ displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \ - logfile.lo kstextview.lo colorpicker.lo FilterRuleEditorData.lo \ -- ksirc_la_meta_unload.lo + logfile.lo kstextview.lo colorpicker.lo FilterRuleEditorData.lo -@KDE_USE_FINAL_FALSE@ksirc_la_OBJECTS = $(ksirc_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@ksirc_la_OBJECTS = $(ksirc_la_final_OBJECTS) -+ libksirc_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libksirc_main_la_OBJECTS = $(libksirc_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libksirc_main_la_OBJECTS = $(libksirc_main_la_final_OBJECTS) bin_PROGRAMS = ksirc$(EXEEXT) check_PROGRAMS = testview$(EXEEXT) noinst_PROGRAMS = getdate$(EXEEXT) -@@ -436,11 +444,11 @@ getdate_OBJECTS = getdate.$(OBJEXT) +@@ -428,11 +436,11 @@ getdate_OBJECTS = getdate.$(OBJEXT) getdate_LDADD = $(LDADD) getdate_DEPENDENCIES = getdate_LDFLAGS = @@ -109,23 +107,97 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ +ksirc_DEPENDENCIES = libksirc_main.la am_testview_OBJECTS = kstextview.$(OBJEXT) kstextviewtest.$(OBJEXT) #>- testview_OBJECTS = $(am_testview_OBJECTS) - #>+ 5 -@@ -471,11 +479,13 @@ am__depfiles_maybe = depfiles - @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \ -- @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrSDI.Plo ./$(DEPDIR)/dummy.Po \ -+ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrSDI.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/getdate.Po ./$(DEPDIR)/ioBroadcast.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/ioDCC.Plo ./$(DEPDIR)/ioDiscard.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/ioLAG.Plo ./$(DEPDIR)/ioNotify.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/iocontroller.Plo ./$(DEPDIR)/ksirc.Plo \ -+ @AMDEP_TRUE@ ./$(DEPDIR)/ksirc_main.Plo \ -+ @AMDEP_TRUE@ ./$(DEPDIR)/ksirc_main.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Po \ -@@ -516,8 +526,8 @@ CXXLD = $(CXX) + #>+ 4 +@@ -458,15 +466,16 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@ $(DEPDIR)/colorpicker.Plo $(DEPDIR)/dccDialog.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/dccDialogData.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/displayMgrMDI.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/getdate.Po $(DEPDIR)/ioBroadcast.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/ioDCC.Plo $(DEPDIR)/ioDiscard.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/ioLAG.Plo $(DEPDIR)/ioNotify.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/iocontroller.Plo $(DEPDIR)/ksirc.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/ksircprocess.Plo $(DEPDIR)/ksopts.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kstextview.Plo $(DEPDIR)/kstextview.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kstextviewtest.Po $(DEPDIR)/ksview.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/logfile.Plo $(DEPDIR)/mditoplevel.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/getdate.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/ioBroadcast.Plo $(DEPDIR)/ioDCC.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/ioDiscard.Plo $(DEPDIR)/ioLAG.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/ioNotify.Plo $(DEPDIR)/iocontroller.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/ksirc.Plo $(DEPDIR)/ksirc_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/ksirc_main.Po $(DEPDIR)/ksircprocess.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/ksopts.Plo $(DEPDIR)/kstextview.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kstextview.Po $(DEPDIR)/kstextviewtest.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/ksview.Plo $(DEPDIR)/logfile.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/mditoplevel.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/messageReceiver.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/objFinder.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/servercontroller.Plo \ +@@ -474,8 +483,8 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@ $(DEPDIR)/ssfepromptdata.Plo $(DEPDIR)/topic.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/usercontrolmenu.Plo +-#>+ 49 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/FilterRuleEditorData.P $(DEPDIR)/ksirc_la.all_cpp.P $(DEPDIR)/testview.all_cpp.P $(DEPDIR)/FilterRuleEditor.Plo \ ++#>+ 51 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/FilterRuleEditorData.P $(DEPDIR)/libksirc_main_la.all_cpp.P $(DEPDIR)/testview.all_cpp.P $(DEPDIR)/FilterRuleEditor.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/NewWindowDialog.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ahistlineedit.Plo $(DEPDIR)/alistbox.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/baserules.Plo $(DEPDIR)/chanButtons.Plo \ +@@ -483,15 +492,16 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/colorpicker.Plo $(DEPDIR)/dccDialog.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dccDialogData.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrMDI.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/getdate.Po $(DEPDIR)/ioBroadcast.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioDCC.Plo $(DEPDIR)/ioDiscard.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioLAG.Plo $(DEPDIR)/ioNotify.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/iocontroller.Plo $(DEPDIR)/ksirc.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksircprocess.Plo $(DEPDIR)/ksopts.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kstextview.Plo $(DEPDIR)/kstextview.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kstextviewtest.Po $(DEPDIR)/ksview.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/logfile.Plo $(DEPDIR)/mditoplevel.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/getdate.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioBroadcast.Plo $(DEPDIR)/ioDCC.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioDiscard.Plo $(DEPDIR)/ioLAG.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioNotify.Plo $(DEPDIR)/iocontroller.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksirc.Plo $(DEPDIR)/ksirc_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksirc_main.Po $(DEPDIR)/ksircprocess.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksopts.Plo $(DEPDIR)/kstextview.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kstextview.Po $(DEPDIR)/kstextviewtest.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksview.Plo $(DEPDIR)/logfile.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/mditoplevel.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/messageReceiver.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/objFinder.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/servercontroller.Plo \ +@@ -507,15 +517,16 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/colorpicker.Plo $(DEPDIR)/dccDialog.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dccDialogData.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrMDI.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/getdate.Po $(DEPDIR)/ioBroadcast.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioDCC.Plo $(DEPDIR)/ioDiscard.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioLAG.Plo $(DEPDIR)/ioNotify.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/iocontroller.Plo $(DEPDIR)/ksirc.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksircprocess.Plo $(DEPDIR)/ksopts.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kstextview.Plo $(DEPDIR)/kstextview.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kstextviewtest.Po $(DEPDIR)/ksview.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/logfile.Plo $(DEPDIR)/mditoplevel.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/getdate.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioBroadcast.Plo $(DEPDIR)/ioDCC.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioDiscard.Plo $(DEPDIR)/ioLAG.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioNotify.Plo $(DEPDIR)/iocontroller.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksirc.Plo $(DEPDIR)/ksirc_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksirc_main.Po $(DEPDIR)/ksircprocess.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksopts.Plo $(DEPDIR)/kstextview.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kstextview.Po $(DEPDIR)/kstextviewtest.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksview.Plo $(DEPDIR)/logfile.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/mditoplevel.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/messageReceiver.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/objFinder.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/servercontroller.Plo \ +@@ -551,8 +562,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -136,7 +208,7 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ DATA = $(apps_DATA) $(conf_DATA) $(misc_DATA) HEADERS = $(noinst_HEADERS) -@@ -529,7 +539,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -564,7 +575,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -145,42 +217,42 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -576,6 +586,8 @@ clean-libLTLIBRARIES: - done +@@ -613,6 +624,8 @@ clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ksirc.la: $(ksirc_la_OBJECTS) $(ksirc_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(ksirc_la_LDFLAGS) $(ksirc_la_OBJECTS) $(ksirc_la_LIBADD) $(LIBS) +libksirc_main.la: $(libksirc_main_la_OBJECTS) $(libksirc_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libksirc_main_la_LDFLAGS) $(libksirc_main_la_OBJECTS) $(libksirc_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -668,7 +680,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccDialogData.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrMDI.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrSDI.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioBroadcast.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioDCC.Plo@am__quote@ -@@ -677,6 +688,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioNotify.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iocontroller.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksircprocess.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksopts.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstextview.Plo@am__quote@ -@@ -896,7 +909,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -693,7 +706,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dccDialogData.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/displayMgrMDI.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/displayMgrSDI.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdate.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioBroadcast.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioDCC.Plo@am__quote@ +@@ -702,6 +714,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioNotify.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/iocontroller.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksircprocess.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksopts.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kstextview.Plo@am__quote@ +@@ -906,7 +920,7 @@ distclean-tags: + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=sirc.help.gz mditoplevel.cpp ssfepromptdata.cpp FilterRuleEditor.cpp displayMgrMDI.h messageReceiver.cpp ahistlineedit.cpp Artistic ksview.cpp default.pl ioLAG.cpp kstextview.h charSelector.h chanButtons.cpp ksopts.cpp relnotes filters.pl displayMgrMDI.cpp openksircproc.dlg ioNotify.cpp servercontroller.dlg dccDialog.dlg FilterRuleEditorData.ui topic.cpp chanButtons.h ioDiscard.cpp topic.h ksircrc colorpicker.cpp ksirc.pl ksircprocess.cpp stringparserstate.h logfile.cpp FilterRuleEditor.dlg ksirc.desktop dccDialog.cpp ioDCC.cpp iocontroller.cpp objFinder.cpp ksirc.cpp FAQ baserules.cpp charSelector.cpp logfile.h colorpicker.h toplevel.cpp NewWindowDialog.cpp dsirc servercontroller.cpp dccDialogData.cpp ssfeprompt.cpp mditoplevel.h displayMgrSDI.cpp usercontrolmenu.cpp version.h ioBroadcast.cpp alistbox.cpp chanparser.cpp -+KDE_DIST=FilterRuleEditor.dlg stringparserstate.h ksview.cpp displayMgrSDI.cpp FAQ mditoplevel.cpp topic.cpp mditoplevel.h objFinder.cpp messageReceiver.cpp ahistlineedit.cpp ioNotify.cpp charSelector.cpp ksircrc usercontrolmenu.cpp displayMgrMDI.cpp dccDialog.cpp charSelector.h kstextview.h default.pl sirc.help.gz FilterRuleEditor.cpp ioDCC.cpp ioLAG.cpp toplevel.loT dsirc filters.pl ssfepromptdata.cpp openksircproc.dlg baserules.cpp Artistic logfile.h ksopts.cpp NewWindowDialog.cpp alistbox.cpp servercontroller.dlg ksircprocess.cpp ssfeprompt.cpp dccDialogData.cpp FilterRuleEditorData.ui logfile.cpp topic.h displayMgrMDI.h ksirc.cpp chanButtons.h colorpicker.cpp ksirc.pl chanButtons.cpp chanparser.cpp ksirc.desktop iocontroller.cpp version.h relnotes ioBroadcast.cpp ioDiscard.cpp toplevel.cpp dccDialog.dlg colorpicker.h servercontroller.cpp ++KDE_DIST=FilterRuleEditor.dlg stringparserstate.h ksview.cpp displayMgrSDI.cpp FAQ mditoplevel.cpp topic.cpp mditoplevel.h objFinder.cpp messageReceiver.cpp ahistlineedit.cpp ioNotify.cpp charSelector.cpp ksircrc usercontrolmenu.cpp displayMgrMDI.cpp dccDialog.cpp charSelector.h kstextview.h default.pl sirc.help.gz FilterRuleEditor.cpp ioDCC.cpp ioLAG.cpp dsirc filters.pl ssfepromptdata.cpp openksircproc.dlg baserules.cpp Artistic logfile.h ksopts.cpp NewWindowDialog.cpp alistbox.cpp servercontroller.dlg ksircprocess.cpp ssfeprompt.cpp dccDialogData.cpp FilterRuleEditorData.ui logfile.cpp topic.h displayMgrMDI.h ksirc.cpp chanButtons.h colorpicker.cpp ksirc.pl chanButtons.cpp chanparser.cpp ksirc.desktop iocontroller.cpp version.h relnotes ioBroadcast.cpp ioDiscard.cpp toplevel.cpp dccDialog.dlg colorpicker.h servercontroller.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -1061,125 +1074,122 @@ messages: rc.cpp +@@ -1065,127 +1079,124 @@ messages: rc.cpp $(EXTRACTRC) KSOpenkSirc/*.ui >> rc.cpp $(EXTRACTRC) KSPrefs/*.ui >> rc.cpp $(XGETTEXT) *.cpp */*.cpp -o $(podir)/ksirc.pot @@ -191,12 +263,14 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --#>+ 12 +-#>+ 14 -FilterRuleEditorData.cpp: $(srcdir)/FilterRuleEditorData.ui FilterRuleEditorData.h FilterRuleEditorData.moc - rm -f FilterRuleEditorData.cpp - echo '#include <klocale.h>' > FilterRuleEditorData.cpp -- $(UIC) -tr ${UIC_TR} -i FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleEditorData,g" >> FilterRuleEditorData.cpp || rm -f FilterRuleEditorData.cpp -- echo '#include "FilterRuleEditorData.moc"' >> FilterRuleEditorData.cpp +- $(UIC) -tr ${UIC_TR} -i FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui > FilterRuleEditorData.cpp.temp ; ret=$$?; \ +- sed -e "s,${UIC_TR}( \"\" ),QString::null,g" FilterRuleEditorData.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleEditorData,g" >> FilterRuleEditorData.cpp ;\ +- rm -f FilterRuleEditorData.cpp.temp ;\ +- if test "$$ret" = 0; then echo '#include "FilterRuleEditorData.moc"' >> FilterRuleEditorData.cpp; else rm -f FilterRuleEditorData.cpp ; exit $$ret ; fi - -FilterRuleEditorData.h: $(srcdir)/FilterRuleEditorData.ui - $(UIC) -o FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui @@ -337,12 +411,14 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ -#>+ 3 -toplevel.moc: $(srcdir)/toplevel.h - $(MOC) $(srcdir)/toplevel.h -o toplevel.moc -+#>+ 12 ++#>+ 14 +FilterRuleEditorData.cpp: $(srcdir)/FilterRuleEditorData.ui FilterRuleEditorData.h FilterRuleEditorData.moc + rm -f FilterRuleEditorData.cpp + echo '#include <klocale.h>' > FilterRuleEditorData.cpp -+ $(UIC) -tr ${UIC_TR} -i FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui | sed -e "s,${UIC_TR}( \"\" ),QString::null,g" | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleEditorData,g" >> FilterRuleEditorData.cpp || rm -f FilterRuleEditorData.cpp -+ echo '#include "FilterRuleEditorData.moc"' >> FilterRuleEditorData.cpp ++ $(UIC) -tr ${UIC_TR} -i FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui > FilterRuleEditorData.cpp.temp ; ret=$$?; \ ++ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" FilterRuleEditorData.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleEditorData,g" >> FilterRuleEditorData.cpp ;\ ++ rm -f FilterRuleEditorData.cpp.temp ;\ ++ if test "$$ret" = 0; then echo '#include "FilterRuleEditorData.moc"' >> FilterRuleEditorData.cpp; else rm -f FilterRuleEditorData.cpp ; exit $$ret ; fi -#>+ 3 -kstextview.moc: $(srcdir)/kstextview.h @@ -363,82 +439,37 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ #>+ 4 clean-ui: -@@ -1197,16 +1207,16 @@ force-reedit: - - - #>+ 12 --ksirc_la_meta_unload.cpp: servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc FilterRuleEditorData.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc toplevel.moc NewWindowDialog.moc kstextview.moc ioNotify.moc -- @echo 'creating ksirc_la_meta_unload.cpp' -- @-rm -f ksirc_la_meta_unload.cpp -+libksirc_main_la_meta_unload.cpp: iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc -+ @echo 'creating libksirc_main_la_meta_unload.cpp' -+ @-rm -f libksirc_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_ksirc_la[] = {' > ksirc_la_meta_unload.cpp ;\ -- cat servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc FilterRuleEditorData.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc toplevel.moc NewWindowDialog.moc kstextview.moc ioNotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> ksirc_la_meta_unload.cpp ;\ -- echo '0};' >> ksirc_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> ksirc_la_meta_unload.cpp ;\ -- echo '_UNLOAD(ksirc_la)' >> ksirc_la_meta_unload.cpp ;\ -- else echo > ksirc_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libksirc_main_la[] = {' > libksirc_main_la_meta_unload.cpp ;\ -+ cat iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libksirc_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libksirc_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libksirc_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libksirc_main_la)' >> libksirc_main_la_meta_unload.cpp ;\ -+ else echo > libksirc_main_la_meta_unload.cpp; fi +@@ -1203,16 +1214,16 @@ force-reedit: - #>+ 12 -@@ -1224,14 +1234,14 @@ testview_meta_unload.cpp: kstextview.mo - - #>+ 3 - clean-moc-classes: -- -rm -f ksirc_la_meta_unload.cpp testview_meta_unload.cpp -+ -rm -f libksirc_main_la_meta_unload.cpp testview_meta_unload.cpp - - #>+ 11 --ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp ksirc_la_meta_unload.cpp FilterRuleEditorData.moc ksircprocess.moc servercontroller.moc ioDCC.moc ssfeprompt.moc FilterRuleEditor.moc ahistlineedit.moc chanButtons.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc NewWindowDialog.moc toplevel.moc kstextview.moc ioNotify.moc -+ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksirc_main.cpp iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc - @echo 'creating ksirc_la.all_cpp.cpp ...'; \ - rm -f ksirc_la.all_cpp.files ksirc_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> ksirc_la.all_cpp.final; \ -- for file in toplevel.cpp charSelector.cpp chanButtons.cpp ksirc.cpp alistbox.cpp ahistlineedit.cpp iocontroller.cpp NewWindowDialog.cpp messageReceiver.cpp ioBroadcast.cpp ksircprocess.cpp servercontroller.cpp FilterRuleEditor.cpp ioDiscard.cpp ioDCC.cpp dccDialog.cpp dccDialogData.cpp ioLAG.cpp ioNotify.cpp ssfeprompt.cpp ssfepromptdata.cpp usercontrolmenu.cpp baserules.cpp chanparser.cpp objFinder.cpp displayMgrSDI.cpp displayMgrMDI.cpp mditoplevel.cpp ksopts.cpp topic.cpp ksview.cpp logfile.cpp kstextview.cpp colorpicker.cpp FilterRuleEditorData.cpp ksirc_la_meta_unload.cpp ; do \ -+ for file in ksirc_main.cpp ; do \ - echo "#include \"$$file\"" >> ksirc_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksirc_la.all_cpp.final; \ - done; \ -@@ -1239,11 +1249,23 @@ ksirc_la.all_cpp.cpp: $(srcdir)/Makefile - rm -f ksirc_la.all_cpp.final ksirc_la.all_cpp.files - #>+ 11 --ksirc.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libksirc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp libksirc_main_la_meta_unload.cpp FilterRuleEditorData.moc +-ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc FilterRuleEditorData.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc toplevel.moc NewWindowDialog.moc kstextview.moc ioNotify.moc +- @echo 'creating ksirc_la.all_cpp.cpp ...'; \ +- rm -f ksirc_la.all_cpp.files ksirc_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> ksirc_la.all_cpp.final; \ ++libksirc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc + @echo 'creating libksirc_main_la.all_cpp.cpp ...'; \ + rm -f libksirc_main_la.all_cpp.files libksirc_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libksirc_main_la.all_cpp.final; \ -+ for file in toplevel.cpp charSelector.cpp chanButtons.cpp ksirc.cpp alistbox.cpp ahistlineedit.cpp iocontroller.cpp NewWindowDialog.cpp messageReceiver.cpp ioBroadcast.cpp ksircprocess.cpp servercontroller.cpp FilterRuleEditor.cpp ioDiscard.cpp ioDCC.cpp dccDialog.cpp dccDialogData.cpp ioLAG.cpp ioNotify.cpp ssfeprompt.cpp ssfepromptdata.cpp usercontrolmenu.cpp baserules.cpp chanparser.cpp objFinder.cpp displayMgrSDI.cpp displayMgrMDI.cpp mditoplevel.cpp ksopts.cpp topic.cpp ksview.cpp logfile.cpp kstextview.cpp colorpicker.cpp FilterRuleEditorData.cpp libksirc_main_la_meta_unload.cpp ; do \ + for file in toplevel.cpp charSelector.cpp chanButtons.cpp ksirc.cpp alistbox.cpp ahistlineedit.cpp iocontroller.cpp NewWindowDialog.cpp messageReceiver.cpp ioBroadcast.cpp ksircprocess.cpp servercontroller.cpp FilterRuleEditor.cpp ioDiscard.cpp ioDCC.cpp dccDialog.cpp dccDialogData.cpp ioLAG.cpp ioNotify.cpp ssfeprompt.cpp ssfepromptdata.cpp usercontrolmenu.cpp baserules.cpp chanparser.cpp objFinder.cpp displayMgrSDI.cpp displayMgrMDI.cpp mditoplevel.cpp ksopts.cpp topic.cpp ksview.cpp logfile.cpp kstextview.cpp colorpicker.cpp FilterRuleEditorData.cpp ; do \ +- echo "#include \"$$file\"" >> ksirc_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksirc_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libksirc_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libksirc_main_la.all_cpp.final; \ -+ done; \ -+ cat libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files > libksirc_main_la.all_cpp.cpp; \ -+ rm -f libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files -+ -+#>+ 11 -+ksirc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksirc_main.cpp - @echo 'creating ksirc.all_cpp.cpp ...'; \ - rm -f ksirc.all_cpp.files ksirc.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> ksirc.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in ksirc_main.cpp ; do \ - echo "#include \"$$file\"" >> ksirc.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksirc.all_cpp.final; \ done; \ -@@ -1264,20 +1286,20 @@ testview.all_cpp.cpp: $(srcdir)/Makefile +- cat ksirc_la.all_cpp.final ksirc_la.all_cpp.files > ksirc_la.all_cpp.cpp; \ +- rm -f ksirc_la.all_cpp.final ksirc_la.all_cpp.files ++ cat libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files > libksirc_main_la.all_cpp.cpp; \ ++ rm -f libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files + + #>+ 11 + testview.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kstextview.cpp $(srcdir)/kstextviewtest.cpp kstextview.moc +@@ -1228,20 +1239,20 @@ testview.all_cpp.cpp: $(srcdir)/Makefile #>+ 3 clean-final: -- -rm -f ksirc_la.all_cpp.cpp ksirc.all_cpp.cpp testview.all_cpp.cpp -+ -rm -f ksirc_la.all_cpp.cpp libksirc_main_la.all_cpp.cpp ksirc.all_cpp.cpp testview.all_cpp.cpp +- -rm -f ksirc_la.all_cpp.cpp testview.all_cpp.cpp ++ -rm -f libksirc_main_la.all_cpp.cpp testview.all_cpp.cpp #>+ 2 final: @@ -458,66 +489,157 @@ $NetBSD: patch-af,v 1.2 2002/10/14 09:13:52 skrll Exp $ + $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_nofinal_OBJECTS)" testview_OBJECTS="$(testview_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1287,36 +1309,36 @@ kde-rpo-clean: + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -1251,84 +1262,84 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 34 + #>+ 82 +-$(srcdir)/ioDCC.cpp: FilterRuleEditorData.h -$(srcdir)/usercontrolmenu.cpp: FilterRuleEditorData.h --$(srcdir)/ioDCC.cpp: ioDCC.moc FilterRuleEditorData.h --$(srcdir)/NewWindowDialog.cpp: NewWindowDialog.moc FilterRuleEditorData.h --$(srcdir)/ahistlineedit.cpp: ahistlineedit.moc FilterRuleEditorData.h --$(srcdir)/ksview.cpp: ksview.moc FilterRuleEditorData.h --$(srcdir)/dccDialog.cpp: dccDialog.moc FilterRuleEditorData.h --$(srcdir)/charSelector.cpp: charSelector.moc FilterRuleEditorData.h --$(srcdir)/iocontroller.cpp: iocontroller.moc FilterRuleEditorData.h --$(srcdir)/toplevel.cpp: toplevel.moc FilterRuleEditorData.h --$(srcdir)/colorpicker.cpp: colorpicker.moc FilterRuleEditorData.h - $(srcdir)/objFinder.cpp: objFinder.moc FilterRuleEditorData.h +-dccDialog.o: dccDialog.moc ++ioLAG.lo: ioLAG.moc ++ssfeprompt.lo: ssfeprompt.moc ++ssfepromptdata.lo: ssfepromptdata.moc ++$(srcdir)/chanparser.cpp: FilterRuleEditorData.h ++toplevel.lo: toplevel.moc ++displayMgrMDI.lo: displayMgrMDI.moc ++ioLAG.o: ioLAG.moc ++ioNotify.o: ioNotify.moc ++$(srcdir)/kstextview.cpp: FilterRuleEditorData.h ++mditoplevel.o: mditoplevel.moc + NewWindowDialog.o: NewWindowDialog.moc +-charSelector.lo: charSelector.moc +-$(srcdir)/ksview.cpp: FilterRuleEditorData.h +-ahistlineedit.o: ahistlineedit.moc +-servercontroller.o: servercontroller.moc +-$(srcdir)/iocontroller.cpp: FilterRuleEditorData.h +-topic.o: topic.moc + $(srcdir)/toplevel.cpp: FilterRuleEditorData.h +-$(srcdir)/colorpicker.cpp: FilterRuleEditorData.h +-$(srcdir)/objFinder.cpp: FilterRuleEditorData.h +-charSelector.o: charSelector.moc -$(srcdir)/logfile.cpp: FilterRuleEditorData.h --$(srcdir)/dccDialogData.cpp: dccDialogData.moc FilterRuleEditorData.h +-$(srcdir)/dccDialogData.cpp: FilterRuleEditorData.h -$(srcdir)/baserules.cpp: FilterRuleEditorData.h -+$(srcdir)/chanparser.cpp: FilterRuleEditorData.h -+$(srcdir)/colorpicker.cpp: colorpicker.moc FilterRuleEditorData.h - $(srcdir)/chanButtons.cpp: chanButtons.moc FilterRuleEditorData.h +-$(srcdir)/chanButtons.cpp: FilterRuleEditorData.h +-FilterRuleEditor.lo: FilterRuleEditor.moc +-ssfeprompt.o: ssfeprompt.moc +-kstextview.o: kstextview.moc +-ksircprocess.lo: ksircprocess.moc +-ksview.lo: ksview.moc -$(srcdir)/ksopts.cpp: FilterRuleEditorData.h ++$(srcdir)/NewWindowDialog.cpp: FilterRuleEditorData.h + kstextview.lo: kstextview.moc +-$(srcdir)/ssfepromptdata.cpp: FilterRuleEditorData.h +-$(srcdir)/ioBroadcast.cpp: FilterRuleEditorData.h +-$(srcdir)/kstextview.cpp: FilterRuleEditorData.h +-displayMgrMDI.lo: displayMgrMDI.moc ++ahistlineedit.o: ahistlineedit.moc ++$(srcdir)/ioDiscard.cpp: FilterRuleEditorData.h ++$(srcdir)/displayMgrSDI.cpp: FilterRuleEditorData.h ++mditoplevel.lo: mditoplevel.moc + ioNotify.lo: ioNotify.moc +-topic.lo: topic.moc +-$(srcdir)/ioLAG.cpp: FilterRuleEditorData.h ++iocontroller.o: iocontroller.moc ++$(srcdir)/FilterRuleEditor.cpp: FilterRuleEditorData.h ++$(srcdir)/charSelector.cpp: FilterRuleEditorData.h ++ksview.o: ksview.moc ++ssfepromptdata.o: ssfepromptdata.moc ++ksview.lo: ksview.moc ++charSelector.o: charSelector.moc ++kstextview.o: kstextview.moc + toplevel.o: toplevel.moc +-$(srcdir)/messageReceiver.cpp: FilterRuleEditorData.h +-$(srcdir)/ioNotify.cpp: FilterRuleEditorData.h +-alistbox.o: alistbox.moc +-$(srcdir)/alistbox.cpp: FilterRuleEditorData.h +-iocontroller.lo: iocontroller.moc +-$(srcdir)/ksircprocess.cpp: FilterRuleEditorData.h +-dccDialogData.o: dccDialogData.moc +-servercontroller.lo: servercontroller.moc +-mditoplevel.o: mditoplevel.moc +-ioDCC.o: ioDCC.moc +-$(srcdir)/NewWindowDialog.cpp: FilterRuleEditorData.h +-toplevel.lo: toplevel.moc +-ssfeprompt.lo: ssfeprompt.moc + $(srcdir)/ahistlineedit.cpp: FilterRuleEditorData.h +-ioLAG.o: ioLAG.moc +-$(srcdir)/dccDialog.cpp: FilterRuleEditorData.h +-objFinder.o: objFinder.moc +-$(srcdir)/charSelector.cpp: FilterRuleEditorData.h +-chanButtons.lo: chanButtons.moc +-colorpicker.o: colorpicker.moc +-iocontroller.o: iocontroller.moc +-ahistlineedit.lo: ahistlineedit.moc +-ioLAG.lo: ioLAG.moc +-ioDCC.lo: ioDCC.moc +-ksircprocess.o: ksircprocess.moc ++NewWindowDialog.lo: NewWindowDialog.moc ++alistbox.o: alistbox.moc ++$(srcdir)/ksview.cpp: FilterRuleEditorData.h + FilterRuleEditor.o: FilterRuleEditor.moc ++$(srcdir)/ssfepromptdata.cpp: FilterRuleEditorData.h ++$(srcdir)/displayMgrMDI.cpp: FilterRuleEditorData.h ++$(srcdir)/ioNotify.cpp: FilterRuleEditorData.h ++objFinder.o: objFinder.moc ++$(srcdir)/objFinder.cpp: FilterRuleEditorData.h ++dccDialogData.lo: dccDialogData.moc ++alistbox.lo: alistbox.moc + colorpicker.lo: colorpicker.moc -$(srcdir)/ioDiscard.cpp: FilterRuleEditorData.h --$(srcdir)/ssfepromptdata.cpp: ssfepromptdata.moc FilterRuleEditorData.h -+$(srcdir)/topic.cpp: topic.moc FilterRuleEditorData.h -+$(srcdir)/dccDialog.cpp: dccDialog.moc FilterRuleEditorData.h +-ssfepromptdata.o: ssfepromptdata.moc +-$(srcdir)/displayMgrSDI.cpp: FilterRuleEditorData.h ++ssfeprompt.o: ssfeprompt.moc ++FilterRuleEditor.lo: FilterRuleEditor.moc ++dccDialog.lo: dccDialog.moc ++$(srcdir)/colorpicker.cpp: FilterRuleEditorData.h ++ioDCC.lo: ioDCC.moc ++ahistlineedit.lo: ahistlineedit.moc ++$(srcdir)/chanButtons.cpp: FilterRuleEditorData.h ++$(srcdir)/topic.cpp: FilterRuleEditorData.h ++$(srcdir)/dccDialog.cpp: FilterRuleEditorData.h +$(srcdir)/logfile.cpp: FilterRuleEditorData.h -+$(srcdir)/kstextview.cpp: kstextview.moc FilterRuleEditorData.h - $(srcdir)/ioBroadcast.cpp: FilterRuleEditorData.h -+$(srcdir)/toplevel.cpp: toplevel.moc FilterRuleEditorData.h -+$(srcdir)/NewWindowDialog.cpp: NewWindowDialog.moc FilterRuleEditorData.h -+$(srcdir)/ioDiscard.cpp: FilterRuleEditorData.h -+$(srcdir)/ksircprocess.cpp: ksircprocess.moc FilterRuleEditorData.h - $(srcdir)/displayMgrSDI.cpp: FilterRuleEditorData.h ++ksircprocess.lo: ksircprocess.moc ++$(srcdir)/ioBroadcast.cpp: FilterRuleEditorData.h ++charSelector.lo: charSelector.moc ++servercontroller.o: servercontroller.moc + objFinder.lo: objFinder.moc ++ioDCC.o: ioDCC.moc ++servercontroller.lo: servercontroller.moc ++dccDialog.o: dccDialog.moc ++topic.o: topic.moc ++$(srcdir)/ksircprocess.cpp: FilterRuleEditorData.h ++dccDialogData.o: dccDialogData.moc + displayMgrMDI.o: displayMgrMDI.moc +-dccDialogData.lo: dccDialogData.moc +-ioNotify.o: ioNotify.moc +-ssfepromptdata.lo: ssfepromptdata.moc +$(srcdir)/messageReceiver.cpp: FilterRuleEditorData.h -+$(srcdir)/charSelector.cpp: charSelector.moc FilterRuleEditorData.h -+$(srcdir)/FilterRuleEditor.cpp: FilterRuleEditor.moc FilterRuleEditorData.h ++chanButtons.o: chanButtons.moc ++topic.lo: topic.moc +$(srcdir)/baserules.cpp: FilterRuleEditorData.h ++iocontroller.lo: iocontroller.moc +$(srcdir)/usercontrolmenu.cpp: FilterRuleEditorData.h -+$(srcdir)/alistbox.cpp: alistbox.moc FilterRuleEditorData.h - $(srcdir)/ssfeprompt.cpp: ssfeprompt.moc FilterRuleEditorData.h -+$(srcdir)/ioDCC.cpp: ioDCC.moc FilterRuleEditorData.h -+$(srcdir)/ioLAG.cpp: ioLAG.moc FilterRuleEditorData.h -+$(srcdir)/ahistlineedit.cpp: ahistlineedit.moc FilterRuleEditorData.h - $(srcdir)/mditoplevel.cpp: mditoplevel.moc FilterRuleEditorData.h --$(srcdir)/topic.cpp: topic.moc FilterRuleEditorData.h --$(srcdir)/kstextview.cpp: kstextview.moc FilterRuleEditorData.h -+$(srcdir)/dccDialogData.cpp: dccDialogData.moc FilterRuleEditorData.h -+$(srcdir)/ksview.cpp: ksview.moc FilterRuleEditorData.h ++$(srcdir)/alistbox.cpp: FilterRuleEditorData.h ++$(srcdir)/ioDCC.cpp: FilterRuleEditorData.h ++ksircprocess.o: ksircprocess.moc + $(srcdir)/ssfeprompt.cpp: FilterRuleEditorData.h ++$(srcdir)/ioLAG.cpp: FilterRuleEditorData.h + $(srcdir)/mditoplevel.cpp: FilterRuleEditorData.h +-$(srcdir)/topic.cpp: FilterRuleEditorData.h ++$(srcdir)/dccDialogData.cpp: FilterRuleEditorData.h +$(srcdir)/ksopts.cpp: FilterRuleEditorData.h - $(srcdir)/servercontroller.cpp: servercontroller.moc FilterRuleEditorData.h --$(srcdir)/ioLAG.cpp: ioLAG.moc FilterRuleEditorData.h --$(srcdir)/messageReceiver.cpp: FilterRuleEditorData.h --$(srcdir)/ioNotify.cpp: ioNotify.moc FilterRuleEditorData.h --$(srcdir)/alistbox.cpp: alistbox.moc FilterRuleEditorData.h --$(srcdir)/ksircprocess.cpp: ksircprocess.moc FilterRuleEditorData.h -+$(srcdir)/ssfepromptdata.cpp: ssfepromptdata.moc FilterRuleEditorData.h - $(srcdir)/displayMgrMDI.cpp: displayMgrMDI.moc FilterRuleEditorData.h + $(srcdir)/servercontroller.cpp: FilterRuleEditorData.h +-NewWindowDialog.lo: NewWindowDialog.moc +-$(srcdir)/displayMgrMDI.cpp: FilterRuleEditorData.h +-mditoplevel.lo: mditoplevel.moc -$(srcdir)/chanparser.cpp: FilterRuleEditorData.h --$(srcdir)/FilterRuleEditor.cpp: FilterRuleEditor.moc FilterRuleEditorData.h -+$(srcdir)/iocontroller.cpp: iocontroller.moc FilterRuleEditorData.h -+$(srcdir)/ioNotify.cpp: ioNotify.moc FilterRuleEditorData.h +-$(srcdir)/FilterRuleEditor.cpp: FilterRuleEditorData.h +-alistbox.lo: alistbox.moc +-ksview.o: ksview.moc +-dccDialog.lo: dccDialog.moc +-chanButtons.o: chanButtons.moc ++colorpicker.o: colorpicker.moc ++$(srcdir)/iocontroller.cpp: FilterRuleEditorData.h ++chanButtons.lo: chanButtons.moc diff --git a/net/kdenetwork3/patches/patch-aj b/net/kdenetwork3/patches/patch-aj index 8af6eec94f4..1b63218732f 100644 --- a/net/kdenetwork3/patches/patch-aj +++ b/net/kdenetwork3/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ +$NetBSD: patch-aj,v 1.3 2003/01/02 09:12:31 skrll Exp $ ---- kxmlrpc/Makefile.in.orig Sat Oct 12 13:19:15 2002 +--- kxmlrpc/Makefile.in.orig Sat Dec 28 08:53:51 2002 +++ kxmlrpc/Makefile.in -@@ -241,17 +241,22 @@ SUBDIRS = gui +@@ -233,17 +233,22 @@ SUBDIRS = gui INCLUDES = $(all_includes) bin_PROGRAMS = kxmlrpcd @@ -21,7 +21,7 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ +libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA) +libkxmlrpcd_main_la_LDFLAGS = $(all_libraries) +libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \ - kxmlrpcdaemon.cpp kxmlrpcutil.cpp + kxmlrpcdaemon.cpp kxmlrpcutil.cpp +#>- libkxmlrpcd_main_la_METASOURCES = AUTO + @@ -31,7 +31,7 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ #>- kxmlrpcd_la_METASOURCES = AUTO libkcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) -@@ -268,30 +273,35 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -260,29 +265,34 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -41,11 +41,10 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ +kxmlrpcd_la_DEPENDENCIES = libkxmlrpcd_main.la +am_kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo #>- kxmlrpcd_la_OBJECTS = $(am_kxmlrpcd_la_OBJECTS) --#>+ 6 +-#>+ 5 -kxmlrpcd_la_final_OBJECTS = kxmlrpcd_la.all_cpp.lo -kxmlrpcd_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ -- kxmlrpcdaemon.lo kxmlrpcutil.lo \ -- kxmlrpcd_la_meta_unload.lo +- kxmlrpcdaemon.lo kxmlrpcutil.lo -@KDE_USE_FINAL_FALSE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_final_OBJECTS) +#>+ 1 @@ -59,11 +58,10 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ +am_libkxmlrpcd_main_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ + kxmlrpcdaemon.lo kxmlrpcutil.lo +#>- libkxmlrpcd_main_la_OBJECTS = $(am_libkxmlrpcd_main_la_OBJECTS) -+#>+ 6 ++#>+ 5 +libkxmlrpcd_main_la_final_OBJECTS = libkxmlrpcd_main_la.all_cpp.lo +libkxmlrpcd_main_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ -+ kxmlrpcdaemon.lo kxmlrpcutil.lo \ -+ libkxmlrpcd_main_la_meta_unload.lo ++ kxmlrpcdaemon.lo kxmlrpcutil.lo +@KDE_USE_FINAL_FALSE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_final_OBJECTS) bin_PROGRAMS = kxmlrpcd$(EXEEXT) @@ -80,17 +78,36 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -300,7 +310,8 @@ LDFLAGS = @LDFLAGS@ +@@ -290,18 +300,24 @@ CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kxmlrpcd_main.Plo \ -+ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcd_main.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcdaemon.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcinit.Plo \ - @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcparser.Plo \ -@@ -326,7 +337,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kxmlrpcdaemon.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kxmlrpcd_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcd_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcdaemon.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcinit.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcparser.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcserver.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcutil.Plo +-#>+ 11 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kxmlrpcd_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kxmlrpcdaemon.Plo \ ++#>+ 15 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkxmlrpcd_main_la.all_cpp.P $(DEPDIR)/kxmlrpcd_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcd_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcdaemon.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcinit.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcparser.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcserver.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcutil.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kxmlrpcdaemon.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kxmlrpcd_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcd_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcdaemon.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcinit.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcparser.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcserver.Plo \ +@@ -327,7 +343,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) \ @@ -99,7 +116,7 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ DATA = $(service_DATA) HEADERS = $(noinst_HEADERS) -@@ -338,7 +349,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -339,7 +355,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -108,27 +125,27 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -418,6 +429,8 @@ kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kx +@@ -412,6 +428,8 @@ kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kx @KDE_USE_CLOSURE_TRUE@libkcm_xmlrpcd.la: libkcm_xmlrpcd.la.closure $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_DEPENDENCIES) @KDE_USE_CLOSURE_FALSE@libkcm_xmlrpcd.la: $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(libkcm_xmlrpcd_la_LDFLAGS) $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_LIBADD) $(LIBS) +libkxmlrpcd_main.la: $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkxmlrpcd_main_la_LDFLAGS) $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -457,7 +470,8 @@ mostlyclean-compile: + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -446,7 +464,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcinit.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcparser.Plo@am__quote@ -@@ -611,7 +625,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcd_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcd_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcinit.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcparser.Plo@am__quote@ +@@ -587,7 +606,7 @@ distclean-tags: + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kxmlrpcd.desktop LICENSE @@ -136,7 +153,7 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -784,8 +798,12 @@ libkcm_xmlrpcd.la.closure: $(libkcm_xmlr +@@ -754,8 +773,12 @@ libkcm_xmlrpcd.la.closure: $(libkcm_xmlr #>+ 3 @@ -150,79 +167,33 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ #>+ 3 clean-closures: -@@ -802,28 +820,28 @@ force-reedit: - - - #>+ 12 --kxmlrpcd_la_meta_unload.cpp: kxmlrpcserver.moc -- @echo 'creating kxmlrpcd_la_meta_unload.cpp' -- @-rm -f kxmlrpcd_la_meta_unload.cpp -+libkxmlrpcd_main_la_meta_unload.cpp: kxmlrpcserver.moc -+ @echo 'creating libkxmlrpcd_main_la_meta_unload.cpp' -+ @-rm -f libkxmlrpcd_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kxmlrpcd_la[] = {' > kxmlrpcd_la_meta_unload.cpp ;\ -- cat kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxmlrpcd_la_meta_unload.cpp ;\ -- echo '0};' >> kxmlrpcd_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kxmlrpcd_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kxmlrpcd_la)' >> kxmlrpcd_la_meta_unload.cpp ;\ -- else echo > kxmlrpcd_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkxmlrpcd_main_la[] = {' > libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ cat kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkxmlrpcd_main_la)' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ -+ else echo > libkxmlrpcd_main_la_meta_unload.cpp; fi +@@ -772,33 +795,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f kxmlrpcd_la_meta_unload.cpp -+ -rm -f libkxmlrpcd_main_la_meta_unload.cpp - #>+ 11 --kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp kxmlrpcd_la_meta_unload.cpp kxmlrpcserver.moc -+kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcd_main.cpp kxmlrpcserver.moc - @echo 'creating kxmlrpcd_la.all_cpp.cpp ...'; \ - rm -f kxmlrpcd_la.all_cpp.files kxmlrpcd_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxmlrpcd_la.all_cpp.final; \ -- for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp kxmlrpcd_la_meta_unload.cpp ; do \ -+ for file in kxmlrpcd_main.cpp ; do \ - echo "#include \"$$file\"" >> kxmlrpcd_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd_la.all_cpp.final; \ - done; \ -@@ -843,11 +861,23 @@ libkcm_xmlrpcd_la.all_cpp.cpp: $(srcdir) - rm -f libkcm_xmlrpcd_la.all_cpp.final libkcm_xmlrpcd_la.all_cpp.files - - #>+ 11 --kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkxmlrpcd_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp libkxmlrpcd_main_la_meta_unload.cpp kxmlrpcserver.moc +-kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp kxmlrpcserver.moc +- @echo 'creating kxmlrpcd_la.all_cpp.cpp ...'; \ +- rm -f kxmlrpcd_la.all_cpp.files kxmlrpcd_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kxmlrpcd_la.all_cpp.final; \ ++libkxmlrpcd_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp kxmlrpcserver.moc + @echo 'creating libkxmlrpcd_main_la.all_cpp.cpp ...'; \ + rm -f libkxmlrpcd_main_la.all_cpp.files libkxmlrpcd_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkxmlrpcd_main_la.all_cpp.final; \ -+ for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp libkxmlrpcd_main_la_meta_unload.cpp ; do \ + for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp ; do \ +- echo "#include \"$$file\"" >> kxmlrpcd_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkxmlrpcd_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxmlrpcd_main_la.all_cpp.final; \ -+ done; \ -+ cat libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files > libkxmlrpcd_main_la.all_cpp.cpp; \ -+ rm -f libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files -+ -+#>+ 11 -+kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcd_main.cpp - @echo 'creating kxmlrpcd.all_cpp.cpp ...'; \ - rm -f kxmlrpcd.all_cpp.files kxmlrpcd.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxmlrpcd.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kxmlrpcd_main.cpp ; do \ - echo "#include \"$$file\"" >> kxmlrpcd.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd.all_cpp.final; \ done; \ -@@ -856,20 +886,20 @@ kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile +- cat kxmlrpcd_la.all_cpp.final kxmlrpcd_la.all_cpp.files > kxmlrpcd_la.all_cpp.cpp; \ +- rm -f kxmlrpcd_la.all_cpp.final kxmlrpcd_la.all_cpp.files ++ cat libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files > libkxmlrpcd_main_la.all_cpp.cpp; \ ++ rm -f libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kxmlrpcd_la.all_cpp.cpp libkcm_xmlrpcd_la.all_cpp.cpp kxmlrpcd.all_cpp.cpp -+ -rm -f kxmlrpcd_la.all_cpp.cpp libkcm_xmlrpcd_la.all_cpp.cpp libkxmlrpcd_main_la.all_cpp.cpp kxmlrpcd.all_cpp.cpp +- -rm -f kxmlrpcd_la.all_cpp.cpp ++ -rm -f libkxmlrpcd_main_la.all_cpp.cpp #>+ 2 final: @@ -242,10 +213,12 @@ $NetBSD: patch-aj,v 1.2 2002/10/14 09:13:52 skrll Exp $ + $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -879,4 +909,4 @@ kde-rpo-clean: + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -808,5 +831,5 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 2 --$(srcdir)/kxmlrpcserver.cpp: kxmlrpcserver.moc -+$(srcdir)/kxmlrpcserver.cpp: kxmlrpcserver.moc kxmlrpcserver.moc + #>+ 3 +-kxmlrpcserver.lo: kxmlrpcserver.moc +-kxmlrpcserver.o: kxmlrpcserver.moc ++kxmlrpcserver.o: kxmlrpcserver.moc kxmlrpcserver.moc ++kxmlrpcserver.lo: kxmlrpcserver.moc kxmlrpcserver.moc diff --git a/net/kdenetwork3/patches/patch-an b/net/kdenetwork3/patches/patch-an deleted file mode 100644 index eef19ef5748..00000000000 --- a/net/kdenetwork3/patches/patch-an +++ /dev/null @@ -1,95 +0,0 @@ -$NetBSD: patch-an,v 1.1 2002/12/04 21:20:06 skrll Exp $ - ---- lanbrowsing/kio_lan/kio_lan.cpp.orig Thu Jan 3 20:34:12 2002 -+++ lanbrowsing/kio_lan/kio_lan.cpp -@@ -176,13 +176,14 @@ int LANProtocol::lanReadDataFromServer() - - char *currentBuf=receiveBuffer; - int bytesLeft=receivedBytes; -- int tmpIP; - //this should be large enough for a name -- char tmpName[1024]; -+ char tmpName[4*1024]; - //this should be large enough for the hostname -- char tmpHostname[512]; -+ char tmpHostname[4*1024]; - while (bytesLeft>0) - { -+ int tmpIP=2; -+ tmpName[0]='\0'; - if ((memchr(currentBuf,0,bytesLeft)==0) || (memchr(currentBuf,int('\n'),bytesLeft)==0)) - { - delete [] receiveBuffer; -@@ -190,17 +191,19 @@ int LANProtocol::lanReadDataFromServer() - return 0; - }; - kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: processing "<<currentBuf; -- sscanf(currentBuf,"%u %s\n",&tmpIP,tmpName); - //since we check for 0 and \n with memchr() we can be sure - //at this point that tmpBuf is correctly terminated - int length=strlen(currentBuf)+1; -+ if (length<(4*1024)) -+ sscanf(currentBuf,"%u %s\n",&tmpIP,tmpName); -+ - bytesLeft-=length; - currentBuf+=length; -- if ((bytesLeft==0) && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) ||(tmpIP==1))) -+ if ((bytesLeft==0) && ((tmpIP==0) ||(tmpIP==1)) && (strstr(tmpName,"succeeded")!=0)) - { - kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: succeeded"<<endl; - } -- else -+ else if (tmpIP!=2) - { - kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl; - UDSAtom atom; -@@ -344,13 +347,14 @@ int LANProtocol::rlanReadDataFromServer( - - char *currentBuf=receiveBuffer; - int bytesLeft=receivedBytes; -- int tmpIP; - //this should be large enough for a name -- char tmpName[1024]; -+ char tmpName[4*1024]; - //this should be large enough for the hostname -- char tmpHostname[512]; -+ char tmpHostname[4*1024]; - while (bytesLeft>0) - { -+ int tmpIP=2; -+ tmpName[0]='\0'; - if ((memchr(currentBuf,0,bytesLeft)==0) || (memchr(currentBuf,int('\n'),bytesLeft)==0)) - { - delete [] receiveBuffer; -@@ -358,17 +362,19 @@ int LANProtocol::rlanReadDataFromServer( - return 0; - }; - kdDebug(7101)<<"RLANProtocol::readDataFromServer: processing "<<currentBuf; -- sscanf(currentBuf,"%u %s\n",&tmpIP,tmpName); - //since we check for 0 and \n with memchr() we can be sure - //at this point that tmpBuf is correctly terminated - int length=strlen(currentBuf)+1; -+ if (length<(4*1024)) -+ sscanf(currentBuf,"%u %s\n",&tmpIP,tmpName); -+ - bytesLeft-=length; - currentBuf+=length; -- if ((bytesLeft==0) && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) ||(tmpIP==1))) -+ if ((bytesLeft==0) && ((tmpIP==0) ||(tmpIP==1)) && (strstr(tmpName,"succeeded")!=0) ) - { - kdDebug(7101)<<"RLANProtocol::readDataFromServer: succeeded"<<endl; - } -- else -+ else if (tmpIP!=2) - { - kdDebug(7101)<<"RLANProtocol::readDataFromServer: listing host: "<<tmpName<<" with ip: "<<tmpIP<<endl; - UDSAtom atom; -@@ -436,7 +442,7 @@ int LANProtocol::checkHost(const QString - delete hostInfo; - return 0; - } -- memcpy(&ip, hp->h_addr, hp->h_length); -+ memcpy(&ip, hp->h_addr, sizeof(ip)); - - for (int i=0; i<KIOLAN_MAX; i++) - { diff --git a/net/kdenetwork3/patches/patch-ao b/net/kdenetwork3/patches/patch-ao deleted file mode 100644 index de99b7547d6..00000000000 --- a/net/kdenetwork3/patches/patch-ao +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2002/12/04 21:20:07 skrll Exp $ - ---- lanbrowsing/lisa/ChangeLog.orig Wed Jan 3 20:38:01 2001 -+++ lanbrowsing/lisa/ChangeLog -@@ -1,2 +1,5 @@ -+0.1.3 -+-security fixes: fixed LOGNAME vulnerabilty and another possible buffer overflow -+ - Version 0.1 - -initial version diff --git a/net/kdenetwork3/patches/patch-ap b/net/kdenetwork3/patches/patch-ap deleted file mode 100644 index a2386549840..00000000000 --- a/net/kdenetwork3/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2002/12/04 21:20:07 skrll Exp $ - ---- lanbrowsing/lisa/lisadefines.h.orig Fri Oct 26 12:05:47 2001 -+++ lanbrowsing/lisa/lisadefines.h -@@ -2,7 +2,7 @@ - #define LISADEFINES_H - - --#define MYVERSION "0.1.1" -+#define MYVERSION "0.2.2" - #define MY_ID 7741 - #define MYPORT 7741 - #define MAX_SPECS 32 diff --git a/net/kdenetwork3/patches/patch-aq b/net/kdenetwork3/patches/patch-aq deleted file mode 100644 index a731548d845..00000000000 --- a/net/kdenetwork3/patches/patch-aq +++ /dev/null @@ -1,121 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2002/12/04 21:20:07 skrll Exp $ - ---- lanbrowsing/lisa/netmanager.cpp.orig Sat Feb 2 22:27:59 2002 -+++ lanbrowsing/lisa/netmanager.cpp -@@ -27,6 +27,7 @@ - #include <strings.h> - #include <errno.h> - #include <string.h> -+#include <pwd.h> - - #ifndef AF_LOCAL - #define AF_LOCAL AF_UNIX -@@ -70,7 +71,7 @@ NetManager::NetManager(int& rawSocketFD, - - NetManager::~NetManager() - { -- mgetDebug()<<"netknife destructor ..."<<std::endl; -+ mgetDebug()<<"NetManager destructor ..."<<std::endl; - if (m_receiveBuffer!=0) delete [] m_receiveBuffer; - ::close(m_listenFD); - ::close(m_bcFD); -@@ -131,14 +132,28 @@ int NetManager::prepare() - m_listenFD=::socket(AF_LOCAL, SOCK_STREAM, 0); - //m_listenFD=::socket(AF_LOCAL, SOCK_STREAM, IPPROTO_TCP); - MyString socketName("/tmp/resLisa-"); -- socketName+=getenv("LOGNAME"); -+ struct passwd *user = getpwuid( getuid() ); -+ if ( user ) -+ socketName+=user->pw_name; -+ else -+ //should never happen -+ socketName+="???"; - ::unlink(socketName.data()); - sockaddr_un serverAddr; --// bzero((char*)&serverAddr, sizeof(serverAddr)); -+ if (socketName.length() >= sizeof(serverAddr.sun_path)) -+ { -+ std::cout<<"NetManager::prepare: your user name \""<<user->pw_name<<"\" is too long, exiting."<<std::endl; -+ return 0; -+ } - memset((void*)&serverAddr, 0, sizeof(serverAddr)); -- serverAddr.sun_family = AF_LOCAL; -- strcpy(serverAddr.sun_path,socketName.data()); -- ::bind(m_listenFD,(sockaddr*) &serverAddr,sizeof(serverAddr)); -+ serverAddr.sun_family=AF_LOCAL; -+ strncpy(serverAddr.sun_path,socketName.data(),sizeof(serverAddr.sun_path)); -+ result=::bind(m_listenFD,(sockaddr*) &serverAddr,sizeof(serverAddr)); -+ if (result!=0) -+ { -+ std::cout<<"NetManager::prepare: bind (UNIX socket) failed, errno: "<<errno<<std::endl; -+ return 0; -+ } - } - else - { -@@ -148,7 +163,7 @@ int NetManager::prepare() - { - std::cout<<"NetManager::prepare: socket(TCP) failed, errno: "<<errno<<std::endl; - return 0; -- }; -+ } - - sockaddr_in serverAddress; - // bzero((char*)&serverAddress, sizeof(serverAddress)); -@@ -654,6 +669,10 @@ int NetManager::readDataFromFD(int fd) - m_receivedBytes+=result; - if (m_receiveBuffer!=0) delete [] m_receiveBuffer; - m_receiveBuffer=newBuf; -+ // too much data - abort at 2MB to avoid memory exhaustion -+ if (m_receivedBytes>2*1024*1024) -+ return 0; -+ - return 1; - }; - -@@ -665,14 +684,15 @@ int NetManager::processScanResults() - - char *tmpBuf=m_receiveBuffer; - int bytesLeft=m_receivedBytes; -- int tmpIP; - mgetDebug()<<"m_receivedBytes: "<<m_receivedBytes<<" bytesLeft: "<<bytesLeft<<std::endl; - //this should be large enough for a name - //and the stuff which is inserted into the buffer -- //comes only from ourselves -+ //comes only from ourselves ... or attackers :-( - char tmpName[1024*4]; - while (bytesLeft>0) - { -+ int tmpIP=2; // well, some impossible IP address, 0 and 1 are already used for the last line of output -+ tmpName[0]='\0'; - if ((memchr(tmpBuf,0,bytesLeft)==0) || (memchr(tmpBuf,int('\n'),bytesLeft)==0)) - { - delete newNodes; -@@ -687,14 +707,16 @@ int NetManager::processScanResults() - return 0; - }; - //mgetDebug()<<"NetManager::processScanResults: processing -"<<tmpBuf; -- sscanf(tmpBuf,"%u %s\n",&tmpIP,tmpName); - //since we check for 0 and \n with memchr() we can be sure - //at this point that tmpBuf is correctly terminated - int length=strlen(tmpBuf)+1; -+ if (length<(4*1024)) -+ sscanf(tmpBuf,"%u %s\n",&tmpIP,tmpName); -+ - bytesLeft-=length; - tmpBuf+=length; - mgetDebug()<<"length: "<<length<<" bytesLeft: "<<bytesLeft<<std::endl; -- if ((bytesLeft==0) && (strstr(tmpName,"succeeded")!=0) && ((tmpIP==0) ||(tmpIP==1))) -+ if ((bytesLeft==0) && ((tmpIP==0) ||(tmpIP==1)) && (strstr(tmpName,"succeeded")!=0)) - { - mgetDebug()<<"NetManager::processScanResults: succeeded :-)"<<std::endl; - delete hostList; -@@ -712,7 +734,7 @@ int NetManager::processScanResults() - - return 1; - } -- else -+ else if (tmpIP!=2) - { - //mgetDebug()<<"NetManager::processScanResults: adding host: "<<tmpName<<" with ip: "<<tmpIP<<std::endl; - newNodes->append(Node(tmpName,tmpIP)); diff --git a/net/kdenetwork3/patches/patch-ar b/net/kdenetwork3/patches/patch-ar deleted file mode 100644 index d34a65bc67b..00000000000 --- a/net/kdenetwork3/patches/patch-ar +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2002/12/04 21:20:07 skrll Exp $ - ---- lanbrowsing/lisa/netscanner.cpp.orig Sat Feb 2 22:27:59 2002 -+++ lanbrowsing/lisa/netscanner.cpp -@@ -36,6 +36,10 @@ - #include <netinet/ip.h> - #include <netinet/ip_icmp.h> - -+#ifndef INADDR_NONE -+#define INADDR_NONE -1 -+#endif -+ - #define mgetDebug() getDebug()<<procId - - struct ICMPEchoRequest -@@ -133,7 +137,7 @@ void NetScanner::configure(Config& confi - { - if ((m_strictMode) && (hostsAdded>=STRICTMODEMAXHOSTS)) - break; -- memcpy(&server_addr, hp->h_addr, hp->h_length); -+ memcpy(&server_addr, hp->h_addr, sizeof(server_addr)); - char *ip=inet_ntoa(server_addr); - mgetDebug()<<"NetScanner::configure(): looking up "<<nextName<<" gives -"<<ip<<"-"<<std::endl; - ipRangeStr=ipRangeStr+ip+';'; -@@ -377,6 +381,9 @@ void NetScanner::nmblookupScan(SimpleLis - }; - }; - } while (!done); -+ -+ // Warning: The return value of plcose may be incorrect due to the -+ // SIGCHLD handler that is installed. Ignore it! - pclose(nmblookupFile); - - delete [] tmpBuf; diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index 94d3305c868..17dc1ad30e1 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2002/12/24 18:41:42 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2003/01/02 09:12:32 skrll Exp $ -DISTNAME= kde-3.0.4 -PKGREVISION= 2 +DISTNAME= kde-3.0.5.1 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # empty @@ -10,17 +9,17 @@ MAINTAINER= skrll@netbsd.org HOMEPAGE= http://www.kde.org/ COMMENT= "meta-package" for the KDE integrated X11 desktop -DEPENDS+= kdeartwork-3.0.4nb1:../../misc/kdeartwork3 -DEPENDS+= kdeaddons-3.0.4nb1:../../misc/kdeaddons3 -DEPENDS+= kdeadmin-3.0.4nb1:../../misc/kdeadmin3 -DEPENDS+= kdeedu-3.0.4nb1:../../misc/kdeedu3 -DEPENDS+= kdegames-3.0.4nb1:../../games/kdegames3 -DEPENDS+= kdegraphics-3.0.4nb1:../../graphics/kdegraphics3 -DEPENDS+= kdemultimedia-3.0.4nb1:../../audio/kdemultimedia3 -DEPENDS+= kdenetwork-3.0.4nb3:../../net/kdenetwork3 -DEPENDS+= kdepim-3.0.4nb1:../../misc/kdepim3 -DEPENDS+= kdetoys-3.0.4nb1:../../games/kdetoys3 -DEPENDS+= kdeutils-3.0.4nb1:../../misc/kdeutils3 +DEPENDS+= kdeartwork-3.0.5.1:../../misc/kdeartwork3 +DEPENDS+= kdeaddons-3.0.5.1:../../misc/kdeaddons3 +DEPENDS+= kdeadmin-3.0.5.1:../../misc/kdeadmin3 +DEPENDS+= kdeedu-3.0.5.1:../../misc/kdeedu3 +DEPENDS+= kdegames-3.0.5.1:../../games/kdegames3 +DEPENDS+= kdegraphics-3.0.5.1:../../graphics/kdegraphics3 +DEPENDS+= kdemultimedia-3.0.5.1:../../audio/kdemultimedia3 +DEPENDS+= kdenetwork-3.0.5.1:../../net/kdenetwork3 +DEPENDS+= kdepim-3.0.5.1:../../misc/kdepim3 +DEPENDS+= kdetoys-3.0.5.1:../../games/kdetoys3 +DEPENDS+= kdeutils-3.0.5.1:../../misc/kdeutils3 EXTRACT_ONLY= # empty USE_BUILDLINK2= yes diff --git a/x11/kde3/Makefile.kde3 b/x11/kde3/Makefile.kde3 index a94de06a224..3c85587383c 100644 --- a/x11/kde3/Makefile.kde3 +++ b/x11/kde3/Makefile.kde3 @@ -1,11 +1,12 @@ -# $NetBSD: Makefile.kde3,v 1.5 2002/10/14 09:13:53 skrll Exp $ +# $NetBSD: Makefile.kde3,v 1.6 2003/01/02 09:12:32 skrll Exp $ # # This Makefile fragment is included at the top of package Makefiles for # KDE3-distributed packages (they all share common configure and build # settings). CATEGORIES+= kde -_KDE_VERSION= 3.0.4 +_KDE_VERSION= 3.0.5a +PKGNAME= ${DISTNAME:S/.5a/.5.1/} MASTER_SITES?= ftp://ftp.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \ ftp://ftp.us.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \ ftp://ftp.de.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index f44a9e7775e..e349d29ac83 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2002/12/24 06:10:33 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2003/01/02 09:12:33 skrll Exp $ -DISTNAME= kdebase-3.0.4 -PKGREVISION= 1 +DISTNAME= kdebase-3.0.5a CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 7357b953c56..f0cde17fd81 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,26 +1,26 @@ -$NetBSD: distinfo,v 1.11 2002/10/14 09:13:54 skrll Exp $ +$NetBSD: distinfo,v 1.12 2003/01/02 09:12:33 skrll Exp $ -SHA1 (kdebase-3.0.4.tar.bz2) = e1c56fffaa4678b7fe09143dab767d9da011157d -Size (kdebase-3.0.4.tar.bz2) = 13111203 bytes +SHA1 (kdebase-3.0.5a.tar.bz2) = 8d30538e4d84f805bffcd0eb6583f2fee5ce2da1 +Size (kdebase-3.0.5a.tar.bz2) = 13117676 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes SHA1 (patch-aa) = dfbbe1ab8010e17dacee5008b2f91822d98231f6 SHA1 (patch-ab) = 803bd6397d5cbc08f52cea51977cf62af0bfbd9e -SHA1 (patch-ac) = 0db69fd7d1e66340e1344c44ffe3bcc61f7f5e3f +SHA1 (patch-ac) = 5ea63b6fb0562439742b3bc14418cc1230ef4e7b SHA1 (patch-ad) = ea5e10b969d9b9d9f0db1a75b582d11bbc5efaf1 SHA1 (patch-ae) = 5ff81a4237c17c73e04d36519972b167638b4fdd SHA1 (patch-af) = df818f3fb40ed58bed493552519548930a644af1 SHA1 (patch-ag) = 10618ca30e36b45446f66854a33d4c05b1f355e6 SHA1 (patch-ah) = 3a07da7a6be10cd429c5c3472491084ce6595ec5 -SHA1 (patch-ai) = f00d1142918cfc5bd0572b499fe8bd09681d5327 +SHA1 (patch-ai) = d924b1d75422c9c35cd9f1931ea482b22a8730f9 SHA1 (patch-aj) = 0a1b96448c4372bd8cea70b8c72016148a824cd6 SHA1 (patch-ak) = 1bb9e60a0bd31e0d9d53f883541a906a971fd3ed SHA1 (patch-al) = ee1f5c7500af18e9583ae3d63093f9eef6fe60bc -SHA1 (patch-am) = 048a7ead9f53f7b964cd0fee10516f152f8a6bcc +SHA1 (patch-am) = 45858098fd0231132ac2efdaab37b292fca0a1ef SHA1 (patch-an) = c5d74fc960875ce6171608556a5dcac1d9e8d221 -SHA1 (patch-ao) = 9f396b689c6763498f477036623c1feb2422dfb8 +SHA1 (patch-ao) = 492b70c4420b8ee50277720aa264a10d2046c80b SHA1 (patch-ap) = 0ca89f037da734856e4ba7156b6fcbb68aaeb8b2 SHA1 (patch-aq) = 393e1ce9e2b0488df3a0e5144e740caf0161ec53 SHA1 (patch-ar) = 994458dd8a423d4098abbc5ce7c8ca212aee0a3d @@ -28,105 +28,101 @@ SHA1 (patch-as) = 8577b2ecae105913dd887054e6dd30b13d988b16 SHA1 (patch-at) = 06ae1f4fcd5c66eeca25061a15b02ebe35b9354b SHA1 (patch-au) = 887c7869d43175874df0f55e76538db888c85610 SHA1 (patch-av) = 244206ebd238d2df3e2acdfd5b6819ff46becd5d -SHA1 (patch-aw) = e166eec5902852b7b6cf4fd75b491b3f283a2637 +SHA1 (patch-aw) = f9c604f2524a452d7b233c8de2ce8237469d2a6b SHA1 (patch-ax) = 97242be8ca133f7fac767e9c474736e6aeaaad91 SHA1 (patch-ay) = fb41177da4b3bbefd02c56cd34a9e6049f4c8ce2 SHA1 (patch-az) = f4878ae808e47270fcb1329a34c1424abcbc84a5 -SHA1 (patch-ba) = 682aede0800492698f7262799df43ebe12bb31de +SHA1 (patch-ba) = 0258d4d4a41748df51648878f4e53cd05f67eb7d SHA1 (patch-bb) = dc7f8209712d34f757a9573017142d7c671df10a SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58 SHA1 (patch-bd) = fae5c175149c25f12e37f84f661b3c3e5e8cf16b -SHA1 (patch-be) = fba0c64c71298570d16ec6ed6979af204b97a3cc +SHA1 (patch-be) = b1e13c107d045fe79088feccc665f77c8d255786 SHA1 (patch-bf) = 1b218b34aa4b64d115bb1270783197e827725fb5 -SHA1 (patch-bg) = 7550e0c5e138207f6e655bfbea4706221793851c +SHA1 (patch-bg) = 6df462d4c521d327b6a50c8b73be547c469a0ed0 SHA1 (patch-bh) = f3f506d69261536eb1dbe552e1382639f95ad7d8 SHA1 (patch-bi) = 1a8f2f79a24f2ba75accf83252677b830afde164 SHA1 (patch-bj) = 56046bc920beba28a7f21364c1f46d9061697105 -SHA1 (patch-bk) = f57ea90235a87d7c7e915bac368cd80cc0885206 +SHA1 (patch-bk) = 7e961c42269c3593db06c3165629fbbf6a962a1a SHA1 (patch-bl) = 00e1169fb75f4a2fe43a48f24ac5b5b1a412d7b1 -SHA1 (patch-bm) = 7a1a91b4acb2e124386136d25976e742724b2ea7 +SHA1 (patch-bm) = 40c32f182882dbf58cb94450aa21a83888d5e2c3 SHA1 (patch-bn) = b33aa4f73315a93506b36a20be2a3cabfcdd16ef SHA1 (patch-bo) = 9c3108d7f9a1de3c82f2e4d78a0e9f5dbe3478f0 -SHA1 (patch-bp) = 8d50a662f137d1ca2abdb38b4976e1f384c05cf5 +SHA1 (patch-bp) = 615ddb599e26f123cb8f21700c3f0528bc37c99c SHA1 (patch-bq) = 247b8babfab3a2e99fd5cee47d94b7fbe528d1d8 SHA1 (patch-br) = 778a94f6e7e5900c3036ed0e9c8fd92a78b13c21 -SHA1 (patch-bs) = d585dfec2419e17215e69a1c938dbdf389b9ffb3 +SHA1 (patch-bs) = 9ee2903934e50c8786a2b45854255f8022e31524 SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a SHA1 (patch-bu) = 2db9e62de48fa7bb6d60bdea44d7bee2eddff4e3 SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16 SHA1 (patch-bw) = cb212ff65b55b8e190f3d1feef4986906bf9a7e6 SHA1 (patch-bx) = dcdec38d984452032176946bafddc9a6614b2b6f SHA1 (patch-by) = 6196da890587636881baac5ac477c850773618e3 -SHA1 (patch-bz) = 2cbe8ae4be49a1977b3ec04abb974c4f3ab62a40 +SHA1 (patch-bz) = ef63ef3ea3c28898e5d8cef4631866854998d41c SHA1 (patch-ca) = 21f45e1498c5a61838d844ad5b53189400f97355 SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b SHA1 (patch-cc) = 12e515c4517a59c3c5f529162ea66c44cbcdd69c -SHA1 (patch-cd) = 06bc9a448cd77778ed7ebffb4b9df64a9f0a4b64 +SHA1 (patch-cd) = 9b21211aef51f94d20c10fbdfda878df7fe77764 SHA1 (patch-ce) = 4437e1fd02a3ef4b623e590bd41e9c695a5c9de6 SHA1 (patch-cf) = f5448151bc1ca0afaceb6aac5ab0865b2a1c8c1e SHA1 (patch-cg) = fb7cf305bec67a5cbb80afa9799b3937989910a5 -SHA1 (patch-ch) = 4b6d173a0b31c91e35e8abf3ed30c4f82613bda4 +SHA1 (patch-ch) = c7204694b08da0579c978575b0792b2ff2fb5b1b SHA1 (patch-ci) = 07f5c0bfae64c180ce954c5eb07a7e425d98a9b2 -SHA1 (patch-cj) = 423e02c7caa6699545ec706bff4baeb896786d04 +SHA1 (patch-cj) = d45347d84fd0cade1fd6e8e2700bdc0280f520ea SHA1 (patch-ck) = b3e6e7ab1a2217a757842cc05aaa94301b74a0dd SHA1 (patch-cl) = 1e95bee0a8cb7cfb27958ccc1479abc01fe9f0a1 SHA1 (patch-cm) = 0e2a608749547ac42000a8ce8222303837cd834a -SHA1 (patch-cn) = a7443bf4a633b11424c6a73c8f1d4a17a86fbc6d +SHA1 (patch-cn) = fc363f836b2acde2ad9bc01759460e997e34aa96 SHA1 (patch-co) = 7640d199e0391afe6aa9b0d917b88dfd4a213090 SHA1 (patch-cp) = 0624d4a11fdd617309dcb711d9beabb6d7d78b36 SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f SHA1 (patch-cr) = ebbd1bafaf17691084ef835ef2f08866c6815924 SHA1 (patch-cs) = 39e69b9d7d4b4a4d28b6532c175b2c8afa1dd1a6 -SHA1 (patch-ct) = 22001fb43fe1eac960460549fe4a4ebf8298cf1d +SHA1 (patch-ct) = e38c308944f34572cbad4e3caa664d6566990b6e SHA1 (patch-cu) = 470db728e7853edefda9731fac174bf04c7fd5aa SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf SHA1 (patch-cw) = 79703f08c6f5c1690fe23b94b26ebb8c6908b29f SHA1 (patch-cx) = 8a2d029f56481c1b3d1626c82096fda36700cf00 SHA1 (patch-cy) = 05a6cebbd223e79c44d6714c78be841ebd63fd8f -SHA1 (patch-cz) = 54f8fe86f485a05bc568d3219a3aa2f1db804792 +SHA1 (patch-cz) = bb88de51bdb08d37d0c77d90509ac7cc6ae17854 SHA1 (patch-da) = ad54da1bc81cfd6cecebaa57f5a0c0a56d6d589f SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81 SHA1 (patch-dc) = ae7d541d91bd466142984b3680cc1e40834f528d SHA1 (patch-dd) = 2e9da1069c86ccafd19dbd0ed2b4594c5a4e2f71 SHA1 (patch-de) = 1fbea1abe5a8aefc0eacdc94d4ff60d26fb3c02a -SHA1 (patch-df) = 5813b78817389faa15378ebcff3f324e8a605f0b +SHA1 (patch-df) = f60490bb53ba5988ec212008615344d090635968 SHA1 (patch-dg) = 2a0e3e14049665549a793cf0f785fc55cc1c7d5d -SHA1 (patch-dh) = b84568ed97b14b16bbfdbc73dcb91b920242ad1b +SHA1 (patch-dh) = a89a4d94a568de02e7d095068356edf6e7011464 SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59 -SHA1 (patch-dj) = 6e3b24fd54ac49da047935640d9f8de9c0f0d193 +SHA1 (patch-dj) = 228bd1ab238bfab1ee7b56019d3e7ff91889940c SHA1 (patch-dk) = 1933b34e056d384b59c86b78301fa3c21854b33d -SHA1 (patch-dl) = 72f4e6358beed28d98a724e82151010b1a5f5db3 +SHA1 (patch-dl) = 546246a024afbf95a19e260d1d8ed70ff946e6dd SHA1 (patch-dm) = 866cb67d9bb39f889226ef5c588552379d153eff -SHA1 (patch-dn) = 32166f48de709c9253801c904f44ab2e2a0a9d6e +SHA1 (patch-dn) = d21ad2ceb35b4dd6ec71fded225073e9563c755a SHA1 (patch-do) = b8712d7d7b242896f034f147969721d4cc0d50e9 -SHA1 (patch-dp) = 3cdd46b5f5a99d133a7379b138faf94f5fe59658 +SHA1 (patch-dp) = c1b48e1f71ee8b0041ec826b8e7918dba8726242 SHA1 (patch-dq) = d354ec69536f68253597fc6912c8ffc5e5d19796 -SHA1 (patch-dr) = c2b94b76ff8d98b4cd740e88c75ba9ba0a7f2210 +SHA1 (patch-dr) = 5729df616b45c2a231b14e55499c8cb2ffcfd64a SHA1 (patch-ds) = 4a8bc0f2624fb8ee1ddf7013e751d6fb93e4d47b -SHA1 (patch-dt) = 4099d8b78a0210140e8c1b58aecc8323adacf833 +SHA1 (patch-dt) = 7f6d79614955732ac3c4b3d6a2f12e824cefa107 SHA1 (patch-du) = 9069c9775c1a2b309bcd23d971fb8f24dcd36cf6 -SHA1 (patch-dv) = 4f02a965e01840c8c0edd50bd11d505072f2f3b0 +SHA1 (patch-dv) = 4381edc1e061041211d2ac9d8411e4ffa42a9cd0 SHA1 (patch-dw) = a50a08c8a1eafeffe187512de9bda98edb5f5045 -SHA1 (patch-dx) = af4a1ca77289fd6612d8a7863b8c14a1f605006b +SHA1 (patch-dx) = 426d933c13e0404ed7e50d5d2c7e573a94970703 SHA1 (patch-dy) = c80bae613812210e1e0fbc29c767b476f925cf9c -SHA1 (patch-dz) = cdf7da547a07906343552b32835a2c8365b385e3 +SHA1 (patch-dz) = f0e94e83ac04f9a9b56265194be0d472914ef7de SHA1 (patch-ea) = 87e6214840bcdb98da2a3b1deb648c56c9833714 -SHA1 (patch-eb) = 8918e4ad36587db21eeee0860b45547613e80043 +SHA1 (patch-eb) = 83bfcc81190f36738a9cec134992ba4f091a3324 SHA1 (patch-ec) = 8c9d6be582eb92ad720bf02aace5660e1c6c0dec -SHA1 (patch-ed) = 2deb8b61109d0975bea523ccbe5b8902c95482c2 +SHA1 (patch-ed) = f59922d3522c3ee8348659d9ee3d979c54c03875 SHA1 (patch-ee) = 9311858579184fc50cd1345b251607cd14e3dff3 -SHA1 (patch-ef) = 637afdf8af3517987a10cd4bb7876096a4148dfa +SHA1 (patch-ef) = 5daff08d2bc845b0298d9c708e465547ea51f847 SHA1 (patch-eg) = d427baa1251f4252c4012ed8dc8567e72c5d3610 -SHA1 (patch-eh) = 5e3e743849016e54b7209153a8ca0adaa4033241 +SHA1 (patch-eh) = 94aa1dd47b86ec9ee7a9f4ac715dceecb8aa3c82 SHA1 (patch-ei) = 69312f1e54ba35908dfe7650ba92686acead542b -SHA1 (patch-ej) = 58463db42818977fce088603330ae4bb940746f2 +SHA1 (patch-ej) = 0838deb8434d7f5867d5947bcd3733246ecac4c6 SHA1 (patch-ek) = 004a6c7933c90e1bcbd9d271708e4432f79a8986 SHA1 (patch-el) = 00629891dbd5c668162213f0bcd5183878e7baf4 SHA1 (patch-em) = 2e42263d67e5e44035bed13dc3e5245fc3a86709 SHA1 (patch-en) = f755e2ddf16eb6df6c2f4498f4193a61509dc45f SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1 SHA1 (patch-ep) = 77d65151a6e74adcfc1143ced2cb393d08029b2c -SHA1 (patch-eq) = 3735ba37c53c8498f8709bdc8b8a857eb2903277 -SHA1 (patch-er) = b8986e7f10c95fecfd8d0af0ed440c730ae3fabd -SHA1 (patch-es) = 5ceea551d02474cc09b6cf1e345a6b6b250aa4aa -SHA1 (patch-et) = 89ceae37e0c858f920aecc279bf490e62226e5e0 diff --git a/x11/kdebase3/patches/patch-ac b/x11/kdebase3/patches/patch-ac index 8727dff256e..b7664ec9cc4 100644 --- a/x11/kdebase3/patches/patch-ac +++ b/x11/kdebase3/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2003/01/02 09:12:33 skrll Exp $ ---- kate/app/Makefile.in.orig Mon May 13 23:57:35 2002 +--- kate/app/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kate/app/Makefile.in -@@ -287,35 +287,45 @@ +@@ -286,35 +286,45 @@ qt_libraries = @qt_libraries@ x_includes = @x_includes@ x_libraries = @x_libraries@ @@ -11,10 +11,10 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ bin_PROGRAMS = kate kwrite -#>- kate_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ --#>- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ --#>- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ --#>- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ --#>- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp +-#>- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ +-#>- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ +-#>- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ +-#>- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp -#>+ 5 -kate_la_SOURCES=kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ - kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ @@ -22,11 +22,11 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ - kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ - kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp +#>- libkate_main_la_SOURCES = kateapp.cpp kateconfigdialog.cpp \ -+#>- kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ -+#>- katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ -+#>- katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ -+#>- kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ -+#>- kategrepdialog.cpp katefiledialog.cpp ++#>- kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ ++#>- katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ ++#>- katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ ++#>- kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ ++#>- kategrepdialog.cpp katefiledialog.cpp +#>+ 6 +libkate_main_la_SOURCES=kateapp.cpp kateconfigdialog.cpp \ + kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ @@ -34,12 +34,12 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ + katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ + kateviewspace.cpp katemain.cpp \ + kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp -+ -+libkate_main_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript -+libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kate_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript ++libkate_main_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript ++libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ +kate_la_SOURCES = dummy_main.cpp +kate_la_LIBADD = libkate_main.la kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version @@ -67,7 +67,7 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) INCLUDES = -DKATEPART_NOT_INSTALLED -I../interfaces $(all_includes) -@@ -327,47 +337,57 @@ +@@ -326,45 +336,55 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -92,7 +92,7 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ katefiledialog.lo -#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) +#>- libkate_main_la_OBJECTS = $(am_libkate_main_la_OBJECTS) - #>+ 10 + #>+ 9 -kate_la_final_OBJECTS = kate_la.all_cpp.lo -kate_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ +libkate_main_la_final_OBJECTS = libkate_main_la.all_cpp.lo @@ -101,28 +101,24 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ katefilelist.lo katefileselector.lo katemainwindow.lo \ katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ kateviewspace.lo katemain.lo kategrepdialog.lo \ - katefiledialog.lo kateappIface_skel.lo kateIface_skel.lo \ -- kate_la_meta_unload.lo + katefiledialog.lo kateappIface_skel.lo kateIface_skel.lo -@KDE_USE_FINAL_FALSE@kate_la_OBJECTS = $(kate_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kate_la_OBJECTS = $(kate_la_final_OBJECTS) -kwrite_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la -am_kwrite_la_OBJECTS = kwritemain.lo katefiledialog.lo -#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) -+ libkate_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkate_main_la_OBJECTS = $(libkate_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkate_main_la_OBJECTS = $(libkate_main_la_final_OBJECTS) +libkwrite_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la +am_libkwrite_main_la_OBJECTS = kwritemain.lo katefiledialog.lo +#>- libkwrite_main_la_OBJECTS = $(am_libkwrite_main_la_OBJECTS) - #>+ 5 + #>+ 4 -kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo --kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ -- kwrite_la_meta_unload.lo +-kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo -@KDE_USE_FINAL_FALSE@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) +libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.lo -+libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ -+ libkwrite_main_la_meta_unload.lo ++libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo +@KDE_USE_FINAL_FALSE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_final_OBJECTS) bin_PROGRAMS = kate$(EXEEXT) kwrite$(EXEEXT) @@ -147,17 +143,39 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -375,7 +395,8 @@ +@@ -372,7 +392,8 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kateapp.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kateconfigdialog.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kateconsole.Plo \ -@@ -409,10 +430,11 @@ +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kateapp.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kateconfigdialog.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kateconsole.Plo \ +@@ -387,8 +408,9 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@ $(DEPDIR)/kateviewmanager.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kateviewspace.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kwritemain.Plo +-#>+ 31 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/kate_la.all_cpp.P $(DEPDIR)/kwrite_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ ++#>+ 33 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/libkate_main_la.all_cpp.P $(DEPDIR)/libkwrite_main_la.all_cpp.P $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateapp.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateconfigdialog.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateconsole.Plo \ +@@ -403,7 +425,8 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateviewmanager.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateviewspace.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwritemain.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kateapp.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kateconfigdialog.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kateconsole.Plo \ +@@ -438,10 +461,11 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -172,7 +190,7 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ #>- all: all-am #>+ 1 -@@ -463,6 +485,10 @@ +@@ -492,6 +516,10 @@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE $(CXXLINK) -rpath $(libdir) $(kate_la_LDFLAGS) $(kate_la_OBJECTS) $(kate_la_LIBADD) $(LIBS) kwrite.la: $(kwrite_la_OBJECTS) $(kwrite_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwrite_la_LDFLAGS) $(kwrite_la_OBJECTS) $(kwrite_la_LIBADD) $(LIBS) @@ -183,7 +201,7 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -500,7 +526,8 @@ +@@ -529,7 +557,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -193,16 +211,16 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateapp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateconfigdialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateconfigplugindialogpage.Plo@am__quote@ -@@ -575,7 +602,7 @@ +@@ -604,7 +633,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=katemain.cpp katefileselector.h katemainwindow.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateconfigplugindialogpage.h kateappIface.h kateviewmanager.cpp katemain.h kateconfigdialog.h katefilelist.cpp katedocmanager.h kateIface.h kateviewspace.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katepluginmanager.cpp +-KDE_DIST=katefilelist.cpp katemain.cpp katefiledialog.h katepluginmanager.h katefileselector.h kateviewmanager.cpp kateviewspace.h kateconsole.cpp kateconfigdialog.h kwritemain.h katedocmanager.cpp katefilelist.h katefileselector.cpp kateconsole.h kateviewspace.cpp katemainwindow.cpp kateapp.h kategrepdialog.cpp katedocmanager.h katesplitter.cpp katemain.h kateconfigplugindialogpage.h katesplitter.h kateappIface.h katemainwindow.h katepluginmanager.cpp kateviewmanager.h kateIface.h kategrepdialog.h +KDE_DIST=katemain.cpp katefileselector.h kateIface.h katemainwindow.cpp kateviewspace.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateappIface.h kateconfigplugindialogpage.h kateviewmanager.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katemain.h katefilelist.cpp kateconfigdialog.h katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katedocmanager.h katepluginmanager.cpp kateconfigplugindialogpage.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -689,23 +716,10 @@ +@@ -718,46 +747,37 @@ uninstall-am: uninstall-binPROGRAMS unin tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-info-am uninstall-libLTLIBRARIES @@ -214,170 +232,155 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ .NOEXPORT: -#>+ 9 --kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOPIDL_DEPENDENCIES) +-kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) -kateappIface_skel.cpp: kateappIface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl --kateIface.kidl: $(srcdir)/kateIface.h $(DCOPIDL_DEPENDENCIES) +-kateIface.kidl: $(srcdir)/kateIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) -kateIface_skel.cpp: kateIface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl ++#>+ 3 ++kateviewmanager.moc: $(srcdir)/kateviewmanager.h ++ $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc + + #>+ 3 +-kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h +- $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc ++katesplitter.moc: $(srcdir)/katesplitter.h ++ $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc + + #>+ 3 +-kateconsole.moc: $(srcdir)/kateconsole.h +- $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc ++katefileselector.moc: $(srcdir)/katefileselector.h ++ $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc + + #>+ 3 +-katemainwindow.moc: $(srcdir)/katemainwindow.h +- $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc ++katefilelist.moc: $(srcdir)/katefilelist.h ++ $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc + + #>+ 3 +-katedocmanager.moc: $(srcdir)/katedocmanager.h +- $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc ++kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h ++ $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc + + #>+ 3 +-kategrepdialog.moc: $(srcdir)/kategrepdialog.h +- $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc ++kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h ++ $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc + + #>+ 3 +-katefilelist.moc: $(srcdir)/katefilelist.h +- $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc ++katemainwindow.moc: $(srcdir)/katemainwindow.h ++ $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc + + #>+ 3 + kateapp.moc: $(srcdir)/kateapp.h +@@ -772,32 +792,38 @@ kateviewspace.moc: $(srcdir)/kateviewspa + $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc + + #>+ 3 +-katesplitter.moc: $(srcdir)/katesplitter.h +- $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc - +-#>+ 3 +-kateviewmanager.moc: $(srcdir)/kateviewmanager.h +- $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc ++katefiledialog.moc: $(srcdir)/katefiledialog.h ++ $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc + + #>+ 3 +-katefileselector.moc: $(srcdir)/katefileselector.h +- $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc ++katedocmanager.moc: $(srcdir)/katedocmanager.h ++ $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc + + #>+ 3 +-katefiledialog.moc: $(srcdir)/katefiledialog.h +- $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc ++kategrepdialog.moc: $(srcdir)/kategrepdialog.h ++ $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc + + #>+ 3 +-kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h +- $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc ++kateconsole.moc: $(srcdir)/kateconsole.h ++ $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc + #>+ 3 - kateviewmanager.moc: $(srcdir)/kateviewmanager.h - $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc -@@ -766,6 +780,16 @@ katepluginmanager.moc: $(srcdir)/katepluginmanager.h $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc +#>+ 9 -+kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOPIDL_DEPENDENCIES) ++kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) +kateappIface_skel.cpp: kateappIface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl -+kateIface.kidl: $(srcdir)/kateIface.h $(DCOPIDL_DEPENDENCIES) ++kateIface.kidl: $(srcdir)/kateIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) +kateIface_skel.cpp: kateIface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl + #>+ 3 clean-metasources: - -rm -f kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc -@@ -787,41 +811,41 @@ - - - #>+ 12 --kate_la_meta_unload.cpp: katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc -- @echo 'creating kate_la_meta_unload.cpp' -- @-rm -f kate_la_meta_unload.cpp -+libkate_main_la_meta_unload.cpp: katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc -+ @echo 'creating libkate_main_la_meta_unload.cpp' -+ @-rm -f libkate_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kate_la[] = {' > kate_la_meta_unload.cpp ;\ -- cat katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kate_la_meta_unload.cpp ;\ -- echo '0};' >> kate_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kate_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kate_la)' >> kate_la_meta_unload.cpp ;\ -- else echo > kate_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkate_main_la[] = {' > libkate_main_la_meta_unload.cpp ;\ -+ cat katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkate_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkate_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkate_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkate_main_la)' >> libkate_main_la_meta_unload.cpp ;\ -+ else echo > libkate_main_la_meta_unload.cpp; fi - - - #>+ 12 --kwrite_la_meta_unload.cpp: kwritemain.moc katefiledialog.moc -- @echo 'creating kwrite_la_meta_unload.cpp' -- @-rm -f kwrite_la_meta_unload.cpp -+libkwrite_main_la_meta_unload.cpp: kwritemain.moc katefiledialog.moc -+ @echo 'creating libkwrite_main_la_meta_unload.cpp' -+ @-rm -f libkwrite_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kwrite_la[] = {' > kwrite_la_meta_unload.cpp ;\ -- cat kwritemain.moc katefiledialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrite_la_meta_unload.cpp ;\ -- echo '0};' >> kwrite_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kwrite_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kwrite_la)' >> kwrite_la_meta_unload.cpp ;\ -- else echo > kwrite_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkwrite_main_la[] = {' > libkwrite_main_la_meta_unload.cpp ;\ -+ cat kwritemain.moc katefiledialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrite_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkwrite_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkwrite_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkwrite_main_la)' >> libkwrite_main_la_meta_unload.cpp ;\ -+ else echo > libkwrite_main_la_meta_unload.cpp; fi - +- -rm -f kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc katefilelist.moc kateapp.moc kwritemain.moc kateviewspace.moc katesplitter.moc kateviewmanager.moc katefileselector.moc katefiledialog.moc kateconfigplugindialogpage.moc katepluginmanager.moc ++ -rm -f kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc - #>+ 3 - clean-moc-classes: -- -rm -f kate_la_meta_unload.cpp kwrite_la_meta_unload.cpp -+ -rm -f libkate_main_la_meta_unload.cpp libkwrite_main_la_meta_unload.cpp + #>+ 5 + clean-idl: +@@ -816,45 +842,45 @@ force-reedit: - #>+ 11 --kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kate_la_meta_unload.cpp kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc -+kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc - @echo 'creating kate_la.all_cpp.cpp ...'; \ - rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ -- for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kate_la_meta_unload.cpp ; do \ -+ for file in dummy_main.cpp ; do \ - echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ - done; \ -@@ -829,11 +853,11 @@ - rm -f kate_la.all_cpp.final kate_la.all_cpp.files #>+ 11 --kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwrite_la_meta_unload.cpp -+kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp - @echo 'creating kwrite_la.all_cpp.cpp ...'; \ - rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ -- for file in kwritemain.cpp katefiledialog.cpp kwrite_la_meta_unload.cpp ; do \ -+ for file in dummy_main.cpp ; do \ - echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ - done; \ -@@ -841,11 +865,35 @@ - rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files - - #>+ 11 --kate.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp libkate_main_la_meta_unload.cpp +-kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc katefilelist.moc kategrepdialog.moc kateapp.moc kateviewspace.moc kateviewmanager.moc katesplitter.moc katefiledialog.moc katefileselector.moc kateconfigplugindialogpage.moc katepluginmanager.moc +- @echo 'creating kate_la.all_cpp.cpp ...'; \ +- rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ ++libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc + @echo 'creating libkate_main_la.all_cpp.cpp ...'; \ + rm -f libkate_main_la.all_cpp.files libkate_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkate_main_la.all_cpp.final; \ -+ for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp libkate_main_la_meta_unload.cpp ; do \ + for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkate_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkate_main_la.all_cpp.final; \ -+ done; \ -+ cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files > libkate_main_la.all_cpp.cpp; \ + done; \ +- cat kate_la.all_cpp.final kate_la.all_cpp.files > kate_la.all_cpp.cpp; \ +- rm -f kate_la.all_cpp.final kate_la.all_cpp.files ++ cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files > libkate_main_la.all_cpp.cpp; \ + rm -f libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files -+ -+#>+ 11 -+libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp libkwrite_main_la_meta_unload.cpp + + #>+ 11 +-kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwritemain.moc katefiledialog.moc +- @echo 'creating kwrite_la.all_cpp.cpp ...'; \ +- rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ ++libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwritemain.moc katefiledialog.moc + @echo 'creating libkwrite_main_la.all_cpp.cpp ...'; \ + rm -f libkwrite_main_la.all_cpp.files libkwrite_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwrite_main_la.all_cpp.final; \ -+ for file in kwritemain.cpp katefiledialog.cpp libkwrite_main_la_meta_unload.cpp ; do \ + for file in kwritemain.cpp katefiledialog.cpp ; do \ +- echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkwrite_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrite_main_la.all_cpp.final; \ -+ done; \ -+ cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files > libkwrite_main_la.all_cpp.cpp; \ -+ rm -f libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files -+ -+#>+ 11 -+kate.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp - @echo 'creating kate.all_cpp.cpp ...'; \ - rm -f kate.all_cpp.files kate.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kate.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in dummy_main.cpp ; do \ - echo "#include \"$$file\"" >> kate.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate.all_cpp.final; \ - done; \ -@@ -853,11 +901,11 @@ - rm -f kate.all_cpp.final kate.all_cpp.files - - #>+ 11 --kwrite.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kwrite.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp - @echo 'creating kwrite.all_cpp.cpp ...'; \ - rm -f kwrite.all_cpp.files kwrite.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwrite.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in dummy_main.cpp ; do \ - echo "#include \"$$file\"" >> kwrite.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite.all_cpp.final; \ done; \ -@@ -866,20 +914,20 @@ +- cat kwrite_la.all_cpp.final kwrite_la.all_cpp.files > kwrite_la.all_cpp.cpp; \ +- rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files ++ cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files > libkwrite_main_la.all_cpp.cpp; \ ++ rm -f libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp -+ -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp libkate_main_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp +- -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp ++ -rm -f libkate_main_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp #>+ 2 final: @@ -397,4 +400,59 @@ $NetBSD: patch-ac,v 1.2 2002/08/25 19:23:36 jlam Exp $ + $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_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 +@@ -864,33 +890,33 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 31 +-kategrepdialog.o: kategrepdialog.moc +-kateapp.o: kateapp.moc +-katesplitter.lo: katesplitter.moc +-kateconsole.lo: kateconsole.moc +-kategrepdialog.lo: kategrepdialog.moc +-katefileselector.lo: katefileselector.moc +-katesplitter.o: katesplitter.moc +-kwritemain.o: kwritemain.moc +-kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc ++kwritemain.lo: kwritemain.moc ++kateapp.lo: kateapp.moc + kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc +-katefileselector.o: katefileselector.moc +-katefiledialog.o: katefiledialog.moc +-kateconsole.o: kateconsole.moc +-kateviewmanager.o: kateviewmanager.moc + katemainwindow.lo: katemainwindow.moc ++kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc ++kategrepdialog.o: kategrepdialog.moc ++kateviewspace.o: kateviewspace.moc ++katepluginmanager.lo: katepluginmanager.moc + kateconfigdialog.o: kateconfigdialog.moc +-kwritemain.lo: kwritemain.moc +-kateviewmanager.lo: kateviewmanager.moc ++katepluginmanager.o: katepluginmanager.moc ++katefileselector.o: katefileselector.moc ++kateconsole.o: kateconsole.moc ++kateconsole.lo: kateconsole.moc ++kategrepdialog.lo: kategrepdialog.moc ++kateapp.o: kateapp.moc ++katefilelist.o: katefilelist.moc + katefiledialog.lo: katefiledialog.moc + katemainwindow.o: katemainwindow.moc ++katefiledialog.o: katefiledialog.moc ++kateviewmanager.o: kateviewmanager.moc + katedocmanager.lo: katedocmanager.moc ++kateviewspace.lo: kateviewspace.moc ++katesplitter.o: katesplitter.moc + katedocmanager.o: katedocmanager.moc ++kwritemain.o: kwritemain.moc ++katefileselector.lo: katefileselector.moc ++kateviewmanager.lo: kateviewmanager.moc + kateconfigdialog.lo: kateconfigdialog.moc +-katepluginmanager.lo: katepluginmanager.moc + katefilelist.lo: katefilelist.moc +-katepluginmanager.o: katepluginmanager.moc +-kateviewspace.o: kateviewspace.moc +-kateviewspace.lo: kateviewspace.moc +-kateapp.lo: kateapp.moc +-katefilelist.o: katefilelist.moc ++katesplitter.lo: katesplitter.moc diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai index 09b12d90c55..484797a69e8 100644 --- a/x11/kdebase3/patches/patch-ai +++ b/x11/kdebase3/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $ +$NetBSD: patch-ai,v 1.4 2003/01/02 09:12:33 skrll Exp $ ---- kcontrol/access/Makefile.in.orig Tue Jun 25 19:31:44 2002 +--- kcontrol/access/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kcontrol/access/Makefile.in -@@ -292,16 +292,20 @@ +@@ -291,16 +291,20 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kaccess @@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $ kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -@@ -319,15 +323,11 @@ +@@ -318,27 +322,32 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -38,10 +38,9 @@ $NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $ +kaccess_la_DEPENDENCIES = libkaccess_main.la +am_kaccess_la_OBJECTS = kaccess_main.lo #>- kaccess_la_OBJECTS = $(am_kaccess_la_OBJECTS) --#>+ 5 +-#>+ 4 -kaccess_la_final_OBJECTS = kaccess_la.all_cpp.lo --kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo \ -- kaccess_la_meta_unload.lo +-kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo -@KDE_USE_FINAL_FALSE@kaccess_la_OBJECTS = $(kaccess_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kaccess_la_OBJECTS = $(kaccess_la_final_OBJECTS) +#>+ 1 @@ -49,17 +48,14 @@ $NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $ kcm_access_la_DEPENDENCIES = am_kcm_access_la_OBJECTS = kcmaccess.lo #>- kcm_access_la_OBJECTS = $(am_kcm_access_la_OBJECTS) -@@ -337,14 +337,23 @@ - kcm_access_la_meta_unload.lo - @KDE_USE_FINAL_FALSE@kcm_access_la_OBJECTS = $(kcm_access_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@kcm_access_la_OBJECTS = $(kcm_access_la_final_OBJECTS) + #>+ 1 + kcm_access_la_OBJECTS = kcmaccess.lo +libkaccess_main_la_DEPENDENCIES = +am_libkaccess_main_la_OBJECTS = kaccess.lo main.lo +#>- libkaccess_main_la_OBJECTS = $(am_libkaccess_main_la_OBJECTS) -+#>+ 5 ++#>+ 4 +libkaccess_main_la_final_OBJECTS = libkaccess_main_la.all_cpp.lo -+libkaccess_main_la_nofinal_OBJECTS = kaccess.lo main.lo \ -+ libkaccess_main_la_meta_unload.lo ++libkaccess_main_la_nofinal_OBJECTS = kaccess.lo main.lo +@KDE_USE_FINAL_FALSE@libkaccess_main_la_OBJECTS = $(libkaccess_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkaccess_main_la_OBJECTS = $(libkaccess_main_la_final_OBJECTS) bin_PROGRAMS = kaccess$(EXEEXT) @@ -76,19 +72,31 @@ $NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -352,8 +361,9 @@ +@@ -346,13 +355,16 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kaccess.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kcmaccess.Plo $(DEPDIR)/main.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kaccess.Plo $(DEPDIR)/kaccess_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kaccess_main.Po $(DEPDIR)/kcmaccess.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/main.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kaccess.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcmaccess.Plo $(DEPDIR)/main.Plo +-#>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kaccess_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kaccess.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmaccess.Plo $(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kaccess.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmaccess.Plo $(DEPDIR)/main.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kaccess.Plo $(DEPDIR)/kaccess_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kaccess_main.Po $(DEPDIR)/kcmaccess.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++#>+ 7 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkaccess_main_la.all_cpp.P $(DEPDIR)/kaccess.Plo $(DEPDIR)/kaccess_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaccess_main.Po $(DEPDIR)/kcmaccess.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kaccess.Plo $(DEPDIR)/kaccess_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaccess_main.Po $(DEPDIR)/kcmaccess.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -374,13 +384,13 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -374,13 +386,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) \ @@ -104,7 +112,7 @@ $NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $ #>- all: all-am #>+ 1 -@@ -453,6 +463,8 @@ +@@ -453,6 +465,8 @@ kaccess.la: $(kaccess_la_OBJECTS) $(kacc @KDE_USE_CLOSURE_TRUE@kcm_access.la: kcm_access.la.closure $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) @KDE_USE_CLOSURE_FALSE@kcm_access.la: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(kcm_access_la_LDFLAGS) $(kcm_access_la_OBJECTS) $(kcm_access_la_LIBADD) $(LIBS) @@ -113,7 +121,7 @@ $NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -487,8 +499,9 @@ +@@ -487,8 +501,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -124,25 +132,16 @@ $NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmaccess.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -583,7 +596,7 @@ +@@ -583,7 +598,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kaccess.desktop kaccess.h configure.in.in kcmaccess.desktop +-KDE_DIST=kaccess.h kcmaccess.desktop configure.in.in kaccess.desktop +KDE_DIST=configure.in.in kcmaccess.desktop kaccess.desktop kaccess.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -670,7 +683,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-am - -@@ -713,9 +726,6 @@ +@@ -713,21 +728,18 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot $(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot @@ -152,108 +151,84 @@ $NetBSD: patch-ai,v 1.3 2002/08/25 19:23:36 jlam 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: -@@ -756,19 +766,6 @@ - - #>+ 12 --kaccess_la_meta_unload.cpp: kaccess.moc -- @echo 'creating kaccess_la_meta_unload.cpp' -- @-rm -f kaccess_la_meta_unload.cpp -- @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kaccess_la[] = {' > kaccess_la_meta_unload.cpp ;\ -- cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaccess_la_meta_unload.cpp ;\ -- echo '0};' >> kaccess_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kaccess_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kaccess_la)' >> kaccess_la_meta_unload.cpp ;\ -- else echo > kaccess_la_meta_unload.cpp; fi -- + #>+ 3 +-kcmaccess.moc: $(srcdir)/kcmaccess.h +- $(MOC) $(srcdir)/kcmaccess.h -o kcmaccess.moc - --#>+ 12 - kcm_access_la_meta_unload.cpp: kcmaccess.moc - @echo 'creating kcm_access_la_meta_unload.cpp' - @-rm -f kcm_access_la_meta_unload.cpp -@@ -781,16 +778,29 @@ - else echo > kcm_access_la_meta_unload.cpp; fi - +-#>+ 3 + kaccess.moc: $(srcdir)/kaccess.h + $(MOC) $(srcdir)/kaccess.h -o kaccess.moc -+#>+ 12 -+libkaccess_main_la_meta_unload.cpp: kaccess.moc -+ @echo 'creating libkaccess_main_la_meta_unload.cpp' -+ @-rm -f libkaccess_main_la_meta_unload.cpp -+ @if test ${kde_qtver} = 2; then \ -+ echo 'static const char * _metalist_libkaccess_main_la[] = {' > libkaccess_main_la_meta_unload.cpp ;\ -+ cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaccess_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkaccess_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkaccess_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkaccess_main_la)' >> libkaccess_main_la_meta_unload.cpp ;\ -+ else echo > libkaccess_main_la_meta_unload.cpp; fi -+ ++#>+ 3 ++kcmaccess.moc: $(srcdir)/kcmaccess.h ++ $(MOC) $(srcdir)/kcmaccess.h -o kcmaccess.moc + + #>+ 8 + kcm_access.la.closure: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) + @echo "int main() {return 0;}" > kcm_access_la_closure.cpp +@@ -739,7 +751,7 @@ kcm_access.la.closure: $(kcm_access_la_O + #>+ 3 - clean-moc-classes: -- -rm -f kaccess_la_meta_unload.cpp kcm_access_la_meta_unload.cpp -+ -rm -f kcm_access_la_meta_unload.cpp libkaccess_main_la_meta_unload.cpp + clean-metasources: +- -rm -f kcmaccess.moc kaccess.moc ++ -rm -f kaccess.moc kcmaccess.moc + + #>+ 3 + clean-closures: +@@ -756,33 +768,33 @@ force-reedit: - #>+ 11 --kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess_la_meta_unload.cpp kaccess.moc kcmaccess.moc -+kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp kaccess.moc kcmaccess.moc - @echo 'creating kaccess_la.all_cpp.cpp ...'; \ - rm -f kaccess_la.all_cpp.files kaccess_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaccess_la.all_cpp.final; \ -- for file in kaccess.cpp main.cpp kaccess_la_meta_unload.cpp ; do \ -+ for file in kaccess_main.cpp ; do \ - echo "#include \"$$file\"" >> kaccess_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess_la.all_cpp.final; \ - done; \ -@@ -810,11 +820,23 @@ - rm -f kcm_access_la.all_cpp.final kcm_access_la.all_cpp.files #>+ 11 --kaccess.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkaccess_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp libkaccess_main_la_meta_unload.cpp +-kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess.moc +- @echo 'creating kaccess_la.all_cpp.cpp ...'; \ +- rm -f kaccess_la.all_cpp.files kaccess_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kaccess_la.all_cpp.final; \ ++libkaccess_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess.moc + @echo 'creating libkaccess_main_la.all_cpp.cpp ...'; \ + rm -f libkaccess_main_la.all_cpp.files libkaccess_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkaccess_main_la.all_cpp.final; \ -+ for file in kaccess.cpp main.cpp libkaccess_main_la_meta_unload.cpp ; do \ + for file in kaccess.cpp main.cpp ; do \ +- echo "#include \"$$file\"" >> kaccess_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkaccess_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaccess_main_la.all_cpp.final; \ -+ done; \ -+ cat libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files > libkaccess_main_la.all_cpp.cpp; \ -+ rm -f libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files -+ -+#>+ 11 -+kaccess.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp - @echo 'creating kaccess.all_cpp.cpp ...'; \ - rm -f kaccess.all_cpp.files kaccess.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaccess.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kaccess_main.cpp ; do \ - echo "#include \"$$file\"" >> kaccess.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess.all_cpp.final; \ done; \ -@@ -823,20 +845,20 @@ +- cat kaccess_la.all_cpp.final kaccess_la.all_cpp.files > kaccess_la.all_cpp.cpp; \ +- rm -f kaccess_la.all_cpp.final kaccess_la.all_cpp.files ++ cat libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files > libkaccess_main_la.all_cpp.cpp; \ ++ rm -f libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kaccess_la.all_cpp.cpp kcm_access_la.all_cpp.cpp kaccess.all_cpp.cpp -+ -rm -f kaccess_la.all_cpp.cpp kcm_access_la.all_cpp.cpp libkaccess_main_la.all_cpp.cpp kaccess.all_cpp.cpp +- -rm -f kaccess_la.all_cpp.cpp ++ -rm -f libkaccess_main_la.all_cpp.cpp #>+ 2 final: -- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" kcm_access_la_OBJECTS="$(kcm_access_la_final_OBJECTS)" all-am -+ $(MAKE) kcm_access_la_OBJECTS="$(kcm_access_la_final_OBJECTS)" libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" all-am +- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" all-am ++ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" kcm_access_la_OBJECTS="$(kcm_access_la_final_OBJECTS)" install-am -+ $(MAKE) kcm_access_la_OBJECTS="$(kcm_access_la_final_OBJECTS)" libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" install-am +- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" install-am ++ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" kcm_access_la_OBJECTS="$(kcm_access_la_nofinal_OBJECTS)" all-am -+ $(MAKE) kcm_access_la_OBJECTS="$(kcm_access_la_nofinal_OBJECTS)" libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" all-am +- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" kcm_access_la_OBJECTS="$(kcm_access_la_nofinal_OBJECTS)" install-am -+ $(MAKE) kcm_access_la_OBJECTS="$(kcm_access_la_nofinal_OBJECTS)" libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" install-am +- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_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 +@@ -792,7 +804,7 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 5 ++kcmaccess.lo: kcmaccess.moc + kaccess.lo: kaccess.moc + kcmaccess.o: kcmaccess.moc + kaccess.o: kaccess.moc +-kcmaccess.lo: kcmaccess.moc diff --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am index a31de5809d4..965989016cd 100644 --- a/x11/kdebase3/patches/patch-am +++ b/x11/kdebase3/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.2 2002/08/25 19:23:37 jlam Exp $ +$NetBSD: patch-am,v 1.3 2003/01/02 09:12:33 skrll Exp $ ---- kcontrol/ebrowsing/Makefile.in.orig Mon May 13 23:57:37 2002 +--- kcontrol/ebrowsing/Makefile.in.orig Tue Nov 26 12:01:10 2002 +++ kcontrol/ebrowsing/Makefile.in -@@ -298,7 +298,7 @@ +@@ -298,7 +298,7 @@ kde_module_LTLIBRARIES = kcm_kurifilt.la kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp @@ -11,11 +11,11 @@ $NetBSD: patch-am,v 1.2 2002/08/25 19:23:37 jlam Exp $ kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) data_DATA = ebrowsing.desktop -@@ -549,7 +549,7 @@ +@@ -549,7 +549,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=ebrowsing.desktop main.h filteropts.h +-KDE_DIST=main.h filteropts.h ebrowsing.desktop +KDE_DIST=main.h ebrowsing.desktop filteropts.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) diff --git a/x11/kdebase3/patches/patch-ao b/x11/kdebase3/patches/patch-ao index fcebbe3d92e..f40ec5f3611 100644 --- a/x11/kdebase3/patches/patch-ao +++ b/x11/kdebase3/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ +$NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ ---- kcontrol/kcontrol/Makefile.in.orig Mon May 13 23:57:39 2002 +--- kcontrol/kcontrol/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kcontrol/kcontrol/Makefile.in -@@ -311,52 +311,65 @@ +@@ -310,52 +310,65 @@ INCLUDES = $(all_includes) SUBDIRS = . pics @@ -16,14 +16,14 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ + -#>- kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ --#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ --#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ --#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ +-#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ +-#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ +-#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ +#>- libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ -+#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ -+#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ -+#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ - #>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel ++#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ ++#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ ++#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ + #>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel #>+ 5 -kcontrol_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ - helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ @@ -45,16 +45,19 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version -#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ --#>- proxywidget.cpp kcdialog.cpp global.cpp \ -+#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \ -+#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ - #>- kcdialog.skel - #>+ 3 +-#>- proxywidget.cpp kcdialog.cpp global.cpp \ +-#>- kcdialog.skel +-#>+ 3 -kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ -- proxywidget.cpp kcdialog.cpp global.cpp \ +- proxywidget.cpp kcdialog.cpp global.cpp \ +- kcdialog_skel.cpp ++#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \ ++#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ ++#>- kcdialog.skel ++#>+ 3 +libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp \ + kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ - kcdialog_skel.cpp ++ kcdialog_skel.cpp -kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) @@ -92,7 +95,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic rcdir = $(kde_datadir)/kcontrol -@@ -373,7 +386,7 @@ +@@ -372,7 +385,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -101,7 +104,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ am_kcminit_la_OBJECTS = kcminit.lo global.lo #>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS) #>+ 4 -@@ -381,52 +394,70 @@ +@@ -380,50 +393,68 @@ kcminit_la_final_OBJECTS = kcminit_la.al kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo @KDE_USE_FINAL_FALSE@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kcminit_la_OBJECTS = $(kcminit_la_final_OBJECTS) @@ -130,18 +133,16 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ +am_libkcmshell_main_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ + kecdialog.lo proxywidget.lo kcdialog.lo global.lo +#>- libkcmshell_main_la_OBJECTS = $(am_libkcmshell_main_la_OBJECTS) - #>+ 6 + #>+ 5 -kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo -kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ +libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo +libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ - kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo \ -- kcmshell_la_meta_unload.lo + kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo -@KDE_USE_FINAL_FALSE@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS) -kcontrol_la_DEPENDENCIES = -am_kcontrol_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ -+ libkcmshell_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS) +libkcontrol_main_la_DEPENDENCIES = @@ -152,7 +153,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ kecdialog.lo kcrootonly.lo moduleIface.lo -#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS) +#>- libkcontrol_main_la_OBJECTS = $(am_libkcontrol_main_la_OBJECTS) - #>+ 9 + #>+ 8 -kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo -kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ +libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo @@ -160,11 +161,9 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \ proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \ global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \ - kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo \ -- kcontrol_la_meta_unload.lo + kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo -@KDE_USE_FINAL_FALSE@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS) -+ libkcontrol_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS) bin_PROGRAMS = kcontrol$(EXEEXT) kcmshell$(EXEEXT) kcminit$(EXEEXT) @@ -197,31 +196,80 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -435,13 +466,16 @@ +@@ -432,40 +463,49 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ -@@ -467,8 +501,9 @@ + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/proxywidget.Plo $(DEPDIR)/quickhelp.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/searchwidget.Plo $(DEPDIR)/toplevel.Plo +-#>+ 27 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/kcmshell_la.all_cpp.P $(DEPDIR)/kcontrol_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ ++#>+ 33 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/libkcminit_main_la.all_cpp.P $(DEPDIR)/libkcmshell_main_la.all_cpp.P $(DEPDIR)/libkcontrol_main_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/proxywidget.Plo $(DEPDIR)/quickhelp.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/searchwidget.Plo $(DEPDIR)/toplevel.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/aboutwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ +@@ -492,8 +532,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) \ @@ -233,7 +281,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ DATA = $(data_DATA) $(rc_DATA) -@@ -478,7 +513,7 @@ +@@ -503,7 +544,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -242,7 +290,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -531,6 +566,12 @@ +@@ -556,6 +597,12 @@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc $(CXXLINK) -rpath $(libdir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS) kcontrol.la: $(kcontrol_la_OBJECTS) $(kcontrol_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kcontrol_la_LDFLAGS) $(kcontrol_la_OBJECTS) $(kcontrol_la_LIBADD) $(LIBS) @@ -255,7 +303,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -573,13 +614,17 @@ +@@ -598,13 +645,17 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aboutwidget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dockcontainer.Plo@am__quote@ @@ -274,16 +322,16 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcrootonly.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kecdialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -745,7 +790,7 @@ +@@ -770,7 +821,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kcontrolui.rc indexwidget.h proxywidget.h dockcontainer.h aboutwidget.cpp modules.cpp main.h moduletreeview.h kecdialog.h moduleIface.h aboutwidget.h kcrootonly.cpp hi16-app-kcontrol.png toplevel.h kcdialog.cpp proxywidget.cpp modules.h moduleinfo.h kcmshell.h modulemenu.cpp modloader.h hi32-app-kcontrol.png modulemenu.h quickhelp.h searchwidget.h moduleiconview.cpp kcdialog.h hi48-app-kcontrol.png kcrootonly.h dockcontainer.cpp helpwidget.h moduleIface.cpp KControl.desktop moduletreeview.cpp version.h quickhelp.cpp moduleiconview.h global.h helpwidget.cpp +-KDE_DIST=quickhelp.cpp moduletreeview.cpp aboutwidget.h toplevel.h hi48-app-kcontrol.png modules.cpp kcontrolui.rc helpwidget.h main.h searchwidget.h proxywidget.cpp moduleIface.cpp hi16-app-kcontrol.png dockcontainer.h kcdialog.cpp kecdialog.h KControl.desktop modules.h modloader.h moduleiconview.cpp hi32-app-kcontrol.png kcdialog.h proxywidget.h quickhelp.h helpwidget.cpp global.h modulemenu.h kcrootonly.cpp modulemenu.cpp kcmshell.h moduleinfo.h moduletreeview.h moduleiconview.h dockcontainer.cpp aboutwidget.cpp version.h indexwidget.h moduleIface.h kcrootonly.h +KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h aboutwidget.cpp quickhelp.h searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop moduletreeview.cpp proxywidget.cpp modules.h version.h quickhelp.cpp moduleiconview.h moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -807,7 +852,6 @@ +@@ -832,7 +883,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -291,7 +339,7 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -890,9 +934,6 @@ +@@ -915,84 +965,81 @@ uninstall-info: uninstall-info-recursive messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot @@ -301,94 +349,133 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam 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: -@@ -1016,34 +1057,34 @@ - - - #>+ 12 --kcmshell_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc -- @echo 'creating kcmshell_la_meta_unload.cpp' -- @-rm -f kcmshell_la_meta_unload.cpp -+libkcmshell_main_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc -+ @echo 'creating libkcmshell_main_la_meta_unload.cpp' -+ @-rm -f libkcmshell_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp ;\ -- cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp ;\ -- echo '0};' >> kcmshell_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcmshell_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp ;\ -- else echo > kcmshell_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp ;\ -+ cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp ;\ -+ else echo > libkcmshell_main_la_meta_unload.cpp; fi - - - #>+ 12 --kcontrol_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc -- @echo 'creating kcontrol_la_meta_unload.cpp' -- @-rm -f kcontrol_la_meta_unload.cpp -+libkcontrol_main_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc -+ @echo 'creating libkcontrol_main_la_meta_unload.cpp' -+ @-rm -f libkcontrol_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp ;\ -- cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp ;\ -- echo '0};' >> kcontrol_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcontrol_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp ;\ -- else echo > kcontrol_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp ;\ -+ cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp ;\ -+ else echo > libkcontrol_main_la_meta_unload.cpp; fi + #>+ 3 +-moduleinfo.moc: $(srcdir)/moduleinfo.h +- $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc +- +-#>+ 3 + indexwidget.moc: $(srcdir)/indexwidget.h + $(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc #>+ 3 - clean-moc-classes: -- -rm -f kcmshell_la_meta_unload.cpp kcontrol_la_meta_unload.cpp -+ -rm -f libkcmshell_main_la_meta_unload.cpp libkcontrol_main_la_meta_unload.cpp +-moduleiconview.moc: $(srcdir)/moduleiconview.h +- $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc +- +-#>+ 3 +-dockcontainer.moc: $(srcdir)/dockcontainer.h +- $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc ++main.moc: $(srcdir)/main.h ++ $(MOC) $(srcdir)/main.h -o main.moc - #>+ 11 - kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc -@@ -1058,11 +1099,11 @@ - rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files + #>+ 3 +-aboutwidget.moc: $(srcdir)/aboutwidget.h +- $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc ++moduleinfo.moc: $(srcdir)/moduleinfo.h ++ $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc - #>+ 11 --kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp -+kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp - @echo 'creating kcmshell_la.all_cpp.cpp ...'; \ - rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ -- for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ; do \ -+ for file in kcmshell_main.cpp ; do \ - echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ - done; \ -@@ -1070,11 +1111,11 @@ - rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files + #>+ 3 +-proxywidget.moc: $(srcdir)/proxywidget.h +- $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc ++kcmshell.moc: $(srcdir)/kcmshell.h ++ $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc - #>+ 11 --kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp -+kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp - @echo 'creating kcontrol_la.all_cpp.cpp ...'; \ - rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ -- for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp ; do \ -+ for file in kcontrol_main.cpp ; do \ - echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ - done; \ -@@ -1082,11 +1123,47 @@ - rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files + #>+ 3 + helpwidget.moc: $(srcdir)/helpwidget.h + $(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc + + #>+ 3 +-quickhelp.moc: $(srcdir)/quickhelp.h +- $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc ++toplevel.moc: $(srcdir)/toplevel.h ++ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc + + #>+ 3 +-main.moc: $(srcdir)/main.h +- $(MOC) $(srcdir)/main.h -o main.moc ++moduletreeview.moc: $(srcdir)/moduletreeview.h ++ $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc ++ ++#>+ 3 ++kecdialog.moc: $(srcdir)/kecdialog.h ++ $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc ++ ++#>+ 3 ++modulemenu.moc: $(srcdir)/modulemenu.h ++ $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc + + #>+ 3 + modules.moc: $(srcdir)/modules.h + $(MOC) $(srcdir)/modules.h -o modules.moc + + #>+ 3 +-kcdialog.moc: $(srcdir)/kcdialog.h +- $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc ++moduleiconview.moc: $(srcdir)/moduleiconview.h ++ $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc + + #>+ 3 +-moduletreeview.moc: $(srcdir)/moduletreeview.h +- $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc ++kcdialog.moc: $(srcdir)/kcdialog.h ++ $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc + + #>+ 3 +-kecdialog.moc: $(srcdir)/kecdialog.h +- $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc ++searchwidget.moc: $(srcdir)/searchwidget.h ++ $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc + + #>+ 3 +-toplevel.moc: $(srcdir)/toplevel.h +- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc ++moduleIface.moc: $(srcdir)/moduleIface.h ++ $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc + + #>+ 3 +-modulemenu.moc: $(srcdir)/modulemenu.h +- $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc ++aboutwidget.moc: $(srcdir)/aboutwidget.h ++ $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc + + #>+ 3 +-kcmshell.moc: $(srcdir)/kcmshell.h +- $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc ++proxywidget.moc: $(srcdir)/proxywidget.h ++ $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc + + #>+ 3 +-moduleIface.moc: $(srcdir)/moduleIface.h +- $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc ++dockcontainer.moc: $(srcdir)/dockcontainer.h ++ $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc + + #>+ 3 +-searchwidget.moc: $(srcdir)/searchwidget.h +- $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc ++quickhelp.moc: $(srcdir)/quickhelp.h ++ $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc + + #>+ 5 + kcdialog.kidl: $(srcdir)/kcdialog.h $(DCOP_DEPENDENCIES) +@@ -1008,7 +1055,7 @@ moduleIface_skel.cpp: moduleIface.kidl + + #>+ 3 + clean-metasources: +- -rm -f moduleinfo.moc indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc kcdialog.moc moduletreeview.moc kecdialog.moc toplevel.moc modulemenu.moc kcmshell.moc moduleIface.moc searchwidget.moc ++ -rm -f indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc + + #>+ 5 + clean-idl: +@@ -1053,45 +1100,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi + rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files #>+ 11 --kcminit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp +-kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kecdialog.moc kcdialog.moc moduleinfo.moc proxywidget.moc kcmshell.moc +- @echo 'creating kcmshell_la.all_cpp.cpp ...'; \ +- rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ ++libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp + @echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \ + rm -f libkcminit_main_la.all_cpp.files libkcminit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcminit_main_la.all_cpp.final; \ @@ -396,77 +483,49 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ + echo "#include \"$$file\"" >> libkcminit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcminit_main_la.all_cpp.final; \ + done; \ -+ cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ ++ cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ + rm -f libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files + +#>+ 11 -+libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ++libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc + @echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \ + rm -f libkcmshell_main_la.all_cpp.files libkcmshell_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcmshell_main_la.all_cpp.final; \ -+ for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ; do \ + for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcmshell_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcmshell_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ + done; \ +- cat kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files > kcmshell_la.all_cpp.cpp; \ +- rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files ++ cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ + rm -f libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files -+ -+#>+ 11 -+libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp + + #>+ 11 +-kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp indexwidget.moc dockcontainer.moc moduleiconview.moc helpwidget.moc kecdialog.moc moduletreeview.moc searchwidget.moc moduleinfo.moc aboutwidget.moc proxywidget.moc quickhelp.moc main.moc modules.moc toplevel.moc moduleIface.moc +- @echo 'creating kcontrol_la.all_cpp.cpp ...'; \ +- rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ ++libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc + @echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \ + rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcontrol_main_la.all_cpp.final; \ -+ for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp ; do \ + for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcontrol_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcontrol_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ -+ rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files -+ -+#>+ 11 -+kcminit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp - @echo 'creating kcminit.all_cpp.cpp ...'; \ - rm -f kcminit.all_cpp.files kcminit.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcminit.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcminit_main.cpp ; do \ - echo "#include \"$$file\"" >> kcminit.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit.all_cpp.final; \ - done; \ -@@ -1094,11 +1171,11 @@ - rm -f kcminit.all_cpp.final kcminit.all_cpp.files - - #>+ 11 --kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp - @echo 'creating kcmshell.all_cpp.cpp ...'; \ - rm -f kcmshell.all_cpp.files kcmshell.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcmshell.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcmshell_main.cpp ; do \ - echo "#include \"$$file\"" >> kcmshell.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell.all_cpp.final; \ done; \ -@@ -1106,11 +1183,11 @@ - rm -f kcmshell.all_cpp.final kcmshell.all_cpp.files - - #>+ 11 --kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp - @echo 'creating kcontrol.all_cpp.cpp ...'; \ - rm -f kcontrol.all_cpp.files kcontrol.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcontrol.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcontrol_main.cpp ; do \ - echo "#include \"$$file\"" >> kcontrol.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol.all_cpp.final; \ - done; \ -@@ -1119,20 +1196,20 @@ +- cat kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files > kcontrol_la.all_cpp.cpp; \ +- rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files ++ cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ ++ rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp -+ -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp +- -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp ++ -rm -f kcminit_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp #>+ 2 final: @@ -486,4 +545,72 @@ $NetBSD: patch-ao,v 1.2 2002/08/25 19:23:37 jlam Exp $ + $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_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 +@@ -1101,39 +1160,39 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 37 +-quickhelp.o: quickhelp.moc ++searchwidget.lo: searchwidget.moc + toplevel.lo: toplevel.moc +-moduletreeview.lo: moduletreeview.moc +-main.lo: main.moc +-kcmshell.lo: kcmshell.moc +-kcdialog.lo: kcdialog.moc +-searchwidget.o: searchwidget.moc +-modulemenu.lo: modulemenu.moc +-moduleinfo.lo: moduleinfo.moc +-dockcontainer.o: dockcontainer.moc +-moduleiconview.o: moduleiconview.moc +-modules.o: modules.moc +-proxywidget.lo: proxywidget.moc +-kcmshell.o: kcmshell.moc +-dockcontainer.lo: dockcontainer.moc +-quickhelp.lo: quickhelp.moc +-indexwidget.o: indexwidget.moc +-kcdialog.o: kcdialog.moc + helpwidget.lo: helpwidget.moc +-modulemenu.o: modulemenu.moc ++indexwidget.o: indexwidget.moc ++moduleIface.lo: moduleIface.moc ++kcdialog.lo: kcdialog.moc + aboutwidget.lo: aboutwidget.moc +-main.o: main.moc + indexwidget.lo: indexwidget.moc +-helpwidget.o: helpwidget.moc +-moduleinfo.o: moduleinfo.moc +-aboutwidget.o: aboutwidget.moc +-toplevel.o: toplevel.moc +-moduleIface.o: moduleIface.moc +-moduletreeview.o: moduletreeview.moc + kecdialog.lo: kecdialog.moc +-searchwidget.lo: searchwidget.moc ++dockcontainer.o: dockcontainer.moc + proxywidget.o: proxywidget.moc +-moduleIface.lo: moduleIface.moc +-moduleiconview.lo: moduleiconview.moc ++modulemenu.o: modulemenu.moc ++moduletreeview.lo: moduletreeview.moc ++quickhelp.o: quickhelp.moc ++searchwidget.o: searchwidget.moc ++main.o: main.moc ++moduletreeview.o: moduletreeview.moc ++dockcontainer.lo: dockcontainer.moc ++kcdialog.o: kcdialog.moc ++moduleIface.o: moduleIface.moc + kecdialog.o: kecdialog.moc ++proxywidget.lo: proxywidget.moc ++aboutwidget.o: aboutwidget.moc ++quickhelp.lo: quickhelp.moc ++main.lo: main.moc ++moduleiconview.lo: moduleiconview.moc ++toplevel.o: toplevel.moc ++helpwidget.o: helpwidget.moc ++moduleinfo.lo: moduleinfo.moc ++modules.o: modules.moc ++kcmshell.lo: kcmshell.moc ++moduleiconview.o: moduleiconview.moc + modules.lo: modules.moc ++moduleinfo.o: moduleinfo.moc ++kcmshell.o: kcmshell.moc ++modulemenu.lo: modulemenu.moc diff --git a/x11/kdebase3/patches/patch-aw b/x11/kdebase3/patches/patch-aw index d86623396bb..146f0c7e683 100644 --- a/x11/kdebase3/patches/patch-aw +++ b/x11/kdebase3/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ +$NetBSD: patch-aw,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- kdeprint/kjobviewer/Makefile.in.orig Mon May 13 23:57:42 2002 +--- kdeprint/kjobviewer/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kdeprint/kjobviewer/Makefile.in -@@ -290,15 +290,20 @@ +@@ -289,15 +289,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kjobviewer @@ -28,7 +28,7 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kjobviewer.h -@@ -316,23 +321,28 @@ +@@ -315,22 +320,27 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -42,15 +42,13 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ +libkjobviewer_main_la_DEPENDENCIES = +am_libkjobviewer_main_la_OBJECTS = kjobviewer.lo main.lo +#>- libkjobviewer_main_la_OBJECTS = $(am_libkjobviewer_main_la_OBJECTS) - #>+ 5 + #>+ 4 -kjobviewer_la_final_OBJECTS = kjobviewer_la.all_cpp.lo --kjobviewer_la_nofinal_OBJECTS = kjobviewer.lo main.lo \ -- kjobviewer_la_meta_unload.lo +-kjobviewer_la_nofinal_OBJECTS = kjobviewer.lo main.lo -@KDE_USE_FINAL_FALSE@kjobviewer_la_OBJECTS = $(kjobviewer_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kjobviewer_la_OBJECTS = $(kjobviewer_la_final_OBJECTS) +libkjobviewer_main_la_final_OBJECTS = libkjobviewer_main_la.all_cpp.lo -+libkjobviewer_main_la_nofinal_OBJECTS = kjobviewer.lo main.lo \ -+ libkjobviewer_main_la_meta_unload.lo ++libkjobviewer_main_la_nofinal_OBJECTS = kjobviewer.lo main.lo +@KDE_USE_FINAL_FALSE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_final_OBJECTS) bin_PROGRAMS = kjobviewer$(EXEEXT) @@ -67,19 +65,31 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -340,8 +350,9 @@ +@@ -338,13 +348,16 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kjobviewer.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kjobviewer.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Po $(DEPDIR)/main.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kjobviewer.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo +-#>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kjobviewer_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kjobviewer.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kjobviewer.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kjobviewer.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Po $(DEPDIR)/main.Plo ++#>+ 7 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkjobviewer_main_la.all_cpp.P $(DEPDIR)/kjobviewer.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Po $(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kjobviewer.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Po $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -361,13 +372,14 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -365,13 +378,14 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -96,7 +106,7 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ #>- all: all-am #>+ 1 -@@ -416,6 +428,8 @@ +@@ -420,6 +434,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kjobviewer.la: $(kjobviewer_la_OBJECTS) $(kjobviewer_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kjobviewer_la_LDFLAGS) $(kjobviewer_la_OBJECTS) $(kjobviewer_la_LIBADD) $(LIBS) @@ -105,7 +115,7 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -450,8 +464,9 @@ +@@ -454,8 +470,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -116,7 +126,7 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ distclean-depend: -@@ -545,7 +560,7 @@ +@@ -549,7 +566,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 @@ -125,7 +135,7 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -666,9 +681,6 @@ +@@ -670,9 +687,6 @@ uninstall-am: uninstall-kde-icons unins uninstall-info-am uninstall-libLTLIBRARIES uninstall-rcDATA @@ -135,7 +145,7 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. -@@ -680,8 +692,12 @@ +@@ -684,8 +698,12 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc #>+ 3 @@ -149,79 +159,33 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ #>+ 2 docs-am: -@@ -705,28 +721,28 @@ - - - #>+ 12 --kjobviewer_la_meta_unload.cpp: kjobviewer.moc -- @echo 'creating kjobviewer_la_meta_unload.cpp' -- @-rm -f kjobviewer_la_meta_unload.cpp -+libkjobviewer_main_la_meta_unload.cpp: kjobviewer.moc -+ @echo 'creating libkjobviewer_main_la_meta_unload.cpp' -+ @-rm -f libkjobviewer_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kjobviewer_la[] = {' > kjobviewer_la_meta_unload.cpp ;\ -- cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kjobviewer_la_meta_unload.cpp ;\ -- echo '0};' >> kjobviewer_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kjobviewer_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kjobviewer_la)' >> kjobviewer_la_meta_unload.cpp ;\ -- else echo > kjobviewer_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkjobviewer_main_la[] = {' > libkjobviewer_main_la_meta_unload.cpp ;\ -+ cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkjobviewer_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkjobviewer_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkjobviewer_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkjobviewer_main_la)' >> libkjobviewer_main_la_meta_unload.cpp ;\ -+ else echo > libkjobviewer_main_la_meta_unload.cpp; fi +@@ -709,33 +727,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f kjobviewer_la_meta_unload.cpp -+ -rm -f libkjobviewer_main_la_meta_unload.cpp - #>+ 11 --kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer_la_meta_unload.cpp kjobviewer.moc -+kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp kjobviewer.moc - @echo 'creating kjobviewer_la.all_cpp.cpp ...'; \ - rm -f kjobviewer_la.all_cpp.files kjobviewer_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kjobviewer_la.all_cpp.final; \ -- for file in kjobviewer.cpp main.cpp kjobviewer_la_meta_unload.cpp ; do \ -+ for file in kjobviewer_main.cpp ; do \ - echo "#include \"$$file\"" >> kjobviewer_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer_la.all_cpp.final; \ - done; \ -@@ -734,11 +750,23 @@ - rm -f kjobviewer_la.all_cpp.final kjobviewer_la.all_cpp.files - - #>+ 11 --kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkjobviewer_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp libkjobviewer_main_la_meta_unload.cpp kjobviewer.moc +-kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer.moc +- @echo 'creating kjobviewer_la.all_cpp.cpp ...'; \ +- rm -f kjobviewer_la.all_cpp.files kjobviewer_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kjobviewer_la.all_cpp.final; \ ++libkjobviewer_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer.moc + @echo 'creating libkjobviewer_main_la.all_cpp.cpp ...'; \ + rm -f libkjobviewer_main_la.all_cpp.files libkjobviewer_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkjobviewer_main_la.all_cpp.final; \ -+ for file in kjobviewer.cpp main.cpp libkjobviewer_main_la_meta_unload.cpp ; do \ + for file in kjobviewer.cpp main.cpp ; do \ +- echo "#include \"$$file\"" >> kjobviewer_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkjobviewer_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkjobviewer_main_la.all_cpp.final; \ -+ done; \ -+ cat libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files > libkjobviewer_main_la.all_cpp.cpp; \ -+ rm -f libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files -+ -+#>+ 11 -+kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp - @echo 'creating kjobviewer.all_cpp.cpp ...'; \ - rm -f kjobviewer.all_cpp.files kjobviewer.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kjobviewer.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kjobviewer_main.cpp ; do \ - echo "#include \"$$file\"" >> kjobviewer.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer.all_cpp.final; \ done; \ -@@ -747,20 +775,20 @@ +- cat kjobviewer_la.all_cpp.final kjobviewer_la.all_cpp.files > kjobviewer_la.all_cpp.cpp; \ +- rm -f kjobviewer_la.all_cpp.final kjobviewer_la.all_cpp.files ++ cat libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files > libkjobviewer_main_la.all_cpp.cpp; \ ++ rm -f libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp -+ -rm -f kjobviewer_la.all_cpp.cpp libkjobviewer_main_la.all_cpp.cpp kjobviewer.all_cpp.cpp +- -rm -f kjobviewer_la.all_cpp.cpp ++ -rm -f libkjobviewer_main_la.all_cpp.cpp #>+ 2 final: @@ -241,10 +205,12 @@ $NetBSD: patch-aw,v 1.2 2002/08/25 19:23:38 jlam Exp $ + $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -770,4 +798,4 @@ + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -745,5 +763,5 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 2 --$(srcdir)/kjobviewer.cpp: kjobviewer.moc -+$(srcdir)/kjobviewer.cpp: kjobviewer.moc kjobviewer.moc + #>+ 3 +-kjobviewer.o: kjobviewer.moc +-kjobviewer.lo: kjobviewer.moc ++kjobviewer.o: kjobviewer.moc kjobviewer.moc ++kjobviewer.lo: kjobviewer.moc kjobviewer.moc diff --git a/x11/kdebase3/patches/patch-ba b/x11/kdebase3/patches/patch-ba index 19344a887b3..87f43511386 100644 --- a/x11/kdebase3/patches/patch-ba +++ b/x11/kdebase3/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ +$NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- kdesktop/Makefile.in.orig Mon May 13 23:57:43 2002 +--- kdesktop/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kdesktop/Makefile.in -@@ -288,10 +288,17 @@ +@@ -287,10 +287,17 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) @@ -22,7 +22,7 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ SUBDIRS = . lock pics patterns programs init kwebdesktop -@@ -299,22 +306,24 @@ +@@ -298,22 +305,24 @@ SUBDIRS = . lock pics patterns programs ####### Files bin_PROGRAMS = kdesktop kdmdesktop bin_SCRIPTS = kdeeject @@ -30,12 +30,12 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ +lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la -#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ --#>- lockeng.cc KDesktopIface.skel \ +-#>- lockeng.cc KDesktopIface.skel \ +#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc \ -+#>- desktop.cc main.cc lockeng.cc KDesktopIface.skel \ - #>- bgmanager.cc init.cc KScreensaverIface.skel \ - #>- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ - #>- startupid.cpp ++#>- desktop.cc main.cc lockeng.cc KDesktopIface.skel \ + #>- bgmanager.cc init.cc KScreensaverIface.skel \ + #>- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ + #>- startupid.cpp #>+ 5 -kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ - lockeng.cc \ @@ -53,7 +53,7 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h -@@ -340,28 +349,33 @@ +@@ -339,27 +348,32 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -71,17 +71,15 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ pixmapserver.lo kcustommenu.lo startupid.lo -#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) +#>- libkdesktop_main_la_OBJECTS = $(am_libkdesktop_main_la_OBJECTS) - #>+ 7 --kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo + #>+ 6 +-kdesktop_la_final_OBJECTS = kdesktop_la.all_cc.lo kdesktop_la.all_cpp.lo -kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ +libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo +libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ - pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ -- kdesktop_la_meta_unload.lo + pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo -@KDE_USE_FINAL_FALSE@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS) -+ libkdesktop_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS) bin_PROGRAMS = kdesktop$(EXEEXT) kdmdesktop$(EXEEXT) @@ -97,20 +95,43 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ +kdesktop_DEPENDENCIES = libkdesktop_main.la am_kdmdesktop_OBJECTS = kdmdesktop.$(OBJEXT) #>- kdmdesktop_OBJECTS = $(am_kdmdesktop_OBJECTS) - #>+ 5 -@@ -381,8 +395,9 @@ + #>+ 1 +@@ -375,23 +389,26 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ -@@ -414,8 +429,8 @@ + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/startupid.Plo $(DEPDIR)/xautolock.Plo +-#>+ 15 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/kdesktop_la.all_cc.P $(DEPDIR)/kdesktop_la.all_cpp.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ ++#>+ 17 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/libkdesktop_main_la.all_cpp.P $(DEPDIR)/libkdesktop_main_la.all_cc.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/startupid.Plo $(DEPDIR)/xautolock.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ +@@ -424,8 +441,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -121,7 +142,7 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ DATA = $(autostart_DATA) $(menu_DATA) HEADERS = $(include_HEADERS) $(noinst_HEADERS) -@@ -428,7 +443,7 @@ +@@ -438,7 +455,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS Makefile.am \ Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -130,7 +151,7 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -477,6 +492,8 @@ +@@ -487,6 +504,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) @@ -139,7 +160,7 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -537,9 +554,10 @@ +@@ -547,9 +566,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bgmanager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/desktop.Plo@am__quote@ @@ -151,174 +172,224 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:38 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdiconview.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdmdesktop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/krootwm.Plo@am__quote@ -@@ -736,7 +754,7 @@ +@@ -746,7 +766,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 pixmapserver.cc bgmanager.cc lockeng.cc DESIGN kcustommenu.h minicli.cpp kdiconview.h kdesktopbindings.cpp kcustommenu.cc kdmdesktop.h startupid.cpp init.cc kdeeject +-KDE_DIST=kcustommenu.h kdesktopbindings.cpp pixmapserver.cc DESIGN lockeng.cc kdesktop.desktop kdesktop_custom_menu1 minicli.cpp startupid.cpp kdiconview.h kcustommenu.cc bgmanager.cc kdeeject kdesktop_custom_menu2 init.cc kdmdesktop.h +KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h minicli.cpp kdiconview.h startupid.cpp init.cc pixmapserver.cc bgmanager.cc main.cc desktop.cc kdesktopbindings.cpp kdeeject lockeng.cc kcustommenu.cc kdmdesktop.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -890,20 +908,6 @@ +@@ -900,67 +920,67 @@ dummy.cc: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 13 --KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOPIDL_DEPENDENCIES) +-KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false ) -KDesktopIface_skel.cc: KDesktopIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl --KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOPIDL_DEPENDENCIES) +-KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false ) -KScreensaverIface_skel.cc: KScreensaverIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl --KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOPIDL_DEPENDENCIES) +-KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false ) -KBackgroundIface_skel.cc: KBackgroundIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl - +-#>+ 3 +-krootwm.moc: $(srcdir)/krootwm.h +- $(MOC) $(srcdir)/krootwm.h -o krootwm.moc +- + #>+ 3 +-minicli.moc: $(srcdir)/minicli.h +- $(MOC) $(srcdir)/minicli.h -o minicli.moc ++xautolock.moc: $(srcdir)/xautolock.h ++ $(MOC) $(srcdir)/xautolock.h -o xautolock.moc + + #>+ 3 +-startupid.moc: $(srcdir)/startupid.h +- $(MOC) $(srcdir)/startupid.h -o startupid.moc ++lockeng.moc: $(srcdir)/lockeng.h ++ $(MOC) $(srcdir)/lockeng.h -o lockeng.moc + #>+ 3 - xautolock.moc: $(srcdir)/xautolock.h - $(MOC) $(srcdir)/xautolock.h -o xautolock.moc -@@ -948,6 +952,20 @@ - krootwm.moc: $(srcdir)/krootwm.h - $(MOC) $(srcdir)/krootwm.h -o krootwm.moc +-kdmdesktop.moc: $(srcdir)/kdmdesktop.h +- $(MOC) $(srcdir)/kdmdesktop.h -o kdmdesktop.moc ++bgmanager.moc: $(srcdir)/bgmanager.h ++ $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc + #>+ 3 +-lockeng.moc: $(srcdir)/lockeng.h +- $(MOC) $(srcdir)/lockeng.h -o lockeng.moc ++kdiconview.moc: $(srcdir)/kdiconview.h ++ $(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc + + #>+ 3 + desktop.moc: $(srcdir)/desktop.h + $(MOC) $(srcdir)/desktop.h -o desktop.moc + + #>+ 3 ++kdmdesktop.moc: $(srcdir)/kdmdesktop.h ++ $(MOC) $(srcdir)/kdmdesktop.h -o kdmdesktop.moc ++ ++#>+ 3 + pixmapserver.moc: $(srcdir)/pixmapserver.h + $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc + + #>+ 3 ++startupid.moc: $(srcdir)/startupid.h ++ $(MOC) $(srcdir)/startupid.h -o startupid.moc ++ ++#>+ 3 + kcustommenu.moc: $(srcdir)/kcustommenu.h + $(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc + + #>+ 3 +-kdiconview.moc: $(srcdir)/kdiconview.h +- $(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc ++minicli.moc: $(srcdir)/minicli.h ++ $(MOC) $(srcdir)/minicli.h -o minicli.moc + + #>+ 3 +-xautolock.moc: $(srcdir)/xautolock.h +- $(MOC) $(srcdir)/xautolock.h -o xautolock.moc ++krootwm.moc: $(srcdir)/krootwm.h ++ $(MOC) $(srcdir)/krootwm.h -o krootwm.moc + +-#>+ 3 +-bgmanager.moc: $(srcdir)/bgmanager.h +- $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc +#>+ 13 -+KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOPIDL_DEPENDENCIES) ++KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false ) +KDesktopIface_skel.cc: KDesktopIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl -+KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOPIDL_DEPENDENCIES) ++KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false ) +KScreensaverIface_skel.cc: KScreensaverIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl -+KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOPIDL_DEPENDENCIES) ++KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false ) +KBackgroundIface_skel.cc: KBackgroundIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl -+ + #>+ 3 clean-metasources: - -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc -@@ -970,16 +988,16 @@ - - - #>+ 12 --kdesktop_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc -- @echo 'creating kdesktop_la_meta_unload.cc' -- @-rm -f kdesktop_la_meta_unload.cc -+libkdesktop_main_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc -+ @echo 'creating libkdesktop_main_la_meta_unload.cc' -+ @-rm -f libkdesktop_main_la_meta_unload.cc - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc ;\ -- cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc ;\ -- echo '0};' >> kdesktop_la_meta_unload.cc ;\ -- echo '#include <kunload.h>' >> kdesktop_la_meta_unload.cc ;\ -- echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc ;\ -- else echo > kdesktop_la_meta_unload.cc; fi -+ echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc ;\ -+ cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc ;\ -+ echo '0};' >> libkdesktop_main_la_meta_unload.cc ;\ -+ echo '#include <kunload.h>' >> libkdesktop_main_la_meta_unload.cc ;\ -+ echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc ;\ -+ else echo > libkdesktop_main_la_meta_unload.cc; fi - - - #>+ 12 -@@ -997,26 +1015,14 @@ +- -rm -f krootwm.moc minicli.moc startupid.moc kdmdesktop.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc ++ -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc - #>+ 3 - clean-moc-classes: -- -rm -f kdesktop_la_meta_unload.cc kdmdesktop_meta_unload.cc -+ -rm -f libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc + #>+ 6 + clean-idl: +@@ -980,45 +1000,45 @@ force-reedit: - #>+ 11 --kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc -- @echo 'creating kdesktop_la.all_cpp.cpp ...'; \ -- rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ -- for file in minicli.cpp startupid.cpp ; do \ -- echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ -- done; \ -- cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ -- rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files -- --#>+ 11 --kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc -+kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc - @echo 'creating kdesktop_la.all_cc.cc ...'; \ - rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ -- for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc ; do \ -+ for file in kdesktop_main.cc ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ - done; \ -@@ -1024,11 +1030,35 @@ - rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files #>+ 11 --kdesktop.all_cc.cc: $(srcdir)/Makefile.in dummy.cc -+libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp +-kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc +- @echo 'creating kdesktop_la.all_cc.cc ...'; \ +- rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ +- echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ +- for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ +- echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ ++libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc + @echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \ + rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \ + for file in minicli.cpp startupid.cpp ; do \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cpp.final; \ -+ done; \ -+ cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \ + done; \ +- cat kdesktop_la.all_cc.final kdesktop_la.all_cc.files > kdesktop_la.all_cc.cc; \ +- rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files ++ cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \ + rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files -+ -+#>+ 11 -+libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc + + #>+ 11 +-kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc +- @echo 'creating kdesktop_la.all_cpp.cpp ...'; \ +- rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ +- for file in minicli.cpp startupid.cpp ; do \ +- echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ ++libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc + @echo 'creating libkdesktop_main_la.all_cc.cc ...'; \ + rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \ -+ for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ; do \ ++ for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \ -+ done; \ -+ cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \ -+ rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files -+ -+#>+ 11 -+kdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc - @echo 'creating kdesktop.all_cc.cc ...'; \ - rm -f kdesktop.all_cc.files kdesktop.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop.all_cc.final; \ -- for file in dummy.cc ; do \ -+ for file in kdesktop_main.cc ; do \ - echo "#include \"$$file\"" >> kdesktop.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop.all_cc.final; \ done; \ -@@ -1061,20 +1091,20 @@ +- cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ +- rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files ++ cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \ ++ rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files #>+ 3 clean-final: -- -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc -+ -rm -f kdesktop_la.all_cc.cc libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc +- -rm -f kdesktop_la.all_cc.cc kdesktop_la.all_cpp.cpp ++ -rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc #>+ 2 final: -- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am -+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" all-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am -+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" install-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am -+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am -+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_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 +@@ -1028,25 +1048,25 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 23 +-kdiconview.o: kdiconview.moc +-lockeng.o: lockeng.moc + krootwm.lo: krootwm.moc ++minicli.lo: minicli.moc ++krootwm.o: krootwm.moc + pixmapserver.lo: pixmapserver.moc +-bgmanager.o: bgmanager.moc ++kdmdesktop.lo: kdmdesktop.moc ++kdmdesktop.o: kdmdesktop.moc + xautolock.o: xautolock.moc +-krootwm.o: krootwm.moc +-kcustommenu.o: kcustommenu.moc +-pixmapserver.o: pixmapserver.moc +-minicli.o: minicli.moc +-desktop.lo: desktop.moc ++lockeng.o: lockeng.moc ++bgmanager.lo: bgmanager.moc ++startupid.o: startupid.moc + xautolock.lo: xautolock.moc +-startupid.lo: startupid.moc +-kdmdesktop.o: kdmdesktop.moc +-lockeng.lo: lockeng.moc +-minicli.lo: minicli.moc + desktop.o: desktop.moc +-startupid.o: startupid.moc +-kdmdesktop.lo: kdmdesktop.moc +-bgmanager.lo: bgmanager.moc ++desktop.lo: desktop.moc ++kcustommenu.o: kcustommenu.moc ++lockeng.lo: lockeng.moc ++startupid.lo: startupid.moc ++minicli.o: minicli.moc + kdiconview.lo: kdiconview.moc ++pixmapserver.o: pixmapserver.moc + kcustommenu.lo: kcustommenu.moc ++kdiconview.o: kdiconview.moc ++bgmanager.o: bgmanager.moc diff --git a/x11/kdebase3/patches/patch-be b/x11/kdebase3/patches/patch-be index f8b13b417d2..9a82cac271a 100644 --- a/x11/kdebase3/patches/patch-be +++ b/x11/kdebase3/patches/patch-be @@ -1,9 +1,9 @@ -$NetBSD: patch-be,v 1.2 2002/08/25 19:23:38 jlam Exp $ +$NetBSD: patch-be,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- kdesktop/main.cc.orig Wed May 8 19:21:24 2002 +--- kdesktop/main.cc.orig Mon Dec 16 02:43:09 2002 +++ kdesktop/main.cc -@@ -70,7 +70,9 @@ - KApplication::kApplication()->quit(); // turn catchable signals into clean shutdown +@@ -75,7 +75,9 @@ static void signalHandler(int sigId) + kapp->quit(); // turn catchable signals into clean shutdown } -int main( int argc, char **argv ) diff --git a/x11/kdebase3/patches/patch-bg b/x11/kdebase3/patches/patch-bg index b9f3c1aa689..517567fb8fe 100644 --- a/x11/kdebase3/patches/patch-bg +++ b/x11/kdebase3/patches/patch-bg @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ +$NetBSD: patch-bg,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- khotkeys/khotkeys/Makefile.in.orig Mon May 13 23:57:45 2002 +--- khotkeys/khotkeys/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ khotkeys/khotkeys/Makefile.in -@@ -290,16 +290,20 @@ +@@ -289,16 +289,20 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ bin_PROGRAMS = khotkeys @@ -29,7 +29,7 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = khotkeys.desktop -@@ -316,23 +320,28 @@ +@@ -315,22 +319,27 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -43,15 +43,13 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ +libkhotkeys_main_la_DEPENDENCIES = ../shared/libshared.la +am_libkhotkeys_main_la_OBJECTS = khotkeys.lo main.lo +#>- libkhotkeys_main_la_OBJECTS = $(am_libkhotkeys_main_la_OBJECTS) - #>+ 5 + #>+ 4 -khotkeys_la_final_OBJECTS = khotkeys_la.all_cpp.lo --khotkeys_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo \ -- khotkeys_la_meta_unload.lo +-khotkeys_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo -@KDE_USE_FINAL_FALSE@khotkeys_la_OBJECTS = $(khotkeys_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@khotkeys_la_OBJECTS = $(khotkeys_la_final_OBJECTS) +libkhotkeys_main_la_final_OBJECTS = libkhotkeys_main_la.all_cpp.lo -+libkhotkeys_main_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo \ -+ libkhotkeys_main_la_meta_unload.lo ++libkhotkeys_main_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo +@KDE_USE_FINAL_FALSE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_final_OBJECTS) bin_PROGRAMS = khotkeys$(EXEEXT) @@ -68,19 +66,31 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -340,8 +349,9 @@ +@@ -338,13 +347,16 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/khotkeys.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/khotkeys.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Po $(DEPDIR)/main.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/khotkeys.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo +-#>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/khotkeys_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/khotkeys.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/khotkeys.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/khotkeys.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Po $(DEPDIR)/main.Plo ++#>+ 7 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/libkhotkeys_main_la.all_cpp.P $(DEPDIR)/khotkeys.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Po $(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/khotkeys.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Po $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -361,13 +371,14 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -365,13 +377,14 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -97,7 +107,7 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ #>- all: all-am #>+ 1 -@@ -416,6 +427,8 @@ +@@ -420,6 +433,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) khotkeys.la: $(khotkeys_la_OBJECTS) $(khotkeys_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(khotkeys_la_LDFLAGS) $(khotkeys_la_OBJECTS) $(khotkeys_la_LIBADD) $(LIBS) @@ -106,7 +116,7 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -450,8 +463,9 @@ +@@ -454,8 +469,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -117,16 +127,16 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ distclean-depend: -@@ -528,7 +542,7 @@ +@@ -532,7 +548,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=khkglobalaccel.h khotkeys.desktop khkglobalaccel.cpp +-KDE_DIST=khkglobalaccel.cpp khotkeys.desktop khkglobalaccel.h +KDE_DIST=khotkeys.desktop khkglobalaccel.h khkglobalaccel.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -643,19 +657,10 @@ +@@ -647,30 +663,27 @@ uninstall-am: uninstall-autostartDATA un uninstall-am uninstall-autostartDATA uninstall-binPROGRAMS \ uninstall-info-am uninstall-libLTLIBRARIES @@ -138,100 +148,61 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ .NOEXPORT: -#>+ 5 --khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOPIDL_DEPENDENCIES) +-khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; /bin/false ) -khotkeys_skel.cpp: khotkeys.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl -- ++#>+ 3 ++khotkeys.moc: $(srcdir)/khotkeys.h ++ $(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc + #>+ 3 - khotkeys.moc: $(srcdir)/khotkeys.h - $(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc -@@ -664,6 +669,12 @@ khkglobalaccel.moc: $(srcdir)/khkglobalaccel.h $(MOC) $(srcdir)/khkglobalaccel.h -o khkglobalaccel.moc +-#>+ 3 +-khotkeys.moc: $(srcdir)/khotkeys.h +- $(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc +#>+ 5 -+khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOPIDL_DEPENDENCIES) ++khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; /bin/false ) +khotkeys_skel.cpp: khotkeys.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl -+ + #>+ 3 clean-metasources: - -rm -f khotkeys.moc khkglobalaccel.moc -@@ -684,28 +695,28 @@ - - - #>+ 12 --khotkeys_la_meta_unload.cpp: khotkeys.moc -- @echo 'creating khotkeys_la_meta_unload.cpp' -- @-rm -f khotkeys_la_meta_unload.cpp -+libkhotkeys_main_la_meta_unload.cpp: khotkeys.moc -+ @echo 'creating libkhotkeys_main_la_meta_unload.cpp' -+ @-rm -f libkhotkeys_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_khotkeys_la[] = {' > khotkeys_la_meta_unload.cpp ;\ -- cat khotkeys.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> khotkeys_la_meta_unload.cpp ;\ -- echo '0};' >> khotkeys_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> khotkeys_la_meta_unload.cpp ;\ -- echo '_UNLOAD(khotkeys_la)' >> khotkeys_la_meta_unload.cpp ;\ -- else echo > khotkeys_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkhotkeys_main_la[] = {' > libkhotkeys_main_la_meta_unload.cpp ;\ -+ cat khotkeys.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkhotkeys_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkhotkeys_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkhotkeys_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkhotkeys_main_la)' >> libkhotkeys_main_la_meta_unload.cpp ;\ -+ else echo > libkhotkeys_main_la_meta_unload.cpp; fi - +- -rm -f khkglobalaccel.moc khotkeys.moc ++ -rm -f khotkeys.moc khkglobalaccel.moc - #>+ 3 - clean-moc-classes: -- -rm -f khotkeys_la_meta_unload.cpp -+ -rm -f libkhotkeys_main_la_meta_unload.cpp + #>+ 4 + clean-idl: +@@ -688,33 +701,33 @@ force-reedit: - #>+ 11 --khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp khotkeys.moc khkglobalaccel.moc -+khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp khotkeys.moc khkglobalaccel.moc - @echo 'creating khotkeys_la.all_cpp.cpp ...'; \ - rm -f khotkeys_la.all_cpp.files khotkeys_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> khotkeys_la.all_cpp.final; \ -- for file in khotkeys.cpp main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp ; do \ -+ for file in khotkeys_main.cpp ; do \ - echo "#include \"$$file\"" >> khotkeys_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys_la.all_cpp.final; \ - done; \ -@@ -713,11 +724,23 @@ - rm -f khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files #>+ 11 --khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkhotkeys_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp libkhotkeys_main_la_meta_unload.cpp +-khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys.moc +- @echo 'creating khotkeys_la.all_cpp.cpp ...'; \ +- rm -f khotkeys_la.all_cpp.files khotkeys_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> khotkeys_la.all_cpp.final; \ ++libkhotkeys_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys.moc + @echo 'creating libkhotkeys_main_la.all_cpp.cpp ...'; \ + rm -f libkhotkeys_main_la.all_cpp.files libkhotkeys_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkhotkeys_main_la.all_cpp.final; \ -+ for file in khotkeys.cpp main.cpp khotkeys_skel.cpp libkhotkeys_main_la_meta_unload.cpp ; do \ + for file in khotkeys.cpp main.cpp khotkeys_skel.cpp ; do \ +- echo "#include \"$$file\"" >> khotkeys_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkhotkeys_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkhotkeys_main_la.all_cpp.final; \ -+ done; \ -+ cat libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files > libkhotkeys_main_la.all_cpp.cpp; \ -+ rm -f libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files -+ -+#>+ 11 -+khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp - @echo 'creating khotkeys.all_cpp.cpp ...'; \ - rm -f khotkeys.all_cpp.files khotkeys.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> khotkeys.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in khotkeys_main.cpp ; do \ - echo "#include \"$$file\"" >> khotkeys.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys.all_cpp.final; \ done; \ -@@ -726,20 +749,20 @@ +- cat khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files > khotkeys_la.all_cpp.cpp; \ +- rm -f khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files ++ cat libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files > libkhotkeys_main_la.all_cpp.cpp; \ ++ rm -f libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f khotkeys_la.all_cpp.cpp khotkeys.all_cpp.cpp -+ -rm -f khotkeys_la.all_cpp.cpp libkhotkeys_main_la.all_cpp.cpp khotkeys.all_cpp.cpp +- -rm -f khotkeys_la.all_cpp.cpp ++ -rm -f libkhotkeys_main_la.all_cpp.cpp #>+ 2 final: @@ -251,4 +222,12 @@ $NetBSD: patch-bg,v 1.2 2002/08/25 19:23:38 jlam Exp $ + $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_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 +@@ -725,6 +738,6 @@ kde-rpo-clean: + + #>+ 5 + khotkeys.lo: khotkeys.moc +-khotkeys.o: khotkeys.moc + khkglobalaccel.lo: khkglobalaccel.moc + khkglobalaccel.o: khkglobalaccel.moc ++khotkeys.o: khotkeys.moc diff --git a/x11/kdebase3/patches/patch-bk b/x11/kdebase3/patches/patch-bk index eb7703941db..62defeacd71 100644 --- a/x11/kdebase3/patches/patch-bk +++ b/x11/kdebase3/patches/patch-bk @@ -1,8 +1,8 @@ -$NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $ +$NetBSD: patch-bk,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- kicker/Makefile.in.orig Mon May 13 23:57:45 2002 +--- kicker/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kicker/Makefile.in -@@ -292,19 +292,23 @@ +@@ -291,19 +291,23 @@ INCLUDES = $(all_includes) SUBDIRS = share core ui buttons . proxy taskmanager taskbar applets extensions menuext data bin_PROGRAMS = kicker @@ -32,7 +32,7 @@ $NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $ kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = panel.desktop -@@ -315,21 +319,26 @@ +@@ -314,21 +318,26 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -66,17 +66,22 @@ $NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -337,7 +346,8 @@ +@@ -336,9 +345,11 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/dummy.Po -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/kicker_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kicker_main.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/dummy.Po +-#>+ 2 +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/dummy.Po ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/kicker_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kicker_main.Po ++#>+ 3 ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/kicker_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kicker_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -357,7 +367,8 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -359,7 +370,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -86,7 +91,7 @@ $NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $ DATA = $(autostart_DATA) -@@ -367,7 +378,7 @@ +@@ -369,7 +381,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = AUTHORS ChangeLog Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -95,7 +100,7 @@ $NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -414,11 +425,13 @@ +@@ -416,11 +428,13 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) @@ -113,7 +118,7 @@ $NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -454,7 +467,8 @@ +@@ -456,7 +470,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Plo@am__quote@ @@ -123,7 +128,7 @@ $NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $ distclean-depend: -rm -rf $(DEPDIR) -@@ -738,17 +752,17 @@ +@@ -740,17 +755,17 @@ dummy.cpp: .NOEXPORT: #>+ 8 @@ -148,52 +153,3 @@ $NetBSD: patch-bk,v 1.2 2002/08/25 19:23:39 jlam Exp $ #>+ 2 docs-am: -@@ -761,11 +775,11 @@ - - - #>+ 11 --kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kicker_main.cpp - @echo 'creating kicker_la.all_cpp.cpp ...'; \ - rm -f kicker_la.all_cpp.files kicker_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kicker_la.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kicker_main.cpp ; do \ - echo "#include \"$$file\"" >> kicker_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker_la.all_cpp.final; \ - done; \ -@@ -773,11 +787,23 @@ - rm -f kicker_la.all_cpp.final kicker_la.all_cpp.files - - #>+ 11 --kicker.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkicker_main_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+ @echo 'creating libkicker_main_la.all_cpp.cpp ...'; \ -+ rm -f libkicker_main_la.all_cpp.files libkicker_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkicker_main_la.all_cpp.final; \ -+ for file in dummy.cpp ; do \ -+ echo "#include \"$$file\"" >> libkicker_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkicker_main_la.all_cpp.final; \ -+ done; \ -+ cat libkicker_main_la.all_cpp.final libkicker_main_la.all_cpp.files > libkicker_main_la.all_cpp.cpp; \ -+ rm -f libkicker_main_la.all_cpp.final libkicker_main_la.all_cpp.files -+ -+#>+ 11 -+kicker.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kicker_main.cpp - @echo 'creating kicker.all_cpp.cpp ...'; \ - rm -f kicker.all_cpp.files kicker.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kicker.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kicker_main.cpp ; do \ - echo "#include \"$$file\"" >> kicker.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker.all_cpp.final; \ - done; \ -@@ -786,7 +812,7 @@ - - #>+ 3 - clean-final: -- -rm -f kicker_la.all_cpp.cpp kicker.all_cpp.cpp -+ -rm -f kicker_la.all_cpp.cpp libkicker_main_la.all_cpp.cpp kicker.all_cpp.cpp - - #>+ 2 - final: diff --git a/x11/kdebase3/patches/patch-bm b/x11/kdebase3/patches/patch-bm index c2ceeb41081..1ee2fcaa4bd 100644 --- a/x11/kdebase3/patches/patch-bm +++ b/x11/kdebase3/patches/patch-bm @@ -1,8 +1,8 @@ -$NetBSD: patch-bm,v 1.2 2002/08/25 19:23:39 jlam Exp $ +$NetBSD: patch-bm,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- kicker/applets/launcher/Makefile.in.orig Mon May 13 23:57:45 2002 +--- kicker/applets/launcher/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kicker/applets/launcher/Makefile.in -@@ -302,14 +302,14 @@ +@@ -301,14 +301,14 @@ lnk_DATA = quicklauncher.desktop EXTRA_DIST = $(lnk_DATA) launcher_panelapplet_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module @@ -19,3 +19,50 @@ $NetBSD: patch-bm,v 1.2 2002/08/25 19:23:39 jlam Exp $ am_launcher_panelapplet_la_OBJECTS = quicklauncher.lo quickbutton.lo \ quickaddappsmenu.lo #>- launcher_panelapplet_la_OBJECTS = $(am_launcher_panelapplet_la_OBJECTS) +@@ -622,10 +622,6 @@ srcdoc: + .NOEXPORT: + + #>+ 3 +-quickbutton.moc: $(srcdir)/quickbutton.h +- $(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc +- +-#>+ 3 + quickaddappsmenu.moc: $(srcdir)/quickaddappsmenu.h + $(MOC) $(srcdir)/quickaddappsmenu.h -o quickaddappsmenu.moc + +@@ -634,8 +630,12 @@ quicklauncher.moc: $(srcdir)/quicklaunch + $(MOC) $(srcdir)/quicklauncher.h -o quicklauncher.moc + + #>+ 3 ++quickbutton.moc: $(srcdir)/quickbutton.h ++ $(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f quickbutton.moc quickaddappsmenu.moc quicklauncher.moc ++ -rm -f quickaddappsmenu.moc quicklauncher.moc quickbutton.moc + + #>+ 2 + docs-am: +@@ -648,7 +648,7 @@ force-reedit: + + + #>+ 11 +-launcher_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/quicklauncher.cpp $(srcdir)/quickbutton.cpp $(srcdir)/quickaddappsmenu.cpp quickbutton.moc quickaddappsmenu.moc quicklauncher.moc ++launcher_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/quicklauncher.cpp $(srcdir)/quickbutton.cpp $(srcdir)/quickaddappsmenu.cpp quicklauncher.moc quickaddappsmenu.moc quickbutton.moc + @echo 'creating launcher_panelapplet_la.all_cpp.cpp ...'; \ + rm -f launcher_panelapplet_la.all_cpp.files launcher_panelapplet_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> launcher_panelapplet_la.all_cpp.final; \ +@@ -684,9 +684,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-quicklauncher.lo: quicklauncher.moc ++quicklauncher.o: quicklauncher.moc + quickaddappsmenu.lo: quickaddappsmenu.moc +-quickbutton.lo: quickbutton.moc + quickbutton.o: quickbutton.moc +-quicklauncher.o: quicklauncher.moc + quickaddappsmenu.o: quickaddappsmenu.moc ++quicklauncher.lo: quicklauncher.moc ++quickbutton.lo: quickbutton.moc diff --git a/x11/kdebase3/patches/patch-bp b/x11/kdebase3/patches/patch-bp index 1bcf5bb0c5e..72b143cadc6 100644 --- a/x11/kdebase3/patches/patch-bp +++ b/x11/kdebase3/patches/patch-bp @@ -1,8 +1,8 @@ -$NetBSD: patch-bp,v 1.2 2002/08/25 19:23:39 jlam Exp $ +$NetBSD: patch-bp,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- kicker/extensions/childpanel/Makefile.in.orig Mon May 13 23:57:46 2002 +--- kicker/extensions/childpanel/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kicker/extensions/childpanel/Makefile.in -@@ -296,7 +296,7 @@ +@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = childpanel_pane childpanel_panelextension_la_SOURCES=childpanelextension.cpp childpanelextension_skel.cpp #>- childpanel_panelextension_la_METASOURCES = AUTO childpanel_panelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module @@ -11,7 +11,7 @@ $NetBSD: patch-bp,v 1.2 2002/08/25 19:23:39 jlam Exp $ noinst_HEADERS = childpanelextension.h -@@ -310,7 +310,7 @@ +@@ -309,7 +309,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,11 @@ $NetBSD: patch-bp,v 1.2 2002/08/25 19:23:39 jlam Exp $ +childpanel_panelextension_la_DEPENDENCIES = ../../libkicker_main.la am_childpanel_panelextension_la_OBJECTS = childpanelextension.lo #>- childpanel_panelextension_la_OBJECTS = \ - #>- $(am_childpanel_panelextension_la_OBJECTS) + #>- $(am_childpanel_panelextension_la_OBJECTS) +@@ -676,5 +676,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-childpanelextension.lo: childpanelextension.moc + childpanelextension.o: childpanelextension.moc ++childpanelextension.lo: childpanelextension.moc diff --git a/x11/kdebase3/patches/patch-bs b/x11/kdebase3/patches/patch-bs index a6dcd702a01..62773a83491 100644 --- a/x11/kdebase3/patches/patch-bs +++ b/x11/kdebase3/patches/patch-bs @@ -1,8 +1,8 @@ -$NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ +$NetBSD: patch-bs,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- kicker/proxy/Makefile.in.orig Mon May 13 23:57:47 2002 +--- kicker/proxy/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kicker/proxy/Makefile.in -@@ -289,27 +289,35 @@ +@@ -288,27 +288,35 @@ x_libraries = @x_libraries@ INCLUDES = -I$(srcdir)/../share $(all_includes) @@ -13,15 +13,15 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ +lib_LTLIBRARIES = libappletproxy_main.la appletproxy.la \ + libextensionproxy_main.la extensionproxy.la + - --appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la --appletproxy_la_SOURCES = appletproxy.cpp --#>- appletproxy_la_METASOURCES = appletproxy.moc ++ +libappletproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la +libappletproxy_main_la_SOURCES = appletproxy.cpp +#>- libappletproxy_main_la_METASOURCES = appletproxy.moc +libappletproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -+ + +-appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la +-appletproxy_la_SOURCES = appletproxy.cpp +-#>- appletproxy_la_METASOURCES = appletproxy.moc +appletproxy_la_LIBADD = libappletproxy_main.la +appletproxy_la_SOURCES = appletproxy_main.cpp appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version @@ -51,7 +51,7 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = appletproxy.h extensionproxy.h -@@ -319,37 +327,48 @@ +@@ -318,29 +326,40 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -60,45 +60,28 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ +appletproxy_la_DEPENDENCIES = libappletproxy_main.la +am_appletproxy_la_OBJECTS = appletproxy_main.lo #>- appletproxy_la_OBJECTS = $(am_appletproxy_la_OBJECTS) --#>+ 5 --appletproxy_la_final_OBJECTS = appletproxy_la.all_cpp.lo --appletproxy_la_nofinal_OBJECTS = appletproxy.lo \ -- appletproxy_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@appletproxy_la_OBJECTS = $(appletproxy_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@appletproxy_la_OBJECTS = $(appletproxy_la_final_OBJECTS) + #>+ 1 +-appletproxy_la_OBJECTS = appletproxy.lo -extensionproxy_la_DEPENDENCIES = ../share/libkickermain.la -am_extensionproxy_la_OBJECTS = extensionproxy.lo -+#>+ 1 +appletproxy_la_OBJECTS = appletproxy_main.lo +extensionproxy_la_DEPENDENCIES = libextensionproxy_main.la +am_extensionproxy_la_OBJECTS = extensionproxy_main.lo #>- extensionproxy_la_OBJECTS = $(am_extensionproxy_la_OBJECTS) -+#>+ 1 + #>+ 1 +-extensionproxy_la_OBJECTS = extensionproxy.lo +extensionproxy_la_OBJECTS = extensionproxy_main.lo +libappletproxy_main_la_DEPENDENCIES = ../share/libkickermain.la +am_libappletproxy_main_la_OBJECTS = appletproxy.lo +#>- libappletproxy_main_la_OBJECTS = $(am_libappletproxy_main_la_OBJECTS) -+#>+ 5 -+libappletproxy_main_la_final_OBJECTS = libappletproxy_main_la.all_cpp.lo -+libappletproxy_main_la_nofinal_OBJECTS = appletproxy.lo \ -+ libappletproxy_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libappletproxy_main_la_OBJECTS = $(libappletproxy_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libappletproxy_main_la_OBJECTS = $(libappletproxy_main_la_final_OBJECTS) ++#>+ 1 ++libappletproxy_main_la_OBJECTS = appletproxy.lo +libextensionproxy_main_la_DEPENDENCIES = ../share/libkickermain.la +am_libextensionproxy_main_la_OBJECTS = extensionproxy.lo +#>- libextensionproxy_main_la_OBJECTS = \ -+#>- $(am_libextensionproxy_main_la_OBJECTS) - #>+ 5 --extensionproxy_la_final_OBJECTS = extensionproxy_la.all_cpp.lo --extensionproxy_la_nofinal_OBJECTS = extensionproxy.lo \ -- extensionproxy_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@extensionproxy_la_OBJECTS = $(extensionproxy_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@extensionproxy_la_OBJECTS = $(extensionproxy_la_final_OBJECTS) -+libextensionproxy_main_la_final_OBJECTS = libextensionproxy_main_la.all_cpp.lo -+libextensionproxy_main_la_nofinal_OBJECTS = extensionproxy.lo \ -+ libextensionproxy_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libextensionproxy_main_la_OBJECTS = $(libextensionproxy_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libextensionproxy_main_la_OBJECTS = $(libextensionproxy_main_la_final_OBJECTS) ++#>- $(am_libextensionproxy_main_la_OBJECTS) ++#>+ 1 ++libextensionproxy_main_la_OBJECTS = extensionproxy.lo bin_PROGRAMS = appletproxy$(EXEEXT) extensionproxy$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -121,22 +104,32 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -357,8 +376,12 @@ +@@ -348,11 +367,19 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo +-#>+ 3 +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Po ++#>+ 7 ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Po \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -379,11 +402,13 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -374,11 +401,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \ @@ -152,7 +145,7 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ #>- all: all-am #>+ 1 -@@ -434,6 +459,10 @@ +@@ -429,6 +458,10 @@ appletproxy.la: $(appletproxy_la_OBJECTS $(CXXLINK) -rpath $(libdir) $(appletproxy_la_LDFLAGS) $(appletproxy_la_OBJECTS) $(appletproxy_la_LIBADD) $(LIBS) extensionproxy.la: $(extensionproxy_la_OBJECTS) $(extensionproxy_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(extensionproxy_la_LDFLAGS) $(extensionproxy_la_OBJECTS) $(extensionproxy_la_LIBADD) $(LIBS) @@ -163,7 +156,7 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -472,8 +501,11 @@ +@@ -467,8 +500,11 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/appletproxy.Plo@am__quote@ @@ -176,7 +169,7 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ distclean-depend: -rm -rf $(DEPDIR) -@@ -576,7 +608,6 @@ +@@ -571,7 +607,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -184,7 +177,7 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -646,9 +677,6 @@ +@@ -641,9 +676,6 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot @@ -194,158 +187,12 @@ $NetBSD: patch-bs,v 1.2 2002/08/25 19:23:39 jlam 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: -@@ -676,41 +704,41 @@ - - - #>+ 12 --appletproxy_la_meta_unload.cpp: appletproxy.moc -- @echo 'creating appletproxy_la_meta_unload.cpp' -- @-rm -f appletproxy_la_meta_unload.cpp -+libappletproxy_main_la_meta_unload.cpp: appletproxy.moc -+ @echo 'creating libappletproxy_main_la_meta_unload.cpp' -+ @-rm -f libappletproxy_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_appletproxy_la[] = {' > appletproxy_la_meta_unload.cpp ;\ -- cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> appletproxy_la_meta_unload.cpp ;\ -- echo '0};' >> appletproxy_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> appletproxy_la_meta_unload.cpp ;\ -- echo '_UNLOAD(appletproxy_la)' >> appletproxy_la_meta_unload.cpp ;\ -- else echo > appletproxy_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libappletproxy_main_la[] = {' > libappletproxy_main_la_meta_unload.cpp ;\ -+ cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libappletproxy_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libappletproxy_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libappletproxy_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libappletproxy_main_la)' >> libappletproxy_main_la_meta_unload.cpp ;\ -+ else echo > libappletproxy_main_la_meta_unload.cpp; fi - - - #>+ 12 --extensionproxy_la_meta_unload.cpp: extensionproxy.moc -- @echo 'creating extensionproxy_la_meta_unload.cpp' -- @-rm -f extensionproxy_la_meta_unload.cpp -+libextensionproxy_main_la_meta_unload.cpp: extensionproxy.moc -+ @echo 'creating libextensionproxy_main_la_meta_unload.cpp' -+ @-rm -f libextensionproxy_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_extensionproxy_la[] = {' > extensionproxy_la_meta_unload.cpp ;\ -- cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> extensionproxy_la_meta_unload.cpp ;\ -- echo '0};' >> extensionproxy_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> extensionproxy_la_meta_unload.cpp ;\ -- echo '_UNLOAD(extensionproxy_la)' >> extensionproxy_la_meta_unload.cpp ;\ -- else echo > extensionproxy_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libextensionproxy_main_la[] = {' > libextensionproxy_main_la_meta_unload.cpp ;\ -+ cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libextensionproxy_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libextensionproxy_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libextensionproxy_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libextensionproxy_main_la)' >> libextensionproxy_main_la_meta_unload.cpp ;\ -+ else echo > libextensionproxy_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f appletproxy_la_meta_unload.cpp extensionproxy_la_meta_unload.cpp -+ -rm -f libappletproxy_main_la_meta_unload.cpp libextensionproxy_main_la_meta_unload.cpp +@@ -691,7 +723,7 @@ kde-rpo-clean: + -rm -f *.rpo - #>+ 11 --appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp appletproxy_la_meta_unload.cpp appletproxy.moc -+appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp - @echo 'creating appletproxy_la.all_cpp.cpp ...'; \ - rm -f appletproxy_la.all_cpp.files appletproxy_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> appletproxy_la.all_cpp.final; \ -- for file in appletproxy.cpp appletproxy_la_meta_unload.cpp ; do \ -+ for file in appletproxy_main.cpp ; do \ - echo "#include \"$$file\"" >> appletproxy_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> appletproxy_la.all_cpp.final; \ - done; \ -@@ -718,11 +746,11 @@ - rm -f appletproxy_la.all_cpp.final appletproxy_la.all_cpp.files - - #>+ 11 --extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp extensionproxy_la_meta_unload.cpp extensionproxy.moc -+extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp - @echo 'creating extensionproxy_la.all_cpp.cpp ...'; \ - rm -f extensionproxy_la.all_cpp.files extensionproxy_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> extensionproxy_la.all_cpp.final; \ -- for file in extensionproxy.cpp extensionproxy_la_meta_unload.cpp ; do \ -+ for file in extensionproxy_main.cpp ; do \ - echo "#include \"$$file\"" >> extensionproxy_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> extensionproxy_la.all_cpp.final; \ - done; \ -@@ -730,11 +758,35 @@ - rm -f extensionproxy_la.all_cpp.final extensionproxy_la.all_cpp.files - - #>+ 11 --appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libappletproxy_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp libappletproxy_main_la_meta_unload.cpp appletproxy.moc -+ @echo 'creating libappletproxy_main_la.all_cpp.cpp ...'; \ -+ rm -f libappletproxy_main_la.all_cpp.files libappletproxy_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libappletproxy_main_la.all_cpp.final; \ -+ for file in appletproxy.cpp libappletproxy_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libappletproxy_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libappletproxy_main_la.all_cpp.final; \ -+ done; \ -+ cat libappletproxy_main_la.all_cpp.final libappletproxy_main_la.all_cpp.files > libappletproxy_main_la.all_cpp.cpp; \ -+ rm -f libappletproxy_main_la.all_cpp.final libappletproxy_main_la.all_cpp.files -+ -+#>+ 11 -+libextensionproxy_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp libextensionproxy_main_la_meta_unload.cpp extensionproxy.moc -+ @echo 'creating libextensionproxy_main_la.all_cpp.cpp ...'; \ -+ rm -f libextensionproxy_main_la.all_cpp.files libextensionproxy_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libextensionproxy_main_la.all_cpp.final; \ -+ for file in extensionproxy.cpp libextensionproxy_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libextensionproxy_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libextensionproxy_main_la.all_cpp.final; \ -+ done; \ -+ cat libextensionproxy_main_la.all_cpp.final libextensionproxy_main_la.all_cpp.files > libextensionproxy_main_la.all_cpp.cpp; \ -+ rm -f libextensionproxy_main_la.all_cpp.final libextensionproxy_main_la.all_cpp.files -+ -+#>+ 11 -+appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp - @echo 'creating appletproxy.all_cpp.cpp ...'; \ - rm -f appletproxy.all_cpp.files appletproxy.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> appletproxy.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in appletproxy_main.cpp ; do \ - echo "#include \"$$file\"" >> appletproxy.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> appletproxy.all_cpp.final; \ - done; \ -@@ -742,11 +794,11 @@ - rm -f appletproxy.all_cpp.final appletproxy.all_cpp.files - - #>+ 11 --extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp - @echo 'creating extensionproxy.all_cpp.cpp ...'; \ - rm -f extensionproxy.all_cpp.files extensionproxy.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> extensionproxy.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in extensionproxy_main.cpp ; do \ - echo "#include \"$$file\"" >> extensionproxy.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> extensionproxy.all_cpp.final; \ - done; \ -@@ -755,20 +807,20 @@ - - #>+ 3 - clean-final: -- -rm -f appletproxy_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp -+ -rm -f appletproxy_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp libappletproxy_main_la.all_cpp.cpp libextensionproxy_main_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" all-am -+ $(MAKE) libappletproxy_main_la_OBJECTS="$(libappletproxy_main_la_final_OBJECTS)" libextensionproxy_main_la_OBJECTS="$(libextensionproxy_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" install-am -+ $(MAKE) libappletproxy_main_la_OBJECTS="$(libappletproxy_main_la_final_OBJECTS)" libextensionproxy_main_la_OBJECTS="$(libextensionproxy_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libappletproxy_main_la_OBJECTS="$(libappletproxy_main_la_nofinal_OBJECTS)" libextensionproxy_main_la_OBJECTS="$(libextensionproxy_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libappletproxy_main_la_OBJECTS="$(libappletproxy_main_la_nofinal_OBJECTS)" libextensionproxy_main_la_OBJECTS="$(libextensionproxy_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + #>+ 5 +-appletproxy.lo: appletproxy.moc + appletproxy.o: appletproxy.moc ++appletproxy.lo: appletproxy.moc + extensionproxy.o: extensionproxy.moc + extensionproxy.lo: extensionproxy.moc diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz index 9c293577502..89ce44e6c13 100644 --- a/x11/kdebase3/patches/patch-bz +++ b/x11/kdebase3/patches/patch-bz @@ -1,8 +1,8 @@ -$NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ +$NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ ---- klipper/Makefile.in.orig Tue Jun 25 19:31:40 2002 +--- klipper/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ klipper/Makefile.in -@@ -290,24 +290,26 @@ +@@ -289,24 +289,26 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = klipper @@ -39,7 +39,7 @@ $NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ klipper_panelapplet_la_SOURCES = applet.cpp klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version -@@ -333,18 +335,12 @@ +@@ -332,29 +334,34 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -49,11 +49,10 @@ $NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ +klipper_la_DEPENDENCIES = libklipper_main.la +am_klipper_la_OBJECTS = klipper_main.lo #>- klipper_la_OBJECTS = $(am_klipper_la_OBJECTS) --#>+ 6 +-#>+ 5 -klipper_la_final_OBJECTS = klipper_la.all_cpp.lo -klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ -- configdialog.lo toplevel_skel.lo \ -- klipper_la_meta_unload.lo +- configdialog.lo toplevel_skel.lo -@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS) -klipper_panelapplet_la_DEPENDENCIES = klipper.la @@ -62,20 +61,16 @@ $NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ +klipper_panelapplet_la_DEPENDENCIES = libklipper_main.la am_klipper_panelapplet_la_OBJECTS = applet.lo #>- klipper_panelapplet_la_OBJECTS = $(am_klipper_panelapplet_la_OBJECTS) - #>+ 5 -@@ -353,14 +349,25 @@ - klipper_panelapplet_la_meta_unload.lo - @KDE_USE_FINAL_FALSE@klipper_panelapplet_la_OBJECTS = $(klipper_panelapplet_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@klipper_panelapplet_la_OBJECTS = $(klipper_panelapplet_la_final_OBJECTS) + #>+ 1 + klipper_panelapplet_la_OBJECTS = applet.lo +libklipper_main_la_DEPENDENCIES = +am_libklipper_main_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ + configdialog.lo +#>- libklipper_main_la_OBJECTS = $(am_libklipper_main_la_OBJECTS) -+#>+ 6 ++#>+ 5 +libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo +libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ -+ configdialog.lo toplevel_skel.lo \ -+ libklipper_main_la_meta_unload.lo ++ configdialog.lo toplevel_skel.lo +@KDE_USE_FINAL_FALSE@libklipper_main_la_OBJECTS = $(libklipper_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libklipper_main_la_OBJECTS = $(libklipper_main_la_final_OBJECTS) bin_PROGRAMS = klipper$(EXEEXT) @@ -92,17 +87,30 @@ $NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -369,7 +376,8 @@ +@@ -363,14 +370,17 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo +-#>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/klipper_la.all_cpp.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/libklipper_main_la.all_cpp.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -391,12 +399,12 @@ +@@ -393,12 +403,12 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \ @@ -117,7 +125,7 @@ $NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ #>- all: all-am #>+ 1 -@@ -466,6 +474,8 @@ +@@ -468,6 +478,8 @@ klipper.la: $(klipper_la_OBJECTS) $(klip $(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS) klipper_panelapplet.la: $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(klipper_panelapplet_la_LDFLAGS) $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_LIBADD) $(LIBS) @@ -126,7 +134,7 @@ $NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -502,7 +512,8 @@ +@@ -504,7 +516,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/applet.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/configdialog.Plo@am__quote@ @@ -136,16 +144,16 @@ $NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/toplevel.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/urlgrabber.Plo@am__quote@ -@@ -649,7 +660,7 @@ +@@ -651,7 +664,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=applet.h hi16-app-klipper.png hi32-app-klipper.png klipper-1-2.pl klipperrc.upd klipperbindings.cpp urlgrabber.h toplevel.h klipper.desktop klipperrc.desktop klipper_dock.png hi48-app-klipper.png version.h configdialog.h +-KDE_DIST=toplevel.h hi48-app-klipper.png klipperrc.desktop klipperbindings.cpp klipper.desktop hi32-app-klipper.png urlgrabber.h hi16-app-klipper.png klipperrc.upd klipper_dock.png configdialog.h klipper-1-2.pl version.h applet.h +KDE_DIST=applet.h klipper_dock.png hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp version.h configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h klipperrc.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -698,7 +709,6 @@ +@@ -700,7 +713,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -153,126 +161,91 @@ $NetBSD: patch-bz,v 1.3 2002/08/25 19:23:40 jlam Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -741,7 +751,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-am +@@ -814,10 +826,6 @@ toplevel_skel.cpp: toplevel.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl -@@ -863,19 +873,6 @@ - - - #>+ 12 --klipper_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc -- @echo 'creating klipper_la_meta_unload.cpp' -- @-rm -f klipper_la_meta_unload.cpp -- @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_klipper_la[] = {' > klipper_la_meta_unload.cpp ;\ -- cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klipper_la_meta_unload.cpp ;\ -- echo '0};' >> klipper_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> klipper_la_meta_unload.cpp ;\ -- echo '_UNLOAD(klipper_la)' >> klipper_la_meta_unload.cpp ;\ -- else echo > klipper_la_meta_unload.cpp; fi -- + #>+ 3 +-configdialog.moc: $(srcdir)/configdialog.h +- $(MOC) $(srcdir)/configdialog.h -o configdialog.moc - --#>+ 12 - klipper_panelapplet_la_meta_unload.cpp: applet.moc - @echo 'creating klipper_panelapplet_la_meta_unload.cpp' - @-rm -f klipper_panelapplet_la_meta_unload.cpp -@@ -888,16 +885,29 @@ - else echo > klipper_panelapplet_la_meta_unload.cpp; fi +-#>+ 3 + urlgrabber.moc: $(srcdir)/urlgrabber.h + $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc +@@ -830,8 +838,12 @@ applet.moc: $(srcdir)/applet.h + $(MOC) $(srcdir)/applet.h -o applet.moc -+#>+ 12 -+libklipper_main_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc -+ @echo 'creating libklipper_main_la_meta_unload.cpp' -+ @-rm -f libklipper_main_la_meta_unload.cpp -+ @if test ${kde_qtver} = 2; then \ -+ echo 'static const char * _metalist_libklipper_main_la[] = {' > libklipper_main_la_meta_unload.cpp ;\ -+ cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklipper_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libklipper_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libklipper_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libklipper_main_la)' >> libklipper_main_la_meta_unload.cpp ;\ -+ else echo > libklipper_main_la_meta_unload.cpp; fi -+ -+ #>+ 3 - clean-moc-classes: -- -rm -f klipper_la_meta_unload.cpp klipper_panelapplet_la_meta_unload.cpp -+ -rm -f klipper_panelapplet_la_meta_unload.cpp libklipper_main_la_meta_unload.cpp ++configdialog.moc: $(srcdir)/configdialog.h ++ $(MOC) $(srcdir)/configdialog.h -o configdialog.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f configdialog.moc urlgrabber.moc toplevel.moc applet.moc ++ -rm -f urlgrabber.moc toplevel.moc applet.moc configdialog.moc + + #>+ 4 + clean-idl: +@@ -863,33 +875,33 @@ force-reedit: - #>+ 11 --klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp klipper_la_meta_unload.cpp urlgrabber.moc toplevel.moc applet.moc configdialog.moc -+klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp - @echo 'creating klipper_la.all_cpp.cpp ...'; \ - rm -f klipper_la.all_cpp.files klipper_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klipper_la.all_cpp.final; \ -- for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp klipper_la_meta_unload.cpp ; do \ -+ for file in klipper_main.cpp ; do \ - echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \ - done; \ -@@ -917,11 +927,23 @@ - rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files #>+ 11 --klipper.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp libklipper_main_la_meta_unload.cpp urlgrabber.moc toplevel.moc applet.moc configdialog.moc +-klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp urlgrabber.moc configdialog.moc toplevel.moc +- @echo 'creating klipper_la.all_cpp.cpp ...'; \ +- rm -f klipper_la.all_cpp.files klipper_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> klipper_la.all_cpp.final; \ ++libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp urlgrabber.moc toplevel.moc configdialog.moc + @echo 'creating libklipper_main_la.all_cpp.cpp ...'; \ + rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \ -+ for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp libklipper_main_la_meta_unload.cpp ; do \ + for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp ; do \ +- echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libklipper_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklipper_main_la.all_cpp.final; \ -+ done; \ -+ cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files > libklipper_main_la.all_cpp.cpp; \ -+ rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files -+ -+#>+ 11 -+klipper.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp - @echo 'creating klipper.all_cpp.cpp ...'; \ - rm -f klipper.all_cpp.files klipper.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klipper.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in klipper_main.cpp ; do \ - echo "#include \"$$file\"" >> klipper.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper.all_cpp.final; \ done; \ -@@ -930,20 +952,20 @@ +- cat klipper_la.all_cpp.final klipper_la.all_cpp.files > klipper_la.all_cpp.cpp; \ +- rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files ++ cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files > libklipper_main_la.all_cpp.cpp; \ ++ rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f klipper_la.all_cpp.cpp klipper_panelapplet_la.all_cpp.cpp klipper.all_cpp.cpp -+ -rm -f klipper_la.all_cpp.cpp klipper_panelapplet_la.all_cpp.cpp libklipper_main_la.all_cpp.cpp klipper.all_cpp.cpp +- -rm -f klipper_la.all_cpp.cpp ++ -rm -f libklipper_main_la.all_cpp.cpp #>+ 2 final: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" all-am -+ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" all-am ++ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" install-am -+ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" install-am ++ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" all-am -+ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" install-am -+ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -953,7 +975,7 @@ + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -899,11 +911,11 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 5 --$(srcdir)/configdialog.cpp: configdialog.moc - $(srcdir)/urlgrabber.cpp: urlgrabber.moc - $(srcdir)/toplevel.cpp: toplevel.moc -+$(srcdir)/configdialog.cpp: configdialog.moc - $(srcdir)/applet.cpp: applet.moc + #>+ 9 +-toplevel.lo: toplevel.moc ++urlgrabber.o: urlgrabber.moc ++toplevel.o: toplevel.moc + urlgrabber.lo: urlgrabber.moc +-configdialog.lo: configdialog.moc ++toplevel.lo: toplevel.moc + applet.lo: applet.moc + applet.o: applet.moc ++configdialog.lo: configdialog.moc + configdialog.o: configdialog.moc +-urlgrabber.o: urlgrabber.moc +-toplevel.o: toplevel.moc diff --git a/x11/kdebase3/patches/patch-cd b/x11/kdebase3/patches/patch-cd index f0c53cd4865..fa810b0f739 100644 --- a/x11/kdebase3/patches/patch-cd +++ b/x11/kdebase3/patches/patch-cd @@ -1,8 +1,8 @@ -$NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ +$NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ ---- kmenuedit/Makefile.in.orig Mon May 13 23:57:48 2002 +--- kmenuedit/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kmenuedit/Makefile.in -@@ -290,17 +290,18 @@ +@@ -289,17 +289,18 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kmenuedit @@ -28,7 +28,7 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h -@@ -324,27 +325,32 @@ +@@ -323,26 +324,31 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -45,17 +45,15 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ khotkeys.lo -#>- kmenuedit_la_OBJECTS = $(am_kmenuedit_la_OBJECTS) +#>- libkmenuedit_main_la_OBJECTS = $(am_libkmenuedit_main_la_OBJECTS) - #>+ 7 + #>+ 6 -kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo -kmenuedit_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ +libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo +libkmenuedit_main_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \ - khotkeys.lo \ -- kmenuedit_la_meta_unload.lo + khotkeys.lo -@KDE_USE_FINAL_FALSE@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS) -+ libkmenuedit_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_final_OBJECTS) bin_PROGRAMS = kmenuedit$(EXEEXT) @@ -72,23 +70,46 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -353,10 +359,12 @@ +@@ -351,21 +357,27 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/basictab.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo $(DEPDIR)/dummy.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/khotkeys.Plo $(DEPDIR)/kmenuedit.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/menueditview.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/namedlg.Plo $(DEPDIR)/treeview.Plo -+ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Po $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/menueditview.Plo $(DEPDIR)/namedlg.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/treeview.Plo + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/basictab.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo $(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/khotkeys.Plo $(DEPDIR)/kmenuedit.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/menueditview.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/namedlg.Plo $(DEPDIR)/treeview.Plo +-#>+ 11 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kmenuedit_la.all_cpp.P $(DEPDIR)/basictab.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo $(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Po $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/menueditview.Plo $(DEPDIR)/namedlg.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/treeview.Plo ++#>+ 15 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkmenuedit_main_la.all_cpp.P $(DEPDIR)/basictab.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys.Plo $(DEPDIR)/kmenuedit.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/menueditview.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/namedlg.Plo $(DEPDIR)/treeview.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/menueditview.Plo $(DEPDIR)/namedlg.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/treeview.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/basictab.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo $(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys.Plo $(DEPDIR)/kmenuedit.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/menueditview.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/namedlg.Plo $(DEPDIR)/treeview.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/menueditview.Plo $(DEPDIR)/namedlg.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/treeview.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -376,7 +384,8 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -386,7 +398,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -98,7 +119,7 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ DATA = $(apps_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) -@@ -388,7 +397,7 @@ +@@ -398,7 +411,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -107,7 +128,7 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -437,6 +446,8 @@ +@@ -447,6 +460,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kmenuedit.la: $(kmenuedit_la_OBJECTS) $(kmenuedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kmenuedit_la_LDFLAGS) $(kmenuedit_la_OBJECTS) $(kmenuedit_la_LIBADD) $(LIBS) @@ -116,7 +137,7 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -473,9 +484,10 @@ +@@ -483,9 +498,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/basictab.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/desktopfileeditor.Plo@am__quote@ @@ -128,16 +149,16 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/menueditview.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/namedlg.Plo@am__quote@ -@@ -632,7 +644,7 @@ +@@ -642,7 +658,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kmenueditui.rc hi32-app-kmenuedit.png hi16-app-kmenuedit.png kmenuedit.desktop hi48-app-kmenuedit.png +-KDE_DIST=kmenuedit.desktop hi16-app-kmenuedit.png hi32-app-kmenuedit.png kmenueditui.rc hi48-app-kmenuedit.png +KDE_DIST=hi32-app-kmenuedit.png kmenuedit.desktop hi16-app-kmenuedit.png kmenueditui.rc hi48-app-kmenuedit.png DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -694,7 +706,6 @@ +@@ -704,7 +720,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -145,79 +166,68 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -833,28 +844,28 @@ - - - #>+ 12 --kmenuedit_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc -- @echo 'creating kmenuedit_la_meta_unload.cpp' -- @-rm -f kmenuedit_la_meta_unload.cpp -+libkmenuedit_main_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc -+ @echo 'creating libkmenuedit_main_la_meta_unload.cpp' -+ @-rm -f libkmenuedit_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kmenuedit_la[] = {' > kmenuedit_la_meta_unload.cpp ;\ -- cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmenuedit_la_meta_unload.cpp ;\ -- echo '0};' >> kmenuedit_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kmenuedit_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kmenuedit_la)' >> kmenuedit_la_meta_unload.cpp ;\ -- else echo > kmenuedit_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkmenuedit_main_la[] = {' > libkmenuedit_main_la_meta_unload.cpp ;\ -+ cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmenuedit_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkmenuedit_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkmenuedit_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkmenuedit_main_la)' >> libkmenuedit_main_la_meta_unload.cpp ;\ -+ else echo > libkmenuedit_main_la_meta_unload.cpp; fi +@@ -795,10 +810,6 @@ dummy.cpp: + .NOEXPORT: + + #>+ 3 +-menueditview.moc: $(srcdir)/menueditview.h +- $(MOC) $(srcdir)/menueditview.h -o menueditview.moc +- +-#>+ 3 + basictab.moc: $(srcdir)/basictab.h + $(MOC) $(srcdir)/basictab.h -o basictab.moc +@@ -807,16 +818,20 @@ treeview.moc: $(srcdir)/treeview.h + $(MOC) $(srcdir)/treeview.h -o treeview.moc #>+ 3 - clean-moc-classes: -- -rm -f kmenuedit_la_meta_unload.cpp -+ -rm -f libkmenuedit_main_la_meta_unload.cpp +-kmenuedit.moc: $(srcdir)/kmenuedit.h +- $(MOC) $(srcdir)/kmenuedit.h -o kmenuedit.moc ++menueditview.moc: $(srcdir)/menueditview.h ++ $(MOC) $(srcdir)/menueditview.h -o menueditview.moc + + #>+ 3 + desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h + $(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc + + #>+ 3 ++kmenuedit.moc: $(srcdir)/kmenuedit.h ++ $(MOC) $(srcdir)/kmenuedit.h -o kmenuedit.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f menueditview.moc basictab.moc treeview.moc kmenuedit.moc desktopfileeditor.moc ++ -rm -f basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc + + #>+ 2 + docs-am: +@@ -843,33 +858,33 @@ force-reedit: - #>+ 11 --kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp kmenuedit_la_meta_unload.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc -+kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc - @echo 'creating kmenuedit_la.all_cpp.cpp ...'; \ - rm -f kmenuedit_la.all_cpp.files kmenuedit_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmenuedit_la.all_cpp.final; \ -- for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp kmenuedit_la_meta_unload.cpp ; do \ -+ for file in kmenuedit_main.cpp ; do \ - echo "#include \"$$file\"" >> kmenuedit_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit_la.all_cpp.final; \ - done; \ -@@ -862,11 +873,23 @@ - rm -f kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files #>+ 11 --kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp +-kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp menueditview.moc treeview.moc basictab.moc desktopfileeditor.moc kmenuedit.moc +- @echo 'creating kmenuedit_la.all_cpp.cpp ...'; \ +- rm -f kmenuedit_la.all_cpp.files kmenuedit_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kmenuedit_la.all_cpp.final; \ ++libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc + @echo 'creating libkmenuedit_main_la.all_cpp.cpp ...'; \ + rm -f libkmenuedit_main_la.all_cpp.files libkmenuedit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmenuedit_main_la.all_cpp.final; \ -+ for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp ; do \ + for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp ; do \ +- echo "#include \"$$file\"" >> kmenuedit_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkmenuedit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmenuedit_main_la.all_cpp.final; \ -+ done; \ -+ cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files > libkmenuedit_main_la.all_cpp.cpp; \ -+ rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files -+ -+#>+ 11 -+kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp - @echo 'creating kmenuedit.all_cpp.cpp ...'; \ - rm -f kmenuedit.all_cpp.files kmenuedit.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmenuedit.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kmenuedit_main.cpp ; do \ - echo "#include \"$$file\"" >> kmenuedit.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit.all_cpp.final; \ done; \ -@@ -875,20 +898,20 @@ +- cat kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files > kmenuedit_la.all_cpp.cpp; \ +- rm -f kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files ++ cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files > libkmenuedit_main_la.all_cpp.cpp; \ ++ rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp -+ -rm -f kmenuedit_la.all_cpp.cpp libkmenuedit_main_la.all_cpp.cpp kmenuedit.all_cpp.cpp +- -rm -f kmenuedit_la.all_cpp.cpp ++ -rm -f libkmenuedit_main_la.all_cpp.cpp #>+ 2 final: @@ -237,4 +247,24 @@ $NetBSD: patch-cd,v 1.2 2002/08/25 19:23:41 jlam Exp $ + $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_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 +@@ -879,13 +894,13 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 11 +-basictab.o: basictab.moc ++basictab.lo: basictab.moc ++menueditview.lo: menueditview.moc + menueditview.o: menueditview.moc +-treeview.lo: treeview.moc +-treeview.o: treeview.moc +-desktopfileeditor.o: desktopfileeditor.moc + kmenuedit.lo: kmenuedit.moc ++treeview.o: treeview.moc + desktopfileeditor.lo: desktopfileeditor.moc +-basictab.lo: basictab.moc + kmenuedit.o: kmenuedit.moc +-menueditview.lo: menueditview.moc ++basictab.o: basictab.moc ++treeview.lo: treeview.moc ++desktopfileeditor.o: desktopfileeditor.moc diff --git a/x11/kdebase3/patches/patch-ch b/x11/kdebase3/patches/patch-ch index 122a9e32376..6241316306c 100644 --- a/x11/kdebase3/patches/patch-ch +++ b/x11/kdebase3/patches/patch-ch @@ -1,8 +1,8 @@ -$NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ +$NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- konqueror/Makefile.in.orig Mon May 13 23:57:50 2002 +--- konqueror/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ konqueror/Makefile.in -@@ -294,7 +294,7 @@ +@@ -293,7 +293,7 @@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar @@ -11,26 +11,26 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ konqdatadir = $(kde_datadir)/konqueror konqdata_DATA = konqueror.rc -@@ -311,7 +311,7 @@ +@@ -310,7 +310,7 @@ include_HEADERS = KonquerorIface.h bin_PROGRAMS = konqueror -#>- konqueror_la_SOURCES = konq_main.cc \ +#>- libkonqueror_main_la_SOURCES = konq_main.cc \ - #>- KonquerorIface.cc KonquerorIface.skel \ - #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ - #>- KonqViewIface.cc KonqViewIface.skel \ -@@ -326,7 +326,7 @@ - #>- konq_browseriface.cc \ - #>- delayedinitializer.cc + #>- KonquerorIface.cc KonquerorIface.skel \ + #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ + #>- KonqViewIface.cc KonqViewIface.skel \ +@@ -325,7 +325,7 @@ bin_PROGRAMS = konqueror + #>- konq_browseriface.cc \ + #>- delayedinitializer.cc #>+ 14 -konqueror_la_SOURCES=konq_main.cc \ +libkonqueror_main_la_SOURCES=konq_main.cc \ - KonquerorIface.cc \ - KonqMainWindowIface.cc \ - KonqViewIface.cc \ -@@ -342,11 +342,15 @@ - delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc + KonquerorIface.cc \ + KonqMainWindowIface.cc \ + KonqViewIface.cc \ +@@ -341,11 +341,15 @@ konqueror_la_SOURCES=konq_main.cc \ + delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc +libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -48,7 +48,7 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) data_DATA = konquerorsu.desktop kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop -@@ -368,33 +372,38 @@ +@@ -367,32 +371,37 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -68,7 +68,7 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ delayedinitializer.lo -#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS) +#>- libkonqueror_main_la_OBJECTS = $(am_libkonqueror_main_la_OBJECTS) - #>+ 10 + #>+ 9 -konqueror_la_final_OBJECTS = konqueror_la.all_cc.lo -konqueror_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ +libkonqueror_main_la_final_OBJECTS = libkonqueror_main_la.all_cc.lo @@ -77,11 +77,9 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ konq_factory.lo konq_combo.lo konq_browseriface.lo \ - delayedinitializer.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo \ -- konqueror_la_meta_unload.lo + delayedinitializer.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo -@KDE_USE_FINAL_FALSE@konqueror_la_OBJECTS = $(konqueror_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@konqueror_la_OBJECTS = $(konqueror_la_final_OBJECTS) -+ libkonqueror_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_final_OBJECTS) bin_PROGRAMS = konqueror$(EXEEXT) @@ -98,27 +96,62 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -405,7 +414,7 @@ - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/KonqMainWindowIface.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/KonqViewIface.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/KonquerorIface.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/konq_actions.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/konq_browseriface.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ -@@ -416,7 +425,9 @@ - @AMDEP_TRUE@ $(DEPDIR)/konq_misc.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/konq_profiledlg.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo -+ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Po +@@ -403,7 +412,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/KonqMainWindowIface.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/KonqViewIface.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/KonquerorIface.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/konq_actions.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/konq_browseriface.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ +@@ -414,12 +423,14 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@ $(DEPDIR)/konq_misc.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/konq_profiledlg.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo +-#>+ 31 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/konqueror_la.all_cc.P $(DEPDIR)/KonqMainWindowIface.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Po ++#>+ 35 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/libkonqueror_main_la.all_cc.P $(DEPDIR)/KonqMainWindowIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/KonqViewIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/KonquerorIface.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_actions.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_browseriface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ +@@ -430,11 +441,13 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_misc.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_profiledlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Po + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/KonqMainWindowIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/KonqViewIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/KonquerorIface.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_actions.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_browseriface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ +@@ -445,7 +458,9 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_misc.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_profiledlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -436,7 +447,8 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -466,7 +481,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -128,7 +161,7 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ DATA = $(data_DATA) $(data2_DATA) $(data3_DATA) $(data4_DATA) \ $(kdelnk_DATA) $(konqdata_DATA) -@@ -450,7 +462,7 @@ +@@ -480,7 +496,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) AUTHORS ChangeLog Makefile.am \ Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -137,7 +170,7 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -499,6 +511,8 @@ +@@ -529,6 +545,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) konqueror.la: $(konqueror_la_OBJECTS) $(konqueror_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(konqueror_la_LDFLAGS) $(konqueror_la_OBJECTS) $(konqueror_la_LIBADD) $(LIBS) @@ -146,7 +179,7 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -537,7 +551,6 @@ +@@ -567,7 +585,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/KonqViewIface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/KonquerorIface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/delayedinitializer.Plo@am__quote@ @@ -154,7 +187,7 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_actions.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_browseriface.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_combo.Plo@am__quote@ -@@ -551,6 +564,8 @@ +@@ -581,6 +598,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_run.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_view.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_viewmgr.Plo@am__quote@ @@ -163,16 +196,16 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ distclean-depend: -rm -rf $(DEPDIR) -@@ -788,7 +803,7 @@ +@@ -818,7 +837,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=konq_misc.h konq_browseriface.h DESIGN_config delayedinitializer.cc konq_viewmgr.h konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h konq_guiclients.cc Home.desktop konq_profiledlg.h DESIGN convert_kdelnk.sh profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror.rc profile_filemanagement.desktop konq_misc.cc konq_frame.cc KonqMainWindowIface.cc IDEAS konqueror.desktop konq_run.cc konq_run.h konq_main.h konquerorsu.desktop KonqViewIface.cc konq_viewmgr.cc konqfilemgr.desktop delayedinitializer.h konqbrowser.desktop konq_actions.cc konq_profiledlg.cc konq_factory.cc profile_filepreview.desktop KonquerorIface.cc konq_openurlrequest.h profile_webbrowsing.desktop konq_view.cc konqueror_config.desktop konq_guiclients.h konq_mainwindow.cc KonqMainWindowIface.h konq_frame.h konq_factory.h version.h konq_combo.h KonqViewIface.h +-KDE_DIST=profile_midnightcommander.desktop KonqMainWindowIface.h konq_mainwindow.h profile_webbrowsing.desktop konq_viewmgr.cc konq_viewmgr.h konq_mainwindow.cc konqfilemgr.desktop konq_frame.cc kfmclient_dir.desktop DESIGN KonqMainWindowIface.cc profile_filepreview.desktop delayedinitializer.h konq_factory.h konq_profiledlg.h konq_combo.cc konq_profiledlg.cc kfmclient_html.desktop konqueror.desktop konq_misc.cc konqbrowser.desktop konq_frame.h konq_browseriface.cc KonquerorIface.cc konq_view.h konq_guiclients.h convert_kdelnk.sh IDEAS konq_run.h KonqViewIface.h konq_view.cc konqueror.rc konq_main.h profile_filemanagement.desktop DESIGN_config konq_guiclients.cc konq_browseriface.h konq_factory.cc konq_actions.h konq_actions.cc konq_run.cc konquerorsu.desktop KonqViewIface.cc delayedinitializer.cc konq_misc.h Home.desktop kfmclient.desktop konq_openurlrequest.h konqueror_config.desktop version.h konq_combo.h +KDE_DIST=konq_viewmgr.cc DESIGN konqfilemgr.desktop convert_kdelnk.sh konq_misc.h konq_view.cc konq_browseriface.h delayedinitializer.h DESIGN_config profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror_config.desktop konqueror.rc konqbrowser.desktop delayedinitializer.cc konq_guiclients.h konq_viewmgr.h profile_filemanagement.desktop konq_mainwindow.h kfmclient_dir.desktop konq_misc.cc kfmclient_html.desktop kfmclient.desktop konq_view.h konq_mainwindow.cc konq_actions.cc konq_frame.cc konq_actions.h KonqMainWindowIface.cc KonqMainWindowIface.h IDEAS konqueror.desktop konq_frame.h konq_profiledlg.cc konq_factory.h konq_run.cc version.h konq_run.h konq_factory.cc konq_combo.h konq_main.h konq_guiclients.cc profile_filepreview.desktop Home.desktop KonquerorIface.cc konquerorsu.desktop KonqViewIface.cc konq_profiledlg.h konq_openurlrequest.h profile_webbrowsing.desktop KonqViewIface.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -946,9 +961,6 @@ +@@ -976,9 +995,6 @@ uninstall-info: uninstall-info-recursive #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static @@ -182,121 +215,131 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ messages: rc.cpp $(EXTRACTRC) *.rc */*.rc >> rc.cpp $(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp -@@ -977,20 +989,6 @@ +@@ -1007,23 +1023,13 @@ uninstall-local: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 13 --KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOPIDL_DEPENDENCIES) +-KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) -KonquerorIface_skel.cc: KonquerorIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl --KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOPIDL_DEPENDENCIES) +-KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false ) -KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl --KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOPIDL_DEPENDENCIES) +-KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false ) -KonqViewIface_skel.cc: KonqViewIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl -- ++#>+ 3 ++konq_view.moc: $(srcdir)/konq_view.h ++ $(MOC) $(srcdir)/konq_view.h -o konq_view.moc + + #>+ 3 +-konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h +- $(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc ++konq_browseriface.moc: $(srcdir)/konq_browseriface.h ++ $(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc + + #>+ 3 + delayedinitializer.moc: $(srcdir)/delayedinitializer.h +@@ -1034,40 +1040,50 @@ konq_mainwindow.moc: $(srcdir)/konq_main + $(MOC) $(srcdir)/konq_mainwindow.h -o konq_mainwindow.moc + + #>+ 3 +-konq_actions.moc: $(srcdir)/konq_actions.h +- $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc ++konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h ++ $(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc + + #>+ 3 +-konq_frame.moc: $(srcdir)/konq_frame.h +- $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc ++konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h ++ $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc + + #>+ 3 +-konq_browseriface.moc: $(srcdir)/konq_browseriface.h +- $(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc ++konq_actions.moc: $(srcdir)/konq_actions.h ++ $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc + + #>+ 3 +-konq_view.moc: $(srcdir)/konq_view.h +- $(MOC) $(srcdir)/konq_view.h -o konq_view.moc ++konq_combo.moc: $(srcdir)/konq_combo.h ++ $(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc + + #>+ 3 +-konq_run.moc: $(srcdir)/konq_run.h +- $(MOC) $(srcdir)/konq_run.h -o konq_run.moc ++konq_guiclients.moc: $(srcdir)/konq_guiclients.h ++ $(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc + + #>+ 3 +-konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h +- $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc ++konq_run.moc: $(srcdir)/konq_run.h ++ $(MOC) $(srcdir)/konq_run.h -o konq_run.moc + #>+ 3 - konq_view.moc: $(srcdir)/konq_view.h - $(MOC) $(srcdir)/konq_view.h -o konq_view.moc -@@ -1035,6 +1033,20 @@ - konq_frame.moc: $(srcdir)/konq_frame.h - $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc +-konq_guiclients.moc: $(srcdir)/konq_guiclients.h +- $(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc ++konq_frame.moc: $(srcdir)/konq_frame.h ++ $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc +-#>+ 3 +-konq_combo.moc: $(srcdir)/konq_combo.h +- $(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc +#>+ 13 -+KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOPIDL_DEPENDENCIES) ++KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) +KonquerorIface_skel.cc: KonquerorIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl -+KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOPIDL_DEPENDENCIES) ++KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false ) +KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl -+KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOPIDL_DEPENDENCIES) ++KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false ) +KonqViewIface_skel.cc: KonqViewIface.kidl + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl -+ + #>+ 3 clean-metasources: - -rm -f konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc -@@ -1057,28 +1069,28 @@ - - - #>+ 12 --konqueror_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc -- @echo 'creating konqueror_la_meta_unload.cc' -- @-rm -f konqueror_la_meta_unload.cc -+libkonqueror_main_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc -+ @echo 'creating libkonqueror_main_la_meta_unload.cc' -+ @-rm -f libkonqueror_main_la_meta_unload.cc - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_konqueror_la[] = {' > konqueror_la_meta_unload.cc ;\ -- cat konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konqueror_la_meta_unload.cc ;\ -- echo '0};' >> konqueror_la_meta_unload.cc ;\ -- echo '#include <kunload.h>' >> konqueror_la_meta_unload.cc ;\ -- echo '_UNLOAD(konqueror_la)' >> konqueror_la_meta_unload.cc ;\ -- else echo > konqueror_la_meta_unload.cc; fi -+ echo 'static const char * _metalist_libkonqueror_main_la[] = {' > libkonqueror_main_la_meta_unload.cc ;\ -+ cat konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonqueror_main_la_meta_unload.cc ;\ -+ echo '0};' >> libkonqueror_main_la_meta_unload.cc ;\ -+ echo '#include <kunload.h>' >> libkonqueror_main_la_meta_unload.cc ;\ -+ echo '_UNLOAD(libkonqueror_main_la)' >> libkonqueror_main_la_meta_unload.cc ;\ -+ else echo > libkonqueror_main_la_meta_unload.cc; fi +- -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc ++ -rm -f konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc + #>+ 6 + clean-idl: +@@ -1087,33 +1103,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f konqueror_la_meta_unload.cc -+ -rm -f libkonqueror_main_la_meta_unload.cc #>+ 11 --konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc -+konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc - @echo 'creating konqueror_la.all_cc.cc ...'; \ - rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \ -- for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc ; do \ -+ for file in konqueror_main.cc ; do \ - echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \ - done; \ -@@ -1086,11 +1098,23 @@ - rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files - - #>+ 11 --konqueror.all_cc.cc: $(srcdir)/Makefile.in dummy.cc -+libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc +-konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc +- @echo 'creating konqueror_la.all_cc.cc ...'; \ +- rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \ +- echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \ ++libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc + @echo 'creating libkonqueror_main_la.all_cc.cc ...'; \ + rm -f libkonqueror_main_la.all_cc.files libkonqueror_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkonqueror_main_la.all_cc.final; \ -+ for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc ; do \ + for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc ; do \ +- echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \ + echo "#include \"$$file\"" >> libkonqueror_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonqueror_main_la.all_cc.final; \ -+ done; \ -+ cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \ -+ rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files -+ -+#>+ 11 -+konqueror.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc - @echo 'creating konqueror.all_cc.cc ...'; \ - rm -f konqueror.all_cc.files konqueror.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> konqueror.all_cc.final; \ -- for file in dummy.cc ; do \ -+ for file in konqueror_main.cc ; do \ - echo "#include \"$$file\"" >> konqueror.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror.all_cc.final; \ done; \ -@@ -1099,20 +1123,20 @@ +- cat konqueror_la.all_cc.final konqueror_la.all_cc.files > konqueror_la.all_cc.cc; \ +- rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files ++ cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \ ++ rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files #>+ 3 clean-final: -- -rm -f konqueror_la.all_cc.cc konqueror.all_cc.cc -+ -rm -f konqueror_la.all_cc.cc libkonqueror_main_la.all_cc.cc konqueror.all_cc.cc +- -rm -f konqueror_la.all_cc.cc ++ -rm -f libkonqueror_main_la.all_cc.cc #>+ 2 final: @@ -316,4 +359,46 @@ $NetBSD: patch-ch,v 1.2 2002/08/25 19:23:41 jlam Exp $ + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_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 +@@ -1123,25 +1139,25 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 23 +-konq_guiclients.lo: konq_guiclients.moc +-konq_run.o: konq_run.moc +-konq_mainwindow.lo: konq_mainwindow.moc +-konq_combo.o: konq_combo.moc +-konq_viewmgr.o: konq_viewmgr.moc +-konq_run.lo: konq_run.moc +-konq_profiledlg.lo: konq_profiledlg.moc +-konq_frame.o: konq_frame.moc +-konq_guiclients.o: konq_guiclients.moc + konq_frame.lo: konq_frame.moc +-delayedinitializer.o: delayedinitializer.moc +-konq_profiledlg.o: konq_profiledlg.moc +-konq_browseriface.lo: konq_browseriface.moc + konq_view.lo: konq_view.moc +-konq_viewmgr.lo: konq_viewmgr.moc ++konq_profiledlg.o: konq_profiledlg.moc + konq_view.o: konq_view.moc ++konq_browseriface.lo: konq_browseriface.moc ++konq_browseriface.o: konq_browseriface.moc ++konq_combo.lo: konq_combo.moc + konq_actions.o: konq_actions.moc +-konq_mainwindow.o: konq_mainwindow.moc ++delayedinitializer.o: delayedinitializer.moc ++konq_profiledlg.lo: konq_profiledlg.moc ++konq_run.lo: konq_run.moc + delayedinitializer.lo: delayedinitializer.moc +-konq_combo.lo: konq_combo.moc +-konq_browseriface.o: konq_browseriface.moc ++konq_guiclients.lo: konq_guiclients.moc ++konq_frame.o: konq_frame.moc ++konq_run.o: konq_run.moc ++konq_viewmgr.o: konq_viewmgr.moc ++konq_combo.o: konq_combo.moc ++konq_guiclients.o: konq_guiclients.moc ++konq_mainwindow.lo: konq_mainwindow.moc ++konq_mainwindow.o: konq_mainwindow.moc ++konq_viewmgr.lo: konq_viewmgr.moc + konq_actions.lo: konq_actions.moc diff --git a/x11/kdebase3/patches/patch-cj b/x11/kdebase3/patches/patch-cj index ae7038a4977..f3234576c58 100644 --- a/x11/kdebase3/patches/patch-cj +++ b/x11/kdebase3/patches/patch-cj @@ -1,8 +1,8 @@ -$NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ +$NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- konqueror/client/Makefile.in.orig Mon May 13 23:57:50 2002 +--- konqueror/client/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ konqueror/client/Makefile.in -@@ -290,14 +290,18 @@ +@@ -289,14 +289,18 @@ x_libraries = @x_libraries@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII bin_PROGRAMS = kfmclient @@ -26,7 +26,7 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ noinst_HEADERS = kfmclient.h #>- METASOURCES = AUTO -@@ -305,32 +309,37 @@ +@@ -304,31 +308,36 @@ noinst_HEADERS = kfmclient.h KonquerorIface_DIR = $(srcdir)/.. KDesktopIface_DIR = $(top_srcdir)/kdesktop @@ -51,15 +51,13 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ +libkfmclient_main_la_DEPENDENCIES = +am_libkfmclient_main_la_OBJECTS = kfmclient.lo +#>- libkfmclient_main_la_OBJECTS = $(am_libkfmclient_main_la_OBJECTS) - #>+ 5 + #>+ 4 -kfmclient_la_final_OBJECTS = kfmclient_la.all_cc.lo --kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \ -- kfmclient_la_meta_unload.lo +-kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo -@KDE_USE_FINAL_FALSE@kfmclient_la_OBJECTS = $(kfmclient_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kfmclient_la_OBJECTS = $(kfmclient_la_final_OBJECTS) +libkfmclient_main_la_final_OBJECTS = libkfmclient_main_la.all_cc.lo -+libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \ -+ libkfmclient_main_la_meta_unload.lo ++libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo +@KDE_USE_FINAL_FALSE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_final_OBJECTS) bin_PROGRAMS = kfmclient$(EXEEXT) @@ -76,18 +74,28 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -338,7 +347,9 @@ +@@ -336,10 +345,16 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kfmclient.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kfmclient.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kfmclient.Plo +-#>+ 3 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/kfmclient_la.all_cc.P $(DEPDIR)/dummy.Po $(DEPDIR)/kfmclient.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/dummy.Po $(DEPDIR)/kfmclient.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kfmclient.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Po ++#>+ 7 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/libkfmclient_main_la.all_cc.P $(DEPDIR)/kfmclient.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/kfmclient.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -358,11 +369,12 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -360,11 +375,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -102,7 +110,7 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ #>- all: all-am #>+ 1 -@@ -411,6 +423,8 @@ +@@ -413,6 +429,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kfmclient.la: $(kfmclient_la_OBJECTS) $(kfmclient_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kfmclient_la_LDFLAGS) $(kfmclient_la_OBJECTS) $(kfmclient_la_LIBADD) $(LIBS) @@ -111,7 +119,7 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -445,8 +459,9 @@ +@@ -447,8 +465,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -122,7 +130,7 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ distclean-depend: -rm -rf $(DEPDIR) -@@ -615,15 +630,16 @@ +@@ -617,15 +636,16 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-info-am uninstall-libLTLIBRARIES @@ -140,9 +148,9 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ + $(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc + #>+ 9 - KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOPIDL_DEPENDENCIES) + KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) -@@ -635,10 +651,6 @@ +@@ -637,10 +657,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-skel KDesktopIface.kidl #>+ 3 @@ -153,79 +161,33 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ clean-metasources: -rm -f kfmclient.moc -@@ -659,28 +671,28 @@ - - - #>+ 12 --kfmclient_la_meta_unload.cc: kfmclient.moc -- @echo 'creating kfmclient_la_meta_unload.cc' -- @-rm -f kfmclient_la_meta_unload.cc -+libkfmclient_main_la_meta_unload.cc: kfmclient.moc -+ @echo 'creating libkfmclient_main_la_meta_unload.cc' -+ @-rm -f libkfmclient_main_la_meta_unload.cc - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kfmclient_la[] = {' > kfmclient_la_meta_unload.cc ;\ -- cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kfmclient_la_meta_unload.cc ;\ -- echo '0};' >> kfmclient_la_meta_unload.cc ;\ -- echo '#include <kunload.h>' >> kfmclient_la_meta_unload.cc ;\ -- echo '_UNLOAD(kfmclient_la)' >> kfmclient_la_meta_unload.cc ;\ -- else echo > kfmclient_la_meta_unload.cc; fi -+ echo 'static const char * _metalist_libkfmclient_main_la[] = {' > libkfmclient_main_la_meta_unload.cc ;\ -+ cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkfmclient_main_la_meta_unload.cc ;\ -+ echo '0};' >> libkfmclient_main_la_meta_unload.cc ;\ -+ echo '#include <kunload.h>' >> libkfmclient_main_la_meta_unload.cc ;\ -+ echo '_UNLOAD(libkfmclient_main_la)' >> libkfmclient_main_la_meta_unload.cc ;\ -+ else echo > libkfmclient_main_la_meta_unload.cc; fi +@@ -661,33 +677,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f kfmclient_la_meta_unload.cc -+ -rm -f libkfmclient_main_la_meta_unload.cc - #>+ 11 --kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc kfmclient.moc -+kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc kfmclient.moc - @echo 'creating kfmclient_la.all_cc.cc ...'; \ - rm -f kfmclient_la.all_cc.files kfmclient_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kfmclient_la.all_cc.final; \ -- for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc ; do \ -+ for file in kfmclient_main.cc ; do \ - echo "#include \"$$file\"" >> kfmclient_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient_la.all_cc.final; \ - done; \ -@@ -688,11 +700,23 @@ - rm -f kfmclient_la.all_cc.final kfmclient_la.all_cc.files - - #>+ 11 --kfmclient.all_cc.cc: $(srcdir)/Makefile.in dummy.cc -+libkfmclient_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc +-kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient.moc +- @echo 'creating kfmclient_la.all_cc.cc ...'; \ +- rm -f kfmclient_la.all_cc.files kfmclient_la.all_cc.final; \ +- echo "#define KDE_USE_FINAL 1" >> kfmclient_la.all_cc.final; \ ++libkfmclient_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient.moc + @echo 'creating libkfmclient_main_la.all_cc.cc ...'; \ + rm -f libkfmclient_main_la.all_cc.files libkfmclient_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkfmclient_main_la.all_cc.final; \ -+ for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc ; do \ + for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc ; do \ +- echo "#include \"$$file\"" >> kfmclient_la.all_cc.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient_la.all_cc.final; \ + echo "#include \"$$file\"" >> libkfmclient_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkfmclient_main_la.all_cc.final; \ -+ done; \ -+ cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files > libkfmclient_main_la.all_cc.cc; \ -+ rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files -+ -+#>+ 11 -+kfmclient.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc - @echo 'creating kfmclient.all_cc.cc ...'; \ - rm -f kfmclient.all_cc.files kfmclient.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kfmclient.all_cc.final; \ -- for file in dummy.cc ; do \ -+ for file in kfmclient_main.cc ; do \ - echo "#include \"$$file\"" >> kfmclient.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient.all_cc.final; \ done; \ -@@ -701,20 +725,20 @@ +- cat kfmclient_la.all_cc.final kfmclient_la.all_cc.files > kfmclient_la.all_cc.cc; \ +- rm -f kfmclient_la.all_cc.final kfmclient_la.all_cc.files ++ cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files > libkfmclient_main_la.all_cc.cc; \ ++ rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files #>+ 3 clean-final: -- -rm -f kfmclient_la.all_cc.cc kfmclient.all_cc.cc -+ -rm -f kfmclient_la.all_cc.cc libkfmclient_main_la.all_cc.cc kfmclient.all_cc.cc +- -rm -f kfmclient_la.all_cc.cc ++ -rm -f libkfmclient_main_la.all_cc.cc #>+ 2 final: @@ -245,4 +207,15 @@ $NetBSD: patch-cj,v 1.2 2002/08/25 19:23:41 jlam Exp $ + $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_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 +@@ -697,8 +713,8 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 6 ++$(srcdir)/kfmclient.cc: KonquerorIface_stub.h KDesktopIface_stub.h + KDesktopIface_stub.cc: KDesktopIface_stub.h ++KonquerorIface_stub.cc: KonquerorIface_stub.h + kfmclient.lo: kfmclient.moc + kfmclient.o: kfmclient.moc +-KonquerorIface_stub.cc: KonquerorIface_stub.h +-$(srcdir)/kfmclient.cc: KonquerorIface_stub.h KDesktopIface_stub.h diff --git a/x11/kdebase3/patches/patch-cn b/x11/kdebase3/patches/patch-cn index f6ff9aaa224..102cbccac21 100644 --- a/x11/kdebase3/patches/patch-cn +++ b/x11/kdebase3/patches/patch-cn @@ -1,8 +1,8 @@ -$NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ +$NetBSD: patch-cn,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- konqueror/keditbookmarks/Makefile.in.orig Mon May 13 23:57:51 2002 +--- konqueror/keditbookmarks/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ konqueror/keditbookmarks/Makefile.in -@@ -291,21 +291,26 @@ +@@ -290,21 +290,26 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all METASOURCES = AUTO @@ -36,7 +36,7 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) rcdir = $(kde_datadir)/keditbookmarks -@@ -320,23 +325,30 @@ +@@ -319,22 +324,29 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -51,16 +51,14 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ + $(top_builddir)/libkonq/libkonq.la +am_libkeditbookmarks_main_la_OBJECTS = main.lo toplevel.lo commands.lo +#>- libkeditbookmarks_main_la_OBJECTS = \ -+#>- $(am_libkeditbookmarks_main_la_OBJECTS) - #>+ 5 ++#>- $(am_libkeditbookmarks_main_la_OBJECTS) + #>+ 4 -keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.lo --keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo \ -- keditbookmarks_la_meta_unload.lo +-keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo -@KDE_USE_FINAL_FALSE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_final_OBJECTS) +libkeditbookmarks_main_la_final_OBJECTS = libkeditbookmarks_main_la.all_cpp.lo -+libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo \ -+ libkeditbookmarks_main_la_meta_unload.lo ++libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo +@KDE_USE_FINAL_FALSE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_final_OBJECTS) bin_PROGRAMS = keditbookmarks$(EXEEXT) @@ -77,20 +75,34 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -344,8 +356,10 @@ +@@ -342,13 +354,19 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo +-#>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/keditbookmarks_la.all_cpp.P $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/libkeditbookmarks_main_la.all_cpp.P $(DEPDIR)/commands.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/commands.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -365,11 +379,12 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -369,11 +387,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -105,7 +117,7 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ #>- all: all-am #>+ 1 -@@ -418,6 +433,8 @@ +@@ -422,6 +441,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) keditbookmarks.la: $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(keditbookmarks_la_LDFLAGS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_LIBADD) $(LIBS) @@ -114,7 +126,7 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -453,7 +470,8 @@ +@@ -457,7 +478,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/commands.Plo@am__quote@ @@ -124,16 +136,16 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/toplevel.Plo@am__quote@ -@@ -548,7 +566,7 @@ +@@ -552,7 +574,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kinsertionsort.h hi32-app-keditbookmarks.png commands.h toplevel.h hi16-app-keditbookmarks.png keditbookmarks.desktop keditbookmarksui.rc +-KDE_DIST=toplevel.h keditbookmarks.desktop keditbookmarksui.rc hi32-app-keditbookmarks.png commands.h hi16-app-keditbookmarks.png kinsertionsort.h +KDE_DIST=commands.h kinsertionsort.h keditbookmarks.desktop hi16-app-keditbookmarks.png hi32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -668,9 +686,6 @@ +@@ -672,9 +694,6 @@ uninstall-am: uninstall-kde-icons unins uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-rcDATA @@ -143,79 +155,55 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam 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: -@@ -720,28 +735,28 @@ - - - #>+ 12 --keditbookmarks_la_meta_unload.cpp: commands.moc toplevel.moc -- @echo 'creating keditbookmarks_la_meta_unload.cpp' -- @-rm -f keditbookmarks_la_meta_unload.cpp -+libkeditbookmarks_main_la_meta_unload.cpp: commands.moc toplevel.moc -+ @echo 'creating libkeditbookmarks_main_la_meta_unload.cpp' -+ @-rm -f libkeditbookmarks_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_keditbookmarks_la[] = {' > keditbookmarks_la_meta_unload.cpp ;\ -- cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '0};' >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '_UNLOAD(keditbookmarks_la)' >> keditbookmarks_la_meta_unload.cpp ;\ -- else echo > keditbookmarks_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkeditbookmarks_main_la[] = {' > libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkeditbookmarks_main_la)' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ else echo > libkeditbookmarks_main_la_meta_unload.cpp; fi +@@ -686,16 +705,16 @@ toplevel_skel.cpp: toplevel.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl + #>+ 3 +-toplevel.moc: $(srcdir)/toplevel.h +- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc +- +-#>+ 3 + commands.moc: $(srcdir)/commands.h + $(MOC) $(srcdir)/commands.h -o commands.moc #>+ 3 - clean-moc-classes: -- -rm -f keditbookmarks_la_meta_unload.cpp -+ -rm -f libkeditbookmarks_main_la_meta_unload.cpp ++toplevel.moc: $(srcdir)/toplevel.h ++ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f toplevel.moc commands.moc ++ -rm -f commands.moc toplevel.moc + + #>+ 4 + clean-idl: +@@ -724,33 +743,33 @@ force-reedit: - #>+ 11 --keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp keditbookmarks_la_meta_unload.cpp commands.moc toplevel.moc -+keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp - @echo 'creating keditbookmarks_la.all_cpp.cpp ...'; \ - rm -f keditbookmarks_la.all_cpp.files keditbookmarks_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> keditbookmarks_la.all_cpp.final; \ -- for file in main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp keditbookmarks_la_meta_unload.cpp ; do \ -+ for file in keditbookmarks_main.cpp ; do \ - echo "#include \"$$file\"" >> keditbookmarks_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks_la.all_cpp.final; \ - done; \ -@@ -749,11 +764,23 @@ - rm -f keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files #>+ 11 --keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp libkeditbookmarks_main_la_meta_unload.cpp commands.moc toplevel.moc +-keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp toplevel.moc commands.moc +- @echo 'creating keditbookmarks_la.all_cpp.cpp ...'; \ +- rm -f keditbookmarks_la.all_cpp.files keditbookmarks_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> keditbookmarks_la.all_cpp.final; \ ++libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp commands.moc toplevel.moc + @echo 'creating libkeditbookmarks_main_la.all_cpp.cpp ...'; \ + rm -f libkeditbookmarks_main_la.all_cpp.files libkeditbookmarks_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkeditbookmarks_main_la.all_cpp.final; \ -+ for file in main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp libkeditbookmarks_main_la_meta_unload.cpp ; do \ + for file in main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp ; do \ +- echo "#include \"$$file\"" >> keditbookmarks_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkeditbookmarks_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeditbookmarks_main_la.all_cpp.final; \ -+ done; \ -+ cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files > libkeditbookmarks_main_la.all_cpp.cpp; \ -+ rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files -+ -+#>+ 11 -+keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp - @echo 'creating keditbookmarks.all_cpp.cpp ...'; \ - rm -f keditbookmarks.all_cpp.files keditbookmarks.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> keditbookmarks.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in keditbookmarks_main.cpp ; do \ - echo "#include \"$$file\"" >> keditbookmarks.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks.all_cpp.final; \ done; \ -@@ -762,20 +789,20 @@ +- cat keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files > keditbookmarks_la.all_cpp.cpp; \ +- rm -f keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files ++ cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files > libkeditbookmarks_main_la.all_cpp.cpp; \ ++ rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp -+ -rm -f keditbookmarks_la.all_cpp.cpp libkeditbookmarks_main_la.all_cpp.cpp keditbookmarks.all_cpp.cpp +- -rm -f keditbookmarks_la.all_cpp.cpp ++ -rm -f libkeditbookmarks_main_la.all_cpp.cpp #>+ 2 final: @@ -235,4 +223,15 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ + $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_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 +@@ -760,7 +779,7 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 5 +-commands.o: commands.moc +-toplevel.lo: toplevel.moc +-commands.lo: commands.moc + toplevel.o: toplevel.moc ++commands.lo: commands.moc ++toplevel.lo: toplevel.moc ++commands.o: commands.moc diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct index eb0d7397210..95495753226 100644 --- a/x11/kdebase3/patches/patch-ct +++ b/x11/kdebase3/patches/patch-ct @@ -1,8 +1,8 @@ -$NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ +$NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ ---- konsole/konsole/Makefile.in.orig Wed Aug 7 18:19:54 2002 +--- konsole/konsole/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ konsole/konsole/Makefile.in -@@ -304,7 +304,9 @@ INCLUDES = $(all_includes) +@@ -303,7 +303,9 @@ INCLUDES = $(all_includes) # you can add here more. This one gets installed bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole @@ -13,7 +13,7 @@ $NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ # libkonsolepart is a part, but konsole.la links directly to it, so we can't # install it under kde_module -@@ -337,18 +339,26 @@ libkonsolepart_la_LDFLAGS = $(all_librar +@@ -336,28 +338,36 @@ libkonsolepart_la_LDFLAGS = $(all_librar libkonsolepart_la_LIBADD = $(LIBUTIL) @XTESTLIB@ $(LIB_KPARTS) # kwrited kdeinit module @@ -46,16 +46,19 @@ $NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version # konsole executable - has all the sources, doesn't link kparts, saves startup time -@@ -358,7 +368,7 @@ konsole_la_LDFLAGS = $(all_libraries) -m + #>- konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ + #>- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ +-#>- konsole_wcwidth.cpp ++#>- konsole_wcwidth.cpp konsole_main.cpp #>+ 3 konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ - TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp \ -- konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp -+ konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp + TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp \ +- konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ++ konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_LDADD = $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ $(LIB_KDEUI) konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -392,24 +402,25 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -391,19 +401,24 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -64,10 +67,9 @@ $NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ +konsole_la_DEPENDENCIES = libkonsole_main.la +am_konsole_la_OBJECTS = konsole_main.lo #>- konsole_la_OBJECTS = $(am_konsole_la_OBJECTS) --#>+ 5 +-#>+ 4 -konsole_la_final_OBJECTS = konsole_la.all_cpp.lo --konsole_la_nofinal_OBJECTS = main.lo konsole.lo \ -- konsole_la_meta_unload.lo +-konsole_la_nofinal_OBJECTS = main.lo konsole.lo -@KDE_USE_FINAL_FALSE@konsole_la_OBJECTS = $(konsole_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@konsole_la_OBJECTS = $(konsole_la_final_OBJECTS) -kwrited_la_DEPENDENCIES = libkonsolepart.la @@ -77,60 +79,51 @@ $NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ +kwrited_la_DEPENDENCIES = libkwrited_main.la +am_kwrited_la_OBJECTS = kwrited_main.lo #>- kwrited_la_OBJECTS = $(am_kwrited_la_OBJECTS) -+#>+ 1 + #>+ 1 +-kwrited_la_OBJECTS = kwrited.lo +kwrited_la_OBJECTS = kwrited_main.lo +libkonsole_main_la_DEPENDENCIES = libkonsolepart.la +am_libkonsole_main_la_OBJECTS = main.lo konsole.lo +#>- libkonsole_main_la_OBJECTS = $(am_libkonsole_main_la_OBJECTS) - #>+ 5 --kwrited_la_final_OBJECTS = kwrited_la.all_cpp.lo --kwrited_la_nofinal_OBJECTS = kwrited.lo \ -- kwrited_la_meta_unload.lo --@KDE_USE_FINAL_FALSE@kwrited_la_OBJECTS = $(kwrited_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kwrited_la_OBJECTS = $(kwrited_la_final_OBJECTS) ++#>+ 4 +libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_cpp.lo -+libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo \ -+ libkonsole_main_la_meta_unload.lo ++libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo +@KDE_USE_FINAL_FALSE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_final_OBJECTS) libkonsolepart_la_DEPENDENCIES = am_libkonsolepart_la_OBJECTS = TEPty.lo BlockArray.lo konsole_part.lo \ schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \ -@@ -423,6 +434,15 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt - libkonsolepart_la_meta_unload.lo +@@ -416,6 +431,11 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt + konsole_wcwidth.lo TEmulation.lo TEHistory.lo keytrans.lo konsoleiface_skel.lo sessioniface_skel.lo @KDE_USE_FINAL_FALSE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_final_OBJECTS) +libkwrited_main_la_DEPENDENCIES = libkonsolepart.la +am_libkwrited_main_la_OBJECTS = kwrited.lo +#>- libkwrited_main_la_OBJECTS = $(am_libkwrited_main_la_OBJECTS) -+#>+ 5 -+libkwrited_main_la_final_OBJECTS = libkwrited_main_la.all_cpp.lo -+libkwrited_main_la_nofinal_OBJECTS = kwrited.lo \ -+ libkwrited_main_la_meta_unload.lo -+@KDE_USE_FINAL_FALSE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_final_OBJECTS) ++#>+ 1 ++libkwrited_main_la_OBJECTS = kwrited.lo bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \ kwrited$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -431,7 +451,7 @@ am_konsole_OBJECTS = TEPty.$(OBJEXT) Blo +@@ -424,7 +444,7 @@ am_konsole_OBJECTS = TEPty.$(OBJEXT) Blo konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ - konsole_wcwidth.$(OBJEXT) + konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) #>- konsole_OBJECTS = $(am_konsole_OBJECTS) - #>+ 9 + #>+ 8 konsole_final_OBJECTS = konsole.all_cpp.o -@@ -439,7 +459,7 @@ konsole_nofinal_OBJECTS = TEPty.$(OBJEXT +@@ -432,7 +452,7 @@ konsole_nofinal_OBJECTS = TEPty.$(OBJEXT konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ -- konsole_wcwidth.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) \ -+ konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) \ - konsole_meta_unload.o +- konsole_wcwidth.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) ++ konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) @KDE_USE_FINAL_FALSE@konsole_OBJECTS = $(konsole_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@konsole_OBJECTS = $(konsole_final_OBJECTS) -@@ -450,11 +470,11 @@ am_konsole_grantpty_OBJECTS = konsole_gr + konsole_DEPENDENCIES = +@@ -442,11 +462,11 @@ am_konsole_grantpty_OBJECTS = konsole_gr konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT) konsole_grantpty_LDADD = $(LDADD) konsole_grantpty_DEPENDENCIES = @@ -145,33 +138,88 @@ $NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -469,15 +489,19 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ - @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ - @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/konsole_grantpty.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/konsole_part.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po -+ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/session.Po +@@ -461,32 +481,40 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/konsole_grantpty.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/konsole_part.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po +-#>+ 33 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/konsole_la.all_cpp.P $(DEPDIR)/libkonsolepart_la.all_cpp.P $(DEPDIR)/konsole.all_cpp.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/session.Po ++#>+ 41 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/libkonsole_main_la.all_cpp.P $(DEPDIR)/libkonsolepart_la.all_cpp.P $(DEPDIR)/konsole.all_cpp.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEHistory.Plo $(DEPDIR)/TEHistory.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEPty.Plo $(DEPDIR)/TEPty.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEScreen.Plo $(DEPDIR)/TEScreen.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_grantpty.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_part.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/session.Po + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEHistory.Plo $(DEPDIR)/TEHistory.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEPty.Plo $(DEPDIR)/TEPty.Po \ +@@ -494,15 +522,19 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_grantpty.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_part.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/session.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -506,14 +530,15 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -532,14 +564,15 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) \ @@ -189,7 +237,7 @@ $NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ #>- all: all-am #>+ 1 -@@ -564,11 +589,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons +@@ -590,11 +623,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons $(CXXLINK) -rpath $(libdir) $(konsole_la_LDFLAGS) $(konsole_la_OBJECTS) $(konsole_la_LIBADD) $(LIBS) kwrited.la: $(kwrited_la_OBJECTS) $(kwrited_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwrited_la_LDFLAGS) $(kwrited_la_OBJECTS) $(kwrited_la_LIBADD) $(LIBS) @@ -205,7 +253,7 @@ $NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -623,16 +652,19 @@ distclean-compile: +@@ -649,16 +686,19 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmuVt102.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Po@am__quote@ @@ -226,198 +274,166 @@ $NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/schema.Plo@am__quote@ -@@ -750,7 +782,7 @@ distclean-tags: +@@ -776,7 +816,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=konsoleiface.h konsole_wcwidth.cpp MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp sessioniface.h keytrans.cpp x-konsole.desktop konsolerc konsole_part.h -+KDE_DIST=TEWidget.cpp keytrans.cpp konsoleiface.h konsole_part.h konsole_wcwidth.cpp x-konsole.desktop session.cpp konsolerc sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmuVt102.cpp TEmulation.cpp +-KDE_DIST=x-konsole.desktop sessioniface.h TEScreen.cpp MakeDefaults konsole_part.h TEmulation.cpp keytrans.cpp konsolerc konsoleiface.h TEHistory.cpp konsole_wcwidth.cpp ++KDE_DIST=keytrans.cpp konsoleiface.h konsole_part.h konsole_wcwidth.cpp x-konsole.desktop konsolerc sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -892,9 +924,6 @@ messages: rc.cpp +@@ -918,9 +958,6 @@ messages: rc.cpp rm -f schemas.cpp rm -f tips.cpp -dummy.cpp: - echo > dummy.cpp - - konsole.lo: konsole.o - # 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. -@@ -978,29 +1007,16 @@ force-reedit: - - - #>+ 12 --konsole_la_meta_unload.cpp: konsole.moc -- @echo 'creating konsole_la_meta_unload.cpp' -- @-rm -f konsole_la_meta_unload.cpp -- @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_konsole_la[] = {' > konsole_la_meta_unload.cpp ;\ -- cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konsole_la_meta_unload.cpp ;\ -- echo '0};' >> konsole_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> konsole_la_meta_unload.cpp ;\ -- echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.cpp ;\ -- else echo > konsole_la_meta_unload.cpp; fi -- -- --#>+ 12 --kwrited_la_meta_unload.cpp: kwrited.moc -- @echo 'creating kwrited_la_meta_unload.cpp' -- @-rm -f kwrited_la_meta_unload.cpp -+libkonsole_main_la_meta_unload.cpp: konsole.moc -+ @echo 'creating libkonsole_main_la_meta_unload.cpp' -+ @-rm -f libkonsole_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kwrited_la[] = {' > kwrited_la_meta_unload.cpp ;\ -- cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrited_la_meta_unload.cpp ;\ -- echo '0};' >> kwrited_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kwrited_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.cpp ;\ -- else echo > kwrited_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkonsole_main_la[] = {' > libkonsole_main_la_meta_unload.cpp ;\ -+ cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonsole_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkonsole_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkonsole_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.cpp ;\ -+ else echo > libkonsole_main_la_meta_unload.cpp; fi - - - #>+ 12 -@@ -1017,6 +1033,19 @@ libkonsolepart_la_meta_unload.cpp: TEmu - - - #>+ 12 -+libkwrited_main_la_meta_unload.cpp: kwrited.moc -+ @echo 'creating libkwrited_main_la_meta_unload.cpp' -+ @-rm -f libkwrited_main_la_meta_unload.cpp -+ @if test ${kde_qtver} = 2; then \ -+ echo 'static const char * _metalist_libkwrited_main_la[] = {' > libkwrited_main_la_meta_unload.cpp ;\ -+ cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrited_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkwrited_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkwrited_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.cpp ;\ -+ else echo > libkwrited_main_la_meta_unload.cpp; fi -+ + #>- konsole.lo: konsole.o + #>+ 1 + konsole.lo: konsole.moc konsole.o +@@ -929,8 +966,12 @@ konsole.lo: konsole.moc konsole.o + .NOEXPORT: + + #>+ 3 +-kwrited.moc: $(srcdir)/kwrited.h +- $(MOC) $(srcdir)/kwrited.h -o kwrited.moc ++konsole_part.moc: $(srcdir)/konsole_part.h ++ $(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc + -+#>+ 12 - konsole_meta_unload.cpp: TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc - @echo 'creating konsole_meta_unload.cpp' - @-rm -f konsole_meta_unload.cpp -@@ -1031,14 +1060,14 @@ konsole_meta_unload.cpp: TEmulation.moc ++#>+ 3 ++konsole.moc: $(srcdir)/konsole.h ++ $(MOC) $(srcdir)/konsole.h -o konsole.moc #>+ 3 - clean-moc-classes: -- -rm -f konsole_la_meta_unload.cpp kwrited_la_meta_unload.cpp libkonsolepart_la_meta_unload.cpp konsole_meta_unload.cpp -+ -rm -f libkonsole_main_la_meta_unload.cpp libkonsolepart_la_meta_unload.cpp libkwrited_main_la_meta_unload.cpp konsole_meta_unload.cpp + TEWidget.moc: $(srcdir)/TEWidget.h +@@ -941,10 +982,6 @@ TEmulation.moc: $(srcdir)/TEmulation.h + $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc - #>+ 11 --konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole_la_meta_unload.cpp konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc -+konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konsole_main.cpp konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc - @echo 'creating konsole_la.all_cpp.cpp ...'; \ - rm -f konsole_la.all_cpp.files konsole_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> konsole_la.all_cpp.final; \ -- for file in main.cpp konsole.cpp konsole_la_meta_unload.cpp ; do \ -+ for file in konsole_main.cpp ; do \ - echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ - done; \ -@@ -1046,11 +1075,11 @@ konsole_la.all_cpp.cpp: $(srcdir)/Makefi - rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files + #>+ 3 +-konsole.moc: $(srcdir)/konsole.h +- $(MOC) $(srcdir)/konsole.h -o konsole.moc +- +-#>+ 3 + session.moc: $(srcdir)/session.h + $(MOC) $(srcdir)/session.h -o session.moc + +@@ -953,8 +990,8 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h + $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc + + #>+ 3 +-konsole_part.moc: $(srcdir)/konsole_part.h +- $(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc ++kwrited.moc: $(srcdir)/kwrited.h ++ $(MOC) $(srcdir)/kwrited.h -o kwrited.moc + + #>+ 3 + TEPty.moc: $(srcdir)/TEPty.h +@@ -981,7 +1018,7 @@ libkonsolepart.la.closure: $(libkonsolep + + #>+ 3 + clean-metasources: +- -rm -f kwrited.moc TEWidget.moc TEmulation.moc konsole.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc ++ -rm -f konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc + + #>+ 7 + clean-idl: +@@ -1006,19 +1043,19 @@ force-reedit: - #>+ 11 --kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited.cpp kwrited_la_meta_unload.cpp -+kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp - @echo 'creating kwrited_la.all_cpp.cpp ...'; \ - rm -f kwrited_la.all_cpp.files kwrited_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_cpp.final; \ -- for file in kwrited.cpp kwrited_la_meta_unload.cpp ; do \ -+ for file in kwrited_main.cpp ; do \ - echo "#include \"$$file\"" >> kwrited_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_cpp.final; \ - done; \ -@@ -1058,6 +1087,18 @@ kwrited_la.all_cpp.cpp: $(srcdir)/Makefi - rm -f kwrited_la.all_cpp.final kwrited_la.all_cpp.files #>+ 11 -+libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp libkonsole_main_la_meta_unload.cpp +-konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole.moc +- @echo 'creating konsole_la.all_cpp.cpp ...'; \ +- rm -f konsole_la.all_cpp.files konsole_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> konsole_la.all_cpp.final; \ ++libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole.moc + @echo 'creating libkonsole_main_la.all_cpp.cpp ...'; \ + rm -f libkonsole_main_la.all_cpp.files libkonsole_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkonsole_main_la.all_cpp.final; \ -+ for file in main.cpp konsole.cpp libkonsole_main_la_meta_unload.cpp ; do \ + for file in main.cpp konsole.cpp ; do \ +- echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkonsole_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonsole_main_la.all_cpp.final; \ -+ done; \ -+ cat libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files > libkonsole_main_la.all_cpp.cpp; \ + done; \ +- cat konsole_la.all_cpp.final konsole_la.all_cpp.files > konsole_la.all_cpp.cpp; \ +- rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files ++ cat libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files > libkonsole_main_la.all_cpp.cpp; \ + rm -f libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files -+ -+#>+ 11 - libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp libkonsolepart_la_meta_unload.cpp + + #>+ 11 +-libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc ++libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEmulation.moc TEWidget.moc TEPty.moc konsole_part.moc session.moc TEmuVt102.moc @echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \ rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \ -@@ -1070,11 +1111,23 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) + echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \ +@@ -1030,11 +1067,11 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) rm -f libkonsolepart_la.all_cpp.final libkonsolepart_la.all_cpp.files #>+ 11 --konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp -+libkwrited_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited.cpp libkwrited_main_la_meta_unload.cpp -+ @echo 'creating libkwrited_main_la.all_cpp.cpp ...'; \ -+ rm -f libkwrited_main_la.all_cpp.files libkwrited_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkwrited_main_la.all_cpp.final; \ -+ for file in kwrited.cpp libkwrited_main_la_meta_unload.cpp ; do \ -+ echo "#include \"$$file\"" >> libkwrited_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrited_main_la.all_cpp.final; \ -+ done; \ -+ cat libkwrited_main_la.all_cpp.final libkwrited_main_la.all_cpp.files > libkwrited_main_la.all_cpp.cpp; \ -+ rm -f libkwrited_main_la.all_cpp.final libkwrited_main_la.all_cpp.files -+ -+#>+ 11 -+konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp +-konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc konsole.moc session.moc TEmuVt102.moc TEPty.moc ++konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc @echo 'creating konsole.all_cpp.cpp ...'; \ rm -f konsole.all_cpp.files konsole.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> konsole.all_cpp.final; \ -- for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ; do \ -+ for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ; do \ +- for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ; do \ ++ for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ; do \ echo "#include \"$$file\"" >> konsole.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \ done; \ -@@ -1082,11 +1135,11 @@ konsole.all_cpp.cpp: $(srcdir)/Makefile. - rm -f konsole.all_cpp.final konsole.all_cpp.files - - #>+ 11 --kwrited.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kwrited.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp - @echo 'creating kwrited.all_cpp.cpp ...'; \ - rm -f kwrited.all_cpp.files kwrited.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwrited.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kwrited_main.cpp ; do \ - echo "#include \"$$file\"" >> kwrited.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_cpp.final; \ - done; \ -@@ -1095,20 +1148,20 @@ kwrited.all_cpp.cpp: $(srcdir)/Makefile. +@@ -1043,20 +1080,20 @@ konsole.all_cpp.cpp: $(srcdir)/Makefile. #>+ 3 clean-final: -- -rm -f konsole_la.all_cpp.cpp kwrited_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp kwrited.all_cpp.cpp -+ -rm -f konsole_la.all_cpp.cpp kwrited_la.all_cpp.cpp libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp libkwrited_main_la.all_cpp.cpp konsole.all_cpp.cpp kwrited.all_cpp.cpp +- -rm -f konsole_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp ++ -rm -f libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp #>+ 2 final: -- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am -+ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am -+ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am -+ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am -+ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_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 +@@ -1066,18 +1103,18 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 16 +-kwrited.lo: kwrited.moc +-TEmuVt102.o: TEmuVt102.moc +-TEWidget.o: TEWidget.moc +-session.lo: session.moc +-TEPty.lo: TEPty.moc +-session.o: session.moc +-TEmulation.lo: TEmulation.moc ++TEmuVt102.lo: TEmuVt102.moc + konsole.o: konsole.moc ++TEPty.lo: TEPty.moc ++session.lo: session.moc + TEPty.o: TEPty.moc +-TEmuVt102.lo: TEmuVt102.moc ++TEmulation.lo: TEmulation.moc + konsole_part.lo: konsole_part.moc ++session.o: session.moc ++TEWidget.lo: TEWidget.moc + TEmulation.o: TEmulation.moc +-konsole_part.o: konsole_part.moc + kwrited.o: kwrited.moc +-TEWidget.lo: TEWidget.moc ++konsole_part.o: konsole_part.moc ++kwrited.lo: kwrited.moc ++TEmuVt102.o: TEmuVt102.moc ++TEWidget.o: TEWidget.moc diff --git a/x11/kdebase3/patches/patch-cz b/x11/kdebase3/patches/patch-cz index 7d9c1b92c62..8730c70ed67 100644 --- a/x11/kdebase3/patches/patch-cz +++ b/x11/kdebase3/patches/patch-cz @@ -1,8 +1,8 @@ -$NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ +$NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- ksmserver/Makefile.in.orig Mon May 13 23:57:53 2002 +--- ksmserver/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ ksmserver/Makefile.in -@@ -309,18 +309,21 @@ +@@ -308,18 +308,21 @@ SUBDIRS = . INCLUDES = $(all_includes) bin_PROGRAMS = ksmserver @@ -29,7 +29,7 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ picsdir = $(kde_datadir)/ksmserver/pics pics_DATA = shutdownkonq.png -@@ -339,24 +342,29 @@ +@@ -338,23 +341,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -43,15 +43,13 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ +libksmserver_main_la_DEPENDENCIES = +am_libksmserver_main_la_OBJECTS = main.lo server.lo shutdown.lo +#>- libksmserver_main_la_OBJECTS = $(am_libksmserver_main_la_OBJECTS) - #>+ 5 + #>+ 4 -ksmserver_la_final_OBJECTS = ksmserver_la.all_cpp.lo --ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo \ -- ksmserver_la_meta_unload.lo +-ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo -@KDE_USE_FINAL_FALSE@ksmserver_la_OBJECTS = $(ksmserver_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@ksmserver_la_OBJECTS = $(ksmserver_la_final_OBJECTS) +libksmserver_main_la_final_OBJECTS = libksmserver_main_la.all_cpp.lo -+libksmserver_main_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo \ -+ libksmserver_main_la_meta_unload.lo ++libksmserver_main_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo +@KDE_USE_FINAL_FALSE@libksmserver_main_la_OBJECTS = $(libksmserver_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libksmserver_main_la_OBJECTS = $(libksmserver_main_la_final_OBJECTS) bin_PROGRAMS = ksmserver$(EXEEXT) @@ -68,18 +66,30 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ +ksmserver_DEPENDENCIES = libksmserver_main.la am_testsh_OBJECTS = test.$(OBJEXT) shutdown.$(OBJEXT) #>- testsh_OBJECTS = $(am_testsh_OBJECTS) - #>+ 5 -@@ -373,7 +381,8 @@ + #>+ 4 +@@ -370,14 +378,17 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ksmserver_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -395,8 +404,8 @@ +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ksmserver_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po +-#>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/ksmserver_la.all_cpp.P $(DEPDIR)/testsh.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libksmserver_main_la.all_cpp.P $(DEPDIR)/testsh.all_cpp.P $(DEPDIR)/ksmserver_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/ksmserver_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po + +@@ -400,8 +411,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -90,7 +100,7 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ DATA = $(pics_DATA) $(update_DATA) HEADERS = $(noinst_HEADERS) -@@ -408,7 +417,7 @@ +@@ -413,7 +424,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -99,7 +109,7 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -457,6 +466,8 @@ +@@ -462,6 +473,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) ksmserver.la: $(ksmserver_la_OBJECTS) $(ksmserver_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(ksmserver_la_LDFLAGS) $(ksmserver_la_OBJECTS) $(ksmserver_la_LIBADD) $(LIBS) @@ -108,7 +118,7 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -497,7 +508,8 @@ +@@ -502,7 +515,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -118,16 +128,16 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/server.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shutdown.Plo@am__quote@ -@@ -655,7 +667,7 @@ +@@ -660,7 +674,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=move_session_config.sh ksmserver.upd shutdownkonq.png configure.in.in LICENSE -+KDE_DIST=ksmserver configure.in.in LICENSE move_session_config.sh ksmserver.upd shutdownkonq.png dummy.cpp +-KDE_DIST=move_session_config.sh shutdownkonq.png ksmserver.upd LICENSE configure.in.in ++KDE_DIST=configure.in.in LICENSE move_session_config.sh ksmserver.upd shutdownkonq.png DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -796,9 +808,6 @@ +@@ -801,24 +815,21 @@ uninstall-info: uninstall-info-recursive messages: $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot @@ -137,82 +147,57 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam 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: -@@ -826,16 +835,16 @@ - - - #>+ 12 --ksmserver_la_meta_unload.cpp: server.moc shutdown.moc -- @echo 'creating ksmserver_la_meta_unload.cpp' -- @-rm -f ksmserver_la_meta_unload.cpp -+libksmserver_main_la_meta_unload.cpp: server.moc shutdown.moc -+ @echo 'creating libksmserver_main_la_meta_unload.cpp' -+ @-rm -f libksmserver_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_ksmserver_la[] = {' > ksmserver_la_meta_unload.cpp ;\ -- cat server.moc shutdown.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> ksmserver_la_meta_unload.cpp ;\ -- echo '0};' >> ksmserver_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> ksmserver_la_meta_unload.cpp ;\ -- echo '_UNLOAD(ksmserver_la)' >> ksmserver_la_meta_unload.cpp ;\ -- else echo > ksmserver_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libksmserver_main_la[] = {' > libksmserver_main_la_meta_unload.cpp ;\ -+ cat server.moc shutdown.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libksmserver_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libksmserver_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libksmserver_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libksmserver_main_la)' >> libksmserver_main_la_meta_unload.cpp ;\ -+ else echo > libksmserver_main_la_meta_unload.cpp; fi - - - #>+ 12 -@@ -853,14 +862,14 @@ #>+ 3 - clean-moc-classes: -- -rm -f ksmserver_la_meta_unload.cpp testsh_meta_unload.cpp -+ -rm -f libksmserver_main_la_meta_unload.cpp testsh_meta_unload.cpp +-shutdown.moc: $(srcdir)/shutdown.h +- $(MOC) $(srcdir)/shutdown.h -o shutdown.moc +- +-#>+ 3 + server.moc: $(srcdir)/server.h + $(MOC) $(srcdir)/server.h -o server.moc + + #>+ 3 ++shutdown.moc: $(srcdir)/shutdown.h ++ $(MOC) $(srcdir)/shutdown.h -o shutdown.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f shutdown.moc server.moc ++ -rm -f server.moc shutdown.moc + + #>+ 2 + docs-am: +@@ -831,16 +842,16 @@ force-reedit: - #>+ 11 --ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp ksmserver_la_meta_unload.cpp server.moc shutdown.moc -+ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksmserver_main.cpp server.moc shutdown.moc - @echo 'creating ksmserver_la.all_cpp.cpp ...'; \ - rm -f ksmserver_la.all_cpp.files ksmserver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> ksmserver_la.all_cpp.final; \ -- for file in main.cpp server.cpp shutdown.cpp ksmserver_la_meta_unload.cpp ; do \ -+ for file in ksmserver_main.cpp ; do \ - echo "#include \"$$file\"" >> ksmserver_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver_la.all_cpp.final; \ - done; \ -@@ -868,11 +877,23 @@ - rm -f ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files #>+ 11 --ksmserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libksmserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp libksmserver_main_la_meta_unload.cpp +-ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp shutdown.moc server.moc +- @echo 'creating ksmserver_la.all_cpp.cpp ...'; \ +- rm -f ksmserver_la.all_cpp.files ksmserver_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> ksmserver_la.all_cpp.final; \ ++libksmserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp server.moc shutdown.moc + @echo 'creating libksmserver_main_la.all_cpp.cpp ...'; \ + rm -f libksmserver_main_la.all_cpp.files libksmserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libksmserver_main_la.all_cpp.final; \ -+ for file in main.cpp server.cpp shutdown.cpp libksmserver_main_la_meta_unload.cpp ; do \ + for file in main.cpp server.cpp shutdown.cpp ; do \ +- echo "#include \"$$file\"" >> ksmserver_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libksmserver_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libksmserver_main_la.all_cpp.final; \ -+ done; \ -+ cat libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files > libksmserver_main_la.all_cpp.cpp; \ -+ rm -f libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files -+ -+#>+ 11 -+ksmserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksmserver_main.cpp - @echo 'creating ksmserver.all_cpp.cpp ...'; \ - rm -f ksmserver.all_cpp.files ksmserver.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> ksmserver.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in ksmserver_main.cpp ; do \ - echo "#include \"$$file\"" >> ksmserver.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver.all_cpp.final; \ done; \ -@@ -893,20 +914,20 @@ +- cat ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files > ksmserver_la.all_cpp.cpp; \ +- rm -f ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files ++ cat libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files > libksmserver_main_la.all_cpp.cpp; \ ++ rm -f libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files + + #>+ 11 + testsh.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/test.cpp $(srcdir)/shutdown.cpp shutdown.moc +@@ -856,20 +867,20 @@ testsh.all_cpp.cpp: $(srcdir)/Makefile.i #>+ 3 clean-final: -- -rm -f ksmserver_la.all_cpp.cpp ksmserver.all_cpp.cpp testsh.all_cpp.cpp -+ -rm -f ksmserver_la.all_cpp.cpp libksmserver_main_la.all_cpp.cpp ksmserver.all_cpp.cpp testsh.all_cpp.cpp +- -rm -f ksmserver_la.all_cpp.cpp testsh.all_cpp.cpp ++ -rm -f libksmserver_main_la.all_cpp.cpp testsh.all_cpp.cpp #>+ 2 final: @@ -232,4 +217,14 @@ $NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $ + $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_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 +@@ -879,7 +890,7 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 5 +-server.lo: server.moc ++server.o: server.moc + shutdown.lo: shutdown.moc ++server.lo: server.moc + shutdown.o: shutdown.moc +-server.o: server.moc diff --git a/x11/kdebase3/patches/patch-df b/x11/kdebase3/patches/patch-df index b0d33d0e43d..e716be18f31 100644 --- a/x11/kdebase3/patches/patch-df +++ b/x11/kdebase3/patches/patch-df @@ -1,34 +1,45 @@ -$NetBSD: patch-df,v 1.5 2002/08/25 19:23:45 jlam Exp $ - ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Wed Aug 21 17:39:19 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c -@@ -20,15 +20,14 @@ +--- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Tue Nov 5 02:41:09 2002 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c Tue Nov 26 11:56:27 2002 +@@ -1,7 +1,7 @@ + /* + KSysGuard, the KDE System Guard + +- Copyright (c) 2001 Tobias Koenig <tokoe@kde.org> ++ Copyright (c) 2001 Tobias Koenig <tokoe82@yahoo.de> + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public +@@ -16,304 +16,269 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +- $Id: patch-df,v 1.6 2003/01/02 09:12:35 skrll Exp $ ++ $Id: patch-df,v 1.6 2003/01/02 09:12:35 skrll Exp $ */ --#include <fcntl.h> +-#include <sys/types.h> +#include <sys/types.h> /* for sys/socket.h, ifaddrs.h */ +#include <ifaddrs.h> #include <sys/socket.h> +#include <sys/param.h> /* for sys/sysctl.h */ -+#include <sys/sysctl.h> + #include <sys/sysctl.h> +-#include <sys/time.h> +- +#include <net/route.h> #include <net/if.h> -#include <net/if_mib.h> +- +-#include <fcntl.h> -#include <stdio.h> +#include <net/if_dl.h> +#include <stdlib.h> #include <string.h> --#include <sys/sysctl.h> --#include <sys/time.h> --#include <sys/types.h> -#include <unistd.h> -- #include "Command.h" -@@ -36,284 +35,250 @@ + #include "ksysguardd.h" #include "netdev.h" -- +#define I_bytes 0 +#define I_packs 1 +#define I_errs 2 @@ -62,7 +73,7 @@ $NetBSD: patch-df,v 1.5 2002/08/25 19:23:45 jlam Exp $ - char *begin; - static char sensor[100]; - static char interface[100]; -- static char* retval[2]; +- static char *retval[2]; - - strncpy(tmp_cmd, cmd, 1024); - @@ -78,10 +89,10 @@ $NetBSD: patch-df,v 1.5 2002/08/25 19:23:45 jlam Exp $ - begin++; - strcpy(interface, begin); - retval[0] = interface; -- + - return retval; -} - +- -int numActivIfaces(void) -{ - int counter = 0; diff --git a/x11/kdebase3/patches/patch-dh b/x11/kdebase3/patches/patch-dh index c9bc7cf1f77..96353a037a8 100644 --- a/x11/kdebase3/patches/patch-dh +++ b/x11/kdebase3/patches/patch-dh @@ -1,8 +1,8 @@ -$NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ +$NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- kwin/Makefile.in.orig Mon May 13 23:57:54 2002 +--- kwin/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/Makefile.in -@@ -293,18 +293,22 @@ +@@ -292,18 +292,22 @@ INCLUDES = $(all_includes) SUBDIRS = . kcmkwin pics clients bin_PROGRAMS = kwin @@ -12,8 +12,8 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ # workspace.cpp has to be first in order not to break --enable-final -#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ +#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ - #>- killwindow.cpp kwinbutton.cpp + #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ + #>- killwindow.cpp kwinbutton.cpp #>+ 3 -kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ +libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ @@ -29,7 +29,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h -@@ -313,7 +317,7 @@ +@@ -312,7 +316,7 @@ kwinincludedir = $(includedir)/kwin kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h kwin_SOURCES = kwin_main.cpp @@ -38,7 +38,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) KDE_ICON = kwin -@@ -324,7 +328,6 @@ +@@ -323,7 +327,6 @@ data_DATA = eventsrc sounddir = $(kde_sounddir) sound_DATA = pop.wav @@ -46,7 +46,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ update_DATA = kwin.upd pluginlibFix.pl updatedir = $(kde_datadir)/kconf_update subdir = kwin -@@ -333,17 +336,24 @@ +@@ -332,16 +335,23 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -56,11 +56,10 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ +kwin_la_DEPENDENCIES = libkwin.la +am_kwin_la_OBJECTS = kwin_main.lo #>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) --#>+ 6 +-#>+ 5 -kwin_la_final_OBJECTS = kwin_la.all_cpp.lo -kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ -- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo \ -- kwin_la_meta_unload.lo +- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo -@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) +#>+ 1 @@ -70,18 +69,17 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ + tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ + kwinbutton.lo +#>- libkwin_la_OBJECTS = $(am_libkwin_la_OBJECTS) -+#>+ 7 ++#>+ 6 +libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo +libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ + tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ -+ kwinbutton.lo KWinInterface_skel.lo \ -+ libkwin_la_meta_unload.lo ++ kwinbutton.lo KWinInterface_skel.lo +@KDE_USE_FINAL_FALSE@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS) bin_PROGRAMS = kwin$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -351,7 +361,7 @@ +@@ -349,7 +359,7 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) #>- kwin_OBJECTS = $(am_kwin_OBJECTS) #>+ 1 kwin_OBJECTS = kwin_main.$(OBJEXT) @@ -90,22 +88,44 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -361,10 +371,10 @@ +@@ -359,23 +369,23 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo -+ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo ++#>- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + #>+ 13 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/kwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/libkwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -384,7 +394,7 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -396,7 +406,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -114,7 +134,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ DATA = $(data_DATA) $(sound_DATA) $(update_DATA) HEADERS = $(include_HEADERS) $(kwininclude_HEADERS) -@@ -397,7 +407,7 @@ +@@ -409,7 +419,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \ Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -123,7 +143,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -446,6 +456,8 @@ +@@ -458,6 +468,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) @@ -132,7 +152,7 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -484,6 +496,7 @@ +@@ -496,6 +508,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/client.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/events.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/killwindow.Plo@am__quote@ @@ -140,107 +160,91 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwin_main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwinbutton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -694,7 +707,7 @@ +@@ -706,7 +719,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=NEWCOLORSCHEME.README plugins.cpp stdclient_bitmaps.h kwin.upd options.cpp tabbox.h hi48-app-kwin.png pluginlibFix.pl LICENSE main.h hi32-app-kwin.png pop.wav kwinbutton.cpp events.cpp plugins.h killwindow.h kwinbindings.cpp events.h atoms.h eventsrc killwindow.cpp tabbox.cpp hi16-app-kwin.png +-KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h eventsrc atoms.h main.h killwindow.cpp kwin.upd pop.wav plugins.cpp pluginlibFix.pl tabbox.cpp hi16-app-kwin.png plugins.h events.h kwinbindings.cpp LICENSE hi48-app-kwin.png options.cpp kwinbutton.cpp hi32-app-kwin.png tabbox.h events.cpp +KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h options.cpp LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h events.h atoms.h killwindow.cpp tabbox.cpp eventsrc hi16-app-kwin.png DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -851,12 +864,6 @@ +@@ -863,25 +876,15 @@ messages: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 5 --KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) +-KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) -KWinInterface_skel.cpp: KWinInterface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl -- ++#>+ 3 ++workspace.moc: $(srcdir)/workspace.h ++ $(MOC) $(srcdir)/workspace.h -o workspace.moc + + #>+ 3 + client.moc: $(srcdir)/client.h + $(MOC) $(srcdir)/client.h -o client.moc + #>+ 3 - workspace.moc: $(srcdir)/workspace.h - $(MOC) $(srcdir)/workspace.h -o workspace.moc -@@ -881,6 +888,12 @@ - plugins.moc: $(srcdir)/plugins.h - $(MOC) $(srcdir)/plugins.h -o plugins.moc +-plugins.moc: $(srcdir)/plugins.h +- $(MOC) $(srcdir)/plugins.h -o plugins.moc +- +-#>+ 3 +-workspace.moc: $(srcdir)/workspace.h +- $(MOC) $(srcdir)/workspace.h -o workspace.moc +- +-#>+ 3 + options.moc: $(srcdir)/options.h + $(MOC) $(srcdir)/options.h -o options.moc +@@ -894,8 +897,18 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h + $(MOC) $(srcdir)/kwinbutton.h -o kwinbutton.moc + + #>+ 3 ++plugins.moc: $(srcdir)/plugins.h ++ $(MOC) $(srcdir)/plugins.h -o plugins.moc ++ +#>+ 5 -+KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) ++KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) +KWinInterface_skel.cpp: KWinInterface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl + - #>+ 3 ++#>+ 3 clean-metasources: - -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc -@@ -915,28 +928,28 @@ - - - #>+ 12 --kwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc -- @echo 'creating kwin_la_meta_unload.cpp' -- @-rm -f kwin_la_meta_unload.cpp -+libkwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc -+ @echo 'creating libkwin_la_meta_unload.cpp' -+ @-rm -f libkwin_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp ;\ -- cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp ;\ -- echo '0};' >> kwin_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kwin_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp ;\ -- else echo > kwin_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp ;\ -+ cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp ;\ -+ echo '0};' >> libkwin_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkwin_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp ;\ -+ else echo > libkwin_la_meta_unload.cpp; fi +- -rm -f client.moc plugins.moc workspace.moc options.moc tabbox.moc kwinbutton.moc ++ -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc + #>+ 4 + clean-idl: +@@ -927,33 +940,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f kwin_la_meta_unload.cpp -+ -rm -f libkwin_la_meta_unload.cpp #>+ 11 --kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc -+kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc - @echo 'creating kwin_la.all_cpp.cpp ...'; \ - rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ -- for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp ; do \ -+ for file in kwin_main.cpp ; do \ - echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ - done; \ -@@ -944,6 +957,18 @@ - rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files - - #>+ 11 -+libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp +-kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp client.moc workspace.moc plugins.moc options.moc tabbox.moc kwinbutton.moc +- @echo 'creating kwin_la.all_cpp.cpp ...'; \ +- rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ ++libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc + @echo 'creating libkwin_la.all_cpp.cpp ...'; \ + rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \ -+ for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ; do \ + for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \ -+ done; \ -+ cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ + done; \ +- cat kwin_la.all_cpp.final kwin_la.all_cpp.files > kwin_la.all_cpp.cpp; \ +- rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files ++ cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ + rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files -+ -+#>+ 11 - kwin.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp - @echo 'creating kwin.all_cpp.cpp ...'; \ - rm -f kwin.all_cpp.files kwin.all_cpp.final; \ -@@ -957,20 +982,20 @@ #>+ 3 clean-final: -- -rm -f kwin_la.all_cpp.cpp kwin.all_cpp.cpp -+ -rm -f kwin_la.all_cpp.cpp libkwin_la.all_cpp.cpp kwin.all_cpp.cpp +- -rm -f kwin_la.all_cpp.cpp ++ -rm -f libkwin_la.all_cpp.cpp #>+ 2 final: @@ -260,4 +264,27 @@ $NetBSD: patch-dh,v 1.2 2002/08/25 19:23:45 jlam Exp $ + $(MAKE) libkwin_la_OBJECTS="$(libkwin_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 +@@ -963,15 +976,15 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 13 +-kwinbutton.lo: kwinbutton.moc + kwinbutton.o: kwinbutton.moc +-tabbox.lo: tabbox.moc +-tabbox.o: tabbox.moc +-options.o: options.moc +-client.lo: client.moc + workspace.o: workspace.moc +-client.o: client.moc +-options.lo: options.moc + plugins.o: plugins.moc ++options.lo: options.moc ++client.o: client.moc ++tabbox.o: tabbox.moc + workspace.lo: workspace.moc ++client.lo: client.moc ++options.o: options.moc + plugins.lo: plugins.moc ++kwinbutton.lo: kwinbutton.moc ++tabbox.lo: tabbox.moc diff --git a/x11/kdebase3/patches/patch-dj b/x11/kdebase3/patches/patch-dj index ffc1433b3d3..2ac9feb58b6 100644 --- a/x11/kdebase3/patches/patch-dj +++ b/x11/kdebase3/patches/patch-dj @@ -1,8 +1,8 @@ -$NetBSD: patch-dj,v 1.2 2002/08/25 19:23:45 jlam Exp $ +$NetBSD: patch-dj,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- kwin/clients/b2/Makefile.in.orig Mon May 13 23:57:54 2002 +--- kwin/clients/b2/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/b2/Makefile.in -@@ -294,7 +294,7 @@ +@@ -293,7 +293,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin_b2.la kwin_b2_la_SOURCES = b2client.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dj,v 1.2 2002/08/25 19:23:45 jlam Exp $ kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -310,7 +310,7 @@ +@@ -309,7 +309,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,13 @@ $NetBSD: patch-dj,v 1.2 2002/08/25 19:23:45 jlam Exp $ +kwin_b2_la_DEPENDENCIES = ../../libkwin.la am_kwin_b2_la_OBJECTS = b2client.lo #>- kwin_b2_la_OBJECTS = $(am_kwin_b2_la_OBJECTS) - #>+ 5 + #>+ 1 +@@ -551,7 +551,7 @@ distclean-tags: + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=bitmaps.h b2.desktop ++KDE_DIST=b2.desktop bitmaps.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase3/patches/patch-dl b/x11/kdebase3/patches/patch-dl index d22bb61b99c..44d426628e4 100644 --- a/x11/kdebase3/patches/patch-dl +++ b/x11/kdebase3/patches/patch-dl @@ -1,8 +1,8 @@ -$NetBSD: patch-dl,v 1.2 2002/08/25 19:23:46 jlam Exp $ +$NetBSD: patch-dl,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- kwin/clients/default/Makefile.in.orig Mon May 13 23:57:54 2002 +--- kwin/clients/default/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/default/Makefile.in -@@ -294,7 +294,7 @@ +@@ -293,7 +293,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin_default.la kwin_default_la_SOURCES = kdedefault.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dl,v 1.2 2002/08/25 19:23:46 jlam Exp $ kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -305,7 +305,7 @@ +@@ -304,7 +304,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,11 @@ $NetBSD: patch-dl,v 1.2 2002/08/25 19:23:46 jlam Exp $ +kwin_default_la_DEPENDENCIES = ../../libkwin.la am_kwin_default_la_OBJECTS = kdedefault.lo #>- kwin_default_la_OBJECTS = $(am_kwin_default_la_OBJECTS) - #>+ 5 + #>+ 1 +@@ -717,5 +717,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-kdedefault.lo: kdedefault.moc + kdedefault.o: kdedefault.moc ++kdedefault.lo: kdedefault.moc diff --git a/x11/kdebase3/patches/patch-dn b/x11/kdebase3/patches/patch-dn index d9d32fb964b..e3cc1ddf637 100644 --- a/x11/kdebase3/patches/patch-dn +++ b/x11/kdebase3/patches/patch-dn @@ -1,8 +1,8 @@ -$NetBSD: patch-dn,v 1.2 2002/08/25 19:23:46 jlam Exp $ +$NetBSD: patch-dn,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- kwin/clients/icewm/Makefile.in.orig Mon May 13 23:57:55 2002 +--- kwin/clients/icewm/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/icewm/Makefile.in -@@ -294,7 +294,7 @@ +@@ -293,7 +293,7 @@ SUBDIRS = . config icewm-themes kde_module_LTLIBRARIES = kwin_icewm.la kwin_icewm_la_SOURCES = icewm.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dn,v 1.2 2002/08/25 19:23:46 jlam Exp $ kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -310,7 +310,7 @@ +@@ -309,7 +309,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,11 @@ $NetBSD: patch-dn,v 1.2 2002/08/25 19:23:46 jlam Exp $ +kwin_icewm_la_DEPENDENCIES = ../../libkwin.la am_kwin_icewm_la_OBJECTS = icewm.lo #>- kwin_icewm_la_OBJECTS = $(am_kwin_icewm_la_OBJECTS) - #>+ 5 + #>+ 1 +@@ -747,5 +747,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-icewm.o: icewm.moc + icewm.lo: icewm.moc ++icewm.o: icewm.moc diff --git a/x11/kdebase3/patches/patch-dp b/x11/kdebase3/patches/patch-dp index d91d4963d80..1583d66dbfa 100644 --- a/x11/kdebase3/patches/patch-dp +++ b/x11/kdebase3/patches/patch-dp @@ -1,8 +1,8 @@ -$NetBSD: patch-dp,v 1.2 2002/08/25 19:23:46 jlam Exp $ +$NetBSD: patch-dp,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- kwin/clients/kde1/Makefile.in.orig Mon May 13 23:57:56 2002 +--- kwin/clients/kde1/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/kde1/Makefile.in -@@ -292,7 +292,7 @@ +@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_kde1.la kwin_kde1_la_SOURCES = kde1client.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dp,v 1.2 2002/08/25 19:23:46 jlam Exp $ kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -307,7 +307,7 @@ +@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,8 +19,8 @@ $NetBSD: patch-dp,v 1.2 2002/08/25 19:23:46 jlam Exp $ +kwin_kde1_la_DEPENDENCIES = ../../libkwin.la am_kwin_kde1_la_OBJECTS = kde1client.lo #>- kwin_kde1_la_OBJECTS = $(am_kwin_kde1_la_OBJECTS) - #>+ 5 -@@ -484,7 +484,7 @@ + #>+ 1 +@@ -482,7 +482,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 @@ -29,3 +29,10 @@ $NetBSD: patch-dp,v 1.2 2002/08/25 19:23:46 jlam Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +@@ -654,5 +654,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-kde1client.lo: kde1client.moc + kde1client.o: kde1client.moc ++kde1client.lo: kde1client.moc diff --git a/x11/kdebase3/patches/patch-dr b/x11/kdebase3/patches/patch-dr index 0d481e73db6..f3a1f107fd1 100644 --- a/x11/kdebase3/patches/patch-dr +++ b/x11/kdebase3/patches/patch-dr @@ -1,8 +1,8 @@ -$NetBSD: patch-dr,v 1.2 2002/08/25 19:23:46 jlam Exp $ +$NetBSD: patch-dr,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/kstep/Makefile.in.orig Mon May 13 23:57:56 2002 +--- kwin/clients/kstep/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/kstep/Makefile.in -@@ -292,7 +292,7 @@ +@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_kstep.la kwin_kstep_la_SOURCES = nextclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dr,v 1.2 2002/08/25 19:23:46 jlam Exp $ kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -308,7 +308,7 @@ +@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,11 @@ $NetBSD: patch-dr,v 1.2 2002/08/25 19:23:46 jlam Exp $ +kwin_kstep_la_DEPENDENCIES = ../../libkwin.la am_kwin_kstep_la_OBJECTS = nextclient.lo #>- kwin_kstep_la_OBJECTS = $(am_kwin_kstep_la_OBJECTS) - #>+ 5 + #>+ 1 +@@ -659,5 +659,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-nextclient.o: nextclient.moc + nextclient.lo: nextclient.moc ++nextclient.o: nextclient.moc diff --git a/x11/kdebase3/patches/patch-dt b/x11/kdebase3/patches/patch-dt index 609b0bc9faf..245a18bc6cb 100644 --- a/x11/kdebase3/patches/patch-dt +++ b/x11/kdebase3/patches/patch-dt @@ -1,8 +1,8 @@ -$NetBSD: patch-dt,v 1.2 2002/08/25 19:23:46 jlam Exp $ +$NetBSD: patch-dt,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/kwmtheme/Makefile.in.orig Mon May 13 23:57:56 2002 +--- kwin/clients/kwmtheme/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/kwmtheme/Makefile.in -@@ -293,7 +293,7 @@ +@@ -292,7 +292,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_kwmtheme.la kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dt,v 1.2 2002/08/25 19:23:46 jlam Exp $ kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -304,7 +304,7 @@ +@@ -303,7 +303,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,4 @@ $NetBSD: patch-dt,v 1.2 2002/08/25 19:23:46 jlam Exp $ +kwin_kwmtheme_la_DEPENDENCIES = ../../libkwin.la am_kwin_kwmtheme_la_OBJECTS = kwmthemeclient.lo #>- kwin_kwmtheme_la_OBJECTS = $(am_kwin_kwmtheme_la_OBJECTS) - #>+ 5 + #>+ 1 diff --git a/x11/kdebase3/patches/patch-dv b/x11/kdebase3/patches/patch-dv index 6ff97037d15..f97131b65ed 100644 --- a/x11/kdebase3/patches/patch-dv +++ b/x11/kdebase3/patches/patch-dv @@ -1,8 +1,8 @@ -$NetBSD: patch-dv,v 1.2 2002/08/25 19:23:46 jlam Exp $ +$NetBSD: patch-dv,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/laptop/Makefile.in.orig Mon May 13 23:57:56 2002 +--- kwin/clients/laptop/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/laptop/Makefile.in -@@ -292,7 +292,7 @@ +@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_laptop.la kwin_laptop_la_SOURCES = laptopclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dv,v 1.2 2002/08/25 19:23:46 jlam Exp $ kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -308,7 +308,7 @@ +@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,4 @@ $NetBSD: patch-dv,v 1.2 2002/08/25 19:23:46 jlam Exp $ +kwin_laptop_la_DEPENDENCIES = ../../libkwin.la am_kwin_laptop_la_OBJECTS = laptopclient.lo #>- kwin_laptop_la_OBJECTS = $(am_kwin_laptop_la_OBJECTS) - #>+ 5 + #>+ 1 diff --git a/x11/kdebase3/patches/patch-dx b/x11/kdebase3/patches/patch-dx index 78c90c5500d..625ae0b0a82 100644 --- a/x11/kdebase3/patches/patch-dx +++ b/x11/kdebase3/patches/patch-dx @@ -1,8 +1,8 @@ -$NetBSD: patch-dx,v 1.2 2002/08/25 19:23:46 jlam Exp $ +$NetBSD: patch-dx,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/modernsystem/Makefile.in.orig Mon May 13 23:57:56 2002 +--- kwin/clients/modernsystem/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/modernsystem/Makefile.in -@@ -296,7 +296,7 @@ +@@ -295,7 +295,7 @@ SUBDIRS = config kde_module_LTLIBRARIES = kwin_modernsys.la kwin_modernsys_la_SOURCES = modernsys.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dx,v 1.2 2002/08/25 19:23:46 jlam Exp $ kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -312,7 +312,7 @@ +@@ -311,7 +311,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,13 +19,20 @@ $NetBSD: patch-dx,v 1.2 2002/08/25 19:23:46 jlam Exp $ +kwin_modernsys_la_DEPENDENCIES = ../../libkwin.la am_kwin_modernsys_la_OBJECTS = modernsys.lo #>- kwin_modernsys_la_OBJECTS = $(am_kwin_modernsys_la_OBJECTS) - #>+ 5 -@@ -555,7 +555,7 @@ + #>+ 1 +@@ -553,7 +553,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=buttondata.h btnhighcolor.h modernsystem.desktop +-KDE_DIST=modernsystem.desktop btnhighcolor.h buttondata.h +KDE_DIST=btnhighcolor.h buttondata.h modernsystem.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +@@ -745,5 +745,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-modernsys.o: modernsys.moc + modernsys.lo: modernsys.moc ++modernsys.o: modernsys.moc diff --git a/x11/kdebase3/patches/patch-dz b/x11/kdebase3/patches/patch-dz index 0d27ab27b5c..87bba13e709 100644 --- a/x11/kdebase3/patches/patch-dz +++ b/x11/kdebase3/patches/patch-dz @@ -1,8 +1,8 @@ -$NetBSD: patch-dz,v 1.2 2002/08/25 19:23:47 jlam Exp $ +$NetBSD: patch-dz,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/quartz/Makefile.in.orig Mon May 13 23:57:57 2002 +--- kwin/clients/quartz/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/quartz/Makefile.in -@@ -294,7 +294,7 @@ +@@ -293,7 +293,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin_quartz.la kwin_quartz_la_SOURCES = quartz.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dz,v 1.2 2002/08/25 19:23:47 jlam Exp $ kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -310,7 +310,7 @@ +@@ -309,7 +309,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,11 @@ $NetBSD: patch-dz,v 1.2 2002/08/25 19:23:47 jlam Exp $ +kwin_quartz_la_DEPENDENCIES = ../../libkwin.la am_kwin_quartz_la_OBJECTS = quartz.lo #>- kwin_quartz_la_OBJECTS = $(am_kwin_quartz_la_OBJECTS) - #>+ 5 + #>+ 1 +@@ -747,5 +747,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-quartz.o: quartz.moc + quartz.lo: quartz.moc ++quartz.o: quartz.moc diff --git a/x11/kdebase3/patches/patch-eb b/x11/kdebase3/patches/patch-eb index b924583f2e5..5c8ab410d54 100644 --- a/x11/kdebase3/patches/patch-eb +++ b/x11/kdebase3/patches/patch-eb @@ -1,8 +1,8 @@ -$NetBSD: patch-eb,v 1.2 2002/08/25 19:23:47 jlam Exp $ +$NetBSD: patch-eb,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/redmond/Makefile.in.orig Mon May 13 23:57:57 2002 +--- kwin/clients/redmond/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/redmond/Makefile.in -@@ -292,7 +292,7 @@ +@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_redmond.la kwin_redmond_la_SOURCES = redmond.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-eb,v 1.2 2002/08/25 19:23:47 jlam Exp $ kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -308,7 +308,7 @@ +@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,11 @@ $NetBSD: patch-eb,v 1.2 2002/08/25 19:23:47 jlam Exp $ +kwin_redmond_la_DEPENDENCIES = ../../libkwin.la am_kwin_redmond_la_OBJECTS = redmond.lo #>- kwin_redmond_la_OBJECTS = $(am_kwin_redmond_la_OBJECTS) - #>+ 5 + #>+ 1 +@@ -659,5 +659,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-redmond.lo: redmond.moc + redmond.o: redmond.moc ++redmond.lo: redmond.moc diff --git a/x11/kdebase3/patches/patch-ed b/x11/kdebase3/patches/patch-ed index 2a25961355f..f537ccbc02d 100644 --- a/x11/kdebase3/patches/patch-ed +++ b/x11/kdebase3/patches/patch-ed @@ -1,17 +1,17 @@ -$NetBSD: patch-ed,v 1.2 2002/08/25 19:23:47 jlam Exp $ +$NetBSD: patch-ed,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/riscos/Makefile.in.orig Mon May 13 23:57:57 2002 +--- kwin/clients/riscos/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/riscos/Makefile.in -@@ -302,7 +302,7 @@ - HelpButton.cpp \ - Static.cpp +@@ -301,7 +301,7 @@ StickyButton.cpp \ + HelpButton.cpp \ + Static.cpp -kwin_riscos_la_LIBADD = ../../kwin.la +kwin_riscos_la_LIBADD = ../../libkwin.la kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -328,7 +328,7 @@ +@@ -327,7 +327,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,12 +20,99 @@ $NetBSD: patch-ed,v 1.2 2002/08/25 19:23:47 jlam Exp $ am_kwin_riscos_la_OBJECTS = Button.lo CloseButton.lo IconifyButton.lo \ LowerButton.lo Manager.lo MaximiseButton.lo StickyButton.lo \ HelpButton.lo Static.lo -@@ -522,7 +522,7 @@ +@@ -664,40 +664,40 @@ kwin_riscos.la.closure: $(kwin_riscos_la - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=Palette.h riscos.desktop -+KDE_DIST=riscos.desktop Palette.h - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + #>+ 3 +-LowerButton.moc: $(srcdir)/LowerButton.h +- $(MOC) $(srcdir)/LowerButton.h -o LowerButton.moc ++Button.moc: $(srcdir)/Button.h ++ $(MOC) $(srcdir)/Button.h -o Button.moc + #>+ 3 + StickyButton.moc: $(srcdir)/StickyButton.h + $(MOC) $(srcdir)/StickyButton.h -o StickyButton.moc + + #>+ 3 +-MaximiseButton.moc: $(srcdir)/MaximiseButton.h +- $(MOC) $(srcdir)/MaximiseButton.h -o MaximiseButton.moc ++LowerButton.moc: $(srcdir)/LowerButton.h ++ $(MOC) $(srcdir)/LowerButton.h -o LowerButton.moc + + #>+ 3 +-HelpButton.moc: $(srcdir)/HelpButton.h +- $(MOC) $(srcdir)/HelpButton.h -o HelpButton.moc ++IconifyButton.moc: $(srcdir)/IconifyButton.h ++ $(MOC) $(srcdir)/IconifyButton.h -o IconifyButton.moc + + #>+ 3 +-Button.moc: $(srcdir)/Button.h +- $(MOC) $(srcdir)/Button.h -o Button.moc ++Manager.moc: $(srcdir)/Manager.h ++ $(MOC) $(srcdir)/Manager.h -o Manager.moc + + #>+ 3 +-CloseButton.moc: $(srcdir)/CloseButton.h +- $(MOC) $(srcdir)/CloseButton.h -o CloseButton.moc ++HelpButton.moc: $(srcdir)/HelpButton.h ++ $(MOC) $(srcdir)/HelpButton.h -o HelpButton.moc + + #>+ 3 +-Manager.moc: $(srcdir)/Manager.h +- $(MOC) $(srcdir)/Manager.h -o Manager.moc ++CloseButton.moc: $(srcdir)/CloseButton.h ++ $(MOC) $(srcdir)/CloseButton.h -o CloseButton.moc + + #>+ 3 +-IconifyButton.moc: $(srcdir)/IconifyButton.h +- $(MOC) $(srcdir)/IconifyButton.h -o IconifyButton.moc ++MaximiseButton.moc: $(srcdir)/MaximiseButton.h ++ $(MOC) $(srcdir)/MaximiseButton.h -o MaximiseButton.moc + + #>+ 3 + clean-metasources: +- -rm -f LowerButton.moc StickyButton.moc MaximiseButton.moc HelpButton.moc Button.moc CloseButton.moc Manager.moc IconifyButton.moc ++ -rm -f Button.moc StickyButton.moc LowerButton.moc IconifyButton.moc Manager.moc HelpButton.moc CloseButton.moc MaximiseButton.moc + + #>+ 3 + clean-closures: +@@ -714,7 +714,7 @@ force-reedit: + + + #>+ 11 +-kwin_riscos_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Button.cpp $(srcdir)/CloseButton.cpp $(srcdir)/IconifyButton.cpp $(srcdir)/LowerButton.cpp $(srcdir)/Manager.cpp $(srcdir)/MaximiseButton.cpp $(srcdir)/StickyButton.cpp $(srcdir)/HelpButton.cpp $(srcdir)/Static.cpp StickyButton.moc Manager.moc IconifyButton.moc LowerButton.moc MaximiseButton.moc HelpButton.moc Button.moc CloseButton.moc ++kwin_riscos_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Button.cpp $(srcdir)/CloseButton.cpp $(srcdir)/IconifyButton.cpp $(srcdir)/LowerButton.cpp $(srcdir)/Manager.cpp $(srcdir)/MaximiseButton.cpp $(srcdir)/StickyButton.cpp $(srcdir)/HelpButton.cpp $(srcdir)/Static.cpp LowerButton.moc StickyButton.moc Button.moc Manager.moc IconifyButton.moc HelpButton.moc CloseButton.moc MaximiseButton.moc + @echo 'creating kwin_riscos_la.all_cpp.cpp ...'; \ + rm -f kwin_riscos_la.all_cpp.files kwin_riscos_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwin_riscos_la.all_cpp.final; \ +@@ -750,19 +750,19 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 17 +-Manager.lo: Manager.moc +-LowerButton.lo: LowerButton.moc +-IconifyButton.lo: IconifyButton.moc +-IconifyButton.o: IconifyButton.moc +-CloseButton.o: CloseButton.moc +-Manager.o: Manager.moc + HelpButton.lo: HelpButton.moc +-Button.lo: Button.moc +-MaximiseButton.lo: MaximiseButton.moc +-LowerButton.o: LowerButton.moc + StickyButton.lo: StickyButton.moc +-MaximiseButton.o: MaximiseButton.moc +-Button.o: Button.moc + StickyButton.o: StickyButton.moc ++Button.o: Button.moc ++LowerButton.lo: LowerButton.moc ++Button.lo: Button.moc ++MaximiseButton.o: MaximiseButton.moc ++IconifyButton.lo: IconifyButton.moc ++MaximiseButton.lo: MaximiseButton.moc + HelpButton.o: HelpButton.moc ++Manager.o: Manager.moc ++LowerButton.o: LowerButton.moc + CloseButton.lo: CloseButton.moc ++IconifyButton.o: IconifyButton.moc ++Manager.lo: Manager.moc ++CloseButton.o: CloseButton.moc diff --git a/x11/kdebase3/patches/patch-ef b/x11/kdebase3/patches/patch-ef index d8db6c5bd63..bdde0b95a0c 100644 --- a/x11/kdebase3/patches/patch-ef +++ b/x11/kdebase3/patches/patch-ef @@ -1,8 +1,8 @@ -$NetBSD: patch-ef,v 1.2 2002/08/25 19:23:47 jlam Exp $ +$NetBSD: patch-ef,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/system/Makefile.in.orig Mon May 13 23:57:57 2002 +--- kwin/clients/system/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/system/Makefile.in -@@ -292,7 +292,7 @@ +@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_system.la kwin_system_la_SOURCES = systemclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-ef,v 1.2 2002/08/25 19:23:47 jlam Exp $ kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -308,7 +308,7 @@ +@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,4 +19,11 @@ $NetBSD: patch-ef,v 1.2 2002/08/25 19:23:47 jlam Exp $ +kwin_system_la_DEPENDENCIES = ../../libkwin.la am_kwin_system_la_OBJECTS = systemclient.lo #>- kwin_system_la_OBJECTS = $(am_kwin_system_la_OBJECTS) - #>+ 5 + #>+ 1 +@@ -659,5 +659,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-systemclient.o: systemclient.moc + systemclient.lo: systemclient.moc ++systemclient.o: systemclient.moc diff --git a/x11/kdebase3/patches/patch-eh b/x11/kdebase3/patches/patch-eh index b51fe994d91..34e1c52631a 100644 --- a/x11/kdebase3/patches/patch-eh +++ b/x11/kdebase3/patches/patch-eh @@ -1,9 +1,9 @@ -$NetBSD: patch-eh,v 1.2 2002/08/25 19:23:47 jlam Exp $ +$NetBSD: patch-eh,v 1.3 2003/01/02 09:12:36 skrll Exp $ ---- kwin/clients/web/Makefile.in.orig Mon May 13 23:57:57 2002 +--- kwin/clients/web/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kwin/clients/web/Makefile.in -@@ -312,7 +312,7 @@ - WebButtonSticky.h +@@ -311,7 +311,7 @@ noinst_HEADERS = \ + WebButtonSticky.h -kwin_web_la_LIBADD = ../../kwin.la @@ -11,7 +11,7 @@ $NetBSD: patch-eh,v 1.2 2002/08/25 19:23:47 jlam Exp $ kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -325,7 +325,7 @@ +@@ -324,7 +324,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,3 +20,99 @@ $NetBSD: patch-eh,v 1.2 2002/08/25 19:23:47 jlam Exp $ am_kwin_web_la_OBJECTS = Web.lo WebButton.lo WebButtonClose.lo \ WebButtonHelp.lo WebButtonIconify.lo WebButtonLower.lo \ WebButtonMaximize.lo WebButtonSticky.lo +@@ -663,40 +663,40 @@ kwin_web.la.closure: $(kwin_web_la_OBJEC + + + #>+ 3 +-WebButtonLower.moc: $(srcdir)/WebButtonLower.h +- $(MOC) $(srcdir)/WebButtonLower.h -o WebButtonLower.moc ++WebButtonSticky.moc: $(srcdir)/WebButtonSticky.h ++ $(MOC) $(srcdir)/WebButtonSticky.h -o WebButtonSticky.moc + + #>+ 3 +-WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h +- $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc ++WebButtonClose.moc: $(srcdir)/WebButtonClose.h ++ $(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc + + #>+ 3 +-WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h +- $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc ++Web.moc: $(srcdir)/Web.h ++ $(MOC) $(srcdir)/Web.h -o Web.moc + + #>+ 3 +-WebButton.moc: $(srcdir)/WebButton.h +- $(MOC) $(srcdir)/WebButton.h -o WebButton.moc ++WebButtonLower.moc: $(srcdir)/WebButtonLower.h ++ $(MOC) $(srcdir)/WebButtonLower.h -o WebButtonLower.moc + + #>+ 3 +-Web.moc: $(srcdir)/Web.h +- $(MOC) $(srcdir)/Web.h -o Web.moc ++WebButtonHelp.moc: $(srcdir)/WebButtonHelp.h ++ $(MOC) $(srcdir)/WebButtonHelp.h -o WebButtonHelp.moc + + #>+ 3 +-WebButtonClose.moc: $(srcdir)/WebButtonClose.h +- $(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc ++WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h ++ $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc + + #>+ 3 +-WebButtonSticky.moc: $(srcdir)/WebButtonSticky.h +- $(MOC) $(srcdir)/WebButtonSticky.h -o WebButtonSticky.moc ++WebButton.moc: $(srcdir)/WebButton.h ++ $(MOC) $(srcdir)/WebButton.h -o WebButton.moc + + #>+ 3 +-WebButtonHelp.moc: $(srcdir)/WebButtonHelp.h +- $(MOC) $(srcdir)/WebButtonHelp.h -o WebButtonHelp.moc ++WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h ++ $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc + + #>+ 3 + clean-metasources: +- -rm -f WebButtonLower.moc WebButtonMaximize.moc WebButtonIconify.moc WebButton.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc ++ -rm -f WebButtonSticky.moc WebButtonClose.moc Web.moc WebButtonLower.moc WebButtonHelp.moc WebButtonMaximize.moc WebButton.moc WebButtonIconify.moc + + #>+ 3 + clean-closures: +@@ -713,7 +713,7 @@ force-reedit: + + + #>+ 11 +-kwin_web_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Web.cpp $(srcdir)/WebButton.cpp $(srcdir)/WebButtonClose.cpp $(srcdir)/WebButtonHelp.cpp $(srcdir)/WebButtonIconify.cpp $(srcdir)/WebButtonLower.cpp $(srcdir)/WebButtonMaximize.cpp $(srcdir)/WebButtonSticky.cpp WebButtonLower.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc WebButtonMaximize.moc WebButtonIconify.moc WebButton.moc ++kwin_web_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Web.cpp $(srcdir)/WebButton.cpp $(srcdir)/WebButtonClose.cpp $(srcdir)/WebButtonHelp.cpp $(srcdir)/WebButtonIconify.cpp $(srcdir)/WebButtonLower.cpp $(srcdir)/WebButtonMaximize.cpp $(srcdir)/WebButtonSticky.cpp WebButtonSticky.moc Web.moc WebButtonHelp.moc WebButtonLower.moc WebButtonMaximize.moc WebButton.moc WebButtonIconify.moc WebButtonClose.moc + @echo 'creating kwin_web_la.all_cpp.cpp ...'; \ + rm -f kwin_web_la.all_cpp.files kwin_web_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwin_web_la.all_cpp.final; \ +@@ -749,19 +749,19 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 17 +-WebButtonSticky.o: WebButtonSticky.moc +-WebButtonClose.o: WebButtonClose.moc +-WebButtonLower.lo: WebButtonLower.moc +-WebButton.o: WebButton.moc + WebButtonMaximize.lo: WebButtonMaximize.moc +-WebButtonMaximize.o: WebButtonMaximize.moc +-Web.lo: Web.moc +-Web.o: Web.moc + WebButtonClose.lo: WebButtonClose.moc ++WebButtonSticky.o: WebButtonSticky.moc ++Web.o: Web.moc ++WebButtonClose.o: WebButtonClose.moc + WebButtonIconify.lo: WebButtonIconify.moc ++Web.lo: Web.moc + WebButtonLower.o: WebButtonLower.moc ++WebButtonHelp.o: WebButtonHelp.moc ++WebButton.o: WebButton.moc + WebButtonIconify.o: WebButtonIconify.moc + WebButton.lo: WebButton.moc +-WebButtonSticky.lo: WebButtonSticky.moc ++WebButtonMaximize.o: WebButtonMaximize.moc + WebButtonHelp.lo: WebButtonHelp.moc +-WebButtonHelp.o: WebButtonHelp.moc ++WebButtonLower.lo: WebButtonLower.moc ++WebButtonSticky.lo: WebButtonSticky.moc diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej index 2e43c2d3c46..0b2e393d21a 100644 --- a/x11/kdebase3/patches/patch-ej +++ b/x11/kdebase3/patches/patch-ej @@ -1,8 +1,8 @@ -$NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ +$NetBSD: patch-ej,v 1.4 2003/01/02 09:12:36 skrll Exp $ ---- kxkb/Makefile.in.orig Tue Jun 25 19:31:39 2002 +--- kxkb/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kxkb/Makefile.in -@@ -292,11 +292,11 @@ +@@ -291,11 +291,11 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kxkb @@ -17,7 +17,7 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ kde_module_LTLIBRARIES = kcm_keyboard.la kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp -@@ -304,9 +304,13 @@ +@@ -303,9 +303,13 @@ kcm_keyboard_la_SOURCES = rules.cpp kcml kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) @@ -33,8 +33,8 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ data_DATA = keyboard.desktop -@@ -327,23 +331,28 @@ - kcm_keyboard_la_meta_unload.lo +@@ -325,22 +329,27 @@ kcm_keyboard_la_final_OBJECTS = kcm_keyb + kcm_keyboard_la_nofinal_OBJECTS = rules.lo kcmlayout.lo pixmap.lo kcmmisc.lo @KDE_USE_FINAL_FALSE@kcm_keyboard_la_OBJECTS = $(kcm_keyboard_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kcm_keyboard_la_OBJECTS = $(kcm_keyboard_la_final_OBJECTS) -kxkb_la_DEPENDENCIES = @@ -47,15 +47,13 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ +libkxkb_main_la_DEPENDENCIES = +am_libkxkb_main_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo +#>- libkxkb_main_la_OBJECTS = $(am_libkxkb_main_la_OBJECTS) - #>+ 5 + #>+ 4 -kxkb_la_final_OBJECTS = kxkb_la.all_cpp.lo --kxkb_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \ -- kxkb_la_meta_unload.lo +-kxkb_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo -@KDE_USE_FINAL_FALSE@kxkb_la_OBJECTS = $(kxkb_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kxkb_la_OBJECTS = $(kxkb_la_final_OBJECTS) +libkxkb_main_la_final_OBJECTS = libkxkb_main_la.all_cpp.lo -+libkxkb_main_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \ -+ libkxkb_main_la_meta_unload.lo ++libkxkb_main_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo +@KDE_USE_FINAL_FALSE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_final_OBJECTS) bin_PROGRAMS = kxkb$(EXEEXT) @@ -72,22 +70,39 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -351,10 +360,10 @@ +@@ -348,19 +357,19 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/rules.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/rules.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo + #>+ 9 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_keyboard_la.all_cpp.P $(DEPDIR)/kxkb_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/rules.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/rules.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_keyboard_la.all_cpp.P $(DEPDIR)/libkxkb_main_la.all_cpp.P $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -375,11 +384,11 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -382,11 +391,11 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) \ @@ -101,7 +116,7 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ #>- all: all-am #>+ 1 -@@ -452,6 +461,8 @@ +@@ -459,6 +468,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_keyboard_la_LDFLAGS) $(kcm_keyboard_la_OBJECTS) $(kcm_keyboard_la_LIBADD) $(LIBS) kxkb.la: $(kxkb_la_OBJECTS) $(kxkb_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kxkb_la_LDFLAGS) $(kxkb_la_OBJECTS) $(kxkb_la_LIBADD) $(LIBS) @@ -110,7 +125,7 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -486,11 +497,12 @@ +@@ -493,11 +504,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -124,25 +139,16 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pixmap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rules.Plo@am__quote@ -@@ -585,7 +597,7 @@ +@@ -592,7 +604,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kcmmisc.h configure.in.in kxkbbindings.cpp pixmap.h keyboard.desktop LICENSE kcmlayout.h extension.h uninstall.desktop kxkb.h kxkb.desktop rules.h +-KDE_DIST=extension.h rules.h keyboard.desktop pixmap.h kcmmisc.h uninstall.desktop kxkb.h kxkbbindings.cpp LICENSE kcmlayout.h configure.in.in kxkb.desktop +KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in kcmlayout.h kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -672,7 +684,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-am - -@@ -722,9 +734,6 @@ +@@ -729,9 +741,6 @@ install-data-local: uninstall.desktop messages: $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot $(XGETTEXT) $(kcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot @@ -152,84 +158,33 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam 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: -@@ -782,21 +791,21 @@ - - - #>+ 12 --kxkb_la_meta_unload.cpp: kxkb.moc -- @echo 'creating kxkb_la_meta_unload.cpp' -- @-rm -f kxkb_la_meta_unload.cpp -+libkxkb_main_la_meta_unload.cpp: kxkb.moc -+ @echo 'creating libkxkb_main_la_meta_unload.cpp' -+ @-rm -f libkxkb_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kxkb_la[] = {' > kxkb_la_meta_unload.cpp ;\ -- cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxkb_la_meta_unload.cpp ;\ -- echo '0};' >> kxkb_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kxkb_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kxkb_la)' >> kxkb_la_meta_unload.cpp ;\ -- else echo > kxkb_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkxkb_main_la[] = {' > libkxkb_main_la_meta_unload.cpp ;\ -+ cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkxkb_main_la)' >> libkxkb_main_la_meta_unload.cpp ;\ -+ else echo > libkxkb_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kcm_keyboard_la_meta_unload.cpp kxkb_la_meta_unload.cpp -+ -rm -f kcm_keyboard_la_meta_unload.cpp libkxkb_main_la_meta_unload.cpp - - #>+ 11 - kcm_keyboard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kcmlayout.cpp $(srcdir)/pixmap.cpp $(srcdir)/kcmmisc.cpp kcm_keyboard_la_meta_unload.cpp kcmlayout.moc kxkb.moc kcmmisc.moc -@@ -811,11 +820,11 @@ +@@ -788,33 +797,33 @@ kcm_keyboard_la.all_cpp.cpp: $(srcdir)/M rm -f kcm_keyboard_la.all_cpp.final kcm_keyboard_la.all_cpp.files #>+ 11 --kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb_la_meta_unload.cpp -+kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp - @echo 'creating kxkb_la.all_cpp.cpp ...'; \ - rm -f kxkb_la.all_cpp.files kxkb_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxkb_la.all_cpp.final; \ -- for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp kxkb_la_meta_unload.cpp ; do \ -+ for file in kxkb_main.cpp ; do \ - echo "#include \"$$file\"" >> kxkb_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb_la.all_cpp.final; \ - done; \ -@@ -823,11 +832,23 @@ - rm -f kxkb_la.all_cpp.final kxkb_la.all_cpp.files - - #>+ 11 --kxkb.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkxkb_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp libkxkb_main_la_meta_unload.cpp +-kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb.moc +- @echo 'creating kxkb_la.all_cpp.cpp ...'; \ +- rm -f kxkb_la.all_cpp.files kxkb_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kxkb_la.all_cpp.final; \ ++libkxkb_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb.moc + @echo 'creating libkxkb_main_la.all_cpp.cpp ...'; \ + rm -f libkxkb_main_la.all_cpp.files libkxkb_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkxkb_main_la.all_cpp.final; \ -+ for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp libkxkb_main_la_meta_unload.cpp ; do \ + for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp ; do \ +- echo "#include \"$$file\"" >> kxkb_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkxkb_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxkb_main_la.all_cpp.final; \ -+ done; \ -+ cat libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files > libkxkb_main_la.all_cpp.cpp; \ -+ rm -f libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files -+ -+#>+ 11 -+kxkb.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp - @echo 'creating kxkb.all_cpp.cpp ...'; \ - rm -f kxkb.all_cpp.files kxkb.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxkb.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kxkb_main.cpp ; do \ - echo "#include \"$$file\"" >> kxkb.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb.all_cpp.final; \ done; \ -@@ -836,20 +857,20 @@ +- cat kxkb_la.all_cpp.final kxkb_la.all_cpp.files > kxkb_la.all_cpp.cpp; \ +- rm -f kxkb_la.all_cpp.final kxkb_la.all_cpp.files ++ cat libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files > libkxkb_main_la.all_cpp.cpp; \ ++ rm -f libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp kxkb.all_cpp.cpp -+ -rm -f kcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp libkxkb_main_la.all_cpp.cpp kxkb.all_cpp.cpp +- -rm -f kcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp ++ -rm -f kcm_keyboard_la.all_cpp.cpp libkxkb_main_la.all_cpp.cpp #>+ 2 final: @@ -249,4 +204,17 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ + $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_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 +@@ -824,9 +833,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-kcmmisc.lo: kcmmisc.moc + kxkb.lo: kxkb.moc ++kcmlayout.o: kcmlayout.moc + kcmlayout.lo: kcmlayout.moc +-kcmmisc.o: kcmmisc.moc + kxkb.o: kxkb.moc +-kcmlayout.o: kcmlayout.moc ++kcmmisc.o: kcmmisc.moc ++kcmmisc.lo: kcmmisc.moc diff --git a/x11/kdebase3/patches/patch-er b/x11/kdebase3/patches/patch-er deleted file mode 100644 index c7c30767dcb..00000000000 --- a/x11/kdebase3/patches/patch-er +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-er,v 1.2 2002/08/25 19:23:49 jlam Exp $ - ---- konqueror/sidebar/trees/Makefile.in.orig Tue Jun 25 19:31:48 2002 -+++ konqueror/sidebar/trees/Makefile.in -@@ -576,7 +576,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=konq_sidebartreetoplevelitem.h konq_sidebartree.h konq_sidebartreemodule.h konqsidebar_tree.h konq_sidebartreeitem.h -+KDE_DIST=konq_sidebartree.h konq_sidebartreemodule.h konqsidebar_tree.h konq_sidebartreetoplevelitem.h konq_sidebartreeitem.h - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -672,7 +672,7 @@ - - #>- install-exec-am: install-libLTLIBRARIES - #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES -+install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES - - install-info: install-info-recursive - diff --git a/x11/kdebase3/patches/patch-es b/x11/kdebase3/patches/patch-es deleted file mode 100644 index 77bd391cc4e..00000000000 --- a/x11/kdebase3/patches/patch-es +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-es,v 1.2 2002/08/25 19:23:49 jlam Exp $ - ---- konqueror/sidebar/Makefile.in.orig Tue Jun 25 19:31:48 2002 -+++ konqueror/sidebar/Makefile.in -@@ -672,7 +672,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=konq_sidebartng.desktop kmultiverttabbar.h konqsidebartng.rc -+KDE_DIST=kmultiverttabbar.h konqsidebartng.rc konq_sidebartng.desktop - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -770,7 +770,7 @@ - - #>- install-exec-am: install-libLTLIBRARIES - #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES -+install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES - - install-info: install-info-recursive - diff --git a/x11/kdebase3/patches/patch-et b/x11/kdebase3/patches/patch-et deleted file mode 100644 index cf6047daa09..00000000000 --- a/x11/kdebase3/patches/patch-et +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-et,v 1.2 2002/08/25 19:23:49 jlam Exp $ - ---- libkonq/Makefile.in.orig Tue Jun 25 19:31:42 2002 -+++ libkonq/Makefile.in -@@ -738,7 +738,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=konq_settings.cc konqpopupmenuplugin.desktop konq_xmlguiclient.cc kbookmarkexporter.cc konq_iconviewwidget.cc konq_historymgr.cc konq_undo.cc DESIGN konq_operations.cc konq_bgnddlg.cc kfileivi.cc SERVICEMENUS konq_faviconmgr.cc konq_dirpart.cc konq_events.cc directory_bookmarkbar.desktop konq_historycomm.cc konq_propsview.cc PLUGINS konq_drag.cc konq_sound.cc konq_pixmapprovider.cc -+KDE_DIST=DESIGN konq_sound.la.closure konq_settings.cc konq_operations.cc konq_drag.cc libkonq.la.closure konq_historycomm_skel.cc konq_sound.cc konq_faviconmgr.kidl konqpopupmenuplugin.desktop konq_xmlguiclient.cc kbookmarkexporter.cc konq_dirpart.cc konq_events.cc konq_bgnddlg.cc konq_faviconmgr_skel.cc directory_bookmarkbar.desktop kfileivi.cc konq_undo.kidl SERVICEMENUS konq_historycomm.cc konq_historycomm.kidl konq_iconviewwidget.cc konq_pixmapprovider.cc konq_historymgr.cc konq_propsview.cc konq_undo_skel.cc konq_faviconmgr.cc konq_undo.cc PLUGINS - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -836,7 +836,7 @@ - - #>- install-exec-am: install-libLTLIBRARIES - #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES -+install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES - - install-info: install-info-recursive - diff --git a/x11/kdelibdocs3/Makefile b/x11/kdelibdocs3/Makefile index 9bc3034ba26..758af8c44ce 100644 --- a/x11/kdelibdocs3/Makefile +++ b/x11/kdelibdocs3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2002/10/14 09:13:54 skrll Exp $ +# $NetBSD: Makefile,v 1.4 2003/01/02 09:12:37 skrll Exp $ -DISTNAME= kdelibs-3.0.4 +DISTNAME= kdelibs-3.0.5 PKGNAME= ${DISTNAME:S/kdelib/kdelibdoc/} CATEGORIES= x11 devel diff --git a/x11/kdelibdocs3/distinfo b/x11/kdelibdocs3/distinfo index 4e9dc3a8be8..33eea73a3a0 100644 --- a/x11/kdelibdocs3/distinfo +++ b/x11/kdelibdocs3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/10/14 09:13:54 skrll Exp $ +$NetBSD: distinfo,v 1.4 2003/01/02 09:12:38 skrll Exp $ -SHA1 (kdelibs-3.0.4.tar.bz2) = f75bd9b813ccb688877aba4fa78c22747e8f3039 -Size (kdelibs-3.0.4.tar.bz2) = 7643484 bytes +SHA1 (kdelibs-3.0.5.tar.bz2) = fe858e947f7e44caaba3123267cf093ec7528f75 +Size (kdelibs-3.0.5.tar.bz2) = 7624848 bytes diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 2599a8c002e..a97159fe880 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2002/12/24 06:10:33 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2003/01/02 09:12:38 skrll Exp $ -DISTNAME= kdelibs-3.0.4 -PKGREVISION= 2 +DISTNAME= kdelibs-3.0.5a CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk index 391bc2c670a..40a27eec1b4 100644 --- a/x11/kdelibs3/buildlink2.mk +++ b/x11/kdelibs3/buildlink2.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink2.mk,v 1.9 2002/12/24 06:10:33 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.10 2003/01/02 09:12:38 skrll Exp $ .if !defined(KDELIBS3_BUILDLINK2_MK) KDELIBS3_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= kdelibs3 BUILDLINK_PKGBASE.kdelibs3?= kdelibs -BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.0.4nb2 +BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.0.5.1 BUILDLINK_PKGSRCDIR.kdelibs3?= ../../x11/kdelibs3 .include "../../mk/bsd.prefs.mk" diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index bc8e1a13b52..b85250bde25 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,59 +1,54 @@ -$NetBSD: distinfo,v 1.11 2002/12/06 11:00:30 skrll Exp $ +$NetBSD: distinfo,v 1.12 2003/01/02 09:12:38 skrll Exp $ -SHA1 (kdelibs-3.0.4.tar.bz2) = f75bd9b813ccb688877aba4fa78c22747e8f3039 -Size (kdelibs-3.0.4.tar.bz2) = 7643484 bytes +SHA1 (kdelibs-3.0.5a.tar.bz2) = 2ebc2927eb724bcf570a781fcfb8f988bc2681ad +Size (kdelibs-3.0.5a.tar.bz2) = 7647507 bytes SHA1 (patch-aa) = dc26c7d5f845e881d313745b25ef9e90ead5707f -SHA1 (patch-ab) = d4f9efbd17df2ee9a5e6cbd1830e343f1b0a8abe +SHA1 (patch-ab) = 526a52e39d4ce89b875383b8d9b8574a2494715b SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e SHA1 (patch-ad) = 60557b5cd8381a5e23a50d90561ff7ca8a552813 SHA1 (patch-ae) = 98b5adaab83f292d0b0b8e0363798e5de7b8aa8c SHA1 (patch-af) = ea4e54130fa31f3c1036e050503f68734106f4be -SHA1 (patch-ag) = 46ca6e3ef08694d4214df93dcc15141060150e9e +SHA1 (patch-ag) = 8d783e53c168dc035c79646e30f3757c0954d589 SHA1 (patch-ah) = 4c1cd440290d6e099e5bf03a6d19ab09af82cedd SHA1 (patch-ai) = b64ba773ca70375ed2c850b61f6f039614aff8e7 SHA1 (patch-aj) = 22a5b302970d76b745cb46ec69b65741461e05b3 -SHA1 (patch-ak) = 7b98398973ffe5ce7b87ed05400cda017986f55d +SHA1 (patch-ak) = 2f83b7bbdc0b54c48ef97532e2c3577edd66b3fe SHA1 (patch-al) = b1d460761ca0665178606989ab4f7427fd0cb901 SHA1 (patch-am) = 504d05365a43ad4b05d60195f4ff4e7d1e26e069 SHA1 (patch-an) = fe81b0dc9790c3b4ca4e71510db0939b3184f9ab SHA1 (patch-ao) = 45b265d56e6d793e53dc06237162652903c9423d -SHA1 (patch-ap) = f4daca020a0d7a7214afe6ae617a216c9b77b8ca +SHA1 (patch-ap) = 360978cb8119a6e1c554e46ad5fcbf01a00f2685 SHA1 (patch-aq) = 802405c2384f3fdaa7f4085dca002d2f879c32fe SHA1 (patch-ar) = 54990b359e3b50eb96673c30a7326c55f2a322eb SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988 SHA1 (patch-at) = 1f78c48ad6b73882b4ee74900b8312c297b4bdaa SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1 -SHA1 (patch-av) = 5fdc6ab612c19add19da554d75780ef5133f53c7 +SHA1 (patch-av) = 4281c59ff129748c6cb8565157d9babd1067799f SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620 SHA1 (patch-ax) = fc9bf7709741c08a0853c6e81c7a2b425d01dbd3 SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0 SHA1 (patch-az) = a22457bc50360ae45c202469b6bb279ace249c61 -SHA1 (patch-ba) = d834df468158dee2c4787e0602583d5019708197 +SHA1 (patch-ba) = 219351243956e93f3601641e0c88938270e63599 SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea SHA1 (patch-bd) = 53f6f18a93296b05f3a7f51152b37ba98c93ff2c SHA1 (patch-be) = 55db94a53b4a5ef10b3294b468c2844a84926d5b SHA1 (patch-bf) = 05280cdb86c11ccbe880721364598ca1a8a24ea6 SHA1 (patch-bg) = 317baf5edff5e9489c8c38b58a6948cfcfc736f7 -SHA1 (patch-bh) = 92ac4dd4d340a0dd962d577300895511ea439029 +SHA1 (patch-bh) = 6fafdedc00aaa70e7a32be6ae4d0e0d8dc1ce60e SHA1 (patch-bi) = fbfe9a8fb2d1be40c03beebce1bfde20f3b9f9f7 SHA1 (patch-bj) = 36f1e6e2b4dc8be210d7e1cd8e0f80bec08f6a93 SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb SHA1 (patch-bl) = 9d4fbc90cb5a638739c3748fbedf74707e96d342 SHA1 (patch-bm) = 3d9cc7de58f13aa55a5035153174a73aad082ff3 -SHA1 (patch-bn) = 9525a052f60249ebfe2b5d425099e95c0ddea358 +SHA1 (patch-bn) = 7f6d0faf310ae168a44821dabb948f210694f123 SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20 SHA1 (patch-bp) = f63f0d5bbcf632bc11d28c8cf8034ec9549cd8e2 SHA1 (patch-bq) = f2aaa203c1c2b968530ea0e2b1c0d2767769093b -SHA1 (patch-br) = bb136610f11bfb441126af7de05a2f625532ec9f +SHA1 (patch-br) = e89409ec2cbb7a2b567f85f2de9f8a7a14469c3b SHA1 (patch-bs) = 97857ea3a7f43ce73b327e2a2fe10a0e4a5ce1c8 SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56 SHA1 (patch-bv) = d4c53ba2add053db87a8d382080535ce1c536cbb -SHA1 (patch-bw) = 246c7123c8ec52944bd99cab1ec8b1226435f5e0 -SHA1 (patch-bx) = bdb54c677c9e21ecf0a67b617e17f26f5fd40019 -SHA1 (patch-by) = b3eec86ae3ffbf5a17fa808c973f0968e6c680e6 SHA1 (patch-ca) = ee31a9cfe62d9dd4f269bf95f2721bfb289d5d51 SHA1 (patch-cb) = 5666c768eb8d56cc1fd67e704153cfc152337f3b -SHA1 (patch-cc) = 332ce2a57ed979d3a341f9e83a376e9e21dab6fe -SHA1 (patch-cd) = 14fb38c90a6607a11d8d0b6ab1d71f8019af41f1 diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab index d66a06b3a4a..546117db720 100644 --- a/x11/kdelibs3/patches/patch-ab +++ b/x11/kdelibs3/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ ---- arts/knotify/Makefile.in.orig Tue May 21 15:42:03 2002 +--- arts/knotify/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ arts/knotify/Makefile.in -@@ -267,17 +267,22 @@ +@@ -267,17 +267,22 @@ INCLUDES = -I$(includedir)/arts $(all_in ####### Files bin_PROGRAMS = knotify @@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH) check_PROGRAMS = knotifytest -@@ -295,24 +300,29 @@ +@@ -295,23 +300,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -45,15 +45,13 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ +libknotify_main_la_DEPENDENCIES = +am_libknotify_main_la_OBJECTS = knotify.lo +#>- libknotify_main_la_OBJECTS = $(am_libknotify_main_la_OBJECTS) - #>+ 5 + #>+ 4 -knotify_la_final_OBJECTS = knotify_la.all_cpp.lo --knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \ -- knotify_la_meta_unload.lo +-knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo -@KDE_USE_FINAL_FALSE@knotify_la_OBJECTS = $(knotify_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@knotify_la_OBJECTS = $(knotify_la_final_OBJECTS) +libknotify_main_la_final_OBJECTS = libknotify_main_la.all_cpp.lo -+libknotify_main_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \ -+ libknotify_main_la_meta_unload.lo ++libknotify_main_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo +@KDE_USE_FINAL_FALSE@libknotify_main_la_OBJECTS = $(libknotify_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libknotify_main_la_OBJECTS = $(libknotify_main_la_final_OBJECTS) bin_PROGRAMS = knotify$(EXEEXT) @@ -71,18 +69,27 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ am_knotifytest_OBJECTS = knotifytest.$(OBJEXT) #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS) #>+ 1 -@@ -325,8 +335,8 @@ +@@ -324,13 +334,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/knotifytest.Po -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/knotifytest.Po ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po + #>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/knotify_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/knotifytest.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/knotifytest.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/libknotify_main_la.all_cpp.P $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -346,14 +356,14 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -351,14 +361,14 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -100,7 +107,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ #>- all: all-am #>+ 1 -@@ -402,6 +412,8 @@ +@@ -407,6 +417,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS) @@ -109,7 +116,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -442,8 +454,9 @@ +@@ -447,8 +459,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -120,16 +127,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotifytest.Po@am__quote@ distclean-depend: -@@ -520,7 +533,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=README.knotify_and_arts knotify.desktop -+KDE_DIST=knotify.desktop README.knotify_and_arts - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -639,13 +652,14 @@ +@@ -644,13 +657,14 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot @@ -145,9 +143,9 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ + $(MOC) $(srcdir)/knotify.h -o knotify.moc + #>+ 5 - knotify.kidl: $(srcdir)/knotify.h $(DCOPIDL_DEPENDENCIES) + knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; /bin/false ) -@@ -658,7 +672,7 @@ +@@ -663,7 +677,7 @@ knotify.moc: $(srcdir)/knotify.h #>+ 3 clean-metasources: @@ -156,79 +154,33 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ #>+ 4 clean-idl: -@@ -676,28 +690,28 @@ - - - #>+ 12 --knotify_la_meta_unload.cpp: knotify.moc -- @echo 'creating knotify_la_meta_unload.cpp' -- @-rm -f knotify_la_meta_unload.cpp -+libknotify_main_la_meta_unload.cpp: knotify.moc -+ @echo 'creating libknotify_main_la_meta_unload.cpp' -+ @-rm -f libknotify_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_knotify_la[] = {' > knotify_la_meta_unload.cpp ;\ -- cat knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> knotify_la_meta_unload.cpp ;\ -- echo '0};' >> knotify_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> knotify_la_meta_unload.cpp ;\ -- echo '_UNLOAD(knotify_la)' >> knotify_la_meta_unload.cpp ;\ -- else echo > knotify_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libknotify_main_la[] = {' > libknotify_main_la_meta_unload.cpp ;\ -+ cat knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libknotify_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libknotify_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libknotify_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libknotify_main_la)' >> libknotify_main_la_meta_unload.cpp ;\ -+ else echo > libknotify_main_la_meta_unload.cpp; fi +@@ -681,33 +695,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f knotify_la_meta_unload.cpp -+ -rm -f libknotify_main_la_meta_unload.cpp - - #>+ 11 --knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp knotify.moc -+knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp knotify.moc - @echo 'creating knotify_la.all_cpp.cpp ...'; \ - rm -f knotify_la.all_cpp.files knotify_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> knotify_la.all_cpp.final; \ -- for file in knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp ; do \ -+ for file in knotify_main.cpp ; do \ - echo "#include \"$$file\"" >> knotify_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify_la.all_cpp.final; \ - done; \ -@@ -705,11 +719,23 @@ - rm -f knotify_la.all_cpp.final knotify_la.all_cpp.files - #>+ 11 --knotify.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libknotify_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp libknotify_main_la_meta_unload.cpp knotify.moc +-knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify.moc +- @echo 'creating knotify_la.all_cpp.cpp ...'; \ +- rm -f knotify_la.all_cpp.files knotify_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> knotify_la.all_cpp.final; \ ++libknotify_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify.moc + @echo 'creating libknotify_main_la.all_cpp.cpp ...'; \ + rm -f libknotify_main_la.all_cpp.files libknotify_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libknotify_main_la.all_cpp.final; \ -+ for file in knotify.cpp knotify_skel.cpp libknotify_main_la_meta_unload.cpp ; do \ + for file in knotify.cpp knotify_skel.cpp ; do \ +- echo "#include \"$$file\"" >> knotify_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libknotify_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libknotify_main_la.all_cpp.final; \ -+ done; \ -+ cat libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files > libknotify_main_la.all_cpp.cpp; \ -+ rm -f libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files -+ -+#>+ 11 -+knotify.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp - @echo 'creating knotify.all_cpp.cpp ...'; \ - rm -f knotify.all_cpp.files knotify.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> knotify.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in knotify_main.cpp ; do \ - echo "#include \"$$file\"" >> knotify.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify.all_cpp.final; \ done; \ -@@ -730,20 +756,20 @@ +- cat knotify_la.all_cpp.final knotify_la.all_cpp.files > knotify_la.all_cpp.cpp; \ +- rm -f knotify_la.all_cpp.final knotify_la.all_cpp.files ++ cat libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files > libknotify_main_la.all_cpp.cpp; \ ++ rm -f libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f knotify_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp -+ -rm -f knotify_la.all_cpp.cpp libknotify_main_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp +- -rm -f knotify_la.all_cpp.cpp ++ -rm -f libknotify_main_la.all_cpp.cpp #>+ 2 final: @@ -248,10 +200,12 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ + $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -753,4 +779,4 @@ + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -717,5 +731,5 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 2 --$(srcdir)/knotify.cpp: knotify.moc -+$(srcdir)/knotify.cpp: knotify.moc knotify.moc + #>+ 3 +-knotify.o: knotify.moc +-knotify.lo: knotify.moc ++knotify.lo: knotify.moc knotify.moc ++knotify.o: knotify.moc knotify.moc diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag index 99269840d45..63e62042edc 100644 --- a/x11/kdelibs3/patches/patch-ag +++ b/x11/kdelibs3/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ +$NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $ ---- dcop/Makefile.in.orig Tue May 21 15:42:04 2002 +--- dcop/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ dcop/Makefile.in -@@ -293,7 +293,7 @@ +@@ -293,7 +293,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = dcopserver dcopserver_shutdown check_PROGRAMS = testdcop testdcopc @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries) -@@ -307,13 +307,17 @@ +@@ -307,13 +307,17 @@ noinst_HEADERS = version.h dcopglobal.h # dcopstub needs to go first for --enable-final to work libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp @@ -33,7 +33,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ dcopserver_shutdown_SOURCES = dcopserver_shutdown.c -@@ -332,14 +336,11 @@ +@@ -332,14 +336,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -52,7 +52,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la am_libDCOP_la_OBJECTS = dcopstub.lo dcopclient.lo dcopobject.lo \ dcopref.lo -@@ -350,15 +351,23 @@ +@@ -350,15 +351,23 @@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo dcopref.lo @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS) @@ -79,21 +79,44 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT) #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS) #>+ 1 -@@ -389,10 +398,11 @@ - @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/dcopserver.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/dcopserver_shutdown.Po \ - @AMDEP_TRUE@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/testdcopc.Po -+ @AMDEP_TRUE@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po +@@ -389,25 +398,28 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/dcopserver.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/dcopserver_shutdown.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/testdcopc.Po +-#>+ 15 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/dcopserver_la.all_cpp.P $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po ++#>+ 17 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/libdcopserver_main_la.all_cpp.P $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_shutdown.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/testdcopc.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_shutdown.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/testdcopc.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -421,8 +431,9 @@ +@@ -437,8 +449,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \ @@ -105,7 +128,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ HEADERS = $(include_HEADERS) $(noinst_HEADERS) -@@ -433,7 +444,7 @@ +@@ -449,7 +462,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -114,7 +137,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -487,6 +498,8 @@ +@@ -503,6 +516,8 @@ dcopserver.la: $(dcopserver_la_OBJECTS) @KDE_USE_CLOSURE_TRUE@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) @KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS) @@ -123,7 +146,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -538,10 +551,11 @@ +@@ -554,10 +569,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopobject.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopref.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver.Plo@am__quote@ @@ -136,7 +159,7 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcopc.Po@am__quote@ -@@ -835,9 +849,6 @@ +@@ -851,22 +867,19 @@ uninstall-info: uninstall-info-recursive uninstall-info-am uninstall-info-recursive \ uninstall-libLTLIBRARIES uninstall-recursive @@ -146,26 +169,57 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam 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: -@@ -882,11 +893,11 @@ + + #>+ 3 +-dcopclient.moc: $(srcdir)/dcopclient.h +- $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc +- +-#>+ 3 + testdcop.moc: $(srcdir)/testdcop.h + $(MOC) $(srcdir)/testdcop.h -o testdcop.moc + + #>+ 3 ++dcopclient.moc: $(srcdir)/dcopclient.h ++ $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc ++ ++#>+ 3 + dcopserver.moc: $(srcdir)/dcopserver.h + $(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc + +@@ -881,7 +894,7 @@ libDCOP.la.closure: $(libDCOP_la_OBJECTS + + #>+ 3 + clean-metasources: +- -rm -f dcopclient.moc testdcop.moc dcopserver.moc ++ -rm -f testdcop.moc dcopclient.moc dcopserver.moc + + #>+ 3 + clean-closures: +@@ -898,18 +911,6 @@ force-reedit: #>+ 11 --dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp testdcop.moc dcopclient.moc dcopserver.moc -+dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp testdcop.moc dcopclient.moc dcopserver.moc - @echo 'creating dcopserver_la.all_cpp.cpp ...'; \ - rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \ +-dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp dcopserver.moc +- @echo 'creating dcopserver_la.all_cpp.cpp ...'; \ +- rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \ - for file in dcopserver.cpp dcopsignals.cpp ; do \ -+ for file in dcopserver_main.cpp ; do \ - echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \ - done; \ -@@ -906,11 +917,23 @@ +- echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \ +- done; \ +- cat dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files > dcopserver_la.all_cpp.cpp; \ +- rm -f dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files +- +-#>+ 11 + libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopclient.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopref.cpp dcopclient.moc + @echo 'creating libDCOP_la.all_cpp.cpp ...'; \ + rm -f libDCOP_la.all_cpp.files libDCOP_la.all_cpp.final; \ +@@ -921,22 +922,34 @@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi + cat libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files > libDCOP_la.all_cpp.cpp; \ rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files - #>+ 11 --dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp ++#>+ 11 ++libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp dcopserver.moc + @echo 'creating libdcopserver_main_la.all_cpp.cpp ...'; \ + rm -f libdcopserver_main_la.all_cpp.files libdcopserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libdcopserver_main_la.all_cpp.final; \ @@ -173,25 +227,13 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ + echo "#include \"$$file\"" >> libdcopserver_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdcopserver_main_la.all_cpp.final; \ + done; \ -+ cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files > libdcopserver_main_la.all_cpp.cpp; \ ++ cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files > libdcopserver_main_la.all_cpp.cpp; \ + rm -f libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files + -+#>+ 11 -+dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp - @echo 'creating dcopserver.all_cpp.cpp ...'; \ - rm -f dcopserver.all_cpp.files dcopserver.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> dcopserver.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in dcopserver_main.cpp ; do \ - echo "#include \"$$file\"" >> dcopserver.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver.all_cpp.final; \ - done; \ -@@ -931,20 +954,20 @@ - #>+ 3 clean-final: -- -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp -+ -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp +- -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp ++ -rm -f libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp #>+ 2 final: @@ -211,4 +253,17 @@ $NetBSD: patch-ag,v 1.2 2002/08/25 19:23:51 jlam Exp $ + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_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 +@@ -946,9 +959,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-dcopserver.o: dcopserver.moc +-testdcop.lo: testdcop.moc +-testdcop.o: testdcop.moc + dcopclient.lo: dcopclient.moc ++testdcop.lo: testdcop.moc ++dcopserver.o: dcopserver.moc + dcopclient.o: dcopclient.moc ++testdcop.o: testdcop.moc + dcopserver.lo: dcopserver.moc diff --git a/x11/kdelibs3/patches/patch-ak b/x11/kdelibs3/patches/patch-ak index 5f7057f8f1a..bf3beec2331 100644 --- a/x11/kdelibs3/patches/patch-ak +++ b/x11/kdelibs3/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $ +$NetBSD: patch-ak,v 1.3 2003/01/02 09:12:39 skrll Exp $ ---- kconf_update/Makefile.in.orig Tue May 21 15:42:05 2002 +--- kconf_update/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ kconf_update/Makefile.in -@@ -282,16 +282,20 @@ +@@ -282,16 +282,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) @@ -28,7 +28,7 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $ #>- METASOURCES = AUTO subdir = kconf_update -@@ -300,19 +304,24 @@ +@@ -300,19 +304,24 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -59,18 +59,24 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -320,7 +329,9 @@ +@@ -320,9 +329,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kconf_update_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kconf_update_main.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo +-#>+ 2 +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kconf_update.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kconf_update_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kconf_update_main.Po ++#>+ 4 ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kconf_update.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kconf_update_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kconf_update_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -340,9 +351,10 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -343,9 +356,10 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -83,7 +89,7 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $ #>- all: all-am #>+ 1 -@@ -391,6 +403,8 @@ +@@ -394,6 +408,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS) @@ -92,7 +98,7 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -425,8 +439,9 @@ +@@ -428,8 +444,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -103,7 +109,7 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam Exp $ distclean-depend: -rm -rf $(DEPDIR) -@@ -602,9 +617,6 @@ +@@ -602,9 +619,6 @@ uninstall-am: uninstall-binPROGRAMS unin # Internal # noinst_HEADERS = kconf_update.h @@ -113,52 +119,3 @@ $NetBSD: patch-ak,v 1.2 2002/08/25 19:23:51 jlam 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: -@@ -620,11 +632,11 @@ - - - #>+ 11 --kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp -+kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp - @echo 'creating kconf_update_la.all_cpp.cpp ...'; \ - rm -f kconf_update_la.all_cpp.files kconf_update_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kconf_update_la.all_cpp.final; \ -- for file in kconf_update.cpp ; do \ -+ for file in kconf_update_main.cpp ; do \ - echo "#include \"$$file\"" >> kconf_update_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update_la.all_cpp.final; \ - done; \ -@@ -632,11 +644,23 @@ - rm -f kconf_update_la.all_cpp.final kconf_update_la.all_cpp.files - - #>+ 11 --kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkconf_update_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp -+ @echo 'creating libkconf_update_main_la.all_cpp.cpp ...'; \ -+ rm -f libkconf_update_main_la.all_cpp.files libkconf_update_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkconf_update_main_la.all_cpp.final; \ -+ for file in kconf_update.cpp ; do \ -+ echo "#include \"$$file\"" >> libkconf_update_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkconf_update_main_la.all_cpp.final; \ -+ done; \ -+ cat libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files > libkconf_update_main_la.all_cpp.cpp; \ -+ rm -f libkconf_update_main_la.all_cpp.final libkconf_update_main_la.all_cpp.files -+ -+#>+ 11 -+kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp - @echo 'creating kconf_update.all_cpp.cpp ...'; \ - rm -f kconf_update.all_cpp.files kconf_update.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kconf_update.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kconf_update_main.cpp ; do \ - echo "#include \"$$file\"" >> kconf_update.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update.all_cpp.final; \ - done; \ -@@ -645,7 +669,7 @@ - - #>+ 3 - clean-final: -- -rm -f kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp -+ -rm -f kconf_update_la.all_cpp.cpp libkconf_update_main_la.all_cpp.cpp kconf_update.all_cpp.cpp - - #>+ 2 - final: diff --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap index 41bfd19f9d6..825018aea33 100644 --- a/x11/kdelibs3/patches/patch-ap +++ b/x11/kdelibs3/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ +$NetBSD: patch-ap,v 1.3 2003/01/02 09:12:39 skrll Exp $ ---- kded/Makefile.in.orig Tue May 21 15:42:06 2002 +--- kded/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ kded/Makefile.in -@@ -283,18 +283,22 @@ +@@ -283,18 +283,22 @@ x_libraries = @x_libraries@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) @@ -15,8 +15,8 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ +libkded_main_la_LDFLAGS = $(all_libraries) +libkded_main_la_LIBADD = $(LIB_KSYCOCA) +libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ - kbuildservicefactory.cpp \ - kbuildservicegroupfactory.cpp kdedmodule.cpp + kbuildservicefactory.cpp \ + kbuildservicegroupfactory.cpp kdedmodule.cpp -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -29,11 +29,11 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ +libkbuildsycoca_main_la_LDFLAGS = $(all_libraries) +libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA) +libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ - kbuildservicefactory.cpp \ - kbuildservicegroupfactory.cpp \ - kbuildimageiofactory.cpp \ -@@ -302,15 +306,19 @@ - kctimefactory.cpp + kbuildservicefactory.cpp \ + kbuildservicegroupfactory.cpp \ + kbuildimageiofactory.cpp \ +@@ -302,15 +306,19 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.c + kctimefactory.cpp +kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -56,7 +56,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdontchangethehostname_LDADD = $(LIB_KDECORE) -@@ -337,48 +345,58 @@ +@@ -337,46 +345,56 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -81,13 +81,12 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ + kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ + kbuildprotocolinfofactory.lo kctimefactory.lo +#>- libkbuildsycoca_main_la_OBJECTS = $(am_libkbuildsycoca_main_la_OBJECTS) - #>+ 8 + #>+ 7 -kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo -kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ - kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \ -- kctimefactory.lo \ -- kbuildsycoca_la_meta_unload.lo +- kctimefactory.lo -@KDE_USE_FINAL_FALSE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS) -kded_la_DEPENDENCIES = @@ -96,8 +95,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ +libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \ + kbuildservicetypefactory.lo kbuildservicefactory.lo \ + kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ -+ kbuildprotocolinfofactory.lo kctimefactory.lo \ -+ libkbuildsycoca_main_la_meta_unload.lo ++ kbuildprotocolinfofactory.lo kctimefactory.lo +@KDE_USE_FINAL_FALSE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS) +libkded_main_la_DEPENDENCIES = @@ -106,17 +104,15 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ kdedmodule.lo -#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS) +#>- libkded_main_la_OBJECTS = $(am_libkded_main_la_OBJECTS) - #>+ 7 + #>+ 6 -kded_la_final_OBJECTS = kded_la.all_cpp.lo -kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo +libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kdedmodule.lo \ -- kded_la_meta_unload.lo + kdedmodule.lo -@KDE_USE_FINAL_FALSE@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kded_la_OBJECTS = $(kded_la_final_OBJECTS) -+ libkded_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS) bin_PROGRAMS = kded$(EXEEXT) kbuildsycoca$(EXEEXT) \ @@ -142,26 +138,54 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS) #>+ 1 -@@ -391,14 +409,16 @@ +@@ -389,33 +407,39 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/kbuildimageiofactory.Plo \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kbuildservicefactory.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kbuildservicetypefactory.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kbuildimageiofactory.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kbuildservicefactory.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kbuildservicetypefactory.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po +-#>+ 19 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kbuildsycoca_la.all_cpp.P $(DEPDIR)/kded_la.all_cpp.P $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildimageiofactory.Plo \ ++#>+ 23 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkbuildsycoca_main_la.all_cpp.P $(DEPDIR)/libkded_main_la.all_cpp.P $(DEPDIR)/kbuildimageiofactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildservicefactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildservicetypefactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildimageiofactory.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kbuildimageiofactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildprotocolinfofactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildservicefactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildservicegroupfactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildservicetypefactory.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kbuildsycoca_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kctimefactory.Plo $(DEPDIR)/kded.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kded_main.Plo $(DEPDIR)/kded_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kdedmodule.Plo $(DEPDIR)/khostname.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -420,6 +440,7 @@ +@@ -438,6 +462,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \ @@ -169,7 +193,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ $(kbuildsycoca_SOURCES) $(kded_SOURCES) \ $(kdontchangethehostname_SOURCES) DATA = $(servicetype_DATA) $(update_DATA) -@@ -428,7 +449,7 @@ +@@ -446,7 +471,7 @@ HEADERS = $(include_HEADERS) $(noinst_HE DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in @@ -178,7 +202,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ #>- all: all-am #>+ 1 -@@ -479,6 +500,10 @@ +@@ -497,6 +522,10 @@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC $(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS) kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS) @@ -189,7 +213,7 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -519,15 +544,18 @@ +@@ -537,15 +566,18 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -209,16 +233,16 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdedmodule.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khostname.Po@am__quote@ -@@ -639,7 +667,7 @@ +@@ -657,7 +689,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=HOWTO README.kded DESIGN kdedmodule.desktop kded.upd kded.h kctimefactory.h +-KDE_DIST=DESIGN kded.upd kded.h kdedmodule.desktop README.kded HOWTO kctimefactory.h +KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kded.upd kctimefactory.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -758,9 +786,6 @@ +@@ -776,9 +808,6 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-servicetypeDATA uninstall-updateDATA @@ -228,141 +252,53 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam 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: -@@ -792,41 +817,41 @@ - - - #>+ 12 --kbuildsycoca_la_meta_unload.cpp: kbuildsycoca.moc -- @echo 'creating kbuildsycoca_la_meta_unload.cpp' -- @-rm -f kbuildsycoca_la_meta_unload.cpp -+libkbuildsycoca_main_la_meta_unload.cpp: kbuildsycoca.moc -+ @echo 'creating libkbuildsycoca_main_la_meta_unload.cpp' -+ @-rm -f libkbuildsycoca_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp ;\ -- cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp ;\ -- echo '0};' >> kbuildsycoca_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kbuildsycoca_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp ;\ -- else echo > kbuildsycoca_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp ;\ -+ cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ -+ else echo > libkbuildsycoca_main_la_meta_unload.cpp; fi - - - #>+ 12 --kded_la_meta_unload.cpp: kded.moc kdedmodule.moc -- @echo 'creating kded_la_meta_unload.cpp' -- @-rm -f kded_la_meta_unload.cpp -+libkded_main_la_meta_unload.cpp: kded.moc kdedmodule.moc -+ @echo 'creating libkded_main_la_meta_unload.cpp' -+ @-rm -f libkded_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp ;\ -- cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp ;\ -- echo '0};' >> kded_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kded_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp ;\ -- else echo > kded_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp ;\ -+ cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkded_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkded_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp ;\ -+ else echo > libkded_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kbuildsycoca_la_meta_unload.cpp kded_la_meta_unload.cpp -+ -rm -f libkbuildsycoca_main_la_meta_unload.cpp libkded_main_la_meta_unload.cpp - - #>+ 11 --kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp kded.moc kdedmodule.moc kbuildsycoca.moc -+kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp kded.moc kdedmodule.moc kbuildsycoca.moc - @echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \ - rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \ -- for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp ; do \ -+ for file in kbuildsycoca_main.cpp ; do \ - echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \ - done; \ -@@ -834,11 +859,11 @@ - rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files +@@ -810,45 +839,45 @@ force-reedit: - #>+ 11 --kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded_la_meta_unload.cpp -+kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp - @echo 'creating kded_la.all_cpp.cpp ...'; \ - rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \ -- for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp kded_la_meta_unload.cpp ; do \ -+ for file in kded_main.cpp ; do \ - echo "#include \"$$file\"" >> kded_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \ - done; \ -@@ -846,11 +871,35 @@ - rm -f kded_la.all_cpp.final kded_la.all_cpp.files #>+ 11 --kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp +-kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca.moc +- @echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \ +- rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \ ++libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca.moc + @echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \ + rm -f libkbuildsycoca_main_la.all_cpp.files libkbuildsycoca_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkbuildsycoca_main_la.all_cpp.final; \ -+ for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp ; do \ + for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp ; do \ +- echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkbuildsycoca_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbuildsycoca_main_la.all_cpp.final; \ -+ done; \ -+ cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files > libkbuildsycoca_main_la.all_cpp.cpp; \ + done; \ +- cat kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files > kbuildsycoca_la.all_cpp.cpp; \ +- rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files ++ cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files > libkbuildsycoca_main_la.all_cpp.cpp; \ + rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files -+ -+#>+ 11 -+libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp libkded_main_la_meta_unload.cpp + + #>+ 11 +-kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded.moc kdedmodule.moc +- @echo 'creating kded_la.all_cpp.cpp ...'; \ +- rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \ ++libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded.moc kdedmodule.moc + @echo 'creating libkded_main_la.all_cpp.cpp ...'; \ + rm -f libkded_main_la.all_cpp.files libkded_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkded_main_la.all_cpp.final; \ -+ for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp libkded_main_la_meta_unload.cpp ; do \ + for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp ; do \ +- echo "#include \"$$file\"" >> kded_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkded_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkded_main_la.all_cpp.final; \ -+ done; \ -+ cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \ -+ rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files -+ -+#>+ 11 -+kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp - @echo 'creating kbuildsycoca.all_cpp.cpp ...'; \ - rm -f kbuildsycoca.all_cpp.files kbuildsycoca.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kbuildsycoca.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kbuildsycoca_main.cpp ; do \ - echo "#include \"$$file\"" >> kbuildsycoca.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca.all_cpp.final; \ - done; \ -@@ -858,11 +907,11 @@ - rm -f kbuildsycoca.all_cpp.final kbuildsycoca.all_cpp.files - - #>+ 11 --kded.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kded.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp - @echo 'creating kded.all_cpp.cpp ...'; \ - rm -f kded.all_cpp.files kded.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kded.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kded_main.cpp ; do \ - echo "#include \"$$file\"" >> kded.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded.all_cpp.final; \ done; \ -@@ -883,20 +932,20 @@ +- cat kded_la.all_cpp.final kded_la.all_cpp.files > kded_la.all_cpp.cpp; \ +- rm -f kded_la.all_cpp.final kded_la.all_cpp.files ++ cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \ ++ rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp kbuildsycoca.all_cpp.cpp kded.all_cpp.cpp kdontchangethehostname.all_cpp.cpp -+ -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp kbuildsycoca.all_cpp.cpp kded.all_cpp.cpp kdontchangethehostname.all_cpp.cpp +- -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp ++ -rm -f libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp #>+ 2 final: @@ -382,4 +318,16 @@ $NetBSD: patch-ap,v 1.2 2002/08/25 19:23:52 jlam Exp $ + $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_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 +@@ -859,8 +888,8 @@ kde-rpo-clean: + + #>+ 7 + kbuildsycoca.lo: kbuildsycoca.moc +-kbuildsycoca.o: kbuildsycoca.moc +-kded.lo: kded.moc +-kdedmodule.lo: kdedmodule.moc + kded.o: kded.moc ++kded.lo: kded.moc + kdedmodule.o: kdedmodule.moc ++kbuildsycoca.o: kbuildsycoca.moc ++kdedmodule.lo: kdedmodule.moc diff --git a/x11/kdelibs3/patches/patch-av b/x11/kdelibs3/patches/patch-av index 2afd69910e7..3bb829ea04c 100644 --- a/x11/kdelibs3/patches/patch-av +++ b/x11/kdelibs3/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $ +$NetBSD: patch-av,v 1.3 2003/01/02 09:12:39 skrll Exp $ ---- kdeprint/management/Makefile.in.orig Tue May 21 15:42:07 2002 +--- kdeprint/management/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ kdeprint/management/Makefile.in -@@ -264,15 +264,19 @@ +@@ -264,15 +264,19 @@ x_libraries = @x_libraries@ INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) @@ -27,7 +27,7 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $ kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) libkdeprint_management_la_SOURCES = \ -@@ -317,11 +321,18 @@ +@@ -317,11 +321,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -43,13 +43,13 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $ +libkaddprinterwizard_main_la_DEPENDENCIES = libkdeprint_management.la +am_libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo +#>- libkaddprinterwizard_main_la_OBJECTS = \ -+#>- $(am_libkaddprinterwizard_main_la_OBJECTS) ++#>- $(am_libkaddprinterwizard_main_la_OBJECTS) +#>+ 1 +libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \ kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \ -@@ -365,11 +376,11 @@ +@@ -364,11 +375,11 @@ libkdeprint_management_la_nofinal_OBJECT bin_PROGRAMS = kaddprinterwizard$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -64,20 +64,48 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -377,9 +388,10 @@ +@@ -376,9 +387,10 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/jobitem.Plo \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/kiconselectaction.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kmconfigcommand.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kmconfigdialog.Plo \ -@@ -437,6 +449,7 @@ +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/jobitem.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kiconselectaction.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kmconfigcommand.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kmconfigdialog.Plo \ +@@ -416,10 +428,11 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlcommandselector.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/pluginaction.Plo $(DEPDIR)/sidepixmap.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/smbview.Plo +-#>+ 81 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkdeprint_management_la.all_cpp.P $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/jobitem.Plo \ ++#>+ 83 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkdeprint_management_la.all_cpp.P $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kiconselectaction.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmconfigcommand.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmconfigdialog.Plo \ +@@ -457,9 +470,10 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlcommandselector.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/pluginaction.Plo $(DEPDIR)/sidepixmap.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/smbview.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/jobitem.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/cjanuswidget.Plo $(DEPDIR)/jobitem.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaddprinterwizard_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kiconselectaction.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmconfigcommand.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmconfigdialog.Plo \ +@@ -518,6 +532,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \ @@ -85,7 +113,7 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $ $(libkdeprint_management_la_SOURCES) \ $(kaddprinterwizard_SOURCES) DATA = $(dataicon_DATA) -@@ -445,7 +458,7 @@ +@@ -526,7 +541,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in @@ -94,7 +122,7 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $ #>- all: all-am #>+ 1 -@@ -494,6 +507,8 @@ +@@ -575,6 +590,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS) @@ -103,7 +131,7 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $ #>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) #>+ 2 @KDE_USE_CLOSURE_TRUE@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) -@@ -534,9 +549,10 @@ +@@ -615,9 +632,10 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/cjanuswidget.Plo@am__quote@ @@ -115,7 +143,16 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kiconselectaction.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmconfigcommand.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmconfigdialog.Plo@am__quote@ -@@ -797,9 +813,6 @@ +@@ -761,7 +779,7 @@ distclean-tags: + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=tileup.png tiledown.png side.png ++KDE_DIST=side.png tiledown.png tileup.png + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -878,9 +896,6 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-dataiconDATA uninstall-info-am \ uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES @@ -125,59 +162,337 @@ $NetBSD: patch-av,v 1.2 2002/08/25 19:23:53 jlam 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: -@@ -981,11 +994,11 @@ - -rm -f libkdeprint_management_la_meta_unload.cpp +@@ -895,140 +910,140 @@ libkdeprint_management.la.closure: $(lib - #>+ 11 --kaddprinterwizard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard.cpp -+kaddprinterwizard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard_main.cpp - @echo 'creating kaddprinterwizard_la.all_cpp.cpp ...'; \ - rm -f kaddprinterwizard_la.all_cpp.files kaddprinterwizard_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaddprinterwizard_la.all_cpp.final; \ -- for file in kaddprinterwizard.cpp ; do \ -+ for file in kaddprinterwizard_main.cpp ; do \ - echo "#include \"$$file\"" >> kaddprinterwizard_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaddprinterwizard_la.all_cpp.final; \ - done; \ -@@ -993,6 +1006,18 @@ - rm -f kaddprinterwizard_la.all_cpp.final kaddprinterwizard_la.all_cpp.files - #>+ 11 -+libkaddprinterwizard_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard.cpp -+ @echo 'creating libkaddprinterwizard_main_la.all_cpp.cpp ...'; \ -+ rm -f libkaddprinterwizard_main_la.all_cpp.files libkaddprinterwizard_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkaddprinterwizard_main_la.all_cpp.final; \ -+ for file in kaddprinterwizard.cpp ; do \ -+ echo "#include \"$$file\"" >> libkaddprinterwizard_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaddprinterwizard_main_la.all_cpp.final; \ -+ done; \ -+ cat libkaddprinterwizard_main_la.all_cpp.final libkaddprinterwizard_main_la.all_cpp.files > libkaddprinterwizard_main_la.all_cpp.cpp; \ -+ rm -f libkaddprinterwizard_main_la.all_cpp.final libkaddprinterwizard_main_la.all_cpp.files + #>+ 3 +-kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h +- $(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc ++kmmainview.moc: $(srcdir)/kmmainview.h ++ $(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc + + #>+ 3 +-kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h +- $(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc ++kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h ++ $(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc + + #>+ 3 +-kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h +- $(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc ++kmconfigpage.moc: $(srcdir)/kmconfigpage.h ++ $(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc + + #>+ 3 +-kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h +- $(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc ++smbview.moc: $(srcdir)/smbview.h ++ $(MOC) $(srcdir)/smbview.h -o smbview.moc + + #>+ 3 +-kmwclass.moc: $(srcdir)/kmwclass.h +- $(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc ++kmwsmb.moc: $(srcdir)/kmwsmb.h ++ $(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc + + #>+ 3 +-kmconfigpage.moc: $(srcdir)/kmconfigpage.h +- $(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc ++cjanuswidget.moc: $(srcdir)/cjanuswidget.h ++ $(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc + + #>+ 3 +-pluginaction.moc: $(srcdir)/pluginaction.h +- $(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc ++kmlistview.moc: $(srcdir)/kmlistview.h ++ $(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc + + #>+ 3 +-kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h +- $(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc ++pluginaction.moc: $(srcdir)/pluginaction.h ++ $(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc + + #>+ 3 +-kmwizardpage.moc: $(srcdir)/kmwizardpage.h +- $(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc ++kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h ++ $(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc + + #>+ 3 +-kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h +- $(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc ++kmwclass.moc: $(srcdir)/kmwclass.h ++ $(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc + + #>+ 3 +-kmdbcreator.moc: $(srcdir)/kmdbcreator.h +- $(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc ++kminstancepage.moc: $(srcdir)/kminstancepage.h ++ $(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc + + #>+ 3 +-kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h +- $(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc ++kmprinterview.moc: $(srcdir)/kmprinterview.h ++ $(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc + + #>+ 3 +-kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h +- $(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc ++kmiconview.moc: $(srcdir)/kmiconview.h ++ $(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc + + #>+ 3 +-kmmainview.moc: $(srcdir)/kmmainview.h +- $(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc ++kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h ++ $(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc + + #>+ 3 +-kmwizard.moc: $(srcdir)/kmwizard.h +- $(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc ++kmdbcreator.moc: $(srcdir)/kmdbcreator.h ++ $(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc + + #>+ 3 + kmpropwidget.moc: $(srcdir)/kmpropwidget.h + $(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc + + #>+ 3 +-cjanuswidget.moc: $(srcdir)/cjanuswidget.h +- $(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc +- +-#>+ 3 + kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h + $(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc + + #>+ 3 +-kminstancepage.moc: $(srcdir)/kminstancepage.h +- $(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc ++kmwlocal.moc: $(srcdir)/kmwlocal.h ++ $(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc + + #>+ 3 +-kiconselectaction.moc: $(srcdir)/kiconselectaction.h +- $(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc ++kmjobviewer.moc: $(srcdir)/kmjobviewer.h ++ $(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc + + #>+ 3 +-kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h +- $(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc ++kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h ++ $(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc + + #>+ 3 +-kmlistview.moc: $(srcdir)/kmlistview.h +- $(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc ++kiconselectaction.moc: $(srcdir)/kiconselectaction.h ++ $(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc + + #>+ 3 +-kmwsmb.moc: $(srcdir)/kmwsmb.h +- $(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc ++kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h ++ $(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc + + #>+ 3 +-kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h +- $(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc ++kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h ++ $(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc + + #>+ 3 +-kmwlocal.moc: $(srcdir)/kmwlocal.h +- $(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc ++kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h ++ $(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc + + #>+ 3 +-kmprinterview.moc: $(srcdir)/kmprinterview.h +- $(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc ++kmpropertypage.moc: $(srcdir)/kmpropertypage.h ++ $(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc + + #>+ 3 +-smbview.moc: $(srcdir)/smbview.h +- $(MOC) $(srcdir)/smbview.h -o smbview.moc ++kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h ++ $(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc + + #>+ 3 +-kmdriverdb.moc: $(srcdir)/kmdriverdb.h +- $(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc ++kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h ++ $(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc + + #>+ 3 + kmwsocket.moc: $(srcdir)/kmwsocket.h + $(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc + + #>+ 3 +-kmtimer.moc: $(srcdir)/kmtimer.h +- $(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc ++kmwizard.moc: $(srcdir)/kmwizard.h ++ $(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc + + #>+ 3 +-kmiconview.moc: $(srcdir)/kmiconview.h +- $(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc ++kmdriverdb.moc: $(srcdir)/kmdriverdb.h ++ $(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc + + #>+ 3 +-kmpropertypage.moc: $(srcdir)/kmpropertypage.h +- $(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc ++kmtimer.moc: $(srcdir)/kmtimer.h ++ $(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc + + #>+ 3 +-kmjobviewer.moc: $(srcdir)/kmjobviewer.h +- $(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc ++kmwizardpage.moc: $(srcdir)/kmwizardpage.h ++ $(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc + -+#>+ 11 - libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp libkdeprint_management_la_meta_unload.cpp kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmwizardpage.moc kmdriverdialog.moc - @echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \ - rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \ -@@ -1005,11 +1030,11 @@ - rm -f libkdeprint_management_la.all_cpp.final libkdeprint_management_la.all_cpp.files ++#>+ 3 ++kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h ++ $(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc + + #>+ 3 + clean-metasources: +- -rm -f kmpropcontainer.moc kmwsocketutil.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmwclass.moc kmconfigpage.moc pluginaction.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmconfigdialog.moc kminstancepage.moc kiconselectaction.moc kmdriverdialog.moc kmlistview.moc kmwsmb.moc kmconfiggeneral.moc kmwlocal.moc kmprinterview.moc smbview.moc kmdriverdb.moc kmwsocket.moc kmtimer.moc kmiconview.moc kmpropertypage.moc kmjobviewer.moc ++ -rm -f kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmwizardpage.moc kmdriverdialog.moc + + #>+ 3 + clean-closures: +@@ -1045,7 +1060,7 @@ force-reedit: + #>+ 11 --kaddprinterwizard.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kaddprinterwizard.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaddprinterwizard_main.cpp - @echo 'creating kaddprinterwizard.all_cpp.cpp ...'; \ - rm -f kaddprinterwizard.all_cpp.files kaddprinterwizard.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kaddprinterwizard.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kaddprinterwizard_main.cpp ; do \ - echo "#include \"$$file\"" >> kaddprinterwizard.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaddprinterwizard.all_cpp.final; \ - done; \ -@@ -1018,7 +1043,7 @@ - - #>+ 3 - clean-final: -- -rm -f kaddprinterwizard_la.all_cpp.cpp libkdeprint_management_la.all_cpp.cpp kaddprinterwizard.all_cpp.cpp -+ -rm -f kaddprinterwizard_la.all_cpp.cpp libkaddprinterwizard_main_la.all_cpp.cpp libkdeprint_management_la.all_cpp.cpp kaddprinterwizard.all_cpp.cpp +-libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp kmdriverdialog.moc kmpropcontainer.moc kmlistview.moc kmwsocketutil.moc kmwsmb.moc kmconfiggeneral.moc kmprinterview.moc kmwlocal.moc smbview.moc kmspecialprinterdlg.moc kmconfigfilter.moc kmdriverdb.moc kmwclass.moc kmwsocket.moc kmconfigpage.moc pluginaction.moc kxmlcommanddlg.moc kmwizardpage.moc kmdriverdbwidget.moc kmdbcreator.moc kxmlcommandselector.moc kmwdrivertest.moc kmiconview.moc kmtimer.moc kmmainview.moc kmwizard.moc kmpropwidget.moc cjanuswidget.moc kmjobviewer.moc kmpropertypage.moc kmconfigdialog.moc kiconselectaction.moc kminstancepage.moc ++libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp kmmainview.moc kmdriverdbwidget.moc kmjobviewer.moc kmwlocal.moc kmconfigdialog.moc kmspecialprinterdlg.moc kiconselectaction.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc kmconfigfilter.moc kmwsocketutil.moc kmlistview.moc kmpropertypage.moc kxmlcommanddlg.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmdbcreator.moc kmdriverdialog.moc kmwizardpage.moc kmpropwidget.moc + @echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \ + rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \ +@@ -1081,69 +1096,69 @@ kde-rpo-clean: + -rm -f *.rpo - #>+ 2 - final: + #>+ 67 +-kmtimer.o: kmtimer.moc +-kmpropertypage.o: kmpropertypage.moc +-smbview.lo: smbview.moc +-kmdriverdialog.o: kmdriverdialog.moc + kmmainview.o: kmmainview.moc +-kmwsmb.o: kmwsmb.moc +-kmwclass.lo: kmwclass.moc +-kmwsocket.o: kmwsocket.moc ++kmpropcontainer.lo: kmpropcontainer.moc ++kmmainview.lo: kmmainview.moc ++kmpropwidget.o: kmpropwidget.moc ++kmdbcreator.o: kmdbcreator.moc ++kmwizardpage.lo: kmwizardpage.moc ++kmwclass.o: kmwclass.moc + kmwlocal.lo: kmwlocal.moc ++kmconfigpage.o: kmconfigpage.moc ++pluginaction.lo: pluginaction.moc + kmwdrivertest.o: kmwdrivertest.moc +-kmpropertypage.lo: kmpropertypage.moc +-kmwlocal.o: kmwlocal.moc +-kxmlcommanddlg.lo: kxmlcommanddlg.moc +-kminstancepage.lo: kminstancepage.moc +-kiconselectaction.lo: kiconselectaction.moc +-kxmlcommandselector.lo: kxmlcommandselector.moc +-kmwsocket.lo: kmwsocket.moc +-kmmainview.lo: kmmainview.moc +-kxmlcommanddlg.o: kxmlcommanddlg.moc +-kmconfiggeneral.lo: kmconfiggeneral.moc +-kmlistview.lo: kmlistview.moc +-kmwsocketutil.lo: kmwsocketutil.moc ++smbview.lo: smbview.moc + kmconfigdialog.lo: kmconfigdialog.moc +-kmdriverdbwidget.lo: kmdriverdbwidget.moc +-kmdbcreator.lo: kmdbcreator.moc +-kmjobviewer.o: kmjobviewer.moc +-kmpropcontainer.lo: kmpropcontainer.moc + kmwizardpage.o: kmwizardpage.moc +-kmwclass.o: kmwclass.moc ++kmwdrivertest.lo: kmwdrivertest.moc ++kiconselectaction.o: kiconselectaction.moc ++kmiconview.o: kmiconview.moc ++kmdriverdb.o: kmdriverdb.moc ++kmpropcontainer.o: kmpropcontainer.moc ++kmtimer.o: kmtimer.moc ++kmjobviewer.o: kmjobviewer.moc ++kmtimer.lo: kmtimer.moc ++cjanuswidget.o: cjanuswidget.moc ++kmwlocal.o: kmwlocal.moc ++kmjobviewer.lo: kmjobviewer.moc + kmdriverdbwidget.o: kmdriverdbwidget.moc +-pluginaction.lo: pluginaction.moc +-kxmlcommandselector.o: kxmlcommandselector.moc ++kmconfiggeneral.lo: kmconfiggeneral.moc + smbview.o: smbview.moc +-kmwdrivertest.lo: kmwdrivertest.moc +-kmspecialprinterdlg.o: kmspecialprinterdlg.moc +-kmprinterview.o: kmprinterview.moc +-kmwizardpage.lo: kmwizardpage.moc +-kmpropwidget.o: kmpropwidget.moc + kmconfigdialog.o: kmconfigdialog.moc +-cjanuswidget.lo: cjanuswidget.moc ++kmwsmb.lo: kmwsmb.moc ++kiconselectaction.lo: kiconselectaction.moc ++kxmlcommandselector.o: kxmlcommandselector.moc ++kminstancepage.o: kminstancepage.moc ++kmconfiggeneral.o: kmconfiggeneral.moc ++kmwclass.lo: kmwclass.moc ++kmdbcreator.lo: kmdbcreator.moc + kmconfigfilter.lo: kmconfigfilter.moc +-kmconfigfilter.o: kmconfigfilter.moc +-pluginaction.o: pluginaction.moc +-kmiconview.o: kmiconview.moc +-kiconselectaction.o: kiconselectaction.moc ++kmdriverdbwidget.lo: kmdriverdbwidget.moc ++kmwsocketutil.lo: kmwsocketutil.moc ++kminstancepage.lo: kminstancepage.moc + kmwizard.lo: kmwizard.moc +-kmconfigpage.o: kmconfigpage.moc +-kmdbcreator.o: kmdbcreator.moc +-kmwsocketutil.o: kmwsocketutil.moc +-cjanuswidget.o: cjanuswidget.moc +-kmlistview.o: kmlistview.moc ++kmpropwidget.lo: kmpropwidget.moc + kmprinterview.lo: kmprinterview.moc +-kmtimer.lo: kmtimer.moc ++kmwsocket.lo: kmwsocket.moc ++cjanuswidget.lo: cjanuswidget.moc ++kmwsmb.o: kmwsmb.moc ++kmlistview.o: kmlistview.moc + kmspecialprinterdlg.lo: kmspecialprinterdlg.moc +-kmdriverdb.lo: kmdriverdb.moc ++pluginaction.o: pluginaction.moc ++kxmlcommanddlg.lo: kxmlcommanddlg.moc ++kxmlcommandselector.lo: kxmlcommandselector.moc ++kmspecialprinterdlg.o: kmspecialprinterdlg.moc + kmconfigpage.lo: kmconfigpage.moc +-kmdriverdb.o: kmdriverdb.moc +-kmjobviewer.lo: kmjobviewer.moc +-kmwizard.o: kmwizard.moc +-kmpropwidget.lo: kmpropwidget.moc +-kmconfiggeneral.o: kmconfiggeneral.moc +-kmwsmb.lo: kmwsmb.moc + kmiconview.lo: kmiconview.moc +-kminstancepage.o: kminstancepage.moc +-kmpropcontainer.o: kmpropcontainer.moc ++kxmlcommanddlg.o: kxmlcommanddlg.moc ++kmconfigfilter.o: kmconfigfilter.moc ++kmwsocketutil.o: kmwsocketutil.moc ++kmdriverdb.lo: kmdriverdb.moc ++kmprinterview.o: kmprinterview.moc ++kmwsocket.o: kmwsocket.moc ++kmpropertypage.o: kmpropertypage.moc + kmdriverdialog.lo: kmdriverdialog.moc ++kmlistview.lo: kmlistview.moc ++kmdriverdialog.o: kmdriverdialog.moc ++kmpropertypage.lo: kmpropertypage.moc ++kmwizard.o: kmwizard.moc diff --git a/x11/kdelibs3/patches/patch-ba b/x11/kdelibs3/patches/patch-ba index 2a93504785d..931ba8d9506 100644 --- a/x11/kdelibs3/patches/patch-ba +++ b/x11/kdelibs3/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $ +$NetBSD: patch-ba,v 1.3 2003/01/02 09:12:39 skrll Exp $ ---- kinit/Makefile.in.orig Tue May 21 15:42:12 2002 +--- kinit/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ kinit/Makefile.in -@@ -324,8 +324,7 @@ +@@ -324,8 +324,7 @@ klauncher_la_LIBADD = $(LIB_KSYCOCA) klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $ METASOURCES = AUTO -@@ -375,11 +374,12 @@ +@@ -374,11 +373,12 @@ am_kioslave_OBJECTS = kioslave.$(OBJEXT) #>+ 1 kioslave_OBJECTS = kioslave.$(OBJEXT) kioslave_DEPENDENCIES = @@ -28,25 +28,48 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $ am_kshell_OBJECTS = shell.$(OBJEXT) #>- kshell_OBJECTS = $(am_kshell_OBJECTS) #>+ 1 -@@ -405,12 +405,12 @@ +@@ -404,25 +404,25 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/kinit.Po $(DEPDIR)/kioslave.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/klauncher.Plo \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/kinit.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kioslave.Po $(DEPDIR)/klauncher.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/klauncher_main.Plo $(DEPDIR)/kwrapper.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/lnusertemp.Po $(DEPDIR)/setproctitle.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/shell.Po $(DEPDIR)/wrapper.Po -+ @AMDEP_TRUE@ $(DEPDIR)/lnusertemp.Po $(DEPDIR)/main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/setproctitle.Po $(DEPDIR)/shell.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/wrapper.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kinit.Po $(DEPDIR)/kioslave.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/klauncher.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/kinit.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kioslave.Po $(DEPDIR)/klauncher.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/klauncher_main.Plo $(DEPDIR)/kwrapper.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/lnusertemp.Po $(DEPDIR)/setproctitle.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/shell.Po $(DEPDIR)/wrapper.Po ++#>- @AMDEP_TRUE@ $(DEPDIR)/lnusertemp.Po $(DEPDIR)/main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/setproctitle.Po $(DEPDIR)/shell.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/wrapper.Po + #>+ 13 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P $(DEPDIR)/autostart.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kinit.Po $(DEPDIR)/kioslave.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klauncher.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P $(DEPDIR)/autostart.Plo $(DEPDIR)/kinit.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kioslave.Po $(DEPDIR)/klauncher.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klauncher_main.Plo $(DEPDIR)/kwrapper.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/lnusertemp.Po $(DEPDIR)/setproctitle.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/shell.Po $(DEPDIR)/wrapper.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kinit.Po $(DEPDIR)/kioslave.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klauncher.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/lnusertemp.Po $(DEPDIR)/main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/setproctitle.Po $(DEPDIR)/shell.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/wrapper.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/autostart.Plo $(DEPDIR)/kinit.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kioslave.Po $(DEPDIR)/klauncher.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klauncher_main.Plo $(DEPDIR)/kwrapper.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/lnusertemp.Po $(DEPDIR)/setproctitle.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/shell.Po $(DEPDIR)/wrapper.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/lnusertemp.Po $(DEPDIR)/main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/setproctitle.Po $(DEPDIR)/shell.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/wrapper.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -556,13 +556,13 @@ +@@ -569,13 +569,13 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/autostart.Plo@am__quote@ @@ -61,16 +84,16 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setproctitle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/wrapper.Po@am__quote@ -@@ -703,7 +703,7 @@ +@@ -716,7 +716,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=LICENSE.setproctitle README.autostart README.DCOP startkde.example README.wrapper +-KDE_DIST=README.DCOP LICENSE.setproctitle README.autostart README.wrapper startkde.example +KDE_DIST=startkde.example LICENSE.setproctitle README.wrapper README.autostart README.DCOP DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -845,9 +845,6 @@ +@@ -858,9 +858,6 @@ kwrapper.c : wrapper.c shell.c : wrapper.c # do nothing, it just depends on it @@ -80,17 +103,3 @@ $NetBSD: patch-ba,v 1.2 2002/08/25 19:23:53 jlam 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: -@@ -924,11 +921,11 @@ - rm -f kioslave.all_cpp.final kioslave.all_cpp.files - - #>+ 11 --klauncher.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+klauncher.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp - @echo 'creating klauncher.all_cpp.cpp ...'; \ - rm -f klauncher.all_cpp.files klauncher.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klauncher.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in main.cpp ; do \ - echo "#include \"$$file\"" >> klauncher.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klauncher.all_cpp.final; \ - done; \ diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh index afafa74ef63..6447aacb0b9 100644 --- a/x11/kdelibs3/patches/patch-bh +++ b/x11/kdelibs3/patches/patch-bh @@ -1,8 +1,8 @@ -$NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ +$NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $ ---- kio/misc/Makefile.in.orig Tue May 21 15:42:15 2002 +--- kio/misc/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ kio/misc/Makefile.in -@@ -286,20 +286,24 @@ +@@ -286,20 +286,24 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir SUBDIRS = . ksendbugmail kpac kdesasl kssld @@ -18,7 +18,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ -#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \ +#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \ - #>- renamedlg.cpp skipdlg.cpp + #>- renamedlg.cpp skipdlg.cpp #>+ 2 -kio_uiserver_la_SOURCES=uiserver.cpp \ +libkio_uiserver_main_la_SOURCES=uiserver.cpp \ @@ -33,7 +33,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version observer_DIR = $(top_srcdir)/kio/kio -@@ -327,24 +331,29 @@ +@@ -327,23 +331,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -47,15 +47,13 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ +libkio_uiserver_main_la_DEPENDENCIES = +am_libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo +#>- libkio_uiserver_main_la_OBJECTS = $(am_libkio_uiserver_main_la_OBJECTS) - #>+ 5 + #>+ 4 -kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo --kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ -- kio_uiserver_la_meta_unload.lo +-kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo -@KDE_USE_FINAL_FALSE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS) +libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo -+libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ -+ libkio_uiserver_main_la_meta_unload.lo ++libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo +@KDE_USE_FINAL_FALSE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS) bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) \ @@ -73,18 +71,32 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ am_kmailservice_OBJECTS = kmailservice.$(OBJEXT) #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS) #>+ 1 -@@ -362,7 +371,9 @@ +@@ -361,14 +370,20 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kio_uiserver_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kio_uiserver_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/kmailservice.Po \ - @AMDEP_TRUE@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -384,7 +395,8 @@ +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kio_uiserver_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kio_uiserver_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kmailservice.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo +-#>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ ++#>+ 11 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/libkio_uiserver_main_la.all_cpp.P $(DEPDIR)/kio_uiserver_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kio_uiserver_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmailservice.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kio_uiserver_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmailservice.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo + +@@ -391,7 +406,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -94,7 +106,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) DATA = $(kde_services_DATA) $(protocol_DATA) -@@ -397,7 +409,7 @@ +@@ -404,7 +420,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -103,7 +115,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -446,6 +458,8 @@ +@@ -453,6 +469,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS) @@ -112,7 +124,7 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -486,7 +500,8 @@ +@@ -493,7 +511,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -122,122 +134,83 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmailservice.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ktelnetservice.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/renamedlg.Plo@am__quote@ -@@ -661,7 +676,7 @@ +@@ -668,7 +687,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=skipdlg.cpp rlogin.protocol kio_uiserver.desktop kmailservice.protocol renamedlg.cpp telnet.protocol rtsp.protocol +-KDE_DIST=rlogin.protocol renamedlg.cpp telnet.protocol rtsp.protocol skipdlg.cpp kmailservice.protocol kio_uiserver.desktop +KDE_DIST=kio_uiserver.desktop renamedlg.cpp skipdlg.cpp kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -808,16 +823,6 @@ +@@ -815,6 +834,18 @@ dummy.cpp: uiserver.kidl # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: --#>+ 9 --uiserver.kidl: $(srcdir)/uiserver.h $(DCOPIDL_DEPENDENCIES) -- $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) --uiserver_skel.cpp: uiserver.kidl -- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub uiserver.kidl --observer.kidl: $(top_srcdir)/kio/kio/observer.h $(DCOPIDL_DEPENDENCIES) -- $(DCOPIDL) $(top_srcdir)/kio/kio/observer.h > observer.kidl || ( rm -f observer.kidl ; /bin/false ) --observer_stub.h: observer.kidl -- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl -- - #>+ 3 - uiserver.moc: $(srcdir)/uiserver.h - $(MOC) $(srcdir)/uiserver.h -o uiserver.moc -@@ -830,6 +835,16 @@ - renamedlg.moc: $(srcdir)/renamedlg.h - $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc - -+#>+ 9 -+uiserver.kidl: $(srcdir)/uiserver.h $(DCOPIDL_DEPENDENCIES) -+ $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) -+uiserver_skel.cpp: uiserver.kidl -+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub uiserver.kidl -+observer.kidl: $(top_srcdir)/kio/kio/observer.h $(DCOPIDL_DEPENDENCIES) -+ $(DCOPIDL) $(top_srcdir)/kio/kio/observer.h > observer.kidl || ( rm -f observer.kidl ; /bin/false ) -+observer_stub.h: observer.kidl -+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl ++#>+ 3 ++uiserver.moc: $(srcdir)/uiserver.h ++ $(MOC) $(srcdir)/uiserver.h -o uiserver.moc ++ ++#>+ 3 ++skipdlg.moc: $(srcdir)/skipdlg.h ++ $(MOC) $(srcdir)/skipdlg.h -o skipdlg.moc + ++#>+ 3 ++renamedlg.moc: $(srcdir)/renamedlg.h ++ $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc ++ + #>+ 9 + uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) +@@ -826,20 +857,8 @@ observer_stub.h: observer.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl + #>+ 3 +-uiserver.moc: $(srcdir)/uiserver.h +- $(MOC) $(srcdir)/uiserver.h -o uiserver.moc +- +-#>+ 3 +-renamedlg.moc: $(srcdir)/renamedlg.h +- $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc +- +-#>+ 3 +-skipdlg.moc: $(srcdir)/skipdlg.h +- $(MOC) $(srcdir)/skipdlg.h -o skipdlg.moc +- +-#>+ 3 clean-metasources: - -rm -f uiserver.moc skipdlg.moc renamedlg.moc -@@ -851,28 +866,28 @@ - +- -rm -f uiserver.moc renamedlg.moc skipdlg.moc ++ -rm -f uiserver.moc skipdlg.moc renamedlg.moc - #>+ 12 --kio_uiserver_la_meta_unload.cpp: uiserver.moc skipdlg.moc renamedlg.moc -- @echo 'creating kio_uiserver_la_meta_unload.cpp' -- @-rm -f kio_uiserver_la_meta_unload.cpp -+libkio_uiserver_main_la_meta_unload.cpp: uiserver.moc skipdlg.moc renamedlg.moc -+ @echo 'creating libkio_uiserver_main_la_meta_unload.cpp' -+ @-rm -f libkio_uiserver_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp ;\ -- cat uiserver.moc skipdlg.moc renamedlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp ;\ -- echo '0};' >> kio_uiserver_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kio_uiserver_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp ;\ -- else echo > kio_uiserver_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp ;\ -+ cat uiserver.moc skipdlg.moc renamedlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkio_uiserver_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp ;\ -+ else echo > libkio_uiserver_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kio_uiserver_la_meta_unload.cpp -+ -rm -f libkio_uiserver_main_la_meta_unload.cpp + #>+ 5 + clean-idl: +@@ -858,33 +877,33 @@ force-reedit: - #>+ 11 --kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp uiserver.moc skipdlg.moc renamedlg.moc -+kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp uiserver.moc skipdlg.moc renamedlg.moc - @echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ - rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ -- for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp ; do \ -+ for file in kio_uiserver_main.cpp ; do \ - echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ - done; \ -@@ -880,11 +895,23 @@ - rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files #>+ 11 --kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp +-kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc skipdlg.moc renamedlg.moc +- @echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ +- rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ ++libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc skipdlg.moc renamedlg.moc + @echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \ + rm -f libkio_uiserver_main_la.all_cpp.files libkio_uiserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkio_uiserver_main_la.all_cpp.final; \ -+ for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp ; do \ + for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp ; do \ +- echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkio_uiserver_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_uiserver_main_la.all_cpp.final; \ -+ done; \ -+ cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \ -+ rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files -+ -+#>+ 11 -+kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp - @echo 'creating kio_uiserver.all_cpp.cpp ...'; \ - rm -f kio_uiserver.all_cpp.files kio_uiserver.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kio_uiserver.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kio_uiserver_main.cpp ; do \ - echo "#include \"$$file\"" >> kio_uiserver.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver.all_cpp.final; \ done; \ -@@ -917,20 +944,20 @@ +- cat kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files > kio_uiserver_la.all_cpp.cpp; \ +- rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files ++ cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \ ++ rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp ktelnetservice.all_cpp.cpp -+ -rm -f kio_uiserver_la.all_cpp.cpp libkio_uiserver_main_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp ktelnetservice.all_cpp.cpp +- -rm -f kio_uiserver_la.all_cpp.cpp ++ -rm -f libkio_uiserver_main_la.all_cpp.cpp #>+ 2 final: @@ -257,4 +230,23 @@ $NetBSD: patch-bh,v 1.2 2002/08/25 19:23:54 jlam Exp $ + $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_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 +@@ -894,13 +913,13 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 11 +-uiserver.o: uiserver.moc ++skipdlg.o: skipdlg.moc + $(srcdir)/skipdlg.cpp: observer_stub.h + renamedlg.lo: renamedlg.moc +-skipdlg.o: skipdlg.moc +-observer_stub.cpp: observer_stub.h +-uiserver.lo: uiserver.moc + $(srcdir)/renamedlg.cpp: observer_stub.h ++$(srcdir)/uiserver.cpp: observer_stub.h + skipdlg.lo: skipdlg.moc ++observer_stub.cpp: observer_stub.h ++uiserver.lo: uiserver.moc ++uiserver.o: uiserver.moc + renamedlg.o: renamedlg.moc +-$(srcdir)/uiserver.cpp: observer_stub.h diff --git a/x11/kdelibs3/patches/patch-bn b/x11/kdelibs3/patches/patch-bn index c5d94a28785..0ca5f5cfee0 100644 --- a/x11/kdelibs3/patches/patch-bn +++ b/x11/kdelibs3/patches/patch-bn @@ -1,8 +1,8 @@ -$NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ +$NetBSD: patch-bn,v 1.4 2003/01/02 09:12:39 skrll Exp $ ---- kioslave/http/Makefile.in.orig Wed Jun 26 08:21:42 2002 +--- kioslave/http/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ kioslave/http/Makefile.in -@@ -273,19 +273,22 @@ +@@ -273,19 +273,22 @@ LDFLAGS = $(all_libraries) ####### Files bin_PROGRAMS = kio_http_cache_cleaner @@ -30,7 +30,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version noinst_HEADERS = http.h -@@ -305,28 +308,38 @@ +@@ -305,31 +308,43 @@ am_kio_http_la_OBJECTS = http.lo #>- kio_http_la_OBJECTS = $(am_kio_http_la_OBJECTS) #>+ 1 kio_http_la_OBJECTS = http.lo @@ -40,7 +40,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ + libkio_http_cache_cleaner_main.la +am_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo #>- kio_http_cache_cleaner_la_OBJECTS = \ - #>- $(am_kio_http_cache_cleaner_la_OBJECTS) + #>- $(am_kio_http_cache_cleaner_la_OBJECTS) #>+ 1 -kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo +kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo @@ -48,7 +48,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ +libkio_http_cache_cleaner_main_la_DEPENDENCIES = +am_libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo +#>- libkio_http_cache_cleaner_main_la_OBJECTS = \ -+#>- $(am_libkio_http_cache_cleaner_main_la_OBJECTS) ++#>- $(am_libkio_http_cache_cleaner_main_la_OBJECTS) +#>+ 1 +libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo bin_PROGRAMS = kio_http_cache_cleaner$(EXEEXT) @@ -68,16 +68,24 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/http.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/http.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/http.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo +-#>+ 3 +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/http.Plo \ +-@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/http.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Po ++#>+ 5 ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/http.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/http_cache_cleaner_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -356,6 +369,7 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -360,6 +375,7 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $( $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(kio_http_la_SOURCES) \ $(kio_http_cache_cleaner_la_SOURCES) \ @@ -85,7 +93,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ $(kio_http_cache_cleaner_SOURCES) DATA = $(kdelnk_DATA) -@@ -368,7 +382,7 @@ +@@ -372,7 +388,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -94,7 +102,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ #>- all: all-recursive #>+ 1 -@@ -441,6 +455,8 @@ +@@ -445,6 +461,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS) kio_http_cache_cleaner.la: $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kio_http_cache_cleaner_la_LDFLAGS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS) @@ -103,7 +111,7 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -475,9 +491,10 @@ +@@ -479,9 +497,10 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -115,25 +123,16 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam Exp $ distclean-depend: -rm -rf $(DEPDIR) -@@ -631,7 +648,7 @@ +@@ -635,7 +654,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=README.http_cache_cleaner README.webdav THOUGHTS https.protocol rfc2616.txt rfc2617.txt http.protocol http_cache_cleaner.desktop webdavs.protocol webdav.protocol -+KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop webdavs.protocol http.protocol webdav.protocol README.webdav https.protocol rfc2616.txt rfc2617.txt kio_http.la.closure THOUGHTS kio_http_cache_cleaner +-KDE_DIST=webdav.protocol http_cache_cleaner.desktop README.webdav THOUGHTS README.http_cache_cleaner webdavs.protocol rfc2617.txt rfc2616.txt http.protocol https.protocol ++KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop webdavs.protocol rfc2617.txt http.protocol webdav.protocol README.webdav https.protocol THOUGHTS rfc2616.txt DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -729,7 +746,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 - -@@ -774,9 +791,6 @@ +@@ -778,9 +797,6 @@ uninstall-info: uninstall-info-recursive uninstall-kdelnkDATA uninstall-libLTLIBRARIES \ uninstall-recursive @@ -143,52 +142,3 @@ $NetBSD: patch-bn,v 1.3 2002/08/25 19:23:54 jlam 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: -@@ -817,11 +831,11 @@ - rm -f kio_http_la.all_cc.final kio_http_la.all_cc.files - - #>+ 11 --kio_http_cache_cleaner_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner.cpp -+kio_http_cache_cleaner_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner_main.cpp - @echo 'creating kio_http_cache_cleaner_la.all_cpp.cpp ...'; \ - rm -f kio_http_cache_cleaner_la.all_cpp.files kio_http_cache_cleaner_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kio_http_cache_cleaner_la.all_cpp.final; \ -- for file in http_cache_cleaner.cpp ; do \ -+ for file in http_cache_cleaner_main.cpp ; do \ - echo "#include \"$$file\"" >> kio_http_cache_cleaner_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_http_cache_cleaner_la.all_cpp.final; \ - done; \ -@@ -829,11 +843,23 @@ - rm -f kio_http_cache_cleaner_la.all_cpp.final kio_http_cache_cleaner_la.all_cpp.files - - #>+ 11 --kio_http_cache_cleaner.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkio_http_cache_cleaner_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner.cpp -+ @echo 'creating libkio_http_cache_cleaner_main_la.all_cpp.cpp ...'; \ -+ rm -f libkio_http_cache_cleaner_main_la.all_cpp.files libkio_http_cache_cleaner_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkio_http_cache_cleaner_main_la.all_cpp.final; \ -+ for file in http_cache_cleaner.cpp ; do \ -+ echo "#include \"$$file\"" >> libkio_http_cache_cleaner_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_http_cache_cleaner_main_la.all_cpp.final; \ -+ done; \ -+ cat libkio_http_cache_cleaner_main_la.all_cpp.final libkio_http_cache_cleaner_main_la.all_cpp.files > libkio_http_cache_cleaner_main_la.all_cpp.cpp; \ -+ rm -f libkio_http_cache_cleaner_main_la.all_cpp.final libkio_http_cache_cleaner_main_la.all_cpp.files -+ -+#>+ 11 -+kio_http_cache_cleaner.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner_main.cpp - @echo 'creating kio_http_cache_cleaner.all_cpp.cpp ...'; \ - rm -f kio_http_cache_cleaner.all_cpp.files kio_http_cache_cleaner.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kio_http_cache_cleaner.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in http_cache_cleaner_main.cpp ; do \ - echo "#include \"$$file\"" >> kio_http_cache_cleaner.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_http_cache_cleaner.all_cpp.final; \ - done; \ -@@ -842,7 +868,7 @@ - - #>+ 3 - clean-final: -- -rm -f kio_http_la.all_cc.cc kio_http_cache_cleaner_la.all_cpp.cpp kio_http_cache_cleaner.all_cpp.cpp -+ -rm -f kio_http_la.all_cc.cc kio_http_cache_cleaner_la.all_cpp.cpp libkio_http_cache_cleaner_main_la.all_cpp.cpp kio_http_cache_cleaner.all_cpp.cpp - - #>+ 2 - final: diff --git a/x11/kdelibs3/patches/patch-br b/x11/kdelibs3/patches/patch-br index 458e9fa80b6..8b795ddd908 100644 --- a/x11/kdelibs3/patches/patch-br +++ b/x11/kdelibs3/patches/patch-br @@ -1,8 +1,8 @@ -$NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ +$NetBSD: patch-br,v 1.3 2003/01/02 09:12:39 skrll Exp $ ---- kioslave/http/kcookiejar/Makefile.in.orig Tue May 21 15:42:15 2002 +--- kioslave/http/kcookiejar/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ kioslave/http/kcookiejar/Makefile.in -@@ -270,22 +270,26 @@ +@@ -270,22 +270,26 @@ INCLUDES = $(all_includes) ####### Files bin_PROGRAMS = kcookiejar @@ -11,13 +11,13 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ -#>- kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \ +#>- libkcookiejar_main_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \ - #>- kcookieserver.skel kcookiewin.cpp \ - #>- kcookiewin.h main.cpp + #>- kcookieserver.skel kcookiewin.cpp \ + #>- kcookiewin.h main.cpp #>+ 3 -kcookiejar_la_SOURCES=kcookiejar.cpp kcookieserver.cpp \ +libkcookiejar_main_la_SOURCES=kcookiejar.cpp kcookieserver.cpp \ - kcookiewin.cpp \ - kcookiewin.h main.cpp kcookieserver_skel.cpp + kcookiewin.cpp \ + kcookiewin.h main.cpp kcookieserver_skel.cpp -#>- kcookiejar_la_METASOURCES = AUTO +#>- libkcookiejar_main_la_METASOURCES = AUTO @@ -36,7 +36,7 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH) services_DATA = kcookiejar.desktop -@@ -299,25 +303,30 @@ +@@ -299,24 +303,29 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -52,17 +52,15 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ +am_libkcookiejar_main_la_OBJECTS = kcookiejar.lo kcookieserver.lo \ + kcookiewin.lo main.lo +#>- libkcookiejar_main_la_OBJECTS = $(am_libkcookiejar_main_la_OBJECTS) - #>+ 6 + #>+ 5 -kcookiejar_la_final_OBJECTS = kcookiejar_la.all_cpp.lo -kcookiejar_la_nofinal_OBJECTS = kcookiejar.lo kcookieserver.lo kcookiewin.lo \ -- main.lo kcookieserver_skel.lo \ -- kcookiejar_la_meta_unload.lo +- main.lo kcookieserver_skel.lo -@KDE_USE_FINAL_FALSE@kcookiejar_la_OBJECTS = $(kcookiejar_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcookiejar_la_OBJECTS = $(kcookiejar_la_final_OBJECTS) +libkcookiejar_main_la_final_OBJECTS = libkcookiejar_main_la.all_cpp.lo +libkcookiejar_main_la_nofinal_OBJECTS = kcookiejar.lo kcookieserver.lo \ -+ kcookiewin.lo main.lo kcookieserver_skel.lo \ -+ libkcookiejar_main_la_meta_unload.lo ++ kcookiewin.lo main.lo kcookieserver_skel.lo +@KDE_USE_FINAL_FALSE@libkcookiejar_main_la_OBJECTS = $(libkcookiejar_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcookiejar_main_la_OBJECTS = $(libkcookiejar_main_la_final_OBJECTS) bin_PROGRAMS = kcookiejar$(EXEEXT) @@ -79,18 +77,32 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -325,7 +334,9 @@ +@@ -324,14 +333,20 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kcookiejar.Plo \ -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kcookiejar.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcookiejar_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcookiejar_main.Po \ - @AMDEP_TRUE@ $(DEPDIR)/kcookieserver.Plo \ - @AMDEP_TRUE@ $(DEPDIR)/kcookiewin.Plo $(DEPDIR)/main.Plo - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -355,11 +366,12 @@ +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kcookiejar.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kcookiejar.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcookiejar_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcookiejar_main.Po \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kcookieserver.Plo \ + #>- @AMDEP_TRUE@ $(DEPDIR)/kcookiewin.Plo $(DEPDIR)/main.Plo +-#>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcookieserver_skel.P $(DEPDIR)/kcookiejar_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kcookiejar.Plo \ ++#>+ 11 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcookieserver_skel.P $(DEPDIR)/libkcookiejar_main_la.all_cpp.P $(DEPDIR)/kcookiejar.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcookiejar_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcookiejar_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcookieserver.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcookiewin.Plo $(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcookieserver_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/kcookiejar.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcookieserver_skel.P $(DEPDIR)/kcookiejar.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcookiejar_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcookiejar_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcookieserver.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcookiewin.Plo $(DEPDIR)/main.Plo + +@@ -362,11 +377,12 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -105,7 +117,7 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ #>- all: all-am #>+ 1 -@@ -408,6 +420,8 @@ +@@ -415,6 +431,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kcookiejar.la: $(kcookiejar_la_OBJECTS) $(kcookiejar_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS) @@ -114,7 +126,7 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -442,8 +456,9 @@ +@@ -449,8 +467,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -125,16 +137,16 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcookieserver.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcookiewin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -539,7 +554,7 @@ +@@ -546,7 +565,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kcookiescfg.upd main.cpp kcookiejar.desktop kcookieserver.h kcookiejar.h rfc2965 kcookiewin.h netscape_cookie_spec.html rfc2109 kcookiewin.cpp +-KDE_DIST=rfc2965 kcookiescfg.upd kcookieserver.h netscape_cookie_spec.html kcookiejar.h main.cpp kcookiewin.cpp kcookiewin.h rfc2109 kcookiejar.desktop +KDE_DIST=kcookiewin.h netscape_cookie_spec.html main.cpp kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h kcookiewin.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -656,9 +671,6 @@ +@@ -663,9 +682,6 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-libLTLIBRARIES uninstall-servicesDATA \ uninstall-updateDATA @@ -144,79 +156,33 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam 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: -@@ -697,28 +709,28 @@ - - - #>+ 12 --kcookiejar_la_meta_unload.cpp: kcookieserver.moc kcookiewin.moc -- @echo 'creating kcookiejar_la_meta_unload.cpp' -- @-rm -f kcookiejar_la_meta_unload.cpp -+libkcookiejar_main_la_meta_unload.cpp: kcookieserver.moc kcookiewin.moc -+ @echo 'creating libkcookiejar_main_la_meta_unload.cpp' -+ @-rm -f libkcookiejar_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kcookiejar_la[] = {' > kcookiejar_la_meta_unload.cpp ;\ -- cat kcookieserver.moc kcookiewin.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcookiejar_la_meta_unload.cpp ;\ -- echo '0};' >> kcookiejar_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kcookiejar_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kcookiejar_la)' >> kcookiejar_la_meta_unload.cpp ;\ -- else echo > kcookiejar_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkcookiejar_main_la[] = {' > libkcookiejar_main_la_meta_unload.cpp ;\ -+ cat kcookieserver.moc kcookiewin.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcookiejar_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkcookiejar_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkcookiejar_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkcookiejar_main_la)' >> libkcookiejar_main_la_meta_unload.cpp ;\ -+ else echo > libkcookiejar_main_la_meta_unload.cpp; fi - +@@ -704,33 +720,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f kcookiejar_la_meta_unload.cpp -+ -rm -f libkcookiejar_main_la_meta_unload.cpp - - #>+ 11 --kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.cpp kcookiejar_la_meta_unload.cpp kcookieserver.moc kcookiewin.moc -+kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar_main.cpp - @echo 'creating kcookiejar_la.all_cpp.cpp ...'; \ - rm -f kcookiejar_la.all_cpp.files kcookiejar_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcookiejar_la.all_cpp.final; \ -- for file in kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp main.cpp kcookieserver_skel.cpp kcookiejar_la_meta_unload.cpp ; do \ -+ for file in kcookiejar_main.cpp ; do \ - echo "#include \"$$file\"" >> kcookiejar_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcookiejar_la.all_cpp.final; \ - done; \ -@@ -726,11 +738,23 @@ - rm -f kcookiejar_la.all_cpp.final kcookiejar_la.all_cpp.files #>+ 11 --kcookiejar.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkcookiejar_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.cpp libkcookiejar_main_la_meta_unload.cpp kcookieserver.moc kcookiewin.moc +-kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.cpp kcookiewin.moc kcookieserver.moc +- @echo 'creating kcookiejar_la.all_cpp.cpp ...'; \ +- rm -f kcookiejar_la.all_cpp.files kcookiejar_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kcookiejar_la.all_cpp.final; \ ++libkcookiejar_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.cpp kcookieserver.moc kcookiewin.moc + @echo 'creating libkcookiejar_main_la.all_cpp.cpp ...'; \ + rm -f libkcookiejar_main_la.all_cpp.files libkcookiejar_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkcookiejar_main_la.all_cpp.final; \ -+ for file in kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp main.cpp kcookieserver_skel.cpp libkcookiejar_main_la_meta_unload.cpp ; do \ + for file in kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp main.cpp kcookieserver_skel.cpp ; do \ +- echo "#include \"$$file\"" >> kcookiejar_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcookiejar_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkcookiejar_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcookiejar_main_la.all_cpp.final; \ -+ done; \ -+ cat libkcookiejar_main_la.all_cpp.final libkcookiejar_main_la.all_cpp.files > libkcookiejar_main_la.all_cpp.cpp; \ -+ rm -f libkcookiejar_main_la.all_cpp.final libkcookiejar_main_la.all_cpp.files -+ -+#>+ 11 -+kcookiejar.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar_main.cpp - @echo 'creating kcookiejar.all_cpp.cpp ...'; \ - rm -f kcookiejar.all_cpp.files kcookiejar.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kcookiejar.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kcookiejar_main.cpp ; do \ - echo "#include \"$$file\"" >> kcookiejar.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcookiejar.all_cpp.final; \ done; \ -@@ -739,20 +763,20 @@ +- cat kcookiejar_la.all_cpp.final kcookiejar_la.all_cpp.files > kcookiejar_la.all_cpp.cpp; \ +- rm -f kcookiejar_la.all_cpp.final kcookiejar_la.all_cpp.files ++ cat libkcookiejar_main_la.all_cpp.final libkcookiejar_main_la.all_cpp.files > libkcookiejar_main_la.all_cpp.cpp; \ ++ rm -f libkcookiejar_main_la.all_cpp.final libkcookiejar_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcookiejar_la.all_cpp.cpp kcookiejar.all_cpp.cpp -+ -rm -f kcookiejar_la.all_cpp.cpp libkcookiejar_main_la.all_cpp.cpp kcookiejar.all_cpp.cpp +- -rm -f kcookiejar_la.all_cpp.cpp ++ -rm -f libkcookiejar_main_la.all_cpp.cpp #>+ 2 final: @@ -236,4 +202,15 @@ $NetBSD: patch-br,v 1.2 2002/08/25 19:23:55 jlam Exp $ + $(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_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 +@@ -740,7 +756,7 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 5 +-kcookieserver.lo: kcookieserver.moc +-kcookiewin.lo: kcookiewin.moc +-kcookiewin.o: kcookiewin.moc + kcookieserver.o: kcookieserver.moc ++kcookiewin.o: kcookiewin.moc ++kcookiewin.lo: kcookiewin.moc ++kcookieserver.lo: kcookieserver.moc diff --git a/x11/kdelibs3/patches/patch-bw b/x11/kdelibs3/patches/patch-bw deleted file mode 100644 index 6cedaf864e7..00000000000 --- a/x11/kdelibs3/patches/patch-bw +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bw,v 1.2 2002/08/25 19:23:55 jlam Exp $ - ---- admin/am_edit.orig Wed Jun 26 08:27:56 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/x11/kdelibs3/patches/patch-bx b/x11/kdelibs3/patches/patch-bx deleted file mode 100644 index d07ecd68a5f..00000000000 --- a/x11/kdelibs3/patches/patch-bx +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-bx,v 1.2 2002/08/25 19:23:55 jlam Exp $ - ---- khtml/Makefile.in.orig Wed Jun 26 08:21:40 2002 -+++ khtml/Makefile.in -@@ -833,7 +833,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=khtmlimage.desktop domtreeview.h khtml_events.cpp TODO-3.0 khtml_browser.rc configure.in.in khtml_iface.cc khtml.rc khtml_factory.h khtml_printsettings.cpp khtml_pagecache.cpp khtml_iface.h khtml_run.h khtml_ext.cpp DESIGN.html khtml.desktop khtml_find.cpp SECURITY khtml_popupmenu.rc -+KDE_DIST=khtml_iface.h khtmlimage.desktop khtml.desktop khtml_find.cpp domtreeview.h configure.in.in khtml_iface.cc khtml_events.cpp SECURITY khtml_popupmenu.rc khtml_run.h khtml_iface_skel.cc TODO-3.0 libkhtml.la.closure khtml_ext.cpp khtml.rc khtmlimagepart.la.closure khtml_iface.kidl khtml_factory.h khtml_printsettings.cpp khtml_pagecache.cpp khtml_browser.rc DESIGN.html - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -932,7 +932,7 @@ - - #>- install-exec-am: install-libLTLIBRARIES - #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES -+install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES - - install-info: install-info-recursive - -@@ -1186,7 +1186,7 @@ - rm -f khtmlimagepart_la.all_cpp.final khtmlimagepart_la.all_cpp.files - - #>+ 11 --khtmlimagepart_la.all_cc.cc: $(srcdir)/Makefile.in khtmlimagepart_la_meta_unload.cc -+khtmlimagepart_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtmlimagepart_la_meta_unload.cc - @echo 'creating khtmlimagepart_la.all_cc.cc ...'; \ - rm -f khtmlimagepart_la.all_cc.files khtmlimagepart_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> khtmlimagepart_la.all_cc.final; \ -@@ -1210,7 +1210,7 @@ - rm -f libkhtml_la.all_cpp.final libkhtml_la.all_cpp.files - - #>+ 11 --libkhtml_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtml_settings.cc $(srcdir)/khtml_iface.cc khtml_iface_skel.cc libkhtml_la_meta_unload.cc testrender.moc khtml_part.moc khtml_run.moc khtmlimage.moc testkhtml.moc khtml_factory.moc domtreeview.moc khtml_ext.moc khtml_pagecache.moc khtml_find.moc test_regression.moc khtmlview.moc khtml_printsettings.moc -+libkhtml_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/khtml_settings.cc $(srcdir)/khtml_iface.cc $(srcdir)/khtml_iface_skel.cc $(srcdir)/libkhtml_la_meta_unload.cc testrender.moc khtml_part.moc khtml_run.moc khtmlimage.moc testkhtml.moc khtml_factory.moc domtreeview.moc khtml_ext.moc khtml_pagecache.moc khtml_find.moc test_regression.moc khtmlview.moc khtml_printsettings.moc - @echo 'creating libkhtml_la.all_cc.cc ...'; \ - rm -f libkhtml_la.all_cc.files libkhtml_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> libkhtml_la.all_cc.final; \ diff --git a/x11/kdelibs3/patches/patch-by b/x11/kdelibs3/patches/patch-by deleted file mode 100644 index 80a2442bd66..00000000000 --- a/x11/kdelibs3/patches/patch-by +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-by,v 1.2 2002/08/25 19:23:55 jlam Exp $ - ---- kdeprint/Makefile.in.orig Wed Jun 26 08:21:44 2002 -+++ kdeprint/Makefile.in -@@ -843,7 +843,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kprinter.cpp kmdbentry.cpp printerfilter.cpp kprintfilter.h kprinterimpl.cpp util.cpp kpqtpage.cpp kprintpreview.cpp configure.in.in kmthreadjob.cpp kpfilterpage.cpp maticparser.cpp.h kprintaction.cpp driveritem.cpp signal_proc.c kmspecialmanager.cpp kdeprintcheck.cpp kxmlcommand.cpp specials.desktop matic.cpp kpcopiespage.cpp kpreloadobject.cpp testprint.ps kprintdialog.cpp treecombobox.cpp kfilelist.cpp driver.cpp kdeprintd.desktop plugincombobox.cpp kpfileselectpage.cpp kmvirtualmanager.cpp kpdriverpage.cpp kmfiltermanager.cpp kdeprintrc kprintdialogpage.cpp kmfiltermanager.h kpipeprocess.cpp driverview.cpp maticscanner.cpp kprinterpropertydialog.cpp kmuimanager.cpp kpgeneralpage.cpp kprintfilter.cpp maticparser.cpp droptionview.cpp -+KDE_DIST=kdeprintd.kidl kprinter.cpp testprint.ps kprintdialog.cpp treecombobox.cpp kfilelist.cpp driver.cpp kdeprintd.desktop kmdbentry.cpp libkdeprint.la.closure plugincombobox.cpp printerfilter.cpp kprintfilter.h kpfileselectpage.cpp kmvirtualmanager.cpp kpdriverpage.cpp libdriverparse.a kmfiltermanager.cpp kprinterimpl.cpp util.cpp kpqtpage.cpp kdeprintrc kmfactory.kidl kprintdialogpage.cpp kpipeprocess.cpp kmfiltermanager.h kprintpreview.cpp configure.in.in kmthreadjob.cpp driverview.cpp kmfactory_skel.cpp maticscanner.cpp kpfilterpage.cpp maticparser.cpp.h kprinterpropertydialog.cpp kprintaction.cpp kmuimanager.cpp driveritem.cpp signal_proc.c kpgeneralpage.cpp kmspecialmanager.cpp kprintfilter.cpp kdeprintcheck.cpp kxmlcommand.cpp maticparser.cpp specials.desktop matic.cpp kpcopiespage.cpp droptionview.cpp kpreloadobject.cpp - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -943,7 +943,7 @@ - - #>- install-exec-am: install-libLTLIBRARIES - #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-libLTLIBRARIES -+install-exec-am: install-libLTLIBRARIES install-kde_moduleLTLIBRARIES - - install-info: install-info-recursive - -@@ -1161,7 +1161,7 @@ - -rm -f kded_kdeprintd_la_meta_unload.cpp libkdeprint_la_meta_unload.cpp - - #>+ 11 --kded_kdeprintd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdeprintd.cpp $(srcdir)/kprintprocess.cpp kdeprintd_skel.cpp kded_kdeprintd_la_meta_unload.cpp -+kded_kdeprintd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdeprintd.cpp $(srcdir)/kprintprocess.cpp $(srcdir)/kdeprintd_skel.cpp $(srcdir)/kded_kdeprintd_la_meta_unload.cpp - @echo 'creating kded_kdeprintd_la.all_cpp.cpp ...'; \ - rm -f kded_kdeprintd_la.all_cpp.files kded_kdeprintd_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kded_kdeprintd_la.all_cpp.final; \ -@@ -1173,7 +1173,7 @@ - rm -f kded_kdeprintd_la.all_cpp.final kded_kdeprintd_la.all_cpp.files - - #>+ 11 --libkdeprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmfactory.cpp $(srcdir)/kmjob.cpp $(srcdir)/kmjobmanager.cpp $(srcdir)/kmmanager.cpp $(srcdir)/kmprinter.cpp $(srcdir)/kmuimanager.cpp $(srcdir)/kmvirtualmanager.cpp $(srcdir)/driver.cpp $(srcdir)/driveritem.cpp $(srcdir)/droptionview.cpp $(srcdir)/driverview.cpp $(srcdir)/maticscanner.cpp $(srcdir)/maticparser.cpp $(srcdir)/matic.cpp $(srcdir)/kmdbentry.cpp $(srcdir)/kprintpreview.cpp $(srcdir)/kprintdialog.cpp $(srcdir)/kprinter.cpp $(srcdir)/kprinterimpl.cpp $(srcdir)/kprintdialogpage.cpp $(srcdir)/kpcopiespage.cpp $(srcdir)/kpdriverpage.cpp $(srcdir)/kprinterpropertydialog.cpp $(srcdir)/kpgeneralpage.cpp $(srcdir)/kpqtpage.cpp $(srcdir)/kmthreadjob.cpp $(srcdir)/kpipeprocess.cpp $(srcdir)/kpfilterpage.cpp $(srcdir)/kmspecialmanager.cpp $(srcdir)/kdeprintcheck.cpp $(srcdir)/plugincombobox.cpp $(srcdir)/kpreloadobject.cpp $(srcdir)/kfilelist.cpp $(srcdir)/kprintaction.cpp $(srcdir)/kpfileselectpage.cpp $(srcdir)/treecombobox.cpp $(srcdir)/kxmlcommand.cpp $(srcdir)/util.cpp $(srcdir)/printerfilter.cpp kmfactory_skel.cpp libkdeprint_la_meta_unload.cpp kmjobmanager.moc kprinterpropertydialog.moc kmfactory.moc kprintpreview.moc kpfilterpage.moc kpcopiespage.moc kprintdialogpage.moc kpqtpage.moc kprintprocess.moc kpgeneralpage.moc kmmanager.moc kfilelist.moc droptionview.moc kdeprintd.moc kprintaction.moc driverview.moc plugincombobox.moc kprinterimpl.moc kprintdialog.moc -+libkdeprint_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmfactory.cpp $(srcdir)/kmjob.cpp $(srcdir)/kmjobmanager.cpp $(srcdir)/kmmanager.cpp $(srcdir)/kmprinter.cpp $(srcdir)/kmuimanager.cpp $(srcdir)/kmvirtualmanager.cpp $(srcdir)/driver.cpp $(srcdir)/driveritem.cpp $(srcdir)/droptionview.cpp $(srcdir)/driverview.cpp $(srcdir)/maticscanner.cpp $(srcdir)/maticparser.cpp $(srcdir)/matic.cpp $(srcdir)/kmdbentry.cpp $(srcdir)/kprintpreview.cpp $(srcdir)/kprintdialog.cpp $(srcdir)/kprinter.cpp $(srcdir)/kprinterimpl.cpp $(srcdir)/kprintdialogpage.cpp $(srcdir)/kpcopiespage.cpp $(srcdir)/kpdriverpage.cpp $(srcdir)/kprinterpropertydialog.cpp $(srcdir)/kpgeneralpage.cpp $(srcdir)/kpqtpage.cpp $(srcdir)/kmthreadjob.cpp $(srcdir)/kpipeprocess.cpp $(srcdir)/kpfilterpage.cpp $(srcdir)/kmspecialmanager.cpp $(srcdir)/kdeprintcheck.cpp $(srcdir)/plugincombobox.cpp $(srcdir)/kpreloadobject.cpp $(srcdir)/kfilelist.cpp $(srcdir)/kprintaction.cpp $(srcdir)/kpfileselectpage.cpp $(srcdir)/treecombobox.cpp $(srcdir)/kxmlcommand.cpp $(srcdir)/util.cpp $(srcdir)/printerfilter.cpp $(srcdir)/kmfactory_skel.cpp $(srcdir)/libkdeprint_la_meta_unload.cpp kmjobmanager.moc kprinterpropertydialog.moc kmfactory.moc kprintpreview.moc kpfilterpage.moc kpcopiespage.moc kprintdialogpage.moc kpqtpage.moc kprintprocess.moc kpgeneralpage.moc kmmanager.moc kfilelist.moc droptionview.moc kdeprintd.moc kprintaction.moc driverview.moc plugincombobox.moc kprinterimpl.moc kprintdialog.moc - @echo 'creating libkdeprint_la.all_cpp.cpp ...'; \ - rm -f libkdeprint_la.all_cpp.files libkdeprint_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libkdeprint_la.all_cpp.final; \ diff --git a/x11/kdelibs3/patches/patch-cc b/x11/kdelibs3/patches/patch-cc deleted file mode 100644 index 68770652081..00000000000 --- a/x11/kdelibs3/patches/patch-cc +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2002/12/06 11:00:31 skrll Exp $ - ---- kio/misc/rlogin.protocol.orig Sat Jan 20 23:01:05 2001 -+++ kio/misc/rlogin.protocol -@@ -1,10 +1,10 @@ - [Protocol] --exec=konsole -e rlogin `echo %u | sed -e 's,rlogin:/*,,'` -+exec=ktelnetservice %u - protocol=rlogin - input=none - output=none - helper=true --listing=false -+listing= - reading=false - writing=false - makedir=false diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd deleted file mode 100644 index 818cf48b8a9..00000000000 --- a/x11/kdelibs3/patches/patch-cd +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2002/12/06 11:00:31 skrll Exp $ - ---- kio/misc/ktelnetservice.cpp.orig Tue Sep 25 12:04:11 2001 -+++ kio/misc/ktelnetservice.cpp Fri Dec 6 08:46:50 2002 -@@ -48,9 +48,16 @@ - - KURL url(args->arg(0)); - QStringList cmd; -- -+ - cmd << "-e"; -- cmd << "telnet"; -+ if ( url.protocol() == "telnet" ) -+ cmd << "telnet"; -+ else if ( url.protocol() == "rlogin" ) -+ cmd << "rlogin"; -+ else { -+ kdError() << "Invalid protocol " << url.protocol() << endl; -+ return 2; -+ } - if (!url.user().isEmpty()) - { - cmd << "-l"; |