diff options
| author | markd <markd> | 2003-05-22 02:42:39 +0000 |
|---|---|---|
| committer | markd <markd> | 2003-05-22 02:42:39 +0000 |
| commit | ecbf69e4d47e70cf3cb1970e7e4076c07913fd5d (patch) | |
| tree | 9c77e4c9570a525f51b31b04f034bc28feb6f6e1 /x11/kdebase3 | |
| parent | d78c6132eb8172964ab68651a7d3dd8920a0d6c2 (diff) | |
| download | pkgsrc-ecbf69e4d47e70cf3cb1970e7e4076c07913fd5d.tar.gz | |
Update KDE to 3.1.2.
Changes:
kdelibs:
* https authentication through proxy fixed.
* KZip failed for some .zip archives.
* Fixed a bug in socket code that made KDEPrint crash.
* kspell: Support for Hebrew spell checking using hspell (requires hspell 0.5).
kdebase:
* kwin: Alt+Tab works while drag'n'drop (unless the application also grabs keyboard).
* kio_smtp: Doesn't eat 100% CPU when connection breaks and fixed a confusing error
message when AUTH failed ("Unknown Command" vs. "Authorization failed")
* kscreensaver: Fixed issue where kdesktop_lock would stay running indefinitely in
the background if it could not grab the keyboard/mouse, preventing the screen from
being locked manually.
* kscreensaver: Screensavers are now stopped when asking for the password [#56803]
* kio_smb: Several bugfixes for the smbro-ioslave.
* kdesktop: fixed minicli layout problem with Qt 3.1.2
* kdm: fixed incorrect user window width with Qt 3.1.2
* Konqueror: Create DCOP interface for mainwindow when object begins to exist.
* Konqueror: Fixed tab open delays when it can't reach website.
* Konsole: Don't flicker when selecting entire lines.
* Konsole: Crash, selection and sort fixes in schema and session editors.
* Konsole: Fixed mouse-wheel in mouse mode.
* Konsole: Allow programs to resize windows if enabled.
* Konsole: Keep output steady when triple-click selecting.
* Konsole: Added "Print" menu command.
* kicker: Fixed kasbar only drawing last icon from a group.
Diffstat (limited to 'x11/kdebase3')
31 files changed, 431 insertions, 473 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 9b6293ab46b..4be3cc6b6b0 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2003/05/02 11:57:26 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2003/05/22 02:42:45 markd Exp $ -DISTNAME= kdebase-3.1.1 -PKGREVISION= 2 +DISTNAME= kdebase-3.1.2 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index fce0b12cf58..f0f4df80344 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2003/04/01 12:27:12 markd Exp $ +@comment $NetBSD: PLIST,v 1.11 2003/05/22 02:42:45 markd Exp $ bin/appletproxy bin/chooser bin/drkonqi @@ -2845,6 +2845,7 @@ share/kde/services/konq_sidebartng.desktop share/kde/services/konq_textview.desktop share/kde/services/konq_treeview.desktop share/kde/services/konqueror_config.desktop +share/kde/services/konsole-script.desktop share/kde/services/konsolepart.desktop share/kde/services/kshorturifilter.desktop share/kde/services/kuriikwsfilter.desktop diff --git a/x11/kdebase3/buildlink2.mk b/x11/kdebase3/buildlink2.mk index a68ef9de725..3a7dc5b8b6f 100644 --- a/x11/kdebase3/buildlink2.mk +++ b/x11/kdebase3/buildlink2.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:57:26 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.10 2003/05/22 02:42:46 markd Exp $ .if !defined(KDEBASE3_BUILDLINK2_MK) KDEBASE3_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= kdebase3 BUILDLINK_PKGBASE.kdebase3?= kdebase -BUILDLINK_DEPENDS.kdebase3?= kdebase>=3.1.1nb2 +BUILDLINK_DEPENDS.kdebase3?= kdebase>=3.1.2 BUILDLINK_PKGSRCDIR.kdebase3?= ../../x11/kdebase3 .include "../../mk/bsd.prefs.mk" diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 6a1ec51ecd0..61d4b122608 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,81 +1,81 @@ -$NetBSD: distinfo,v 1.28 2003/05/05 12:11:05 markd Exp $ +$NetBSD: distinfo,v 1.29 2003/05/22 02:42:46 markd Exp $ -SHA1 (kdebase-3.1.1.tar.bz2) = bae5a726544658971f02b113d2a3148fa607ad54 -Size (kdebase-3.1.1.tar.bz2) = 14917696 bytes +SHA1 (kdebase-3.1.2.tar.bz2) = 2e75e74f902977c497e8bdc15074909009d8c91a +Size (kdebase-3.1.2.tar.bz2) = 15229871 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes -SHA1 (patch-aa) = 56e8d1ee573bf2a1f9003bf9b4a174a6167b1714 +SHA1 (patch-aa) = f0b027549ced62934832c24032bd198572b18c37 SHA1 (patch-ab) = ef34628c73aaf9704bf06d92db6086bac3da5b44 -SHA1 (patch-ac) = 14c207fa0ed246d10367dbc6182c6f0f5fd256fd +SHA1 (patch-ac) = 4556a9bcdbf690e21bf67cca0d1dd6bb22a2f28f SHA1 (patch-ae) = 2a1717aea4ee6b3a891dc93102af523db3801302 SHA1 (patch-af) = df818f3fb40ed58bed493552519548930a644af1 SHA1 (patch-ah) = 3a07da7a6be10cd429c5c3472491084ce6595ec5 -SHA1 (patch-ai) = a19bf878b24dfdba3ab68b6f52c3b8d72d4ed7f0 +SHA1 (patch-ai) = 904fa48dae37fcee1bf9a3a28171ae75e451bbfa SHA1 (patch-ak) = 19ce7c8ec8726e7e97011d322b98ca67974e51b0 SHA1 (patch-al) = 20d1860d839b90e73577e5c05f38753a45beed6c -SHA1 (patch-am) = 7ff4d5216774434bb1fc88049737c58201a946ac +SHA1 (patch-am) = e8e7f42749eeebc57f0d4e13fc44dbcd08f5f65c SHA1 (patch-an) = 36bc6f26f108830290fd107f94892b32f5975a24 -SHA1 (patch-ao) = 87b48897ab359eebc00c23492a6b3eeea1f7eb42 +SHA1 (patch-ao) = 2bbe8783d258ea3ce9cf85b7f51e729d9ee1c6f3 SHA1 (patch-ap) = 0ca89f037da734856e4ba7156b6fcbb68aaeb8b2 SHA1 (patch-ar) = 994458dd8a423d4098abbc5ce7c8ca212aee0a3d SHA1 (patch-au) = 53228332fc535b161bae0985b09141dfa062a25f SHA1 (patch-av) = 244206ebd238d2df3e2acdfd5b6819ff46becd5d -SHA1 (patch-aw) = 20328a251e47305ce333758783a65fcc79322116 +SHA1 (patch-aw) = b3d7d42e1a1c8f38a66cdee8766dad43aeddf320 SHA1 (patch-ay) = fb41177da4b3bbefd02c56cd34a9e6049f4c8ce2 SHA1 (patch-az) = 76629061210b9800da5267104085acc0cb521d81 -SHA1 (patch-ba) = b38d5e62e9555e35accacf3af6f54eb9160e0a2d +SHA1 (patch-ba) = c107de648ed80c9ad9a07134505593c25c386624 SHA1 (patch-bb) = dc7f8209712d34f757a9573017142d7c671df10a SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58 SHA1 (patch-be) = b1e13c107d045fe79088feccc665f77c8d255786 SHA1 (patch-bf) = 1b218b34aa4b64d115bb1270783197e827725fb5 -SHA1 (patch-bg) = c17806c947f6ab30f5892af0ea16d1ebef3e4a6a +SHA1 (patch-bg) = 826c58a957994c39e58b0d8b0b5d1c1348a120d9 SHA1 (patch-bi) = 1a8f2f79a24f2ba75accf83252677b830afde164 SHA1 (patch-bj) = 53e4391ff75aa2766c9b4e0d7a4796b355af8081 -SHA1 (patch-bk) = 2bb5d37b5f7bd2412ad27361f81ab62ab5e04efd +SHA1 (patch-bk) = 270f5362478c4b71740a53c900e21c05e123efd5 SHA1 (patch-bl) = 6761e02d32c7afdf02f4717ee0b4875fc07c6aab -SHA1 (patch-bm) = af8ef008bbe2c2900da7410a6b8f0b694c1d2d19 +SHA1 (patch-bm) = b38d4f2234eec6d1dde09b5a7a7f1ffbd2a4c8f6 SHA1 (patch-bn) = b33aa4f73315a93506b36a20be2a3cabfcdd16ef SHA1 (patch-bo) = 5c0e1a396882d5436093d2597a4797a4414ead66 SHA1 (patch-bp) = 1b51f504e3a0c72b4af9386813f767cc7957e90b SHA1 (patch-br) = 778a94f6e7e5900c3036ed0e9c8fd92a78b13c21 -SHA1 (patch-bs) = 70841168931ce0e60ca86c124ff34728165974e3 +SHA1 (patch-bs) = cd8eedc75f703010da01351daee4efdb8e8ad740 SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16 SHA1 (patch-bx) = dcdec38d984452032176946bafddc9a6614b2b6f SHA1 (patch-by) = fcfca10f504c1ac9b0bb136bb941a8ab2899087b -SHA1 (patch-bz) = 0be0fb721e5fbbdbdab740d075ce21dbdc54024e +SHA1 (patch-bz) = 374da5a2a83642a7a0dc4b129cc752dfb989b12e SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b SHA1 (patch-cc) = 30af57e7c59c8484e6b562664e0cb5e32c36e144 -SHA1 (patch-cd) = 0ee3d935c4f554a47b19a57cc00e71c6f3ac8b47 +SHA1 (patch-cd) = e0b9f98b90dcc74c148a56cf4a8126e212bf1d84 SHA1 (patch-cf) = f5448151bc1ca0afaceb6aac5ab0865b2a1c8c1e SHA1 (patch-cg) = b0a395b6c57e527da07f36256f2771d8ede58ac5 -SHA1 (patch-ch) = 3323eb9bd11c048c079369e1854a8125f74372d2 +SHA1 (patch-ch) = 8ea03f14b1e95d480e8c74db784b7d9d9c178be1 SHA1 (patch-ci) = 91a906ab0cdc12e0610e9920facdb100903426d4 -SHA1 (patch-cj) = b0ec3f40af1113066d217c88998bdb6488985a26 +SHA1 (patch-cj) = ff652e90aea61ae84afeb6b4d6b41caab42fe514 SHA1 (patch-ck) = b3e6e7ab1a2217a757842cc05aaa94301b74a0dd SHA1 (patch-cm) = 71ec2ce962ac46f6a9d9634001c7492d383b69ec -SHA1 (patch-cn) = 6f44ed18999310ab8debbdc3711e763deb0c1b0e +SHA1 (patch-cn) = 56ad5e5a8908b2ad8937a877e3603034eaab2078 SHA1 (patch-cp) = e2a5a664b0ae0b582bf90253e3f0c91d68cdab9f SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f -SHA1 (patch-cs) = d55c1f45ee52a3927452e9136e4d4eac73c4e6ac -SHA1 (patch-ct) = 4582ca80dca92afc612a3d168b4128029bb25b41 +SHA1 (patch-cs) = 40fd36127054b092bb9a18f1f989060e9a0df018 +SHA1 (patch-ct) = 047a43c7d140077427b2fba4d68e783f10f93c07 SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf SHA1 (patch-cx) = 8a2d029f56481c1b3d1626c82096fda36700cf00 SHA1 (patch-cy) = fa472a641904f1c9fbb15240e12708aa3d935f80 -SHA1 (patch-cz) = b0382597de90c16de150b2bca9f55afadce28de2 +SHA1 (patch-cz) = 60f90d32f372fdc73aef3c912ef171c9b7b2571b SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81 SHA1 (patch-dg) = 900ce410b99912583ab0620d20b2e0d597f7c3a4 -SHA1 (patch-dh) = 603f6f0ecc544fe1db01d728e41d0b1f225818ce +SHA1 (patch-dh) = adf545ecb6ac090bd03682570e07c446df01996f SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59 -SHA1 (patch-dj) = 7f546f877a66fdda3fd460f338311cbc1c7efc2a +SHA1 (patch-dj) = c3b5f503720234518192732e4ca3f32514aad1ff SHA1 (patch-dk) = 1933b34e056d384b59c86b78301fa3c21854b33d SHA1 (patch-dl) = 863ece9d3b0b00ea2660d0f91e73f48bdafa3894 SHA1 (patch-dm) = 866cb67d9bb39f889226ef5c588552379d153eff SHA1 (patch-dn) = 76e7a0dec98f63cc8e9addc4a3fdd0f07710110f SHA1 (patch-do) = b8712d7d7b242896f034f147969721d4cc0d50e9 -SHA1 (patch-dp) = dbadef9408bb47f546cc9dab0620a2515f5424e6 +SHA1 (patch-dp) = f75bb540aa59c0df3a89b837ae93c62815f56d43 SHA1 (patch-dq) = d354ec69536f68253597fc6912c8ffc5e5d19796 SHA1 (patch-dr) = 5edc88e7e28731d85442bf4a26b95ab2ca2eca0a SHA1 (patch-ds) = 4a8bc0f2624fb8ee1ddf7013e751d6fb93e4d47b @@ -83,7 +83,7 @@ SHA1 (patch-dt) = 90baacdc4d0f85baeb3ea0c3f227cbffb37c08f1 SHA1 (patch-du) = 9069c9775c1a2b309bcd23d971fb8f24dcd36cf6 SHA1 (patch-dv) = c19d5ea88fad2cbffed3c42d58dd5b3dfb3982b4 SHA1 (patch-dw) = a50a08c8a1eafeffe187512de9bda98edb5f5045 -SHA1 (patch-dx) = 5a233d14aa9736143f99196b34a79cabab9944ea +SHA1 (patch-dx) = f1b7b494ead663b0995ab97b1334f6c49bfbe69b SHA1 (patch-dy) = c80bae613812210e1e0fbc29c767b476f925cf9c SHA1 (patch-dz) = 01b735d0aed64b2a046cd6bea8c7387a9bcefafc SHA1 (patch-ea) = 87e6214840bcdb98da2a3b1deb648c56c9833714 @@ -95,17 +95,16 @@ SHA1 (patch-ef) = edef4f29fa65a51986306055a24fcccf7739bdef SHA1 (patch-eg) = d427baa1251f4252c4012ed8dc8567e72c5d3610 SHA1 (patch-eh) = 604ec8175c4001541a1e90cf99bfe1cd90bd418a SHA1 (patch-ei) = f1a9d5155af533f3628f9e3ea68f62384f3febe7 -SHA1 (patch-ej) = 9499c43aac6db3f5fcb909d9ca1138c955982bef +SHA1 (patch-ej) = 3dea867394534af3902fa6654de7ca8e9b97137b SHA1 (patch-ek) = 774406667b24eeaa1539f58207354662de4cba94 SHA1 (patch-em) = 75fa7c78bbe6aec49745d4988ddc82c46ab16efd SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1 SHA1 (patch-ep) = dfe68fe99903c5bf0d59df9f4a1c64f9baa82a84 -SHA1 (patch-eq) = a1dc61bc7d7c0a04245e21e9f63d5f8cf1a2220c +SHA1 (patch-eq) = 917ad364f7b1d4779d8972d78ceba0a966812077 SHA1 (patch-er) = 77df7513b54e09ef81100a75da45c2ed2e520380 SHA1 (patch-es) = efe9aed66ab85970629bfd9c444b28282cc9db32 -SHA1 (patch-et) = a9556424082a5daa60b963e3d7620d5705cb24c6 +SHA1 (patch-et) = 4a70d356cf351e67bf0b8bb62b0d7522b00a14cd SHA1 (patch-eu) = 142d526643d21f02b349e4128dec3c44c7aece93 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5 SHA1 (patch-ex) = 6dad116e38ba30ea1a9a3529e250b1e512c4865f -SHA1 (patch-ey) = 9967afa35546e34d9692cf0cedfd0e690f235773 diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa index 1579ea7b4f5..a8def774661 100644 --- a/x11/kdebase3/patches/patch-aa +++ b/x11/kdebase3/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2003/03/11 13:10:18 markd Exp $ +$NetBSD: patch-aa,v 1.6 2003/05/22 02:42:47 markd Exp $ ---- configure.orig Fri Jan 17 09:03:15 2003 +--- configure.orig Tue May 13 23:08:06 2003 +++ configure -@@ -30923,64 +30923,6 @@ _ACEOF +@@ -31619,63 +31619,6 @@ _ACEOF @@ -10,14 +10,12 @@ $NetBSD: patch-aa,v 1.5 2003/03/11 13:10:18 markd Exp $ -echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" --#include "confdefs.h" +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ - --#ifdef F77_DUMMY_MAIN --# ifdef __cplusplus -- extern "C" --# endif -- int F77_DUMMY_MAIN() { return 1; } --#endif -int -main () -{ @@ -46,7 +44,8 @@ $NetBSD: patch-aa,v 1.5 2003/03/11 13:10:18 markd Exp $ -echo "${ECHO_T}yes" >&6 -else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- - - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 @@ -67,29 +66,27 @@ $NetBSD: patch-aa,v 1.5 2003/03/11 13:10:18 markd Exp $ echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5 echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6 -@@ -32958,7 +32900,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -33795,6 +33738,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l (exit $ac_status); }; }; then ac_cv_have_dpms="-lXdpms" -- -+ -+ lib=Xdpms -+ 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 ] || ++ ++ lib=Xdpms ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || + [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then -+ shared_lib_found=yes -+ break; -+ fi -+ esac -+ done -+ if [ "$shared_lib_found" = "no" ]; then -+ eval "ac_cv_have_dpms=no" -+ fi -+ ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_have_dpms=no" ++ fi + else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 diff --git a/x11/kdebase3/patches/patch-ac b/x11/kdebase3/patches/patch-ac index f3271aca729..af8db489b15 100644 --- a/x11/kdebase3/patches/patch-ac +++ b/x11/kdebase3/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ +$NetBSD: patch-ac,v 1.5 2003/05/22 02:42:47 markd Exp $ ---- kate/app/Makefile.in.orig Fri Jan 17 09:03:04 2003 +--- kate/app/Makefile.in.orig Tue May 13 23:07:53 2003 +++ kate/app/Makefile.in -@@ -284,7 +284,7 @@ qt_includes = @qt_includes@ - qt_libraries = @qt_libraries@ +@@ -420,7 +420,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ x_includes = @x_includes@ x_libraries = @x_libraries@ -lib_LTLIBRARIES = libkateinterfaces.la kate.la kwrite.la @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ bin_PROGRAMS = kate kwrite #>- libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ -@@ -304,20 +304,28 @@ libkateinterfaces_la_SOURCES=kateapp.cpp +@@ -440,20 +440,28 @@ libkateinterfaces_la_SOURCES=kateapp.cpp libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la -lkscript ../lib/libkmultitabbar.la libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version @@ -48,7 +48,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) #>- METASOURCES = AUTO -@@ -329,19 +337,21 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -466,19 +474,21 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ libkateinterfaces_la_DEPENDENCIES = \ ../interfaces/libkateinterfacesprivate.la \ ../lib/libkmultitabbar.la -@@ -364,19 +374,29 @@ libkateinterfaces_la_nofinal_OBJECTS = k +@@ -501,25 +511,35 @@ libkateinterfaces_la_nofinal_OBJECTS = k katedockcontainer.lo kateIface_skel.lo @KDE_USE_FINAL_FALSE@libkateinterfaces_la_OBJECTS = $(libkateinterfaces_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libkateinterfaces_la_OBJECTS = $(libkateinterfaces_la_final_OBJECTS) @@ -114,10 +114,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ +kwrite_OBJECTS = dummy_main.$(OBJEXT) +kwrite_DEPENDENCIES = libkwrite_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -385,8 +405,8 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy_kate.Po \ @@ -127,7 +124,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kateapp.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kateconfigdialog.Plo \ -@@ -409,8 +429,8 @@ am__depfiles_maybe = depfiles +@@ -542,8 +562,8 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/kwritedialogs.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kwritemain.Plo #>+ 47 @@ -138,7 +135,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateapp.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateconfigdialog.Plo \ -@@ -432,8 +452,8 @@ am__depfiles_maybe = depfiles +@@ -565,8 +585,8 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkhandler.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwritedialogs.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwritemain.Plo @@ -149,9 +146,9 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateapp.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateconfigdialog.Plo \ -@@ -476,10 +496,10 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -608,10 +628,10 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \ - $(libkateinterfaces_la_SOURCES) $(kate_SOURCES) \ - $(kwrite_SOURCES) @@ -163,7 +160,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ #>- all: all-am #>+ 1 -@@ -528,8 +548,12 @@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE +@@ -660,8 +680,12 @@ 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) @@ -176,7 +173,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -572,8 +596,8 @@ mostlyclean-compile: +@@ -704,8 +728,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -187,16 +184,16 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kactionselector.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kateapp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kateconfigdialog.Plo@am__quote@ -@@ -665,7 +689,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -829,7 +853,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=katefilelist.cpp katefiledialog.h katemailfilesdialog.h kateapp.h katepluginmanager.h kategrepdialog.cpp katefileselector.h katedocmanager.h katesplitter.cpp kateviewmanager.cpp kateviewspace.h katemain.h katedockcontainer.cpp kateconsole.cpp kateconfigplugindialogpage.h katesplitter.h kactionselector.h kateconfigdialog.h katemainwindow.h kwritemain.h katepluginmanager.cpp kbookmarkhandler.h kateviewmanager.h katemailfilesdialog.cpp kateIface.h katedocmanager.cpp katefilelist.h kwritedialogs.h kbookmarkhandler.cpp katefileselector.cpp kateconsole.h kateviewspace.cpp katemainwindow.cpp kactionselector.cpp katedockcontainer.h kategrepdialog.h -+KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h katemainwindow.cpp kateviewspace.cpp kateapp.h kbookmarkhandler.h katemailfilesdialog.cpp kactionselector.cpp katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateconfigplugindialogpage.h kateviewmanager.cpp kwritedialogs.h kategrepdialog.h kateviewspace.h katesplitter.cpp katemain.h kateconfigdialog.h katefilelist.cpp katedockcontainer.h kactionselector.h katefileselector.cpp katepluginmanager.h kateconsole.h katedockcontainer.cpp kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h katedocmanager.cpp katepluginmanager.cpp kbookmarkhandler.cpp +-KDE_DIST=katefiledialog.h katemailfilesdialog.h kateapp.h katepluginmanager.h katefileselector.h katedocmanager.h kateviewspace.h katemain.h kateconfigplugindialogpage.h katesplitter.h kactionselector.h kateconfigdialog.h katemainwindow.h kwritemain.h kbookmarkhandler.h kateviewmanager.h kateIface.h katefilelist.h kwritedialogs.h kateconsole.h katedockcontainer.h kategrepdialog.h ++KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h kateapp.h kbookmarkhandler.h katefiledialog.h katesplitter.h kwritemain.h kateconfigplugindialogpage.h kwritedialogs.h kategrepdialog.h kateviewspace.h katemain.h kateconfigdialog.h katedockcontainer.h kactionselector.h katepluginmanager.h kateconsole.h katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -788,91 +812,85 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -967,91 +991,85 @@ uninstall-am: uninstall-binPROGRAMS unin dummy_kate_la.cpp: echo > dummy_kate_la.cpp @@ -320,7 +317,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ #>+ 3 kwritedialogs.moc: $(srcdir)/kwritedialogs.h -@@ -886,7 +904,7 @@ kateIface_skel.cpp: kateIface.kidl +@@ -1065,7 +1083,7 @@ kateIface_skel.cpp: kateIface.kidl #>+ 3 clean-metasources: @@ -329,7 +326,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ #>+ 4 clean-idl: -@@ -904,19 +922,7 @@ force-reedit: +@@ -1083,19 +1101,7 @@ force-reedit: #>+ 11 @@ -350,7 +347,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ @echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \ rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \ -@@ -927,22 +933,34 @@ libkateinterfaces_la.all_cpp.cpp: $(srcd +@@ -1106,22 +1112,34 @@ libkateinterfaces_la.all_cpp.cpp: $(srcd cat libkateinterfaces_la.all_cpp.final libkateinterfaces_la.all_cpp.files > libkateinterfaces_la.all_cpp.cpp; \ rm -f libkateinterfaces_la.all_cpp.final libkateinterfaces_la.all_cpp.files @@ -390,7 +387,7 @@ $NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -952,43 +970,43 @@ kde-rpo-clean: +@@ -1131,43 +1149,43 @@ kde-rpo-clean: -rm -f *.rpo #>+ 41 diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai index 078275c8c91..6fc4e79958b 100644 --- a/x11/kdebase3/patches/patch-ai +++ b/x11/kdebase3/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ +$NetBSD: patch-ai,v 1.6 2003/05/22 02:42:47 markd Exp $ ---- kcontrol/access/Makefile.in.orig Fri Jan 17 09:03:04 2003 +--- kcontrol/access/Makefile.in.orig Tue May 13 23:07:53 2003 +++ kcontrol/access/Makefile.in -@@ -290,16 +290,20 @@ INCLUDES = $(all_includes) +@@ -426,16 +426,20 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kaccess @@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -@@ -317,27 +321,32 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -454,37 +458,48 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -70,10 +70,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ +kaccess_OBJECTS = kaccess_main.$(OBJEXT) +kaccess_DEPENDENCIES = libkaccess_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -346,12 +355,18 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kaccess.Plo \ @@ -95,9 +92,9 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmaccess.Plo ./$(DEPDIR)/main.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -374,13 +389,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -506,13 +521,13 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) \ - $(kaccess_SOURCES) + $(libkaccess_main_la_SOURCES) $(kaccess_SOURCES) @@ -111,7 +108,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ #>- all: all-am #>+ 1 -@@ -460,6 +475,8 @@ kaccess.la: $(kaccess_la_OBJECTS) $(kacc +@@ -592,6 +607,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) @@ -120,7 +117,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -499,8 +516,9 @@ mostlyclean-compile: +@@ -631,8 +648,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -131,8 +128,8 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmaccess.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ -@@ -609,7 +627,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -773,7 +791,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kaccess.h configure.in.in kcmaccess.desktop kaccess.desktop @@ -140,7 +137,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -745,21 +763,18 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -924,21 +942,18 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot $(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot @@ -166,7 +163,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ #>+ 8 kcm_access.la.closure: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) @echo "int main() {return 0;}" > kcm_access_la_closure.cpp -@@ -771,7 +786,7 @@ kcm_access.la.closure: $(kcm_access_la_O +@@ -950,7 +965,7 @@ kcm_access.la.closure: $(kcm_access_la_O #>+ 3 clean-metasources: @@ -175,7 +172,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ #>+ 3 clean-closures: -@@ -788,33 +803,33 @@ force-reedit: +@@ -967,33 +982,33 @@ force-reedit: #>+ 11 @@ -222,7 +219,7 @@ $NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -824,7 +839,7 @@ kde-rpo-clean: +@@ -1003,7 +1018,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am index ab48323d332..a2de8d01c01 100644 --- a/x11/kdebase3/patches/patch-am +++ b/x11/kdebase3/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.4 2003/03/11 13:10:19 markd Exp $ +$NetBSD: patch-am,v 1.5 2003/05/22 02:42:47 markd Exp $ ---- kcontrol/ebrowsing/Makefile.in.orig Fri Jan 17 09:03:04 2003 +--- kcontrol/ebrowsing/Makefile.in.orig Tue May 13 23:07:53 2003 +++ kcontrol/ebrowsing/Makefile.in -@@ -294,7 +294,7 @@ INCLUDES = -I$(srcdir)/plugins/ikws $(al +@@ -430,7 +430,7 @@ INCLUDES = -I$(srcdir)/plugins/ikws $(al kde_module_LTLIBRARIES = kcm_kurifilt.la kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp @@ -11,8 +11,8 @@ $NetBSD: patch-am,v 1.4 2003/03/11 13:10:19 markd Exp $ kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) data_DATA = ebrowsing.desktop -@@ -561,7 +561,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -736,7 +736,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=filteropts.h main.h ebrowsing.desktop diff --git a/x11/kdebase3/patches/patch-ao b/x11/kdebase3/patches/patch-ao index 9f04971a44b..5382a7ea683 100644 --- a/x11/kdebase3/patches/patch-ao +++ b/x11/kdebase3/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ +$NetBSD: patch-ao,v 1.5 2003/05/22 02:42:48 markd Exp $ ---- kcontrol/kcontrol/Makefile.in.orig Fri Jan 17 09:03:05 2003 +--- kcontrol/kcontrol/Makefile.in.orig Tue May 13 23:07:54 2003 +++ kcontrol/kcontrol/Makefile.in -@@ -309,52 +309,65 @@ INCLUDES = $(all_includes) +@@ -445,52 +445,65 @@ INCLUDES = $(all_includes) SUBDIRS = . pics @@ -95,7 +95,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic rccontroldir = $(kde_datadir)/kcontrol -@@ -373,7 +386,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -510,7 +523,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -104,7 +104,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ am_kcminit_la_OBJECTS = kcminit.lo global.lo #>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS) #>+ 4 -@@ -381,50 +394,68 @@ kcminit_la_final_OBJECTS = kcminit_la.al +@@ -518,60 +531,84 @@ 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) @@ -194,9 +194,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ +kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) +kcontrol_DEPENDENCIES = libkcontrol_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -434,11 +465,17 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aboutwidget.Plo \ @@ -216,7 +214,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kecdialog.Plo ./$(DEPDIR)/main.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/modloader.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/moduleIface.Plo \ -@@ -449,13 +486,19 @@ am__depfiles_maybe = depfiles +@@ -582,13 +619,19 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/quickhelp.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/searchwidget.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo @@ -240,7 +238,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ @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 \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/moduleIface.Plo \ -@@ -467,11 +510,17 @@ am__depfiles_maybe = depfiles +@@ -600,11 +643,17 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchwidget.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P ./$(DEPDIR)/aboutwidget.Plo \ @@ -260,9 +258,9 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ @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 \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/moduleIface.Plo \ -@@ -503,8 +552,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -635,8 +684,9 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) \ - $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) \ - $(kcontrol_SOURCES) @@ -272,8 +270,8 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ DATA = $(data_DATA) $(rccontrol_DATA) $(rcinfo_DATA) -@@ -514,7 +564,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - uninstall-recursive check-recursive installcheck-recursive +@@ -647,7 +697,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) @@ -281,7 +279,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -565,6 +615,12 @@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc +@@ -698,6 +748,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) @@ -294,7 +292,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -612,13 +668,17 @@ distclean-compile: +@@ -745,13 +801,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@ @@ -313,16 +311,16 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd 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@ -@@ -816,7 +876,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -991,7 +1051,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=cr32-app-kcontrol.png quickhelp.cpp cr48-app-kcontrol.png kcdialog.h proxywidget.h moduletreeview.cpp quickhelp.h KControl_NoDisplay.desktop cr64-app-kcontrol.png helpwidget.cpp aboutwidget.h global.h toplevel.h modulemenu.h kcrootonly.cpp modulemenu.cpp kinfocenterui.rc modules.cpp kcontrolui.rc kcmshell.h kinfocenter.desktop helpwidget.h main.h moduleinfo.h moduletreeview.h searchwidget.h proxywidget.cpp moduleIface.cpp moduleiconview.h dockcontainer.cpp dockcontainer.h kcdialog.cpp kecdialog.h cr16-app-kcontrol.png aboutwidget.cpp version.h cr128-app-kcontrol.png indexwidget.h KControl.desktop moduleIface.h modules.h modloader.h moduleiconview.cpp kcrootonly.h -+KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h aboutwidget.cpp quickhelp.h cr128-app-kcontrol.png searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h kinfocenter.desktop kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop cr48-app-kcontrol.png moduletreeview.cpp proxywidget.cpp modules.h version.h cr16-app-kcontrol.png quickhelp.cpp moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h +-KDE_DIST=cr32-app-kcontrol.png cr48-app-kcontrol.png kcdialog.h proxywidget.h quickhelp.h KControl_NoDisplay.desktop cr64-app-kcontrol.png aboutwidget.h global.h toplevel.h modulemenu.h modulemenu.cpp kinfocenterui.rc kcontrolui.rc kcmshell.h kinfocenter.desktop helpwidget.h main.h moduleinfo.h moduletreeview.h searchwidget.h moduleiconview.h dockcontainer.h kecdialog.h cr16-app-kcontrol.png version.h cr128-app-kcontrol.png indexwidget.h KControl.desktop moduleIface.h modules.h modloader.h kcrootonly.h ++KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h quickhelp.h cr128-app-kcontrol.png searchwidget.h main.h moduletreeview.h kcdialog.h kecdialog.h moduleIface.h aboutwidget.h kinfocenter.desktop kcrootonly.h toplevel.h helpwidget.h KControl.desktop cr48-app-kcontrol.png modules.h version.h cr16-app-kcontrol.png moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -884,7 +944,6 @@ install-strip: +@@ -1065,7 +1125,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -330,7 +328,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -981,84 +1040,81 @@ install-data-local: KControl_NoDisplay.d +@@ -1170,84 +1229,81 @@ install-data-local: KControl_NoDisplay.d messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot @@ -449,7 +447,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ #>+ 5 kcdialog.kidl: $(srcdir)/kcdialog.h $(DCOP_DEPENDENCIES) -@@ -1074,7 +1130,7 @@ moduleIface_skel.cpp: moduleIface.kidl +@@ -1263,7 +1319,7 @@ moduleIface_skel.cpp: moduleIface.kidl #>+ 3 clean-metasources: @@ -458,7 +456,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ #>+ 5 clean-idl: -@@ -1125,45 +1181,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi +@@ -1314,45 +1370,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files #>+ 11 @@ -537,7 +535,7 @@ $NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1173,39 +1241,39 @@ kde-rpo-clean: +@@ -1362,39 +1430,39 @@ kde-rpo-clean: -rm -f *.rpo #>+ 37 diff --git a/x11/kdebase3/patches/patch-aw b/x11/kdebase3/patches/patch-aw index 853e5384b67..3588e71b1f3 100644 --- a/x11/kdebase3/patches/patch-aw +++ b/x11/kdebase3/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ +$NetBSD: patch-aw,v 1.5 2003/05/22 02:42:48 markd Exp $ ---- kdeprint/kjobviewer/Makefile.in.orig Fri Jan 17 09:03:06 2003 +--- kdeprint/kjobviewer/Makefile.in.orig Tue May 13 23:07:56 2003 +++ kdeprint/kjobviewer/Makefile.in -@@ -287,15 +287,20 @@ x_libraries = @x_libraries@ +@@ -423,15 +423,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kjobviewer @@ -28,7 +28,7 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kjobviewer.h -@@ -313,22 +318,27 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -450,33 +455,41 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -63,10 +63,7 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ +kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT) +kjobviewer_DEPENDENCIES = libkjobviewer_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -337,13 +347,16 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kjobviewer.Plo \ @@ -89,10 +86,10 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -364,13 +377,14 @@ CXXLD = $(CXX) +@@ -496,13 +509,14 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES) +DIST_SOURCES = $(kjobviewer_la_SOURCES) $(libkjobviewer_main_la_SOURCES) \ + $(kjobviewer_SOURCES) @@ -106,7 +103,7 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ #>- all: all-am #>+ 1 -@@ -417,6 +431,8 @@ clean-libLTLIBRARIES: +@@ -549,6 +563,8 @@ clean-libLTLIBRARIES: done kjobviewer.la: $(kjobviewer_la_OBJECTS) $(kjobviewer_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kjobviewer_la_LDFLAGS) $(kjobviewer_la_OBJECTS) $(kjobviewer_la_LIBADD) $(LIBS) @@ -115,7 +112,7 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -456,8 +472,9 @@ mostlyclean-compile: +@@ -588,8 +604,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -126,8 +123,8 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ distclean-depend: -@@ -565,7 +582,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -729,7 +746,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kjobviewerui.rc cr16-app-kjobviewer.png cr32-app-kjobviewer.png kjobviewer.desktop @@ -135,8 +132,8 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -692,9 +709,6 @@ uninstall-am: uninstall-kde-icons unins - uninstall-info-am uninstall-libLTLIBRARIES uninstall-rcDATA +@@ -871,9 +888,6 @@ uninstall-am: uninstall-kde-icons unins + uninstall-libLTLIBRARIES uninstall-rcDATA -dummy.cpp: @@ -145,7 +142,7 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. -@@ -706,8 +720,12 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h +@@ -885,8 +899,12 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc #>+ 3 @@ -159,7 +156,7 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ #>+ 2 docs-am: -@@ -731,33 +749,33 @@ force-reedit: +@@ -910,33 +928,33 @@ force-reedit: #>+ 11 @@ -206,7 +203,7 @@ $NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -767,5 +785,5 @@ kde-rpo-clean: +@@ -946,5 +964,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-ba b/x11/kdebase3/patches/patch-ba index f37ee472bdb..24bffb00fda 100644 --- a/x11/kdebase3/patches/patch-ba +++ b/x11/kdebase3/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ +$NetBSD: patch-ba,v 1.5 2003/05/22 02:42:48 markd Exp $ ---- kdesktop/Makefile.in.orig Fri Jan 17 09:03:06 2003 +--- kdesktop/Makefile.in.orig Tue May 13 23:07:56 2003 +++ kdesktop/Makefile.in -@@ -286,10 +286,17 @@ x_includes = @x_includes@ +@@ -422,10 +422,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.4 2003/03/11 13:10:21 markd Exp $ SUBDIRS = . lock pics patterns programs init kwebdesktop -@@ -297,22 +304,24 @@ SUBDIRS = . lock pics patterns programs +@@ -433,22 +440,24 @@ SUBDIRS = . lock pics patterns programs ####### Files bin_PROGRAMS = kdesktop bin_SCRIPTS = kdeeject @@ -51,7 +51,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h -@@ -334,27 +343,32 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -471,27 +480,32 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -98,7 +98,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ SCRIPTS = $(bin_SCRIPTS) -@@ -366,25 +380,31 @@ LIBS = @LIBS@ +@@ -499,25 +513,31 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$( depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bgmanager.Plo \ @@ -138,9 +138,9 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiconview.Plo ./$(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 \ -@@ -418,7 +438,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( - CCLD = $(CC) - LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +@@ -542,7 +562,8 @@ CXXLD = $(CXX) + #>+ 2 + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) +DIST_SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) \ @@ -148,7 +148,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ DATA = $(autostart_DATA) $(menu_DATA) HEADERS = $(include_HEADERS) $(noinst_HEADERS) -@@ -431,7 +452,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -556,7 +577,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS Makefile.am \ Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -157,7 +157,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -478,6 +499,8 @@ clean-libLTLIBRARIES: +@@ -603,6 +624,8 @@ clean-libLTLIBRARIES: done kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) @@ -166,7 +166,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -539,9 +562,10 @@ distclean-compile: +@@ -664,9 +687,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@ @@ -178,16 +178,16 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdiconview.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krootwm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lockeng.Plo@am__quote@ -@@ -752,7 +776,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -934,7 +958,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --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 -+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 kdesktopbindings.cpp kdeeject lockeng.cc kcustommenu.cc +-KDE_DIST=kcustommenu.h kdesktopbindings.cpp DESIGN kdesktop.desktop kdesktop_custom_menu1 kdiconview.h kdeeject kdesktop_custom_menu2 ++KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -912,35 +936,21 @@ dummy.cc: +@@ -1109,35 +1133,21 @@ dummy.cc: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -231,7 +231,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ #>+ 3 desktop.moc: $(srcdir)/desktop.h -@@ -951,24 +961,38 @@ pixmapserver.moc: $(srcdir)/pixmapserver +@@ -1148,24 +1158,38 @@ pixmapserver.moc: $(srcdir)/pixmapserver $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc #>+ 3 @@ -278,7 +278,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ #>+ 6 clean-idl: -@@ -988,45 +1012,45 @@ force-reedit: +@@ -1185,45 +1209,45 @@ force-reedit: #>+ 11 @@ -347,7 +347,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1036,23 +1060,23 @@ kde-rpo-clean: +@@ -1233,23 +1257,23 @@ kde-rpo-clean: -rm -f *.rpo #>+ 21 diff --git a/x11/kdebase3/patches/patch-bg b/x11/kdebase3/patches/patch-bg index a61c84384ea..b71337bf46f 100644 --- a/x11/kdebase3/patches/patch-bg +++ b/x11/kdebase3/patches/patch-bg @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ +$NetBSD: patch-bg,v 1.5 2003/05/22 02:42:48 markd Exp $ ---- khotkeys/khotkeys/Makefile.in.orig Fri Jan 17 09:03:07 2003 +--- khotkeys/khotkeys/Makefile.in.orig Tue May 13 23:07:57 2003 +++ khotkeys/khotkeys/Makefile.in -@@ -288,16 +288,20 @@ x_includes = @x_includes@ +@@ -424,16 +424,20 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ bin_PROGRAMS = khotkeys @@ -29,7 +29,7 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = khotkeys.desktop -@@ -314,22 +318,27 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -451,33 +455,41 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -64,10 +64,7 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ +khotkeys_OBJECTS = khotkeys_main.$(OBJEXT) +khotkeys_DEPENDENCIES = libkhotkeys_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -338,13 +347,16 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \ @@ -90,10 +87,10 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -365,13 +377,14 @@ CXXLD = $(CXX) +@@ -497,13 +509,14 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES) +DIST_SOURCES = $(khotkeys_la_SOURCES) $(libkhotkeys_main_la_SOURCES) \ + $(khotkeys_SOURCES) @@ -107,7 +104,7 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ #>- all: all-am #>+ 1 -@@ -418,6 +431,8 @@ clean-libLTLIBRARIES: +@@ -550,6 +563,8 @@ clean-libLTLIBRARIES: done khotkeys.la: $(khotkeys_la_OBJECTS) $(khotkeys_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(khotkeys_la_LDFLAGS) $(khotkeys_la_OBJECTS) $(khotkeys_la_LIBADD) $(LIBS) @@ -116,7 +113,7 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -457,8 +472,9 @@ mostlyclean-compile: +@@ -589,8 +604,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -127,8 +124,8 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ distclean-depend: -@@ -548,7 +564,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -712,7 +728,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=khkglobalaccel.cpp khotkeys.desktop khkglobalaccel.h @@ -136,9 +133,9 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -669,30 +685,27 @@ uninstall-am: uninstall-autostartDATA un - uninstall-am uninstall-autostartDATA uninstall-binPROGRAMS \ - uninstall-info-am uninstall-libLTLIBRARIES +@@ -848,30 +864,27 @@ uninstall-am: uninstall-autostartDATA un + uninstall-binPROGRAMS uninstall-info-am \ + uninstall-libLTLIBRARIES - -dummy.cpp: @@ -176,7 +173,7 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ #>+ 4 clean-idl: -@@ -710,33 +723,33 @@ force-reedit: +@@ -889,33 +902,33 @@ force-reedit: #>+ 11 @@ -223,7 +220,7 @@ $NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -747,6 +760,6 @@ kde-rpo-clean: +@@ -926,6 +939,6 @@ kde-rpo-clean: #>+ 5 khotkeys.lo: khotkeys.moc diff --git a/x11/kdebase3/patches/patch-bk b/x11/kdebase3/patches/patch-bk index 5f5bb0cfd70..fa75ce26ced 100644 --- a/x11/kdebase3/patches/patch-bk +++ b/x11/kdebase3/patches/patch-bk @@ -1,8 +1,8 @@ -$NetBSD: patch-bk,v 1.4 2003/03/11 13:10:21 markd Exp $ +$NetBSD: patch-bk,v 1.5 2003/05/22 02:42:49 markd Exp $ ---- kicker/Makefile.in.orig Fri Jan 17 09:03:07 2003 +--- kicker/Makefile.in.orig Tue May 13 23:07:57 2003 +++ kicker/Makefile.in -@@ -289,19 +289,23 @@ INCLUDES = $(all_includes) +@@ -425,19 +425,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.4 2003/03/11 13:10:21 markd Exp $ kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = panel.desktop -@@ -318,21 +322,26 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -455,28 +459,37 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -64,10 +64,7 @@ $NetBSD: patch-bk,v 1.4 2003/03/11 13:10:21 markd Exp $ +kicker_OBJECTS = kicker_main.$(OBJEXT) +kicker_DEPENDENCIES = libkicker_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -341,9 +350,13 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/dummy_la.Po @@ -83,18 +80,18 @@ $NetBSD: patch-bk,v 1.4 2003/03/11 13:10:21 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -364,7 +377,8 @@ CXXLD = $(CXX) +@@ -496,7 +509,8 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES) +DIST_SOURCES = $(kicker_la_SOURCES) $(libkicker_main_la_SOURCES) \ + $(kicker_SOURCES) DATA = $(autostart_DATA) $(config_DATA) $(update_DATA) -@@ -374,7 +388,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - uninstall-recursive check-recursive installcheck-recursive +@@ -507,7 +521,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive DIST_COMMON = AUTHORS ChangeLog Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES) @@ -102,7 +99,7 @@ $NetBSD: patch-bk,v 1.4 2003/03/11 13:10:21 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -419,11 +433,13 @@ clean-libLTLIBRARIES: +@@ -552,11 +566,13 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -120,7 +117,7 @@ $NetBSD: patch-bk,v 1.4 2003/03/11 13:10:21 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -464,7 +480,8 @@ distclean-compile: +@@ -597,7 +613,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ @@ -130,16 +127,16 @@ $NetBSD: patch-bk,v 1.4 2003/03/11 13:10:21 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -649,7 +666,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -824,7 +841,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kcmkicker.desktop panel.desktop kicker-3.1-properSizeSetting.pl kickerrc.upd -+KDE_DIST=kicker-3.1-properSizeSetting.pl kcmkicker.desktop kicker.la.closure kicker.la.blsav kickerrc.upd kicker libkicker_main.la.blsav panel.desktop libkicker_main.la.closure ++KDE_DIST=kicker-3.1-properSizeSetting.pl kcmkicker.desktop kickerrc.upd panel.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -807,17 +824,17 @@ dummy.cpp dummy_la.cpp: +@@ -996,17 +1013,17 @@ dummy.cpp dummy_la.cpp: .NOEXPORT: #>+ 8 diff --git a/x11/kdebase3/patches/patch-bm b/x11/kdebase3/patches/patch-bm index 225a09139ab..87975e86d06 100644 --- a/x11/kdebase3/patches/patch-bm +++ b/x11/kdebase3/patches/patch-bm @@ -1,16 +1,17 @@ -$NetBSD: patch-bm,v 1.4 2003/03/11 13:10:22 markd Exp $ +$NetBSD: patch-bm,v 1.5 2003/05/22 02:42:49 markd Exp $ ---- kicker/applets/launcher/Makefile.in.orig Fri Jan 17 09:03:07 2003 +--- kicker/applets/launcher/Makefile.in.orig Tue May 13 23:07:57 2003 +++ kicker/applets/launcher/Makefile.in -@@ -300,14 +300,14 @@ lnk_DATA = quicklauncher.desktop +@@ -436,7 +436,7 @@ lnk_DATA = quicklauncher.desktop EXTRA_DIST = $(lnk_DATA) launcher_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) +launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI) subdir = kicker/applets/launcher + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h +@@ -444,7 +444,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,7 +20,7 @@ $NetBSD: patch-bm,v 1.4 2003/03/11 13:10:22 markd Exp $ am_launcher_panelapplet_la_OBJECTS = quicklauncher.lo quickbutton.lo \ quickaddappsmenu.lo #>- launcher_panelapplet_la_OBJECTS = $(am_launcher_panelapplet_la_OBJECTS) -@@ -651,10 +651,6 @@ launcher_panelapplet.la.closure: $(launc +@@ -829,10 +829,6 @@ launcher_panelapplet.la.closure: $(launc #>+ 3 @@ -30,7 +31,7 @@ $NetBSD: patch-bm,v 1.4 2003/03/11 13:10:22 markd Exp $ quickaddappsmenu.moc: $(srcdir)/quickaddappsmenu.h $(MOC) $(srcdir)/quickaddappsmenu.h -o quickaddappsmenu.moc -@@ -663,8 +659,12 @@ quicklauncher.moc: $(srcdir)/quicklaunch +@@ -841,8 +837,12 @@ quicklauncher.moc: $(srcdir)/quicklaunch $(MOC) $(srcdir)/quicklauncher.h -o quicklauncher.moc #>+ 3 @@ -44,7 +45,7 @@ $NetBSD: patch-bm,v 1.4 2003/03/11 13:10:22 markd Exp $ #>+ 3 clean-closures: -@@ -681,7 +681,7 @@ force-reedit: +@@ -859,7 +859,7 @@ force-reedit: #>+ 11 @@ -53,7 +54,7 @@ $NetBSD: patch-bm,v 1.4 2003/03/11 13:10:22 markd Exp $ @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; \ -@@ -717,9 +717,9 @@ kde-rpo-clean: +@@ -895,9 +895,9 @@ kde-rpo-clean: -rm -f *.rpo #>+ 7 diff --git a/x11/kdebase3/patches/patch-bs b/x11/kdebase3/patches/patch-bs index ca1451daa09..d9f54bd6363 100644 --- a/x11/kdebase3/patches/patch-bs +++ b/x11/kdebase3/patches/patch-bs @@ -1,8 +1,8 @@ -$NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ +$NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ ---- kicker/proxy/Makefile.in.orig Fri Jan 17 09:03:08 2003 +--- kicker/proxy/Makefile.in.orig Tue May 13 23:07:58 2003 +++ kicker/proxy/Makefile.in -@@ -286,27 +286,35 @@ x_includes = @x_includes@ +@@ -422,27 +422,35 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ INCLUDES = -I$(srcdir)/../share $(all_includes) @@ -51,7 +51,7 @@ $NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = appletproxy.h extensionproxy.h -@@ -316,29 +324,40 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -453,38 +461,57 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -102,10 +102,7 @@ $NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ +extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT) +extensionproxy_DEPENDENCIES = libextensionproxy_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -347,11 +366,19 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appletproxy.Plo ./$(DEPDIR)/dummy.Po \ @@ -129,9 +126,9 @@ $NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -373,11 +400,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -505,11 +532,13 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \ - $(appletproxy_SOURCES) $(extensionproxy_SOURCES) + $(libappletproxy_main_la_SOURCES) \ @@ -145,7 +142,7 @@ $NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ #>- all: all-am #>+ 1 -@@ -426,6 +455,10 @@ appletproxy.la: $(appletproxy_la_OBJECTS +@@ -558,6 +587,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) @@ -156,7 +153,7 @@ $NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -469,8 +502,11 @@ distclean-compile: +@@ -601,8 +634,11 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appletproxy.Plo@am__quote@ @@ -169,7 +166,7 @@ $NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -591,7 +627,6 @@ install-strip: +@@ -761,7 +797,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -177,7 +174,7 @@ $NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -661,9 +696,6 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -840,9 +875,6 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot @@ -187,7 +184,7 @@ $NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd 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: -@@ -711,7 +743,7 @@ kde-rpo-clean: +@@ -890,7 +922,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz index 6a6f1b6ff49..7218a599136 100644 --- a/x11/kdebase3/patches/patch-bz +++ b/x11/kdebase3/patches/patch-bz @@ -1,8 +1,8 @@ -$NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ +$NetBSD: patch-bz,v 1.7 2003/05/22 02:42:49 markd Exp $ ---- klipper/Makefile.in.orig Fri Jan 17 09:03:09 2003 +--- klipper/Makefile.in.orig Tue May 13 23:07:59 2003 +++ klipper/Makefile.in -@@ -287,27 +287,29 @@ x_libraries = @x_libraries@ +@@ -423,27 +423,29 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = klipper @@ -42,7 +42,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ #>- klipper_panelapplet_la_SOURCES = applet.cpp applet.skel #>+ 1 klipper_panelapplet_la_SOURCES=applet.cpp applet_skel.cpp -@@ -333,17 +335,12 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -470,17 +472,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -65,7 +65,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ am_klipper_panelapplet_la_OBJECTS = applet.lo #>- klipper_panelapplet_la_OBJECTS = $(am_klipper_panelapplet_la_OBJECTS) #>+ 4 -@@ -351,14 +348,24 @@ klipper_panelapplet_la_final_OBJECTS = k +@@ -488,31 +485,44 @@ klipper_panelapplet_la_final_OBJECTS = k klipper_panelapplet_la_nofinal_OBJECTS = applet.lo applet_skel.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) @@ -91,9 +91,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ +klipper_OBJECTS = klipper_main.$(OBJEXT) +klipper_DEPENDENCIES = libklipper_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -368,18 +375,21 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/applet.Plo \ @@ -127,9 +125,9 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -401,11 +411,11 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -533,11 +543,11 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \ - $(klipper_SOURCES) + $(libklipper_main_la_SOURCES) $(klipper_SOURCES) @@ -141,7 +139,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ #>- all: all-am #>+ 1 -@@ -482,6 +492,8 @@ klipper.la: $(klipper_la_OBJECTS) $(klip +@@ -614,6 +624,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) @@ -150,7 +148,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -523,7 +535,8 @@ distclean-compile: +@@ -655,7 +667,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@ @@ -160,7 +158,16 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd 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@ -@@ -724,7 +737,6 @@ install-strip: +@@ -833,7 +846,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=toplevel.h cr64-app-klipper.png klipperrc.desktop klipperbindings.cpp cr48-app-klipper.png klipper.desktop cr22-app-klipper.png cr32-app-klipper.png urlgrabber.h klipperrc.upd klipper-kde31.sh cr128-app-klipper.png configdialog.h cr16-app-klipper.png klipper-1-2.pl version.h klippershortcuts.upd applet.h ++KDE_DIST=applet.h cr128-app-klipper.png cr22-app-klipper.png toplevel.h cr48-app-klipper.png cr64-app-klipper.png klipper-kde31.sh klipperbindings.cpp version.h configdialog.h cr32-app-klipper.png klipper-1-2.pl cr16-app-klipper.png klipper.desktop klipperrc.upd urlgrabber.h klipperrc.desktop klippershortcuts.upd + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -894,7 +907,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -168,7 +175,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -825,16 +837,18 @@ dummy.cpp: +@@ -1004,16 +1016,18 @@ dummy.cpp: .NOEXPORT: #>+ 5 @@ -191,7 +198,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ urlgrabber.moc: $(srcdir)/urlgrabber.h $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc -@@ -846,21 +860,19 @@ toplevel.moc: $(srcdir)/toplevel.h +@@ -1025,21 +1039,19 @@ toplevel.moc: $(srcdir)/toplevel.h applet.moc: $(srcdir)/applet.h $(MOC) $(srcdir)/applet.h -o applet.moc @@ -219,7 +226,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ #>+ 2 docs-am: -@@ -893,18 +905,6 @@ force-reedit: +@@ -1075,18 +1087,6 @@ force-reedit: #>+ 11 @@ -238,7 +245,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ klipper_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/applet.cpp applet_skel.cpp applet.moc @echo 'creating klipper_panelapplet_la.all_cpp.cpp ...'; \ rm -f klipper_panelapplet_la.all_cpp.files klipper_panelapplet_la.all_cpp.final; \ -@@ -916,22 +916,34 @@ klipper_panelapplet_la.all_cpp.cpp: $(sr +@@ -1098,22 +1098,34 @@ klipper_panelapplet_la.all_cpp.cpp: $(sr cat klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files > klipper_panelapplet_la.all_cpp.cpp; \ rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files @@ -278,7 +285,7 @@ $NetBSD: patch-bz,v 1.6 2003/04/01 12:27:12 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -941,11 +953,11 @@ kde-rpo-clean: +@@ -1123,11 +1135,11 @@ kde-rpo-clean: -rm -f *.rpo #>+ 9 diff --git a/x11/kdebase3/patches/patch-cd b/x11/kdebase3/patches/patch-cd index 43eb0b7c3e1..4ec7a95a179 100644 --- a/x11/kdebase3/patches/patch-cd +++ b/x11/kdebase3/patches/patch-cd @@ -1,8 +1,8 @@ -$NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ +$NetBSD: patch-cd,v 1.5 2003/05/22 02:42:50 markd Exp $ ---- kmenuedit/Makefile.in.orig Fri Jan 17 09:03:09 2003 +--- kmenuedit/Makefile.in.orig Tue May 13 23:07:59 2003 +++ kmenuedit/Makefile.in -@@ -287,17 +287,19 @@ x_libraries = @x_libraries@ +@@ -423,17 +423,19 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kmenuedit @@ -28,7 +28,7 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h khotkeys.h -@@ -321,24 +323,31 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -458,45 +460,55 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -70,9 +70,8 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ +kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) +kmenuedit_DEPENDENCIES = libkmenuedit_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -349,21 +358,24 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/basictab.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/desktopfileeditor.Plo \ @@ -105,18 +104,18 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/menueditview.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/treeview.Plo -@@ -386,7 +398,8 @@ CXXLD = $(CXX) +@@ -518,7 +530,8 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) +DIST_SOURCES = $(kmenuedit_la_SOURCES) $(libkmenuedit_main_la_SOURCES) \ + $(kmenuedit_SOURCES) DATA = $(apps_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) -@@ -398,7 +411,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - uninstall-recursive check-recursive installcheck-recursive +@@ -531,7 +544,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) @@ -124,7 +123,7 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -445,6 +458,8 @@ clean-libLTLIBRARIES: +@@ -578,6 +591,8 @@ clean-libLTLIBRARIES: done kmenuedit.la: $(kmenuedit_la_OBJECTS) $(kmenuedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kmenuedit_la_LDFLAGS) $(kmenuedit_la_OBJECTS) $(kmenuedit_la_LIBADD) $(LIBS) @@ -133,7 +132,7 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -486,9 +501,10 @@ distclean-compile: +@@ -619,9 +634,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@ @@ -145,8 +144,8 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd 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)/treeview.Plo@am__quote@ -@@ -658,7 +674,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -833,7 +849,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=cr48-app-kmenuedit.png uninstall.desktop kmenuedit.desktop cr16-app-kmenuedit.png kmenueditui.rc cr32-app-kmenuedit.png @@ -154,7 +153,7 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -726,7 +742,6 @@ install-strip: +@@ -907,7 +923,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -162,7 +161,7 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -822,10 +837,6 @@ dummy.cpp: +@@ -1012,10 +1027,6 @@ dummy.cpp: .NOEXPORT: #>+ 3 @@ -173,7 +172,7 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ basictab.moc: $(srcdir)/basictab.h $(MOC) $(srcdir)/basictab.h -o basictab.moc -@@ -834,16 +845,20 @@ treeview.moc: $(srcdir)/treeview.h +@@ -1024,16 +1035,20 @@ treeview.moc: $(srcdir)/treeview.h $(MOC) $(srcdir)/treeview.h -o treeview.moc #>+ 3 @@ -197,7 +196,7 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ #>+ 2 docs-am: -@@ -870,33 +885,33 @@ force-reedit: +@@ -1060,33 +1075,33 @@ force-reedit: #>+ 11 @@ -244,7 +243,7 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -906,13 +921,13 @@ kde-rpo-clean: +@@ -1096,13 +1111,13 @@ kde-rpo-clean: -rm -f *.rpo #>+ 11 diff --git a/x11/kdebase3/patches/patch-ch b/x11/kdebase3/patches/patch-ch index 6201d5b29d3..de14355ff0d 100644 --- a/x11/kdebase3/patches/patch-ch +++ b/x11/kdebase3/patches/patch-ch @@ -1,8 +1,8 @@ -$NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ +$NetBSD: patch-ch,v 1.5 2003/05/22 02:42:50 markd Exp $ ---- konqueror/Makefile.in.orig Fri Jan 17 09:03:09 2003 +--- konqueror/Makefile.in.orig Tue May 13 23:07:59 2003 +++ konqueror/Makefile.in -@@ -291,7 +291,7 @@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t +@@ -427,7 +427,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,7 +11,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ konqdatadir = $(kde_datadir)/konqueror konqdata_DATA = konqueror.rc -@@ -308,7 +308,7 @@ include_HEADERS = KonquerorIface.h +@@ -444,7 +444,7 @@ include_HEADERS = KonquerorIface.h bin_PROGRAMS = konqueror @@ -20,7 +20,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ #>- KonquerorIface.cc KonquerorIface.skel \ #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ #>- KonqViewIface.cc KonqViewIface.skel \ -@@ -323,7 +323,7 @@ bin_PROGRAMS = konqueror +@@ -459,7 +459,7 @@ bin_PROGRAMS = konqueror #>- konq_browseriface.cc \ #>- delayedinitializer.cc #>+ 14 @@ -29,7 +29,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ KonquerorIface.cc \ KonqMainWindowIface.cc \ KonqViewIface.cc \ -@@ -346,11 +346,15 @@ noinst_HEADERS = KonqMainWindowIface.h K +@@ -482,11 +482,15 @@ noinst_HEADERS = KonqMainWindowIface.h K konq_view.h konq_viewmgr.h version.h @@ -48,7 +48,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) data_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop -@@ -375,32 +379,37 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -512,32 +516,37 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -94,9 +94,9 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ +konqueror_OBJECTS = konqueror_main.$(OBJEXT) +konqueror_DEPENDENCIES = libkonqueror_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -413,7 +422,7 @@ am__depfiles_maybe = depfiles + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +@@ -546,7 +555,7 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/KonqViewIface.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/KonquerorIface.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/delayedinitializer.Plo \ @@ -105,7 +105,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_browseriface.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_combo.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_factory.Plo \ -@@ -424,13 +433,15 @@ am__depfiles_maybe = depfiles +@@ -557,13 +566,15 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_misc.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_profiledlg.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_run.Plo ./$(DEPDIR)/konq_view.Plo \ @@ -125,7 +125,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_browseriface.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_combo.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_factory.Plo \ -@@ -441,12 +452,14 @@ am__depfiles_maybe = depfiles +@@ -574,12 +585,14 @@ am__depfiles_maybe = depfiles @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 \ @@ -142,7 +142,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_browseriface.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_combo.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_factory.Plo \ -@@ -457,7 +470,9 @@ am__depfiles_maybe = depfiles +@@ -590,7 +603,9 @@ am__depfiles_maybe = depfiles @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 \ @@ -153,17 +153,17 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -478,7 +493,8 @@ CXXLD = $(CXX) +@@ -610,7 +625,8 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) +DIST_SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) \ + $(konqueror_SOURCES) DATA = $(data_DATA) $(data2_DATA) $(data3_DATA) $(data4_DATA) \ $(data5_DATA) $(kde_apps_DATA) $(kde_services_DATA) \ $(konqdata_DATA) -@@ -493,7 +509,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -626,7 +642,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS ChangeLog \ Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -172,7 +172,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -540,6 +556,8 @@ clean-libLTLIBRARIES: +@@ -673,6 +689,8 @@ clean-libLTLIBRARIES: done konqueror.la: $(konqueror_la_OBJECTS) $(konqueror_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(konqueror_la_LDFLAGS) $(konqueror_la_OBJECTS) $(konqueror_la_LIBADD) $(LIBS) @@ -181,7 +181,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -583,7 +601,6 @@ distclean-compile: +@@ -716,7 +734,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@ @@ -189,7 +189,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd 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@ -@@ -597,6 +614,8 @@ distclean-compile: +@@ -730,6 +747,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@ @@ -198,16 +198,16 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -889,7 +908,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -1064,7 +1083,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=profile_midnightcommander.desktop profile_webbrowsing.desktop kfmclient_war.desktop konq_viewmgr.cc konq_mainwindow.cc konqfilemgr.desktop konq_frame.cc kfmclient_dir.desktop DESIGN KonqMainWindowIface.cc profile_filepreview.desktop konq_combo.cc konq_profiledlg.cc kfmclient_html.desktop konqueror.desktop konq_misc.cc konqbrowser.desktop konq_browseriface.cc uninstall.desktop KonquerorIface.cc convert_kdelnk.sh IDEAS konq_view.cc konqueror.rc profile_filemanagement.desktop DESIGN_config konq_guiclients.cc konq_factory.cc konq_actions.cc konq_run.cc konquerorsu.desktop KonqViewIface.cc delayedinitializer.cc Home.desktop kfmclient.desktop konqueror_config.desktop -+KDE_DIST=konq_viewmgr.cc DESIGN konqfilemgr.desktop convert_kdelnk.sh konq_view.cc DESIGN_config profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror_config.desktop konqueror.rc konqbrowser.desktop delayedinitializer.cc profile_filemanagement.desktop kfmclient_dir.desktop konq_misc.cc kfmclient_html.desktop kfmclient.desktop uninstall.desktop konq_mainwindow.cc konq_actions.cc konq_frame.cc KonqMainWindowIface.cc IDEAS konqueror.desktop konq_profiledlg.cc konq_run.cc konq_factory.cc konq_guiclients.cc profile_filepreview.desktop Home.desktop KonquerorIface.cc konquerorsu.desktop kfmclient_war.desktop KonqViewIface.cc profile_webbrowsing.desktop +-KDE_DIST=profile_midnightcommander.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop DESIGN profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop uninstall.desktop convert_kdelnk.sh IDEAS konqueror.rc profile_filemanagement.desktop DESIGN_config konquerorsu.desktop Home.desktop kfmclient.desktop konqueror_config.desktop ++KDE_DIST=DESIGN konqfilemgr.desktop convert_kdelnk.sh DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop profile_filemanagement.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop uninstall.desktop IDEAS konqueror.desktop profile_filepreview.desktop Home.desktop konquerorsu.desktop kfmclient_war.desktop profile_webbrowsing.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -1056,9 +1075,6 @@ uninstall-info: uninstall-info-recursive +@@ -1246,9 +1265,6 @@ uninstall-info: uninstall-info-recursive #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static @@ -217,7 +217,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ messages: rc.cpp $(EXTRACTRC) *.rc */*.rc >> rc.cpp $(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp -@@ -1079,23 +1095,13 @@ uninstall-local: +@@ -1269,23 +1285,13 @@ uninstall-local: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -246,7 +246,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ #>+ 3 delayedinitializer.moc: $(srcdir)/delayedinitializer.h -@@ -1106,40 +1112,50 @@ konq_mainwindow.moc: $(srcdir)/konq_main +@@ -1296,40 +1302,50 @@ konq_mainwindow.moc: $(srcdir)/konq_main $(MOC) $(srcdir)/konq_mainwindow.h -o konq_mainwindow.moc #>+ 3 @@ -315,7 +315,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ #>+ 6 clean-idl: -@@ -1159,33 +1175,33 @@ force-reedit: +@@ -1349,33 +1365,33 @@ force-reedit: #>+ 11 @@ -362,7 +362,7 @@ $NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1195,25 +1211,25 @@ kde-rpo-clean: +@@ -1385,25 +1401,25 @@ kde-rpo-clean: -rm -f *.rpo #>+ 23 diff --git a/x11/kdebase3/patches/patch-cj b/x11/kdebase3/patches/patch-cj index a654ead5b7c..530bc6a2b74 100644 --- a/x11/kdebase3/patches/patch-cj +++ b/x11/kdebase3/patches/patch-cj @@ -1,8 +1,8 @@ -$NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ +$NetBSD: patch-cj,v 1.5 2003/05/22 02:42:50 markd Exp $ ---- konqueror/client/Makefile.in.orig Fri Jan 17 09:03:09 2003 +--- konqueror/client/Makefile.in.orig Tue May 13 23:07:59 2003 +++ konqueror/client/Makefile.in -@@ -287,14 +287,18 @@ x_libraries = @x_libraries@ +@@ -423,14 +423,18 @@ x_libraries = @x_libraries@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII bin_PROGRAMS = kfmclient @@ -26,7 +26,7 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ noinst_HEADERS = kfmclient.h #>- METASOURCES = AUTO -@@ -302,31 +306,36 @@ noinst_HEADERS = kfmclient.h +@@ -438,9 +442,9 @@ noinst_HEADERS = kfmclient.h KonquerorIface_DIR = $(srcdir)/.. KDesktopIface_DIR = $(top_srcdir)/kdesktop @@ -36,8 +36,9 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ -kfmclient_LDADD = kfmclient.la +kfmclient_LDADD = libkfmclient_main.la subdir = konqueror/client + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h +@@ -448,30 +452,41 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -72,10 +73,7 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ +kfmclient_OBJECTS = kfmclient_main.$(OBJEXT) +kfmclient_DEPENDENCIES = libkfmclient_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -335,10 +344,16 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kfmclient.Plo @@ -95,10 +93,10 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -359,11 +374,12 @@ CXXLD = $(CXX) +@@ -491,11 +506,12 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES) +DIST_SOURCES = $(kfmclient_la_SOURCES) $(libkfmclient_main_la_SOURCES) \ + $(kfmclient_SOURCES) @@ -110,7 +108,7 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ #>- all: all-am #>+ 1 -@@ -410,6 +426,8 @@ clean-libLTLIBRARIES: +@@ -542,6 +558,8 @@ clean-libLTLIBRARIES: done kfmclient.la: $(kfmclient_la_OBJECTS) $(kfmclient_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kfmclient_la_LDFLAGS) $(kfmclient_la_OBJECTS) $(kfmclient_la_LIBADD) $(LIBS) @@ -119,7 +117,7 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -449,8 +467,9 @@ mostlyclean-compile: +@@ -581,8 +599,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -130,8 +128,8 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -637,15 +656,16 @@ uninstall-am: uninstall-binPROGRAMS unin - uninstall-info-am uninstall-libLTLIBRARIES +@@ -816,15 +835,16 @@ uninstall-am: uninstall-binPROGRAMS unin + uninstall-libLTLIBRARIES -dummy.cc: @@ -150,7 +148,7 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ #>+ 9 KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) -@@ -657,10 +677,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl +@@ -836,10 +856,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-skel KDesktopIface.kidl #>+ 3 @@ -161,7 +159,7 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ clean-metasources: -rm -f kfmclient.moc -@@ -681,33 +697,33 @@ force-reedit: +@@ -860,33 +876,33 @@ force-reedit: #>+ 11 @@ -208,7 +206,7 @@ $NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -717,8 +733,8 @@ kde-rpo-clean: +@@ -896,8 +912,8 @@ kde-rpo-clean: -rm -f *.rpo #>+ 6 diff --git a/x11/kdebase3/patches/patch-cn b/x11/kdebase3/patches/patch-cn index a483f8cb4ec..5347bdca508 100644 --- a/x11/kdebase3/patches/patch-cn +++ b/x11/kdebase3/patches/patch-cn @@ -1,8 +1,8 @@ -$NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ +$NetBSD: patch-cn,v 1.5 2003/05/22 02:42:50 markd Exp $ ---- konqueror/keditbookmarks/Makefile.in.orig Fri Jan 17 09:03:09 2003 +--- konqueror/keditbookmarks/Makefile.in.orig Tue May 13 23:07:59 2003 +++ konqueror/keditbookmarks/Makefile.in -@@ -288,20 +288,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all +@@ -424,20 +424,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all #>- METASOURCES = AUTO @@ -33,7 +33,7 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ keditbookmarks_LDFLAGS = $(all_libraries) rcdir = $(kde_datadir)/keditbookmarks -@@ -314,24 +318,31 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -451,37 +455,50 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -74,10 +74,7 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ +keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT) +keditbookmarks_DEPENDENCIES = libkeditbookmarks_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -340,15 +351,21 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commands.Plo ./$(DEPDIR)/dummy.Po \ @@ -102,10 +99,10 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -370,11 +387,12 @@ CXXLD = $(CXX) +@@ -502,11 +519,12 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) +DIST_SOURCES = $(keditbookmarks_la_SOURCES) \ + $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_SOURCES) @@ -117,7 +114,7 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ #>- all: all-am #>+ 1 -@@ -421,6 +439,8 @@ clean-libLTLIBRARIES: +@@ -553,6 +571,8 @@ clean-libLTLIBRARIES: done keditbookmarks.la: $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(keditbookmarks_la_LDFLAGS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_LIBADD) $(LIBS) @@ -126,7 +123,7 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -461,9 +481,10 @@ distclean-compile: +@@ -593,9 +613,10 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Plo@am__quote@ @@ -138,8 +135,8 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toplevel.Plo@am__quote@ -@@ -554,7 +575,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -718,7 +739,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=toplevel.h cr48-app-keditbookmarks.png cr128-app-keditbookmarks.png cr32-app-keditbookmarks.png uninstall.desktop cr64-app-keditbookmarks.png keditbookmarksui.rc favicons.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h @@ -147,7 +144,7 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -681,9 +702,6 @@ uninstall-am: uninstall-kde-icons unins +@@ -859,9 +880,6 @@ uninstall-am: uninstall-kde-icons unins uninstall-libLTLIBRARIES uninstall-rcDATA @@ -157,7 +154,7 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ install-data-local: uninstall.desktop $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Internet $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Internet/keditbookmarks.desktop -@@ -691,27 +709,27 @@ install-data-local: uninstall.desktop +@@ -869,27 +887,27 @@ install-data-local: uninstall.desktop # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -195,7 +192,7 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ #>+ 4 clean-idl: -@@ -749,33 +767,33 @@ force-reedit: +@@ -927,33 +945,33 @@ force-reedit: #>+ 11 @@ -242,7 +239,7 @@ $NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -785,9 +803,9 @@ kde-rpo-clean: +@@ -963,9 +981,9 @@ kde-rpo-clean: -rm -f *.rpo #>+ 7 diff --git a/x11/kdebase3/patches/patch-cs b/x11/kdebase3/patches/patch-cs index 1c344fa1404..63b58e7573e 100644 --- a/x11/kdebase3/patches/patch-cs +++ b/x11/kdebase3/patches/patch-cs @@ -1,6 +1,6 @@ -$NetBSD: patch-cs,v 1.4 2003/03/11 13:10:24 markd Exp $ +$NetBSD: patch-cs,v 1.5 2003/05/22 02:42:50 markd Exp $ ---- konsole/konsole/Makefile.am.orig Fri Jan 3 17:43:59 2003 +--- konsole/konsole/Makefile.am.orig Wed May 7 23:44:16 2003 +++ konsole/konsole/Makefile.am @@ -12,7 +12,7 @@ INCLUDES = -I. $(all_includes) @@ -29,7 +29,7 @@ $NetBSD: patch-cs,v 1.4 2003/03/11 13:10:24 markd Exp $ -kwrited_SOURCES = dummy.cpp -kwrited_LDADD = kwrited.la +kwrited_SOURCES = kwrited_main.cpp -+kwrited_LDADD = libkwrited_main.la ++kwrited_LDADD = libkwrited_main.la kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@ -39,16 +39,16 @@ $NetBSD: patch-cs,v 1.4 2003/03/11 13:10:24 markd Exp $ TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp +libkonsole_main_la_LDFLAGS = $(all_libraries) -+libkonsole_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) ++libkonsole_main_la_LIBADD = $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB) + +konsole_la_SOURCES = konsole_main.cpp konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version --konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) +-konsole_la_LIBADD = $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB) +konsole_la_LIBADD = libkonsole_main.la # konsole executable -konsole_SOURCES = dummy.cpp --konsole_LDADD = konsole.la $(LIB_KIO) +-konsole_LDADD = konsole.la $(LIB_KDEPRINT) +konsole_SOURCES = konsole_main.cpp +konsole_LDADD = libkonsole_main.la konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct index 6c4ad5e9417..00aee26b456 100644 --- a/x11/kdebase3/patches/patch-ct +++ b/x11/kdebase3/patches/patch-ct @@ -1,8 +1,8 @@ -$NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ +$NetBSD: patch-ct,v 1.6 2003/05/22 02:42:51 markd Exp $ ---- konsole/konsole/Makefile.in.orig Fri Jan 17 09:03:10 2003 +--- konsole/konsole/Makefile.in.orig Tue May 13 23:08:00 2003 +++ konsole/konsole/Makefile.in -@@ -301,7 +301,7 @@ INCLUDES = -I. $(all_includes) +@@ -437,7 +437,7 @@ INCLUDES = -I. $(all_includes) # you can add here more. This one gets installed bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole @@ -11,7 +11,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ # libkonsolepart is a part, but konsole.la links directly to it, so we can't -@@ -336,30 +336,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar +@@ -472,30 +472,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS) # kwrited kdeinit module @@ -29,7 +29,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ -kwrited_SOURCES = dummy.cpp -kwrited_LDADD = kwrited.la +kwrited_SOURCES = kwrited_main.cpp -+kwrited_LDADD = libkwrited_main.la ++kwrited_LDADD = libkwrited_main.la kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) # konsole kdeinit module @@ -44,22 +44,22 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp +libkonsole_main_la_LDFLAGS = $(all_libraries) -+libkonsole_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) ++libkonsole_main_la_LIBADD = $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB) + +konsole_la_SOURCES = konsole_main.cpp konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version --konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) +-konsole_la_LIBADD = $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB) +konsole_la_LIBADD = libkonsole_main.la # konsole executable -konsole_SOURCES = dummy.cpp --konsole_LDADD = konsole.la $(LIB_KIO) +-konsole_LDADD = konsole.la $(LIB_KDEPRINT) +konsole_SOURCES = konsole_main.cpp +konsole_LDADD = libkonsole_main.la konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -394,27 +402,32 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -531,27 +539,32 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -110,7 +110,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ libkonsolepart_la_DEPENDENCIES = am_libkonsolepart_la_OBJECTS = TEPty.lo BlockArray.lo konsole_part.lo \ schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \ -@@ -427,25 +440,30 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt +@@ -564,25 +577,30 @@ 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) @@ -145,9 +145,9 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ +kwrited_OBJECTS = kwrited_main.$(OBJEXT) +kwrited_DEPENDENCIES = libkwrited_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -458,44 +476,56 @@ am__depfiles_maybe = depfiles + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +@@ -591,44 +609,56 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/TEHistory.Plo ./$(DEPDIR)/TEPty.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/TEScreen.Plo ./$(DEPDIR)/TEWidget.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/TEmuVt102.Plo \ @@ -215,9 +215,9 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/schema.Plo ./$(DEPDIR)/session.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -526,14 +556,15 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -657,14 +687,15 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) \ - $(libkonsolepart_la_SOURCES) $(konsole_SOURCES) \ + $(libkonsole_main_la_SOURCES) $(libkonsolepart_la_SOURCES) \ @@ -233,7 +233,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ #>- all: all-am #>+ 1 -@@ -610,11 +641,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons +@@ -741,11 +772,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) @@ -249,7 +249,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -667,16 +702,19 @@ distclean-compile: +@@ -798,16 +833,19 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEWidget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEmuVt102.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEmulation.Plo@am__quote@ @@ -270,16 +270,16 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/schema.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Plo@am__quote@ -@@ -805,7 +843,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -982,7 +1020,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=x-konsole.desktop sessioniface.h TEScreen.cpp MakeDefaults konsole_part.h konsolebookmarkmenu.cpp TEmulation.cpp konsole_child.cpp keytrans.cpp konsolerc konsoleiface.h konsolebookmarkhandler.cpp TEHistory.cpp konsole_wcwidth.cpp -+KDE_DIST=keytrans.cpp konsoleiface.h konsole_part.h konsolebookmarkmenu.cpp konsole_wcwidth.cpp x-konsole.desktop konsolerc konsole_child.cpp sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp konsolebookmarkhandler.cpp +-KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults konsole_part.h konsolerc konsoleiface.h ++KDE_DIST=konsoleiface.h konsole_part.h x-konsole.desktop konsolerc sessioniface.h MakeDefaults DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -962,50 +1000,37 @@ messages: rc.cpp +@@ -1154,50 +1192,37 @@ messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot rm -f schemas.cpp rm -f tips.cpp @@ -342,7 +342,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ #>+ 3 session.moc: $(srcdir)/session.h -@@ -1016,12 +1041,22 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h +@@ -1208,12 +1233,22 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc #>+ 3 @@ -369,7 +369,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ #>+ 8 libkonsolepart.la.closure: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) -@@ -1034,7 +1069,7 @@ libkonsolepart.la.closure: $(libkonsolep +@@ -1226,7 +1261,7 @@ libkonsolepart.la.closure: $(libkonsolep #>+ 3 clean-metasources: @@ -378,7 +378,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ #>+ 7 clean-idl: -@@ -1059,19 +1094,19 @@ force-reedit: +@@ -1251,19 +1286,19 @@ force-reedit: #>+ 11 @@ -407,7 +407,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ @echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \ rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \ -@@ -1084,20 +1119,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) +@@ -1276,20 +1311,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) #>+ 3 clean-final: @@ -433,7 +433,7 @@ $NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1107,25 +1142,25 @@ kde-rpo-clean: +@@ -1299,25 +1334,25 @@ kde-rpo-clean: -rm -f *.rpo #>+ 23 diff --git a/x11/kdebase3/patches/patch-cz b/x11/kdebase3/patches/patch-cz index 61488de4f1d..4fbcbe0a891 100644 --- a/x11/kdebase3/patches/patch-cz +++ b/x11/kdebase3/patches/patch-cz @@ -1,8 +1,8 @@ -$NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ +$NetBSD: patch-cz,v 1.5 2003/05/22 02:42:51 markd Exp $ ---- ksmserver/Makefile.in.orig Fri Jan 17 09:03:10 2003 +--- ksmserver/Makefile.in.orig Tue May 13 23:08:01 2003 +++ ksmserver/Makefile.in -@@ -307,20 +307,23 @@ SUBDIRS = . +@@ -443,20 +443,23 @@ SUBDIRS = . INCLUDES = $(all_includes) bin_PROGRAMS = ksmserver @@ -32,7 +32,7 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ picsdir = $(kde_datadir)/ksmserver/pics pics_DATA = shutdownkonq.png -@@ -338,23 +341,28 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -475,23 +478,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -70,8 +70,8 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ am_testsh_OBJECTS = test.$(OBJEXT) #>- testsh_OBJECTS = $(am_testsh_OBJECTS) #>+ 1 -@@ -368,14 +376,17 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ +@@ -501,14 +509,17 @@ testsh_DEPENDENCIES = shutdown.lo + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/main.Plo \ @@ -92,10 +92,10 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/server.Plo ./$(DEPDIR)/shutdown.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test.Po -@@ -398,8 +409,8 @@ CXXLD = $(CXX) +@@ -530,8 +541,8 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(ksmserver_la_SOURCES) $(ksmserver_SOURCES) \ - $(testsh_SOURCES) +DIST_SOURCES = $(ksmserver_la_SOURCES) $(libksmserver_main_la_SOURCES) \ @@ -103,8 +103,8 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ DATA = $(pics_DATA) $(update_DATA) HEADERS = $(noinst_HEADERS) -@@ -411,7 +422,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - uninstall-recursive check-recursive installcheck-recursive +@@ -544,7 +555,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(ksmserver_la_SOURCES) $(ksmserver_SOURCES) $(testsh_SOURCES) @@ -112,7 +112,7 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -458,6 +469,8 @@ clean-libLTLIBRARIES: +@@ -591,6 +602,8 @@ clean-libLTLIBRARIES: done ksmserver.la: $(ksmserver_la_OBJECTS) $(ksmserver_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(ksmserver_la_LDFLAGS) $(ksmserver_la_OBJECTS) $(ksmserver_la_LIBADD) $(LIBS) @@ -121,7 +121,7 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -500,7 +513,8 @@ mostlyclean-compile: +@@ -633,7 +646,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -131,8 +131,8 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd 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@ -@@ -671,7 +685,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -846,7 +860,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=move_session_config.sh shutdownkonq.png ksmserver.upd LICENSE KSMServerInterface.h configure.in.in @@ -140,7 +140,7 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -817,30 +831,27 @@ uninstall-info: uninstall-info-recursive +@@ -1007,30 +1021,27 @@ uninstall-info: uninstall-info-recursive messages: $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot @@ -180,7 +180,7 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ #>+ 4 clean-idl: -@@ -858,33 +869,33 @@ force-reedit: +@@ -1048,33 +1059,33 @@ force-reedit: #>+ 11 @@ -227,7 +227,7 @@ $NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -894,7 +905,7 @@ kde-rpo-clean: +@@ -1084,7 +1095,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdebase3/patches/patch-dh b/x11/kdebase3/patches/patch-dh index acc1847227c..f2b11e3cfa3 100644 --- a/x11/kdebase3/patches/patch-dh +++ b/x11/kdebase3/patches/patch-dh @@ -1,8 +1,8 @@ -$NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ +$NetBSD: patch-dh,v 1.5 2003/05/22 02:42:51 markd Exp $ ---- kwin/Makefile.in.orig Fri Jan 17 09:03:11 2003 +--- kwin/Makefile.in.orig Tue May 13 23:08:02 2003 +++ kwin/Makefile.in -@@ -290,18 +290,22 @@ INCLUDES = $(all_includes) +@@ -426,18 +426,22 @@ INCLUDES = $(all_includes) SUBDIRS = . kcmkwin pics clients bin_PROGRAMS = kwin @@ -29,7 +29,7 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h -@@ -310,7 +314,7 @@ kwinincludedir = $(includedir)/kwin +@@ -446,7 +450,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.4 2003/03/11 13:10:27 markd Exp $ kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) KDE_ICON = kwin -@@ -321,7 +325,6 @@ data_DATA = eventsrc +@@ -457,7 +461,6 @@ data_DATA = eventsrc sounddir = $(kde_sounddir) sound_DATA = pop.wav @@ -46,7 +46,7 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ update_DATA = kwin.upd pluginlibFix.pl updatedir = $(kde_datadir)/kconf_update subdir = kwin -@@ -330,18 +333,23 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -467,18 +470,23 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -77,16 +77,15 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ bin_PROGRAMS = kwin$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -349,7 +357,7 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) +@@ -486,33 +494,33 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) #>- kwin_OBJECTS = $(am_kwin_OBJECTS) #>+ 1 kwin_OBJECTS = kwin_main.$(OBJEXT) -kwin_DEPENDENCIES = kwin.la +kwin_DEPENDENCIES = libkwin.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -360,26 +368,26 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/events.Plo ./$(DEPDIR)/killwindow.Plo \ @@ -129,16 +128,16 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -400,7 +408,7 @@ CXXLD = $(CXX) +@@ -532,7 +540,7 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) +DIST_SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES) DATA = $(data_DATA) $(sound_DATA) $(update_DATA) HEADERS = $(include_HEADERS) $(kwininclude_HEADERS) -@@ -413,7 +421,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -546,7 +554,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \ Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -147,7 +146,7 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -460,6 +468,8 @@ clean-libLTLIBRARIES: +@@ -593,6 +601,8 @@ clean-libLTLIBRARIES: done kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) @@ -156,7 +155,7 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -503,6 +513,7 @@ distclean-compile: +@@ -636,6 +646,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@ @@ -164,16 +163,16 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd 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@ -@@ -732,7 +743,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -907,7 +918,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h cr32-app-kwin.png eventsrc atoms.h main.h killwindow.cpp kwin.upd pop.wav plugins.cpp cr16-app-kwin.png pluginlibFix.pl tabbox.cpp placement.h plugins.h events.h kwinbindings.cpp LICENSE popupinfo.h options.cpp popupinfo.cpp kwinbutton.cpp cr48-app-kwin.png tabbox.h events.cpp -+KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h placement.h options.cpp LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h popupinfo.cpp events.h cr16-app-kwin.png atoms.h killwindow.cpp tabbox.cpp eventsrc +-KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h cr32-app-kwin.png eventsrc atoms.h main.h kwin.upd pop.wav cr16-app-kwin.png pluginlibFix.pl placement.h plugins.h events.h kwinbindings.cpp LICENSE popupinfo.h cr48-app-kwin.png tabbox.h ++KDE_DIST=pluginlibFix.pl kwin.upd plugins.h placement.h LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h cr16-app-kwin.png atoms.h eventsrc DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -895,25 +906,15 @@ messages: +@@ -1085,25 +1096,15 @@ messages: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -202,7 +201,7 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ options.moc: $(srcdir)/options.h $(MOC) $(srcdir)/options.h -o options.moc -@@ -930,8 +931,18 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h +@@ -1120,8 +1121,18 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h $(MOC) $(srcdir)/kwinbutton.h -o kwinbutton.moc #>+ 3 @@ -222,7 +221,7 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ #>+ 4 clean-idl: -@@ -963,33 +974,33 @@ force-reedit: +@@ -1153,33 +1164,33 @@ force-reedit: #>+ 11 @@ -269,7 +268,7 @@ $NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -999,17 +1010,17 @@ kde-rpo-clean: +@@ -1189,17 +1200,17 @@ kde-rpo-clean: -rm -f *.rpo #>+ 15 diff --git a/x11/kdebase3/patches/patch-dj b/x11/kdebase3/patches/patch-dj index 02ec26fc5ef..04aeb903f8f 100644 --- a/x11/kdebase3/patches/patch-dj +++ b/x11/kdebase3/patches/patch-dj @@ -1,8 +1,8 @@ -$NetBSD: patch-dj,v 1.4 2003/03/11 13:10:27 markd Exp $ +$NetBSD: patch-dj,v 1.5 2003/05/22 02:42:51 markd Exp $ ---- kwin/clients/b2/Makefile.in.orig Fri Jan 17 09:03:11 2003 +--- kwin/clients/b2/Makefile.in.orig Tue May 13 23:08:02 2003 +++ kwin/clients/b2/Makefile.in -@@ -292,7 +292,7 @@ SUBDIRS = . config +@@ -428,7 +428,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin_b2.la kwin_b2_la_SOURCES = b2client.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dj,v 1.4 2003/03/11 13:10:27 markd Exp $ kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -308,7 +308,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -445,7 +445,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,8 +20,8 @@ $NetBSD: patch-dj,v 1.4 2003/03/11 13:10:27 markd Exp $ am_kwin_b2_la_OBJECTS = b2client.lo #>- kwin_b2_la_OBJECTS = $(am_kwin_b2_la_OBJECTS) #>+ 1 -@@ -562,7 +562,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -737,7 +737,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=bitmaps.h b2.desktop diff --git a/x11/kdebase3/patches/patch-dp b/x11/kdebase3/patches/patch-dp index 12d1d31fe5d..3156e717a82 100644 --- a/x11/kdebase3/patches/patch-dp +++ b/x11/kdebase3/patches/patch-dp @@ -1,8 +1,8 @@ -$NetBSD: patch-dp,v 1.4 2003/03/11 13:10:27 markd Exp $ +$NetBSD: patch-dp,v 1.5 2003/05/22 02:42:51 markd Exp $ ---- kwin/clients/kde1/Makefile.in.orig Fri Jan 17 09:03:11 2003 +--- kwin/clients/kde1/Makefile.in.orig Tue May 13 23:08:02 2003 +++ kwin/clients/kde1/Makefile.in -@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) +@@ -426,7 +426,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.4 2003/03/11 13:10:27 markd Exp $ kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -305,7 +305,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -442,7 +442,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,8 +20,8 @@ $NetBSD: patch-dp,v 1.4 2003/03/11 13:10:27 markd Exp $ am_kwin_kde1_la_OBJECTS = kde1client.lo #>- kwin_kde1_la_OBJECTS = $(am_kwin_kde1_la_OBJECTS) #>+ 1 -@@ -493,7 +493,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -657,7 +657,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kde1.desktop kde1client_bitmaps.h @@ -29,7 +29,7 @@ $NetBSD: patch-dp,v 1.4 2003/03/11 13:10:27 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -671,5 +671,5 @@ kde-rpo-clean: +@@ -849,5 +849,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-dx b/x11/kdebase3/patches/patch-dx index 34acff2119d..2aa254b120a 100644 --- a/x11/kdebase3/patches/patch-dx +++ b/x11/kdebase3/patches/patch-dx @@ -1,8 +1,8 @@ -$NetBSD: patch-dx,v 1.4 2003/03/11 13:10:28 markd Exp $ +$NetBSD: patch-dx,v 1.5 2003/05/22 02:42:51 markd Exp $ ---- kwin/clients/modernsystem/Makefile.in.orig Fri Jan 17 09:03:12 2003 +--- kwin/clients/modernsystem/Makefile.in.orig Tue May 13 23:08:02 2003 +++ kwin/clients/modernsystem/Makefile.in -@@ -294,7 +294,7 @@ SUBDIRS = config +@@ -430,7 +430,7 @@ SUBDIRS = config kde_module_LTLIBRARIES = kwin_modernsys.la kwin_modernsys_la_SOURCES = modernsys.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dx,v 1.4 2003/03/11 13:10:28 markd Exp $ kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -310,7 +310,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -447,7 +447,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,8 +20,8 @@ $NetBSD: patch-dx,v 1.4 2003/03/11 13:10:28 markd Exp $ am_kwin_modernsys_la_OBJECTS = modernsys.lo #>- kwin_modernsys_la_OBJECTS = $(am_kwin_modernsys_la_OBJECTS) #>+ 1 -@@ -564,7 +564,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -739,7 +739,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=modernsystem.desktop btnhighcolor.h buttondata.h @@ -29,7 +29,7 @@ $NetBSD: patch-dx,v 1.4 2003/03/11 13:10:28 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -762,5 +762,5 @@ kde-rpo-clean: +@@ -953,5 +953,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej index fea62443f49..c49e1e1a9d4 100644 --- a/x11/kdebase3/patches/patch-ej +++ b/x11/kdebase3/patches/patch-ej @@ -1,8 +1,8 @@ -$NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ +$NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ ---- kxkb/Makefile.in.orig Fri Jan 17 09:03:12 2003 +--- kxkb/Makefile.in.orig Tue May 13 23:08:03 2003 +++ kxkb/Makefile.in -@@ -293,11 +293,11 @@ KDE_OPTIONS = nofinal +@@ -429,11 +429,11 @@ KDE_OPTIONS = nofinal bin_PROGRAMS = kxkb @@ -17,7 +17,7 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ kde_module_LTLIBRARIES = kcm_keyboard.la #>- kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp kcmmiscwidget.ui -@@ -306,9 +306,13 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay +@@ -442,9 +442,13 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile @@ -33,7 +33,7 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ data_DATA = keyboard.desktop data2_DATA = keyboard_layout.desktop -@@ -327,19 +331,24 @@ am_kcm_keyboard_la_OBJECTS = rules.lo kc +@@ -464,31 +468,38 @@ am_kcm_keyboard_la_OBJECTS = rules.lo kc #>- kcm_keyboard_la_OBJECTS = $(am_kcm_keyboard_la_OBJECTS) #>+ 1 kcm_keyboard_la_OBJECTS = rules.lo kcmlayout.lo pixmap.lo kcmmisc.lo kcmmiscwidget.lo @@ -62,10 +62,7 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ +kxkb_OBJECTS = kxkb_main.$(OBJEXT) +kxkb_DEPENDENCIES = libkxkb_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -348,14 +357,16 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/extension.Plo \ @@ -86,17 +83,17 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/rules.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -378,7 +389,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -510,7 +521,7 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) \ - $(kxkb_SOURCES) + $(libkxkb_main_la_SOURCES) $(kxkb_SOURCES) DATA = $(data_DATA) $(data2_DATA) $(services_DATA) -@@ -388,7 +399,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - uninstall-recursive check-recursive installcheck-recursive +@@ -521,7 +532,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES) @@ -104,7 +101,7 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -468,6 +479,8 @@ clean-libLTLIBRARIES: +@@ -601,6 +612,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) @@ -113,7 +110,7 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -507,11 +520,12 @@ mostlyclean-compile: +@@ -640,11 +653,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -127,8 +124,8 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixmap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rules.Plo@am__quote@ -@@ -698,7 +712,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -873,7 +887,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=extension.h rules.h keyboard.desktop pixmap.h kcmmisc.h uninstall.desktop kxkb.h kxkbbindings.cpp keyboard_layout.desktop LICENSE kcmlayout.h configure.in.in kcmmiscwidget.ui kxkb.desktop @@ -136,7 +133,7 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -859,9 +873,6 @@ install-data-local: uninstall.desktop +@@ -1049,9 +1063,6 @@ install-data-local: uninstall.desktop messages: rc.cpp $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot $(XGETTEXT) rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp rc.cpp kxkbbindings.cpp -o $(podir)/kcmlayout.pot @@ -146,7 +143,7 @@ $NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd 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: -@@ -946,13 +957,13 @@ kde-rpo-clean: +@@ -1136,13 +1147,13 @@ kde-rpo-clean: -rm -f *.rpo #>+ 11 diff --git a/x11/kdebase3/patches/patch-eq b/x11/kdebase3/patches/patch-eq index cd5ee20e03e..b1da69311d5 100644 --- a/x11/kdebase3/patches/patch-eq +++ b/x11/kdebase3/patches/patch-eq @@ -1,8 +1,8 @@ -$NetBSD: patch-eq,v 1.5 2003/03/11 13:10:29 markd Exp $ +$NetBSD: patch-eq,v 1.6 2003/05/22 02:42:52 markd Exp $ ---- legacyimport/Makefile.in.orig Fri Jan 17 09:03:12 2003 +--- legacyimport/Makefile.in.orig Tue May 13 23:08:03 2003 +++ legacyimport/Makefile.in -@@ -287,14 +287,18 @@ x_libraries = @x_libraries@ +@@ -423,14 +423,18 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = klegacyimport @@ -26,7 +26,7 @@ $NetBSD: patch-eq,v 1.5 2003/03/11 13:10:29 markd Exp $ klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = legacyimport.h -@@ -310,19 +314,25 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -447,27 +451,35 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -56,10 +56,7 @@ $NetBSD: patch-eq,v 1.5 2003/03/11 13:10:29 markd Exp $ +klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT) +klegacyimport_DEPENDENCIES = libklegacyimport_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -331,10 +341,12 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ @@ -74,10 +71,10 @@ $NetBSD: patch-eq,v 1.5 2003/03/11 13:10:29 markd Exp $ @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/legacyimport.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -356,13 +368,14 @@ CXXLD = $(CXX) +@@ -488,13 +500,14 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES) +DIST_SOURCES = $(klegacyimport_la_SOURCES) \ + $(libklegacyimport_main_la_SOURCES) $(klegacyimport_SOURCES) @@ -91,7 +88,7 @@ $NetBSD: patch-eq,v 1.5 2003/03/11 13:10:29 markd Exp $ #>- all: all-am #>+ 1 -@@ -409,6 +422,8 @@ clean-libLTLIBRARIES: +@@ -541,6 +554,8 @@ clean-libLTLIBRARIES: done klegacyimport.la: $(klegacyimport_la_OBJECTS) $(klegacyimport_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(klegacyimport_la_LDFLAGS) $(klegacyimport_la_OBJECTS) $(klegacyimport_la_LIBADD) $(LIBS) @@ -100,7 +97,7 @@ $NetBSD: patch-eq,v 1.5 2003/03/11 13:10:29 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -448,7 +463,8 @@ mostlyclean-compile: +@@ -580,7 +595,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -110,16 +107,16 @@ $NetBSD: patch-eq,v 1.5 2003/03/11 13:10:29 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legacyimport.Plo@am__quote@ distclean-depend: -@@ -538,7 +554,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -702,7 +718,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=configure.in.in klegacyimport.desktop -+KDE_DIST=Makefile.am.rej klegacyimport.desktop configure.in.in dummy.cpp ++KDE_DIST=klegacyimport.desktop configure.in.in dummy.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -705,5 +721,5 @@ kde-rpo-clean: +@@ -883,5 +899,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-et b/x11/kdebase3/patches/patch-et index 7e934349f5e..cc22099fbf6 100644 --- a/x11/kdebase3/patches/patch-et +++ b/x11/kdebase3/patches/patch-et @@ -1,8 +1,8 @@ -$NetBSD: patch-et,v 1.4 2003/03/11 13:10:30 markd Exp $ +$NetBSD: patch-et,v 1.5 2003/05/22 02:42:52 markd Exp $ ---- kwin/clients/keramik/Makefile.in.orig Fri Jan 17 09:03:11 2003 +--- kwin/clients/keramik/Makefile.in.orig Tue May 13 23:08:02 2003 +++ kwin/clients/keramik/Makefile.in -@@ -299,7 +299,7 @@ embedtool_LDFLAGS = $(all_libraries) $(K +@@ -435,7 +435,7 @@ embedtool_LDFLAGS = $(all_libraries) $(K kde_module_LTLIBRARIES = kwin_keramik.la kwin_keramik_la_SOURCES = keramik.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-et,v 1.4 2003/03/11 13:10:30 markd Exp $ kwin_keramik_la_COMPILE_FIRST = tiles.h kwin_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -@@ -316,7 +316,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -453,7 +453,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,8 +20,8 @@ $NetBSD: patch-et,v 1.4 2003/03/11 13:10:30 markd Exp $ am_kwin_keramik_la_OBJECTS = keramik.lo #>- kwin_keramik_la_OBJECTS = $(am_kwin_keramik_la_OBJECTS) #>+ 1 -@@ -589,7 +589,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -764,7 +764,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=keramik.h keramik.desktop configure.in.in diff --git a/x11/kdebase3/patches/patch-ey b/x11/kdebase3/patches/patch-ey deleted file mode 100644 index 6f606522d8b..00000000000 --- a/x11/kdebase3/patches/patch-ey +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ey,v 1.1 2003/04/10 13:13:24 markd Exp $ - ---- kioslave/thumbnail/gscreator.cpp.orig Fri Dec 6 09:40:47 2002 -+++ kioslave/thumbnail/gscreator.cpp -@@ -59,6 +59,8 @@ static const char *gsargs[] = { - "gs", - "-sDEVICE=png16m", - "-sOutputFile=-", -+ "-dSAFER", -+ "-dPARANOIDSAFER", - "-dNOPAUSE", - "-dFirstPage=1", - "-dLastPage=1", |