diff options
author | skrll <skrll> | 2001-12-03 15:37:14 +0000 |
---|---|---|
committer | skrll <skrll> | 2001-12-03 15:37:14 +0000 |
commit | c82c533cf5e4e3fa75fd6332e9a0fe8ee5bbd480 (patch) | |
tree | bfa138716839927c14f0e8332a5bfa57d9e3fb73 /x11/kdelibs2 | |
parent | 53d855dff8a313e81705a0f62aebcf53e1d13bc6 (diff) | |
download | pkgsrc-c82c533cf5e4e3fa75fd6332e9a0fe8ee5bbd480.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/kdelibs2')
-rw-r--r-- | x11/kdelibs2/Makefile | 5 | ||||
-rw-r--r-- | x11/kdelibs2/PLIST | 10 | ||||
-rw-r--r-- | x11/kdelibs2/distinfo | 26 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-ac | 188 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-af | 16 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-ah | 138 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-al | 111 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-ap | 50 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-ar | 4 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-at | 4 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-au | 185 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-aw | 148 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-ba | 174 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-be | 252 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-bf | 4 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-bh | 4 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-bl | 89 | ||||
-rw-r--r-- | x11/kdelibs2/patches/patch-bs | 13 |
18 files changed, 932 insertions, 489 deletions
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index d3770a32388..a7f739da008 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2001/11/15 21:00:27 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/12/03 15:37:20 skrll Exp $ -DISTNAME= kdelibs-2.2.1 +DISTNAME= kdelibs-2.2.2 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop @@ -74,6 +74,7 @@ post-install: .include "../../print/cups/buildlink.mk" .include "../../security/openssl/buildlink.mk" .include "../../textproc/libxml2/buildlink.mk" +.include "../../textproc/libxslt/buildlink.mk" .include "../../x11/kde2/buildlink.mk" .include "../../x11/qt2-libs/buildlink.mk" .include "../../mk/ossaudio.buildlink.mk" diff --git a/x11/kdelibs2/PLIST b/x11/kdelibs2/PLIST index 3d150274452..a5e49e61acb 100644 --- a/x11/kdelibs2/PLIST +++ b/x11/kdelibs2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2001/11/15 21:00:27 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2001/12/03 15:37:20 skrll Exp $ bin/artsc-config bin/artscat bin/artsd @@ -155,6 +155,7 @@ include/kallocator.h include/kalphapainter.h include/kanimwidget.h include/kapp.h +include/kapplication.h include/karrowbutton.h include/kasyncio.h include/kaudioplayer.h @@ -406,6 +407,7 @@ include/ksslpkcs12.h include/ksslsettings.h include/ksslutils.h include/ksslx509map.h +include/kstandarddirs.h include/kstartupinfo.h include/kstaticdeleter.h include/kstatusbar.h @@ -432,6 +434,7 @@ include/ktoolbarbutton.h include/ktoolbarradiogroup.h include/ktrader.h include/kuniqueapp.h +include/kuniqueapplication.h include/kunload.h include/kurifilter.h include/kurl.h @@ -651,6 +654,9 @@ lib/libkdecore.la lib/libkdecore.so lib/libkdecore.so.3 lib/libkdecore.so.3.0 +lib/libkded_kssld.a +lib/libkded_kssld.la +lib/libkded_kssld.so lib/libkded_main.a lib/libkded_main.la lib/libkded_main.so @@ -1481,6 +1487,7 @@ share/kde/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl share/kde/apps/ksgmltools2/docbook/xsl/common/sv.xml share/kde/apps/ksgmltools2/docbook/xsl/common/titles.xsl share/kde/apps/ksgmltools2/docbook/xsl/common/tr.xml +share/kde/apps/ksgmltools2/docbook/xsl/common/xh.xml share/kde/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml share/kde/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml share/kde/apps/ksgmltools2/docbook/xsl/html/ChangeLog @@ -2728,6 +2735,7 @@ share/kde/services/kaclplugin.desktop share/kde/services/kbzip2filter.desktop share/kde/services/kcookiejar.desktop share/kde/services/kded/kdeprintd.desktop +share/kde/services/kded/kssld.desktop share/kde/services/kgzipfilter.desktop share/kde/services/khtml.desktop share/kde/services/khtmlimage.desktop diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo index ba9c26247a5..3ea39595dcf 100644 --- a/x11/kdelibs2/distinfo +++ b/x11/kdelibs2/distinfo @@ -1,50 +1,40 @@ -$NetBSD: distinfo,v 1.9 2001/11/17 12:01:34 skrll Exp $ +$NetBSD: distinfo,v 1.10 2001/12/03 15:37:20 skrll Exp $ -SHA1 (kdelibs-2.2.1.tar.bz2) = 6f5359905ba1f6c0785972da92c0113485ddee62 -Size (kdelibs-2.2.1.tar.bz2) = 5999418 bytes +SHA1 (kdelibs-2.2.2.tar.bz2) = 6ae1096ffb547f317adca6b29cb9ce9dcaf1863c +Size (kdelibs-2.2.2.tar.bz2) = 5955592 bytes SHA1 (patch-aa) = 06628108422b6a8b41671484f0a9955bc321a959 SHA1 (patch-ab) = 4fcb10ca2605b9641ad317cea37d504f1644e150 -SHA1 (patch-ac) = 442c255b1361cbc77ac2b1c738c224467b9a35c5 SHA1 (patch-ad) = 52fe9cdc53496ecbde42ff4a6c46a5bb104738a0 SHA1 (patch-ae) = 55feaee4a2c1bcedbd135d8f4ed49a9fdc487247 -SHA1 (patch-af) = a0a9c54c82cb039313d680d5379f80d8399de3cb +SHA1 (patch-af) = 0c70385a39340b6d9af67415d761e79c638e7a26 SHA1 (patch-ag) = 14d75d761888ff56058f305853cf29244d9a3878 -SHA1 (patch-ah) = b31b2e72f70bd3cfd9b005cf7796c8cbef395b49 SHA1 (patch-ai) = 02a985d9032412fc98f6497ea81d524a063e3115 SHA1 (patch-aj) = 4b44ac3b1783b40cdda8e4d60ad0e43c698d2e57 SHA1 (patch-ak) = 22a5b302970d76b745cb46ec69b65741461e05b3 -SHA1 (patch-al) = 3ca7786b44fcdd20d0a42bcd8ffd63480fceba27 SHA1 (patch-am) = 946abdc7e5aca8fba56bc38967ab92075898e5ac SHA1 (patch-an) = ba06fec81150c267f9f6ad0189ac743d3c0dc586 SHA1 (patch-ao) = 5b92245db7449b581d6b9f27d2a13cfc6b37d0b0 -SHA1 (patch-ap) = 0a5ba404739ee07b4b01a6e954051d4af225c672 SHA1 (patch-aq) = 12058bf6cea9a7a3bb0b1758f8e4dab2c5fac202 -SHA1 (patch-ar) = 99d94a7860c8e2ce57491671701bb92226e4617f +SHA1 (patch-ar) = bba44c62eac37af05052d25d82946cd8b62a8fd0 SHA1 (patch-as) = 539500f116386aea80058ddc42499956164a3bc5 -SHA1 (patch-at) = f9bd8c6c8b92c1daca5ed149bb9ecf9ebf154b69 -SHA1 (patch-au) = 95599be925043d3f0113cc45215b26c5bf00d530 +SHA1 (patch-at) = f1deb9c36e24d562837479c2cc9c5e2b0be5b15e SHA1 (patch-av) = 5f35a3acb5fe1507e19ea564dcece84aeb25bab4 -SHA1 (patch-aw) = 553b6898fcde6a4c28f570c02b692e0d113ccaab SHA1 (patch-ax) = f965f2f44ca973d8c4f10cba45b9ab302b4b5093 SHA1 (patch-ay) = 0f23906c80be4d1fece0792aff5dea389a8c7d74 SHA1 (patch-az) = 80ac9edd81f5e77ac9a84b08eb1a5e3c46d15016 -SHA1 (patch-ba) = d82098a5a77d217d5a061b6eccf2b45c734aae0b SHA1 (patch-bb) = 141cef41c88677bc663fc833b9676677c1c368ff SHA1 (patch-bc) = ce702c385a77af04dd42325408df3355a3fe55b4 SHA1 (patch-bd) = 87f42ed64b3fdad61b155f6d87e27724a38293b7 -SHA1 (patch-be) = 09188f5e470c8ede65e00a107db3a4621d3f11b2 -SHA1 (patch-bf) = 760649d41fd10ff1d2114c74ca5f99c10c2a404d +SHA1 (patch-bf) = 8db351c0605b91a9b91c07602a5a8c75da94b8c0 SHA1 (patch-bg) = b84f9fee2b5f9953c5c18c52a95a91d60251ef96 -SHA1 (patch-bh) = 8c4129ce09b618e19974e23520be5633e6cfad25 +SHA1 (patch-bh) = f76ddc313b7a56a196309b98dcd01ff5b818ca8d SHA1 (patch-bi) = ea227addf017e108df6bcef333e4195c3b590d58 SHA1 (patch-bj) = a546588a39e23613008517ca22bbb8099105c4a1 SHA1 (patch-bk) = 1d623313d38d72534f6607011d78f76f638a9eb0 -SHA1 (patch-bl) = e97414ba9c0407d73ef1b9d44f023a49444539ea SHA1 (patch-bm) = 5f4609c677c8a55c4269567be1f1ab4ac2eb8249 SHA1 (patch-bn) = db1962a1424601820b628a82d7e286f4c54f7594 SHA1 (patch-bo) = 50c88a7ca572409a7f91df075155a1705a7ebca2 SHA1 (patch-bp) = 84fe12d8317bbc9eb0ea2f2d320d3fb9fb138faf SHA1 (patch-bq) = 37b760bcd4067d3adac6260377f16fcb6ffae909 SHA1 (patch-br) = e4098450a416d419a8ac947ad7a2244298c2c011 -SHA1 (patch-bs) = 1aa53bc22b5c4971e3135fd53e1cfb4bec4d78d3 SHA1 (patch-bt) = 96a5b587056abc922957e55898e222910ab98dca diff --git a/x11/kdelibs2/patches/patch-ac b/x11/kdelibs2/patches/patch-ac index 1a8c077e4c3..06d78d19b6e 100644 --- a/x11/kdelibs2/patches/patch-ac +++ b/x11/kdelibs2/patches/patch-ac @@ -1,119 +1,155 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-ac,v 1.2 2001/10/15 22:46:21 skrll Exp $ +$NetBSD: patch-ac,v 1.3 2001/12/03 15:37:21 skrll Exp $ ---- arts/knotify/Makefile.in.orig Wed Sep 12 06:09:35 2001 +--- arts/knotify/Makefile.in.orig Tue Nov 13 20:57:02 2001 +++ arts/knotify/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -270 +270 @@ +@@ -263,18 +263,23 @@ + ####### Files + + bin_PROGRAMS = knotify -lib_LTLIBRARIES = knotify.la +lib_LTLIBRARIES = libknotify_main.la knotify.la -@@ -272 +272 @@ + -#>- knotify_la_SOURCES = knotify.cpp knotify.skel +#>- libknotify_main_la_SOURCES = knotify.cpp knotify.skel -@@ -274,2 +274,2 @@ + #>+ 1 -knotify_la_SOURCES=knotify.cpp knotify_skel.cpp -knotify_la_LIBADD = ../soundserver/libsoundserver_idl.la ../qtmcop/libqtmcop.la $(LIB_KDEUI) $(LIB_KDECORE) +libknotify_main_la_SOURCES=knotify.cpp knotify_skel.cpp +libknotify_main_la_LIBADD = ../soundserver/libsoundserver_idl.la ../qtmcop/libqtmcop.la $(LIB_KDEUI) $(LIB_KDECORE) -@@ -276,0 +277,5 @@ + +libknotify_main_la_LDFLAGS = $(all_libraries) +#>- libknotify_main_la_METASOURCES = AUTO + +knotify_la_SOURCES = knotify_main.cpp +knotify_la_LIBADD = libknotify_main.la -@@ -280,2 +285,2 @@ + knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version + #>- knotify_la_METASOURCES = AUTO + -knotify_SOURCES = dummy.cpp -knotify_LDADD = knotify.la +knotify_SOURCES = knotify_main.cpp +knotify_LDADD = libknotify_main.la -@@ -303 +308 @@ + knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + check_PROGRAMS = knotifytest +@@ -296,23 +301,27 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ -knotify_la_DEPENDENCIES = ../soundserver/libsoundserver_idl.la \ +libknotify_main_la_DEPENDENCIES = ../soundserver/libsoundserver_idl.la \ -@@ -305 +310 @@ + ../qtmcop/libqtmcop.la -#>- knotify_la_OBJECTS = knotify.lo +#>- libknotify_main_la_OBJECTS = knotify.lo -@@ -307,5 +312,9 @@ + #>+ 5 -knotify_la_final_OBJECTS = knotify_la.all_cpp.lo -knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \ --knotify_la_meta_unload.lo +- knotify_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@knotify_la_OBJECTS = $(knotify_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@knotify_la_OBJECTS = $(knotify_la_final_OBJECTS) +libknotify_main_la_final_OBJECTS = libknotify_main_la.all_cpp.lo +libknotify_main_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \ -+libknotify_main_la_meta_unload.lo ++ libknotify_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libknotify_main_la_OBJECTS = $(libknotify_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libknotify_main_la_OBJECTS = $(libknotify_main_la_final_OBJECTS) +knotify_la_DEPENDENCIES = libknotify_main.la +#>- knotify_la_OBJECTS = knotify_main.lo +#>+ 1 +knotify_la_OBJECTS = knotify_main.lo -@@ -316 +325 @@ + bin_PROGRAMS = knotify$(EXEEXT) + check_PROGRAMS = knotifytest$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- knotify_OBJECTS = dummy.$(OBJEXT) +#>- knotify_OBJECTS = knotify_main.$(OBJEXT) -@@ -318,2 +327,2 @@ + #>+ 1 -knotify_OBJECTS = dummy.$(OBJEXT) -knotify_DEPENDENCIES = knotify.la +knotify_OBJECTS = knotify_main.$(OBJEXT) +knotify_DEPENDENCIES = libknotify_main.la -@@ -344 +353 @@ + #>- knotifytest_OBJECTS = knotifytest.$(OBJEXT) + #>+ 1 + knotifytest_OBJECTS = knotifytest.$(OBJEXT) +@@ -337,15 +346,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=README.knotify_and_arts knotify.desktop +KDE_DIST=knotify.desktop README.knotify_and_arts -@@ -351,2 +360,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(knotify_la_SOURCES) $(knotify_SOURCES) $(knotifytest_SOURCES) -OBJECTS = $(knotify_la_OBJECTS) $(knotify_OBJECTS) $(knotifytest_OBJECTS) +SOURCES = $(libknotify_main_la_SOURCES) $(knotify_la_SOURCES) $(knotify_SOURCES) $(knotifytest_SOURCES) +OBJECTS = $(libknotify_main_la_OBJECTS) $(knotify_la_OBJECTS) $(knotify_OBJECTS) $(knotifytest_OBJECTS) -@@ -438,0 +448,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -432,6 +441,9 @@ + + maintainer-clean-libtool: + +libknotify_main.la: $(libknotify_main_la_OBJECTS) $(libknotify_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libknotify_main_la_LDFLAGS) $(libknotify_main_la_OBJECTS) $(libknotify_main_la_LIBADD) $(LIBS) + -@@ -543,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 -@@ -661,3 +661,0 @@ + knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS) + +@@ -643,9 +655,6 @@ + messages: + $(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot + -dummy.cpp: - echo > dummy.cpp - -@@ -678,0 +677,4 @@ + # 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: +@@ -661,8 +670,12 @@ + $(MOC) $(srcdir)/knotify.h -o knotify.moc + + #>+ 3 +knotify.moc: $(srcdir)/knotify.h + $(MOC) $(srcdir)/knotify.h -o knotify.moc + +#>+ 3 -@@ -680 +682 @@ + clean-metasources: - -rm -f knotify.moc + -rm -f knotify.moc knotify.moc -@@ -697,8 +699,8 @@ + + #>+ 4 + clean-idl: +@@ -679,28 +692,40 @@ + + + #>+ 12 -knotify_la_meta_unload.cpp: knotify.moc - @echo 'creating knotify_la_meta_unload.cpp' - @-rm -f knotify_la_meta_unload.cpp -- @echo 'static const char * _metalist_knotify_la[] = {' > knotify_la_meta_unload.cpp -- @cat knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> knotify_la_meta_unload.cpp -- @echo '0};' >> knotify_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> knotify_la_meta_unload.cpp -- @echo '_UNLOAD(knotify_la)' >> knotify_la_meta_unload.cpp +libknotify_main_la_meta_unload.cpp: knotify.moc + @echo 'creating libknotify_main_la_meta_unload.cpp' + @-rm -f libknotify_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libknotify_main_la[] = {' > libknotify_main_la_meta_unload.cpp -+ @cat knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libknotify_main_la_meta_unload.cpp -+ @echo '0};' >> libknotify_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libknotify_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libknotify_main_la)' >> libknotify_main_la_meta_unload.cpp -@@ -709 +711,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_knotify_la[] = {' > knotify_la_meta_unload.cpp ;\ +- cat knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> knotify_la_meta_unload.cpp ;\ +- echo '0};' >> knotify_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> knotify_la_meta_unload.cpp ;\ +- echo '_UNLOAD(knotify_la)' >> knotify_la_meta_unload.cpp ;\ +- else echo > knotify_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libknotify_main_la[] = {' > libknotify_main_la_meta_unload.cpp ;\ ++ cat knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libknotify_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libknotify_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libknotify_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libknotify_main_la)' >> libknotify_main_la_meta_unload.cpp ;\ ++ else echo > libknotify_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f knotify_la_meta_unload.cpp + -rm -f libknotify_main_la_meta_unload.cpp + @@ -128,27 +164,61 @@ $NetBSD: patch-ac,v 1.2 2001/10/15 22:46:21 skrll Exp $ + done; \ + cat libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files > libknotify_main_la.all_cpp.cpp; \ + rm -f libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files -@@ -712 +726 @@ + + #>+ 11 -knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp knotify.moc +knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp knotify.moc -@@ -716 +730 @@ + @echo 'creating knotify_la.all_cpp.cpp ...'; \ + rm -f knotify_la.all_cpp.files knotify_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> knotify_la.all_cpp.final; \ - for file in knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp ; do \ + for file in knotify_main.cpp ; do \ -@@ -724 +738 @@ + echo "#include \"$$file\"" >> knotify_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify_la.all_cpp.final; \ + done; \ +@@ -708,11 +733,11 @@ + rm -f knotify_la.all_cpp.final knotify_la.all_cpp.files + + #>+ 11 -knotify.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +knotify.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp -@@ -728 +742 @@ + @echo 'creating knotify.all_cpp.cpp ...'; \ + rm -f knotify.all_cpp.files knotify.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> knotify.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in knotify_main.cpp ; do \ -@@ -749 +763 @@ + echo "#include \"$$file\"" >> knotify.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify.all_cpp.final; \ + done; \ +@@ -733,20 +758,20 @@ + + #>+ 3 + clean-final: - -rm -f knotify_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp + -rm -f libknotify_main_la.all_cpp.cpp knotify_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp -@@ -753 +767 @@ + + #>+ 2 + final: - $(MAKE) knotify_la_OBJECTS="$(knotify_la_final_OBJECTS)" all-am + $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_final_OBJECTS)" all-am -@@ -756 +770 @@ + #>+ 2 + final-install: +- $(MAKE) knotify_la_OBJECTS="$(knotify_la_final_OBJECTS)" install-am ++ $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) knotify_la_OBJECTS="$(knotify_la_nofinal_OBJECTS)" all-am + $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_nofinal_OBJECTS)" all-am -@@ -766 +780 @@ + #>+ 2 + no-final-install: +- $(MAKE) knotify_la_OBJECTS="$(knotify_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_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)/knotify.cpp: knotify.moc +$(srcdir)/knotify.cpp: knotify.moc knotify.moc diff --git a/x11/kdelibs2/patches/patch-af b/x11/kdelibs2/patches/patch-af index 22d2def2b61..31400dc9b9f 100644 --- a/x11/kdelibs2/patches/patch-af +++ b/x11/kdelibs2/patches/patch-af @@ -1,13 +1,11 @@ -$NetBSD: patch-af,v 1.3 2001/11/13 21:09:07 jlam Exp $ - ---- configure.orig Wed Sep 12 01:10:21 2001 -+++ configure -@@ -6889,7 +6889,7 @@ - ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross +--- configure.orig Wed Nov 14 09:58:06 2001 ++++ configure Fri Nov 23 13:41:42 2001 +@@ -9648,7 +9648,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='rm -rf SunWS_cache; ${LIBTOOL_SHELL} --tag=CXX --mode=link ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - - + ac_cxxflags_safe="$CXXFLAGS" + ac_ldflags_safe="$LDFLAGS" diff --git a/x11/kdelibs2/patches/patch-ah b/x11/kdelibs2/patches/patch-ah index 70a2f802974..0f4e5b593c2 100644 --- a/x11/kdelibs2/patches/patch-ah +++ b/x11/kdelibs2/patches/patch-ah @@ -1,21 +1,26 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-ah,v 1.2 2001/10/15 22:46:22 skrll Exp $ +$NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $ ---- dcop/Makefile.in.orig Wed Sep 12 06:09:37 2001 +--- dcop/Makefile.in.orig Tue Nov 13 20:57:03 2001 +++ dcop/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -291 +291 @@ +@@ -284,12 +284,12 @@ + KDE_OPTIONS = qtonly + + INCLUDES = $(all_includes) -LDFLAGS = $(all_libraries) +LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -296 +296 @@ + + bin_PROGRAMS = dcopserver + check_PROGRAMS = testdcop testdcopc + -lib_LTLIBRARIES = libDCOP.la dcopserver.la +lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la -@@ -310,3 +310,7 @@ + libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) + libDCOP_la_LDFLAGS = -version-info 1:0 $(all_libraries) -no-undefined + +@@ -303,13 +303,17 @@ + # dcopstub needs to go first for --enable-final to work + libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp + -dcopserver_la_LDFLAGS = -module -avoid-version -dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp -dcopserver_la_LIBADD = libDCOP.la @@ -26,18 +31,25 @@ $NetBSD: patch-ah,v 1.2 2001/10/15 22:46:22 skrll Exp $ +dcopserver_la_LDFLAGS = -Wl,-export-dynamic -module -avoid-version +dcopserver_la_SOURCES = dcopserver_main.cpp +dcopserver_la_LIBADD = libdcopserver_main.la -@@ -315,2 +319,2 @@ + + dcopserver_LDFLAGS = $(KDE_RPATH) -dcopserver_SOURCES = dummy.cpp -dcopserver_LDADD = dcopserver.la +dcopserver_SOURCES = dcopserver_main.cpp +dcopserver_LDADD = libdcopserver_main.la -@@ -341,2 +345,3 @@ + + testdcop_SOURCES = testdcop.cpp + testdcop_LDADD = ../kdecore/libkdecore.la +@@ -334,21 +338,26 @@ + libDCOP_la_nofinal_OBJECTS = dcopstub.lo dcopclient.lo dcopobject.lo dcopref.lo + @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS) -dcopserver_la_DEPENDENCIES = libDCOP.la -#>- dcopserver_la_OBJECTS = dcopserver.lo dcopsignals.lo +libdcopserver_main_la_LDFLAGS = +libdcopserver_main_la_DEPENDENCIES = libDCOP.la +#>- libdcopserver_main_la_OBJECTS = dcopserver.lo dcopsignals.lo -@@ -344,4 +349,8 @@ + #>+ 4 -dcopserver_la_final_OBJECTS = dcopserver_la.all_cpp.lo -dcopserver_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo -@KDE_USE_FINAL_FALSE@dcopserver_la_OBJECTS = $(dcopserver_la_nofinal_OBJECTS) @@ -50,43 +62,55 @@ $NetBSD: patch-ah,v 1.2 2001/10/15 22:46:22 skrll Exp $ +#>- dcopserver_la_OBJECTS = dcopserver_main.lo +#>+ 1 +dcopserver_la_OBJECTS = dcopserver_main.lo -@@ -352 +361 @@ + bin_PROGRAMS = dcopserver$(EXEEXT) + check_PROGRAMS = testdcop$(EXEEXT) testdcopc$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- dcopserver_OBJECTS = dummy.$(OBJEXT) +#>- dcopserver_OBJECTS = dcopserver_main.$(OBJEXT) -@@ -354,2 +363,2 @@ + #>+ 1 -dcopserver_OBJECTS = dummy.$(OBJEXT) -dcopserver_DEPENDENCIES = dcopserver.la +dcopserver_OBJECTS = dcopserver_main.$(OBJEXT) +dcopserver_DEPENDENCIES = libdcopserver_main.la -@@ -399,2 +408,2 @@ + #>- testdcop_OBJECTS = testdcop.$(OBJEXT) + #>+ 1 + testdcop_OBJECTS = testdcop.$(OBJEXT) +@@ -392,8 +401,8 @@ + + TAR = tar + GZIP_ENV = --best -SOURCES = $(libDCOP_la_SOURCES) $(dcopserver_la_SOURCES) $(dcopserver_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) -OBJECTS = $(libDCOP_la_OBJECTS) $(dcopserver_la_OBJECTS) $(dcopserver_OBJECTS) $(testdcop_OBJECTS) $(testdcopc_OBJECTS) +SOURCES = $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_la_SOURCES) $(dcopserver_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) +OBJECTS = $(libDCOP_la_OBJECTS) $(libdcopserver_main_la_OBJECTS) $(dcopserver_la_OBJECTS) $(dcopserver_OBJECTS) $(testdcop_OBJECTS) $(testdcopc_OBJECTS) -@@ -492,0 +502,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -486,6 +495,9 @@ + @KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS) + +libdcopserver_main.la: $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libdcopserver_main_la_LDFLAGS) $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_LIBADD) $(LIBS) + -@@ -599 +611 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -657,11 +668,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 -@@ -788,3 +788,0 @@ + dcopserver.la: $(dcopserver_la_OBJECTS) $(dcopserver_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(dcopserver_la_LDFLAGS) $(dcopserver_la_OBJECTS) $(dcopserver_la_LIBADD) $(LIBS) + +@@ -770,9 +782,6 @@ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + -dummy.cpp: - echo > dummy.cpp - -@@ -846 +844,13 @@ + # 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: +@@ -828,11 +837,23 @@ + rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files + + #>+ 11 -dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp +libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp + @echo 'creating libdcopserver_main_la.all_cpp.cpp ...'; \ @@ -101,21 +125,51 @@ $NetBSD: patch-ah,v 1.2 2001/10/15 22:46:22 skrll Exp $ + +#>+ 11 +dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp -@@ -850 +860 @@ + @echo 'creating dcopserver_la.all_cpp.cpp ...'; \ + rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \ - for file in dcopserver.cpp dcopsignals.cpp ; do \ + for file in dcopserver_main.cpp ; do \ -@@ -858 +868 @@ + echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \ + done; \ +@@ -840,11 +861,11 @@ + rm -f dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files + + #>+ 11 -dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp -@@ -862 +872 @@ + @echo 'creating dcopserver.all_cpp.cpp ...'; \ + rm -f dcopserver.all_cpp.files dcopserver.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> dcopserver.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in dcopserver_main.cpp ; do \ -@@ -883 +893 @@ + echo "#include \"$$file\"" >> dcopserver.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver.all_cpp.final; \ + done; \ +@@ -865,20 +886,20 @@ + + #>+ 3 + clean-final: - -rm -f libDCOP_la.all_cpp.cpp dcopserver_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp + -rm -f libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp dcopserver_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp -@@ -887 +897 @@ + + #>+ 2 + final: - $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am -@@ -890 +900 @@ + #>+ 2 + final-install: +- $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am ++ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am + $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am ++ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdelibs2/patches/patch-al b/x11/kdelibs2/patches/patch-al index f7083fd1c5d..638d6969801 100644 --- a/x11/kdelibs2/patches/patch-al +++ b/x11/kdelibs2/patches/patch-al @@ -1,23 +1,21 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-al,v 1.2 2001/10/15 22:46:22 skrll Exp $ +$NetBSD: patch-al,v 1.3 2001/12/03 15:37:21 skrll Exp $ ---- kconf_update/Makefile.in.orig Wed Sep 12 06:09:39 2001 +--- kconf_update/Makefile.in.orig Tue Nov 13 20:57:04 2001 +++ kconf_update/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -284 +284 @@ +@@ -277,16 +277,20 @@ + + INCLUDES = $(all_includes) + -lib_LTLIBRARIES = kconf_update.la +lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la -@@ -287,2 +287,2 @@ + + bin_PROGRAMS = kconf_update -kconf_update_SOURCES = dummy.cpp -kconf_update_LDADD = kconf_update.la +kconf_update_SOURCES = kconf_update_main.cpp +kconf_update_LDADD = libkconf_update_main.la -@@ -291,2 +291,5 @@ + kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries) + -kconf_update_la_SOURCES = kconf_update.cpp -kconf_update_la_LIBADD = ../kdecore/libkdecore.la +libkconf_update_main_la_SOURCES = kconf_update.cpp @@ -25,9 +23,15 @@ $NetBSD: patch-al,v 1.2 2001/10/15 22:46:22 skrll Exp $ +libkconf_update_main_la_LDFLAGS = $(all_libraries) + +kconf_update_la_SOURCES = kconf_update_main.cpp -@@ -293,0 +297 @@ + kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version +kconf_update_la_LIBADD = libkconf_update_main.la -@@ -306,2 +310,6 @@ + + #>- METASOURCES = AUTO + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs +@@ -299,17 +303,21 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ -kconf_update_la_DEPENDENCIES = ../kdecore/libkdecore.la -#>- kconf_update_la_OBJECTS = kconf_update.lo +libkconf_update_main_la_DEPENDENCIES = ../kdecore/libkdecore.la @@ -36,43 +40,57 @@ $NetBSD: patch-al,v 1.2 2001/10/15 22:46:22 skrll Exp $ +libkconf_update_main_la_OBJECTS = kconf_update.lo +kconf_update_la_DEPENDENCIES = libkconf_update_main.la +#>- kconf_update_la_OBJECTS = kconf_update_main.lo -@@ -309 +317 @@ + #>+ 1 -kconf_update_la_OBJECTS = kconf_update.lo +kconf_update_la_OBJECTS = kconf_update_main.lo -@@ -313 +321 @@ + bin_PROGRAMS = kconf_update$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kconf_update_OBJECTS = dummy.$(OBJEXT) +#>- kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) -@@ -315,2 +323,2 @@ + #>+ 1 -kconf_update_OBJECTS = dummy.$(OBJEXT) -kconf_update_DEPENDENCIES = kconf_update.la +kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) +kconf_update_DEPENDENCIES = libkconf_update_main.la -@@ -340,2 +348,2 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -333,8 +341,8 @@ + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) -OBJECTS = $(kconf_update_la_OBJECTS) $(kconf_update_OBJECTS) +SOURCES = $(libkconf_update_main_la_SOURCES) $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) +OBJECTS = $(libkconf_update_main_la_OBJECTS) $(kconf_update_la_OBJECTS) $(kconf_update_OBJECTS) -@@ -427,0 +436,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -421,6 +429,9 @@ + + maintainer-clean-libtool: + +libkconf_update_main.la: $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkconf_update_main_la_LDFLAGS) $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_LIBADD) $(LIBS) + -@@ -500,11 +510,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 -@@ -610,3 +609,0 @@ + kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS) + +@@ -592,9 +603,6 @@ + # Internal + # noinst_HEADERS = kconf_update.h + -dummy.cpp: - echo > dummy.cpp - -@@ -627 +624,13 @@ + # 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: +@@ -609,11 +617,23 @@ + + + #>+ 11 -kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp +libkconf_update_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update.cpp + @echo 'creating libkconf_update_main_la.all_cpp.cpp ...'; \ @@ -87,15 +105,34 @@ $NetBSD: patch-al,v 1.2 2001/10/15 22:46:22 skrll Exp $ + +#>+ 11 +kconf_update_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp -@@ -631 +640 @@ + @echo 'creating kconf_update_la.all_cpp.cpp ...'; \ + rm -f kconf_update_la.all_cpp.files kconf_update_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kconf_update_la.all_cpp.final; \ - for file in kconf_update.cpp ; do \ + for file in kconf_update_main.cpp ; do \ -@@ -639 +648 @@ + echo "#include \"$$file\"" >> kconf_update_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update_la.all_cpp.final; \ + done; \ +@@ -621,11 +641,11 @@ + rm -f kconf_update_la.all_cpp.final kconf_update_la.all_cpp.files + + #>+ 11 -kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kconf_update.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kconf_update_main.cpp -@@ -643 +652 @@ + @echo 'creating kconf_update.all_cpp.cpp ...'; \ + rm -f kconf_update.all_cpp.files kconf_update.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kconf_update.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kconf_update_main.cpp ; do \ -@@ -652 +661 @@ + echo "#include \"$$file\"" >> kconf_update.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kconf_update.all_cpp.final; \ + done; \ +@@ -634,7 +654,7 @@ + + #>+ 3 + clean-final: - -rm -f kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp + -rm -f libkconf_update_main_la.all_cpp.cpp kconf_update_la.all_cpp.cpp kconf_update.all_cpp.cpp + + #>+ 2 + final: diff --git a/x11/kdelibs2/patches/patch-ap b/x11/kdelibs2/patches/patch-ap index c3baab02fc8..6b8b72e9352 100644 --- a/x11/kdelibs2/patches/patch-ap +++ b/x11/kdelibs2/patches/patch-ap @@ -1,37 +1,33 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-ap,v 1.2 2001/10/15 22:46:22 skrll Exp $ +$NetBSD: patch-ap,v 1.3 2001/12/03 15:37:21 skrll Exp $ ---- kdecore/Makefile.in.orig Wed Sep 12 06:09:44 2001 +--- kdecore/Makefile.in.orig Tue Nov 13 20:57:06 2001 +++ kdecore/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -623 +623 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -681,11 +680,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 -@@ -821,3 +809,0 @@ +@@ -803,9 +803,6 @@ + #>- $(mkinstalldirs) $(includedir)/kio + #>+ 1 + $(mkinstalldirs) $(DESTDIR)$(includedir)/kio -#>- $(INSTALL_DATA) $(srcdir)/../libltdl/ltdl.h $(includedir)/ltdl.h -#>+ 1 - $(INSTALL_DATA) $(srcdir)/../libltdl/ltdl.h $(DESTDIR)$(includedir)/ltdl.h -@@ -854,3 +839,0 @@ + #>- $(mkinstalldirs) $(kde_confdir) + #>+ 1 + $(mkinstalldirs) $(DESTDIR)$(kde_confdir) +@@ -836,9 +833,6 @@ + #>- -rm -f $(kde_confdir)/charsets + #>+ 1 + -rm -f $(DESTDIR)$(kde_confdir)/charsets -#>- -rm -f $(includedir)/ltdl.h -#>+ 1 - -rm -f $(DESTDIR)$(includedir)/ltdl.h -@@ -1041 +1024 @@ + #>- -rm -f $(includedir)/kio/kmdcodec.h + #>+ 1 + -rm -f $(DESTDIR)$(includedir)/kio/kmdcodec.h +@@ -1025,7 +1019,7 @@ + rm -f libkdecore_la.all_cpp.final libkdecore_la.all_cpp.files + + #>+ 11 -kde_config.all_cpp.cpp: $(srcdir)/Makefile.in kde-config.cpp +kde_config.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kde-config.cpp + @echo 'creating kde_config.all_cpp.cpp ...'; \ + rm -f kde_config.all_cpp.files kde_config.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kde_config.all_cpp.final; \ diff --git a/x11/kdelibs2/patches/patch-ar b/x11/kdelibs2/patches/patch-ar index 2b7bb09ddce..eef7fba6d39 100644 --- a/x11/kdelibs2/patches/patch-ar +++ b/x11/kdelibs2/patches/patch-ar @@ -1,8 +1,8 @@ -$NetBSD: patch-ar,v 1.2 2001/10/15 22:46:22 skrll Exp $ +$NetBSD: patch-ar,v 1.3 2001/12/03 15:37:21 skrll Exp $ --- kdecore/kstddirs.cpp.orig Wed Jan 24 22:29:38 2001 +++ kdecore/kstddirs.cpp -@@ -652,33 +652,33 @@ +@@ -690,33 +690,33 @@ QString KStandardDirs::kde_default(const char *type) { if (!strcmp(type, "data")) diff --git a/x11/kdelibs2/patches/patch-at b/x11/kdelibs2/patches/patch-at index b3b27dc78ee..27c72c78c5a 100644 --- a/x11/kdelibs2/patches/patch-at +++ b/x11/kdelibs2/patches/patch-at @@ -1,10 +1,10 @@ -$NetBSD: patch-at,v 1.3 2001/10/15 22:46:23 skrll Exp $ +$NetBSD: patch-at,v 1.4 2001/12/03 15:37:21 skrll Exp $ --- kio/Makefile.am.orig Thu Jun 21 00:05:50 2001 +++ kio/Makefile.am @@ -21,7 +21,7 @@ SUBDIRS = . klauncher kded file http ftp pics tests ksendbugmail kpac \ - gzip $(BZIP2DIR) + gzip kssld $(BZIP2DIR) -lib_LTLIBRARIES = libkio.la libksycoca.la kio_uiserver.la +lib_LTLIBRARIES = libkio.la libksycoca.la libkio_uiserver_main.la kio_uiserver.la diff --git a/x11/kdelibs2/patches/patch-au b/x11/kdelibs2/patches/patch-au index f4d607066ea..5549417d69c 100644 --- a/x11/kdelibs2/patches/patch-au +++ b/x11/kdelibs2/patches/patch-au @@ -1,116 +1,153 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-au,v 1.3 2001/10/15 22:46:23 skrll Exp $ +$NetBSD: patch-au,v 1.4 2001/12/03 15:37:21 skrll Exp $ ---- kio/Makefile.in.orig Wed Sep 12 06:10:12 2001 +--- kio/Makefile.in.orig Tue Nov 13 20:57:17 2001 +++ kio/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -287 +287 @@ +@@ -280,7 +280,7 @@ + SUBDIRS = . klauncher kded file http ftp pics tests ksendbugmail kpac gzip kssld $(BZIP2DIR) + + -lib_LTLIBRARIES = libkio.la libksycoca.la kio_uiserver.la +lib_LTLIBRARIES = libkio.la libksycoca.la libkio_uiserver_main.la kio_uiserver.la -@@ -311,2 +311,2 @@ + bin_PROGRAMS = kio_uiserver kmailservice + + #libkioslave_la_LDFLAGS = -version-info 3:0 +@@ -304,15 +304,19 @@ + libkio_la_SOURCES=kshred.cpp kprotocolmanager.cpp slave.cpp slaveinterface.cpp sessiondata.cpp scheduler.cpp connection.cpp job.cpp global.cpp slaveconfig.cpp netaccess.cpp paste.cpp kmimemagic.cpp tcpslavebase.cpp slavebase.cpp passdlg.cpp progressbase.cpp defaultprogress.cpp statusbarprogress.cpp kdirnotify.cpp observer.cpp kemailsettings.cpp authinfo.cpp kprotocolinfo.cpp kprotocolinfofactory.cpp kdirnotify_skel.cpp kdirnotify_stub.cpp uiserver_stub.cpp observer_skel.cpp + + -kio_uiserver_SOURCES = dummy.cpp -kio_uiserver_LDADD = kio_uiserver.la +kio_uiserver_SOURCES = kio_uiserver_main.cpp +kio_uiserver_LDADD = libkio_uiserver_main.la -@@ -315 +315 @@ + kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) + -#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub renamedlg.cpp skipdlg.cpp +#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub renamedlg.cpp skipdlg.cpp -@@ -317 +317 @@ + #>+ 1 -kio_uiserver_la_SOURCES=uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp +libkio_uiserver_main_la_SOURCES=uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp -@@ -319 +319,5 @@ + -kio_uiserver_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la +libkio_uiserver_main_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la +libkio_uiserver_main_la_LDFLAGS = $(all_libraries) + +kio_uiserver_la_SOURCES = kio_uiserver_main.cpp +kio_uiserver_la_LIBADD = libkio_uiserver_main.la -@@ -399 +403 @@ + kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version + + #>- METASOURCES = AUTO +@@ -392,22 +396,26 @@ + libksycoca_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@libksycoca_la_OBJECTS = $(libksycoca_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libksycoca_la_OBJECTS = $(libksycoca_la_final_OBJECTS) -kio_uiserver_la_DEPENDENCIES = libksycoca.la ../kssl/libkssl.la \ +libkio_uiserver_main_la_DEPENDENCIES = libksycoca.la ../kssl/libkssl.la \ -@@ -401 +405 @@ + ../kdesu/libkdesu.la -#>- kio_uiserver_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo +#>- libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo -@@ -403,5 +407,9 @@ + #>+ 5 -kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo -kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ --kio_uiserver_la_meta_unload.lo +- kio_uiserver_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS) +libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo +libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \ -+libkio_uiserver_main_la_meta_unload.lo ++ libkio_uiserver_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS) +kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la +#>- kio_uiserver_la_OBJECTS = kio_uiserver_main.lo +#>+ 1 +kio_uiserver_la_OBJECTS = kio_uiserver_main.lo -@@ -411 +419 @@ + bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kio_uiserver_OBJECTS = dummy.$(OBJEXT) +#>- kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) -@@ -413,2 +421,2 @@ + #>+ 1 -kio_uiserver_OBJECTS = dummy.$(OBJEXT) -kio_uiserver_DEPENDENCIES = kio_uiserver.la +kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) +kio_uiserver_DEPENDENCIES = libkio_uiserver_main.la -@@ -445 +453 @@ + #>- kmailservice_OBJECTS = kmailservice.$(OBJEXT) + #>+ 1 + kmailservice_OBJECTS = kmailservice.$(OBJEXT) +@@ -438,15 +446,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=DESIGN.metadata kcomprfilter.desktop application.desktop kioslave.upd proxytype.pl DESIGN configure.in.in DESIGN.krun rlogin.protocol kurifilterplugin.desktop lex.l kscan.desktop kio_uiserver.desktop ktypecode.h useragent.pl kmailservice.protocol yacc.y kservicegroupfactory.h design.h telnet.protocol magic DESKTOP_ENTRY_STANDARD +KDE_DIST=DESIGN.metadata kcomprfilter.desktop application.desktop kioslave.upd proxytype.pl DESIGN configure.in.in DESIGN.krun rlogin.protocol kurifilterplugin.desktop lex.l kio_uiserver.desktop kscan.desktop ktypecode.h useragent.pl kmailservice.protocol yacc.y kservicegroupfactory.h design.h telnet.protocol magic DESKTOP_ENTRY_STANDARD -@@ -452,2 +460,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(libkio_la_SOURCES) $(libksycoca_la_SOURCES) $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) -OBJECTS = $(libkio_la_OBJECTS) $(libksycoca_la_OBJECTS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_OBJECTS) $(kmailservice_OBJECTS) +SOURCES = $(libkio_la_SOURCES) $(libksycoca_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) +OBJECTS = $(libkio_la_OBJECTS) $(libksycoca_la_OBJECTS) $(libkio_uiserver_main_la_OBJECTS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_OBJECTS) $(kmailservice_OBJECTS) -@@ -551,0 +560,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -545,6 +553,9 @@ + @KDE_USE_CLOSURE_FALSE@libksycoca.la: $(libksycoca_la_OBJECTS) $(libksycoca_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libksycoca_la_LDFLAGS) $(libksycoca_la_OBJECTS) $(libksycoca_la_LIBADD) $(LIBS) + +libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS) + -@@ -755 +766 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -813,11 +823,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 -@@ -958,3 +957,0 @@ + kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS) + +@@ -940,9 +951,6 @@ + #kdirnotify_stub.h + $(srcdir)/kmimetype.cpp: kdirnotify_stub.h + -dummy.cpp: uiserver.kidl - echo > dummy.cpp - -@@ -1176,8 +1173,8 @@ + parser: $(parserfiles) + cd $(srcdir) ;\ + flex -olex.c -Pkiotrader lex.l ;\ +@@ -1162,21 +1170,21 @@ + + + #>+ 12 -kio_uiserver_la_meta_unload.cpp: renamedlg.moc uiserver.moc skipdlg.moc - @echo 'creating kio_uiserver_la_meta_unload.cpp' - @-rm -f kio_uiserver_la_meta_unload.cpp -- @echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp -- @cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp -- @echo '0};' >> kio_uiserver_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kio_uiserver_la_meta_unload.cpp -- @echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp +libkio_uiserver_main_la_meta_unload.cpp: renamedlg.moc uiserver.moc skipdlg.moc + @echo 'creating libkio_uiserver_main_la_meta_unload.cpp' + @-rm -f libkio_uiserver_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp -+ @cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp -+ @echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkio_uiserver_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp -@@ -1188 +1185 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp ;\ +- cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp ;\ +- echo '0};' >> kio_uiserver_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kio_uiserver_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp ;\ +- else echo > kio_uiserver_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp ;\ ++ cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkio_uiserver_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp ;\ ++ else echo > libkio_uiserver_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f libkio_la_meta_unload.cpp libksycoca_la_meta_unload.cpp kio_uiserver_la_meta_unload.cpp + -rm -f libkio_la_meta_unload.cpp libksycoca_la_meta_unload.cpp libkio_uiserver_main_la_meta_unload.cpp -@@ -1215 +1212,13 @@ + + #>+ 11 + libkio_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kshred.cpp $(srcdir)/kprotocolmanager.cpp $(srcdir)/slave.cpp $(srcdir)/slaveinterface.cpp $(srcdir)/sessiondata.cpp $(srcdir)/scheduler.cpp $(srcdir)/connection.cpp $(srcdir)/job.cpp $(srcdir)/global.cpp $(srcdir)/slaveconfig.cpp $(srcdir)/netaccess.cpp $(srcdir)/paste.cpp $(srcdir)/kmimemagic.cpp $(srcdir)/tcpslavebase.cpp $(srcdir)/slavebase.cpp $(srcdir)/passdlg.cpp $(srcdir)/progressbase.cpp $(srcdir)/defaultprogress.cpp $(srcdir)/statusbarprogress.cpp $(srcdir)/kdirnotify.cpp $(srcdir)/observer.cpp $(srcdir)/kemailsettings.cpp $(srcdir)/authinfo.cpp $(srcdir)/kprotocolinfo.cpp $(srcdir)/kprotocolinfofactory.cpp kdirnotify_skel.cpp kdirnotify_stub.cpp uiserver_stub.cpp observer_skel.cpp libkio_la_meta_unload.cpp jobclasses.moc ktrader.moc passdlg.moc kfilterbase.moc sessiondata.moc statusbarprogress.moc krun.moc slaveconfig.moc kurlcompletion.moc defaultprogress.moc kscan.moc kdirwatch.moc previewjob.moc slaveinterface.moc renamedlg.moc chmodjob.moc kdirlister.moc observer.moc uiserver.moc slave.moc kautomount.moc kurifilter.moc skipdlg.moc netaccess.moc kshred.moc kshellcompletion.moc connection.moc progressbase.moc scheduler.moc +@@ -1203,11 +1211,23 @@ + rm -f libksycoca_la.all_cpp.final libksycoca_la.all_cpp.files + + #>+ 11 -kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp +libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp + @echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \ @@ -125,21 +162,51 @@ $NetBSD: patch-au,v 1.3 2001/10/15 22:46:23 skrll Exp $ + +#>+ 11 +kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp -@@ -1219 +1228 @@ + @echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ + rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ - for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp ; do \ + for file in kio_uiserver_main.cpp ; do \ -@@ -1227 +1236 @@ + echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ + done; \ +@@ -1215,11 +1235,11 @@ + rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files + + #>+ 11 -kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp -@@ -1231 +1240 @@ + @echo 'creating kio_uiserver.all_cpp.cpp ...'; \ + rm -f kio_uiserver.all_cpp.files kio_uiserver.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kio_uiserver.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kio_uiserver_main.cpp ; do \ -@@ -1252 +1261 @@ + echo "#include \"$$file\"" >> kio_uiserver.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver.all_cpp.final; \ + done; \ +@@ -1240,20 +1260,20 @@ + + #>+ 3 + clean-final: - -rm -f libkio_la.all_cpp.cpp libksycoca_la.all_cpp.cpp kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp + -rm -f libkio_la.all_cpp.cpp libksycoca_la.all_cpp.cpp libkio_uiserver_main_la.all_cpp.cpp kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp -@@ -1256 +1265 @@ + + #>+ 2 + final: - $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am + $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am -@@ -1259 +1268 @@ + #>+ 2 + final-install: +- $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" install-am ++ $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am + $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdelibs2/patches/patch-aw b/x11/kdelibs2/patches/patch-aw index a6bd9731a6d..a16c52229e3 100644 --- a/x11/kdelibs2/patches/patch-aw +++ b/x11/kdelibs2/patches/patch-aw @@ -1,23 +1,25 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-aw,v 1.1 2001/10/15 22:46:23 skrll Exp $ +$NetBSD: patch-aw,v 1.2 2001/12/03 15:37:21 skrll Exp $ ---- kio/http/Makefile.in.orig Wed Sep 12 06:10:13 2001 +--- kio/http/Makefile.in.orig Tue Nov 13 20:57:18 2001 +++ kio/http/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -275 +275 @@ +@@ -268,19 +268,22 @@ + ####### Files + + bin_PROGRAMS = kio_http_cache_cleaner -lib_LTLIBRARIES = kio_http_cache_cleaner.la +lib_LTLIBRARIES = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner.la -@@ -282,2 +282,2 @@ + kde_module_LTLIBRARIES = kio_http.la + + kio_http_la_SOURCES = http.cc + kio_http_la_LIBADD = ../libkio.la $(LIBZ) + kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) + -kio_http_cache_cleaner_SOURCES = dummy.cpp -kio_http_cache_cleaner_LDADD = kio_http_cache_cleaner.la +kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp +kio_http_cache_cleaner_LDADD = libkio_http_cache_cleaner_main.la -@@ -286,2 +286,5 @@ + kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH) + -kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp -kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) +libkio_http_cache_cleaner_main_la_SOURCES = http_cache_cleaner.cpp @@ -25,7 +27,13 @@ $NetBSD: patch-aw,v 1.1 2001/10/15 22:46:23 skrll Exp $ + +kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_main.cpp +kio_http_cache_cleaner_la_LIBADD = libkio_http_cache_cleaner_main.la -@@ -307,2 +310,8 @@ + kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version + + noinst_HEADERS = http.h +@@ -300,17 +303,23 @@ + #>- kio_http_la_OBJECTS = http.lo + #>+ 1 + kio_http_la_OBJECTS = http.lo -kio_http_cache_cleaner_la_DEPENDENCIES = -#>- kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo +libkio_http_cache_cleaner_main_la_LDFLAGS = @@ -34,47 +42,109 @@ $NetBSD: patch-aw,v 1.1 2001/10/15 22:46:23 skrll Exp $ +#>+ 1 +libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo +kio_http_cache_cleaner_la_DEPENDENCIES = \ -+libkio_http_cache_cleaner_main.la ++ libkio_http_cache_cleaner_main.la +#>- kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo -@@ -310 +319 @@ + #>+ 1 -kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo +kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo -@@ -314 +323 @@ + bin_PROGRAMS = kio_http_cache_cleaner$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kio_http_cache_cleaner_OBJECTS = dummy.$(OBJEXT) +#>- kio_http_cache_cleaner_OBJECTS = http_cache_cleaner_main.$(OBJEXT) -@@ -316,2 +325,2 @@ + #>+ 1 -kio_http_cache_cleaner_OBJECTS = dummy.$(OBJEXT) -kio_http_cache_cleaner_DEPENDENCIES = kio_http_cache_cleaner.la +kio_http_cache_cleaner_OBJECTS = http_cache_cleaner_main.$(OBJEXT) +kio_http_cache_cleaner_DEPENDENCIES = libkio_http_cache_cleaner_main.la -@@ -338 +347 @@ --KDE_DIST=README.http_cache_cleaner THOUGHTS https.protocol rfc2616.txt rfc2617.txt http.protocol http_cache_cleaner.desktop -+KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop rfc2617.txt http.protocol https.protocol THOUGHTS rfc2616.txt -@@ -345,2 +354,2 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -331,15 +340,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=README.http_cache_cleaner https.protocol rfc2616.txt rfc2617.txt http.protocol http_cache_cleaner.desktop ++KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop rfc2617.txt http.protocol https.protocol rfc2616.txt + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) -OBJECTS = $(kio_http_la_OBJECTS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_OBJECTS) +SOURCES = $(kio_http_la_SOURCES) $(libkio_http_cache_cleaner_main_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) +OBJECTS = $(kio_http_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_OBJECTS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_OBJECTS) -@@ -463,0 +473,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -457,6 +466,9 @@ + @KDE_USE_CLOSURE_FALSE@kio_http.la: $(kio_http_la_OBJECTS) $(kio_http_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS) + +libkio_http_cache_cleaner_main.la: $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkio_http_cache_cleaner_main_la_LDFLAGS) $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_LIBADD) $(LIBS) + -@@ -563 +575 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -621,11 +632,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 -@@ -756,3 +756,0 @@ -- + kio_http_cache_cleaner.la: $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kio_http_cache_cleaner_la_LDFLAGS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS) + +@@ -739,9 +751,6 @@ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + -dummy.cpp: - echo > dummy.cpp +- + # 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: +@@ -781,11 +790,23 @@ + rm -f kio_http_la.all_cc.final kio_http_la.all_cc.files + + #>+ 11 +-kio_http_cache_cleaner_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner.cpp ++libkio_http_cache_cleaner_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner.cpp ++ @echo 'creating libkio_http_cache_cleaner_main_la.all_cpp.cpp ...'; \ ++ rm -f libkio_http_cache_cleaner_main_la.all_cpp.files libkio_http_cache_cleaner_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkio_http_cache_cleaner_main_la.all_cpp.final; \ ++ for file in http_cache_cleaner.cpp ; do \ ++ echo "#include \"$$file\"" >> libkio_http_cache_cleaner_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_http_cache_cleaner_main_la.all_cpp.final; \ ++ done; \ ++ cat libkio_http_cache_cleaner_main_la.all_cpp.final libkio_http_cache_cleaner_main_la.all_cpp.files > libkio_http_cache_cleaner_main_la.all_cpp.cpp; \ ++ rm -f libkio_http_cache_cleaner_main_la.all_cpp.final libkio_http_cache_cleaner_main_la.all_cpp.files ++ ++#>+ 11 ++kio_http_cache_cleaner_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner_main.cpp + @echo 'creating kio_http_cache_cleaner_la.all_cpp.cpp ...'; \ + rm -f kio_http_cache_cleaner_la.all_cpp.files kio_http_cache_cleaner_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kio_http_cache_cleaner_la.all_cpp.final; \ +- for file in http_cache_cleaner.cpp ; do \ ++ for file in http_cache_cleaner_main.cpp ; do \ + echo "#include \"$$file\"" >> kio_http_cache_cleaner_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_http_cache_cleaner_la.all_cpp.final; \ + done; \ +@@ -793,11 +814,11 @@ + rm -f kio_http_cache_cleaner_la.all_cpp.final kio_http_cache_cleaner_la.all_cpp.files + + #>+ 11 +-kio_http_cache_cleaner.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kio_http_cache_cleaner.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/http_cache_cleaner_main.cpp + @echo 'creating kio_http_cache_cleaner.all_cpp.cpp ...'; \ + rm -f kio_http_cache_cleaner.all_cpp.files kio_http_cache_cleaner.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kio_http_cache_cleaner.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in http_cache_cleaner_main.cpp ; do \ + echo "#include \"$$file\"" >> kio_http_cache_cleaner.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_http_cache_cleaner.all_cpp.final; \ + done; \ +@@ -806,7 +827,7 @@ + + #>+ 3 + clean-final: +- -rm -f kio_http_la.all_cc.cc kio_http_cache_cleaner_la.all_cpp.cpp kio_http_cache_cleaner.all_cpp.cpp ++ -rm -f kio_http_la.all_cc.cc libkio_http_cache_cleaner_main_la.all_cpp.cpp kio_http_cache_cleaner_la.all_cpp.cpp kio_http_cache_cleaner.all_cpp.cpp + + #>+ 2 + final: diff --git a/x11/kdelibs2/patches/patch-ba b/x11/kdelibs2/patches/patch-ba index eb19b918db1..9477516c9ad 100644 --- a/x11/kdelibs2/patches/patch-ba +++ b/x11/kdelibs2/patches/patch-ba @@ -1,116 +1,143 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-ba,v 1.1 2001/10/15 22:46:24 skrll Exp $ +$NetBSD: patch-ba,v 1.2 2001/12/03 15:37:21 skrll Exp $ ---- kio/http/kcookiejar/Makefile.in.orig Wed Sep 12 06:10:13 2001 +--- kio/http/kcookiejar/Makefile.in.orig Tue Nov 13 20:57:18 2001 +++ kio/http/kcookiejar/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -272 +272 @@ +@@ -265,18 +265,22 @@ + ####### Files + + bin_PROGRAMS = kcookiejar -lib_LTLIBRARIES = kcookiejar.la +lib_LTLIBRARIES = libkcookiejar_main.la kcookiejar.la -@@ -274 +274 @@ + -#>- kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp kcookieserver.skel kcookiewin.cpp kcookiewin.h main.cpp +#>- libkcookiejar_main_la_SOURCES = kcookiejar.cpp kcookieserver.cpp kcookieserver.skel kcookiewin.cpp kcookiewin.h main.cpp -@@ -276 +276 @@ + #>+ 1 -kcookiejar_la_SOURCES=kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp kcookiewin.h main.cpp kcookieserver_skel.cpp +libkcookiejar_main_la_SOURCES=kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp kcookiewin.h main.cpp kcookieserver_skel.cpp -@@ -278 +278,5 @@ + -#>- kcookiejar_la_METASOURCES = AUTO +#>- libkcookiejar_main_la_METASOURCES = AUTO +libkcookiejar_main_la_LDFLAGS = $(all_libraries) +libkcookiejar_main_la_LIBADD = $(LIB_KIO) + +kcookiejar_la_SOURCES = kcookiejar_main.cpp -@@ -280 +284 @@ + kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version -kcookiejar_la_LIBADD = $(LIB_KIO) +kcookiejar_la_LIBADD = libkcookiejar_main.la -@@ -282,2 +286,2 @@ + -kcookiejar_SOURCES = dummy.cpp -kcookiejar_LDADD = kcookiejar.la +kcookiejar_SOURCES = kcookiejar_main.cpp +kcookiejar_LDADD = libkcookiejar_main.la -@@ -301,3 +305,3 @@ + kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + services_DATA = kcookiejar.desktop +@@ -294,23 +298,27 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ -kcookiejar_la_DEPENDENCIES = -#>- kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo kcookiewin.lo \ -#>- main.lo +libkcookiejar_main_la_DEPENDENCIES = +#>- libkcookiejar_main_la_OBJECTS = kcookiejar.lo kcookieserver.lo \ +#>- kcookiewin.lo main.lo -@@ -305,6 +309,10 @@ + #>+ 6 -kcookiejar_la_final_OBJECTS = kcookiejar_la.all_cpp.lo -kcookiejar_la_nofinal_OBJECTS = kcookiejar.lo kcookieserver.lo kcookiewin.lo \ --main.lo kcookieserver_skel.lo \ --kcookiejar_la_meta_unload.lo +- main.lo kcookieserver_skel.lo \ +- kcookiejar_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kcookiejar_la_OBJECTS = $(kcookiejar_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kcookiejar_la_OBJECTS = $(kcookiejar_la_final_OBJECTS) +libkcookiejar_main_la_final_OBJECTS = libkcookiejar_main_la.all_cpp.lo +libkcookiejar_main_la_nofinal_OBJECTS = kcookiejar.lo kcookieserver.lo \ -+kcookiewin.lo main.lo kcookieserver_skel.lo \ -+libkcookiejar_main_la_meta_unload.lo ++ kcookiewin.lo main.lo kcookieserver_skel.lo \ ++ libkcookiejar_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkcookiejar_main_la_OBJECTS = $(libkcookiejar_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkcookiejar_main_la_OBJECTS = $(libkcookiejar_main_la_final_OBJECTS) +kcookiejar_la_DEPENDENCIES = libkcookiejar_main.la +#>- kcookiejar_la_OBJECTS = kcookiejar_main.lo +#>+ 1 +kcookiejar_la_OBJECTS = kcookiejar_main.lo -@@ -314 +322 @@ + bin_PROGRAMS = kcookiejar$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kcookiejar_OBJECTS = dummy.$(OBJEXT) +#>- kcookiejar_OBJECTS = kcookiejar_main.$(OBJEXT) -@@ -316,2 +324,2 @@ + #>+ 1 -kcookiejar_OBJECTS = dummy.$(OBJEXT) -kcookiejar_DEPENDENCIES = kcookiejar.la +kcookiejar_OBJECTS = kcookiejar_main.$(OBJEXT) +kcookiejar_DEPENDENCIES = libkcookiejar_main.la -@@ -341 +349 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -334,15 +342,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=kcookiescfg.upd kcookiejar.desktop kcookieserver.h kcookiejar.h rfc2965 netscape_cookie_spec.html rfc2109 +KDE_DIST=netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h -@@ -348,2 +356,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kcookiejar_la_SOURCES) $(kcookiejar_SOURCES) -OBJECTS = $(kcookiejar_la_OBJECTS) $(kcookiejar_OBJECTS) +SOURCES = $(libkcookiejar_main_la_SOURCES) $(kcookiejar_la_SOURCES) $(kcookiejar_SOURCES) +OBJECTS = $(libkcookiejar_main_la_OBJECTS) $(kcookiejar_la_OBJECTS) $(kcookiejar_OBJECTS) -@@ -435,0 +444,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -429,6 +437,9 @@ + + maintainer-clean-libtool: + +libkcookiejar_main.la: $(libkcookiejar_main_la_OBJECTS) $(libkcookiejar_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcookiejar_main_la_LDFLAGS) $(libkcookiejar_main_la_OBJECTS) $(libkcookiejar_main_la_LIBADD) $(LIBS) + -@@ -546,11 +556,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 @@ + kcookiejar.la: $(kcookiejar_la_OBJECTS) $(kcookiejar_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS) + +@@ -638,9 +649,6 @@ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + -dummy.cpp: - echo > dummy.cpp - -@@ -696,8 +693,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: +@@ -678,28 +686,40 @@ + + + #>+ 12 -kcookiejar_la_meta_unload.cpp: kcookieserver.moc kcookiewin.moc - @echo 'creating kcookiejar_la_meta_unload.cpp' - @-rm -f kcookiejar_la_meta_unload.cpp -- @echo 'static const char * _metalist_kcookiejar_la[] = {' > kcookiejar_la_meta_unload.cpp -- @cat kcookieserver.moc kcookiewin.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcookiejar_la_meta_unload.cpp -- @echo '0};' >> kcookiejar_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kcookiejar_la_meta_unload.cpp -- @echo '_UNLOAD(kcookiejar_la)' >> kcookiejar_la_meta_unload.cpp +libkcookiejar_main_la_meta_unload.cpp: kcookieserver.moc kcookiewin.moc + @echo 'creating libkcookiejar_main_la_meta_unload.cpp' + @-rm -f libkcookiejar_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkcookiejar_main_la[] = {' > libkcookiejar_main_la_meta_unload.cpp -+ @cat kcookieserver.moc kcookiewin.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcookiejar_main_la_meta_unload.cpp -+ @echo '0};' >> libkcookiejar_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkcookiejar_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkcookiejar_main_la)' >> libkcookiejar_main_la_meta_unload.cpp -@@ -708 +705,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kcookiejar_la[] = {' > kcookiejar_la_meta_unload.cpp ;\ +- cat kcookieserver.moc kcookiewin.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcookiejar_la_meta_unload.cpp ;\ +- echo '0};' >> kcookiejar_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kcookiejar_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kcookiejar_la)' >> kcookiejar_la_meta_unload.cpp ;\ +- else echo > kcookiejar_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkcookiejar_main_la[] = {' > libkcookiejar_main_la_meta_unload.cpp ;\ ++ cat kcookieserver.moc kcookiewin.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcookiejar_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkcookiejar_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkcookiejar_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkcookiejar_main_la)' >> libkcookiejar_main_la_meta_unload.cpp ;\ ++ else echo > libkcookiejar_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kcookiejar_la_meta_unload.cpp + -rm -f libkcookiejar_main_la_meta_unload.cpp + @@ -125,24 +152,55 @@ $NetBSD: patch-ba,v 1.1 2001/10/15 22:46:24 skrll Exp $ + done; \ + cat libkcookiejar_main_la.all_cpp.final libkcookiejar_main_la.all_cpp.files > libkcookiejar_main_la.all_cpp.cpp; \ + rm -f libkcookiejar_main_la.all_cpp.final libkcookiejar_main_la.all_cpp.files -@@ -711 +720 @@ + + #>+ 11 -kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp $(srcdir)/main.cpp kcookieserver_skel.cpp kcookiejar_la_meta_unload.cpp kcookieserver.moc kcookiewin.moc +kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar_main.cpp -@@ -715 +724 @@ + @echo 'creating kcookiejar_la.all_cpp.cpp ...'; \ + rm -f kcookiejar_la.all_cpp.files kcookiejar_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcookiejar_la.all_cpp.final; \ - for file in kcookiejar.cpp kcookieserver.cpp kcookiewin.cpp main.cpp kcookieserver_skel.cpp kcookiejar_la_meta_unload.cpp ; do \ + for file in kcookiejar_main.cpp ; do \ -@@ -723 +732 @@ + echo "#include \"$$file\"" >> kcookiejar_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcookiejar_la.all_cpp.final; \ + done; \ +@@ -707,11 +727,11 @@ + rm -f kcookiejar_la.all_cpp.final kcookiejar_la.all_cpp.files + + #>+ 11 -kcookiejar.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kcookiejar.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar_main.cpp -@@ -727 +736 @@ + @echo 'creating kcookiejar.all_cpp.cpp ...'; \ + rm -f kcookiejar.all_cpp.files kcookiejar.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcookiejar.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kcookiejar_main.cpp ; do \ -@@ -736 +745 @@ + echo "#include \"$$file\"" >> kcookiejar.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcookiejar.all_cpp.final; \ + done; \ +@@ -720,20 +740,20 @@ + + #>+ 3 + clean-final: - -rm -f kcookiejar_la.all_cpp.cpp kcookiejar.all_cpp.cpp + -rm -f libkcookiejar_main_la.all_cpp.cpp kcookiejar_la.all_cpp.cpp kcookiejar.all_cpp.cpp -@@ -740 +749 @@ + + #>+ 2 + final: - $(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_final_OBJECTS)" all-am + $(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_final_OBJECTS)" all-am -@@ -743 +752 @@ + #>+ 2 + final-install: +- $(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_final_OBJECTS)" install-am ++ $(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_nofinal_OBJECTS)" all-am + $(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kcookiejar_la_OBJECTS="$(kcookiejar_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkcookiejar_main_la_OBJECTS="$(libkcookiejar_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdelibs2/patches/patch-be b/x11/kdelibs2/patches/patch-be index 991b884eca8..a5ec4d5e4c2 100644 --- a/x11/kdelibs2/patches/patch-be +++ b/x11/kdelibs2/patches/patch-be @@ -1,15 +1,11 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-be,v 1.1 2001/10/15 22:46:25 skrll Exp $ +$NetBSD: patch-be,v 1.2 2001/12/03 15:37:21 skrll Exp $ ---- kio/kded/Makefile.in.orig Wed Sep 12 06:10:13 2001 +--- kio/kded/Makefile.in.orig Tue Nov 13 20:57:18 2001 +++ kio/kded/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -285 +285,6 @@ +@@ -278,27 +278,35 @@ + + INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) + -lib_LTLIBRARIES = kded.la kbuildsycoca.la +lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la + @@ -17,45 +13,57 @@ $NetBSD: patch-be,v 1.1 2001/10/15 22:46:25 skrll Exp $ +libkded_main_la_LIBADD = $(LIB_KSYCOCA) +libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp + -@@ -288,2 +293,2 @@ + + kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_la_LIBADD = $(LIB_KSYCOCA) -kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp +kded_la_LIBADD = libkded_main.la +kded_la_SOURCES = kded_main.cpp -@@ -290,0 +296,3 @@ + +libkbuildsycoca_main_la_LDFLAGS = $(all_libraries) +libkbuildsycoca_main_la_LIBADD = $(LIB_KSYCOCA) +libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp -@@ -292,3 +299,0 @@ + -kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version -kbuildsycoca_la_LIBADD = $(LIB_KSYCOCA) -kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp -@@ -295,0 +301,3 @@ + +kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version +kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la +kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp -@@ -300,2 +308,2 @@ + + bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname + + kded_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kded_LDADD = $(LIB_KSYCOCA) kded.la -kded_SOURCES = dummy.cpp +kded_LDADD = $(LIB_KSYCOCA) libkded_main.la +kded_SOURCES = kded_main.cpp -@@ -304,2 +312,2 @@ + + kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH) -kbuildsycoca_LDADD = $(LIB_KSYCOCA) kbuildsycoca.la -kbuildsycoca_SOURCES = dummy.cpp +kbuildsycoca_LDADD = $(LIB_KSYCOCA) libkbuildsycoca_main.la +kbuildsycoca_SOURCES = kbuildsycoca_main.cpp -@@ -330,2 +338,2 @@ + + kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) + kdontchangethehostname_LDADD = $(LIB_KDECORE) +@@ -323,40 +331,50 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ -kded_la_DEPENDENCIES = -#>- kded_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkded_main_la_DEPENDENCIES = +#>- libkded_main_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ -@@ -334,2 +342,2 @@ + #>- kbuildservicefactory.lo kbuildservicegroupfactory.lo kdedmodule.lo + #>+ 6 -kded_la_final_OBJECTS = kded_la.all_cpp.lo -kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ +libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo +libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ -@@ -337,15 +345,25 @@ --kded_la_meta_unload.lo + kbuildservicefactory.lo kbuildservicegroupfactory.lo kdedmodule.lo \ +- kded_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kded_la_OBJECTS = $(kded_la_final_OBJECTS) -kbuildsycoca_la_DEPENDENCIES = @@ -65,12 +73,12 @@ $NetBSD: patch-be,v 1.1 2001/10/15 22:46:25 skrll Exp $ -#>+ 7 -kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo -kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ --kbuildservicefactory.lo kbuildservicegroupfactory.lo \ --kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo \ --kbuildsycoca_la_meta_unload.lo +- kbuildservicefactory.lo kbuildservicegroupfactory.lo \ +- kbuildimageiofactory.lo kbuildprotocolinfofactory.lo kctimefactory.lo \ +- kbuildsycoca_la_meta_unload.lo -@KDE_USE_FINAL_FALSE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS) -+libkded_main_la_meta_unload.lo ++ libkded_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS) +kded_la_DEPENDENCIES = libkded_main.la @@ -85,98 +93,131 @@ $NetBSD: patch-be,v 1.1 2001/10/15 22:46:25 skrll Exp $ +#>+ 8 +libkbuildsycoca_main_la_final_OBJECTS = libkbuildsycoca_main_la.all_cpp.lo +libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \ -+kbuildservicetypefactory.lo kbuildservicefactory.lo \ -+kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ -+kbuildprotocolinfofactory.lo kctimefactory.lo \ -+libkbuildsycoca_main_la_meta_unload.lo ++ kbuildservicetypefactory.lo kbuildservicefactory.lo \ ++ kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ ++ kbuildprotocolinfofactory.lo kctimefactory.lo \ ++ libkbuildsycoca_main_la_meta_unload.lo +@KDE_USE_FINAL_FALSE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS) +kbuildsycoca_la_DEPENDENCIES = libkbuildsycoca_main.la +#>- kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo +#>+ 1 +kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo -@@ -356 +374 @@ + bin_PROGRAMS = kded$(EXEEXT) kbuildsycoca$(EXEEXT) \ + kdontchangethehostname$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- kded_OBJECTS = dummy.$(OBJEXT) +#>- kded_OBJECTS = kded_main.$(OBJEXT) -@@ -358,3 +376,3 @@ + #>+ 1 -kded_OBJECTS = dummy.$(OBJEXT) -kded_DEPENDENCIES = kded.la -#>- kbuildsycoca_OBJECTS = dummy.$(OBJEXT) +kded_OBJECTS = kded_main.$(OBJEXT) +kded_DEPENDENCIES = libkded_main.la +#>- kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) -@@ -362,2 +380,2 @@ + #>+ 1 -kbuildsycoca_OBJECTS = dummy.$(OBJEXT) -kbuildsycoca_DEPENDENCIES = kbuildsycoca.la +kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) +kbuildsycoca_DEPENDENCIES = libkbuildsycoca_main.la -@@ -388 +406 @@ + #>- kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) + #>+ 1 + kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) +@@ -381,15 +399,15 @@ + + #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 -KDE_DIST=HOWTO README.kded DESIGN kdedmodule.desktop kded.h kctimefactory.h +KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO kctimefactory.h -@@ -395,2 +413,2 @@ + + DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + + + TAR = tar + GZIP_ENV = --best -SOURCES = $(kded_la_SOURCES) $(kbuildsycoca_la_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) $(kdontchangethehostname_SOURCES) -OBJECTS = $(kded_la_OBJECTS) $(kbuildsycoca_la_OBJECTS) $(kded_OBJECTS) $(kbuildsycoca_OBJECTS) $(kdontchangethehostname_OBJECTS) +SOURCES = $(libkded_main_la_SOURCES) $(kded_la_SOURCES) $(libkbuildsycoca_main_la_SOURCES) $(kbuildsycoca_la_SOURCES) $(kded_SOURCES) $(kbuildsycoca_SOURCES) $(kdontchangethehostname_SOURCES) +OBJECTS = $(libkded_main_la_OBJECTS) $(kded_la_OBJECTS) $(libkbuildsycoca_main_la_OBJECTS) $(kbuildsycoca_la_OBJECTS) $(kded_OBJECTS) $(kbuildsycoca_OBJECTS) $(kdontchangethehostname_OBJECTS) -@@ -482,0 +501,3 @@ + + #>- all: all-redirect + #>+ 1 +@@ -476,9 +494,15 @@ + + maintainer-clean-libtool: + +libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS) + -@@ -485,0 +507,3 @@ + kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS) + +libkbuildsycoca_main.la: $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS) + -@@ -600,11 +623,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 -@@ -710,3 +722,0 @@ + kbuildsycoca.la: $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS) + +@@ -692,9 +716,6 @@ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + -dummy.cpp: - echo > dummy.cpp - -@@ -743,8 +753,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: +@@ -725,41 +746,53 @@ + + + #>+ 12 -kded_la_meta_unload.cpp: kded.moc kdedmodule.moc - @echo 'creating kded_la_meta_unload.cpp' - @-rm -f kded_la_meta_unload.cpp -- @echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp -- @cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp -- @echo '0};' >> kded_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kded_la_meta_unload.cpp -- @echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp +libkded_main_la_meta_unload.cpp: kded.moc kdedmodule.moc + @echo 'creating libkded_main_la_meta_unload.cpp' + @-rm -f libkded_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp -+ @cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp -+ @echo '0};' >> libkded_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkded_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp -@@ -754,8 +764,8 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kded_la[] = {' > kded_la_meta_unload.cpp ;\ +- cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kded_la_meta_unload.cpp ;\ +- echo '0};' >> kded_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kded_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kded_la)' >> kded_la_meta_unload.cpp ;\ +- else echo > kded_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkded_main_la[] = {' > libkded_main_la_meta_unload.cpp ;\ ++ cat kded.moc kdedmodule.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkded_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkded_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkded_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkded_main_la)' >> libkded_main_la_meta_unload.cpp ;\ ++ else echo > libkded_main_la_meta_unload.cpp; fi + + + #>+ 12 -kbuildsycoca_la_meta_unload.cpp: kbuildsycoca.moc - @echo 'creating kbuildsycoca_la_meta_unload.cpp' - @-rm -f kbuildsycoca_la_meta_unload.cpp -- @echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp -- @cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp -- @echo '0};' >> kbuildsycoca_la_meta_unload.cpp -- @echo '#include <kunload.h>' >> kbuildsycoca_la_meta_unload.cpp -- @echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp +libkbuildsycoca_main_la_meta_unload.cpp: kbuildsycoca.moc + @echo 'creating libkbuildsycoca_main_la_meta_unload.cpp' + @-rm -f libkbuildsycoca_main_la_meta_unload.cpp -+ @echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp -+ @cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp -+ @echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp -+ @echo '#include <kunload.h>' >> libkbuildsycoca_main_la_meta_unload.cpp -+ @echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp -@@ -766 +776,13 @@ + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kbuildsycoca_la[] = {' > kbuildsycoca_la_meta_unload.cpp ;\ +- cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kbuildsycoca_la_meta_unload.cpp ;\ +- echo '0};' >> kbuildsycoca_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kbuildsycoca_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kbuildsycoca_la)' >> kbuildsycoca_la_meta_unload.cpp ;\ +- else echo > kbuildsycoca_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkbuildsycoca_main_la[] = {' > libkbuildsycoca_main_la_meta_unload.cpp ;\ ++ cat kbuildsycoca.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkbuildsycoca_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkbuildsycoca_main_la)' >> libkbuildsycoca_main_la_meta_unload.cpp ;\ ++ else echo > libkbuildsycoca_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: - -rm -f kded_la_meta_unload.cpp kbuildsycoca_la_meta_unload.cpp + -rm -f libkded_main_la_meta_unload.cpp libkbuildsycoca_main_la_meta_unload.cpp + @@ -191,13 +232,22 @@ $NetBSD: patch-be,v 1.1 2001/10/15 22:46:25 skrll Exp $ + done; \ + cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \ + rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files -@@ -769 +791 @@ + + #>+ 11 -kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded_la_meta_unload.cpp kded.moc kdedmodule.moc kbuildsycoca.moc +kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp -@@ -773 +795 @@ + @echo 'creating kded_la.all_cpp.cpp ...'; \ + rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \ - for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp kded_la_meta_unload.cpp ; do \ + for file in kded_main.cpp ; do \ -@@ -781 +803,13 @@ + echo "#include \"$$file\"" >> kded_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \ + done; \ +@@ -767,11 +800,23 @@ + rm -f kded_la.all_cpp.final kded_la.all_cpp.files + + #>+ 11 -kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp +libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp libkbuildsycoca_main_la_meta_unload.cpp + @echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \ @@ -212,27 +262,65 @@ $NetBSD: patch-be,v 1.1 2001/10/15 22:46:25 skrll Exp $ + +#>+ 11 +kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp -@@ -785 +819 @@ + @echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \ + rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \ - for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp kbuildsycoca_la_meta_unload.cpp ; do \ + for file in kbuildsycoca_main.cpp ; do \ -@@ -793 +827 @@ + echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \ + done; \ +@@ -779,11 +824,11 @@ + rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files + + #>+ 11 -kded.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kded.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded_main.cpp -@@ -797 +831 @@ + @echo 'creating kded.all_cpp.cpp ...'; \ + rm -f kded.all_cpp.files kded.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kded.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kded_main.cpp ; do \ -@@ -805 +839 @@ + echo "#include \"$$file\"" >> kded.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded.all_cpp.final; \ + done; \ +@@ -791,11 +836,11 @@ + rm -f kded.all_cpp.final kded.all_cpp.files + + #>+ 11 -kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +kbuildsycoca.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca_main.cpp -@@ -809 +843 @@ + @echo 'creating kbuildsycoca.all_cpp.cpp ...'; \ + rm -f kbuildsycoca.all_cpp.files kbuildsycoca.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kbuildsycoca.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kbuildsycoca_main.cpp ; do \ -@@ -830 +864 @@ + echo "#include \"$$file\"" >> kbuildsycoca.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca.all_cpp.final; \ + done; \ +@@ -816,20 +861,20 @@ + + #>+ 3 + clean-final: - -rm -f kded_la.all_cpp.cpp kbuildsycoca_la.all_cpp.cpp kded.all_cpp.cpp kbuildsycoca.all_cpp.cpp kdontchangethehostname.all_cpp.cpp + -rm -f libkded_main_la.all_cpp.cpp kded_la.all_cpp.cpp libkbuildsycoca_main_la.all_cpp.cpp kbuildsycoca_la.all_cpp.cpp kded.all_cpp.cpp kbuildsycoca.all_cpp.cpp kdontchangethehostname.all_cpp.cpp -@@ -834 +868 @@ + + #>+ 2 + final: - $(MAKE) kded_la_OBJECTS="$(kded_la_final_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" all-am + $(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" all-am -@@ -837 +871 @@ + #>+ 2 + final-install: +- $(MAKE) kded_la_OBJECTS="$(kded_la_final_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" install-am ++ $(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: - $(MAKE) kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" all-am + $(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdelibs2/patches/patch-bf b/x11/kdelibs2/patches/patch-bf index 6d21aae654a..86bcc1b30d9 100644 --- a/x11/kdelibs2/patches/patch-bf +++ b/x11/kdelibs2/patches/patch-bf @@ -1,8 +1,8 @@ -$NetBSD: patch-bf,v 1.1 2001/10/15 22:46:25 skrll Exp $ +$NetBSD: patch-bf,v 1.2 2001/12/03 15:37:21 skrll Exp $ --- kio/kded/kbuildsycoca.cpp.orig Wed Sep 5 00:08:16 2001 +++ kio/kded/kbuildsycoca.cpp -@@ -382,7 +382,7 @@ +@@ -376,7 +376,7 @@ static const char *appName = "kbuildsycoca"; static const char *appVersion = "1.0"; diff --git a/x11/kdelibs2/patches/patch-bh b/x11/kdelibs2/patches/patch-bh index cd65236c03b..72d247f625a 100644 --- a/x11/kdelibs2/patches/patch-bh +++ b/x11/kdelibs2/patches/patch-bh @@ -1,8 +1,8 @@ -$NetBSD: patch-bh,v 1.1 2001/10/15 22:46:25 skrll Exp $ +$NetBSD: patch-bh,v 1.2 2001/12/03 15:37:21 skrll Exp $ --- kio/kded/kded.cpp.orig Wed Sep 5 00:08:16 2001 +++ kio/kded/kded.cpp -@@ -449,5 +449,5 @@ +@@ -463,5 +463,5 @@ }; -int main(int argc, char *argv[]) diff --git a/x11/kdelibs2/patches/patch-bl b/x11/kdelibs2/patches/patch-bl index 05d4ac09f2f..166533f53bb 100644 --- a/x11/kdelibs2/patches/patch-bl +++ b/x11/kdelibs2/patches/patch-bl @@ -1,64 +1,83 @@ -Cannot strip away RCS IDs, please handle manually! -$NetBSD: patch-bl,v 1.1 2001/10/15 22:46:26 skrll Exp $ +$NetBSD: patch-bl,v 1.2 2001/12/03 15:37:21 skrll Exp $ ---- kio/klauncher/Makefile.in.orig Wed Sep 12 06:10:14 2001 +--- kio/klauncher/Makefile.in.orig Tue Nov 13 20:57:18 2001 +++ kio/klauncher/Makefile.in -@@ -2 +2 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -@@ -4 +4 @@ --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -@@ -291 +291 @@ +@@ -284,11 +284,10 @@ + + klauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version + klauncher_la_LIBADD = $(LIB_KSYCOCA) -klauncher_la_SOURCES = klauncher.cpp main.cpp autostart.cpp +klauncher_la_SOURCES = klauncher.cpp autostart.cpp main.cpp -@@ -294,2 +294 @@ + + klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) -klauncher_LDADD = klauncher.la -klauncher_SOURCES = dummy.cpp +klauncher_SOURCES = klauncher_main.cpp -@@ -311 +310 @@ + + #>- METASOURCES = AUTO + +@@ -304,20 +303,21 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + klauncher_la_DEPENDENCIES = -#>- klauncher_la_OBJECTS = klauncher.lo main.lo autostart.lo +#>- klauncher_la_OBJECTS = klauncher.lo autostart.lo main.lo -@@ -314 +313 @@ + #>+ 5 + klauncher_la_final_OBJECTS = klauncher_la.all_cpp.lo -klauncher_la_nofinal_OBJECTS = klauncher.lo main.lo autostart.lo \ +klauncher_la_nofinal_OBJECTS = klauncher.lo autostart.lo main.lo \ -@@ -321 +320 @@ + klauncher_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@klauncher_la_OBJECTS = $(klauncher_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@klauncher_la_OBJECTS = $(klauncher_la_final_OBJECTS) + bin_PROGRAMS = klauncher$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + -#>- klauncher_OBJECTS = dummy.$(OBJEXT) +#>- klauncher_OBJECTS = klauncher_main.$(OBJEXT) -@@ -323,2 +322,3 @@ + #>+ 1 -klauncher_OBJECTS = dummy.$(OBJEXT) -klauncher_DEPENDENCIES = klauncher.la +klauncher_OBJECTS = klauncher_main.$(OBJEXT) +klauncher_LDADD = $(LDADD) +klauncher_DEPENDENCIES = -@@ -512 +512 @@ -- test "$$subdir" = "." && dot_seen=yes; \ -+ test "$$subdir" != "." || dot_seen=yes; \ -@@ -570,11 +569,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 -@@ -693,3 +681,0 @@ + CXXFLAGS = @CXXFLAGS@ + #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 1 +@@ -675,9 +675,6 @@ + maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + -dummy.cpp: - echo > dummy.cpp - -@@ -733 +719 @@ + # 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: +@@ -717,11 +714,11 @@ + -rm -f klauncher_la_meta_unload.cpp + + #>+ 11 -klauncher_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klauncher.cpp $(srcdir)/main.cpp $(srcdir)/autostart.cpp klauncher_la_meta_unload.cpp klauncher.moc +klauncher_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klauncher.cpp $(srcdir)/autostart.cpp $(srcdir)/main.cpp klauncher_la_meta_unload.cpp klauncher.moc -@@ -737 +723 @@ + @echo 'creating klauncher_la.all_cpp.cpp ...'; \ + rm -f klauncher_la.all_cpp.files klauncher_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> klauncher_la.all_cpp.final; \ - for file in klauncher.cpp main.cpp autostart.cpp klauncher_la_meta_unload.cpp ; do \ + for file in klauncher.cpp autostart.cpp main.cpp klauncher_la_meta_unload.cpp ; do \ -@@ -745 +731 @@ + echo "#include \"$$file\"" >> klauncher_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klauncher_la.all_cpp.final; \ + done; \ +@@ -729,11 +726,11 @@ + rm -f klauncher_la.all_cpp.final klauncher_la.all_cpp.files + + #>+ 11 -klauncher.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +klauncher.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klauncher_main.cpp -@@ -749 +735 @@ + @echo 'creating klauncher.all_cpp.cpp ...'; \ + rm -f klauncher.all_cpp.files klauncher.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> klauncher.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in klauncher_main.cpp ; do \ + echo "#include \"$$file\"" >> klauncher.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klauncher.all_cpp.final; \ + done; \ diff --git a/x11/kdelibs2/patches/patch-bs b/x11/kdelibs2/patches/patch-bs deleted file mode 100644 index 1adc36ed342..00000000000 --- a/x11/kdelibs2/patches/patch-bs +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bs,v 1.1 2001/11/17 12:01:34 skrll Exp $ - ---- kio/ftp/ftp.cc.orig Mon Jul 30 23:11:23 2001 -+++ kio/ftp/ftp.cc -@@ -664,7 +664,7 @@ - return false; - } - -- if (sscanf(rspbuf, "%*[^(](%d,%d,%d,%d,%d,%d)",&i[0], &i[1], &i[2], &i[3], &i[4], &i[5]) != 6) -+ if (sscanf(rspbuf+4, "%*[^0-9]%d,%d,%d,%d,%d,%d",&i[0], &i[1], &i[2], &i[3], &i[4], &i[5]) != 6) - { - return false; - } |