diff options
| author | skrll <skrll@pkgsrc.org> | 2001-12-03 15:37:14 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2001-12-03 15:37:14 +0000 |
| commit | a100f5d455f6eea6ce32708beef653a44b4d7824 (patch) | |
| tree | bfa138716839927c14f0e8332a5bfa57d9e3fb73 /x11/kdebase2 | |
| parent | 0ff798a7c8ba91a3e239f120f9506f5112ef7ce4 (diff) | |
| download | pkgsrc-a100f5d455f6eea6ce32708beef653a44b4d7824.tar.gz | |
Update to KDE 2.2.2
Closes pkg/14728 from Mark Davies <mark@mcs.vuw.ac.nz>. Changes from him
with updates from myself.
From www.kde.org... The principal improvements over KDE 2.2.1, release two
months ago, include:
o security-related
- SSL certificate loading
- symlink vulnerability in .wmrc access by KDM introduced in 2.2
- security problem with eFax (used by klprfax)
- potential problem in PAM invocation by KDM
- potential harmful side-effect of failed KDM session starts
o new features
- added support for CodeWeavers' CrossOver plug-in (provides support
for QuickTime, etc.)
- added support for the wheelmouse for scrolling through the
KGhostview PS/PDF viewer component
- ability to search for multiple patterns at a time in the file
search dialog
- debugging multi-threaded applications with KDevelop
o improvements/fixes
- handling of HTTP links that redirect to FTP
- POST using SSL through a proxy and sending headers through proxies
- saving of recently-selected files in the file dialog
- handling of non-ASCII characters over SMB
- toolbar button captions with certain styles
- selecting items with the mouse in Konqueror
- sorting in Konqueror's textview
- saving current settings as a theme in the theme manager
- crashes in KMail with certain mails
- crash on invoking the KDM chooser
- non-Latin languages with KDevelop
performance
- icon loading optimized
- file dialog speedups
- stop spinning SMB client processes
- handling of large files in Kate
Diffstat (limited to 'x11/kdebase2')
50 files changed, 2694 insertions, 1642 deletions
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index d7d0711ec67..dad07da390c 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2001/11/22 04:27:47 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2001/12/03 15:37:18 skrll Exp $ -DISTNAME= kdebase-2.2.1 +DISTNAME= kdebase-2.2.2 CATEGORIES= x11 COMMENT= Base modules for the KDE 2 integrated X11 desktop @@ -55,6 +55,11 @@ PLIST_SRC+= ${PKGDIR}/PLIST ICONDIR= share/kde/icons +post-configure: + ln -s ../Linux/conf.c ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/conf.c + ln -s ../Linux/conf.h ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/conf.h + ln -s ../Linux/ksysguardd.h ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/ksysguardd.h + post-build: cd ${WRKSRC}; \ files="kioslave/info/kde-info2html.conf"; \ diff --git a/x11/kdebase2/PLIST b/x11/kdebase2/PLIST index 736e9d16061..63fc593b809 100644 --- a/x11/kdebase2/PLIST +++ b/x11/kdebase2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2001/11/16 05:07:14 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2001/12/03 15:37:18 skrll Exp $ bin/appletproxy bin/chooser bin/conttest @@ -291,8 +291,6 @@ lib/kde2/libkcm_kwinoptions.so lib/kde2/libkcm_launch.a lib/kde2/libkcm_launch.la lib/kde2/libkcm_launch.so -lib/kde2/libkcm_launch.so.0 -lib/kde2/libkcm_launch.so.0.0 lib/kde2/libkcm_locale.a lib/kde2/libkcm_locale.la lib/kde2/libkcm_locale.so @@ -378,8 +376,6 @@ lib/kde2/libkonqsidebartree_dirtree.so lib/kde2/libkonqsidebartree_history.a lib/kde2/libkonqsidebartree_history.la lib/kde2/libkonqsidebartree_history.so -lib/kde2/libkonqsidebartree_history.so.0 -lib/kde2/libkonqsidebartree_history.so.0.0 lib/kde2/libkonqsound.a lib/kde2/libkonqsound.la lib/kde2/libkonqsound.so @@ -1816,9 +1812,6 @@ share/kde/apps/konsole/konsole_part.rc share/kde/apps/konsole/linux.desktop share/kde/apps/konsole/linux.keytab share/kde/apps/konsole/mc.desktop -share/kde/apps/konsole/pics/brightness.png -share/kde/apps/konsole/pics/colourness.png -share/kde/apps/konsole/pics/contrast.png share/kde/apps/konsole/shell.desktop share/kde/apps/konsole/su.desktop share/kde/apps/konsole/sumc.desktop @@ -2422,6 +2415,8 @@ share/kde/locale/l10n/hr/entry.desktop share/kde/locale/l10n/hr/flag.png share/kde/locale/l10n/hu/entry.desktop share/kde/locale/l10n/hu/flag.png +share/kde/locale/l10n/id/entry.desktop +share/kde/locale/l10n/id/flag.png share/kde/locale/l10n/ie/entry.desktop share/kde/locale/l10n/ie/flag.png share/kde/locale/l10n/il/entry.desktop @@ -2740,6 +2735,7 @@ share/kde/wallpapers/vegetative_fog.jpg @dirrm share/kde/locale/l10n/is @dirrm share/kde/locale/l10n/il @dirrm share/kde/locale/l10n/ie +@dirrm share/kde/locale/l10n/id @dirrm share/kde/locale/l10n/hu @dirrm share/kde/locale/l10n/hr @dirrm share/kde/locale/l10n/hn @@ -2791,7 +2787,6 @@ share/kde/wallpapers/vegetative_fog.jpg @dirrm share/kde/apps/kscreensaver @dirrm share/kde/apps/kpersonalizer/pics @dirrm share/kde/apps/kpersonalizer -@dirrm share/kde/apps/konsole/pics @dirrm share/kde/apps/konsole @dirrm share/kde/apps/konqueror/tiles @dirrm share/kde/apps/konqueror/profiles diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo index 7b1baa178bb..b1fcd80f081 100644 --- a/x11/kdebase2/distinfo +++ b/x11/kdebase2/distinfo @@ -1,60 +1,60 @@ -$NetBSD: distinfo,v 1.14 2001/11/28 13:34:18 skrll Exp $ +$NetBSD: distinfo,v 1.15 2001/12/03 15:37:18 skrll Exp $ -SHA1 (kdebase-2.2.1.tar.bz2) = 5c3a300829fee66bfe26faea39112050fc4cd1e9 -Size (kdebase-2.2.1.tar.bz2) = 12696643 bytes +SHA1 (kdebase-2.2.2.tar.bz2) = dbbc8dec49b9bb15055ce43e1b4eafe6945463b0 +Size (kdebase-2.2.2.tar.bz2) = 12888455 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes -SHA1 (patch-aa) = 75df9bfa1f5447a056e7565a4658a17272f482a1 +SHA1 (patch-aa) = e630486f13824047326911aa046d9b08bbbdb6ff SHA1 (patch-ab) = b20193817a7d4e10dc84890e024e48f63fdcf889 -SHA1 (patch-ac) = 9a6326413006036df756dc4d7c90516c261948ff +SHA1 (patch-ac) = 9c2038386a23bc0d2fe8c3b3debf043319f6989e SHA1 (patch-ad) = 972b0cace3baacc5d7ea031065a391b43dd377e5 SHA1 (patch-ae) = 647a44a4f5db8c7ca44ca94e7f720eb18bd3285d SHA1 (patch-af) = d60a3d8f5fcc6ed0ebf71ff9aa7dbfb25cbbb3f5 SHA1 (patch-ag) = b5173768733b68e49028daa8c81b5c5cb9be70ff SHA1 (patch-ah) = 538abd3555bf93e1a477e3e3753f141199a70ec3 -SHA1 (patch-ai) = f4cc95a9383aff302c078fe5562eb4a61f14d4d1 +SHA1 (patch-ai) = 6e885ee27346be6739c1641856bf6ef7130ea9af SHA1 (patch-aj) = 9b9c94d0b70c6eb1166144ef0da6fa51405fd698 SHA1 (patch-ak) = b84ba03330ba49d8410237f3551a8331aa51c8e8 SHA1 (patch-al) = 0540bc48551547b2d749c5a3abce3f0511c04522 -SHA1 (patch-am) = c4031c4ae4e3059615e744c634857af7c8e9ceef +SHA1 (patch-am) = 0294870968b6c8ccc167ad84b9d6924e4de5d47f SHA1 (patch-an) = 5a87690d7b2ed6aa12bb6f06b452c8edac62ff0c SHA1 (patch-ao) = bfaa153d9e7429955def1b549647e5a56befb862 -SHA1 (patch-ap) = 9b2c20a744ac6b0e1166f26d77fa1beacf12f5b2 +SHA1 (patch-ap) = daef50b1acb53a63e747904e210a8f1f4d18143c SHA1 (patch-aq) = 41bc29852561d5dbc2b5d874f63e0f14ecde9677 SHA1 (patch-ar) = 65077f21078b47810238962fa97eae4278916f9d SHA1 (patch-as) = 60919f97d69070ed4cf92b57d9ba3af98cac17a1 SHA1 (patch-at) = a83ed07e5fb01ea1ac3b64f8550b84b1ceeb35dc -SHA1 (patch-au) = df8e81dfaae33e0a8371d1176d37ab64b26b4984 +SHA1 (patch-au) = 5caac81b24a19c4c04817fdb7ddb6410f62d984f SHA1 (patch-av) = c2e2777a0b9f25a3418e919121a8cb95c104425a SHA1 (patch-aw) = d510d135a475c5f3367e218a7b35cf3f81a92a04 SHA1 (patch-ax) = 67e65b516fec8d69fd24da2416c9392c5b8e0c19 -SHA1 (patch-ay) = 99da69fbe2e746d362ef3a9d37f93bfba1671502 +SHA1 (patch-ay) = 9bc38f27a3cbbf5749343bddf99914c954003e23 SHA1 (patch-az) = c0d3bd7de39f25e5aeb6c6b8a2f53ed6a723a51e -SHA1 (patch-ba) = e35ed891863c43c0d23c5039e46a66b45f225812 +SHA1 (patch-ba) = baf6d656d3c7bb9d89e222414b1e769470df75a3 SHA1 (patch-bb) = 3fdad176411aa555a98278e0770479cc0aa188e1 -SHA1 (patch-bc) = 355f23f7dcaded142c94c8ca039ccf922362e410 +SHA1 (patch-bc) = 4c8ce299a99b7f61be62697669f2b215578abb49 SHA1 (patch-bd) = 8e0436a500cc2b37098beac7413d8320310e8bb3 -SHA1 (patch-be) = 316ea71a9c2724f790f02a297c5029e556c027f9 +SHA1 (patch-be) = 4dc45743c3fdb046ab5bf1357c608c23dbc2592f SHA1 (patch-bf) = 2cace1983f5009e94e39eabbebfc261086ffe7bd SHA1 (patch-bg) = 4e708f50e2f0cd2f222ac0cb7d155caa929da99a SHA1 (patch-bh) = 0d0e023f793593653dc18d0391a6fcd336d75847 -SHA1 (patch-bi) = 837d0ba37494769d8122e95ce65d208cb07f40e9 +SHA1 (patch-bi) = 16de13cef7655b3b0bd3d19c9dec935cfc4b6b81 SHA1 (patch-bj) = 45e51ad6da60e2b38ccfecf61b75175b9e9858fb SHA1 (patch-bk) = cdb0cc50e498c101e47b689a31078f7f942dcb9c SHA1 (patch-bl) = dc3a589816c7c5681c09c9ef962178ff9e37409d -SHA1 (patch-bm) = 5675e1672697461011657b492f2ca18babcec3f6 +SHA1 (patch-bm) = f3391e9d958992cb8a2c7e6a562c2859b5661e65 SHA1 (patch-bn) = 93c8f8a3bb6aaf1a5c852eac73441ea868aacf98 SHA1 (patch-bo) = 3ed1b9b2bd2870c80aad7a0b39aee9ac3bdc9238 -SHA1 (patch-bp) = 704329e88e00d9ca817355bf06b83e21f2fdfb71 -SHA1 (patch-bq) = f731da49382e75a6302ac0c15608d48123e72068 +SHA1 (patch-bp) = b3434d3bb0c9dd9574cefd33dab4223fc0781e18 +SHA1 (patch-bq) = 1aa1e975850333b25ca8e8e7ce04a5a0d4518874 SHA1 (patch-br) = ccb960d5b9f43f70e17bde094ffa1b49f0d89d2b -SHA1 (patch-bs) = ce2eeeb511591fec68f96cf246c324debfd2690d +SHA1 (patch-bs) = 95a0c171ae38c3d156d78105772265ecf1564f26 SHA1 (patch-bt) = 19dad64a5f030d502116934618e62913318eb272 -SHA1 (patch-bu) = 27ebf1865fa59c2a3b7f6a72ee5127cb342705bb +SHA1 (patch-bu) = ef3fc303a8044c3d0bbfeee0ba4f2d2ec032c239 SHA1 (patch-bv) = a38c2aae13e3f5fd1f8934624bf8619fa58c0583 -SHA1 (patch-bw) = 8085afa89f26d1814d006321b060641f0e82a8c9 +SHA1 (patch-bw) = 5d0bb3a631b84ab59c521175034ead0b440fb809 SHA1 (patch-bx) = b17a1bf7eaf50274ae74c3b344b2e31a53d75472 SHA1 (patch-by) = 2f1c28c09d8fd2f5c1776222d4f1365c1920f3b5 SHA1 (patch-bz) = 9bbd80c748b2e2cd56c3c2c1cd336d712382c97a @@ -63,79 +63,80 @@ SHA1 (patch-cb) = b55ec33208f56ac784c5fce3b386f17f158f752c SHA1 (patch-cc) = eca19e5c3f0efbcb919a5c2d570079ea17c1ea58 SHA1 (patch-cd) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9 SHA1 (patch-ce) = 59abadb4bcd1b194dfab07ebf667afb0b85bcfc8 -SHA1 (patch-cf) = 88fe3064f75881f55227c90fbfb185672907f5bb +SHA1 (patch-cf) = f1cdafa3cc109ddeae15091493d179f19b6f1d38 SHA1 (patch-cg) = 909c29002c494c2d04dbb01fa6ab8c981e7ea349 SHA1 (patch-ch) = b8fb2688192c61778d79f8fbd1c4fb5fc3fe409d SHA1 (patch-ci) = 12e515c4517a59c3c5f529162ea66c44cbcdd69c -SHA1 (patch-cj) = 1c659b1cfeda7fa0610dfd6124cd49c763796479 +SHA1 (patch-cj) = 2625ce2fb6de8fd7dd465cef97b4ff36537c9d68 SHA1 (patch-ck) = 6af4e727203046c7fedda9a5870c37285849f85c SHA1 (patch-cl) = c4b36e0d27a719d99e8e154691c52a111944ccd4 SHA1 (patch-cm) = 1b6d0a49111a4e6dda4e262200c57e5a32e0ee4c -SHA1 (patch-cn) = 8f6c708f061d443a2cb6f26971bd8073e304bd68 +SHA1 (patch-cn) = a2c001d0fdcb0ddcda112319f2cd74494254c54c SHA1 (patch-co) = 07f5c0bfae64c180ce954c5eb07a7e425d98a9b2 -SHA1 (patch-cp) = ffed00158cc312d71ee6b090599282c2acf09385 +SHA1 (patch-cp) = 6098f80a53bf90ad3ac868a2d97168c4904efc04 SHA1 (patch-cq) = 6d8bd231a1d4cc7c1aaa679d55606d4920c01774 SHA1 (patch-cr) = 6597394593adf2c192bb1efda1ce6d90518a1636 SHA1 (patch-cs) = c111370c446497bd009950f42badfb2ac8ae6ba6 -SHA1 (patch-ct) = 55150f15cdcb502c972791fa7800ed5ac13cdc00 +SHA1 (patch-ct) = 65b1859c91d5f102ae2af2c4e3deb6d0681f09aa SHA1 (patch-cu) = 905c9cdb6a257d56bbcc17d8db9abdcbf2cb13ee SHA1 (patch-cv) = 300ad933f112da299ea019b18fecdd751c55c3f7 SHA1 (patch-cw) = 4e153072d46391cfd8ec92aa680e15567a7cfd61 SHA1 (patch-cx) = 99210d00107bf63f62928a614a60cb95c6d966ca -SHA1 (patch-cy) = 3a74e5fab69748d0fd9f8c1ba356200c7731a7ee -SHA1 (patch-cz) = 2bc9173a96d1011367241703676b359e839a3282 +SHA1 (patch-cy) = 439a3d95a503b9821c3961e12e0d636cd27266ae +SHA1 (patch-cz) = 7ca3ed2680f8618ef5825b5f797789f7ad180bae SHA1 (patch-da) = e95356642c3eb7f16fefb8ff9b0d12b81e6dca77 SHA1 (patch-db) = 7f7b40b560a1e5d80df0c3365a4e21b5e09bab5a SHA1 (patch-dc) = f96c5afb536e8458b9022aa289b19ffa7b7fc3cb -SHA1 (patch-dd) = 4bdfcd867cf41116771bb751d568aad4254ab4b7 -SHA1 (patch-de) = d30d837719e8bbdf4bc6f5ff377d6febcd85c502 -SHA1 (patch-df) = 2681287d8817be3d95f97abba834c906b1226c96 +SHA1 (patch-dd) = 51790459743c70028e53b717422da8d88ca78f16 +SHA1 (patch-de) = ed75cc59870fdc3db56485b64297aa96a1179a35 +SHA1 (patch-df) = 4e9217d0b11d63b2a2e5631810b31177ef908b67 SHA1 (patch-dg) = 4bd7d431a28a970355a6abe1b74bab9e13fcb0c5 -SHA1 (patch-dh) = 117d31103867ee047cde035b1decf9abd2fa306a +SHA1 (patch-dh) = ad92a9517752b85383ab0c885a53868c50895617 SHA1 (patch-di) = 60f389ba30cb8dddbb7542eb52de672b47af66d5 -SHA1 (patch-dj) = 86e1c6218e7e62fc0529e50b04fcb94bd69633ff +SHA1 (patch-dj) = 1c86ddba9a52ad50184edebda3f136cd7f51e47d SHA1 (patch-dk) = faa2733e735965f3ba16d34c986dca973e429db6 -SHA1 (patch-dl) = de55f1f18852278896239e56cc561f34272ba574 +SHA1 (patch-dl) = 647cf0effe6c94a942741b0e61efcbacb71f0f6f SHA1 (patch-dm) = 7a73526844a40e3ad99b35617a18a1c7e58ede00 -SHA1 (patch-dn) = 1a3fb5692cf1c3ed81d6bdac3500f97fd98bb295 +SHA1 (patch-dn) = 548ad36c01c1374d82eca2531add638dbee858fd SHA1 (patch-do) = 837a1c746ce91c7840e1b05083b3ad62a03ce74b SHA1 (patch-dp) = f93857e6410ec475281f2bd153430de911f051b6 -SHA1 (patch-dq) = 18bc38b1f348908838aa309024e1a8252d006d97 +SHA1 (patch-dq) = 97192b14dcc33ad4aa4c8ffdbc4bf79e30c7ebcd SHA1 (patch-dr) = 6f33a15c8cdc34fb1e67390e48c529ccef249171 -SHA1 (patch-ds) = a75bc4e7d48047fd2b625e59f9025f5045a9c8f1 +SHA1 (patch-ds) = ccb2b48a8dedf0a29b8ba05f81f4a07c589751a9 SHA1 (patch-dt) = c05f146222ea7342241ca857e48eb310850c8047 -SHA1 (patch-du) = dba726f3a0aea90c857d005b3ef3bde8820a0e0a +SHA1 (patch-du) = ea42d71cf5408ef9c60c1402d22329d1b6e4de77 SHA1 (patch-dv) = 84abd1e2951346aeac06bc407057219920339768 -SHA1 (patch-dw) = c9c91ae5c6a3e95eae74220dcd7a925d9c96a063 +SHA1 (patch-dw) = 95167b1d8befcdf81c369dce8622d258c1c14abf SHA1 (patch-dx) = 82a2b28db04ac66bf9348e5c83d48171e44938d7 -SHA1 (patch-dy) = 40f84c38d5338b8c7bb0de2f569ea08df8f3ab5a +SHA1 (patch-dy) = 08a59976e69ca1357396cdef0091f902f601bc9d SHA1 (patch-dz) = 680397ce7b0d3176876fb2cdec0680c22708c9f9 -SHA1 (patch-ea) = 514ead7137f3ef9d1f839162d0f79495a7377859 +SHA1 (patch-ea) = dd7cd27d59ae5613aa4e05bf2ac5da644721097d SHA1 (patch-eb) = 8e1777dabe29400120ea27148e8d8b3e9c357a66 -SHA1 (patch-ec) = 7350b01a16f459e2e23ba474a3fa1074105b7d81 +SHA1 (patch-ec) = 8660a2e2267034ada37cb2462b447515744da859 SHA1 (patch-ed) = 8ee44615ce8372a000d5550e764e980c925a5a0f -SHA1 (patch-ee) = e6ace4dfbf1b3ed0000cac6f78d41636f0951242 +SHA1 (patch-ee) = 27eb064f024a275fb39ef29dde9e48be522a7cb6 SHA1 (patch-ef) = 692eb8d20ce34c35e711eaa7366332ae3272305f -SHA1 (patch-eg) = 482455343b12e42930828949ddd3bf1c4bd1880b +SHA1 (patch-eg) = e8f8208b62e76fd8e63e41f8f9bfef5277d2861a SHA1 (patch-eh) = 642c18fdcbe215418597a5ab17ed148c112c0789 -SHA1 (patch-ei) = ce6aad1dab3f0f66ba4e844ae8f1ee37b6188561 +SHA1 (patch-ei) = d435f063c2b8b2e68619472d85f1957775b3900e SHA1 (patch-ej) = c6b8075e6da941a03032eb22c311867d0372a6d0 -SHA1 (patch-ek) = 2d0be7912cb009593e71ea6d53c9c538aec9caef +SHA1 (patch-ek) = b29c40008c74e005911b3c8ede796ce6814c7e81 SHA1 (patch-el) = 99f484d15555fdf38acf0d7c04bd55a0d0d2bff7 SHA1 (patch-em) = 636dc26af3ca541dfecea60bcb8d4d5af7944f6d SHA1 (patch-en) = e62d89268c19a0ad02f55b9543518b0fed0c8a5a -SHA1 (patch-eo) = 3f6ceff6f3c000f11fc5035995b3dd6e6b78da47 +SHA1 (patch-eo) = 1ab86efd90dc176c9fe38964c9f2f232c8a7d9ef SHA1 (patch-ep) = 57e1ed1d41871b626f7d7b906c552abb4dde8e9f SHA1 (patch-eq) = 52e74649447f35114c0b92aebf23262ed67495b3 SHA1 (patch-er) = df2f9a856bd75b7f3726b8d7457ab7123f91314b -SHA1 (patch-es) = ec61651f85b48e4f9b747fd97474c726efcabf5c +SHA1 (patch-es) = fb6216bfd7304273378099566955e435f0937269 SHA1 (patch-et) = 1a573a0f3043e803f7edb08492aa8d42f79ce5e5 SHA1 (patch-eu) = d31dee4dbf809b237662eae8bdec019cc594dc73 SHA1 (patch-ev) = 2e42263d67e5e44035bed13dc3e5245fc3a86709 -SHA1 (patch-ew) = 78ff80b8b8de9fedaba7d875ac00ea6fd9e88a0a +SHA1 (patch-ew) = 20da4927026655647414f5407edf83d8acf4e34b SHA1 (patch-ex) = 96fac765f7678be3563245c3fa1a23ace5bce86b SHA1 (patch-ey) = 2252a4ed9f9d15021e59b542568b0dc0f9c73e48 -SHA1 (patch-ez) = 904a251a996d9c73e7ea4a0dbc384422ba7d28db -SHA1 (patch-fa) = c8ceb03ef5eb7a3b16f3fd988e03278e7661978c +SHA1 (patch-ez) = 8d3f98ab51075af154ef6db786cde704ddb8c556 +SHA1 (patch-fa) = bccd1a6d1939ef1c97c3c45ec9e3619b568eca09 SHA1 (patch-fb) = 8f95df054822fd535c967ea770e6c65af6545b20 SHA1 (patch-fc) = 5b3da5ab4370d01c1378a4e14467fd05e58932b7 +SHA1 (patch-fd) = 6fdc0cab3d4391c6571325dfdbc6bdce57a9851c diff --git a/x11/kdebase2/patches/patch-aa b/x11/kdebase2/patches/patch-aa index 67fa8803278..ce4cf56440f 100644 --- a/x11/kdebase2/patches/patch-aa +++ b/x11/kdebase2/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.7 2001/11/13 21:10:46 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2001/12/03 15:37:18 skrll Exp $ ---- configure.orig Fri Sep 7 20:36:55 2001 +--- configure.orig Sat Nov 10 08:08:04 2001 +++ configure -@@ -12536,7 +12536,7 @@ +@@ -16640,7 +16640,7 @@ ac_save_ldflags="$LDFLAGS" ac_save_cflags="$CFLAGS" @@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.7 2001/11/13 21:10:46 jlam Exp $ + LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lGL -lGLU -lX11 -lXext -lm $LIBSOCKET" CFLAGS="$CFLAGS $X_INCLUDES" test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS" - cat > conftest.$ac_ext <<EOF -@@ -12601,13 +12601,13 @@ + cat >conftest.$ac_ext <<_ACEOF +@@ -16733,13 +16733,13 @@ if test "$GL_LDFLAGS" = ""; then if test "$ac_cv_have_gl" = "mesa"; then @@ -27,41 +27,41 @@ $NetBSD: patch-aa,v 1.7 2001/11/13 21:10:46 jlam Exp $ else GLLIB="$GL_LDFLAGS -lGL -lGLU "'$(LIB_X11)' fi -@@ -12621,7 +12621,7 @@ - +@@ -16754,7 +16754,7 @@ + GL_SAVERS="kmorph3d.kss kspace.kss kpipes.kss" ac_save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="-I$GL_INCLUDE $CPPFLAGS $X_INCLUDES" +CPPFLAGS="$GLINC $CPPFLAGS $X_INCLUDES" - for ac_hdr in GL/xmesa.h GL/glut.h memory.h + + for ac_header in GL/xmesa.h GL/glut.h memory.h do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -@@ -12810,6 +12810,23 @@ - +@@ -16984,6 +16984,23 @@ + 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 ] || -+ [ "`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 + ++ 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 + else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -@@ -12919,6 +12936,7 @@ - case "$host" in + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -17108,6 +17125,7 @@ + case "$host" in *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;; *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; + *-*-netbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; diff --git a/x11/kdebase2/patches/patch-ac b/x11/kdebase2/patches/patch-ac index 75968cb13c1..42036e46772 100644 --- a/x11/kdebase2/patches/patch-ac +++ b/x11/kdebase2/patches/patch-ac @@ -1,11 +1,20 @@ -$NetBSD: patch-ac,v 1.5 2001/10/15 22:46:00 skrll Exp $ +$NetBSD: patch-ac,v 1.6 2001/12/03 15:37:18 skrll Exp $ ---- kate/main/Makefile.in.orig Sat Sep 8 01:36:21 2001 +--- kate/main/Makefile.in.orig Sat Nov 10 07:58:16 2001 +++ kate/main/Makefile.in -@@ -274 +274 @@ +@@ -273,7 +273,7 @@ + x_includes = @x_includes@ + x_libraries = @x_libraries@ + -lib_LTLIBRARIES = libkatecore.la kate.la kwrite.la +lib_LTLIBRARIES = libkatecore.la libkate_main.la kate.la libkwrite_main.la kwrite.la -@@ -282,2 +282,6 @@ + bin_PROGRAMS = kate kwrite + + libkatecore_la_SOURCES = dummy.cpp +@@ -281,20 +281,28 @@ + + libkatecore_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN) -module -avoid-version + -kate_la_SOURCES = katemain.cpp -kate_la_LIBADD = libkatecore.la +libkate_main_la_SOURCES = katemain.cpp @@ -14,7 +23,8 @@ $NetBSD: patch-ac,v 1.5 2001/10/15 22:46:00 skrll Exp $ + +kate_la_SOURCES = kate_main.cpp +kate_la_LIBADD = libkate_main.la -@@ -286,2 +290,6 @@ + kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + -kwrite_la_SOURCES = kwritemain.cpp -kwrite_la_LIBADD = libkatecore.la +libkwrite_main_la_SOURCES = kwritemain.cpp @@ -23,108 +33,138 @@ $NetBSD: patch-ac,v 1.5 2001/10/15 22:46:00 skrll Exp $ + +kwrite_la_SOURCES = kwrite_main.cpp +kwrite_la_LIBADD = libkwrite_main.la -@@ -290,2 +298,2 @@ + kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + -kate_SOURCES = dummy.cpp -kate_LDADD = kate.la +kate_SOURCES = kate_main.cpp +kate_LDADD = libkate_main.la -@@ -294,2 +302,2 @@ + kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) + -kwrite_SOURCES = dummy.cpp -kwrite_LDADD = kwrite.la +kwrite_SOURCES = kwrite_main.cpp +kwrite_LDADD = libkwrite_main.la -@@ -323,2 +331,6 @@ + kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + INCLUDES = $(all_includes) +@@ -322,29 +330,37 @@ + #>- libkatecore_la_OBJECTS = dummy.lo + #>+ 1 + libkatecore_la_OBJECTS = dummy.lo -kate_la_DEPENDENCIES = libkatecore.la -#>- kate_la_OBJECTS = katemain.lo +libkate_main_la_DEPENDENCIES = libkatecore.la +#>- libkate_main_la_OBJECTS = katemain.lo -+#>+ 1 -+libkate_main_la_OBJECTS = katemain.lo -+kate_la_DEPENDENCIES = libkate_main.la -+#>- kate_la_OBJECTS = kate_main.lo -@@ -326,3 +338,3 @@ + #>+ 1 -kate_la_OBJECTS = katemain.lo -kwrite_la_DEPENDENCIES = libkatecore.la -#>- kwrite_la_OBJECTS = kwritemain.lo ++libkate_main_la_OBJECTS = katemain.lo ++kate_la_DEPENDENCIES = libkate_main.la ++#>- kate_la_OBJECTS = kate_main.lo ++#>+ 1 +kate_la_OBJECTS = kate_main.lo +libkwrite_main_la_DEPENDENCIES = libkatecore.la +#>- libkwrite_main_la_OBJECTS = kwritemain.lo -@@ -330,5 +342,9 @@ + #>+ 5 -kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo -kwrite_la_nofinal_OBJECTS = kwritemain.lo \ --kwrite_la_meta_unload.lo +- kwrite_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) +libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.lo +libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo \ -+libkwrite_main_la_meta_unload.lo ++ libkwrite_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_final_OBJECTS) +kwrite_la_DEPENDENCIES = libkwrite_main.la +#>- kwrite_la_OBJECTS = kwrite_main.lo +#>+ 1 +kwrite_la_OBJECTS = kwrite_main.lo -@@ -338 +354 @@ + bin_PROGRAMS = kate$(EXEEXT) kwrite$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kate_OBJECTS = dummy.$(OBJEXT) +#>- kate_OBJECTS = kate_main.$(OBJEXT) -@@ -340,3 +356,3 @@ + #>+ 1 -kate_OBJECTS = dummy.$(OBJEXT) -kate_DEPENDENCIES = kate.la -#>- kwrite_OBJECTS = dummy.$(OBJEXT) +kate_OBJECTS = kate_main.$(OBJEXT) +kate_DEPENDENCIES = libkate_main.la +#>- kwrite_OBJECTS = kwrite_main.$(OBJEXT) -@@ -344,2 +360,2 @@ + #>+ 1 -kwrite_OBJECTS = dummy.$(OBJEXT) -kwrite_DEPENDENCIES = kwrite.la +kwrite_OBJECTS = kwrite_main.$(OBJEXT) +kwrite_DEPENDENCIES = libkwrite_main.la -@@ -369,2 +385,2 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -368,8 +384,8 @@ + + TAR = tar + GZIP_ENV = --best -SOURCES = $(libkatecore_la_SOURCES) $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) -OBJECTS = $(libkatecore_la_OBJECTS) $(kate_la_OBJECTS) $(kwrite_la_OBJECTS) $(kate_OBJECTS) $(kwrite_OBJECTS) +SOURCES = $(libkatecore_la_SOURCES) $(libkate_main_la_SOURCES) $(kate_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) +OBJECTS = $(libkatecore_la_OBJECTS) $(libkate_main_la_OBJECTS) $(kate_la_OBJECTS) $(libkwrite_main_la_OBJECTS) $(kwrite_la_OBJECTS) $(kate_OBJECTS) $(kwrite_OBJECTS) -@@ -462,0 +479,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -462,9 +478,15 @@ + @KDE_USE_CLOSURE_FALSE@libkatecore.la: $(libkatecore_la_OBJECTS) $(libkatecore_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkatecore_la_LDFLAGS) $(libkatecore_la_OBJECTS) $(libkatecore_la_LIBADD) $(LIBS) + +libkate_main.la: $(libkate_main_la_OBJECTS) $(libkate_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkate_main_la_LDFLAGS) $(libkate_main_la_OBJECTS) $(libkate_main_la_LIBADD) $(LIBS) + -@@ -465,0 +485,3 @@ + kate.la: $(kate_la_OBJECTS) $(kate_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kate_la_LDFLAGS) $(kate_la_OBJECTS) $(kate_la_LIBADD) $(LIBS) + +libkwrite_main.la: $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwrite_main_la_LDFLAGS) $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_LIBADD) $(LIBS) + -@@ -542,11 +563,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -687,8 +698,8 @@ + kwrite.la: $(kwrite_la_OBJECTS) $(kwrite_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kwrite_la_LDFLAGS) $(kwrite_la_OBJECTS) $(kwrite_la_LIBADD) $(LIBS) + +@@ -675,21 +697,21 @@ + + + #>+ 12 -kwrite_la_meta_unload.cpp: kwritemain.moc - @echo 'creating kwrite_la_meta_unload.cpp' - @-rm -f kwrite_la_meta_unload.cpp -- @echo 'static const char * _metalist_kwrite_la[] = {' > kwrite_la_meta_unload.cpp -- @cat kwritemain.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrite_la_meta_unload.cpp -- @echo '0};' >> kwrite_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kwrite_la_meta_unload.cpp -- @echo '_UNLOAD(kwrite_la)' >> kwrite_la_meta_unload.cpp +libkwrite_main_la_meta_unload.cpp: kwritemain.moc + @echo 'creating libkwrite_main_la_meta_unload.cpp' + @-rm -f libkwrite_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkwrite_main_la[] = {' > libkwrite_main_la_meta_unload.cpp -+ @cat kwritemain.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrite_main_la_meta_unload.cpp -+ @echo '0};' >> libkwrite_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkwrite_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkwrite_main_la)' >> libkwrite_main_la_meta_unload.cpp -@@ -699 +710 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kwrite_la[] = {' > kwrite_la_meta_unload.cpp ;\ +- cat kwritemain.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrite_la_meta_unload.cpp ;\ +- echo '0};' >> kwrite_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kwrite_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kwrite_la)' >> kwrite_la_meta_unload.cpp ;\ +- else echo > kwrite_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkwrite_main_la[] = {' > libkwrite_main_la_meta_unload.cpp ;\ ++ cat kwritemain.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrite_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkwrite_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkwrite_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkwrite_main_la)' >> libkwrite_main_la_meta_unload.cpp ;\ ++ else echo > libkwrite_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kwrite_la_meta_unload.cpp + -rm -f libkwrite_main_la_meta_unload.cpp -@@ -714 +725,13 @@ + + #>+ 11 + libkatecore_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp kwritemain.moc +@@ -704,11 +726,23 @@ + rm -f libkatecore_la.all_cpp.final libkatecore_la.all_cpp.files + + #>+ 11 -kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katemain.cpp +libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/katemain.cpp + @echo 'creating libkate_main_la.all_cpp.cpp ...'; \ @@ -139,10 +179,18 @@ $NetBSD: patch-ac,v 1.5 2001/10/15 22:46:00 skrll Exp $ + +#>+ 11 +kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kate_main.cpp -@@ -718 +741 @@ + @echo 'creating kate_la.all_cpp.cpp ...'; \ + rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ - for file in katemain.cpp ; do \ + for file in kate_main.cpp ; do \ -@@ -726 +749,13 @@ + echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ + done; \ +@@ -716,11 +750,23 @@ + rm -f kate_la.all_cpp.final kate_la.all_cpp.files + + #>+ 11 -kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp kwrite_la_meta_unload.cpp +libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp libkwrite_main_la_meta_unload.cpp + @echo 'creating libkwrite_main_la.all_cpp.cpp ...'; \ @@ -157,27 +205,65 @@ $NetBSD: patch-ac,v 1.5 2001/10/15 22:46:00 skrll Exp $ + +#>+ 11 +kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrite_main.cpp -@@ -730 +765 @@ + @echo 'creating kwrite_la.all_cpp.cpp ...'; \ + rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ - for file in kwritemain.cpp kwrite_la_meta_unload.cpp ; do \ + for file in kwrite_main.cpp ; do \ -@@ -738 +773 @@ + echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ + done; \ +@@ -728,11 +774,11 @@ + rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files + + #>+ 11 -kate.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kate.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kate_main.cpp -@@ -742 +777 @@ + @echo 'creating kate.all_cpp.cpp ...'; \ + rm -f kate.all_cpp.files kate.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kate.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kate_main.cpp ; do \ -@@ -750 +785 @@ + echo "#include \"$$file\"" >> kate.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate.all_cpp.final; \ + done; \ +@@ -740,11 +786,11 @@ + rm -f kate.all_cpp.final kate.all_cpp.files + + #>+ 11 -kwrite.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kwrite.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrite_main.cpp -@@ -754 +789 @@ + @echo 'creating kwrite.all_cpp.cpp ...'; \ + rm -f kwrite.all_cpp.files kwrite.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwrite.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kwrite_main.cpp ; do \ -@@ -763 +798 @@ + echo "#include \"$$file\"" >> kwrite.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite.all_cpp.final; \ + done; \ +@@ -753,20 +799,20 @@ + + #>+ 3 + clean-final: - -rm -f libkatecore_la.all_cpp.cpp kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp + -rm -f libkatecore_la.all_cpp.cpp libkate_main_la.all_cpp.cpp kate_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp -@@ -767 +802 @@ + + #>+ 2 + final: - $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" all-am + $(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am -@@ -770 +805 @@ + #>+ 2 + final-install: +- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" install-am ++ $(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" all-am + $(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-ai b/x11/kdebase2/patches/patch-ai index cef4b9b37ea..8363828caa4 100644 --- a/x11/kdebase2/patches/patch-ai +++ b/x11/kdebase2/patches/patch-ai @@ -1,103 +1,143 @@ -$NetBSD: patch-ai,v 1.3 2001/10/15 22:46:00 skrll Exp $ +$NetBSD: patch-ai,v 1.4 2001/12/03 15:37:19 skrll Exp $ ---- kcontrol/access/Makefile.in.orig Sat Sep 8 01:36:21 2001 +--- kcontrol/access/Makefile.in.orig Sat Nov 10 07:58:17 2001 +++ kcontrol/access/Makefile.in -@@ -278 +278 @@ +@@ -277,15 +277,19 @@ + + bin_PROGRAMS = kaccess + -kaccess_SOURCES = dummy.cpp +kaccess_SOURCES = kaccess_main.cpp -@@ -280 +280 @@ + kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kaccess_LDADD = kaccess.la +kaccess_LDADD = libkaccess_sl.la -@@ -282 +282 @@ + -kde_module_LTLIBRARIES = libkcm_access.la kaccess.la +kde_module_LTLIBRARIES = libkcm_access.la libkaccess_sl.la kaccess.la -@@ -284 +284,5 @@ + -kaccess_la_SOURCES = kaccess.cpp main.cpp +libkaccess_sl_la_SOURCES = kaccess.cpp main.cpp +libkaccess_sl_la_LDFLAGS = $(all_libraries) +libkaccess_sl_la_LIBADD = $(LIB_KDEUI) + +kaccess_la_SOURCES = kaccess_main.cpp -@@ -286 +290 @@ + kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version -kaccess_la_LIBADD = $(LIB_KDEUI) +kaccess_la_LIBADD = libkaccess_sl.la $(LIB_KDEUI) -@@ -319,2 +323,2 @@ + + libkcm_access_la_SOURCES = kcmaccess.cpp + libkcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +@@ -318,21 +322,25 @@ + libkcm_access_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@libkcm_access_la_OBJECTS = $(libkcm_access_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libkcm_access_la_OBJECTS = $(libkcm_access_la_final_OBJECTS) -kaccess_la_DEPENDENCIES = -#>- kaccess_la_OBJECTS = kaccess.lo main.lo +libkaccess_sl_la_DEPENDENCIES = +#>- libkaccess_sl_la_OBJECTS = kaccess.lo main.lo -@@ -322,5 +326,9 @@ + #>+ 5 -kaccess_la_final_OBJECTS = kaccess_la.all_cpp.lo -kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo \ --kaccess_la_meta_unload.lo +- kaccess_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kaccess_la_OBJECTS = $(kaccess_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kaccess_la_OBJECTS = $(kaccess_la_final_OBJECTS) +libkaccess_sl_la_final_OBJECTS = libkaccess_sl_la.all_cpp.lo +libkaccess_sl_la_nofinal_OBJECTS = kaccess.lo main.lo \ -+libkaccess_sl_la_meta_unload.lo ++ libkaccess_sl_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkaccess_sl_la_OBJECTS = $(libkaccess_sl_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkaccess_sl_la_OBJECTS = $(libkaccess_sl_la_final_OBJECTS) +kaccess_la_DEPENDENCIES = libkaccess_sl.la +#>- kaccess_la_OBJECTS = kaccess_main.lo +#>+ 1 +kaccess_la_OBJECTS = kaccess_main.lo -@@ -330 +338 @@ + bin_PROGRAMS = kaccess$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kaccess_OBJECTS = dummy.$(OBJEXT) +#>- kaccess_OBJECTS = kaccess_main.$(OBJEXT) -@@ -332,2 +340,2 @@ + #>+ 1 -kaccess_OBJECTS = dummy.$(OBJEXT) -kaccess_DEPENDENCIES = kaccess.la +kaccess_OBJECTS = kaccess_main.$(OBJEXT) +kaccess_DEPENDENCIES = libkaccess_sl.la -@@ -354 +362 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -353,15 +361,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=kaccess.desktop configure.in.in kaccess.h kcmaccess.desktop +KDE_DIST=configure.in.in kcmaccess.desktop kaccess.desktop kaccess.h -@@ -361,2 +369,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(libkcm_access_la_SOURCES) $(kaccess_la_SOURCES) $(kaccess_SOURCES) -OBJECTS = $(libkcm_access_la_OBJECTS) $(kaccess_la_OBJECTS) $(kaccess_OBJECTS) +SOURCES = $(libkcm_access_la_SOURCES) $(libkaccess_sl_la_SOURCES) $(kaccess_la_SOURCES) $(kaccess_SOURCES) +OBJECTS = $(libkcm_access_la_OBJECTS) $(libkaccess_sl_la_OBJECTS) $(kaccess_la_OBJECTS) $(kaccess_OBJECTS) -@@ -454,0 +463,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -454,6 +462,9 @@ + @KDE_USE_CLOSURE_FALSE@libkcm_access.la: $(libkcm_access_la_OBJECTS) $(libkcm_access_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(libkcm_access_la_LDFLAGS) $(libkcm_access_la_OBJECTS) $(libkcm_access_la_LIBADD) $(LIBS) + +libkaccess_sl.la: $(libkaccess_sl_la_OBJECTS) $(libkaccess_sl_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(libkaccess_sl_la_LDFLAGS) $(libkaccess_sl_la_OBJECTS) $(libkaccess_sl_la_LIBADD) $(LIBS) + -@@ -565,11 +575,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -688,3 +687,0 @@ + kaccess.la: $(kaccess_la_OBJECTS) $(kaccess_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(kaccess_la_LDFLAGS) $(kaccess_la_OBJECTS) $(kaccess_la_LIBADD) $(LIBS) + +@@ -676,9 +687,6 @@ + $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot + $(XGETTEXT) $(libkcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot + -dummy.cpp: - echo > dummy.cpp - -@@ -741,8 +738,8 @@ + # 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: +@@ -731,21 +739,21 @@ + + + #>+ 12 -kaccess_la_meta_unload.cpp: kaccess.moc - @echo 'creating kaccess_la_meta_unload.cpp' - @-rm -f kaccess_la_meta_unload.cpp -- @echo 'static const char * _metalist_kaccess_la[] = {' > kaccess_la_meta_unload.cpp -- @cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaccess_la_meta_unload.cpp -- @echo '0};' >> kaccess_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kaccess_la_meta_unload.cpp -- @echo '_UNLOAD(kaccess_la)' >> kaccess_la_meta_unload.cpp +libkaccess_sl_la_meta_unload.cpp: kaccess.moc + @echo 'creating libkaccess_sl_la_meta_unload.cpp' + @-rm -f libkaccess_sl_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkaccess_sl_la[] = {' > libkaccess_sl_la_meta_unload.cpp -+ @cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaccess_sl_la_meta_unload.cpp -+ @echo '0};' >> libkaccess_sl_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkaccess_sl_la_meta_unload.cpp -+ @echo '_UNLOAD(libkaccess_sl_la)' >> libkaccess_sl_la_meta_unload.cpp -@@ -753 +750 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kaccess_la[] = {' > kaccess_la_meta_unload.cpp ;\ +- cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaccess_la_meta_unload.cpp ;\ +- echo '0};' >> kaccess_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kaccess_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kaccess_la)' >> kaccess_la_meta_unload.cpp ;\ +- else echo > kaccess_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkaccess_sl_la[] = {' > libkaccess_sl_la_meta_unload.cpp ;\ ++ cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaccess_sl_la_meta_unload.cpp ;\ ++ echo '0};' >> libkaccess_sl_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkaccess_sl_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkaccess_sl_la)' >> libkaccess_sl_la_meta_unload.cpp ;\ ++ else echo > libkaccess_sl_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f libkcm_access_la_meta_unload.cpp kaccess_la_meta_unload.cpp + -rm -f libkcm_access_la_meta_unload.cpp libkaccess_sl_la_meta_unload.cpp -@@ -768 +765,13 @@ + + #>+ 11 + libkcm_access_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmaccess.cpp libkcm_access_la_meta_unload.cpp kcmaccess.moc kaccess.moc +@@ -760,11 +768,23 @@ + rm -f libkcm_access_la.all_cpp.final libkcm_access_la.all_cpp.files + + #>+ 11 -kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess_la_meta_unload.cpp +libkaccess_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp libkaccess_sl_la_meta_unload.cpp + @echo 'creating libkaccess_sl_la.all_cpp.cpp ...'; \ @@ -112,21 +152,51 @@ $NetBSD: patch-ai,v 1.3 2001/10/15 22:46:00 skrll Exp $ + +#>+ 11 +kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp -@@ -772 +781 @@ + @echo 'creating kaccess_la.all_cpp.cpp ...'; \ + rm -f kaccess_la.all_cpp.files kaccess_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kaccess_la.all_cpp.final; \ - for file in kaccess.cpp main.cpp kaccess_la_meta_unload.cpp ; do \ + for file in kaccess_main.cpp ; do \ -@@ -780 +789 @@ + echo "#include \"$$file\"" >> kaccess_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess_la.all_cpp.final; \ + done; \ +@@ -772,11 +792,11 @@ + rm -f kaccess_la.all_cpp.final kaccess_la.all_cpp.files + + #>+ 11 -kaccess.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kaccess.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp -@@ -784 +793 @@ + @echo 'creating kaccess.all_cpp.cpp ...'; \ + rm -f kaccess.all_cpp.files kaccess.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kaccess.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kaccess_main.cpp ; do \ -@@ -793 +802 @@ + echo "#include \"$$file\"" >> kaccess.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess.all_cpp.final; \ + done; \ +@@ -785,20 +805,20 @@ + + #>+ 3 + clean-final: - -rm -f libkcm_access_la.all_cpp.cpp kaccess_la.all_cpp.cpp kaccess.all_cpp.cpp + -rm -f libkcm_access_la.all_cpp.cpp libkaccess_sl_la.all_cpp.cpp kaccess_la.all_cpp.cpp kaccess.all_cpp.cpp -@@ -797 +806 @@ + + #>+ 2 + final: - $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" all-am + $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_final_OBJECTS)" all-am -@@ -800 +809 @@ + #>+ 2 + final-install: +- $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" install-am ++ $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_final_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" all-am + $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkcm_access_la_OBJECTS="$(libkcm_access_la_nofinal_OBJECTS)" libkaccess_sl_la_OBJECTS="$(libkaccess_sl_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-am b/x11/kdebase2/patches/patch-am index e362b049a46..51af1463ea1 100644 --- a/x11/kdebase2/patches/patch-am +++ b/x11/kdebase2/patches/patch-am @@ -1,25 +1,22 @@ -$NetBSD: patch-am,v 1.2 2001/10/15 22:46:00 skrll Exp $ +$NetBSD: patch-am,v 1.3 2001/12/03 15:37:19 skrll Exp $ ---- kcontrol/ebrowsing/Makefile.in.orig Sat Sep 8 01:36:23 2001 +--- kcontrol/ebrowsing/Makefile.in.orig Sat Nov 10 07:58:18 2001 +++ kcontrol/ebrowsing/Makefile.in -@@ -284 +284 @@ +@@ -283,7 +283,7 @@ + + libkcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp + -libkcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +libkcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH} -@@ -326 +326 @@ + libkcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) + + data_DATA = ebrowsing.desktop +@@ -325,7 +325,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=ebrowsing.desktop filteropts.h main.h +KDE_DIST=main.h ebrowsing.desktop filteropts.h -@@ -488 +488 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -546,11 +545,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase2/patches/patch-ap b/x11/kdebase2/patches/patch-ap index dafe10c9379..b1617dce64c 100644 --- a/x11/kdebase2/patches/patch-ap +++ b/x11/kdebase2/patches/patch-ap @@ -1,39 +1,44 @@ -$NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $ +$NetBSD: patch-ap,v 1.3 2001/12/03 15:37:19 skrll Exp $ ---- kcontrol/kcontrol/Makefile.in.orig Sat Sep 8 01:36:25 2001 +--- kcontrol/kcontrol/Makefile.in.orig Sat Nov 10 07:58:19 2001 +++ kcontrol/kcontrol/Makefile.in -@@ -297,2 +296,0 @@ +@@ -296,38 +296,49 @@ + + SUBDIRS = . pics + -CLEANFILES = dummy.cpp - -@@ -300 +298,4 @@ + bin_PROGRAMS = kcontrol kcmshell kcminit -kde_module_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la +kde_module_LTLIBRARIES = libkcontrol_main.la kcontrol.la libkcmshell_main.la kcmshell.la libkcminit_main.la kcminit.la + + +libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp -@@ -302 +302,0 @@ + -kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp -@@ -303,0 +304,2 @@ + +libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcontrol_main_la_LDFLAGS = $(all_libraries) -@@ -305 +307,2 @@ + -kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +kcontrol_la_SOURCES = kcontrol_main.cpp +kcontrol_la_LIBADD = libkcontrol_main.la -@@ -308 +311 @@ + kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version + -#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog.skel +#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog.skel -@@ -310 +313 @@ + #>+ 1 -kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp +libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp -@@ -312 +315,5 @@ + -kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcmshell_main_la_LDFLAGS = $(all_libraries) + +kcmshell_la_SOURCES = kcmshell_main.cpp +kcmshell_la_LIBADD = libkcmshell_main.la -@@ -315,2 +322,6 @@ + kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version + -kcminit_la_SOURCES = kcminit.cpp global.cpp utils.cpp -kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcminit_main_la_SOURCES = kcminit.cpp global.cpp utils.cpp @@ -42,38 +47,54 @@ $NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $ + +kcminit_la_SOURCES = kcminit_main.cpp +kcminit_la_LIBADD = libkcminit_main.la -@@ -319,2 +330,2 @@ + kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version + -kcontrol_SOURCES = dummy.cpp -kcontrol_LDADD = kcontrol.la +kcontrol_SOURCES = kcontrol_main.cpp +kcontrol_LDADD = libkcontrol_main.la -@@ -323,2 +334,2 @@ + kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + -kcmshell_SOURCES = dummy.cpp -kcmshell_LDADD = kcmshell.la +kcmshell_SOURCES = kcmshell_main.cpp +kcmshell_LDADD = libkcmshell_main.la -@@ -327,2 +338,2 @@ + kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + -kcminit_SOURCES = dummy.cpp -kcminit_LDADD = kcminit.la +kcminit_SOURCES = kcminit_main.cpp +kcminit_LDADD = libkcminit_main.la -@@ -352,2 +363,2 @@ + kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + + rcdir = $(kde_datadir)/kcontrol +@@ -351,54 +362,66 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -kcontrol_la_DEPENDENCIES = -#>- kcontrol_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ +libkcontrol_main_la_DEPENDENCIES = +#>- libkcontrol_main_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ -@@ -359,2 +370,2 @@ + #>- searchwidget.lo helpwidget.lo moduleinfo.lo utils.lo modules.lo \ + #>- proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo global.lo \ + #>- quickhelp.lo moduletreeview.lo moduleiconview.lo kecdialog.lo \ + #>- kcrootonly.lo + #>+ 9 -kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo -kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ +libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo +libkcontrol_main_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ -@@ -365,5 +376,9 @@ --kcontrol_la_meta_unload.lo + searchwidget.lo helpwidget.lo moduleinfo.lo utils.lo modules.lo \ + proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo global.lo \ + quickhelp.lo moduletreeview.lo moduleiconview.lo kecdialog.lo \ + kcrootonly.lo \ +- kcontrol_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS) -kcmshell_la_DEPENDENCIES = -#>- kcmshell_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ -+libkcontrol_main_la_meta_unload.lo ++ libkcontrol_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS) +kcontrol_la_DEPENDENCIES = libkcontrol_main.la @@ -82,18 +103,19 @@ $NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $ +kcontrol_la_OBJECTS = kcontrol_main.lo +libkcmshell_main_la_DEPENDENCIES = +#>- libkcmshell_main_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ -@@ -372,2 +387,2 @@ + #>- kecdialog.lo utils.lo proxywidget.lo kcdialog.lo global.lo + #>+ 6 -kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo -kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ +libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo +libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ -@@ -375,5 +390,9 @@ --kcmshell_la_meta_unload.lo + kecdialog.lo utils.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo \ +- kcmshell_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS) -kcminit_la_DEPENDENCIES = -#>- kcminit_la_OBJECTS = kcminit.lo global.lo utils.lo -+libkcmshell_main_la_meta_unload.lo ++ libkcmshell_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS) +kcmshell_la_DEPENDENCIES = libkcmshell_main.la @@ -102,7 +124,7 @@ $NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $ +kcmshell_la_OBJECTS = kcmshell_main.lo +libkcminit_main_la_DEPENDENCIES = +#>- libkcminit_main_la_OBJECTS = kcminit.lo global.lo utils.lo -@@ -381,4 +400,8 @@ + #>+ 4 -kcminit_la_final_OBJECTS = kcminit_la.all_cpp.lo -kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo utils.lo -@KDE_USE_FINAL_FALSE@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS) @@ -115,108 +137,147 @@ $NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $ +#>- kcminit_la_OBJECTS = kcminit_main.lo +#>+ 1 +kcminit_la_OBJECTS = kcminit_main.lo -@@ -388 +411 @@ + bin_PROGRAMS = kcontrol$(EXEEXT) kcmshell$(EXEEXT) kcminit$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kcontrol_OBJECTS = dummy.$(OBJEXT) +#>- kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) -@@ -390,3 +413,3 @@ + #>+ 1 -kcontrol_OBJECTS = dummy.$(OBJEXT) -kcontrol_DEPENDENCIES = kcontrol.la -#>- kcmshell_OBJECTS = dummy.$(OBJEXT) -+kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) -+kcontrol_DEPENDENCIES = libkcontrol_main.la -+#>- kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) -@@ -394,3 +417,3 @@ +-#>+ 1 -kcmshell_OBJECTS = dummy.$(OBJEXT) -kcmshell_DEPENDENCIES = kcmshell.la -#>- kcminit_OBJECTS = dummy.$(OBJEXT) ++kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) ++kcontrol_DEPENDENCIES = libkcontrol_main.la ++#>- kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) ++#>+ 1 +kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) +kcmshell_DEPENDENCIES = libkcmshell_main.la +#>- kcminit_OBJECTS = kcminit_main.$(OBJEXT) -@@ -398,2 +421,2 @@ + #>+ 1 -kcminit_OBJECTS = dummy.$(OBJEXT) -kcminit_DEPENDENCIES = kcminit.la +kcminit_OBJECTS = kcminit_main.$(OBJEXT) +kcminit_DEPENDENCIES = libkcminit_main.la -@@ -418 +441 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -417,15 +440,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=indexwidget.h proxywidget.h modules.h moduleinfo.h modloader.h quickhelp.h searchwidget.h kcdialog.h hi48-app-kcontrol.png helpwidget.h moduleiconview.h kcontrolui.rc dockcontainer.h main.h moduletreeview.h utils.h kecdialog.h aboutwidget.h hi16-app-kcontrol.png toplevel.h kcmshell.h modulemenu.cpp hi32-app-kcontrol.png modulemenu.h kcrootonly.h KControl.desktop global.h +KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h quickhelp.h searchwidget.h main.h moduletreeview.h utils.h kecdialog.h kcdialog.h aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.h toplevel.h helpwidget.h KControl.desktop modules.h moduleiconview.h moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h -@@ -425,2 +448,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kcontrol_la_SOURCES) $(kcmshell_la_SOURCES) $(kcminit_la_SOURCES) $(kcontrol_SOURCES) $(kcmshell_SOURCES) $(kcminit_SOURCES) -OBJECTS = $(kcontrol_la_OBJECTS) $(kcmshell_la_OBJECTS) $(kcminit_la_OBJECTS) $(kcontrol_OBJECTS) $(kcmshell_OBJECTS) $(kcminit_OBJECTS) +SOURCES = $(libkcontrol_main_la_SOURCES) $(kcontrol_la_SOURCES) $(libkcmshell_main_la_SOURCES) $(kcmshell_la_SOURCES) $(libkcminit_main_la_SOURCES) $(kcminit_la_SOURCES) $(kcontrol_SOURCES) $(kcmshell_SOURCES) $(kcminit_SOURCES) +OBJECTS = $(libkcontrol_main_la_OBJECTS) $(kcontrol_la_OBJECTS) $(libkcmshell_main_la_OBJECTS) $(kcmshell_la_OBJECTS) $(libkcminit_main_la_OBJECTS) $(kcminit_la_OBJECTS) $(kcontrol_OBJECTS) $(kcmshell_OBJECTS) $(kcminit_OBJECTS) -@@ -512,0 +536,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -512,12 +535,21 @@ + + maintainer-clean-libtool: + +libkcontrol_main.la: $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(libkcontrol_main_la_LDFLAGS) $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_LIBADD) $(LIBS) + -@@ -515,0 +542,3 @@ + kcontrol.la: $(kcontrol_la_OBJECTS) $(kcontrol_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(kcontrol_la_LDFLAGS) $(kcontrol_la_OBJECTS) $(kcontrol_la_LIBADD) $(LIBS) + +libkcmshell_main.la: $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(libkcmshell_main_la_LDFLAGS) $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_LIBADD) $(LIBS) + -@@ -518,0 +548,3 @@ + kcmshell.la: $(kcmshell_la_OBJECTS) $(kcmshell_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS) + +libkcminit_main.la: $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(libkcminit_main_la_LDFLAGS) $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_LIBADD) $(LIBS) + -@@ -639 +671 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -697,11 +728,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -772 +792,0 @@ + kcminit.la: $(kcminit_la_OBJECTS) $(kcminit_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(kcminit_la_LDFLAGS) $(kcminit_la_OBJECTS) $(kcminit_la_LIBADD) $(LIBS) + +@@ -760,7 +792,6 @@ + mostlyclean-generic: + + clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -@@ -838,3 +857,0 @@ + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) +@@ -826,9 +857,6 @@ + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot + -dummy.cpp: - echo > dummy.cpp - -@@ -952,8 +969,8 @@ + # 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: +@@ -940,41 +968,53 @@ + + + #>+ 12 -kcontrol_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc - @echo 'creating kcontrol_la_meta_unload.cpp' - @-rm -f kcontrol_la_meta_unload.cpp -- @echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp -- @cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp -- @echo '0};' >> kcontrol_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kcontrol_la_meta_unload.cpp -- @echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp +libkcontrol_main_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc + @echo 'creating libkcontrol_main_la_meta_unload.cpp' + @-rm -f libkcontrol_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp -+ @cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp -+ @echo '0};' >> libkcontrol_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkcontrol_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp -@@ -963,8 +980,8 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp ;\ +- cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp ;\ +- echo '0};' >> kcontrol_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kcontrol_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp ;\ +- else echo > kcontrol_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp ;\ ++ cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc moduleiconview.moc modules.moc aboutwidget.moc searchwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkcontrol_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkcontrol_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp ;\ ++ else echo > libkcontrol_main_la_meta_unload.cpp; fi + + + #>+ 12 -kcmshell_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc - @echo 'creating kcmshell_la_meta_unload.cpp' - @-rm -f kcmshell_la_meta_unload.cpp -- @echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp -- @cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp -- @echo '0};' >> kcmshell_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kcmshell_la_meta_unload.cpp -- @echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp +libkcmshell_main_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc + @echo 'creating libkcmshell_main_la_meta_unload.cpp' + @-rm -f libkcmshell_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp -+ @cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp -+ @echo '0};' >> libkcmshell_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkcmshell_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp -@@ -975 +992,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp ;\ +- cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp ;\ +- echo '0};' >> kcmshell_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kcmshell_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp ;\ +- else echo > kcmshell_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp ;\ ++ cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkcmshell_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkcmshell_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp ;\ ++ else echo > libkcmshell_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kcontrol_la_meta_unload.cpp kcmshell_la_meta_unload.cpp + -rm -f libkcontrol_main_la_meta_unload.cpp libkcmshell_main_la_meta_unload.cpp -+ -+#>+ 11 + + #>+ 11 +-kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/utils.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp kcontrol_la_meta_unload.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc moduleiconview.moc modules.moc kcdialog.moc aboutwidget.moc searchwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc +libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/utils.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp libkcontrol_main_la_meta_unload.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc moduleiconview.moc modules.moc kcdialog.moc aboutwidget.moc searchwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc + @echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \ + rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \ @@ -227,13 +288,21 @@ $NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $ + done; \ + cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ + rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files -@@ -978 +1007 @@ --kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/utils.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp kcontrol_la_meta_unload.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc moduleiconview.moc modules.moc kcdialog.moc aboutwidget.moc searchwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc -+kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in kcontrol_main.cpp -@@ -982 +1011 @@ ++ ++#>+ 11 ++kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp + @echo 'creating kcontrol_la.all_cpp.cpp ...'; \ + rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ - for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp utils.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp kcontrol_la_meta_unload.cpp ; do \ + for file in kcontrol_main.cpp ; do \ -@@ -990 +1019,13 @@ + echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ + done; \ +@@ -982,11 +1022,23 @@ + rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files + + #>+ 11 -kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/utils.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp +libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/utils.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp + @echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \ @@ -248,10 +317,18 @@ $NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $ + +#>+ 11 +kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp -@@ -994 +1035 @@ + @echo 'creating kcmshell_la.all_cpp.cpp ...'; \ + rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ - for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp utils.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ; do \ + for file in kcmshell_main.cpp ; do \ -@@ -1002 +1043,13 @@ + echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ + done; \ +@@ -994,11 +1046,23 @@ + rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files + + #>+ 11 -kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp $(srcdir)/utils.cpp +libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp $(srcdir)/utils.cpp + @echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \ @@ -266,33 +343,79 @@ $NetBSD: patch-ap,v 1.2 2001/10/15 22:46:00 skrll Exp $ + +#>+ 11 +kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp -@@ -1006 +1059 @@ + @echo 'creating kcminit_la.all_cpp.cpp ...'; \ + rm -f kcminit_la.all_cpp.files kcminit_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcminit_la.all_cpp.final; \ - for file in kcminit.cpp global.cpp utils.cpp ; do \ + for file in kcminit_main.cpp ; do \ -@@ -1014 +1067 @@ + echo "#include \"$$file\"" >> kcminit_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit_la.all_cpp.final; \ + done; \ +@@ -1006,11 +1070,11 @@ + rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files + + #>+ 11 -kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in kcontrol_main.cpp -@@ -1018 +1071 @@ ++kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp + @echo 'creating kcontrol.all_cpp.cpp ...'; \ + rm -f kcontrol.all_cpp.files kcontrol.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcontrol.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcontrol_main.cpp ; do \ -@@ -1026 +1079 @@ + echo "#include \"$$file\"" >> kcontrol.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol.all_cpp.final; \ + done; \ +@@ -1018,11 +1082,11 @@ + rm -f kcontrol.all_cpp.final kcontrol.all_cpp.files + + #>+ 11 -kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp -@@ -1030 +1083 @@ + @echo 'creating kcmshell.all_cpp.cpp ...'; \ + rm -f kcmshell.all_cpp.files kcmshell.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcmshell.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcmshell_main.cpp ; do \ -@@ -1038 +1091 @@ + echo "#include \"$$file\"" >> kcmshell.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell.all_cpp.final; \ + done; \ +@@ -1030,11 +1094,11 @@ + rm -f kcmshell.all_cpp.final kcmshell.all_cpp.files + + #>+ 11 -kcminit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kcminit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp -@@ -1042 +1095 @@ + @echo 'creating kcminit.all_cpp.cpp ...'; \ + rm -f kcminit.all_cpp.files kcminit.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcminit.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcminit_main.cpp ; do \ -@@ -1051 +1104 @@ + echo "#include \"$$file\"" >> kcminit.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit.all_cpp.final; \ + done; \ +@@ -1043,20 +1107,20 @@ + + #>+ 3 + clean-final: - -rm -f kcontrol_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcminit_la.all_cpp.cpp kcontrol.all_cpp.cpp kcmshell.all_cpp.cpp kcminit.all_cpp.cpp + -rm -f libkcontrol_main_la.all_cpp.cpp kcontrol_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp kcmshell_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp kcminit_la.all_cpp.cpp kcontrol.all_cpp.cpp kcmshell.all_cpp.cpp kcminit.all_cpp.cpp -@@ -1055 +1108 @@ + + #>+ 2 + final: - $(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" all-am + $(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" all-am -@@ -1058 +1111 @@ + #>+ 2 + final-install: +- $(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" install-am ++ $(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" all-am + $(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-au b/x11/kdebase2/patches/patch-au index 56423dfd5b8..efac29344c1 100644 --- a/x11/kdebase2/patches/patch-au +++ b/x11/kdebase2/patches/patch-au @@ -1,6 +1,6 @@ -$NetBSD: patch-au,v 1.2 2001/10/15 22:46:00 skrll Exp $ +$NetBSD: patch-au,v 1.3 2001/12/03 15:37:19 skrll Exp $ ---- kcontrol/kcontrol/kcontrol_main.cpp.orig Tue Oct 2 17:50:31 2001 +--- kcontrol/kcontrol/kcontrol_main.cpp.orig Mon Dec 3 10:00:43 2001 +++ kcontrol/kcontrol/kcontrol_main.cpp @@ -0,0 +1,28 @@ +/* diff --git a/x11/kdebase2/patches/patch-ay b/x11/kdebase2/patches/patch-ay index fde5cddaaf1..01f6c121b40 100644 --- a/x11/kdebase2/patches/patch-ay +++ b/x11/kdebase2/patches/patch-ay @@ -1,25 +1,22 @@ -$NetBSD: patch-ay,v 1.2 2001/10/15 22:46:01 skrll Exp $ +$NetBSD: patch-ay,v 1.3 2001/12/03 15:37:19 skrll Exp $ ---- kcontrol/kio/Makefile.in.orig Sat Sep 8 01:36:26 2001 +--- kcontrol/kio/Makefile.in.orig Sat Nov 10 07:58:20 2001 +++ kcontrol/kio/Makefile.in -@@ -292 +292 @@ +@@ -291,7 +291,7 @@ + + + libkcm_kio_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE) +libkcm_kio_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KFILE) ${KDE_RPATH} -@@ -361 +361 @@ + + check_PROGRAMS = test + test_SOURCES = $(libkcm_kio_la_SOURCES) test.cpp +@@ -360,7 +360,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=UA-DESKTOP-FILE-HOWTO cookies.desktop useragent.desktop useragentdlg.h uagentproviderdlg.h proxy.desktop policydlg.h ksmboptdlg.h kcookiesmanagement.h fakeuaprovider.h netpref.desktop kproxydlg.h kcookiesmain.h kproxydlgui.ui kcookiespolicies.h uninstall.desktop smb.desktop uasprovider.desktop netpref.h smbrodlg.h +KDE_DIST=policydlg.h ksmboptdlg.h kcookiesmanagement.h UA-DESKTOP-FILE-HOWTO kproxydlgui.ui fakeuaprovider.h useragentdlg.h uagentproviderdlg.h cookies.desktop kcookiespolicies.h netpref.desktop uninstall.desktop smb.desktop proxy.desktop useragent.desktop uasprovider.desktop kproxydlg.h netpref.h kcookiesmain.h smbrodlg.h -@@ -574 +574 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -632,11 +631,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase2/patches/patch-ba b/x11/kdebase2/patches/patch-ba index 8073d2199f3..076ec81b296 100644 --- a/x11/kdebase2/patches/patch-ba +++ b/x11/kdebase2/patches/patch-ba @@ -1,22 +1,22 @@ -$NetBSD: patch-ba,v 1.2 2001/10/15 22:46:01 skrll Exp $ +$NetBSD: patch-ba,v 1.3 2001/12/03 15:37:19 skrll Exp $ ---- kcontrol/konq/Makefile.in.orig Sat Sep 8 01:36:26 2001 +--- kcontrol/konq/Makefile.in.orig Sat Nov 10 07:58:20 2001 +++ kcontrol/konq/Makefile.in -@@ -286 +286 @@ +@@ -285,7 +285,7 @@ + + + libkcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) ${KDE_RPATH} -@@ -339 +339 @@ + + libkcm_konq_la_DATA = overlapping.png onlyone.png + libkcm_konq_ladir = $(kde_datadir)/kcontrol/pics +@@ -338,7 +338,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=fontopts.h onlyone.png kcmkonq.desktop desktop.desktop desktop.h main.h rootopts.h overlapping.png virtualdesktops.desktop behaviour.h uninstall.desktop trashopts.h +KDE_DIST=trashopts.h desktop.h behaviour.h virtualdesktops.desktop onlyone.png desktop.desktop kcmkonq.desktop fontopts.h main.h rootopts.h uninstall.desktop overlapping.png -@@ -537,11 +536,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase2/patches/patch-bc b/x11/kdebase2/patches/patch-bc index 26052719deb..76542177819 100644 --- a/x11/kdebase2/patches/patch-bc +++ b/x11/kdebase2/patches/patch-bc @@ -1,22 +1,22 @@ -$NetBSD: patch-bc,v 1.1 2001/10/15 22:46:01 skrll Exp $ +$NetBSD: patch-bc,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kcontrol/konqhtml/Makefile.in.orig Sat Sep 8 01:36:26 2001 +--- kcontrol/konqhtml/Makefile.in.orig Sat Nov 10 07:58:20 2001 +++ kcontrol/konqhtml/Makefile.in -@@ -283 +283 @@ +@@ -282,7 +282,7 @@ + libkcm_konqhtml_la_SOURCES = htmlopts.cpp jsopts.cpp javaopts.cpp pluginopts.cpp appearance.cpp khttpoptdlg.cpp policydlg.cpp main.cpp + + -libkcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +libkcm_konqhtml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH} -@@ -329 +329 @@ + libkcm_konqhtml_la_LIBADD = -lkhtml -lkdeui + + data_DATA = konqhtml.desktop +@@ -328,7 +328,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=javaopts.h jsopts.h appearance.h htmlopts.h khttpoptdlg.h policydlg.h main.h pluginopts.h konqhtml.desktop +KDE_DIST=policydlg.h jsopts.h khttpoptdlg.h konqhtml.desktop main.h htmlopts.h javaopts.h pluginopts.h appearance.h -@@ -489,11 +488,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase2/patches/patch-be b/x11/kdebase2/patches/patch-be index a16fa06421e..3ac4863ae6d 100644 --- a/x11/kdebase2/patches/patch-be +++ b/x11/kdebase2/patches/patch-be @@ -1,16 +1,20 @@ -$NetBSD: patch-be,v 1.1 2001/10/15 22:46:01 skrll Exp $ +$NetBSD: patch-be,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kdeprint/kjobviewer/Makefile.in.orig Sat Sep 8 01:36:29 2001 +--- kdeprint/kjobviewer/Makefile.in.orig Sat Nov 10 07:58:23 2001 +++ kdeprint/kjobviewer/Makefile.in -@@ -277 +277 @@ +@@ -276,15 +276,20 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = kjobviewer -lib_LTLIBRARIES = kjobviewer.la +lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la -@@ -279,2 +279,2 @@ + -kjobviewer_SOURCES = dummy.cpp -kjobviewer_LDADD = kjobviewer.la +kjobviewer_SOURCES = kjobviewer_main.cpp +kjobviewer_LDADD = libkjobviewer_main.la -@@ -283 +283,6 @@ + kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries) + -kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp +libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp +#>- libkjobviewer_main_la_METASOURCES = AUTO @@ -18,91 +22,128 @@ $NetBSD: patch-be,v 1.1 2001/10/15 22:46:01 skrll Exp $ +libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kjobviewer_la_SOURCES = kjobviewer_main.cpp -@@ -285 +290 @@ + #>- kjobviewer_la_METASOURCES = AUTO -kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) +kjobviewer_la_LIBADD = libkjobviewer_main.la -@@ -309,2 +314,2 @@ + kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = kjobviewer.h +@@ -308,21 +313,25 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -kjobviewer_la_DEPENDENCIES = -#>- kjobviewer_la_OBJECTS = kjobviewer.lo main.lo +libkjobviewer_main_la_DEPENDENCIES = +#>- libkjobviewer_main_la_OBJECTS = kjobviewer.lo main.lo -@@ -312,5 +317,9 @@ + #>+ 5 -kjobviewer_la_final_OBJECTS = kjobviewer_la.all_cpp.lo -kjobviewer_la_nofinal_OBJECTS = kjobviewer.lo main.lo \ --kjobviewer_la_meta_unload.lo +- kjobviewer_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kjobviewer_la_OBJECTS = $(kjobviewer_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kjobviewer_la_OBJECTS = $(kjobviewer_la_final_OBJECTS) +libkjobviewer_main_la_final_OBJECTS = libkjobviewer_main_la.all_cpp.lo +libkjobviewer_main_la_nofinal_OBJECTS = kjobviewer.lo main.lo \ -+libkjobviewer_main_la_meta_unload.lo ++ libkjobviewer_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_final_OBJECTS) +kjobviewer_la_DEPENDENCIES = libkjobviewer_main.la +#>- kjobviewer_la_OBJECTS = kjobviewer_main.lo +#>+ 1 +kjobviewer_la_OBJECTS = kjobviewer_main.lo -@@ -320 +329 @@ + bin_PROGRAMS = kjobviewer$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kjobviewer_OBJECTS = dummy.$(OBJEXT) +#>- kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT) -@@ -322,2 +331,2 @@ + #>+ 1 -kjobviewer_OBJECTS = dummy.$(OBJEXT) -kjobviewer_DEPENDENCIES = kjobviewer.la +kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT) +kjobviewer_DEPENDENCIES = libkjobviewer_main.la -@@ -344 +353 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -343,15 +352,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=kjobviewerui.rc hi32-app-kjobviewer.png kjobviewer.desktop hi16-app-kjobviewer.png +KDE_DIST=hi32-app-kjobviewer.png hi16-app-kjobviewer.png kjobviewerui.rc kjobviewer.desktop -@@ -351,2 +360,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES) -OBJECTS = $(kjobviewer_la_OBJECTS) $(kjobviewer_OBJECTS) +SOURCES = $(libkjobviewer_main_la_SOURCES) $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES) +OBJECTS = $(libkjobviewer_main_la_OBJECTS) $(kjobviewer_la_OBJECTS) $(kjobviewer_OBJECTS) -@@ -438,0 +448,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -438,6 +447,9 @@ + + maintainer-clean-libtool: + +libkjobviewer_main.la: $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkjobviewer_main_la_LDFLAGS) $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_LIBADD) $(LIBS) + -@@ -549,11 +560,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -664,3 +664,0 @@ + kjobviewer.la: $(kjobviewer_la_OBJECTS) $(kjobviewer_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kjobviewer_la_LDFLAGS) $(kjobviewer_la_OBJECTS) $(kjobviewer_la_LIBADD) $(LIBS) + +@@ -652,9 +664,6 @@ + mostlyclean distclean maintainer-clean + + -dummy.cpp: - echo > dummy.cpp - -@@ -678,0 +677,4 @@ + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot + +@@ -667,8 +676,12 @@ + $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc + + #>+ 3 +kjobviewer.moc: $(srcdir)/kjobviewer.h + $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc + +#>+ 3 -@@ -680 +682 @@ + clean-metasources: - -rm -f kjobviewer.moc + -rm -f kjobviewer.moc kjobviewer.moc -@@ -703,8 +705,8 @@ + + #>+ 2 + docs-am: +@@ -691,28 +704,40 @@ + + + #>+ 12 -kjobviewer_la_meta_unload.cpp: kjobviewer.moc - @echo 'creating kjobviewer_la_meta_unload.cpp' - @-rm -f kjobviewer_la_meta_unload.cpp -- @echo 'static const char * _metalist_kjobviewer_la[] = {' > kjobviewer_la_meta_unload.cpp -- @cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kjobviewer_la_meta_unload.cpp -- @echo '0};' >> kjobviewer_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kjobviewer_la_meta_unload.cpp -- @echo '_UNLOAD(kjobviewer_la)' >> kjobviewer_la_meta_unload.cpp +libkjobviewer_main_la_meta_unload.cpp: kjobviewer.moc + @echo 'creating libkjobviewer_main_la_meta_unload.cpp' + @-rm -f libkjobviewer_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkjobviewer_main_la[] = {' > libkjobviewer_main_la_meta_unload.cpp -+ @cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkjobviewer_main_la_meta_unload.cpp -+ @echo '0};' >> libkjobviewer_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkjobviewer_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkjobviewer_main_la)' >> libkjobviewer_main_la_meta_unload.cpp -@@ -715 +717,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kjobviewer_la[] = {' > kjobviewer_la_meta_unload.cpp ;\ +- cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kjobviewer_la_meta_unload.cpp ;\ +- echo '0};' >> kjobviewer_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kjobviewer_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kjobviewer_la)' >> kjobviewer_la_meta_unload.cpp ;\ +- else echo > kjobviewer_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkjobviewer_main_la[] = {' > libkjobviewer_main_la_meta_unload.cpp ;\ ++ cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkjobviewer_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkjobviewer_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkjobviewer_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkjobviewer_main_la)' >> libkjobviewer_main_la_meta_unload.cpp ;\ ++ else echo > libkjobviewer_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kjobviewer_la_meta_unload.cpp + -rm -f libkjobviewer_main_la_meta_unload.cpp + @@ -117,27 +158,61 @@ $NetBSD: patch-be,v 1.1 2001/10/15 22:46:01 skrll Exp $ + done; \ + cat libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files > libkjobviewer_main_la.all_cpp.cpp; \ + rm -f libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files -@@ -718 +732 @@ + + #>+ 11 -kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer_la_meta_unload.cpp kjobviewer.moc +kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp kjobviewer.moc -@@ -722 +736 @@ + @echo 'creating kjobviewer_la.all_cpp.cpp ...'; \ + rm -f kjobviewer_la.all_cpp.files kjobviewer_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kjobviewer_la.all_cpp.final; \ - for file in kjobviewer.cpp main.cpp kjobviewer_la_meta_unload.cpp ; do \ + for file in kjobviewer_main.cpp ; do \ -@@ -730 +744 @@ + echo "#include \"$$file\"" >> kjobviewer_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer_la.all_cpp.final; \ + done; \ +@@ -720,11 +745,11 @@ + rm -f kjobviewer_la.all_cpp.final kjobviewer_la.all_cpp.files + + #>+ 11 -kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp -@@ -734 +748 @@ + @echo 'creating kjobviewer.all_cpp.cpp ...'; \ + rm -f kjobviewer.all_cpp.files kjobviewer.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kjobviewer.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kjobviewer_main.cpp ; do \ -@@ -743 +757 @@ + echo "#include \"$$file\"" >> kjobviewer.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer.all_cpp.final; \ + done; \ +@@ -733,20 +758,20 @@ + + #>+ 3 + clean-final: - -rm -f kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp + -rm -f libkjobviewer_main_la.all_cpp.cpp kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp -@@ -747 +761 @@ + + #>+ 2 + final: - $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" all-am + $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" all-am -@@ -750 +764 @@ + #>+ 2 + final-install: +- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" install-am ++ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" all-am + $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" all-am -@@ -760 +774 @@ + #>+ 2 + no-final-install: +- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -756,4 +781,4 @@ + -rm -f *.rpo + + #>+ 2 -$(srcdir)/kjobviewer.cpp: kjobviewer.moc +$(srcdir)/kjobviewer.cpp: kjobviewer.moc kjobviewer.moc diff --git a/x11/kdebase2/patches/patch-bi b/x11/kdebase2/patches/patch-bi index cff4c2933e8..3db94a6d357 100644 --- a/x11/kdebase2/patches/patch-bi +++ b/x11/kdebase2/patches/patch-bi @@ -1,8 +1,8 @@ -$NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ +$NetBSD: patch-bi,v 1.3 2001/12/03 15:37:19 skrll Exp $ ---- kdesktop/Makefile.in.orig Sat Sep 8 01:36:30 2001 +--- kdesktop/Makefile.in.orig Sat Nov 10 07:58:23 2001 +++ kdesktop/Makefile.in -@@ -272,10 +272,12 @@ +@@ -274,10 +274,12 @@ x_libraries = @x_libraries@ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) @@ -17,7 +17,7 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ SUBDIRS = . pics patterns programs init kwebdesktop -@@ -283,14 +285,16 @@ +@@ -285,14 +287,16 @@ bin_PROGRAMS = kdesktop kdmdesktop bin_SCRIPTS = kdeeject @@ -38,13 +38,13 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h -@@ -322,26 +326,30 @@ +@@ -324,26 +328,30 @@ LIBS = @LIBS@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ -kdesktop_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ +libkdesktop_main_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ - $(top_builddir)/kcontrol/background/libbgnd.la + $(top_builddir)/kcontrol/background/libbgnd.la -#>- kdesktop_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo desktop.lo \ -#>- main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \ -#>- pixmapserver.lo kcustommenu.lo startupid.lo @@ -54,16 +54,16 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ #>+ 7 -kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo -kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo desktop.lo \ --main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \ --pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ --kdesktop_la_meta_unload.lo +- main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo minicli.lo \ +- pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ +- kdesktop_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS) +libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo +libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ -+desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \ -+minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ -+libkdesktop_main_la_meta_unload.lo ++ desktop.lo main.lo lockeng.lo lockdlg.lo bgmanager.lo init.lo \ ++ minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ ++ libkdesktop_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS) +kdesktop_la_DEPENDENCIES = libkdesktop_main.la @@ -82,13 +82,13 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ +kdesktop_DEPENDENCIES = libkdesktop_main.la #>- kdmdesktop_OBJECTS = kdmdesktop.$(OBJEXT) #>+ 5 - kdmdesktop_final_OBJECTS = kdmdesktop.o kdmdesktop.all_cc.o -@@ -373,15 +381,15 @@ + kdmdesktop_final_OBJECTS = kdmdesktop.all_cpp.o kdmdesktop.all_cc.o +@@ -375,15 +383,15 @@ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 DESIGN kcustommenu.h kdiconview.h kdesktopbindings.cpp kdmdesktop.h kdeeject -+KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kdmdesktop kcustommenu.h KBackgroundIface.kidl kdiconview.h KScreensaverIface.kidl kdesktop libkdesktop_main_la_meta_unload.cc kdesktop.core kdesktopbindings.cpp kdeeject KDesktopIface.kidl kdmdesktop_meta_unload.cc kdmdesktop.h ++KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h kdesktopbindings.cpp kdeeject kdmdesktop.h DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@ -102,7 +102,7 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ #>- all: all-redirect #>+ 1 -@@ -468,6 +476,9 @@ +@@ -470,6 +478,9 @@ maintainer-clean-libtool: @@ -112,34 +112,7 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) -@@ -624,7 +635,7 @@ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ -@@ -682,17 +693,6 @@ - subdir = kdesktop - - distdir: $(DISTFILES) --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -819,9 +819,6 @@ +@@ -810,9 +821,6 @@ messages: $(XGETTEXT) *.cc *.cpp *.h -o $(podir)/kdesktop.pot @@ -149,30 +122,33 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ install-data-local: @test -n "$(DESTDIR)" || test -z "$(PAM)" || $(top_srcdir)/mkpamserv $(PAM) -@@ -912,14 +909,14 @@ +@@ -903,16 +911,16 @@ - #>+ 10 + #>+ 12 -kdesktop_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc - @echo 'creating kdesktop_la_meta_unload.cc' - @-rm -f kdesktop_la_meta_unload.cc -- @echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc -- @cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc -- @echo '0};' >> kdesktop_la_meta_unload.cc -- @echo '#include <kunload.h>' >> kdesktop_la_meta_unload.cc -- @echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc +libkdesktop_main_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc + @echo 'creating libkdesktop_main_la_meta_unload.cc' + @-rm -f libkdesktop_main_la_meta_unload.cc -+ @echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc -+ @cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc -+ @echo '0};' >> libkdesktop_main_la_meta_unload.cc -+ @echo '#include <kunload.h>' >> libkdesktop_main_la_meta_unload.cc -+ @echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc - - - #>+ 10 -@@ -935,26 +932,38 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc ;\ +- cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc ;\ +- echo '0};' >> kdesktop_la_meta_unload.cc ;\ +- echo '#include <kunload.h>' >> kdesktop_la_meta_unload.cc ;\ +- echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc ;\ +- else echo > kdesktop_la_meta_unload.cc; fi ++ echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc ;\ ++ cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc lockdlg.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc ;\ ++ echo '0};' >> libkdesktop_main_la_meta_unload.cc ;\ ++ echo '#include <kunload.h>' >> libkdesktop_main_la_meta_unload.cc ;\ ++ echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc ;\ ++ else echo > libkdesktop_main_la_meta_unload.cc; fi + + + #>+ 12 +@@ -930,26 +938,38 @@ #>+ 3 clean-moc-classes: @@ -180,11 +156,11 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ + -rm -f libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc #>+ 11 --kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp +-kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc - @echo 'creating kdesktop_la.all_cpp.cpp ...'; \ - rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ -+libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp ++libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc + @echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \ + rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \ @@ -198,7 +174,7 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ + rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files + +#>+ 11 -+libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc $(srcdir)/KDesktopIface_skel.cc $(srcdir)/KScreensaverIface_skel.cc $(srcdir)/KBackgroundIface_skel.cc $(srcdir)/libkdesktop_main_la_meta_unload.cc xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc ++libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/lockdlg.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc xautolock.moc pixmapserver.moc lockeng.moc kdmdesktop.moc startupid.moc lockdlg.moc bgmanager.moc kdiconview.moc minicli.moc kcustommenu.moc desktop.moc krootwm.moc + @echo 'creating libkdesktop_main_la.all_cc.cc ...'; \ + rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \ @@ -222,7 +198,7 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ done; \ -@@ -962,11 +971,11 @@ +@@ -957,11 +977,11 @@ rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files #>+ 11 @@ -236,30 +212,29 @@ $NetBSD: patch-bi,v 1.2 2001/10/18 15:43:11 skrll Exp $ echo "#include \"$$file\"" >> kdesktop.all_cc.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop.all_cc.final; \ done; \ -@@ -974,7 +983,7 @@ - rm -f kdesktop.all_cc.final kdesktop.all_cc.files - - #>+ 11 --kdmdesktop.all_cc.cc: $(srcdir)/Makefile.in kdmdesktop_meta_unload.cc -+kdmdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdmdesktop_meta_unload.cc - @echo 'creating kdmdesktop.all_cc.cc ...'; \ - rm -f kdmdesktop.all_cc.files kdmdesktop.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kdmdesktop.all_cc.final; \ -@@ -987,14 +996,14 @@ +@@ -994,20 +1014,20 @@ #>+ 3 clean-final: -- -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cc.cc -+ -rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cc.cc +- -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc ++ -rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc #>+ 2 final: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am #>+ 2 + final-install: +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am + #>+ 2 no-final: - $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am + $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-bm b/x11/kdebase2/patches/patch-bm index 03075225a23..545e06cf46d 100644 --- a/x11/kdebase2/patches/patch-bm +++ b/x11/kdebase2/patches/patch-bm @@ -1,99 +1,129 @@ -$NetBSD: patch-bm,v 1.1 2001/10/15 22:46:02 skrll Exp $ +$NetBSD: patch-bm,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- khotkeys/khotkeys/Makefile.in.orig Sat Sep 8 01:36:32 2001 +--- khotkeys/khotkeys/Makefile.in.orig Sat Nov 10 07:58:25 2001 +++ khotkeys/khotkeys/Makefile.in -@@ -277 +277 @@ +@@ -276,17 +276,21 @@ + x_libraries = @x_libraries@ + + bin_PROGRAMS = khotkeys -lib_LTLIBRARIES = khotkeys.la +lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la -@@ -279 +279 @@ + -#>- khotkeys_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys.skel +#>- libkhotkeys_main_la_SOURCES = khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys.skel -@@ -281 +281 @@ + #>+ 1 -khotkeys_la_SOURCES=khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp +libkhotkeys_main_la_SOURCES=khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp -@@ -283 +283,5 @@ + -khotkeys_la_LIBADD = ../shared/libshared.la -lksycoca +libkhotkeys_main_la_LIBADD = ../shared/libshared.la -lksycoca +libkhotkeys_main_la_LDFLAGS = $(all_libraries) + +khotkeys_la_SOURCES = khotkeys_main.cpp +khotkeys_la_LIBADD = libkhotkeys_main.la -@@ -286,2 +290,2 @@ + khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version + -khotkeys_SOURCES = dummy.cpp -khotkeys_LDADD = khotkeys.la +khotkeys_SOURCES = khotkeys_main.cpp +khotkeys_LDADD = libkhotkeys_main.la -@@ -310,2 +314,2 @@ + khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + autostart_DATA = khotkeys.desktop +@@ -309,21 +313,25 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -khotkeys_la_DEPENDENCIES = ../shared/libshared.la -#>- khotkeys_la_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo +libkhotkeys_main_la_DEPENDENCIES = ../shared/libshared.la +#>- libkhotkeys_main_la_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo -@@ -313,5 +317,9 @@ + #>+ 5 -khotkeys_la_final_OBJECTS = khotkeys_la.all_cpp.lo -khotkeys_la_nofinal_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo khotkeys_skel.lo \ --khotkeys_la_meta_unload.lo +- khotkeys_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@khotkeys_la_OBJECTS = $(khotkeys_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@khotkeys_la_OBJECTS = $(khotkeys_la_final_OBJECTS) +libkhotkeys_main_la_final_OBJECTS = libkhotkeys_main_la.all_cpp.lo +libkhotkeys_main_la_nofinal_OBJECTS = khkglobalaccel.lo khotkeys.lo main.lo khotkeys_skel.lo \ -+libkhotkeys_main_la_meta_unload.lo ++ libkhotkeys_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_final_OBJECTS) +khotkeys_la_DEPENDENCIES = libkhotkeys_main.la +#>- khotkeys_la_OBJECTS = khotkeys_main.lo +#>+ 1 +khotkeys_la_OBJECTS = khotkeys_main.lo -@@ -321 +329 @@ + bin_PROGRAMS = khotkeys$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- khotkeys_OBJECTS = dummy.$(OBJEXT) +#>- khotkeys_OBJECTS = khotkeys_main.$(OBJEXT) -@@ -323,2 +331,2 @@ + #>+ 1 -khotkeys_OBJECTS = dummy.$(OBJEXT) -khotkeys_DEPENDENCIES = khotkeys.la +khotkeys_OBJECTS = khotkeys_main.$(OBJEXT) +khotkeys_DEPENDENCIES = libkhotkeys_main.la -@@ -352,2 +360,2 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -351,8 +359,8 @@ + + TAR = tar + GZIP_ENV = --best -SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES) -OBJECTS = $(khotkeys_la_OBJECTS) $(khotkeys_OBJECTS) +SOURCES = $(libkhotkeys_main_la_SOURCES) $(khotkeys_la_SOURCES) $(khotkeys_SOURCES) +OBJECTS = $(libkhotkeys_main_la_OBJECTS) $(khotkeys_la_OBJECTS) $(khotkeys_OBJECTS) -@@ -439,0 +448,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -439,6 +447,9 @@ + + maintainer-clean-libtool: + +libkhotkeys_main.la: $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkhotkeys_main_la_LDFLAGS) $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_LIBADD) $(LIBS) + -@@ -531,11 +541,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -640,3 +639,0 @@ + khotkeys.la: $(khotkeys_la_OBJECTS) $(khotkeys_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(khotkeys_la_LDFLAGS) $(khotkeys_la_OBJECTS) $(khotkeys_la_LIBADD) $(LIBS) + +@@ -628,9 +639,6 @@ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + -dummy.cpp: - echo > dummy.cpp - -@@ -680,8 +677,8 @@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +@@ -668,28 +676,40 @@ + + + #>+ 12 -khotkeys_la_meta_unload.cpp: khotkeys.moc khkglobalaccel.moc - @echo 'creating khotkeys_la_meta_unload.cpp' - @-rm -f khotkeys_la_meta_unload.cpp -- @echo 'static const char * _metalist_khotkeys_la[] = {' > khotkeys_la_meta_unload.cpp -- @cat khotkeys.moc khkglobalaccel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> khotkeys_la_meta_unload.cpp -- @echo '0};' >> khotkeys_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> khotkeys_la_meta_unload.cpp -- @echo '_UNLOAD(khotkeys_la)' >> khotkeys_la_meta_unload.cpp +libkhotkeys_main_la_meta_unload.cpp: khotkeys.moc khkglobalaccel.moc + @echo 'creating libkhotkeys_main_la_meta_unload.cpp' + @-rm -f libkhotkeys_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkhotkeys_main_la[] = {' > libkhotkeys_main_la_meta_unload.cpp -+ @cat khotkeys.moc khkglobalaccel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkhotkeys_main_la_meta_unload.cpp -+ @echo '0};' >> libkhotkeys_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkhotkeys_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkhotkeys_main_la)' >> libkhotkeys_main_la_meta_unload.cpp -@@ -692 +689,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_khotkeys_la[] = {' > khotkeys_la_meta_unload.cpp ;\ +- cat khotkeys.moc khkglobalaccel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> khotkeys_la_meta_unload.cpp ;\ +- echo '0};' >> khotkeys_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> khotkeys_la_meta_unload.cpp ;\ +- echo '_UNLOAD(khotkeys_la)' >> khotkeys_la_meta_unload.cpp ;\ +- else echo > khotkeys_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkhotkeys_main_la[] = {' > libkhotkeys_main_la_meta_unload.cpp ;\ ++ cat khotkeys.moc khkglobalaccel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkhotkeys_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkhotkeys_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkhotkeys_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkhotkeys_main_la)' >> libkhotkeys_main_la_meta_unload.cpp ;\ ++ else echo > libkhotkeys_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f khotkeys_la_meta_unload.cpp + -rm -f libkhotkeys_main_la_meta_unload.cpp + @@ -108,24 +138,55 @@ $NetBSD: patch-bm,v 1.1 2001/10/15 22:46:02 skrll Exp $ + done; \ + cat libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files > libkhotkeys_main_la.all_cpp.cpp; \ + rm -f libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files -@@ -695 +704 @@ + + #>+ 11 -khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khkglobalaccel.cpp $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp khotkeys.moc khkglobalaccel.moc +khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp -@@ -699 +708 @@ + @echo 'creating khotkeys_la.all_cpp.cpp ...'; \ + rm -f khotkeys_la.all_cpp.files khotkeys_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> khotkeys_la.all_cpp.final; \ - for file in khkglobalaccel.cpp khotkeys.cpp main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp ; do \ + for file in khotkeys_main.cpp ; do \ -@@ -707 +716 @@ + echo "#include \"$$file\"" >> khotkeys_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys_la.all_cpp.final; \ + done; \ +@@ -697,11 +717,11 @@ + rm -f khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files + + #>+ 11 -khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp -@@ -711 +720 @@ + @echo 'creating khotkeys.all_cpp.cpp ...'; \ + rm -f khotkeys.all_cpp.files khotkeys.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> khotkeys.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in khotkeys_main.cpp ; do \ -@@ -720 +729 @@ + echo "#include \"$$file\"" >> khotkeys.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys.all_cpp.final; \ + done; \ +@@ -710,20 +730,20 @@ + + #>+ 3 + clean-final: - -rm -f khotkeys_la.all_cpp.cpp khotkeys.all_cpp.cpp + -rm -f libkhotkeys_main_la.all_cpp.cpp khotkeys_la.all_cpp.cpp khotkeys.all_cpp.cpp -@@ -724 +733 @@ + + #>+ 2 + final: - $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" all-am + $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" all-am -@@ -727 +736 @@ + #>+ 2 + final-install: +- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" install-am ++ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" all-am + $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-bp b/x11/kdebase2/patches/patch-bp index a202f8c2d74..0c325cdf4c5 100644 --- a/x11/kdebase2/patches/patch-bp +++ b/x11/kdebase2/patches/patch-bp @@ -1,8 +1,8 @@ -$NetBSD: patch-bp,v 1.3 2001/10/18 15:43:11 skrll Exp $ +$NetBSD: patch-bp,v 1.4 2001/12/03 15:37:19 skrll Exp $ ---- kicker/Makefile.am.orig Sat Jun 2 19:01:03 2001 +--- kicker/Makefile.am.orig Mon Dec 3 11:00:21 2001 +++ kicker/Makefile.am -@@ -3,16 +3,20 @@ +@@ -3,7 +3,7 @@ SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data bin_PROGRAMS = kicker @@ -11,16 +11,14 @@ $NetBSD: patch-bp,v 1.3 2001/10/18 15:43:11 skrll Exp $ CLEANFILES = dummy.cpp - kicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE) --kicker_la_SOURCES = dummy.cpp -+kicker_la_SOURCES = kicker_main.cpp +@@ -11,8 +11,11 @@ + kicker_la_SOURCES = dummy.cpp kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module -kicker_LDADD = kicker.la -kicker_SOURCES = dummy.cpp +libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE) +libkicker_la_SOURCES = dummy.cpp -+libkicker_la_LDFLAGS = $(KDE_PLUGIN) + +kicker_LDADD = libkicker.la +kicker_SOURCES = kicker_main.cpp diff --git a/x11/kdebase2/patches/patch-bq b/x11/kdebase2/patches/patch-bq index 2d8b10bb323..abc4001ebf7 100644 --- a/x11/kdebase2/patches/patch-bq +++ b/x11/kdebase2/patches/patch-bq @@ -1,19 +1,8 @@ -$NetBSD: patch-bq,v 1.3 2001/10/18 15:43:11 skrll Exp $ +$NetBSD: patch-bq,v 1.4 2001/12/03 15:37:19 skrll Exp $ ---- kicker/Makefile.in.orig Sat Sep 8 01:36:32 2001 +--- kicker/Makefile.in.orig Sat Nov 10 07:58:25 2001 +++ kicker/Makefile.in -@@ -19,10 +18,6 @@ - VPATH = @srcdir@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ --#>- --bindir = @bindir@ --#>+ 3 --DEPDIR = .deps - - bindir = @bindir@ - sbindir = @sbindir@ -@@ -276,16 +271,20 @@ +@@ -278,7 +278,7 @@ SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data bin_PROGRAMS = kicker @@ -22,68 +11,44 @@ $NetBSD: patch-bq,v 1.3 2001/10/18 15:43:11 skrll Exp $ CLEANFILES = dummy.cpp - kicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE) --kicker_la_SOURCES = dummy.cpp -+kicker_la_SOURCES = kicker_main.cpp +@@ -286,8 +286,11 @@ + kicker_la_SOURCES = dummy.cpp kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module -kicker_LDADD = kicker.la -kicker_SOURCES = dummy.cpp +libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE) +libkicker_la_SOURCES = dummy.cpp -+libkicker_la_LDFLAGS = $(KDE_PLUGIN) + +kicker_LDADD = libkicker.la +kicker_SOURCES = kicker_main.cpp kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = panel.desktop -@@ -304,54 +303,37 @@ - X_LIBS = @X_LIBS@ - kicker_la_DEPENDENCIES = share/libkicker_share.la \ - core/libkicker_core.la ui/libkicker_ui.la --#>- kicker_la_OBJECTS = dummy.lo --#>+ 1 --kicker_la_OBJECTS = dummy.lo -+kicker_la_OBJECTS = kicker_main.lo +@@ -309,13 +312,19 @@ + #>- kicker_la_OBJECTS = dummy.lo + #>+ 1 + kicker_la_OBJECTS = dummy.lo ++libkicker_la_LDFLAGS = +libkicker_la_DEPENDENCIES = share/libkicker_share.la \ -+core/libkicker_core.la ui/libkicker_ui.la -+libkicker_la_OBJECTS = dummy.lo ++ core/libkicker_core.la ui/libkicker_ui.la ++#>- libkicker_la_OBJECTS = dummy.lo ++#>+ 1 ++libkicker_la_OBJECTS = dummy.lo bin_PROGRAMS = kicker$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -#>- kicker_OBJECTS = dummy.$(OBJEXT) --#>+ 1 ++#>- kicker_OBJECTS = kicker_main.$(OBJEXT) + #>+ 1 -kicker_OBJECTS = dummy.$(OBJEXT) -kicker_DEPENDENCIES = kicker.la -+kicker_OBJECTS = kicker_main.$(OBJEXT) ++kicker_OBJECTS = kicker_main.$(OBJEXT) +kicker_DEPENDENCIES = libkicker.la CXXFLAGS = @CXXFLAGS@ --#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 1 --CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 1 --LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) -+CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ --#>+ 1 --CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) $(LDFLAGS) -o $@ -+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ - DATA = $(autostart_DATA) - - DIST_COMMON = AUTHORS Makefile.am Makefile.in TODO - - --#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) --#>+ 4 --KDE_DIST=panel.desktop -- --DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -- -+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -341,8 +350,8 @@ TAR = tar GZIP_ENV = --best @@ -92,29 +57,10 @@ $NetBSD: patch-bq,v 1.3 2001/10/18 15:43:11 skrll Exp $ +SOURCES = $(kicker_la_SOURCES) $(libkicker_la_SOURCES) $(kicker_SOURCES) +OBJECTS = $(kicker_la_OBJECTS) $(libkicker_la_OBJECTS) $(kicker_OBJECTS) --#>- all: all-redirect --#>+ 1 --all: docs-am all-redirect -+all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .cpp .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) --#>- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kicker/Makefile --#>+ 2 - cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kicker/Makefile -- cd $(top_srcdir) && perl admin/am_edit kicker/Makefile.in - - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ -@@ -427,12 +409,12 @@ - - maintainer-clean-libtool: - --#>- kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@kicker.la: kicker.la.closure $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) -+kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) + #>- all: all-redirect + #>+ 1 +@@ -435,6 +444,9 @@ + @KDE_USE_CLOSURE_FALSE@kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS) +libkicker.la: $(libkicker_la_OBJECTS) $(libkicker_la_DEPENDENCIES) @@ -123,118 +69,47 @@ $NetBSD: patch-bq,v 1.3 2001/10/18 15:43:11 skrll Exp $ mostlyclean-binPROGRAMS: clean-binPROGRAMS: -@@ -523,7 +505,7 @@ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ -@@ -581,17 +563,6 @@ - subdir = kicker +@@ -731,7 +743,7 @@ - distdir: $(DISTFILES) --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -658,17 +629,11 @@ - mostlyclean: mostlyclean-recursive - --#>- clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \ --#>- clean-binPROGRAMS clean-tags clean-generic \ --#>- mostlyclean-am --#>+ 3 --clean-am: clean-closures clean-final clean-libLTLIBRARIES clean-compile clean-libtool \ -+clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \ - clean-binPROGRAMS clean-tags clean-generic \ - mostlyclean-am - --#>- clean: clean-recursive --#>+ 1 --clean: kde-rpo-clean clean-recursive -+clean: clean-recursive - - distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-binPROGRAMS distclean-tags \ -@@ -716,67 +681,3 @@ - # 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: -- --#>+ 8 --kicker.la.closure: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > kicker_la_closure.cpp -- @$(LTCXXCOMPILE) -c kicker_la_closure.cpp -- @$(CXXLINK) kicker_la_closure.lo $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS) -- @rm -f kicker_la_closure.* kicker.la.closure -- @echo "timestamp" > kicker.la.closure -- -- --#>+ 3 --clean-closures: -- -rm -f kicker.la.closure -- --#>+ 2 --docs-am: -- --#>+ 5 --force-reedit: -- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kicker/Makefile -- cd $(top_srcdir) && perl admin/am_edit kicker/Makefile.in -- -- --#>+ 11 + #>+ 11 -kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -- @echo 'creating kicker_la.all_cpp.cpp ...'; \ -- rm -f kicker_la.all_cpp.files kicker_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kicker_la.all_cpp.final; \ -- for file in dummy.cpp ; do \ -- echo "#include \"$$file\"" >> kicker_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker_la.all_cpp.final; \ -- done; \ -- cat kicker_la.all_cpp.final kicker_la.all_cpp.files > kicker_la.all_cpp.cpp; \ -- rm -f kicker_la.all_cpp.final kicker_la.all_cpp.files -- --#>+ 11 ++kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp + @echo 'creating kicker_la.all_cpp.cpp ...'; \ + rm -f kicker_la.all_cpp.files kicker_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kicker_la.all_cpp.final; \ +@@ -743,11 +755,23 @@ + rm -f kicker_la.all_cpp.final kicker_la.all_cpp.files + + #>+ 11 -kicker.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -- @echo 'creating kicker.all_cpp.cpp ...'; \ -- rm -f kicker.all_cpp.files kicker.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kicker.all_cpp.final; \ ++libkicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp ++ @echo 'creating libkicker_la.all_cpp.cpp ...'; \ ++ rm -f libkicker_la.all_cpp.files libkicker_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkicker_la.all_cpp.final; \ ++ for file in dummy.cpp ; do \ ++ echo "#include \"$$file\"" >> libkicker_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkicker_la.all_cpp.final; \ ++ done; \ ++ cat libkicker_la.all_cpp.final libkicker_la.all_cpp.files > libkicker_la.all_cpp.cpp; \ ++ rm -f libkicker_la.all_cpp.final libkicker_la.all_cpp.files ++ ++#>+ 11 ++kicker.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kicker_main.cpp + @echo 'creating kicker.all_cpp.cpp ...'; \ + rm -f kicker.all_cpp.files kicker.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kicker.all_cpp.final; \ - for file in dummy.cpp ; do \ -- echo "#include \"$$file\"" >> kicker.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker.all_cpp.final; \ -- done; \ -- cat kicker.all_cpp.final kicker.all_cpp.files > kicker.all_cpp.cpp; \ -- rm -f kicker.all_cpp.final kicker.all_cpp.files -- --#>+ 3 --clean-final: ++ for file in kicker_main.cpp ; do \ + echo "#include \"$$file\"" >> kicker.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker.all_cpp.final; \ + done; \ +@@ -756,7 +780,7 @@ + + #>+ 3 + clean-final: - -rm -f kicker_la.all_cpp.cpp kicker.all_cpp.cpp -- --#>+ 2 --final: -- $(MAKE) all-am --#>+ 2 --no-final: -- $(MAKE) all-am --#>+ 3 --cvs-clean: -- $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo ++ -rm -f kicker_la.all_cpp.cpp libkicker_la.all_cpp.cpp kicker.all_cpp.cpp + + #>+ 2 + final: diff --git a/x11/kdebase2/patches/patch-bs b/x11/kdebase2/patches/patch-bs index 3e6520d56ea..13cf01a0f3a 100644 --- a/x11/kdebase2/patches/patch-bs +++ b/x11/kdebase2/patches/patch-bs @@ -1,22 +1,22 @@ -$NetBSD: patch-bs,v 1.1 2001/10/15 22:46:03 skrll Exp $ +$NetBSD: patch-bs,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kicker/applets/launcher/Makefile.in.orig Sat Sep 8 01:36:33 2001 +--- kicker/applets/launcher/Makefile.in.orig Sat Nov 10 07:58:25 2001 +++ kicker/applets/launcher/Makefile.in -@@ -289 +289 @@ +@@ -288,7 +288,7 @@ + EXTRA_DIST = $(lnk_DATA) + + libquicklauncher_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module -libquicklauncher_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) +libquicklauncher_la_LIBADD = ../../libkicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) -@@ -302 +302 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +@@ -301,7 +301,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libquicklauncher_la_DEPENDENCIES = ../../kicker.la +libquicklauncher_la_DEPENDENCIES = ../../libkicker.la -@@ -489,11 +488,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libquicklauncher_la_OBJECTS = quicklauncher.lo quickbutton.lo \ + #>- quickaddappsmenu.lo + #>+ 6 diff --git a/x11/kdebase2/patches/patch-bu b/x11/kdebase2/patches/patch-bu index 91011a7b056..abaeb6eccbb 100644 --- a/x11/kdebase2/patches/patch-bu +++ b/x11/kdebase2/patches/patch-bu @@ -1,22 +1,22 @@ -$NetBSD: patch-bu,v 1.1 2001/10/15 22:46:03 skrll Exp $ +$NetBSD: patch-bu,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kicker/extensions/childpanel/Makefile.in.orig Sat Sep 8 01:36:34 2001 +--- kicker/extensions/childpanel/Makefile.in.orig Sat Nov 10 07:58:26 2001 +++ kicker/extensions/childpanel/Makefile.in -@@ -283 +283 @@ +@@ -282,7 +282,7 @@ + libchildpanelextension_la_SOURCES=childpanelextension.cpp childpanelextension_skel.cpp + #>- libchildpanelextension_la_METASOURCES = AUTO + libchildpanelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module -libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la +libchildpanelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker.la -@@ -303 +303 @@ + + noinst_HEADERS = childpanelextension.h + +@@ -302,7 +302,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libchildpanelextension_la_DEPENDENCIES = ../../kicker.la +libchildpanelextension_la_DEPENDENCIES = ../../libkicker.la -@@ -488,11 +487,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libchildpanelextension_la_OBJECTS = childpanelextension.lo + #>+ 5 + libchildpanelextension_la_final_OBJECTS = libchildpanelextension_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-bw b/x11/kdebase2/patches/patch-bw index 7e788e6492e..ca7258c1ec4 100644 --- a/x11/kdebase2/patches/patch-bw +++ b/x11/kdebase2/patches/patch-bw @@ -1,8 +1,11 @@ -$NetBSD: patch-bw,v 1.1 2001/10/15 22:46:03 skrll Exp $ +$NetBSD: patch-bw,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kicker/proxy/Makefile.in.orig Sat Sep 8 01:36:34 2001 +--- kicker/proxy/Makefile.in.orig Sat Nov 10 07:58:26 2001 +++ kicker/proxy/Makefile.in -@@ -279 +279,6 @@ +@@ -278,24 +278,32 @@ + CLEANFILES = dummy.cpp + + bin_PROGRAMS = appletproxy extensionproxy -lib_LTLIBRARIES = appletproxy.la extensionproxy.la +lib_LTLIBRARIES = libappletproxy_sl.la appletproxy.la libextensionproxy_sl.la extensionproxy.la + @@ -10,16 +13,19 @@ $NetBSD: patch-bw,v 1.1 2001/10/15 22:46:03 skrll Exp $ +libappletproxy_sl_la_SOURCES = appletproxy.cpp +#>- libappletproxy_sl_la_METASOURCES = appletproxy.moc +libappletproxy_sl_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -282,2 +287 @@ + + appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la -appletproxy_la_SOURCES = appletproxy.cpp -#>- appletproxy_la_METASOURCES = appletproxy.moc +appletproxy_la_SOURCES = appletproxy_main.cpp -@@ -286,2 +290,2 @@ + appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + -appletproxy_LDADD = appletproxy.la -appletproxy_SOURCES = dummy.cpp +appletproxy_LDADD = libappletproxy_sl.la +appletproxy_SOURCES = appletproxy_main.cpp -@@ -290,3 +294,7 @@ + appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) + -extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkicker_share.la -extensionproxy_la_SOURCES = extensionproxy.cpp -#>- extensionproxy_la_METASOURCES = extensionproxy.moc @@ -30,27 +36,34 @@ $NetBSD: patch-bw,v 1.1 2001/10/15 22:46:03 skrll Exp $ + +extensionproxy_la_LIBADD = libextensionproxy_sl.la +extensionproxy_la_SOURCES = extensionproxy_main.cpp -@@ -295,2 +303,2 @@ + extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + -extensionproxy_LDADD = extensionproxy.la -extensionproxy_SOURCES = dummy.cpp +extensionproxy_LDADD = libextensionproxy_sl.la +extensionproxy_SOURCES = extensionproxy_main.cpp -@@ -312,2 +320,2 @@ + extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = appletproxy.h extensionproxy.h +@@ -311,33 +319,41 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -appletproxy_la_DEPENDENCIES = ../share/libkicker_share.la -#>- appletproxy_la_OBJECTS = appletproxy.lo +libappletproxy_sl_la_DEPENDENCIES = ../share/libkicker_share.la +#>- libappletproxy_sl_la_OBJECTS = appletproxy.lo -@@ -315,7 +323,11 @@ + #>+ 5 -appletproxy_la_final_OBJECTS = appletproxy_la.all_cpp.lo -appletproxy_la_nofinal_OBJECTS = appletproxy.lo \ --appletproxy_la_meta_unload.lo +- appletproxy_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@appletproxy_la_OBJECTS = $(appletproxy_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@appletproxy_la_OBJECTS = $(appletproxy_la_final_OBJECTS) -extensionproxy_la_DEPENDENCIES = ../share/libkicker_share.la -#>- extensionproxy_la_OBJECTS = extensionproxy.lo +libappletproxy_sl_la_final_OBJECTS = libappletproxy_sl_la.all_cpp.lo +libappletproxy_sl_la_nofinal_OBJECTS = appletproxy.lo \ -+libappletproxy_sl_la_meta_unload.lo ++ libappletproxy_sl_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libappletproxy_sl_la_OBJECTS = $(libappletproxy_sl_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libappletproxy_sl_la_OBJECTS = $(libappletproxy_sl_la_final_OBJECTS) +appletproxy_la_DEPENDENCIES = ../share/libkicker_share.la @@ -59,100 +72,127 @@ $NetBSD: patch-bw,v 1.1 2001/10/15 22:46:03 skrll Exp $ +appletproxy_la_OBJECTS = appletproxy_main.lo +libextensionproxy_sl_la_DEPENDENCIES = ../share/libkicker_share.la +#>- libextensionproxy_sl_la_OBJECTS = extensionproxy.lo -@@ -323,5 +335,9 @@ + #>+ 5 -extensionproxy_la_final_OBJECTS = extensionproxy_la.all_cpp.lo -extensionproxy_la_nofinal_OBJECTS = extensionproxy.lo \ --extensionproxy_la_meta_unload.lo +- extensionproxy_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@extensionproxy_la_OBJECTS = $(extensionproxy_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@extensionproxy_la_OBJECTS = $(extensionproxy_la_final_OBJECTS) +libextensionproxy_sl_la_final_OBJECTS = libextensionproxy_sl_la.all_cpp.lo +libextensionproxy_sl_la_nofinal_OBJECTS = extensionproxy.lo \ -+libextensionproxy_sl_la_meta_unload.lo ++ libextensionproxy_sl_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libextensionproxy_sl_la_OBJECTS = $(libextensionproxy_sl_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libextensionproxy_sl_la_OBJECTS = $(libextensionproxy_sl_la_final_OBJECTS) +extensionproxy_la_DEPENDENCIES = libextensionproxy_sl.la +#>- extensionproxy_la_OBJECTS = extensionproxy_main.lo +#>+ 1 +extensionproxy_la_OBJECTS = extensionproxy_main.lo -@@ -331 +347 @@ + bin_PROGRAMS = appletproxy$(EXEEXT) extensionproxy$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- appletproxy_OBJECTS = dummy.$(OBJEXT) +#>- appletproxy_OBJECTS = appletproxy_main.$(OBJEXT) -@@ -333,3 +349,3 @@ + #>+ 1 -appletproxy_OBJECTS = dummy.$(OBJEXT) -appletproxy_DEPENDENCIES = appletproxy.la -#>- extensionproxy_OBJECTS = dummy.$(OBJEXT) +appletproxy_OBJECTS = appletproxy_main.$(OBJEXT) +appletproxy_DEPENDENCIES = libappletproxy_sl.la +#>- extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT) -@@ -337,2 +353,2 @@ + #>+ 1 -extensionproxy_OBJECTS = dummy.$(OBJEXT) -extensionproxy_DEPENDENCIES = extensionproxy.la +extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT) +extensionproxy_DEPENDENCIES = libextensionproxy_sl.la -@@ -359,2 +375,2 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -358,8 +374,8 @@ + + TAR = tar + GZIP_ENV = --best -SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES) -OBJECTS = $(appletproxy_la_OBJECTS) $(extensionproxy_la_OBJECTS) $(appletproxy_OBJECTS) $(extensionproxy_OBJECTS) +SOURCES = $(libappletproxy_sl_la_SOURCES) $(appletproxy_la_SOURCES) $(libextensionproxy_sl_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES) +OBJECTS = $(libappletproxy_sl_la_OBJECTS) $(appletproxy_la_OBJECTS) $(libextensionproxy_sl_la_OBJECTS) $(extensionproxy_la_OBJECTS) $(appletproxy_OBJECTS) $(extensionproxy_OBJECTS) -@@ -446,0 +463,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -446,9 +462,15 @@ + + maintainer-clean-libtool: + +libappletproxy_sl.la: $(libappletproxy_sl_la_OBJECTS) $(libappletproxy_sl_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libappletproxy_sl_la_LDFLAGS) $(libappletproxy_sl_la_OBJECTS) $(libappletproxy_sl_la_LIBADD) $(LIBS) + -@@ -449,0 +469,3 @@ + appletproxy.la: $(appletproxy_la_OBJECTS) $(appletproxy_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(appletproxy_la_LDFLAGS) $(appletproxy_la_OBJECTS) $(appletproxy_la_LIBADD) $(LIBS) + +libextensionproxy_sl.la: $(libextensionproxy_sl_la_OBJECTS) $(libextensionproxy_sl_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libextensionproxy_sl_la_LDFLAGS) $(libextensionproxy_sl_la_OBJECTS) $(libextensionproxy_sl_la_LIBADD) $(LIBS) + -@@ -526,11 +547,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -638,3 +648,0 @@ + extensionproxy.la: $(extensionproxy_la_OBJECTS) $(extensionproxy_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(extensionproxy_la_LDFLAGS) $(extensionproxy_la_OBJECTS) $(extensionproxy_la_LIBADD) $(LIBS) + +@@ -626,9 +648,6 @@ + $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot + $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot + -dummy.cpp: - echo > dummy.cpp - -@@ -667,8 +675,8 @@ + # 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: +@@ -655,41 +674,53 @@ + + + #>+ 12 -appletproxy_la_meta_unload.cpp: appletproxy.moc - @echo 'creating appletproxy_la_meta_unload.cpp' - @-rm -f appletproxy_la_meta_unload.cpp -- @echo 'static const char * _metalist_appletproxy_la[] = {' > appletproxy_la_meta_unload.cpp -- @cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> appletproxy_la_meta_unload.cpp -- @echo '0};' >> appletproxy_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> appletproxy_la_meta_unload.cpp -- @echo '_UNLOAD(appletproxy_la)' >> appletproxy_la_meta_unload.cpp +libappletproxy_sl_la_meta_unload.cpp: appletproxy.moc + @echo 'creating libappletproxy_sl_la_meta_unload.cpp' + @-rm -f libappletproxy_sl_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libappletproxy_sl_la[] = {' > libappletproxy_sl_la_meta_unload.cpp -+ @cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libappletproxy_sl_la_meta_unload.cpp -+ @echo '0};' >> libappletproxy_sl_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libappletproxy_sl_la_meta_unload.cpp -+ @echo '_UNLOAD(libappletproxy_sl_la)' >> libappletproxy_sl_la_meta_unload.cpp -@@ -678,8 +686,8 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_appletproxy_la[] = {' > appletproxy_la_meta_unload.cpp ;\ +- cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> appletproxy_la_meta_unload.cpp ;\ +- echo '0};' >> appletproxy_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> appletproxy_la_meta_unload.cpp ;\ +- echo '_UNLOAD(appletproxy_la)' >> appletproxy_la_meta_unload.cpp ;\ +- else echo > appletproxy_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libappletproxy_sl_la[] = {' > libappletproxy_sl_la_meta_unload.cpp ;\ ++ cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libappletproxy_sl_la_meta_unload.cpp ;\ ++ echo '0};' >> libappletproxy_sl_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libappletproxy_sl_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libappletproxy_sl_la)' >> libappletproxy_sl_la_meta_unload.cpp ;\ ++ else echo > libappletproxy_sl_la_meta_unload.cpp; fi + + + #>+ 12 -extensionproxy_la_meta_unload.cpp: extensionproxy.moc - @echo 'creating extensionproxy_la_meta_unload.cpp' - @-rm -f extensionproxy_la_meta_unload.cpp -- @echo 'static const char * _metalist_extensionproxy_la[] = {' > extensionproxy_la_meta_unload.cpp -- @cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> extensionproxy_la_meta_unload.cpp -- @echo '0};' >> extensionproxy_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> extensionproxy_la_meta_unload.cpp -- @echo '_UNLOAD(extensionproxy_la)' >> extensionproxy_la_meta_unload.cpp +libextensionproxy_sl_la_meta_unload.cpp: extensionproxy.moc + @echo 'creating libextensionproxy_sl_la_meta_unload.cpp' + @-rm -f libextensionproxy_sl_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libextensionproxy_sl_la[] = {' > libextensionproxy_sl_la_meta_unload.cpp -+ @cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libextensionproxy_sl_la_meta_unload.cpp -+ @echo '0};' >> libextensionproxy_sl_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libextensionproxy_sl_la_meta_unload.cpp -+ @echo '_UNLOAD(libextensionproxy_sl_la)' >> libextensionproxy_sl_la_meta_unload.cpp -@@ -690 +698,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_extensionproxy_la[] = {' > extensionproxy_la_meta_unload.cpp ;\ +- cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> extensionproxy_la_meta_unload.cpp ;\ +- echo '0};' >> extensionproxy_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> extensionproxy_la_meta_unload.cpp ;\ +- echo '_UNLOAD(extensionproxy_la)' >> extensionproxy_la_meta_unload.cpp ;\ +- else echo > extensionproxy_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libextensionproxy_sl_la[] = {' > libextensionproxy_sl_la_meta_unload.cpp ;\ ++ cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libextensionproxy_sl_la_meta_unload.cpp ;\ ++ echo '0};' >> libextensionproxy_sl_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libextensionproxy_sl_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libextensionproxy_sl_la)' >> libextensionproxy_sl_la_meta_unload.cpp ;\ ++ else echo > libextensionproxy_sl_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f appletproxy_la_meta_unload.cpp extensionproxy_la_meta_unload.cpp + -rm -f libappletproxy_sl_la_meta_unload.cpp libextensionproxy_sl_la_meta_unload.cpp + @@ -167,13 +207,22 @@ $NetBSD: patch-bw,v 1.1 2001/10/15 22:46:03 skrll Exp $ + done; \ + cat libappletproxy_sl_la.all_cpp.final libappletproxy_sl_la.all_cpp.files > libappletproxy_sl_la.all_cpp.cpp; \ + rm -f libappletproxy_sl_la.all_cpp.final libappletproxy_sl_la.all_cpp.files -@@ -693 +713 @@ + + #>+ 11 -appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp appletproxy_la_meta_unload.cpp appletproxy.moc +appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp -@@ -697 +717 @@ + @echo 'creating appletproxy_la.all_cpp.cpp ...'; \ + rm -f appletproxy_la.all_cpp.files appletproxy_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> appletproxy_la.all_cpp.final; \ - for file in appletproxy.cpp appletproxy_la_meta_unload.cpp ; do \ + for file in appletproxy_main.cpp ; do \ -@@ -705 +725,13 @@ + echo "#include \"$$file\"" >> appletproxy_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> appletproxy_la.all_cpp.final; \ + done; \ +@@ -697,11 +728,23 @@ + rm -f appletproxy_la.all_cpp.final appletproxy_la.all_cpp.files + + #>+ 11 -extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp extensionproxy_la_meta_unload.cpp extensionproxy.moc +libextensionproxy_sl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp libextensionproxy_sl_la_meta_unload.cpp extensionproxy.moc + @echo 'creating libextensionproxy_sl_la.all_cpp.cpp ...'; \ @@ -188,27 +237,65 @@ $NetBSD: patch-bw,v 1.1 2001/10/15 22:46:03 skrll Exp $ + +#>+ 11 +extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp -@@ -709 +741 @@ + @echo 'creating extensionproxy_la.all_cpp.cpp ...'; \ + rm -f extensionproxy_la.all_cpp.files extensionproxy_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> extensionproxy_la.all_cpp.final; \ - for file in extensionproxy.cpp extensionproxy_la_meta_unload.cpp ; do \ + for file in extensionproxy_main.cpp ; do \ -@@ -717 +749 @@ + echo "#include \"$$file\"" >> extensionproxy_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> extensionproxy_la.all_cpp.final; \ + done; \ +@@ -709,11 +752,11 @@ + rm -f extensionproxy_la.all_cpp.final extensionproxy_la.all_cpp.files + + #>+ 11 -appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp -@@ -721 +753 @@ + @echo 'creating appletproxy.all_cpp.cpp ...'; \ + rm -f appletproxy.all_cpp.files appletproxy.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> appletproxy.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in appletproxy_main.cpp ; do \ -@@ -729 +761 @@ + echo "#include \"$$file\"" >> appletproxy.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> appletproxy.all_cpp.final; \ + done; \ +@@ -721,11 +764,11 @@ + rm -f appletproxy.all_cpp.final appletproxy.all_cpp.files + + #>+ 11 -extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp -@@ -733 +765 @@ + @echo 'creating extensionproxy.all_cpp.cpp ...'; \ + rm -f extensionproxy.all_cpp.files extensionproxy.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> extensionproxy.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in extensionproxy_main.cpp ; do \ -@@ -742 +774 @@ + echo "#include \"$$file\"" >> extensionproxy.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> extensionproxy.all_cpp.final; \ + done; \ +@@ -734,20 +777,20 @@ + + #>+ 3 + clean-final: - -rm -f appletproxy_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp + -rm -f libappletproxy_sl_la.all_cpp.cpp appletproxy_la.all_cpp.cpp libextensionproxy_sl_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp -@@ -746 +778 @@ + + #>+ 2 + final: - $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" all-am + $(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_final_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_final_OBJECTS)" all-am -@@ -749 +781 @@ + #>+ 2 + final-install: +- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" install-am ++ $(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_final_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" all-am + $(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_nofinal_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libappletproxy_sl_la_OBJECTS="$(libappletproxy_sl_la_nofinal_OBJECTS)" libextensionproxy_sl_la_OBJECTS="$(libextensionproxy_sl_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-cf b/x11/kdebase2/patches/patch-cf index df295d4cc3d..b2fff189dbc 100644 --- a/x11/kdebase2/patches/patch-cf +++ b/x11/kdebase2/patches/patch-cf @@ -1,8 +1,8 @@ -$NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ +$NetBSD: patch-cf,v 1.3 2001/12/03 15:37:19 skrll Exp $ ---- klipper/Makefile.in.orig Sat Sep 8 01:36:37 2001 +--- klipper/Makefile.in.orig Sat Nov 10 07:58:28 2001 +++ klipper/Makefile.in -@@ -273,18 +273,19 @@ +@@ -275,18 +275,19 @@ INCLUDES = $(all_includes) bin_PROGRAMS = klipper @@ -29,7 +29,7 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH) appsdir = $(kde_appsdir)/Utilities -@@ -314,21 +315,27 @@ +@@ -316,21 +317,27 @@ LIBS = @LIBS@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ @@ -38,7 +38,7 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ -#>+ 5 -klipper_la_final_OBJECTS = klipper_la.all_cpp.lo -klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo configdialog.lo \ --klipper_la_meta_unload.lo +- klipper_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS) +libklipper_main_la_DEPENDENCIES = @@ -47,8 +47,8 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ +#>+ 6 +libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo +libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ -+configdialog.lo \ -+libklipper_main_la_meta_unload.lo ++ configdialog.lo \ ++ libklipper_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libklipper_main_la_OBJECTS = $(libklipper_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libklipper_main_la_OBJECTS = $(libklipper_main_la_final_OBJECTS) +klipper_la_DEPENDENCIES = libklipper_main.la @@ -68,12 +68,12 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ CXXFLAGS = @CXXFLAGS@ #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 1 -@@ -347,15 +354,15 @@ +@@ -349,15 +356,15 @@ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=klipperrc hi16-app-klipper.png hi32-app-klipper.png klipper-1-2.pl klipperrc.upd klipperbindings.cpp urlgrabber.h toplevel.h klipper.desktop hi48-app-klipper.png configdialog.h -+KDE_DIST=klipperrc klipper hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h libklipper_main_la_meta_unload.cpp ++KDE_DIST=klipperrc hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@ -87,7 +87,7 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ #>- all: all-redirect #>+ 1 -@@ -442,6 +449,9 @@ +@@ -444,6 +451,9 @@ maintainer-clean-libtool: @@ -97,25 +97,7 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ klipper.la: $(klipper_la_OBJECTS) $(klipper_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS) -@@ -590,17 +600,6 @@ - subdir = klipper - - distdir: $(DISTFILES) --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -653,7 +652,6 @@ +@@ -644,7 +654,6 @@ mostlyclean-generic: clean-generic: @@ -123,7 +105,7 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -715,9 +713,6 @@ +@@ -706,9 +715,6 @@ messages: $(XGETTEXT) $(klipper_la_SOURCES) klipperbindings.cpp -o $(podir)/klipper.pot @@ -133,26 +115,29 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -762,26 +757,38 @@ +@@ -753,28 +759,40 @@ - #>+ 10 + #>+ 12 -klipper_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc - @echo 'creating klipper_la_meta_unload.cpp' - @-rm -f klipper_la_meta_unload.cpp -- @echo 'static const char * _metalist_klipper_la[] = {' > klipper_la_meta_unload.cpp -- @cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klipper_la_meta_unload.cpp -- @echo '0};' >> klipper_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> klipper_la_meta_unload.cpp -- @echo '_UNLOAD(klipper_la)' >> klipper_la_meta_unload.cpp +libklipper_main_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc + @echo 'creating libklipper_main_la_meta_unload.cpp' + @-rm -f libklipper_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libklipper_main_la[] = {' > libklipper_main_la_meta_unload.cpp -+ @cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklipper_main_la_meta_unload.cpp -+ @echo '0};' >> libklipper_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libklipper_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libklipper_main_la)' >> libklipper_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_klipper_la[] = {' > klipper_la_meta_unload.cpp ;\ +- cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klipper_la_meta_unload.cpp ;\ +- echo '0};' >> klipper_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> klipper_la_meta_unload.cpp ;\ +- echo '_UNLOAD(klipper_la)' >> klipper_la_meta_unload.cpp ;\ +- else echo > klipper_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libklipper_main_la[] = {' > libklipper_main_la_meta_unload.cpp ;\ ++ cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklipper_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libklipper_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libklipper_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libklipper_main_la)' >> libklipper_main_la_meta_unload.cpp ;\ ++ else echo > libklipper_main_la_meta_unload.cpp; fi #>+ 3 @@ -161,7 +146,7 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ + -rm -f libklipper_main_la_meta_unload.cpp + +#>+ 11 -+libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/libklipper_main_la_meta_unload.cpp ++libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp libklipper_main_la_meta_unload.cpp + @echo 'creating libklipper_main_la.all_cpp.cpp ...'; \ + rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \ @@ -183,7 +168,7 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \ done; \ -@@ -789,11 +796,11 @@ +@@ -782,11 +800,11 @@ rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files #>+ 11 @@ -197,7 +182,7 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ echo "#include \"$$file\"" >> klipper.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper.all_cpp.final; \ done; \ -@@ -802,14 +809,14 @@ +@@ -795,20 +813,20 @@ #>+ 3 clean-final: @@ -209,9 +194,17 @@ $NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $ - $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" all-am + $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am #>+ 2 + final-install: +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" install-am ++ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am + #>+ 2 no-final: - $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" all-am + $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-cj b/x11/kdebase2/patches/patch-cj index 3a31b6872e8..104fcf2bc2c 100644 --- a/x11/kdebase2/patches/patch-cj +++ b/x11/kdebase2/patches/patch-cj @@ -1,102 +1,135 @@ -$NetBSD: patch-cj,v 1.1 2001/10/15 22:46:05 skrll Exp $ +$NetBSD: patch-cj,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kmenuedit/Makefile.in.orig Sat Sep 8 01:36:37 2001 +--- kmenuedit/Makefile.in.orig Sat Nov 10 07:58:28 2001 +++ kmenuedit/Makefile.in -@@ -277 +277 @@ +@@ -276,17 +276,18 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = kmenuedit -lib_LTLIBRARIES = kmenuedit.la +lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la -@@ -279 +279,3 @@ + -CLEANFILES = dummy.cpp +libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp +libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) +libkmenuedit_main_la_LDFLAGS = $(all_libraries) -@@ -281,3 +283,2 @@ + -kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp - -kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) +kmenuedit_la_SOURCES = kmenuedit_main.cpp +kmenuedit_la_LIBADD = libkmenuedit_main.la -@@ -286,2 +287,2 @@ + kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version + -kmenuedit_SOURCES = dummy.cpp -kmenuedit_LDADD = kmenuedit.la +kmenuedit_SOURCES = kmenuedit_main.cpp +kmenuedit_LDADD = libkmenuedit_main.la -@@ -317,2 +318,2 @@ + kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h +@@ -316,23 +317,27 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -kmenuedit_la_DEPENDENCIES = -#>- kmenuedit_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ +libkmenuedit_main_la_DEPENDENCIES = +#>- libkmenuedit_main_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ -@@ -321,2 +322,2 @@ + #>- desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo khotkeys.lo + #>+ 6 -kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo -kmenuedit_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ +libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo +libkmenuedit_main_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ -@@ -324,3 +325,7 @@ --kmenuedit_la_meta_unload.lo + desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo khotkeys.lo \ +- kmenuedit_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS) -+libkmenuedit_main_la_meta_unload.lo ++ libkmenuedit_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_final_OBJECTS) +kmenuedit_la_DEPENDENCIES = libkmenuedit_main.la +#>- kmenuedit_la_OBJECTS = kmenuedit_main.lo +#>+ 1 +kmenuedit_la_OBJECTS = kmenuedit_main.lo -@@ -330 +335 @@ + bin_PROGRAMS = kmenuedit$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kmenuedit_OBJECTS = dummy.$(OBJEXT) +#>- kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) -@@ -332,2 +337,2 @@ + #>+ 1 -kmenuedit_OBJECTS = dummy.$(OBJEXT) -kmenuedit_DEPENDENCIES = kmenuedit.la +kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) +kmenuedit_DEPENDENCIES = libkmenuedit_main.la -@@ -354 +359 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -353,15 +358,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=kmenueditui.rc hi32-app-kmenuedit.png hi16-app-kmenuedit.png kmenuedit.desktop hi48-app-kmenuedit.png +KDE_DIST=hi32-app-kmenuedit.png kmenuedit.desktop hi16-app-kmenuedit.png hi48-app-kmenuedit.png kmenueditui.rc -@@ -361,2 +366,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) -OBJECTS = $(kmenuedit_la_OBJECTS) $(kmenuedit_OBJECTS) +SOURCES = $(libkmenuedit_main_la_SOURCES) $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) +OBJECTS = $(libkmenuedit_main_la_OBJECTS) $(kmenuedit_la_OBJECTS) $(kmenuedit_OBJECTS) -@@ -448,0 +454,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -448,6 +453,9 @@ + + maintainer-clean-libtool: + +libkmenuedit_main.la: $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkmenuedit_main_la_LDFLAGS) $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_LIBADD) $(LIBS) + -@@ -561 +569 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -619,11 +626,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -688 +684,0 @@ + kmenuedit.la: $(kmenuedit_la_OBJECTS) $(kmenuedit_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kmenuedit_la_LDFLAGS) $(kmenuedit_la_OBJECTS) $(kmenuedit_la_LIBADD) $(LIBS) + +@@ -676,7 +684,6 @@ + mostlyclean-generic: + + clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) -@@ -809,8 +805,8 @@ + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) +@@ -797,28 +804,40 @@ + + + #>+ 12 -kmenuedit_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc - @echo 'creating kmenuedit_la_meta_unload.cpp' - @-rm -f kmenuedit_la_meta_unload.cpp -- @echo 'static const char * _metalist_kmenuedit_la[] = {' > kmenuedit_la_meta_unload.cpp -- @cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmenuedit_la_meta_unload.cpp -- @echo '0};' >> kmenuedit_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kmenuedit_la_meta_unload.cpp -- @echo '_UNLOAD(kmenuedit_la)' >> kmenuedit_la_meta_unload.cpp +libkmenuedit_main_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc + @echo 'creating libkmenuedit_main_la_meta_unload.cpp' + @-rm -f libkmenuedit_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkmenuedit_main_la[] = {' > libkmenuedit_main_la_meta_unload.cpp -+ @cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmenuedit_main_la_meta_unload.cpp -+ @echo '0};' >> libkmenuedit_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkmenuedit_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkmenuedit_main_la)' >> libkmenuedit_main_la_meta_unload.cpp -@@ -821 +817,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kmenuedit_la[] = {' > kmenuedit_la_meta_unload.cpp ;\ +- cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmenuedit_la_meta_unload.cpp ;\ +- echo '0};' >> kmenuedit_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kmenuedit_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kmenuedit_la)' >> kmenuedit_la_meta_unload.cpp ;\ +- else echo > kmenuedit_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkmenuedit_main_la[] = {' > libkmenuedit_main_la_meta_unload.cpp ;\ ++ cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmenuedit_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkmenuedit_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkmenuedit_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkmenuedit_main_la)' >> libkmenuedit_main_la_meta_unload.cpp ;\ ++ else echo > libkmenuedit_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kmenuedit_la_meta_unload.cpp + -rm -f libkmenuedit_main_la_meta_unload.cpp + @@ -111,24 +144,55 @@ $NetBSD: patch-cj,v 1.1 2001/10/15 22:46:05 skrll Exp $ + done; \ + cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files > libkmenuedit_main_la.all_cpp.cpp; \ + rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files -@@ -824 +832 @@ + + #>+ 11 -kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp kmenuedit_la_meta_unload.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc +kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp -@@ -828 +836 @@ + @echo 'creating kmenuedit_la.all_cpp.cpp ...'; \ + rm -f kmenuedit_la.all_cpp.files kmenuedit_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmenuedit_la.all_cpp.final; \ - for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp kmenuedit_la_meta_unload.cpp ; do \ + for file in kmenuedit_main.cpp ; do \ -@@ -836 +844 @@ + echo "#include \"$$file\"" >> kmenuedit_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit_la.all_cpp.final; \ + done; \ +@@ -826,11 +845,11 @@ + rm -f kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files + + #>+ 11 -kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp -@@ -840 +848 @@ + @echo 'creating kmenuedit.all_cpp.cpp ...'; \ + rm -f kmenuedit.all_cpp.files kmenuedit.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmenuedit.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kmenuedit_main.cpp ; do \ -@@ -849 +857 @@ + echo "#include \"$$file\"" >> kmenuedit.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit.all_cpp.final; \ + done; \ +@@ -839,20 +858,20 @@ + + #>+ 3 + clean-final: - -rm -f kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp + -rm -f libkmenuedit_main_la.all_cpp.cpp kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp -@@ -853 +861 @@ + + #>+ 2 + final: - $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" all-am + $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" all-am -@@ -856 +864 @@ + #>+ 2 + final-install: +- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" install-am ++ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" all-am + $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-cn b/x11/kdebase2/patches/patch-cn index dc339f3461b..5f7781fa220 100644 --- a/x11/kdebase2/patches/patch-cn +++ b/x11/kdebase2/patches/patch-cn @@ -1,107 +1,152 @@ -$NetBSD: patch-cn,v 1.1 2001/10/15 22:46:05 skrll Exp $ +$NetBSD: patch-cn,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- konqueror/Makefile.in.orig Sat Sep 8 01:36:39 2001 +--- konqueror/Makefile.in.orig Sat Nov 10 07:58:30 2001 +++ konqueror/Makefile.in -@@ -277 +277 @@ +@@ -276,7 +276,7 @@ + + SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks kfindpart shellcmdplugin about pics sidebar + -lib_LTLIBRARIES = konqueror.la +lib_LTLIBRARIES = libkonqueror_main.la konqueror.la -@@ -294 +294 @@ + + konqdatadir = $(kde_datadir)/konqueror + konqdata_DATA = konqueror.rc +@@ -293,16 +293,20 @@ + + bin_PROGRAMS = konqueror + -#>- konqueror_la_SOURCES = konq_main.cc KonquerorIface.cc KonquerorIface.skel KonqMainWindowIface.cc KonqMainWindowIface.skel KonqViewIface.cc KonqViewIface.skel konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc +#>- libkonqueror_main_la_SOURCES = konq_main.cc KonquerorIface.cc KonquerorIface.skel KonqMainWindowIface.cc KonqMainWindowIface.skel KonqViewIface.cc KonqViewIface.skel konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc -@@ -296 +296 @@ + #>+ 1 -konqueror_la_SOURCES=konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc +libkonqueror_main_la_SOURCES=konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc -@@ -298,0 +299,4 @@ + + +libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version +libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la + +konqueror_la_SOURCES = konqueror_main.cc -@@ -300 +304 @@ + konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version -konqueror_la_LIBADD = ../libkonq/libkonq.la +konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la -@@ -302,2 +306,2 @@ + -konqueror_SOURCES = dummy.cc -konqueror_LDADD = konqueror.la +konqueror_SOURCES = konqueror_main.cc +konqueror_LDADD = libkonqueror_main.la -@@ -332,2 +336,2 @@ + konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + data_DATA = konquerorsu.desktop kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop +@@ -331,29 +335,33 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -konqueror_la_DEPENDENCIES = ../libkonq/libkonq.la -#>- konqueror_la_OBJECTS = konq_main.lo KonquerorIface.lo \ +libkonqueror_main_la_DEPENDENCIES = ../libkonq/libkonq.la +#>- libkonqueror_main_la_OBJECTS = konq_main.lo KonquerorIface.lo \ -@@ -339,2 +343,2 @@ + #>- KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ + #>- konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ + #>- konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ + #>- konq_factory.lo konq_combo.lo konq_browseriface.lo + #>+ 9 -konqueror_la_final_OBJECTS = konqueror_la.all_cc.lo -konqueror_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ +libkonqueror_main_la_final_OBJECTS = libkonqueror_main_la.all_cc.lo +libkonqueror_main_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ -@@ -345,3 +349,7 @@ --konqueror_la_meta_unload.lo + KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ + konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ + konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ + konq_factory.lo konq_combo.lo konq_browseriface.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo \ +- konqueror_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@konqueror_la_OBJECTS = $(konqueror_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@konqueror_la_OBJECTS = $(konqueror_la_final_OBJECTS) -+libkonqueror_main_la_meta_unload.lo ++ libkonqueror_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_final_OBJECTS) +konqueror_la_DEPENDENCIES = libkonqueror_main.la ../libkonq/libkonq.la +#>- konqueror_la_OBJECTS = konqueror_main.lo +#>+ 1 +konqueror_la_OBJECTS = konqueror_main.lo -@@ -351 +359 @@ + bin_PROGRAMS = konqueror$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- konqueror_OBJECTS = dummy.$(OBJEXT) +#>- konqueror_OBJECTS = konqueror_main.$(OBJEXT) -@@ -353,2 +361,2 @@ + #>+ 1 -konqueror_OBJECTS = dummy.$(OBJEXT) -konqueror_DEPENDENCIES = konqueror.la +konqueror_OBJECTS = konqueror_main.$(OBJEXT) +konqueror_DEPENDENCIES = libkonqueror_main.la -@@ -376 +384 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -375,15 +383,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=konq_misc.h konq_browseriface.h DESIGN_config konq_viewmgr.h konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h Home.desktop konq_profiledlg.h DESIGN convert_kdelnk.sh profile_midnightcommander.desktop konqueror.rc profile_filemanagement.desktop IDEAS konqueror.desktop konq_run.h konq_main.h konquerorsu.desktop konqfilemgr.desktop konqbrowser.desktop profile_filepreview.desktop profile_webbrowsing.desktop konq_openurlrequest.h konqueror_config.desktop konq_guiclients.h KonqMainWindowIface.h konq_frame.h konq_factory.h version.h konq_combo.h KonqViewIface.h +KDE_DIST=konqfilemgr.desktop DESIGN convert_kdelnk.sh konq_misc.h konq_browseriface.h DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop konq_viewmgr.h konq_guiclients.h profile_filemanagement.desktop konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h KonqMainWindowIface.h IDEAS konqueror.desktop konq_frame.h konq_factory.h version.h konq_run.h konq_combo.h konq_main.h profile_filepreview.desktop Home.desktop konquerorsu.desktop profile_webbrowsing.desktop konq_profiledlg.h konq_openurlrequest.h KonqViewIface.h -@@ -383,2 +391,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) -OBJECTS = $(konqueror_la_OBJECTS) $(konqueror_OBJECTS) +SOURCES = $(libkonqueror_main_la_SOURCES) $(konqueror_la_SOURCES) $(konqueror_SOURCES) +OBJECTS = $(libkonqueror_main_la_OBJECTS) $(konqueror_la_OBJECTS) $(konqueror_OBJECTS) -@@ -470,0 +479,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -470,6 +478,9 @@ + + maintainer-clean-libtool: + +libkonqueror_main.la: $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkonqueror_main_la_LDFLAGS) $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_LIBADD) $(LIBS) + -@@ -674 +685 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -732,11 +742,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -883,3 +882,0 @@ + konqueror.la: $(konqueror_la_OBJECTS) $(konqueror_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(konqueror_la_LDFLAGS) $(konqueror_la_OBJECTS) $(konqueror_la_LIBADD) $(LIBS) + +@@ -871,9 +882,6 @@ + #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la + #konqueror_static_LDFLAGS = $(all_libraries) -static + -dummy.cc: - echo > dummy.cc - -@@ -991,8 +988,8 @@ + messages: rc.cpp + $(EXTRACTRC) */*.rc >> rc.cpp + $(EXTRACTRC) dirtree/history_module/*.ui >> rc.cpp +@@ -979,28 +987,40 @@ + + + #>+ 12 -konqueror_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc - @echo 'creating konqueror_la_meta_unload.cc' - @-rm -f konqueror_la_meta_unload.cc -- @echo 'static const char * _metalist_konqueror_la[] = {' > konqueror_la_meta_unload.cc -- @cat konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konqueror_la_meta_unload.cc -- @echo '0};' >> konqueror_la_meta_unload.cc -- @echo '#include <kunload.h>' >> konqueror_la_meta_unload.cc -- @echo '_UNLOAD(konqueror_la)' >> konqueror_la_meta_unload.cc +libkonqueror_main_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc + @echo 'creating libkonqueror_main_la_meta_unload.cc' + @-rm -f libkonqueror_main_la_meta_unload.cc -+ @echo 'static const char * _metalist_libkonqueror_main_la[] = {' > libkonqueror_main_la_meta_unload.cc -+ @cat konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonqueror_main_la_meta_unload.cc -+ @echo '0};' >> libkonqueror_main_la_meta_unload.cc -+ @echo '#include <kunload.h>' >> libkonqueror_main_la_meta_unload.cc -+ @echo '_UNLOAD(libkonqueror_main_la)' >> libkonqueror_main_la_meta_unload.cc -@@ -1003 +1000,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_konqueror_la[] = {' > konqueror_la_meta_unload.cc ;\ +- cat konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konqueror_la_meta_unload.cc ;\ +- echo '0};' >> konqueror_la_meta_unload.cc ;\ +- echo '#include <kunload.h>' >> konqueror_la_meta_unload.cc ;\ +- echo '_UNLOAD(konqueror_la)' >> konqueror_la_meta_unload.cc ;\ +- else echo > konqueror_la_meta_unload.cc; fi ++ echo 'static const char * _metalist_libkonqueror_main_la[] = {' > libkonqueror_main_la_meta_unload.cc ;\ ++ cat konq_view.moc konq_browseriface.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonqueror_main_la_meta_unload.cc ;\ ++ echo '0};' >> libkonqueror_main_la_meta_unload.cc ;\ ++ echo '#include <kunload.h>' >> libkonqueror_main_la_meta_unload.cc ;\ ++ echo '_UNLOAD(libkonqueror_main_la)' >> libkonqueror_main_la_meta_unload.cc ;\ ++ else echo > libkonqueror_main_la_meta_unload.cc; fi + + + #>+ 3 + clean-moc-classes: - -rm -f konqueror_la_meta_unload.cc + -rm -f libkonqueror_main_la_meta_unload.cc + @@ -116,24 +161,55 @@ $NetBSD: patch-cn,v 1.1 2001/10/15 22:46:05 skrll Exp $ + done; \ + cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \ + rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files -@@ -1006 +1015 @@ + + #>+ 11 -konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc +konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc -@@ -1010 +1019 @@ + @echo 'creating konqueror_la.all_cc.cc ...'; \ + rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \ - for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc ; do \ + for file in konqueror_main.cc ; do \ -@@ -1018 +1027 @@ + echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \ + done; \ +@@ -1008,11 +1028,11 @@ + rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files + + #>+ 11 -konqueror.all_cc.cc: $(srcdir)/Makefile.in dummy.cc +konqueror.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc -@@ -1022 +1031 @@ + @echo 'creating konqueror.all_cc.cc ...'; \ + rm -f konqueror.all_cc.files konqueror.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> konqueror.all_cc.final; \ - for file in dummy.cc ; do \ + for file in konqueror_main.cc ; do \ -@@ -1031 +1040 @@ + echo "#include \"$$file\"" >> konqueror.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror.all_cc.final; \ + done; \ +@@ -1021,20 +1041,20 @@ + + #>+ 3 + clean-final: - -rm -f konqueror_la.all_cc.cc konqueror.all_cc.cc + -rm -f libkonqueror_main_la.all_cc.cc konqueror_la.all_cc.cc konqueror.all_cc.cc -@@ -1035 +1044 @@ + + #>+ 2 + final: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" all-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" all-am -@@ -1038 +1047 @@ + #>+ 2 + final-install: +- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" install-am ++ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" all-am + $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-cp b/x11/kdebase2/patches/patch-cp index 3f91c7a7167..b577dbb9665 100644 --- a/x11/kdebase2/patches/patch-cp +++ b/x11/kdebase2/patches/patch-cp @@ -1,101 +1,137 @@ -$NetBSD: patch-cp,v 1.1 2001/10/15 22:46:06 skrll Exp $ +$NetBSD: patch-cp,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- konqueror/client/Makefile.in.orig Sat Sep 8 01:36:39 2001 +--- konqueror/client/Makefile.in.orig Sat Nov 10 07:58:30 2001 +++ konqueror/client/Makefile.in -@@ -277 +277 @@ +@@ -276,14 +276,18 @@ + AM_CPPFLAGS = -DQT_NO_CAST_ASCII + + bin_PROGRAMS = kfmclient -lib_LTLIBRARIES = kfmclient.la +lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la -@@ -280,3 +280,3 @@ + + INCLUDES = -I.. $(all_includes) -kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version -kfmclient_la_LIBADD = $(LIB_KFILE) -#>- kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub +libkfmclient_main_la_LDFLAGS = $(all_libraries) +libkfmclient_main_la_LIBADD = $(LIB_KFILE) +#>- libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub -@@ -284 +284,5 @@ + #>+ 1 -kfmclient_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc +libkfmclient_main_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc + +kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version +kfmclient_la_LIBADD = libkfmclient_main.la +kfmclient_la_SOURCES = kfmclient_main.cc -@@ -292 +296 @@ + + noinst_HEADERS = kfmclient.h + #>- METASOURCES = AUTO +@@ -291,9 +295,9 @@ + KonquerorIface_DIR = $(srcdir)/.. + KDesktopIface_DIR = $(top_srcdir)/kdesktop + -kfmclient_SOURCES = dummy.cc +kfmclient_SOURCES = kfmclient_main.cc -@@ -294 +298 @@ + kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kfmclient_LDADD = kfmclient.la +kfmclient_LDADD = libkfmclient_main.la -@@ -307,2 +311,2 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs + CONFIG_HEADER = ../../config.h + CONFIG_CLEAN_FILES = +@@ -306,21 +310,25 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -kfmclient_la_DEPENDENCIES = -#>- kfmclient_la_OBJECTS = kfmclient.lo +libkfmclient_main_la_DEPENDENCIES = +#>- libkfmclient_main_la_OBJECTS = kfmclient.lo -@@ -310,5 +314,9 @@ + #>+ 5 -kfmclient_la_final_OBJECTS = kfmclient_la.all_cc.lo -kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \ --kfmclient_la_meta_unload.lo +- kfmclient_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kfmclient_la_OBJECTS = $(kfmclient_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kfmclient_la_OBJECTS = $(kfmclient_la_final_OBJECTS) +libkfmclient_main_la_final_OBJECTS = libkfmclient_main_la.all_cc.lo +libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \ -+libkfmclient_main_la_meta_unload.lo ++ libkfmclient_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_final_OBJECTS) +kfmclient_la_DEPENDENCIES = libkfmclient_main.la +#>- kfmclient_la_OBJECTS = kfmclient_main.lo +#>+ 1 +kfmclient_la_OBJECTS = kfmclient_main.lo -@@ -318 +326 @@ + bin_PROGRAMS = kfmclient$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kfmclient_OBJECTS = dummy.$(OBJEXT) +#>- kfmclient_OBJECTS = kfmclient_main.$(OBJEXT) -@@ -320,2 +328,2 @@ + #>+ 1 -kfmclient_OBJECTS = dummy.$(OBJEXT) -kfmclient_DEPENDENCIES = kfmclient.la +kfmclient_OBJECTS = kfmclient_main.$(OBJEXT) +kfmclient_DEPENDENCIES = libkfmclient_main.la -@@ -342,2 +350,2 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -341,8 +349,8 @@ + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES) -OBJECTS = $(kfmclient_la_OBJECTS) $(kfmclient_OBJECTS) +SOURCES = $(libkfmclient_main_la_SOURCES) $(kfmclient_la_SOURCES) $(kfmclient_SOURCES) +OBJECTS = $(libkfmclient_main_la_OBJECTS) $(kfmclient_la_OBJECTS) $(kfmclient_OBJECTS) -@@ -429,0 +438,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -429,6 +437,9 @@ + + maintainer-clean-libtool: + +libkfmclient_main.la: $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkfmclient_main_la_LDFLAGS) $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_LIBADD) $(LIBS) + -@@ -502,11 +512,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -609,3 +608,0 @@ + kfmclient.la: $(kfmclient_la_OBJECTS) $(kfmclient_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kfmclient_la_LDFLAGS) $(kfmclient_la_OBJECTS) $(kfmclient_la_LIBADD) $(LIBS) + +@@ -597,9 +608,6 @@ + mostlyclean distclean maintainer-clean + + -dummy.cc: - echo > dummy.cc - -@@ -653,8 +650,8 @@ + messages: + $(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot + +@@ -641,28 +649,40 @@ + + + #>+ 12 -kfmclient_la_meta_unload.cc: kfmclient.moc - @echo 'creating kfmclient_la_meta_unload.cc' - @-rm -f kfmclient_la_meta_unload.cc -- @echo 'static const char * _metalist_kfmclient_la[] = {' > kfmclient_la_meta_unload.cc -- @cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kfmclient_la_meta_unload.cc -- @echo '0};' >> kfmclient_la_meta_unload.cc -- @echo '#include <kunload.h>' >> kfmclient_la_meta_unload.cc -- @echo '_UNLOAD(kfmclient_la)' >> kfmclient_la_meta_unload.cc +libkfmclient_main_la_meta_unload.cc: kfmclient.moc + @echo 'creating libkfmclient_main_la_meta_unload.cc' + @-rm -f libkfmclient_main_la_meta_unload.cc -+ @echo 'static const char * _metalist_libkfmclient_main_la[] = {' > libkfmclient_main_la_meta_unload.cc -+ @cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkfmclient_main_la_meta_unload.cc -+ @echo '0};' >> libkfmclient_main_la_meta_unload.cc -+ @echo '#include <kunload.h>' >> libkfmclient_main_la_meta_unload.cc -+ @echo '_UNLOAD(libkfmclient_main_la)' >> libkfmclient_main_la_meta_unload.cc -@@ -665 +662,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kfmclient_la[] = {' > kfmclient_la_meta_unload.cc ;\ +- cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kfmclient_la_meta_unload.cc ;\ +- echo '0};' >> kfmclient_la_meta_unload.cc ;\ +- echo '#include <kunload.h>' >> kfmclient_la_meta_unload.cc ;\ +- echo '_UNLOAD(kfmclient_la)' >> kfmclient_la_meta_unload.cc ;\ +- else echo > kfmclient_la_meta_unload.cc; fi ++ echo 'static const char * _metalist_libkfmclient_main_la[] = {' > libkfmclient_main_la_meta_unload.cc ;\ ++ cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkfmclient_main_la_meta_unload.cc ;\ ++ echo '0};' >> libkfmclient_main_la_meta_unload.cc ;\ ++ echo '#include <kunload.h>' >> libkfmclient_main_la_meta_unload.cc ;\ ++ echo '_UNLOAD(libkfmclient_main_la)' >> libkfmclient_main_la_meta_unload.cc ;\ ++ else echo > libkfmclient_main_la_meta_unload.cc; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kfmclient_la_meta_unload.cc + -rm -f libkfmclient_main_la_meta_unload.cc + @@ -110,24 +146,55 @@ $NetBSD: patch-cp,v 1.1 2001/10/15 22:46:06 skrll Exp $ + done; \ + cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files > libkfmclient_main_la.all_cc.cc; \ + rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files -@@ -668 +677 @@ + + #>+ 11 -kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc kfmclient.moc +kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc -@@ -672 +681 @@ + @echo 'creating kfmclient_la.all_cc.cc ...'; \ + rm -f kfmclient_la.all_cc.files kfmclient_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> kfmclient_la.all_cc.final; \ - for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc ; do \ + for file in kfmclient_main.cc ; do \ -@@ -680 +689 @@ + echo "#include \"$$file\"" >> kfmclient_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient_la.all_cc.final; \ + done; \ +@@ -670,11 +690,11 @@ + rm -f kfmclient_la.all_cc.final kfmclient_la.all_cc.files + + #>+ 11 -kfmclient.all_cc.cc: $(srcdir)/Makefile.in dummy.cc +kfmclient.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc -@@ -684 +693 @@ + @echo 'creating kfmclient.all_cc.cc ...'; \ + rm -f kfmclient.all_cc.files kfmclient.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> kfmclient.all_cc.final; \ - for file in dummy.cc ; do \ + for file in kfmclient_main.cc ; do \ -@@ -693 +702 @@ + echo "#include \"$$file\"" >> kfmclient.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient.all_cc.final; \ + done; \ +@@ -683,20 +703,20 @@ + + #>+ 3 + clean-final: - -rm -f kfmclient_la.all_cc.cc kfmclient.all_cc.cc + -rm -f libkfmclient_main_la.all_cc.cc kfmclient_la.all_cc.cc kfmclient.all_cc.cc -@@ -697 +706 @@ + + #>+ 2 + final: - $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" all-am + $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" all-am -@@ -700 +709 @@ + #>+ 2 + final-install: +- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" install-am ++ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" all-am + $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-ct b/x11/kdebase2/patches/patch-ct index dba648b4aab..7e8525c8eec 100644 --- a/x11/kdebase2/patches/patch-ct +++ b/x11/kdebase2/patches/patch-ct @@ -1,83 +1,115 @@ -$NetBSD: patch-ct,v 1.1 2001/10/15 22:46:06 skrll Exp $ +$NetBSD: patch-ct,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- konqueror/keditbookmarks/Makefile.in.orig Sat Sep 8 01:36:40 2001 +--- konqueror/keditbookmarks/Makefile.in.orig Sat Nov 10 07:58:31 2001 +++ konqueror/keditbookmarks/Makefile.in -@@ -277 +277 @@ +@@ -276,18 +276,22 @@ + + METASOURCES = AUTO + -lib_LTLIBRARIES = keditbookmarks.la +lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la -@@ -279 +279,4 @@ + -keditbookmarks_la_SOURCES = main.cpp toplevel.cpp commands.cpp +libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp commands.cpp +libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la +libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) +#>- libkeditbookmarks_main_la_METASOURCES = AUTO -@@ -281 +284,2 @@ + -keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la +keditbookmarks_la_SOURCES = keditbookmarks_main.cpp +keditbookmarks_la_LIBADD = libkeditbookmarks_main.la -@@ -287,2 +291,2 @@ + keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version + #>- keditbookmarks_la_METASOURCES = AUTO + + bin_PROGRAMS = keditbookmarks + -keditbookmarks_SOURCES = dummy.cpp -keditbookmarks_LDADD = keditbookmarks.la +keditbookmarks_SOURCES = keditbookmarks_main.cpp +keditbookmarks_LDADD = libkeditbookmarks_main.la -@@ -310,2 +314,3 @@ + keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + rcdir = $(kde_datadir)/keditbookmarks +@@ -309,21 +313,26 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -keditbookmarks_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la -#>- keditbookmarks_la_OBJECTS = main.lo toplevel.lo commands.lo +libkeditbookmarks_main_la_DEPENDENCIES = \ -+$(top_builddir)/libkonq/libkonq.la ++ $(top_builddir)/libkonq/libkonq.la +#>- libkeditbookmarks_main_la_OBJECTS = main.lo toplevel.lo commands.lo -@@ -313,5 +318,9 @@ + #>+ 5 -keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.lo -keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo \ --keditbookmarks_la_meta_unload.lo +- keditbookmarks_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_final_OBJECTS) +libkeditbookmarks_main_la_final_OBJECTS = libkeditbookmarks_main_la.all_cpp.lo +libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo \ -+libkeditbookmarks_main_la_meta_unload.lo ++ libkeditbookmarks_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_final_OBJECTS) +keditbookmarks_la_DEPENDENCIES = libkeditbookmarks_main.la +#>- keditbookmarks_la_OBJECTS = keditbookmarks_main.lo +#>+ 1 +keditbookmarks_la_OBJECTS = keditbookmarks_main.lo -@@ -321 +330 @@ + bin_PROGRAMS = keditbookmarks$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- keditbookmarks_OBJECTS = dummy.$(OBJEXT) +#>- keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT) -@@ -323,2 +332,2 @@ + #>+ 1 -keditbookmarks_OBJECTS = dummy.$(OBJEXT) -keditbookmarks_DEPENDENCIES = keditbookmarks.la +keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT) +keditbookmarks_DEPENDENCIES = libkeditbookmarks_main.la -@@ -343 +352 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -342,15 +351,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=kinsertionsort.h hi32-app-keditbookmarks.png commands.h toplevel.h hi16-app-keditbookmarks.png keditbookmarks.desktop keditbookmarksui.rc +KDE_DIST=commands.h kinsertionsort.h keditbookmarks.desktop hi16-app-keditbookmarks.png hi32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc -@@ -350,2 +359,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) -OBJECTS = $(keditbookmarks_la_OBJECTS) $(keditbookmarks_OBJECTS) +SOURCES = $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) +OBJECTS = $(libkeditbookmarks_main_la_OBJECTS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_OBJECTS) -@@ -437,0 +447,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -437,6 +446,9 @@ + + maintainer-clean-libtool: + +libkeditbookmarks_main.la: $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkeditbookmarks_main_la_LDFLAGS) $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_LIBADD) $(LIBS) + -@@ -548,11 +559,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -663,3 +663,0 @@ + keditbookmarks.la: $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(keditbookmarks_la_LDFLAGS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_LIBADD) $(LIBS) + +@@ -651,9 +663,6 @@ + mostlyclean distclean maintainer-clean + + -dummy.cpp: - echo > dummy.cpp - -@@ -678,0 +677,8 @@ + # 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: +@@ -667,8 +676,16 @@ + $(MOC) $(srcdir)/toplevel.h -o toplevel.moc + + #>+ 3 +commands.moc: $(srcdir)/commands.h + $(MOC) $(srcdir)/commands.h -o commands.moc + @@ -86,27 +118,39 @@ $NetBSD: patch-ct,v 1.1 2001/10/15 22:46:06 skrll Exp $ + $(MOC) $(srcdir)/toplevel.h -o toplevel.moc + +#>+ 3 -@@ -680 +686 @@ + clean-metasources: - -rm -f commands.moc toplevel.moc + -rm -f commands.moc toplevel.moc commands.moc toplevel.moc -@@ -703,8 +709,8 @@ + + #>+ 2 + docs-am: +@@ -691,28 +708,40 @@ + + + #>+ 12 -keditbookmarks_la_meta_unload.cpp: commands.moc toplevel.moc - @echo 'creating keditbookmarks_la_meta_unload.cpp' - @-rm -f keditbookmarks_la_meta_unload.cpp -- @echo 'static const char * _metalist_keditbookmarks_la[] = {' > keditbookmarks_la_meta_unload.cpp -- @cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> keditbookmarks_la_meta_unload.cpp -- @echo '0};' >> keditbookmarks_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> keditbookmarks_la_meta_unload.cpp -- @echo '_UNLOAD(keditbookmarks_la)' >> keditbookmarks_la_meta_unload.cpp +libkeditbookmarks_main_la_meta_unload.cpp: commands.moc toplevel.moc + @echo 'creating libkeditbookmarks_main_la_meta_unload.cpp' + @-rm -f libkeditbookmarks_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkeditbookmarks_main_la[] = {' > libkeditbookmarks_main_la_meta_unload.cpp -+ @cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkeditbookmarks_main_la_meta_unload.cpp -+ @echo '0};' >> libkeditbookmarks_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkeditbookmarks_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkeditbookmarks_main_la)' >> libkeditbookmarks_main_la_meta_unload.cpp -@@ -715 +721,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_keditbookmarks_la[] = {' > keditbookmarks_la_meta_unload.cpp ;\ +- cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> keditbookmarks_la_meta_unload.cpp ;\ +- echo '0};' >> keditbookmarks_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> keditbookmarks_la_meta_unload.cpp ;\ +- echo '_UNLOAD(keditbookmarks_la)' >> keditbookmarks_la_meta_unload.cpp ;\ +- else echo > keditbookmarks_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkeditbookmarks_main_la[] = {' > libkeditbookmarks_main_la_meta_unload.cpp ;\ ++ cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkeditbookmarks_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkeditbookmarks_main_la)' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ ++ else echo > libkeditbookmarks_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f keditbookmarks_la_meta_unload.cpp + -rm -f libkeditbookmarks_main_la_meta_unload.cpp + @@ -121,28 +165,62 @@ $NetBSD: patch-ct,v 1.1 2001/10/15 22:46:06 skrll Exp $ + done; \ + cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files > libkeditbookmarks_main_la.all_cpp.cpp; \ + rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files -@@ -718 +736 @@ + + #>+ 11 -keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp keditbookmarks_la_meta_unload.cpp commands.moc toplevel.moc +keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp commands.moc toplevel.moc -@@ -722 +740 @@ + @echo 'creating keditbookmarks_la.all_cpp.cpp ...'; \ + rm -f keditbookmarks_la.all_cpp.files keditbookmarks_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> keditbookmarks_la.all_cpp.final; \ - for file in main.cpp toplevel.cpp commands.cpp keditbookmarks_la_meta_unload.cpp ; do \ + for file in keditbookmarks_main.cpp ; do \ -@@ -730 +748 @@ + echo "#include \"$$file\"" >> keditbookmarks_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks_la.all_cpp.final; \ + done; \ +@@ -720,11 +749,11 @@ + rm -f keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files + + #>+ 11 -keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp -@@ -734 +752 @@ + @echo 'creating keditbookmarks.all_cpp.cpp ...'; \ + rm -f keditbookmarks.all_cpp.files keditbookmarks.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> keditbookmarks.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in keditbookmarks_main.cpp ; do \ -@@ -743 +761 @@ + echo "#include \"$$file\"" >> keditbookmarks.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks.all_cpp.final; \ + done; \ +@@ -733,20 +762,20 @@ + + #>+ 3 + clean-final: - -rm -f keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp + -rm -f libkeditbookmarks_main_la.all_cpp.cpp keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp -@@ -747 +765 @@ + + #>+ 2 + final: - $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" all-am + $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" all-am -@@ -750 +768 @@ + #>+ 2 + final-install: +- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" install-am ++ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" all-am + $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" all-am -@@ -760,2 +778,2 @@ + #>+ 2 + no-final-install: +- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -756,5 +785,5 @@ + -rm -f *.rpo + + #>+ 3 -$(srcdir)/toplevel.cpp: toplevel.moc -$(srcdir)/commands.cpp: commands.moc +$(srcdir)/toplevel.cpp: toplevel.moc toplevel.moc diff --git a/x11/kdebase2/patches/patch-cy b/x11/kdebase2/patches/patch-cy index b4d0baeb2d8..887466fa9da 100644 --- a/x11/kdebase2/patches/patch-cy +++ b/x11/kdebase2/patches/patch-cy @@ -1,4 +1,4 @@ -$NetBSD: patch-cy,v 1.1 2001/10/15 22:46:07 skrll Exp $ +$NetBSD: patch-cy,v 1.2 2001/12/03 15:37:19 skrll Exp $ --- konsole/src/Makefile.am.orig Thu Jun 14 19:53:50 2001 +++ konsole/src/Makefile.am @@ -14,7 +14,7 @@ $NetBSD: patch-cy,v 1.1 2001/10/15 22:46:07 skrll Exp $ @@ -34,24 +35,32 @@ libkonsolepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTEMPTER) $(LIBUTIL) + libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) +libkwrited_main_la_SOURCES = kwrited.C +libkwrited_main_la_LIBADD = libkonsolepart.la @@ -49,7 +49,7 @@ $NetBSD: patch-cy,v 1.1 2001/10/15 22:46:07 skrll Exp $ konsole_SOURCES = TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C \ - TEScreen.C TEmulation.C TEHistory.C keytrans.C + TEScreen.C TEmulation.C TEHistory.C keytrans.C konsole_main.cpp - konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTEMPTER) $(LIBUTIL) + konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@ -88,10 +97,6 @@ diff --git a/x11/kdebase2/patches/patch-cz b/x11/kdebase2/patches/patch-cz index 16165818517..ebb5699f236 100644 --- a/x11/kdebase2/patches/patch-cz +++ b/x11/kdebase2/patches/patch-cz @@ -1,55 +1,75 @@ -$NetBSD: patch-cz,v 1.1 2001/10/15 22:46:07 skrll Exp $ +$NetBSD: patch-cz,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- konsole/src/Makefile.in.orig Sat Sep 8 01:36:44 2001 +--- konsole/src/Makefile.in.orig Sat Nov 10 07:58:33 2001 +++ konsole/src/Makefile.in -@@ -292 +292,2 @@ +@@ -291,7 +291,8 @@ + + # you can add here more. This one gets installed + bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole -lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la +lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la libkonsole_main.la konsole.la + -@@ -301,0 +303,4 @@ + # libkonsolepart is a part, but konsole.la links directly to it, so we can't + # install it under kde_module + +@@ -301,23 +302,31 @@ + libkonsolepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) + +libkwrited_main_la_SOURCES = kwrited.C +libkwrited_main_la_LIBADD = libkonsolepart.la +libkwrited_main_la_LDFLAGS = $(all_libraries) + -@@ -303,2 +308,2 @@ + # kwrited kdeinit module -kwrited_la_SOURCES = kwrited.C -kwrited_la_LIBADD = libkonsolepart.la +kwrited_la_SOURCES = kwrited_main.cpp +kwrited_la_LIBADD = libkwrited_main.la -@@ -308,2 +313,2 @@ + kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version + + # kwrited executable -kwrited_SOURCES = dummy.C -kwrited_LDADD = kwrited.la +kwrited_SOURCES = kwrited_main.cpp +kwrited_LDADD = libkwrited_main.la -@@ -311,0 +317,4 @@ + kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +libkonsole_main_la_SOURCES = main.C konsole.C +libkonsole_main_la_LIBADD = libkonsolepart.la +libkonsole_main_la_LDFLAGS = $(all_libraries) + -@@ -313,2 +322,2 @@ + # konsole kdeinit module -konsole_la_SOURCES = main.C konsole.C -konsole_la_LIBADD = libkonsolepart.la +konsole_la_SOURCES = konsole_main.cpp +konsole_la_LIBADD = libkonsole_main.la -@@ -318 +327 @@ + konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version + + # konsole executable - has all the sources, doesn't link kparts, saves startup time -konsole_SOURCES = TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C TEScreen.C TEmulation.C TEHistory.C keytrans.C +konsole_SOURCES = TEPty.C BlockArray.C main.C konsole.C schema.C session.C TEWidget.C TEmuVt102.C TEScreen.C TEmulation.C TEHistory.C keytrans.C konsole_main.cpp -@@ -372,2 +381,2 @@ + + konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) + konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) +@@ -371,22 +380,30 @@ + libkonsolepart_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_final_OBJECTS) -kwrited_la_DEPENDENCIES = libkonsolepart.la -#>- kwrited_la_OBJECTS = kwrited.lo +libkwrited_main_la_DEPENDENCIES = libkonsolepart.la +#>- libkwrited_main_la_OBJECTS = kwrited.lo -@@ -375,7 +384,11 @@ + #>+ 5 -kwrited_la_final_OBJECTS = kwrited_la.all_C.lo -kwrited_la_nofinal_OBJECTS = kwrited.lo \ --kwrited_la_meta_unload.lo +- kwrited_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kwrited_la_OBJECTS = $(kwrited_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwrited_la_OBJECTS = $(kwrited_la_final_OBJECTS) -konsole_la_DEPENDENCIES = libkonsolepart.la -#>- konsole_la_OBJECTS = main.lo konsole.lo +libkwrited_main_la_final_OBJECTS = libkwrited_main_la.all_C.lo +libkwrited_main_la_nofinal_OBJECTS = kwrited.lo \ -+libkwrited_main_la_meta_unload.lo ++ libkwrited_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_final_OBJECTS) +kwrited_la_DEPENDENCIES = libkwrited_main.la @@ -58,118 +78,181 @@ $NetBSD: patch-cz,v 1.1 2001/10/15 22:46:07 skrll Exp $ +kwrited_la_OBJECTS = kwrited_main.lo +libkonsole_main_la_DEPENDENCIES = libkonsolepart.la +#>- libkonsole_main_la_OBJECTS = main.lo konsole.lo -@@ -383,5 +396,9 @@ + #>+ 5 -konsole_la_final_OBJECTS = konsole_la.all_C.lo -konsole_la_nofinal_OBJECTS = main.lo konsole.lo \ --konsole_la_meta_unload.lo +- konsole_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@konsole_la_OBJECTS = $(konsole_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@konsole_la_OBJECTS = $(konsole_la_final_OBJECTS) +libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_C.lo +libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo \ -+libkonsole_main_la_meta_unload.lo ++ libkonsole_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_final_OBJECTS) +konsole_la_DEPENDENCIES = libkonsole_main.la +#>- konsole_la_OBJECTS = konsole_main.lo +#>+ 1 +konsole_la_OBJECTS = konsole_main.lo -@@ -395 +412 @@ + bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \ + kwrited$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) +@@ -394,13 +411,13 @@ + #>- konsole_OBJECTS = TEPty.$(OBJEXT) BlockArray.$(OBJEXT) main.$(OBJEXT) \ + #>- konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) TEWidget.$(OBJEXT) \ + #>- TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) TEmulation.$(OBJEXT) \ -#>- TEHistory.$(OBJEXT) keytrans.$(OBJEXT) +#>- TEHistory.$(OBJEXT) keytrans.$(OBJEXT) konsole_main.$(OBJEXT) -@@ -397 +414 @@ + #>+ 8 -konsole_final_OBJECTS = konsole.all_C.o -+konsole_final_OBJECTS = konsole_main.o konsole.all_C.o -@@ -401 +418 @@ --TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ -+TEHistory.$(OBJEXT) keytrans.$(OBJEXT) konsole_main.$(OBJEXT) \ -@@ -411 +428 @@ ++konsole_final_OBJECTS = konsole.all_cpp.o konsole.all_C.o + konsole_nofinal_OBJECTS = TEPty.$(OBJEXT) BlockArray.$(OBJEXT) main.$(OBJEXT) \ + konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) TEWidget.$(OBJEXT) \ + TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) TEmulation.$(OBJEXT) \ +- TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ ++ TEHistory.$(OBJEXT) keytrans.$(OBJEXT) konsole_main.$(OBJEXT) \ + konsole_meta_unload.o + @KDE_USE_FINAL_FALSE@konsole_OBJECTS = $(konsole_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@konsole_OBJECTS = $(konsole_final_OBJECTS) +@@ -410,10 +427,10 @@ + konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT) + konsole_grantpty_LDADD = $(LDADD) + konsole_grantpty_DEPENDENCIES = -#>- kwrited_OBJECTS = dummy.$(OBJEXT) +#>- kwrited_OBJECTS = kwrited_main.$(OBJEXT) -@@ -413,2 +430,2 @@ + #>+ 1 -kwrited_OBJECTS = dummy.$(OBJEXT) -kwrited_DEPENDENCIES = kwrited.la +kwrited_OBJECTS = kwrited_main.$(OBJEXT) +kwrited_DEPENDENCIES = libkwrited_main.la -@@ -438 +455 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -437,21 +454,21 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=x-konsole.desktop konsolerc sample.shell konsole_part.rc +KDE_DIST=sample.shell konsole_part.rc x-konsole.desktop konsolerc -@@ -445,2 +462,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(libkonsolepart_la_SOURCES) $(kwrited_la_SOURCES) $(konsole_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES) -OBJECTS = $(libkonsolepart_la_OBJECTS) $(kwrited_la_OBJECTS) $(konsole_la_OBJECTS) $(konsole_OBJECTS) $(konsole_grantpty_OBJECTS) $(kwrited_OBJECTS) +SOURCES = $(libkonsolepart_la_SOURCES) $(libkwrited_main_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsole_main_la_SOURCES) $(konsole_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES) +OBJECTS = $(libkonsolepart_la_OBJECTS) $(libkwrited_main_la_OBJECTS) $(kwrited_la_OBJECTS) $(libkonsole_main_la_OBJECTS) $(konsole_la_OBJECTS) $(konsole_OBJECTS) $(konsole_grantpty_OBJECTS) $(kwrited_OBJECTS) -@@ -452 +469 @@ + + #>- all: all-redirect + #>+ 1 + all: docs-am all-redirect + .SUFFIXES: -.SUFFIXES: .C .S .c .lo .o .obj .s +.SUFFIXES: .C .S .c .cpp .lo .o .obj .s -@@ -538,0 +556,3 @@ + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + #>- cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps konsole/src/Makefile + #>+ 2 +@@ -538,9 +555,15 @@ + @KDE_USE_CLOSURE_FALSE@libkonsolepart.la: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkonsolepart_la_LDFLAGS) $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_LIBADD) $(LIBS) + +libkwrited_main.la: $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwrited_main_la_LDFLAGS) $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_LIBADD) $(LIBS) + -@@ -541,0 +562,3 @@ + kwrited.la: $(kwrited_la_OBJECTS) $(kwrited_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kwrited_la_LDFLAGS) $(kwrited_la_OBJECTS) $(kwrited_la_LIBADD) $(LIBS) + +libkonsole_main.la: $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkonsole_main_la_LDFLAGS) $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_LIBADD) $(LIBS) + -@@ -586,0 +610,6 @@ + konsole.la: $(konsole_la_OBJECTS) $(konsole_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(konsole_la_LDFLAGS) $(konsole_la_OBJECTS) $(konsole_la_LIBADD) $(LIBS) + +@@ -586,6 +609,12 @@ + $(CXXCOMPILE) -c `cygpath -w $<` + .C.lo: + $(LTCXXCOMPILE) -c $< +.cpp.o: + $(CXXCOMPILE) -c $< +.cpp.obj: + $(CXXCOMPILE) -c `cygpath -w $<` +.cpp.lo: + $(LTCXXCOMPILE) -c $< -@@ -679,11 +707,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -814,3 +831,0 @@ + + install-dataDATA: $(data_DATA) + @$(NORMAL_INSTALL) +@@ -802,9 +831,6 @@ + $(XGETTEXT) rc.cpp *.C -o $(podir)/konsole.pot + rm -f schemas.C + -dummy.C: - echo > dummy.C - -@@ -891,8 +906,8 @@ + # 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: +@@ -881,29 +907,29 @@ + + + #>+ 12 -kwrited_la_meta_unload.C: kwrited.moc - @echo 'creating kwrited_la_meta_unload.C' - @-rm -f kwrited_la_meta_unload.C -- @echo 'static const char * _metalist_kwrited_la[] = {' > kwrited_la_meta_unload.C -- @cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrited_la_meta_unload.C -- @echo '0};' >> kwrited_la_meta_unload.C -- @echo '#include <kunload.h>' >> kwrited_la_meta_unload.C -- @echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.C +libkwrited_main_la_meta_unload.C: kwrited.moc + @echo 'creating libkwrited_main_la_meta_unload.C' + @-rm -f libkwrited_main_la_meta_unload.C -+ @echo 'static const char * _metalist_libkwrited_main_la[] = {' > libkwrited_main_la_meta_unload.C -+ @cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrited_main_la_meta_unload.C -+ @echo '0};' >> libkwrited_main_la_meta_unload.C -+ @echo '#include <kunload.h>' >> libkwrited_main_la_meta_unload.C -+ @echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.C -@@ -902,8 +917,8 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kwrited_la[] = {' > kwrited_la_meta_unload.C ;\ +- cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrited_la_meta_unload.C ;\ +- echo '0};' >> kwrited_la_meta_unload.C ;\ +- echo '#include <kunload.h>' >> kwrited_la_meta_unload.C ;\ +- echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.C ;\ +- else echo > kwrited_la_meta_unload.C; fi ++ echo 'static const char * _metalist_libkwrited_main_la[] = {' > libkwrited_main_la_meta_unload.C ;\ ++ cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrited_main_la_meta_unload.C ;\ ++ echo '0};' >> libkwrited_main_la_meta_unload.C ;\ ++ echo '#include <kunload.h>' >> libkwrited_main_la_meta_unload.C ;\ ++ echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.C ;\ ++ else echo > libkwrited_main_la_meta_unload.C; fi + + + #>+ 12 -konsole_la_meta_unload.C: konsole.moc - @echo 'creating konsole_la_meta_unload.C' - @-rm -f konsole_la_meta_unload.C -- @echo 'static const char * _metalist_konsole_la[] = {' > konsole_la_meta_unload.C -- @cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konsole_la_meta_unload.C -- @echo '0};' >> konsole_la_meta_unload.C -- @echo '#include <kunload.h>' >> konsole_la_meta_unload.C -- @echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.C +libkonsole_main_la_meta_unload.C: konsole.moc + @echo 'creating libkonsole_main_la_meta_unload.C' + @-rm -f libkonsole_main_la_meta_unload.C -+ @echo 'static const char * _metalist_libkonsole_main_la[] = {' > libkonsole_main_la_meta_unload.C -+ @cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonsole_main_la_meta_unload.C -+ @echo '0};' >> libkonsole_main_la_meta_unload.C -+ @echo '#include <kunload.h>' >> libkonsole_main_la_meta_unload.C -+ @echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.C -@@ -925 +940 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_konsole_la[] = {' > konsole_la_meta_unload.C ;\ +- cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konsole_la_meta_unload.C ;\ +- echo '0};' >> konsole_la_meta_unload.C ;\ +- echo '#include <kunload.h>' >> konsole_la_meta_unload.C ;\ +- echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.C ;\ +- else echo > konsole_la_meta_unload.C; fi ++ echo 'static const char * _metalist_libkonsole_main_la[] = {' > libkonsole_main_la_meta_unload.C ;\ ++ cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonsole_main_la_meta_unload.C ;\ ++ echo '0};' >> libkonsole_main_la_meta_unload.C ;\ ++ echo '#include <kunload.h>' >> libkonsole_main_la_meta_unload.C ;\ ++ echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.C ;\ ++ else echo > libkonsole_main_la_meta_unload.C; fi + + + #>+ 12 +@@ -921,7 +947,7 @@ + + #>+ 3 + clean-moc-classes: - -rm -f libkonsolepart_la_meta_unload.C kwrited_la_meta_unload.C konsole_la_meta_unload.C konsole_meta_unload.C + -rm -f libkonsolepart_la_meta_unload.C libkwrited_main_la_meta_unload.C libkonsole_main_la_meta_unload.C konsole_meta_unload.C -@@ -940,7 +955,7 @@ + + #>+ 11 + libkonsolepart_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/TEPty.C $(srcdir)/BlockArray.C $(srcdir)/schema.C $(srcdir)/session.C $(srcdir)/TEWidget.C $(srcdir)/TEmuVt102.C $(srcdir)/TEScreen.C $(srcdir)/TEmulation.C $(srcdir)/TEHistory.C $(srcdir)/keytrans.C $(srcdir)/konsole_part.C libkonsolepart_la_meta_unload.C konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc +@@ -936,28 +962,64 @@ + rm -f libkonsolepart_la.all_C.final libkonsolepart_la.all_C.files + + #>+ 11 -kwrited_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/kwrited.C kwrited_la_meta_unload.C - @echo 'creating kwrited_la.all_C.C ...'; \ - rm -f kwrited_la.all_C.files kwrited_la.all_C.final; \ @@ -184,19 +267,23 @@ $NetBSD: patch-cz,v 1.1 2001/10/15 22:46:07 skrll Exp $ + for file in kwrited.C libkwrited_main_la_meta_unload.C ; do \ + echo "#include \"$$file\"" >> libkwrited_main_la.all_C.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrited_main_la.all_C.final; \ -@@ -948,2 +963,2 @@ -- cat kwrited_la.all_C.final kwrited_la.all_C.files > kwrited_la.all_C.C; \ -- rm -f kwrited_la.all_C.final kwrited_la.all_C.files ++ done; \ + cat libkwrited_main_la.all_C.final libkwrited_main_la.all_C.files > libkwrited_main_la.all_C.C; \ + rm -f libkwrited_main_la.all_C.final libkwrited_main_la.all_C.files -@@ -952,7 +967,7 @@ --konsole_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C konsole_la_meta_unload.C -- @echo 'creating konsole_la.all_C.C ...'; \ -- rm -f konsole_la.all_C.files konsole_la.all_C.final; \ -- echo "#define KDE_USE_FINAL 1" >> konsole_la.all_C.final; \ -- for file in main.C konsole.C konsole_la_meta_unload.C ; do \ -- echo "#include \"$$file\"" >> konsole_la.all_C.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_C.final; \ ++ ++#>+ 11 ++kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp ++ @echo 'creating kwrited_la.all_cpp.cpp ...'; \ ++ rm -f kwrited_la.all_cpp.files kwrited_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_cpp.final; \ ++ for file in kwrited_main.cpp ; do \ ++ echo "#include \"$$file\"" >> kwrited_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_cpp.final; \ ++ done; \ ++ cat kwrited_la.all_cpp.final kwrited_la.all_cpp.files > kwrited_la.all_cpp.cpp; \ ++ rm -f kwrited_la.all_cpp.final kwrited_la.all_cpp.files ++ ++#>+ 11 +libkonsole_main_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C libkonsole_main_la_meta_unload.C + @echo 'creating libkonsole_main_la.all_C.C ...'; \ + rm -f libkonsole_main_la.all_C.files libkonsole_main_la.all_C.final; \ @@ -204,13 +291,51 @@ $NetBSD: patch-cz,v 1.1 2001/10/15 22:46:07 skrll Exp $ + for file in main.C konsole.C libkonsole_main_la_meta_unload.C ; do \ + echo "#include \"$$file\"" >> libkonsole_main_la.all_C.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonsole_main_la.all_C.final; \ -@@ -960,2 +975,2 @@ -- cat konsole_la.all_C.final konsole_la.all_C.files > konsole_la.all_C.C; \ -- rm -f konsole_la.all_C.final konsole_la.all_C.files ++ done; \ + cat libkonsole_main_la.all_C.final libkonsole_main_la.all_C.files > libkonsole_main_la.all_C.C; \ + rm -f libkonsole_main_la.all_C.final libkonsole_main_la.all_C.files -@@ -975,12 +989,0 @@ --#>+ 11 ++ ++#>+ 11 ++konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konsole_main.cpp ++ @echo 'creating konsole_la.all_cpp.cpp ...'; \ ++ rm -f konsole_la.all_cpp.files konsole_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> konsole_la.all_cpp.final; \ ++ for file in konsole_main.cpp ; do \ ++ echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ + done; \ +- cat kwrited_la.all_C.final kwrited_la.all_C.files > kwrited_la.all_C.C; \ +- rm -f kwrited_la.all_C.final kwrited_la.all_C.files ++ cat konsole_la.all_cpp.final konsole_la.all_cpp.files > konsole_la.all_cpp.cpp; \ ++ rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files + + #>+ 11 +-konsole_la.all_C.C: $(srcdir)/Makefile.in $(srcdir)/main.C $(srcdir)/konsole.C konsole_la_meta_unload.C +- @echo 'creating konsole_la.all_C.C ...'; \ +- rm -f konsole_la.all_C.files konsole_la.all_C.final; \ +- echo "#define KDE_USE_FINAL 1" >> konsole_la.all_C.final; \ +- for file in main.C konsole.C konsole_la_meta_unload.C ; do \ +- echo "#include \"$$file\"" >> konsole_la.all_C.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_C.final; \ ++konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konsole_main.cpp ++ @echo 'creating konsole.all_cpp.cpp ...'; \ ++ rm -f konsole.all_cpp.files konsole.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> konsole.all_cpp.final; \ ++ for file in konsole_main.cpp ; do \ ++ echo "#include \"$$file\"" >> konsole.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \ + done; \ +- cat konsole_la.all_C.final konsole_la.all_C.files > konsole_la.all_C.C; \ +- rm -f konsole_la.all_C.final konsole_la.all_C.files ++ cat konsole.all_cpp.final konsole.all_cpp.files > konsole.all_cpp.cpp; \ ++ rm -f konsole.all_cpp.final konsole.all_cpp.files + + #>+ 11 + konsole.all_C.C: $(srcdir)/Makefile.in $(srcdir)/TEPty.C $(srcdir)/BlockArray.C $(srcdir)/main.C $(srcdir)/konsole.C $(srcdir)/schema.C $(srcdir)/session.C $(srcdir)/TEWidget.C $(srcdir)/TEmuVt102.C $(srcdir)/TEScreen.C $(srcdir)/TEmulation.C $(srcdir)/TEHistory.C $(srcdir)/keytrans.C konsole_meta_unload.C +@@ -972,33 +1034,33 @@ + rm -f konsole.all_C.final konsole.all_C.files + + #>+ 11 -kwrited.all_C.C: $(srcdir)/Makefile.in dummy.C - @echo 'creating kwrited.all_C.C ...'; \ - rm -f kwrited.all_C.files kwrited.all_C.final; \ @@ -218,16 +343,40 @@ $NetBSD: patch-cz,v 1.1 2001/10/15 22:46:07 skrll Exp $ - for file in dummy.C ; do \ - echo "#include \"$$file\"" >> kwrited.all_C.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_C.final; \ -- done; \ ++kwrited.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp ++ @echo 'creating kwrited.all_cpp.cpp ...'; \ ++ rm -f kwrited.all_cpp.files kwrited.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> kwrited.all_cpp.final; \ ++ for file in kwrited_main.cpp ; do \ ++ echo "#include \"$$file\"" >> kwrited.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_cpp.final; \ + done; \ - cat kwrited.all_C.final kwrited.all_C.files > kwrited.all_C.C; \ - rm -f kwrited.all_C.final kwrited.all_C.files -- -@@ -989 +992 @@ ++ cat kwrited.all_cpp.final kwrited.all_cpp.files > kwrited.all_cpp.cpp; \ ++ rm -f kwrited.all_cpp.final kwrited.all_cpp.files + + #>+ 3 + clean-final: - -rm -f libkonsolepart_la.all_C.C kwrited_la.all_C.C konsole_la.all_C.C konsole.all_C.C kwrited.all_C.C -+ -rm -f libkonsolepart_la.all_C.C libkwrited_main_la.all_C.C libkonsole_main_la.all_C.C konsole.all_C.C -@@ -993 +996 @@ ++ -rm -f libkonsolepart_la.all_C.C libkwrited_main_la.all_C.C kwrited_la.all_cpp.cpp libkonsole_main_la.all_C.C konsole_la.all_cpp.cpp konsole.all_cpp.cpp konsole.all_C.C kwrited.all_cpp.cpp + + #>+ 2 + final: - $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am + $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am -@@ -996 +999 @@ + #>+ 2 + final-install: +- $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am ++ $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am + $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am ++ $(MAKE) libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-dd b/x11/kdebase2/patches/patch-dd index 2cbafec29f2..807a4ec83df 100644 --- a/x11/kdebase2/patches/patch-dd +++ b/x11/kdebase2/patches/patch-dd @@ -1,8 +1,8 @@ -$NetBSD: patch-dd,v 1.1 2001/10/15 22:46:08 skrll Exp $ +$NetBSD: patch-dd,v 1.2 2001/12/03 15:37:19 skrll Exp $ --- konsole/src/main.C.orig Wed Sep 5 00:16:57 2001 +++ konsole/src/main.C -@@ -109,7 +109,7 @@ +@@ -108,7 +108,7 @@ /* --| main |------------------------------------------------------ */ diff --git a/x11/kdebase2/patches/patch-de b/x11/kdebase2/patches/patch-de index 06e15cb1a84..e78852d52cf 100644 --- a/x11/kdebase2/patches/patch-de +++ b/x11/kdebase2/patches/patch-de @@ -1,16 +1,14 @@ -$NetBSD: patch-de,v 1.1 2001/10/15 22:46:08 skrll Exp $ - ---- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Tue Aug 8 23:53:56 2000 -+++ ksysguard/ksysguardd/FreeBSD/CPU.c -@@ -25,7 +25,11 @@ +--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Mon Nov 26 01:14:58 2001 ++++ ksysguard/ksysguardd/FreeBSD/CPU.c Mon Nov 26 01:15:11 2001 +@@ -19,7 +19,11 @@ + */ - #include <kvm.h> - #include <nlist.h> + #include <sys/dkstat.h> +#ifdef __NetBSD__ +#include <sys/sched.h> /* CPUSTATES */ +#else #include <devstat.h> +#endif #include <fcntl.h> - #include <stdio.h> - #include <stdlib.h> + #include <kvm.h> + #include <nlist.h> diff --git a/x11/kdebase2/patches/patch-df b/x11/kdebase2/patches/patch-df index ee039463cc9..cda0c9563dc 100644 --- a/x11/kdebase2/patches/patch-df +++ b/x11/kdebase2/patches/patch-df @@ -1,40 +1,49 @@ -$NetBSD: patch-df,v 1.1 2001/10/15 22:46:08 skrll Exp $ - ---- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Jul 28 00:59:28 2000 -+++ ksysguard/ksysguardd/FreeBSD/Memory.c -@@ -29,7 +29,12 @@ - - #include <sys/param.h> - #include <sys/sysctl.h> +--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Sat Nov 10 18:17:04 2001 ++++ ksysguard/ksysguardd/FreeBSD/Memory.c Mon Nov 26 12:00:04 2001 +@@ -32,7 +32,12 @@ + #include <sys/types.h> + #include <sys/vmmeter.h> + #include <unistd.h> +/* Everything post 1.5.x uses uvm/uvm_* includes */ +#if __NetBSD_Version__ >= 105010000 +#include <uvm/uvm_param.h> +#else #include <vm/vm_param.h> +#endif - #include <sys/vmmeter.h> - #include <string.h> - #include <unistd.h> -@@ -65,9 +70,16 @@ - struct vmtotal p; - FILE *file; - char buf[256]; + + #include "Command.h" + #include "Memory.h" +@@ -82,15 +87,25 @@ + struct vmtotal p; + FILE *file; + char buf[256]; + int rc; ++#ifndef __NetBSD__ + struct kvm_swap kswap[16]; + int i, swap_count, hlen, pagesize = getpagesize(); + long blocksize; ++#endif len = sizeof (Total); +#ifdef __NetBSD__ -+ mib[0] = CTL_HW; -+ mib[1] = HW_PHYSMEM; -+ sysctl(mib, sizeof(mib), &Total, &len, NULL, 0); ++ mib[0] = CTL_HW; ++ mib[1] = HW_PHYSMEM; ++ sysctl(mib, sizeof(mib), &Total, &len, NULL, 0); +#else sysctlbyname("hw.physmem", &Total, &len, NULL, 0); +#endif Total /= 1024; - /* Q&D hack for swap display. Borrowed from xsysinfo-1.4 */ -@@ -92,23 +104,40 @@ - } + /* Borrowed from pstat */ ++#ifndef __NetBSD__ + swap_count = kvm_getswapinfo(kd, kswap, 16, SWIF_DEV_PREFIX); + getbsize(&hlen, &blocksize); +@@ -101,24 +116,42 @@ + SUsed = CONVERT(kswap[0].ksw_used); + SFree = CONVERT(kswap[0].ksw_total - kswap[0].ksw_used); + } ++#endif +#ifdef __NetBSD__ + /* NetBSD doesn't know about vfs.bufspace */ diff --git a/x11/kdebase2/patches/patch-dh b/x11/kdebase2/patches/patch-dh index 34273c317ba..859f3c820ca 100644 --- a/x11/kdebase2/patches/patch-dh +++ b/x11/kdebase2/patches/patch-dh @@ -1,93 +1,130 @@ -$NetBSD: patch-dh,v 1.1 2001/10/15 22:46:08 skrll Exp $ +$NetBSD: patch-dh,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kwin/Makefile.in.orig Sat Sep 8 01:36:48 2001 +--- kwin/Makefile.in.orig Sat Nov 10 07:58:36 2001 +++ kwin/Makefile.in -@@ -278 +278 @@ +@@ -277,15 +277,15 @@ + SUBDIRS = . pics clients + + bin_PROGRAMS = kwin -lib_LTLIBRARIES = kwin.la +lib_LTLIBRARIES = libkwin.la -@@ -281 +281 @@ + + # workspace.cpp has to be first in order not to break --enable-final -#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel killwindow.cpp kwinbutton.cpp +#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel killwindow.cpp kwinbutton.cpp -@@ -283 +283 @@ + #>+ 1 -kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp +libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp -@@ -285,2 +285,2 @@ + -kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) -kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version +libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) +libkwin_la_LDFLAGS = $(all_libraries) -module -avoid-version -@@ -294 +294 @@ + + include_HEADERS = KWinInterface.h + +@@ -293,7 +293,7 @@ + kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h + + kwin_SOURCES = kwin_main.cpp -kwin_LDADD = kwin.la +kwin_LDADD = libkwin.la -@@ -319,2 +319,2 @@ + kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + KDE_ICON = kwin +@@ -318,23 +318,23 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -kwin_la_DEPENDENCIES = -#>- kwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ +libkwin_la_DEPENDENCIES = +#>- libkwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ -@@ -323,2 +323,2 @@ + #>- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo + #>+ 6 -kwin_la_final_OBJECTS = kwin_la.all_cpp.lo -kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ +libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo +libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ -@@ -326,3 +326,3 @@ --kwin_la_meta_unload.lo + options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo \ +- kwin_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) -+libkwin_la_meta_unload.lo ++ libkwin_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS) -@@ -335 +335 @@ + bin_PROGRAMS = kwin$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + + #>- kwin_OBJECTS = kwin_main.$(OBJEXT) + #>+ 1 + kwin_OBJECTS = kwin_main.$(OBJEXT) -kwin_DEPENDENCIES = kwin.la +kwin_DEPENDENCIES = libkwin.la -@@ -356 +356 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -355,15 +355,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=NEWCOLORSCHEME.README stdclient_bitmaps.h tabbox.h hi48-app-kwin.png LICENSE main.h hi32-app-kwin.png pop.wav plugins.h killwindow.h kwinbindings.cpp events.h atoms.h eventsrc hi16-app-kwin.png +KDE_DIST=plugins.h LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h atoms.h eventsrc hi16-app-kwin.png -@@ -363,2 +363,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) -OBJECTS = $(kwin_la_OBJECTS) $(kwin_OBJECTS) +SOURCES = $(libkwin_la_SOURCES) $(kwin_SOURCES) +OBJECTS = $(libkwin_la_OBJECTS) $(kwin_OBJECTS) -@@ -451,2 +451,2 @@ + + #>- all: all-redirect + #>+ 1 +@@ -450,8 +450,8 @@ + + maintainer-clean-libtool: + -kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) +libkwin.la: $(libkwin_la_OBJECTS) $(libkwin_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwin_la_LDFLAGS) $(libkwin_la_OBJECTS) $(libkwin_la_LIBADD) $(LIBS) -@@ -593 +593 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -651,11 +650,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -859,8 +848,8 @@ + + mostlyclean-binPROGRAMS: + +@@ -847,33 +847,33 @@ + + + #>+ 12 -kwin_la_meta_unload.cpp: workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc - @echo 'creating kwin_la_meta_unload.cpp' - @-rm -f kwin_la_meta_unload.cpp -- @echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp -- @cat workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp -- @echo '0};' >> kwin_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kwin_la_meta_unload.cpp -- @echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp +libkwin_la_meta_unload.cpp: workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc + @echo 'creating libkwin_la_meta_unload.cpp' + @-rm -f libkwin_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp -+ @cat workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp -+ @echo '0};' >> libkwin_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkwin_la_meta_unload.cpp -+ @echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp -@@ -871 +860 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp ;\ +- cat workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp ;\ +- echo '0};' >> kwin_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kwin_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp ;\ +- else echo > kwin_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp ;\ ++ cat workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp ;\ ++ echo '0};' >> libkwin_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkwin_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp ;\ ++ else echo > libkwin_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kwin_la_meta_unload.cpp + -rm -f libkwin_la_meta_unload.cpp -@@ -874,7 +863,7 @@ + + #>+ 11 -kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc - @echo 'creating kwin_la.all_cpp.cpp ...'; \ - rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ @@ -102,17 +139,37 @@ $NetBSD: patch-dh,v 1.1 2001/10/15 22:46:08 skrll Exp $ + for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \ -@@ -882,2 +871,2 @@ + done; \ - cat kwin_la.all_cpp.final kwin_la.all_cpp.files > kwin_la.all_cpp.cpp; \ - rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files + cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ + rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files -@@ -899 +888 @@ + + #>+ 11 + kwin.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp +@@ -889,20 +889,20 @@ + + #>+ 3 + clean-final: - -rm -f kwin_la.all_cpp.cpp kwin.all_cpp.cpp + -rm -f libkwin_la.all_cpp.cpp kwin.all_cpp.cpp -@@ -903 +892 @@ + + #>+ 2 + final: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" all-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" all-am -@@ -906 +895 @@ + #>+ 2 + final-install: +- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" install-am ++ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" all-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-dj b/x11/kdebase2/patches/patch-dj index bd0f1c1f872..8a229cd8f01 100644 --- a/x11/kdebase2/patches/patch-dj +++ b/x11/kdebase2/patches/patch-dj @@ -1,25 +1,31 @@ -$NetBSD: patch-dj,v 1.1 2001/10/15 22:46:08 skrll Exp $ +$NetBSD: patch-dj,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kwin/clients/b2/Makefile.in.orig Sat Sep 8 01:36:48 2001 +--- kwin/clients/b2/Makefile.in.orig Sat Nov 10 07:58:36 2001 +++ kwin/clients/b2/Makefile.in -@@ -279 +279 @@ +@@ -278,7 +278,7 @@ + kde_module_LTLIBRARIES = libkwinb2.la + + libkwinb2_la_SOURCES = b2client.cpp -libkwinb2_la_LIBADD = ../../kwin.la +libkwinb2_la_LIBADD = ../../libkwin.la -@@ -301 +301 @@ + libkwinb2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -300,7 +300,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinb2_la_DEPENDENCIES = ../../kwin.la +libkwinb2_la_DEPENDENCIES = ../../libkwin.la -@@ -329 +329 @@ + #>- libkwinb2_la_OBJECTS = b2client.lo + #>+ 5 + libkwinb2_la_final_OBJECTS = libkwinb2_la.all_cpp.lo +@@ -328,7 +328,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=b2.desktop bitmaps.h +KDE_DIST=bitmaps.h b2.desktop -@@ -489,11 +488,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase2/patches/patch-dl b/x11/kdebase2/patches/patch-dl index 1701e1cd7de..44aab37d92b 100644 --- a/x11/kdebase2/patches/patch-dl +++ b/x11/kdebase2/patches/patch-dl @@ -1,25 +1,22 @@ -$NetBSD: patch-dl,v 1.1 2001/10/15 22:46:09 skrll Exp $ +$NetBSD: patch-dl,v 1.2 2001/12/03 15:37:19 skrll Exp $ ---- kwin/clients/default/Makefile.in.orig Sat Sep 8 01:36:49 2001 +--- kwin/clients/default/Makefile.in.orig Sat Nov 10 07:58:36 2001 +++ kwin/clients/default/Makefile.in -@@ -281 +281 @@ +@@ -280,7 +280,7 @@ + kde_module_LTLIBRARIES = libkwindefault.la + + libkwindefault_la_SOURCES = kdedefault.cpp -libkwindefault_la_LIBADD = ../../kwin.la +libkwindefault_la_LIBADD = ../../libkwin.la -@@ -298 +298 @@ + libkwindefault_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -297,7 +297,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwindefault_la_DEPENDENCIES = ../../kwin.la +libkwindefault_la_DEPENDENCIES = ../../libkwin.la -@@ -462 +462 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -520,11 +519,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwindefault_la_OBJECTS = kdedefault.lo + #>+ 5 + libkwindefault_la_final_OBJECTS = libkwindefault_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-dn b/x11/kdebase2/patches/patch-dn index a87d2013571..4fa8382d330 100644 --- a/x11/kdebase2/patches/patch-dn +++ b/x11/kdebase2/patches/patch-dn @@ -1,25 +1,22 @@ -$NetBSD: patch-dn,v 1.1 2001/10/15 22:46:09 skrll Exp $ +$NetBSD: patch-dn,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/icewm/Makefile.in.orig Sat Sep 8 01:36:49 2001 +--- kwin/clients/icewm/Makefile.in.orig Sat Nov 10 07:58:37 2001 +++ kwin/clients/icewm/Makefile.in -@@ -281 +281 @@ +@@ -280,7 +280,7 @@ + kde_module_LTLIBRARIES = libkwinicewm.la + + libkwinicewm_la_SOURCES = icewm.cpp -libkwinicewm_la_LIBADD = ../../kwin.la +libkwinicewm_la_LIBADD = ../../libkwin.la -@@ -303 +303 @@ + libkwinicewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -302,7 +302,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinicewm_la_DEPENDENCIES = ../../kwin.la +libkwinicewm_la_DEPENDENCIES = ../../libkwin.la -@@ -493 +493 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -551,11 +550,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinicewm_la_OBJECTS = icewm.lo + #>+ 5 + libkwinicewm_la_final_OBJECTS = libkwinicewm_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-dq b/x11/kdebase2/patches/patch-dq index fb30dc95caf..292c3d09078 100644 --- a/x11/kdebase2/patches/patch-dq +++ b/x11/kdebase2/patches/patch-dq @@ -1,25 +1,31 @@ -$NetBSD: patch-dq,v 1.1 2001/10/15 22:46:09 skrll Exp $ +$NetBSD: patch-dq,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/kde1/Makefile.in.orig Sat Sep 8 01:36:49 2001 +--- kwin/clients/kde1/Makefile.in.orig Sat Nov 10 07:58:37 2001 +++ kwin/clients/kde1/Makefile.in -@@ -279 +279 @@ +@@ -278,7 +278,7 @@ + kde_module_LTLIBRARIES = libkwinkde1.la + + libkwinkde1_la_SOURCES = kde1client.cpp -libkwinkde1_la_LIBADD = ../../kwin.la +libkwinkde1_la_LIBADD = ../../libkwin.la -@@ -300 +300 @@ + libkwinkde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -299,7 +299,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinkde1_la_DEPENDENCIES = ../../kwin.la +libkwinkde1_la_DEPENDENCIES = ../../libkwin.la -@@ -328 +328 @@ + #>- libkwinkde1_la_OBJECTS = kde1client.lo + #>+ 5 + libkwinkde1_la_final_OBJECTS = libkwinkde1_la.all_cpp.lo +@@ -327,7 +327,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=kde1.desktop kde1client_bitmaps.h +KDE_DIST=kde1client_bitmaps.h kde1.desktop -@@ -488,11 +487,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase2/patches/patch-ds b/x11/kdebase2/patches/patch-ds index 1a45d5cf0ed..307f0d44629 100644 --- a/x11/kdebase2/patches/patch-ds +++ b/x11/kdebase2/patches/patch-ds @@ -1,22 +1,22 @@ -$NetBSD: patch-ds,v 1.1 2001/10/15 22:46:10 skrll Exp $ +$NetBSD: patch-ds,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/kstep/Makefile.in.orig Sat Sep 8 01:36:49 2001 +--- kwin/clients/kstep/Makefile.in.orig Sat Nov 10 07:58:37 2001 +++ kwin/clients/kstep/Makefile.in -@@ -279 +279 @@ +@@ -278,7 +278,7 @@ + kde_module_LTLIBRARIES = libkwinkstep.la + + libkwinkstep_la_SOURCES = nextclient.cpp -libkwinkstep_la_LIBADD = ../../kwin.la +libkwinkstep_la_LIBADD = ../../libkwin.la -@@ -301 +301 @@ + libkwinkstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -300,7 +300,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinkstep_la_DEPENDENCIES = ../../kwin.la +libkwinkstep_la_DEPENDENCIES = ../../libkwin.la -@@ -489,11 +488,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinkstep_la_OBJECTS = nextclient.lo + #>+ 5 + libkwinkstep_la_final_OBJECTS = libkwinkstep_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-du b/x11/kdebase2/patches/patch-du index e730b201c6e..5e38654e6e4 100644 --- a/x11/kdebase2/patches/patch-du +++ b/x11/kdebase2/patches/patch-du @@ -1,25 +1,22 @@ -$NetBSD: patch-du,v 1.1 2001/10/15 22:46:10 skrll Exp $ +$NetBSD: patch-du,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/kwmtheme/Makefile.in.orig Sat Sep 8 01:36:49 2001 +--- kwin/clients/kwmtheme/Makefile.in.orig Sat Nov 10 07:58:37 2001 +++ kwin/clients/kwmtheme/Makefile.in -@@ -280 +280 @@ +@@ -279,7 +279,7 @@ + kde_module_LTLIBRARIES = libkwinkwmtheme.la + + libkwinkwmtheme_la_SOURCES = kwmthemeclient.cpp -libkwinkwmtheme_la_LIBADD = ../../kwin.la +libkwinkwmtheme_la_LIBADD = ../../libkwin.la -@@ -297 +297 @@ + libkwinkwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -296,7 +296,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinkwmtheme_la_DEPENDENCIES = ../../kwin.la +libkwinkwmtheme_la_DEPENDENCIES = ../../libkwin.la -@@ -466 +466 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -524,11 +523,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinkwmtheme_la_OBJECTS = kwmthemeclient.lo + #>+ 5 + libkwinkwmtheme_la_final_OBJECTS = libkwinkwmtheme_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-dw b/x11/kdebase2/patches/patch-dw index 9d7f02f04f4..935012ef4a5 100644 --- a/x11/kdebase2/patches/patch-dw +++ b/x11/kdebase2/patches/patch-dw @@ -1,22 +1,22 @@ -$NetBSD: patch-dw,v 1.1 2001/10/15 22:46:10 skrll Exp $ +$NetBSD: patch-dw,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/laptop/Makefile.in.orig Sat Sep 8 01:36:50 2001 +--- kwin/clients/laptop/Makefile.in.orig Sat Nov 10 07:58:37 2001 +++ kwin/clients/laptop/Makefile.in -@@ -279 +279 @@ +@@ -278,7 +278,7 @@ + kde_module_LTLIBRARIES = libkwinlaptop.la + + libkwinlaptop_la_SOURCES = laptopclient.cpp -libkwinlaptop_la_LIBADD = ../../kwin.la +libkwinlaptop_la_LIBADD = ../../libkwin.la -@@ -301 +301 @@ + libkwinlaptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -300,7 +300,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinlaptop_la_DEPENDENCIES = ../../kwin.la +libkwinlaptop_la_DEPENDENCIES = ../../libkwin.la -@@ -489,11 +488,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinlaptop_la_OBJECTS = laptopclient.lo + #>+ 5 + libkwinlaptop_la_final_OBJECTS = libkwinlaptop_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-dy b/x11/kdebase2/patches/patch-dy index 941a43c20f4..05c8e953573 100644 --- a/x11/kdebase2/patches/patch-dy +++ b/x11/kdebase2/patches/patch-dy @@ -1,28 +1,31 @@ -$NetBSD: patch-dy,v 1.1 2001/10/15 22:46:10 skrll Exp $ +$NetBSD: patch-dy,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/modernsystem/Makefile.in.orig Sat Sep 8 01:36:50 2001 +--- kwin/clients/modernsystem/Makefile.in.orig Sat Nov 10 07:58:37 2001 +++ kwin/clients/modernsystem/Makefile.in -@@ -283 +283 @@ +@@ -282,7 +282,7 @@ + kde_module_LTLIBRARIES = libkwinmodernsys.la + + libkwinmodernsys_la_SOURCES = modernsys.cpp -libkwinmodernsys_la_LIBADD = ../../kwin.la +libkwinmodernsys_la_LIBADD = ../../libkwin.la -@@ -305 +305 @@ + libkwinmodernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -304,7 +304,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinmodernsys_la_DEPENDENCIES = ../../kwin.la +libkwinmodernsys_la_DEPENDENCIES = ../../libkwin.la -@@ -333 +333 @@ + #>- libkwinmodernsys_la_OBJECTS = modernsys.lo + #>+ 5 + libkwinmodernsys_la_final_OBJECTS = libkwinmodernsys_la.all_cpp.lo +@@ -332,7 +332,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=buttondata.h btnhighcolor.h modernsystem.desktop +KDE_DIST=btnhighcolor.h modernsystem.desktop buttondata.h -@@ -495 +495 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -553,11 +552,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase2/patches/patch-ea b/x11/kdebase2/patches/patch-ea index abf653b7419..fe81f0ca3ab 100644 --- a/x11/kdebase2/patches/patch-ea +++ b/x11/kdebase2/patches/patch-ea @@ -1,22 +1,22 @@ -$NetBSD: patch-ea,v 1.1 2001/10/15 22:46:10 skrll Exp $ +$NetBSD: patch-ea,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/mwm/Makefile.in.orig Sat Sep 8 01:36:50 2001 +--- kwin/clients/mwm/Makefile.in.orig Sat Nov 10 07:58:37 2001 +++ kwin/clients/mwm/Makefile.in -@@ -279 +279 @@ +@@ -278,7 +278,7 @@ + kde_module_LTLIBRARIES = libkwinmwm.la + + libkwinmwm_la_SOURCES = mwmclient.cpp -libkwinmwm_la_LIBADD = ../../kwin.la +libkwinmwm_la_LIBADD = ../../libkwin.la -@@ -301 +301 @@ + libkwinmwm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -300,7 +300,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinmwm_la_DEPENDENCIES = ../../kwin.la +libkwinmwm_la_DEPENDENCIES = ../../libkwin.la -@@ -489,11 +488,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinmwm_la_OBJECTS = mwmclient.lo + #>+ 5 + libkwinmwm_la_final_OBJECTS = libkwinmwm_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-ec b/x11/kdebase2/patches/patch-ec index ed155807c36..61db836ed32 100644 --- a/x11/kdebase2/patches/patch-ec +++ b/x11/kdebase2/patches/patch-ec @@ -1,25 +1,22 @@ -$NetBSD: patch-ec,v 1.1 2001/10/15 22:46:10 skrll Exp $ +$NetBSD: patch-ec,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/quartz/Makefile.in.orig Sat Sep 8 01:36:50 2001 +--- kwin/clients/quartz/Makefile.in.orig Sat Nov 10 07:58:38 2001 +++ kwin/clients/quartz/Makefile.in -@@ -281 +281 @@ +@@ -280,7 +280,7 @@ + kde_module_LTLIBRARIES = libkwinquartz.la + + libkwinquartz_la_SOURCES = quartz.cpp -libkwinquartz_la_LIBADD = ../../kwin.la +libkwinquartz_la_LIBADD = ../../libkwin.la -@@ -303 +303 @@ + libkwinquartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -302,7 +302,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinquartz_la_DEPENDENCIES = ../../kwin.la +libkwinquartz_la_DEPENDENCIES = ../../libkwin.la -@@ -493 +493 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -551,11 +550,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinquartz_la_OBJECTS = quartz.lo + #>+ 5 + libkwinquartz_la_final_OBJECTS = libkwinquartz_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-ee b/x11/kdebase2/patches/patch-ee index 9dc88deb897..0ad55cd6451 100644 --- a/x11/kdebase2/patches/patch-ee +++ b/x11/kdebase2/patches/patch-ee @@ -1,22 +1,22 @@ -$NetBSD: patch-ee,v 1.1 2001/10/15 22:46:10 skrll Exp $ +$NetBSD: patch-ee,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/redmond/Makefile.in.orig Sat Sep 8 01:36:50 2001 +--- kwin/clients/redmond/Makefile.in.orig Sat Nov 10 07:58:38 2001 +++ kwin/clients/redmond/Makefile.in -@@ -279 +279 @@ +@@ -278,7 +278,7 @@ + kde_module_LTLIBRARIES = libkwinredmond.la + + libkwinredmond_la_SOURCES = redmond.cpp -libkwinredmond_la_LIBADD = ../../kwin.la +libkwinredmond_la_LIBADD = ../../libkwin.la -@@ -301 +301 @@ + libkwinredmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -300,7 +300,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinredmond_la_DEPENDENCIES = ../../kwin.la +libkwinredmond_la_DEPENDENCIES = ../../libkwin.la -@@ -489,11 +488,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinredmond_la_OBJECTS = redmond.lo + #>+ 5 + libkwinredmond_la_final_OBJECTS = libkwinredmond_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-eg b/x11/kdebase2/patches/patch-eg index 3832f6184f1..89c12274b4a 100644 --- a/x11/kdebase2/patches/patch-eg +++ b/x11/kdebase2/patches/patch-eg @@ -1,25 +1,31 @@ -$NetBSD: patch-eg,v 1.1 2001/10/15 22:46:10 skrll Exp $ +$NetBSD: patch-eg,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/riscos/Makefile.in.orig Sat Sep 8 01:36:50 2001 +--- kwin/clients/riscos/Makefile.in.orig Sat Nov 10 07:58:38 2001 +++ kwin/clients/riscos/Makefile.in -@@ -280 +280 @@ +@@ -279,7 +279,7 @@ + + libkwinriscos_la_SOURCES = Button.cpp CloseButton.cpp IconifyButton.cpp LowerButton.cpp Manager.cpp MaximiseButton.cpp StickyButton.cpp HelpButton.cpp Static.cpp + -libkwinriscos_la_LIBADD = ../../kwin.la +libkwinriscos_la_LIBADD = ../../libkwin.la -@@ -303 +303 @@ + libkwinriscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -302,7 +302,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinriscos_la_DEPENDENCIES = ../../kwin.la +libkwinriscos_la_DEPENDENCIES = ../../libkwin.la -@@ -335 +335 @@ + #>- libkwinriscos_la_OBJECTS = Button.lo CloseButton.lo IconifyButton.lo \ + #>- LowerButton.lo Manager.lo MaximiseButton.lo StickyButton.lo \ + #>- HelpButton.lo Static.lo +@@ -334,7 +334,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=Palette.h riscos.desktop +KDE_DIST=riscos.desktop Palette.h -@@ -495,11 +494,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase2/patches/patch-ei b/x11/kdebase2/patches/patch-ei index 8781283d6c4..0b2992f6b3b 100644 --- a/x11/kdebase2/patches/patch-ei +++ b/x11/kdebase2/patches/patch-ei @@ -1,22 +1,22 @@ -$NetBSD: patch-ei,v 1.1 2001/10/15 22:46:11 skrll Exp $ +$NetBSD: patch-ei,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/system/Makefile.in.orig Sat Sep 8 01:36:50 2001 +--- kwin/clients/system/Makefile.in.orig Sat Nov 10 07:58:38 2001 +++ kwin/clients/system/Makefile.in -@@ -279 +279 @@ +@@ -278,7 +278,7 @@ + kde_module_LTLIBRARIES = libkwinsystem.la + + libkwinsystem_la_SOURCES = systemclient.cpp -libkwinsystem_la_LIBADD = ../../kwin.la +libkwinsystem_la_LIBADD = ../../libkwin.la -@@ -301 +301 @@ + libkwinsystem_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + + #>- METASOURCES = AUTO +@@ -300,7 +300,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinsystem_la_DEPENDENCIES = ../../kwin.la +libkwinsystem_la_DEPENDENCIES = ../../libkwin.la -@@ -489,11 +488,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinsystem_la_OBJECTS = systemclient.lo + #>+ 5 + libkwinsystem_la_final_OBJECTS = libkwinsystem_la.all_cpp.lo diff --git a/x11/kdebase2/patches/patch-ek b/x11/kdebase2/patches/patch-ek index 7b5f95d3395..bf506a2f7ef 100644 --- a/x11/kdebase2/patches/patch-ek +++ b/x11/kdebase2/patches/patch-ek @@ -1,22 +1,22 @@ -$NetBSD: patch-ek,v 1.1 2001/10/15 22:46:11 skrll Exp $ +$NetBSD: patch-ek,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kwin/clients/web/Makefile.in.orig Sat Sep 8 01:36:50 2001 +--- kwin/clients/web/Makefile.in.orig Sat Nov 10 07:58:38 2001 +++ kwin/clients/web/Makefile.in -@@ -283 +283 @@ +@@ -282,7 +282,7 @@ + noinst_HEADERS = Web.h WebButton.h WebButtonClose.h WebButtonHelp.h WebButtonIconify.h WebButtonLower.h WebButtonMaximize.h WebButtonSticky.h + + -libkwinweb_la_LIBADD = ../../kwin.la +libkwinweb_la_LIBADD = ../../libkwin.la -@@ -302 +302 @@ + libkwinweb_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) + #>- METASOURCES = AUTO + +@@ -301,7 +301,7 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -libkwinweb_la_DEPENDENCIES = ../../kwin.la +libkwinweb_la_DEPENDENCIES = ../../libkwin.la -@@ -494,11 +493,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 + #>- libkwinweb_la_OBJECTS = Web.lo WebButton.lo WebButtonClose.lo \ + #>- WebButtonHelp.lo WebButtonIconify.lo WebButtonLower.lo \ + #>- WebButtonMaximize.lo WebButtonSticky.lo diff --git a/x11/kdebase2/patches/patch-eo b/x11/kdebase2/patches/patch-eo index 8556e8d3ed1..47766fa60e3 100644 --- a/x11/kdebase2/patches/patch-eo +++ b/x11/kdebase2/patches/patch-eo @@ -1,103 +1,148 @@ -$NetBSD: patch-eo,v 1.1 2001/10/15 22:46:11 skrll Exp $ +$NetBSD: patch-eo,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kxkb/Makefile.in.orig Sat Sep 8 01:36:51 2001 +--- kxkb/Makefile.in.orig Sat Nov 10 07:58:38 2001 +++ kxkb/Makefile.in -@@ -278 +278 @@ +@@ -277,20 +277,24 @@ + + bin_PROGRAMS = kxkb + -kxkb_SOURCES = dummy.cpp +kxkb_SOURCES = kxkb_main.cpp -@@ -280 +280 @@ + kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kxkb_LDADD = kxkb.la +kxkb_LDADD = libkxkb_main.la -@@ -282 +282 @@ + -lib_LTLIBRARIES = libkcm_keyboard.la kxkb.la +lib_LTLIBRARIES = libkcm_keyboard.la libkxkb_main.la kxkb.la -@@ -289 +289,5 @@ + + libkcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp + + libkcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined + libkcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) + -kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp +libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp +libkxkb_main_la_LDFLAGS = $(all_libraries) +libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) + +kxkb_la_SOURCES = kxkb_main.cpp -@@ -291 +295 @@ + kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version -kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) +kxkb_la_LIBADD = libkxkb_main.la -@@ -318,2 +322,2 @@ + + data_DATA = keyboard.desktop + datadir = $(kde_appsdir)/Settings/Peripherals +@@ -317,21 +321,25 @@ + libkcm_keyboard_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@libkcm_keyboard_la_OBJECTS = $(libkcm_keyboard_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libkcm_keyboard_la_OBJECTS = $(libkcm_keyboard_la_final_OBJECTS) -kxkb_la_DEPENDENCIES = -#>- kxkb_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo +libkxkb_main_la_DEPENDENCIES = +#>- libkxkb_main_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo -@@ -321,5 +325,9 @@ + #>+ 5 -kxkb_la_final_OBJECTS = kxkb_la.all_cpp.lo -kxkb_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \ --kxkb_la_meta_unload.lo +- kxkb_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kxkb_la_OBJECTS = $(kxkb_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kxkb_la_OBJECTS = $(kxkb_la_final_OBJECTS) +libkxkb_main_la_final_OBJECTS = libkxkb_main_la.all_cpp.lo +libkxkb_main_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \ -+libkxkb_main_la_meta_unload.lo ++ libkxkb_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_final_OBJECTS) +kxkb_la_DEPENDENCIES = libkxkb_main.la +#>- kxkb_la_OBJECTS = kxkb_main.lo +#>+ 1 +kxkb_la_OBJECTS = kxkb_main.lo -@@ -329 +337 @@ + bin_PROGRAMS = kxkb$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kxkb_OBJECTS = dummy.$(OBJEXT) +#>- kxkb_OBJECTS = kxkb_main.$(OBJEXT) -@@ -331,2 +339,2 @@ + #>+ 1 -kxkb_OBJECTS = dummy.$(OBJEXT) -kxkb_DEPENDENCIES = kxkb.la +kxkb_OBJECTS = kxkb_main.$(OBJEXT) +kxkb_DEPENDENCIES = libkxkb_main.la -@@ -351 +359 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -350,15 +358,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=test.cpp kcmmisc.h configure.in.in kxkbbindings.cpp pixmap.h keyboard.desktop LICENSE kcmlayout.h extension.h uninstall.desktop kxkb.h kxkb.desktop rules.h +KDE_DIST=pixmap.h kxkb.h test.cpp kcmmisc.h configure.in.in kcmlayout.h kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h -@@ -358,2 +366,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(libkcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES) -OBJECTS = $(libkcm_keyboard_la_OBJECTS) $(kxkb_la_OBJECTS) $(kxkb_OBJECTS) +SOURCES = $(libkcm_keyboard_la_SOURCES) $(libkxkb_main_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES) +OBJECTS = $(libkcm_keyboard_la_OBJECTS) $(libkxkb_main_la_OBJECTS) $(kxkb_la_OBJECTS) $(kxkb_OBJECTS) -@@ -451,0 +460,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -451,6 +459,9 @@ + @KDE_USE_CLOSURE_FALSE@libkcm_keyboard.la: $(libkcm_keyboard_la_OBJECTS) $(libkcm_keyboard_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcm_keyboard_la_LDFLAGS) $(libkcm_keyboard_la_OBJECTS) $(libkcm_keyboard_la_LIBADD) $(LIBS) + +libkxkb_main.la: $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkxkb_main_la_LDFLAGS) $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_LIBADD) $(LIBS) + -@@ -562,11 +572,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -685,3 +684,0 @@ + kxkb.la: $(kxkb_la_OBJECTS) $(kxkb_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kxkb_la_LDFLAGS) $(kxkb_la_OBJECTS) $(kxkb_la_LIBADD) $(LIBS) + +@@ -673,9 +684,6 @@ + $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot + $(XGETTEXT) $(libkcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot + -dummy.cpp: - echo > dummy.cpp - -@@ -742,8 +739,8 @@ + # 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: +@@ -732,21 +740,21 @@ + + + #>+ 12 -kxkb_la_meta_unload.cpp: kxkb.moc - @echo 'creating kxkb_la_meta_unload.cpp' - @-rm -f kxkb_la_meta_unload.cpp -- @echo 'static const char * _metalist_kxkb_la[] = {' > kxkb_la_meta_unload.cpp -- @cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxkb_la_meta_unload.cpp -- @echo '0};' >> kxkb_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kxkb_la_meta_unload.cpp -- @echo '_UNLOAD(kxkb_la)' >> kxkb_la_meta_unload.cpp +libkxkb_main_la_meta_unload.cpp: kxkb.moc + @echo 'creating libkxkb_main_la_meta_unload.cpp' + @-rm -f libkxkb_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkxkb_main_la[] = {' > libkxkb_main_la_meta_unload.cpp -+ @cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxkb_main_la_meta_unload.cpp -+ @echo '0};' >> libkxkb_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkxkb_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkxkb_main_la)' >> libkxkb_main_la_meta_unload.cpp -@@ -754 +751 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kxkb_la[] = {' > kxkb_la_meta_unload.cpp ;\ +- cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxkb_la_meta_unload.cpp ;\ +- echo '0};' >> kxkb_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kxkb_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kxkb_la)' >> kxkb_la_meta_unload.cpp ;\ +- else echo > kxkb_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkxkb_main_la[] = {' > libkxkb_main_la_meta_unload.cpp ;\ ++ cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxkb_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkxkb_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkxkb_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkxkb_main_la)' >> libkxkb_main_la_meta_unload.cpp ;\ ++ else echo > libkxkb_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f libkcm_keyboard_la_meta_unload.cpp kxkb_la_meta_unload.cpp + -rm -f libkcm_keyboard_la_meta_unload.cpp libkxkb_main_la_meta_unload.cpp -@@ -769 +766,13 @@ + + #>+ 11 + libkcm_keyboard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kcmlayout.cpp $(srcdir)/pixmap.cpp $(srcdir)/kcmmisc.cpp libkcm_keyboard_la_meta_unload.cpp kcmlayout.moc kxkb.moc kcmmisc.moc +@@ -761,11 +769,23 @@ + rm -f libkcm_keyboard_la.all_cpp.final libkcm_keyboard_la.all_cpp.files + + #>+ 11 -kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb_la_meta_unload.cpp +libkxkb_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp libkxkb_main_la_meta_unload.cpp + @echo 'creating libkxkb_main_la.all_cpp.cpp ...'; \ @@ -112,21 +157,51 @@ $NetBSD: patch-eo,v 1.1 2001/10/15 22:46:11 skrll Exp $ + +#>+ 11 +kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp -@@ -773 +782 @@ + @echo 'creating kxkb_la.all_cpp.cpp ...'; \ + rm -f kxkb_la.all_cpp.files kxkb_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kxkb_la.all_cpp.final; \ - for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp kxkb_la_meta_unload.cpp ; do \ + for file in kxkb_main.cpp ; do \ -@@ -781 +790 @@ + echo "#include \"$$file\"" >> kxkb_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb_la.all_cpp.final; \ + done; \ +@@ -773,11 +793,11 @@ + rm -f kxkb_la.all_cpp.final kxkb_la.all_cpp.files + + #>+ 11 -kxkb.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kxkb.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp -@@ -785 +794 @@ + @echo 'creating kxkb.all_cpp.cpp ...'; \ + rm -f kxkb.all_cpp.files kxkb.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kxkb.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kxkb_main.cpp ; do \ -@@ -794 +803 @@ + echo "#include \"$$file\"" >> kxkb.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb.all_cpp.final; \ + done; \ +@@ -786,20 +806,20 @@ + + #>+ 3 + clean-final: - -rm -f libkcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp kxkb.all_cpp.cpp + -rm -f libkcm_keyboard_la.all_cpp.cpp libkxkb_main_la.all_cpp.cpp kxkb_la.all_cpp.cpp kxkb.all_cpp.cpp -@@ -798 +807 @@ + + #>+ 2 + final: - $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" all-am + $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" all-am -@@ -801 +810 @@ + #>+ 2 + final-install: +- $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" install-am ++ $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" all-am + $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkcm_keyboard_la_OBJECTS="$(libkcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-es b/x11/kdebase2/patches/patch-es index ff3b46982d4..423e377636d 100644 --- a/x11/kdebase2/patches/patch-es +++ b/x11/kdebase2/patches/patch-es @@ -1,11 +1,14 @@ -$NetBSD: patch-es,v 1.1 2001/10/15 22:46:11 skrll Exp $ +$NetBSD: patch-es,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kxmlrpc/Makefile.in.orig Sat Sep 8 01:36:51 2001 +--- kxmlrpc/Makefile.in.orig Sat Nov 10 07:58:38 2001 +++ kxmlrpc/Makefile.in -@@ -280 +280 @@ +@@ -279,15 +279,19 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = kxmlrpcd -kxmlrpcd_LDADD = kxmlrpcd.la +kxmlrpcd_LDADD = libkxmlrpcd_main.la -@@ -282 +282,6 @@ + kxmlrpcd_LDFLAGS = $(KDE_RPATH) -kxmlrpcd_SOURCES = dummy.cpp +kxmlrpcd_SOURCES = kxmlrpcd_main.cpp + @@ -13,90 +16,126 @@ $NetBSD: patch-es,v 1.1 2001/10/15 22:46:11 skrll Exp $ +libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA) +libkxmlrpcd_main_la_LDFLAGS = $(all_libraries) +libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp -@@ -284,4 +288,0 @@ + -lib_LTLIBRARIES = kxmlrpcd.la libkcm_xmlrpcd.la -kxmlrpcd_la_LIBADD = $(LIB_KSYCOCA) -kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version -kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp -@@ -288,0 +290,3 @@ + +kxmlrpcd_la_LIBADD = libkxmlrpcd_main.la +kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version +kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp -@@ -311,2 +315,2 @@ + #>- kxmlrpcd_la_METASOURCES = AUTO + + libkcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) +@@ -310,16 +314,20 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -kxmlrpcd_la_DEPENDENCIES = -#>- kxmlrpcd_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ +libkxmlrpcd_main_la_DEPENDENCIES = +#>- libkxmlrpcd_main_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ -@@ -315,2 +319,2 @@ + #>- kxmlrpcdaemon.lo kxmlrpcutil.lo + #>+ 6 -kxmlrpcd_la_final_OBJECTS = kxmlrpcd_la.all_cpp.lo -kxmlrpcd_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ +libkxmlrpcd_main_la_final_OBJECTS = libkxmlrpcd_main_la.all_cpp.lo +libkxmlrpcd_main_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ -@@ -318,3 +322,7 @@ --kxmlrpcd_la_meta_unload.lo + kxmlrpcdaemon.lo kxmlrpcutil.lo \ +- kxmlrpcd_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_final_OBJECTS) -+libkxmlrpcd_main_la_meta_unload.lo ++ libkxmlrpcd_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_final_OBJECTS) +kxmlrpcd_la_DEPENDENCIES = libkxmlrpcd_main.la +#>- kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo +#>+ 1 +kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo -@@ -328 +336 @@ + libkcm_xmlrpcd_la_DEPENDENCIES = + #>- libkcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.lo + #>+ 1 +@@ -327,10 +335,10 @@ + bin_PROGRAMS = kxmlrpcd$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kxmlrpcd_OBJECTS = dummy.$(OBJEXT) +#>- kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT) -@@ -330,2 +338,2 @@ + #>+ 1 -kxmlrpcd_OBJECTS = dummy.$(OBJEXT) -kxmlrpcd_DEPENDENCIES = kxmlrpcd.la +kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT) +kxmlrpcd_DEPENDENCIES = libkxmlrpcd_main.la -@@ -352 +360 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -351,15 +359,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=kxmlrpcd.desktop LICENSE +KDE_DIST=LICENSE kxmlrpcd.desktop -@@ -359,2 +367,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES) -OBJECTS = $(kxmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_OBJECTS) $(kxmlrpcd_OBJECTS) +SOURCES = $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES) +OBJECTS = $(libkxmlrpcd_main_la_OBJECTS) $(kxmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_OBJECTS) $(kxmlrpcd_OBJECTS) -@@ -446,0 +455,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -446,6 +454,9 @@ + + maintainer-clean-libtool: + +libkxmlrpcd_main.la: $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkxmlrpcd_main_la_LDFLAGS) $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_LIBADD) $(LIBS) + -@@ -544,11 +554,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -656,3 +655,0 @@ + kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kxmlrpcd_la_LDFLAGS) $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_LIBADD) $(LIBS) + +@@ -644,9 +655,6 @@ + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kxmlrpcd.pot + -dummy.cpp: - echo > dummy.cpp - -@@ -694,8 +691,8 @@ + # 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: +@@ -682,28 +690,40 @@ + + + #>+ 12 -kxmlrpcd_la_meta_unload.cpp: kxmlrpcserver.moc - @echo 'creating kxmlrpcd_la_meta_unload.cpp' - @-rm -f kxmlrpcd_la_meta_unload.cpp -- @echo 'static const char * _metalist_kxmlrpcd_la[] = {' > kxmlrpcd_la_meta_unload.cpp -- @cat kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxmlrpcd_la_meta_unload.cpp -- @echo '0};' >> kxmlrpcd_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kxmlrpcd_la_meta_unload.cpp -- @echo '_UNLOAD(kxmlrpcd_la)' >> kxmlrpcd_la_meta_unload.cpp +libkxmlrpcd_main_la_meta_unload.cpp: kxmlrpcserver.moc + @echo 'creating libkxmlrpcd_main_la_meta_unload.cpp' + @-rm -f libkxmlrpcd_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkxmlrpcd_main_la[] = {' > libkxmlrpcd_main_la_meta_unload.cpp -+ @cat kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxmlrpcd_main_la_meta_unload.cpp -+ @echo '0};' >> libkxmlrpcd_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkxmlrpcd_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkxmlrpcd_main_la)' >> libkxmlrpcd_main_la_meta_unload.cpp -@@ -706 +703,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kxmlrpcd_la[] = {' > kxmlrpcd_la_meta_unload.cpp ;\ +- cat kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxmlrpcd_la_meta_unload.cpp ;\ +- echo '0};' >> kxmlrpcd_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kxmlrpcd_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kxmlrpcd_la)' >> kxmlrpcd_la_meta_unload.cpp ;\ +- else echo > kxmlrpcd_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkxmlrpcd_main_la[] = {' > libkxmlrpcd_main_la_meta_unload.cpp ;\ ++ cat kxmlrpcserver.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxmlrpcd_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkxmlrpcd_main_la)' >> libkxmlrpcd_main_la_meta_unload.cpp ;\ ++ else echo > libkxmlrpcd_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kxmlrpcd_la_meta_unload.cpp + -rm -f libkxmlrpcd_main_la_meta_unload.cpp + @@ -111,24 +150,55 @@ $NetBSD: patch-es,v 1.1 2001/10/15 22:46:11 skrll Exp $ + done; \ + cat libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files > libkxmlrpcd_main_la.all_cpp.cpp; \ + rm -f libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files -@@ -709 +718 @@ + + #>+ 11 -kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp kxmlrpcd_la_meta_unload.cpp kxmlrpcserver.moc +kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcd_main.cpp kxmlrpcserver.moc -@@ -713 +722 @@ + @echo 'creating kxmlrpcd_la.all_cpp.cpp ...'; \ + rm -f kxmlrpcd_la.all_cpp.files kxmlrpcd_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kxmlrpcd_la.all_cpp.final; \ - for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp kxmlrpcd_la_meta_unload.cpp ; do \ + for file in kxmlrpcd_main.cpp ; do \ -@@ -733 +742 @@ + echo "#include \"$$file\"" >> kxmlrpcd_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd_la.all_cpp.final; \ + done; \ +@@ -723,11 +743,11 @@ + rm -f libkcm_xmlrpcd_la.all_cpp.final libkcm_xmlrpcd_la.all_cpp.files + + #>+ 11 -kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kxmlrpcd.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcd_main.cpp -@@ -737 +746 @@ + @echo 'creating kxmlrpcd.all_cpp.cpp ...'; \ + rm -f kxmlrpcd.all_cpp.files kxmlrpcd.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kxmlrpcd.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kxmlrpcd_main.cpp ; do \ -@@ -746 +755 @@ + echo "#include \"$$file\"" >> kxmlrpcd.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd.all_cpp.final; \ + done; \ +@@ -736,20 +756,20 @@ + + #>+ 3 + clean-final: - -rm -f kxmlrpcd_la.all_cpp.cpp libkcm_xmlrpcd_la.all_cpp.cpp kxmlrpcd.all_cpp.cpp + -rm -f libkxmlrpcd_main_la.all_cpp.cpp kxmlrpcd_la.all_cpp.cpp libkcm_xmlrpcd_la.all_cpp.cpp kxmlrpcd.all_cpp.cpp -@@ -750 +759 @@ + + #>+ 2 + final: - $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" all-am + $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" all-am -@@ -753 +762 @@ + #>+ 2 + final-install: +- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" install-am ++ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" all-am + $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-ew b/x11/kdebase2/patches/patch-ew index 82e2ea7ded1..3c088f5207d 100644 --- a/x11/kdebase2/patches/patch-ew +++ b/x11/kdebase2/patches/patch-ew @@ -1,11 +1,14 @@ -$NetBSD: patch-ew,v 1.1 2001/10/15 22:46:11 skrll Exp $ +$NetBSD: patch-ew,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- legacyimport/Makefile.in.orig Sat Sep 8 01:36:51 2001 +--- legacyimport/Makefile.in.orig Sat Nov 10 07:58:39 2001 +++ legacyimport/Makefile.in -@@ -277 +277 @@ +@@ -276,14 +276,18 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = klegacyimport -lib_LTLIBRARIES = klegacyimport.la +lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la -@@ -279,2 +279,6 @@ + -klegacyimport_la_SOURCES = legacyimport.cpp -klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) +libklegacyimport_main_la_SOURCES = legacyimport.cpp @@ -14,81 +17,107 @@ $NetBSD: patch-ew,v 1.1 2001/10/15 22:46:11 skrll Exp $ + +klegacyimport_la_SOURCES = klegacyimport_main.cpp +klegacyimport_la_LIBADD = libklegacyimport_main.la -@@ -283,2 +287,2 @@ + klegacyimport_la_LDFLAGS = $(all_libraries) -module -avoid-version + -klegacyimport_SOURCES = dummy.cpp -klegacyimport_LDADD = klegacyimport.la +klegacyimport_SOURCES = klegacyimport_main.cpp +klegacyimport_LDADD = libklegacyimport_main.la -@@ -306,2 +310,2 @@ + klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = legacyimport.h +@@ -305,21 +309,25 @@ + LIBS = @LIBS@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ -klegacyimport_la_DEPENDENCIES = -#>- klegacyimport_la_OBJECTS = legacyimport.lo +libklegacyimport_main_la_DEPENDENCIES = +#>- libklegacyimport_main_la_OBJECTS = legacyimport.lo -@@ -309,5 +313,9 @@ + #>+ 5 -klegacyimport_la_final_OBJECTS = klegacyimport_la.all_cpp.lo -klegacyimport_la_nofinal_OBJECTS = legacyimport.lo \ --klegacyimport_la_meta_unload.lo +- klegacyimport_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@klegacyimport_la_OBJECTS = $(klegacyimport_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@klegacyimport_la_OBJECTS = $(klegacyimport_la_final_OBJECTS) +libklegacyimport_main_la_final_OBJECTS = libklegacyimport_main_la.all_cpp.lo +libklegacyimport_main_la_nofinal_OBJECTS = legacyimport.lo \ -+libklegacyimport_main_la_meta_unload.lo ++ libklegacyimport_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libklegacyimport_main_la_OBJECTS = $(libklegacyimport_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libklegacyimport_main_la_OBJECTS = $(libklegacyimport_main_la_final_OBJECTS) +klegacyimport_la_DEPENDENCIES = libklegacyimport_main.la +#>- klegacyimport_la_OBJECTS = klegacyimport_main.lo +#>+ 1 +klegacyimport_la_OBJECTS = klegacyimport_main.lo -@@ -317 +325 @@ + bin_PROGRAMS = klegacyimport$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- klegacyimport_OBJECTS = dummy.$(OBJEXT) +#>- klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT) -@@ -319,2 +327,2 @@ + #>+ 1 -klegacyimport_OBJECTS = dummy.$(OBJEXT) -klegacyimport_DEPENDENCIES = klegacyimport.la +klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT) +klegacyimport_DEPENDENCIES = libklegacyimport_main.la -@@ -341 +349 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -340,15 +348,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=klegacyimport.desktop +KDE_DIST=klegacyimport.desktop dummy.cpp -@@ -348,2 +356,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES) -OBJECTS = $(klegacyimport_la_OBJECTS) $(klegacyimport_OBJECTS) +SOURCES = $(libklegacyimport_main_la_SOURCES) $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES) +OBJECTS = $(libklegacyimport_main_la_OBJECTS) $(klegacyimport_la_OBJECTS) $(klegacyimport_OBJECTS) -@@ -435,0 +444,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -435,6 +443,9 @@ + + maintainer-clean-libtool: + +libklegacyimport_main.la: $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libklegacyimport_main_la_LDFLAGS) $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_LIBADD) $(LIBS) + -@@ -527,11 +537,0 @@ --#>- @for file in $(DISTFILES); do \ --#>- d=$(srcdir); \ --#>- if test -d $$d/$$file; then \ --#>- cp -pr $$/$$file $(distdir)/$$file; \ --#>- else \ --#>- test -f $(distdir)/$$file \ --#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ --#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ --#>- fi; \ --#>- done --#>+ 10 -@@ -661,8 +661,8 @@ + klegacyimport.la: $(klegacyimport_la_OBJECTS) $(klegacyimport_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(klegacyimport_la_LDFLAGS) $(klegacyimport_la_OBJECTS) $(klegacyimport_la_LIBADD) $(LIBS) + +@@ -649,28 +660,40 @@ + + + #>+ 12 -klegacyimport_la_meta_unload.cpp: legacyimport.moc - @echo 'creating klegacyimport_la_meta_unload.cpp' - @-rm -f klegacyimport_la_meta_unload.cpp -- @echo 'static const char * _metalist_klegacyimport_la[] = {' > klegacyimport_la_meta_unload.cpp -- @cat legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klegacyimport_la_meta_unload.cpp -- @echo '0};' >> klegacyimport_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> klegacyimport_la_meta_unload.cpp -- @echo '_UNLOAD(klegacyimport_la)' >> klegacyimport_la_meta_unload.cpp +libklegacyimport_main_la_meta_unload.cpp: legacyimport.moc + @echo 'creating libklegacyimport_main_la_meta_unload.cpp' + @-rm -f libklegacyimport_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libklegacyimport_main_la[] = {' > libklegacyimport_main_la_meta_unload.cpp -+ @cat legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklegacyimport_main_la_meta_unload.cpp -+ @echo '0};' >> libklegacyimport_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libklegacyimport_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libklegacyimport_main_la)' >> libklegacyimport_main_la_meta_unload.cpp -@@ -673 +673,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_klegacyimport_la[] = {' > klegacyimport_la_meta_unload.cpp ;\ +- cat legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klegacyimport_la_meta_unload.cpp ;\ +- echo '0};' >> klegacyimport_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> klegacyimport_la_meta_unload.cpp ;\ +- echo '_UNLOAD(klegacyimport_la)' >> klegacyimport_la_meta_unload.cpp ;\ +- else echo > klegacyimport_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libklegacyimport_main_la[] = {' > libklegacyimport_main_la_meta_unload.cpp ;\ ++ cat legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklegacyimport_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libklegacyimport_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libklegacyimport_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libklegacyimport_main_la)' >> libklegacyimport_main_la_meta_unload.cpp ;\ ++ else echo > libklegacyimport_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f klegacyimport_la_meta_unload.cpp + -rm -f libklegacyimport_main_la_meta_unload.cpp + @@ -103,24 +132,55 @@ $NetBSD: patch-ew,v 1.1 2001/10/15 22:46:11 skrll Exp $ + done; \ + cat libklegacyimport_main_la.all_cpp.final libklegacyimport_main_la.all_cpp.files > libklegacyimport_main_la.all_cpp.cpp; \ + rm -f libklegacyimport_main_la.all_cpp.final libklegacyimport_main_la.all_cpp.files -@@ -676 +688 @@ + + #>+ 11 -klegacyimport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/legacyimport.cpp klegacyimport_la_meta_unload.cpp legacyimport.moc +klegacyimport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klegacyimport_main.cpp -@@ -680 +692 @@ + @echo 'creating klegacyimport_la.all_cpp.cpp ...'; \ + rm -f klegacyimport_la.all_cpp.files klegacyimport_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> klegacyimport_la.all_cpp.final; \ - for file in legacyimport.cpp klegacyimport_la_meta_unload.cpp ; do \ + for file in klegacyimport_main.cpp ; do \ -@@ -688 +700 @@ + echo "#include \"$$file\"" >> klegacyimport_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klegacyimport_la.all_cpp.final; \ + done; \ +@@ -678,11 +701,11 @@ + rm -f klegacyimport_la.all_cpp.final klegacyimport_la.all_cpp.files + + #>+ 11 -klegacyimport.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp +klegacyimport.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klegacyimport_main.cpp -@@ -692 +704 @@ + @echo 'creating klegacyimport.all_cpp.cpp ...'; \ + rm -f klegacyimport.all_cpp.files klegacyimport.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> klegacyimport.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in klegacyimport_main.cpp ; do \ -@@ -701 +713 @@ + echo "#include \"$$file\"" >> klegacyimport.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klegacyimport.all_cpp.final; \ + done; \ +@@ -691,20 +714,20 @@ + + #>+ 3 + clean-final: - -rm -f klegacyimport_la.all_cpp.cpp klegacyimport.all_cpp.cpp + -rm -f libklegacyimport_main_la.all_cpp.cpp klegacyimport_la.all_cpp.cpp klegacyimport.all_cpp.cpp -@@ -705 +717 @@ + + #>+ 2 + final: - $(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_final_OBJECTS)" all-am + $(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_final_OBJECTS)" all-am -@@ -708 +720 @@ + #>+ 2 + final-install: +- $(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_final_OBJECTS)" install-am ++ $(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_nofinal_OBJECTS)" all-am + $(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase2/patches/patch-ez b/x11/kdebase2/patches/patch-ez index 16fb505b3ab..1816980ae18 100644 --- a/x11/kdebase2/patches/patch-ez +++ b/x11/kdebase2/patches/patch-ez @@ -1,6 +1,6 @@ -$NetBSD: patch-ez,v 1.1 2001/10/18 15:43:11 skrll Exp $ +$NetBSD: patch-ez,v 1.2 2001/12/03 15:37:20 skrll Exp $ ---- kicker/kicker_main.cpp.orig Thu Oct 18 16:16:52 2001 +--- kicker/kicker_main.cpp.orig Mon Dec 3 10:00:55 2001 +++ kicker/kicker_main.cpp @@ -0,0 +1,28 @@ +/* @@ -25,9 +25,9 @@ $NetBSD: patch-ez,v 1.1 2001/10/18 15:43:11 skrll Exp $ + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + -+extern int kicker_main(int, char **); ++extern "C" int kdemain(int, char **); + +int main( int argc, char* argv[] ) +{ -+ return kicker_main(argc, argv); ++ return kdemain(argc, argv); +} diff --git a/x11/kdebase2/patches/patch-fa b/x11/kdebase2/patches/patch-fa index f501df32891..067b2d0cd1a 100644 --- a/x11/kdebase2/patches/patch-fa +++ b/x11/kdebase2/patches/patch-fa @@ -1,13 +1,15 @@ -$NetBSD: patch-fa,v 1.1 2001/10/18 15:43:11 skrll Exp $ +$NetBSD: patch-fa,v 1.2 2001/12/03 15:37:20 skrll Exp $ --- kicker/core/main.cpp.orig Fri Aug 3 21:14:29 2001 +++ kicker/core/main.cpp -@@ -122,7 +122,7 @@ +@@ -122,7 +122,9 @@ QApplication::exit(); } -int main( int argc, char ** argv ) -+int kicker_main( int argc, char ** argv ) ++extern "C" int kdemain(int, char **); ++ ++int kdemain( int argc, char ** argv ) { { QCString multiHead = getenv("KDE_MULTIHEAD"); |