diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/kdenetwork3/Makefile | 10 | ||||
| -rw-r--r-- | net/kdenetwork3/PLIST | 535 | ||||
| -rw-r--r-- | net/kdenetwork3/buildlink2.mk | 4 | ||||
| -rw-r--r-- | net/kdenetwork3/distinfo | 18 | ||||
| -rw-r--r-- | net/kdenetwork3/patches/patch-aa | 57 | ||||
| -rw-r--r-- | net/kdenetwork3/patches/patch-ae | 17 | ||||
| -rw-r--r-- | net/kdenetwork3/patches/patch-af | 477 | ||||
| -rw-r--r-- | net/kdenetwork3/patches/patch-ai | 15 | ||||
| -rw-r--r-- | net/kdenetwork3/patches/patch-aj | 143 | ||||
| -rw-r--r-- | net/kdenetwork3/patches/patch-am | 77 |
10 files changed, 708 insertions, 645 deletions
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index d329cdbf03f..dda1ac9b62d 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2003/01/20 10:03:58 skrll Exp $ +# $NetBSD: Makefile,v 1.13 2003/03/11 13:13:26 markd Exp $ -DISTNAME= kdenetwork-3.0.5a +DISTNAME= kdenetwork-3.1 CATEGORIES= net COMMENT= Network modules for the KDE integrated X11 desktop @@ -13,6 +13,12 @@ FOO_MAIN_FILES= \ ksirc/ksirc_main.cpp \ kxmlrpc/kxmlrpcd_main.cpp +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +CONFIGURE_ENV+= ac_cv_sys_file_offset_bits=no +.endif + .include "../../x11/kde3/Makefile.foo_main" .include "../../converters/uulib/buildlink2.mk" diff --git a/net/kdenetwork3/PLIST b/net/kdenetwork3/PLIST index 781989e9f2a..e2b4a0317a1 100644 --- a/net/kdenetwork3/PLIST +++ b/net/kdenetwork3/PLIST @@ -1,15 +1,18 @@ -@comment $NetBSD: PLIST,v 1.3 2003/01/20 10:03:58 skrll Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/03/11 13:13:26 markd Exp $ bin/dsirc bin/kdict +bin/kget +bin/kgpgcertmanager bin/kit bin/kmail bin/kmailcvt bin/knewstickerstub bin/knode bin/korn -bin/kotalkd bin/kppp bin/kppplogview +bin/krdc +bin/krfb bin/ksirc bin/ktalkd bin/ktalkdlg @@ -52,28 +55,32 @@ include/mimelib/text.h include/mimelib/token.h include/mimelib/utility.h include/mimelib/uuencode.h -lib/kde3/kdictapplet.la -lib/kde3/kdictapplet.so -lib/kde3/kdictapplet.so.1 -lib/kde3/kdictapplet.so.1.0 -lib/kde3/knewsticker_applet.la -lib/kde3/knewsticker_applet.so -lib/kde3/kpfapplet.la -lib/kde3/kpfapplet.so -lib/kde3/kpfpropertiesdialogplugin.la -lib/kde3/kpfpropertiesdialogplugin.so -lib/kde3/libkcm_kcmkxmlrpcd.la -lib/kde3/libkcm_kcmkxmlrpcd.so -lib/kde3/libkcm_ktalkd.la -lib/kde3/libkcm_ktalkd.so -lib/kde3/libkcm_lanbrowser.la -lib/kde3/libkcm_lanbrowser.so -lib/kde3/libkcm_newsticker.la -lib/kde3/libkcm_newsticker.so -lib/kde3/libkcm_xmlrpcd.la -lib/kde3/libkcm_xmlrpcd.so -lib/kio_lan.la -lib/kio_lan.so +lib/kde3/kcm_knewsticker.la +lib/kde3/kcm_knewsticker.so +lib/kde3/kcm_krfb.la +lib/kde3/kcm_krfb.so +lib/kde3/kcm_ktalkd.la +lib/kde3/kcm_ktalkd.so +lib/kde3/kcm_lanbrowser.la +lib/kde3/kcm_lanbrowser.so +lib/kde3/kcm_xmlrpcd.la +lib/kde3/kcm_xmlrpcd.so +lib/kde3/kded_kinetd.la +lib/kde3/kded_kinetd.so +lib/kde3/kdict_panelapplet.la +lib/kde3/kdict_panelapplet.so +lib/kde3/kfile_rfc822.la +lib/kde3/kfile_rfc822.so +lib/kde3/khtml_kget.la +lib/kde3/khtml_kget.so +lib/kde3/kio_lan.la +lib/kde3/kio_lan.so +lib/kde3/knewsticker_panelapplet.la +lib/kde3/knewsticker_panelapplet.so +lib/kde3/kpf_panelapplet.la +lib/kde3/kpf_panelapplet.so +lib/kde3/kpfpropertiesdialog.la +lib/kde3/kpfpropertiesdialog.so lib/ksirc.la lib/ksirc.so lib/kxmlrpcd.la @@ -96,6 +103,15 @@ lib/libmimelib.la lib/libmimelib.so lib/libmimelib.so.1 lib/libmimelib.so.1.1 +share/doc/kde/HTML/en/kcontrol/kcmtalkd/common +share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmtalkd/index.docbook +share/doc/kde/HTML/en/kcontrol/kxmlrpcd/common +share/doc/kde/HTML/en/kcontrol/kxmlrpcd/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kxmlrpcd/index.docbook +share/doc/kde/HTML/en/kcontrol/lanbrowser/common +share/doc/kde/HTML/en/kcontrol/lanbrowser/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/lanbrowser/index.docbook share/doc/kde/HTML/en/kdict/applet.png share/doc/kde/HTML/en/kdict/common share/doc/kde/HTML/en/kdict/conf.png @@ -103,38 +119,58 @@ share/doc/kde/HTML/en/kdict/index.cache.bz2 share/doc/kde/HTML/en/kdict/index.docbook share/doc/kde/HTML/en/kdict/mainwin.png share/doc/kde/HTML/en/kdict/seteditor.png +share/doc/kde/HTML/en/kgpgcertmanager/common +share/doc/kde/HTML/en/kgpgcertmanager/index.cache.bz2 +share/doc/kde/HTML/en/kgpgcertmanager/index.docbook share/doc/kde/HTML/en/kit/common share/doc/kde/HTML/en/kit/index.cache.bz2 share/doc/kde/HTML/en/kit/index.docbook share/doc/kde/HTML/en/kmail/common +share/doc/kde/HTML/en/kmail/configure.docbook +share/doc/kde/HTML/en/kmail/credits-and-licenses.docbook +share/doc/kde/HTML/en/kmail/faq.docbook +share/doc/kde/HTML/en/kmail/getting-started.docbook +share/doc/kde/HTML/en/kmail/importing.docbook share/doc/kde/HTML/en/kmail/index.cache.bz2 share/doc/kde/HTML/en/kmail/index.docbook +share/doc/kde/HTML/en/kmail/intro.docbook +share/doc/kde/HTML/en/kmail/menus.docbook +share/doc/kde/HTML/en/kmail/using-kmail.docbook share/doc/kde/HTML/en/knewsticker/TODO share/doc/kde/HTML/en/knewsticker/about-icon.png share/doc/kde/HTML/en/knewsticker/checknews-icon.png share/doc/kde/HTML/en/knewsticker/common share/doc/kde/HTML/en/knewsticker/contextmenu.png -share/doc/kde/HTML/en/knewsticker/downarrow-icon.png share/doc/kde/HTML/en/knewsticker/help-icon.png share/doc/kde/HTML/en/knewsticker/index.cache.bz2 share/doc/kde/HTML/en/knewsticker/index.docbook +share/doc/kde/HTML/en/knewsticker/kcmnewsticker-filters.png share/doc/kde/HTML/en/knewsticker/kcmnewsticker-general.png +share/doc/kde/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png share/doc/kde/HTML/en/knewsticker/kcmnewsticker-newssources.png +share/doc/kde/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png share/doc/kde/HTML/en/knewsticker/kcontrol-icon.png share/doc/kde/HTML/en/knewsticker/knewsticker-childpanel.png +share/doc/kde/HTML/en/knewsticker/knewsticker-icon.png share/doc/kde/HTML/en/knewsticker/knewsticker-kicker.png +share/doc/kde/HTML/en/knewsticker/knewsticker-ownwindow.png share/doc/kde/HTML/en/knewsticker/newarticle-icon.png share/doc/kde/HTML/en/knewsticker/newssite-icon.png share/doc/kde/HTML/en/knewsticker/oldarticle-icon.png share/doc/kde/HTML/en/knewsticker/preferences-icon.png -share/doc/kde/HTML/en/knewsticker/uparrow-icon.png +share/doc/kde/HTML/en/knode/commands.docbook share/doc/kde/HTML/en/knode/common +share/doc/kde/HTML/en/knode/credits.docbook share/doc/kde/HTML/en/knode/eyes.png -share/doc/kde/HTML/en/knode/german_original.docbook +share/doc/kde/HTML/en/knode/faq.docbook +share/doc/kde/HTML/en/knode/gloss.docbook share/doc/kde/HTML/en/knode/greyball.png share/doc/kde/HTML/en/knode/greyballchk.png share/doc/kde/HTML/en/knode/index.cache.bz2 share/doc/kde/HTML/en/knode/index.docbook +share/doc/kde/HTML/en/knode/install.docbook +share/doc/kde/HTML/en/knode/introduction.docbook +share/doc/kde/HTML/en/knode/journey.docbook share/doc/kde/HTML/en/knode/knode-cleanup.png share/doc/kde/HTML/en/knode/knode-colors-fonts.png share/doc/kde/HTML/en/knode/knode-composer-attachments.png @@ -157,10 +193,13 @@ share/doc/kde/HTML/en/knode/knode-search.png share/doc/kde/HTML/en/knode/knode-start.png share/doc/kde/HTML/en/knode/knode-subscribe.png share/doc/kde/HTML/en/knode/knode-views.png +share/doc/kde/HTML/en/knode/more.docbook share/doc/kde/HTML/en/knode/newsubs.png share/doc/kde/HTML/en/knode/redball.png share/doc/kde/HTML/en/knode/redballchk.png -share/doc/kde/HTML/en/knode/translation.po +share/doc/kde/HTML/en/knode/using-firststart.docbook +share/doc/kde/HTML/en/knode/using-morefeatures.docbook +share/doc/kde/HTML/en/knode/using-subscribing.docbook share/doc/kde/HTML/en/korn/common share/doc/kde/HTML/en/korn/index.cache.bz2 share/doc/kde/HTML/en/korn/index.docbook @@ -199,6 +238,9 @@ share/doc/kde/HTML/en/kppp/security.docbook share/doc/kde/HTML/en/kppp/tricks.docbook share/doc/kde/HTML/en/kppp/ttyS-cua.txt share/doc/kde/HTML/en/kppp/wizard.docbook +share/doc/kde/HTML/en/krfb/common +share/doc/kde/HTML/en/krfb/index.cache.bz2 +share/doc/kde/HTML/en/krfb/index.docbook share/doc/kde/HTML/en/ksirc/common share/doc/kde/HTML/en/ksirc/index.cache.bz2 share/doc/kde/HTML/en/ksirc/index.docbook @@ -208,49 +250,121 @@ share/doc/kde/HTML/en/ktalkd/index.docbook share/doc/kde/HTML/en/lisa/common share/doc/kde/HTML/en/lisa/index.cache.bz2 share/doc/kde/HTML/en/lisa/index.docbook +share/kde/applnk/.hidden/kcmkiolan.desktop +share/kde/applnk/.hidden/kcmlisa.desktop +share/kde/applnk/.hidden/kcmnewsticker.desktop +share/kde/applnk/.hidden/kcmreslisa.desktop share/kde/applnk/.hidden/knewstickerstub.desktop share/kde/applnk/Internet/KMail.desktop share/kde/applnk/Internet/KNode.desktop share/kde/applnk/Internet/KOrn.desktop share/kde/applnk/Internet/Kppp.desktop +share/kde/applnk/Internet/More/KOrn.desktop +share/kde/applnk/Internet/More/knewsticker-standalone.desktop +share/kde/applnk/Internet/More/kppplogview.desktop +share/kde/applnk/Internet/kget.desktop share/kde/applnk/Internet/kit.desktop share/kde/applnk/Internet/knewsticker-standalone.desktop share/kde/applnk/Internet/kppplogview.desktop +share/kde/applnk/Internet/krdc.desktop share/kde/applnk/Internet/ksirc.desktop +share/kde/applnk/Settings/Network/kcmkrfb.desktop share/kde/applnk/Settings/Network/kcmktalkd.desktop -share/kde/applnk/Settings/Network/kcmnewsticker.desktop -share/kde/applnk/Settings/Network/lanbrowser.desktop share/kde/applnk/Settings/Personalization/kcmnewsticker.desktop -share/kde/applnk/Settings/System/kcmkxmlrpcd.desktop +share/kde/applnk/System/krfb.desktop share/kde/applnk/Utilities/kdict.desktop share/kde/applnk/Utilities/kmailcvt.desktop +share/kde/apps/kconf_update/kmail-${PKGVERSION}-update-new-mail-notification-settings.pl +share/kde/apps/kconf_update/kmail-${PKGVERSION}-use-UOID-for-identities.pl share/kde/apps/kconf_update/kmail-pgpidentity.pl +share/kde/apps/kconf_update/kmail-upd-identities.pl share/kde/apps/kconf_update/kmail.upd share/kde/apps/kconf_update/knewsticker.upd share/kde/apps/kconf_update/knt-0.1-0.2.pl +share/kde/apps/kconf_update/kpgp-${PKGVERSION}-upgrade-address-data.pl share/kde/apps/kconf_update/kpgp.upd +share/kde/apps/kconf_update/upgrade-signature.pl share/kde/apps/kconf_update/upgrade-transport.pl -share/kde/apps/kdict/icons/hicolor/16x16/actions/define_clip.png -share/kde/apps/kdict/icons/hicolor/16x16/actions/query_erase.png -share/kde/apps/kdict/icons/hicolor/22x22/actions/define_clip.png -share/kde/apps/kdict/icons/hicolor/32x32/actions/define_clip.png +share/kde/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png +share/kde/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png +share/kde/apps/kdict/icons/crystalsvg/22x22/actions/define_clip.png +share/kde/apps/kdict/icons/crystalsvg/32x32/actions/define_clip.png share/kde/apps/kdict/kdictui.rc +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_clipboard.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_delay.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_delete.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_disconnect.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_dock.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_drop_target.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_expert.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_logwindow.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_normal.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_off.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_on.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_paste.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_pause.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_preferences.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_queue.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_restart.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_resume.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_shutdown.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_timer.png +share/kde/apps/kget/icons/crystalsvg/22x22/actions/tool_uselastdir.png +share/kde/apps/kget/kgetui.rc +share/kde/apps/kget/pics/bar0.png +share/kde/apps/kget/pics/bar1.png +share/kde/apps/kget/pics/bar2.png +share/kde/apps/kget/pics/bar3.png +share/kde/apps/kget/pics/bar4.png +share/kde/apps/kget/pics/bar5.png +share/kde/apps/kget/pics/bar6.png +share/kde/apps/kget/pics/connect0.png +share/kde/apps/kget/pics/connect1.png +share/kde/apps/kget/pics/connect2.png +share/kde/apps/kget/pics/connect3.png +share/kde/apps/kget/pics/connect4.png +share/kde/apps/kget/pics/connect5.png +share/kde/apps/kget/pics/connect6.png +share/kde/apps/kget/pics/connect7.png +share/kde/apps/kget/pics/dock.png +share/kde/apps/kget/pics/md_delayed.png +share/kde/apps/kget/pics/md_finished.png +share/kde/apps/kget/pics/md_queued.png +share/kde/apps/kget/pics/md_scheduled.png +share/kde/apps/kget/pics/retrying.png +share/kde/apps/kget/pics/target.png +share/kde/apps/kget/pics/try0.png +share/kde/apps/kget/pics/try1.png +share/kde/apps/kget/pics/try2.png +share/kde/apps/kget/pics/try3.png +share/kde/apps/kget/pics/try4.png +share/kde/apps/kget/pics/try5.png +share/kde/apps/kget/pics/try6.png +share/kde/apps/kget/pics/try7.png +share/kde/apps/kget/sounds/added.wav +share/kde/apps/kget/sounds/finished.wav +share/kde/apps/kget/sounds/finishedall.wav +share/kde/apps/kget/sounds/started.wav +share/kde/apps/kgpgcertmanager/kgpgcertmanagerui.rc +share/kde/apps/khtml/kpartplugins/kget_plug_in.rc share/kde/apps/kicker/applets/kdictapplet.desktop share/kde/apps/kicker/applets/knewsticker.desktop share/kde/apps/kicker/applets/kpfapplet.desktop +share/kde/apps/kinetd/eventsrc share/kde/apps/kit/eventsrc -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_anonwarning.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_away.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_bold.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_group.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_info.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_logging.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_offline.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_online.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_sound.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_status.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_timestamping.png -share/kde/apps/kit/icons/hicolor/16x16/actions/kit_warning.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_anonwarning.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_away.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_bold.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_group.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_info.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_logging.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_offline.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_online.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_sound.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_status.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_timestamping.png +share/kde/apps/kit/icons/crystalsvg/16x16/actions/kit_warning.png +share/kde/apps/kit/kitui.rc share/kde/apps/kmail/about/background.png share/kde/apps/kmail/about/bgtable.png share/kde/apps/kmail/about/kdelogo2.png @@ -261,36 +375,47 @@ share/kde/apps/kmail/about/lines2.png share/kde/apps/kmail/about/main.html share/kde/apps/kmail/about/pointers.png share/kde/apps/kmail/about/shadow1.png +share/kde/apps/kmail/eventsrc share/kde/apps/kmail/kmcomposerui.rc share/kde/apps/kmail/kmmainwin.rc -share/kde/apps/kmail/pics/abdown.png -share/kde/apps/kmail/pics/abup.png -share/kde/apps/kmail/pics/closed.png -share/kde/apps/kmail/pics/feather_white.png -share/kde/apps/kmail/pics/green-bullet.png share/kde/apps/kmail/pics/kdelogo.png +share/kde/apps/kmail/pics/key.png share/kde/apps/kmail/pics/key_bad.png share/kde/apps/kmail/pics/key_ok.png share/kde/apps/kmail/pics/key_unknown.png -share/kde/apps/kmail/pics/kmfldin.png -share/kde/apps/kmail/pics/kmfldout.png -share/kde/apps/kmail/pics/kmfldsent.png -share/kde/apps/kmail/pics/kmfolder.png -share/kde/apps/kmail/pics/kmfolderfull.png -share/kde/apps/kmail/pics/kminsorgmsg.png +share/kde/apps/kmail/pics/kmailwindowlayout1.png +share/kde/apps/kmail/pics/kmailwindowlayout1_no_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout1_smart_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout2.png +share/kde/apps/kmail/pics/kmailwindowlayout2_no_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout2_smart_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout3.png +share/kde/apps/kmail/pics/kmailwindowlayout3_no_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout3_smart_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout4.png +share/kde/apps/kmail/pics/kmailwindowlayout4_no_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout4_smart_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout5.png +share/kde/apps/kmail/pics/kmailwindowlayout5_no_mime.png +share/kde/apps/kmail/pics/kmailwindowlayout5_smart_mime.png share/kde/apps/kmail/pics/kmmsgdel.png +share/kde/apps/kmail/pics/kmmsgfiller.png share/kde/apps/kmail/pics/kmmsgflag.png share/kde/apps/kmail/pics/kmmsgforwarded.png +share/kde/apps/kmail/pics/kmmsgfullyencrypted.png +share/kde/apps/kmail/pics/kmmsgfullysigned.png share/kde/apps/kmail/pics/kmmsgnew.png share/kde/apps/kmail/pics/kmmsgold.png +share/kde/apps/kmail/pics/kmmsgpartiallyencrypted.png +share/kde/apps/kmail/pics/kmmsgpartiallysigned.png share/kde/apps/kmail/pics/kmmsgqueued.png share/kde/apps/kmail/pics/kmmsgreplied.png share/kde/apps/kmail/pics/kmmsgsent.png +share/kde/apps/kmail/pics/kmmsgundefinedencrypted.png +share/kde/apps/kmail/pics/kmmsgundefinedsigned.png share/kde/apps/kmail/pics/kmmsgunseen.png -share/kde/apps/kmail/pics/kmtrash.png share/kde/apps/kmail/pics/pgp-keys.png share/kde/apps/kmail/pics/pub_key_red.png -share/kde/apps/kmail/pics/red-bullet.png share/kde/apps/kmail/pics/stopwatch.xbm share/kde/apps/kmail/pics/stopwatchMask.xbm share/kde/apps/kmail/profile-default-rc @@ -298,6 +423,7 @@ share/kde/apps/kmail/profile-high-contrast-rc share/kde/apps/kmail/profile-html-rc share/kde/apps/kmail/profile-purist-rc share/kde/apps/kmail/profile-secure-rc +share/kde/apps/kmail/tips share/kde/apps/knewsticker/eventsrc share/kde/apps/knode/filters/1.fltr share/kde/apps/knode/filters/2.fltr @@ -309,9 +435,9 @@ share/kde/apps/knode/filters/7.fltr share/kde/apps/knode/filters/8.fltr share/kde/apps/knode/filters/filters.rc share/kde/apps/knode/headers.rc -share/kde/apps/knode/icons/hicolor/16x16/actions/message_reply.png -share/kde/apps/knode/icons/hicolor/22x22/actions/message_reply.png -share/kde/apps/knode/icons/hicolor/32x32/actions/message_reply.png +share/kde/apps/knode/icons/crystalsvg/16x16/actions/message_reply.png +share/kde/apps/knode/icons/crystalsvg/22x22/actions/message_reply.png +share/kde/apps/knode/icons/crystalsvg/32x32/actions/message_reply.png share/kde/apps/knode/kncomposerui.rc share/kde/apps/knode/knodeui.rc share/kde/apps/knode/knreaderui.rc @@ -322,6 +448,7 @@ share/kde/apps/knode/pics/greyballchk.png share/kde/apps/knode/pics/group.png share/kde/apps/knode/pics/group_big.png share/kde/apps/knode/pics/ignore.png +share/kde/apps/knode/pics/key.png share/kde/apps/knode/pics/key_bad.png share/kde/apps/knode/pics/key_ok.png share/kde/apps/knode/pics/key_unknown.png @@ -424,6 +551,7 @@ share/kde/apps/kppp/Provider/Slovenia/Volja share/kde/apps/kppp/Provider/Sweden/.directory share/kde/apps/kppp/Provider/Sweden/Tiscali share/kde/apps/kppp/Provider/Sweden/Utfors +share/kde/apps/kppp/Provider/Switzerland/Bluewin share/kde/apps/kppp/Provider/Taiwan/.directory share/kde/apps/kppp/Provider/Taiwan/EraNet share/kde/apps/kppp/Provider/Taiwan/HiNet @@ -437,13 +565,11 @@ share/kde/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666 share/kde/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666 share/kde/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666 share/kde/apps/kppp/Provider/United_Kingdom/FreeServe +share/kde/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032ISDN +share/kde/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032Modem +share/kde/apps/kppp/Provider/United_Kingdom/UKPOST%032ISDN +share/kde/apps/kppp/Provider/United_Kingdom/UKPOST%032Modem share/kde/apps/kppp/Provider/Yugoslavia/041Net -share/kde/apps/kppp/Provider/Yugoslavia/041_1xx_xxx.rst -share/kde/apps/kppp/Provider/Yugoslavia/041_2xx_xxx.rst -share/kde/apps/kppp/Provider/Yugoslavia/041_3xx_xxx.rst -share/kde/apps/kppp/Provider/Yugoslavia/041_4xx_xxx.rst -share/kde/apps/kppp/Provider/Yugoslavia/041_5xx_xxx.rst -share/kde/apps/kppp/Provider/Yugoslavia/041_9xx_xxx.rst share/kde/apps/kppp/Provider/Yugoslavia/BeoTelNet share/kde/apps/kppp/Provider/Yugoslavia/CG.Bar.yu share/kde/apps/kppp/Provider/Yugoslavia/CG.Berane.yu @@ -469,14 +595,12 @@ share/kde/apps/kppp/Provider/Yugoslavia/EUnetNoviSad share/kde/apps/kppp/Provider/Yugoslavia/EUnetPristina share/kde/apps/kppp/Provider/Yugoslavia/EUnetSombor share/kde/apps/kppp/Provider/Yugoslavia/EUnetSubotica -share/kde/apps/kppp/Provider/Yugoslavia/III_zona-preko_200km.rst -share/kde/apps/kppp/Provider/Yugoslavia/II_zona-do_200km.rst -share/kde/apps/kppp/Provider/Yugoslavia/I_zona-ista_mreza.rst share/kde/apps/kppp/Provider/Yugoslavia/InfoSKY -share/kde/apps/kppp/Provider/Yugoslavia/Lokalni_poziv.rst share/kde/apps/kppp/Provider/Yugoslavia/PTT share/kde/apps/kppp/Provider/Yugoslavia/SCnet share/kde/apps/kppp/Provider/Yugoslavia/Sezampro +share/kde/apps/kppp/Provider/Yugoslavia/SuOnline +share/kde/apps/kppp/Provider/Yugoslavia/TippNet share/kde/apps/kppp/Provider/Yugoslavia/VeratNet share/kde/apps/kppp/Provider/Yugoslavia/YUBCnet share/kde/apps/kppp/Rules/Argentina/Argentina_0610.rst @@ -507,16 +631,10 @@ share/kde/apps/kppp/Rules/Belgium/Belgium_internet_frank.rst share/kde/apps/kppp/Rules/Belgium/Belgium_interzonal.rst share/kde/apps/kppp/Rules/Belgium/Belgium_zonal.rst share/kde/apps/kppp/Rules/Brasil/Brasil.rst +share/kde/apps/kppp/Rules/Brasil/Brasil_Ligbr.rst +share/kde/apps/kppp/Rules/Brasil/Rio_de_Janeiro.rst share/kde/apps/kppp/Rules/Brasil/SaoPaulo.rst -share/kde/apps/kppp/Rules/Croatia/CARNet_lokalni_poziv.rst -share/kde/apps/kppp/Rules/Croatia/CARNet_medjugradski_poziv.rst -share/kde/apps/kppp/Rules/Croatia/hinet_anonimni_ulaz.rst -share/kde/apps/kppp/Rules/Croatia/hinet_hpt.rst -share/kde/apps/kppp/Rules/Croatia/ibm_net.rst -share/kde/apps/kppp/Rules/Croatia/iskon_lokalni_poziv.rst -share/kde/apps/kppp/Rules/Croatia/iskon_medjugradski_poziv.rst -share/kde/apps/kppp/Rules/Croatia/iskon_optimal.rst -share/kde/apps/kppp/Rules/Croatia/iskon_zagrebacka_zupanija.rst +share/kde/apps/kppp/Rules/Croatia/CARNet.rst share/kde/apps/kppp/Rules/Czechia/Tarif_INTERNET_2002_INTERNET_MAXI_PLUS.rst share/kde/apps/kppp/Rules/Czechia/Tarif_INTERNET_2002_MINI.rst share/kde/apps/kppp/Rules/Czechia/Tarif_INTERNET_2002_STANDARD_MAXI.rst @@ -532,9 +650,18 @@ share/kde/apps/kppp/Rules/Denmark/Worldonline-Analog.rst share/kde/apps/kppp/Rules/Denmark/Worldonline-ISDN.rst share/kde/apps/kppp/Rules/Estonia/Eesti_Telefon.rst share/kde/apps/kppp/Rules/Finland/Vaasan_LP.rst +share/kde/apps/kppp/Rules/France/Cegetel_Local.rst +share/kde/apps/kppp/Rules/France/Cegetel_National.rst share/kde/apps/kppp/Rules/France/France_Telecom_Local.rst share/kde/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst share/kde/apps/kppp/Rules/France/France_Telecom_National.rst +share/kde/apps/kppp/Rules/France/Le_9_Local.rst +share/kde/apps/kppp/Rules/France/Le_9_National.rst +share/kde/apps/kppp/Rules/France/OneTel.rst +share/kde/apps/kppp/Rules/France/Tele2_Local.rst +share/kde/apps/kppp/Rules/France/Tele2_National.rst +share/kde/apps/kppp/Rules/France/Wanadoo_Free.rst +share/kde/apps/kppp/Rules/Germany/1und1_InternetZugang.rst share/kde/apps/kppp/Rules/Germany/2.5min.rst share/kde/apps/kppp/Rules/Germany/2.5s.rst share/kde/apps/kppp/Rules/Germany/AddCom_by_Call.rst @@ -547,9 +674,12 @@ share/kde/apps/kppp/Rules/Germany/Callisa_City.rst share/kde/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst share/kde/apps/kppp/Rules/Germany/Cityweb.rst share/kde/apps/kppp/Rules/Germany/CompuservePro.rst +share/kde/apps/kppp/Rules/Germany/E-Plus-Online_Jedermann.rst share/kde/apps/kppp/Rules/Germany/Easynet_easy-call.rst share/kde/apps/kppp/Rules/Germany/Freenet_Enterprise.rst share/kde/apps/kppp/Rules/Germany/Freenet_Sorglos.rst +share/kde/apps/kppp/Rules/Germany/Freenet_StandardTarif.rst +share/kde/apps/kppp/Rules/Germany/Freenet_Super_CbC.rst share/kde/apps/kppp/Rules/Germany/Freenet_special_call_by_call.rst share/kde/apps/kppp/Rules/Germany/MSN.rst share/kde/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst @@ -592,27 +722,32 @@ share/kde/apps/kppp/Rules/Ireland/Eircom_National.rst share/kde/apps/kppp/Rules/Ireland/Eircom_Special.rst share/kde/apps/kppp/Rules/Israel/Bezeq_Interurban.rst share/kde/apps/kppp/Rules/Israel/Bezeq_Local.rst -share/kde/apps/kppp/Rules/Italy/Infostrada_Libero@Sogno.rst -share/kde/apps/kppp/Rules/Italy/Infostrada_Libero@Sogno_Prima_del_24.10.2000.rst -share/kde/apps/kppp/Rules/Italy/Infostrada_Locali.rst -share/kde/apps/kppp/Rules/Italy/Infostrada_Nazionali.rst -share/kde/apps/kppp/Rules/Italy/Infostrada_Regionali.rst -share/kde/apps/kppp/Rules/Italy/Infostrada_SpazioZero.rst -share/kde/apps/kppp/Rules/Italy/Infostrada_SpazioZero_Ridotta.rst -share/kde/apps/kppp/Rules/Italy/TAT_Distrettuale.rst -share/kde/apps/kppp/Rules/Italy/TAT_Formula_Urbana.rst -share/kde/apps/kppp/Rules/Italy/TAT_Interdistrettuale_0-15.rst -share/kde/apps/kppp/Rules/Italy/TAT_Interdistrettuale_15-30.rst -share/kde/apps/kppp/Rules/Italy/TAT_Interdistrettuale_30+.rst -share/kde/apps/kppp/Rules/Italy/TAT_Urbana.rst -share/kde/apps/kppp/Rules/Italy/Tele2_Urbana.rst -share/kde/apps/kppp/Rules/Italy/Teleconomy_24.rst -share/kde/apps/kppp/Rules/Italy/Teleconomy_24_Ridotta.rst -share/kde/apps/kppp/Rules/Italy/Teleconomy_No_Stop.rst -share/kde/apps/kppp/Rules/Italy/Wind_Internet_Light_1088.rst -share/kde/apps/kppp/Rules/Italy/Wind_Internet_Light_1088_24ore.rst -share/kde/apps/kppp/Rules/Italy/Wind_Regionale_1088_Light.rst -share/kde/apps/kppp/Rules/Italy/Wind_Urbana.rst +share/kde/apps/kppp/Rules/Italy/Infostrada_Internet_SpZero.rst +share/kde/apps/kppp/Rules/Italy/Infostrada_Libero1055_Base.rst +share/kde/apps/kppp/Rules/Italy/Infostrada_Libero1055_SpZero.rst +share/kde/apps/kppp/Rules/Italy/Infostrada_Loc_Reg_Naz_SpZero.rst +share/kde/apps/kppp/Rules/Italy/Infostrada_Locali_Base.rst +share/kde/apps/kppp/Rules/Italy/Infostrada_Reg_Naz_Base.rst +share/kde/apps/kppp/Rules/Italy/Tele2_Interurbane.rst +share/kde/apps/kppp/Rules/Italy/Tele2_Urbane.rst +share/kde/apps/kppp/Rules/Italy/Telecom_Interurbane_Fino15Km.rst +share/kde/apps/kppp/Rules/Italy/Telecom_Interurbane_Oltre15Km.rst +share/kde/apps/kppp/Rules/Italy/Telecom_Locali.rst +share/kde/apps/kppp/Rules/Italy/Teleconomy24_Internet.rst +share/kde/apps/kppp/Rules/Italy/Teleconomy24_Nazionali.rst +share/kde/apps/kppp/Rules/Italy/Teleconomy_NoStop_Internet.rst +share/kde/apps/kppp/Rules/Italy/Wind_24ore_Internet_AltriISP.rst +share/kde/apps/kppp/Rules/Italy/Wind_24ore_Internet_InWind.rst +share/kde/apps/kppp/Rules/Italy/Wind_24ore_Interurbane.rst +share/kde/apps/kppp/Rules/Italy/Wind_24ore_Urbane.rst +share/kde/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Internet_InWind.rst +share/kde/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Urbane_Interurbane.rst +share/kde/apps/kppp/Rules/Italy/Wind_Family_Internet_AltriISP.rst +share/kde/apps/kppp/Rules/Italy/Wind_Family_Internet_InWind.rst +share/kde/apps/kppp/Rules/Italy/Wind_Family_Interurbane.rst +share/kde/apps/kppp/Rules/Italy/Wind_Family_Urbane.rst +share/kde/apps/kppp/Rules/Italy/Wind_Flat_Internet_AltriISP.rst +share/kde/apps/kppp/Rules/Italy/Wind_Flat_Internet_InWind.rst share/kde/apps/kppp/Rules/Italy/Wind_Urbana_1088_Light.rst share/kde/apps/kppp/Rules/Jamaica/CWJ_InterParish.rst share/kde/apps/kppp/Rules/Jamaica/CWJ_Local.rst @@ -626,15 +761,15 @@ share/kde/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst share/kde/apps/kppp/Rules/Malaysia/malaysia.rst share/kde/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst share/kde/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst -share/kde/apps/kppp/Rules/Netherlands/BelBasis_Lokaal.rst +share/kde/apps/kppp/Rules/Netherlands/BelBasis_Regio.rst share/kde/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst share/kde/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst share/kde/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst share/kde/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst share/kde/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst share/kde/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst -share/kde/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst -share/kde/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst +share/kde/apps/kppp/Rules/Netherlands/Priority_Telecom_Nationaal.rst +share/kde/apps/kppp/Rules/Netherlands/Priority_Telecom_Regionaal.rst share/kde/apps/kppp/Rules/Norway/Local_Area.rst share/kde/apps/kppp/Rules/Norway/Long_Distance.rst share/kde/apps/kppp/Rules/Norway/Netcom.rst @@ -652,9 +787,8 @@ share/kde/apps/kppp/Rules/Portugal/PT_Regional.rst share/kde/apps/kppp/Rules/Portugal/PT_Regional_Ilhas.rst share/kde/apps/kppp/Rules/Portugal/PT_YesNET.rst share/kde/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst -share/kde/apps/kppp/Rules/Romania/RomTelecom_GSM.rst -share/kde/apps/kppp/Rules/Romania/RomTelecom_Interurban.rst -share/kde/apps/kppp/Rules/Romania/RomTelecom_Local.rst +share/kde/apps/kppp/Rules/Romania/RomTelecom.rst +share/kde/apps/kppp/Rules/Romania/Zapp-Mobile.rst share/kde/apps/kppp/Rules/Russia/TEMPLATE.ru share/kde/apps/kppp/Rules/Russia/mtu-intel_standart.rst share/kde/apps/kppp/Rules/Singapore/SingTel_Local.rst @@ -725,6 +859,16 @@ share/kde/apps/kppp/Rules/United_Kingdom/BritishTelecom_Regional.rst share/kde/apps/kppp/Rules/United_Kingdom/British_OneTel.rst share/kde/apps/kppp/Rules/United_Kingdom/Connaught_Telecom.rst share/kde/apps/kppp/Rules/Uruguay/Adinet_cIVA.rst +share/kde/apps/kppp/Rules/Yugoslavia/041_1xx_xxx.rst +share/kde/apps/kppp/Rules/Yugoslavia/041_2xx_xxx.rst +share/kde/apps/kppp/Rules/Yugoslavia/041_3xx_xxx.rst +share/kde/apps/kppp/Rules/Yugoslavia/041_4xx_xxx.rst +share/kde/apps/kppp/Rules/Yugoslavia/041_5xx_xxx.rst +share/kde/apps/kppp/Rules/Yugoslavia/041_9xx_xxx.rst +share/kde/apps/kppp/Rules/Yugoslavia/III_zona-preko_200km.rst +share/kde/apps/kppp/Rules/Yugoslavia/II_zona-do_200km.rst +share/kde/apps/kppp/Rules/Yugoslavia/I_zona-ista_mreza.rst +share/kde/apps/kppp/Rules/Yugoslavia/Lokalni_poziv.rst share/kde/apps/kppp/Rules/checkrules share/kde/apps/kppp/pics/dock_both.png share/kde/apps/kppp/pics/dock_left.png @@ -736,6 +880,15 @@ share/kde/apps/kppp/pics/modemleft.png share/kde/apps/kppp/pics/modemnone.png share/kde/apps/kppp/pics/modemright.png share/kde/apps/kppp/pics/phone.png +share/kde/apps/krdc/pics/pindown.png +share/kde/apps/krdc/pics/pinup.png +share/kde/apps/krdc/pics/pointcursor.png +share/kde/apps/krdc/pics/pointcursormask.png +share/kde/apps/krfb/eventsrc +share/kde/apps/krfb/pics/connection-side-image.png +share/kde/apps/krfb/pics/eyes-closed24.png +share/kde/apps/krfb/pics/eyes-open24.png +share/kde/apps/ksirc/eventsrc share/kde/apps/ksirc/filters.pl share/kde/apps/ksirc/ksirc.pl share/kde/apps/ksirc/pics/arrow.png @@ -780,61 +933,94 @@ share/kde/apps/ksirc/sirc.help.gz share/kde/apps/lisa/README share/kde/config/ksircrc share/kde/config/ktalkdrc -share/kde/icons/hicolor/16x16/apps/kdict.png -share/kde/icons/hicolor/16x16/apps/kit.png -share/kde/icons/hicolor/16x16/apps/kmail.png -share/kde/icons/hicolor/16x16/apps/kmailcvt.png -share/kde/icons/hicolor/16x16/apps/knewsticker.png -share/kde/icons/hicolor/16x16/apps/knode.png -share/kde/icons/hicolor/16x16/apps/korn.png -share/kde/icons/hicolor/16x16/apps/kpf.png -share/kde/icons/hicolor/16x16/apps/kppp.png -share/kde/icons/hicolor/16x16/apps/ksirc.png -share/kde/icons/hicolor/16x16/apps/ktalkd.png -share/kde/icons/hicolor/32x32/apps/kdict.png -share/kde/icons/hicolor/32x32/apps/kit.png -share/kde/icons/hicolor/32x32/apps/kmail.png -share/kde/icons/hicolor/32x32/apps/kmailcvt.png -share/kde/icons/hicolor/32x32/apps/knewsticker.png -share/kde/icons/hicolor/32x32/apps/knode.png -share/kde/icons/hicolor/32x32/apps/korn.png -share/kde/icons/hicolor/32x32/apps/kpf.png -share/kde/icons/hicolor/32x32/apps/kppp.png -share/kde/icons/hicolor/32x32/apps/ksirc.png -share/kde/icons/hicolor/32x32/apps/ktalkd.png -share/kde/icons/hicolor/48x48/apps/kdict.png -share/kde/icons/hicolor/48x48/apps/kit.png -share/kde/icons/hicolor/48x48/apps/kmail.png -share/kde/icons/hicolor/48x48/apps/kmailcvt.png -share/kde/icons/hicolor/48x48/apps/knewsticker.png -share/kde/icons/hicolor/48x48/apps/knode.png -share/kde/icons/hicolor/48x48/apps/korn.png -share/kde/icons/hicolor/48x48/apps/kpf.png -share/kde/icons/hicolor/48x48/apps/kppp.png -share/kde/icons/hicolor/48x48/apps/ksirc.png -share/kde/icons/hicolor/48x48/apps/ktalkd.png +share/kde/icons/crystalsvg/128x128/apps/kdict.png +share/kde/icons/crystalsvg/128x128/apps/kmail.png +share/kde/icons/crystalsvg/128x128/apps/kppp.png +share/kde/icons/crystalsvg/16x16/apps/kdict.png +share/kde/icons/crystalsvg/16x16/apps/kit.png +share/kde/icons/crystalsvg/16x16/apps/kmail.png +share/kde/icons/crystalsvg/16x16/apps/kmailcvt.png +share/kde/icons/crystalsvg/16x16/apps/knewsticker.png +share/kde/icons/crystalsvg/16x16/apps/knode.png +share/kde/icons/crystalsvg/16x16/apps/korn.png +share/kde/icons/crystalsvg/16x16/apps/kpf.png +share/kde/icons/crystalsvg/16x16/apps/kppp.png +share/kde/icons/crystalsvg/16x16/apps/ksirc.png +share/kde/icons/crystalsvg/16x16/apps/ktalkd.png +share/kde/icons/crystalsvg/22x22/actions/khtml_kget.png +share/kde/icons/crystalsvg/32x32/apps/kdict.png +share/kde/icons/crystalsvg/32x32/apps/kit.png +share/kde/icons/crystalsvg/32x32/apps/kmail.png +share/kde/icons/crystalsvg/32x32/apps/kmailcvt.png +share/kde/icons/crystalsvg/32x32/apps/knewsticker.png +share/kde/icons/crystalsvg/32x32/apps/knode.png +share/kde/icons/crystalsvg/32x32/apps/korn.png +share/kde/icons/crystalsvg/32x32/apps/kpf.png +share/kde/icons/crystalsvg/32x32/apps/kppp.png +share/kde/icons/crystalsvg/32x32/apps/krdc.png +share/kde/icons/crystalsvg/32x32/apps/krfb.png +share/kde/icons/crystalsvg/32x32/apps/ksirc.png +share/kde/icons/crystalsvg/32x32/apps/ktalkd.png +share/kde/icons/crystalsvg/48x48/apps/kdict.png +share/kde/icons/crystalsvg/48x48/apps/kget.png +share/kde/icons/crystalsvg/48x48/apps/kit.png +share/kde/icons/crystalsvg/48x48/apps/kmail.png +share/kde/icons/crystalsvg/48x48/apps/kmailcvt.png +share/kde/icons/crystalsvg/48x48/apps/knewsticker.png +share/kde/icons/crystalsvg/48x48/apps/knode.png +share/kde/icons/crystalsvg/48x48/apps/korn.png +share/kde/icons/crystalsvg/48x48/apps/kpf.png +share/kde/icons/crystalsvg/48x48/apps/kppp.png +share/kde/icons/crystalsvg/48x48/apps/krdc.png +share/kde/icons/crystalsvg/48x48/apps/krfb.png +share/kde/icons/crystalsvg/48x48/apps/ksirc.png +share/kde/icons/crystalsvg/48x48/apps/ktalkd.png +share/kde/icons/crystalsvg/48x48/mimetypes/kget_list.png +share/kde/icons/crystalsvg/64x64/apps/kdict.png +share/kde/icons/crystalsvg/64x64/apps/kmail.png +share/kde/icons/crystalsvg/64x64/apps/kppp.png +share/kde/icons/locolor/16x16/apps/krfb.png share/kde/icons/locolor/16x16/apps/ksirc.png +share/kde/icons/locolor/32x32/apps/krfb.png share/kde/icons/locolor/32x32/apps/ksirc.png +share/kde/mimelnk/application/x-kgetlist.desktop +share/kde/services/kded/kinetd.desktop +share/kde/services/kfile_rfc822.desktop +share/kde/services/kinetd_krfb.desktop share/kde/services/knewsservice.protocol share/kde/services/kntsrcfilepropsdlg.desktop share/kde/services/kpfpropertiesdialogplugin.desktop share/kde/services/kxmlrpcd.desktop share/kde/services/lan.protocol share/kde/services/rlan.protocol +share/kde/services/vnc.protocol +share/kde/servicetypes/kinetdmodule.desktop share/kde/sounds/ktalkd.wav @comment dirrm share/kde/sounds +@comment dirrm share/kde/servicetypes +@comment dirrm share/kde/services/kded @comment dirrm share/kde/services +@comment dirrm share/kde/mimelnk/application @comment dirrm share/kde/icons/locolor/32x32/apps @comment dirrm share/kde/icons/locolor/16x16/apps -@comment dirrm share/kde/icons/hicolor/48x48/apps -@comment dirrm share/kde/icons/hicolor/32x32/apps -@comment dirrm share/kde/icons/hicolor/16x16/apps +@comment dirrm share/kde/icons/crystalsvg/64x64/apps +@comment dirrm share/kde/icons/crystalsvg/48x48/mimetypes +@comment dirrm share/kde/icons/crystalsvg/48x48/apps +@comment dirrm share/kde/icons/crystalsvg/32x32/apps +@comment dirrm share/kde/icons/crystalsvg/22x22/actions +@comment dirrm share/kde/icons/crystalsvg/16x16/apps +@comment dirrm share/kde/icons/crystalsvg/128x128/apps @comment dirrm share/kde/config @dirrm share/kde/apps/lisa @dirrm share/kde/apps/ksirc/pics/emoticons @dirrm share/kde/apps/ksirc/pics @dirrm share/kde/apps/ksirc +@dirrm share/kde/apps/krfb/pics +@dirrm share/kde/apps/krfb +@dirrm share/kde/apps/krdc/pics +@dirrm share/kde/apps/krdc @dirrm share/kde/apps/kppp/pics +@dirrm share/kde/apps/kppp/Rules/Yugoslavia @dirrm share/kde/apps/kppp/Rules/Uruguay @dirrm share/kde/apps/kppp/Rules/United_Kingdom @dirrm share/kde/apps/kppp/Rules/Ukraine @@ -889,6 +1075,7 @@ share/kde/sounds/ktalkd.wav @dirrm share/kde/apps/kppp/Provider/United_Kingdom @dirrm share/kde/apps/kppp/Provider/Ukraine @dirrm share/kde/apps/kppp/Provider/Taiwan +@dirrm share/kde/apps/kppp/Provider/Switzerland @dirrm share/kde/apps/kppp/Provider/Sweden @dirrm share/kde/apps/kppp/Provider/Slovenia @dirrm share/kde/apps/kppp/Provider/Portugal @@ -903,15 +1090,15 @@ share/kde/sounds/ktalkd.wav @dirrm share/kde/apps/kppp @dirrm share/kde/apps/konqueror/dirtree/remote @dirrm share/kde/apps/konqueror/dirtree -@comment dirrm share/kde/apps/konqueror +@dirrm share/kde/apps/konqueror @dirrm share/kde/apps/knode/pics -@dirrm share/kde/apps/knode/icons/hicolor/32x32/actions -@dirrm share/kde/apps/knode/icons/hicolor/32x32 -@dirrm share/kde/apps/knode/icons/hicolor/22x22/actions -@dirrm share/kde/apps/knode/icons/hicolor/22x22 -@dirrm share/kde/apps/knode/icons/hicolor/16x16/actions -@dirrm share/kde/apps/knode/icons/hicolor/16x16 -@dirrm share/kde/apps/knode/icons/hicolor +@dirrm share/kde/apps/knode/icons/crystalsvg/32x32/actions +@dirrm share/kde/apps/knode/icons/crystalsvg/32x32 +@dirrm share/kde/apps/knode/icons/crystalsvg/22x22/actions +@dirrm share/kde/apps/knode/icons/crystalsvg/22x22 +@dirrm share/kde/apps/knode/icons/crystalsvg/16x16/actions +@dirrm share/kde/apps/knode/icons/crystalsvg/16x16 +@dirrm share/kde/apps/knode/icons/crystalsvg @dirrm share/kde/apps/knode/icons @dirrm share/kde/apps/knode/filters @dirrm share/kde/apps/knode @@ -919,32 +1106,44 @@ share/kde/sounds/ktalkd.wav @dirrm share/kde/apps/kmail/pics @dirrm share/kde/apps/kmail/about @dirrm share/kde/apps/kmail -@dirrm share/kde/apps/kit/icons/hicolor/16x16/actions -@dirrm share/kde/apps/kit/icons/hicolor/16x16 -@dirrm share/kde/apps/kit/icons/hicolor +@dirrm share/kde/apps/kit/icons/crystalsvg/16x16/actions +@dirrm share/kde/apps/kit/icons/crystalsvg/16x16 +@dirrm share/kde/apps/kit/icons/crystalsvg @dirrm share/kde/apps/kit/icons @dirrm share/kde/apps/kit +@dirrm share/kde/apps/kinetd @comment dirrm share/kde/apps/kicker/applets -@dirrm share/kde/apps/kdict/icons/hicolor/32x32/actions -@dirrm share/kde/apps/kdict/icons/hicolor/32x32 -@dirrm share/kde/apps/kdict/icons/hicolor/22x22/actions -@dirrm share/kde/apps/kdict/icons/hicolor/22x22 -@dirrm share/kde/apps/kdict/icons/hicolor/16x16/actions -@dirrm share/kde/apps/kdict/icons/hicolor/16x16 -@dirrm share/kde/apps/kdict/icons/hicolor +@comment dirrm share/kde/apps/khtml/kpartplugins +@dirrm share/kde/apps/kgpgcertmanager +@dirrm share/kde/apps/kget/sounds +@dirrm share/kde/apps/kget/pics +@dirrm share/kde/apps/kget/icons/crystalsvg/22x22/actions +@dirrm share/kde/apps/kget/icons/crystalsvg/22x22 +@dirrm share/kde/apps/kget/icons/crystalsvg +@dirrm share/kde/apps/kget/icons +@dirrm share/kde/apps/kget +@dirrm share/kde/apps/kdict/icons/crystalsvg/32x32/actions +@dirrm share/kde/apps/kdict/icons/crystalsvg/32x32 +@dirrm share/kde/apps/kdict/icons/crystalsvg/22x22/actions +@dirrm share/kde/apps/kdict/icons/crystalsvg/22x22 +@dirrm share/kde/apps/kdict/icons/crystalsvg/16x16/actions +@dirrm share/kde/apps/kdict/icons/crystalsvg/16x16 +@dirrm share/kde/apps/kdict/icons/crystalsvg @dirrm share/kde/apps/kdict/icons @dirrm share/kde/apps/kdict -@comment dirrm share/kde/apps/kconf_update +@dirrm share/kde/apps/kconf_update @comment dirrm share/kde/apps @comment dirrm share/kde/applnk/Utilities -@comment dirrm share/kde/applnk/Settings/System +@comment dirrm share/kde/applnk/System @comment dirrm share/kde/applnk/Settings/Personalization @comment dirrm share/kde/applnk/Settings/Network +@comment dirrm share/kde/applnk/Internet/More @comment dirrm share/kde/applnk/Internet @comment dirrm share/kde/applnk/.hidden @dirrm share/doc/kde/HTML/en/lisa @dirrm share/doc/kde/HTML/en/ktalkd @dirrm share/doc/kde/HTML/en/ksirc +@dirrm share/doc/kde/HTML/en/krfb @dirrm share/doc/kde/HTML/en/kppp @dirrm share/doc/kde/HTML/en/kpf @dirrm share/doc/kde/HTML/en/korn @@ -952,7 +1151,11 @@ share/kde/sounds/ktalkd.wav @dirrm share/doc/kde/HTML/en/knewsticker @dirrm share/doc/kde/HTML/en/kmail @dirrm share/doc/kde/HTML/en/kit +@dirrm share/doc/kde/HTML/en/kgpgcertmanager @dirrm share/doc/kde/HTML/en/kdict +@dirrm share/doc/kde/HTML/en/kcontrol/lanbrowser +@dirrm share/doc/kde/HTML/en/kcontrol/kxmlrpcd +@dirrm share/doc/kde/HTML/en/kcontrol/kcmtalkd +@dirrm share/doc/kde/HTML/en/kcontrol @comment dirrm share/doc/kde/HTML/en -@comment dirrm lib/kde3 @dirrm include/mimelib diff --git a/net/kdenetwork3/buildlink2.mk b/net/kdenetwork3/buildlink2.mk index eaf341fac2b..4595beea78c 100644 --- a/net/kdenetwork3/buildlink2.mk +++ b/net/kdenetwork3/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1 2003/01/09 11:21:43 uebayasi Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2003/03/11 13:13:27 markd Exp $ # # This Makefile fragment is included by packages that use kdenetwork. # @@ -9,7 +9,7 @@ KDENETWORK_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= kdenetwork -BUILDLINK_DEPENDS.kdenetwork?= kdenetwork>=3.0.5.1 +BUILDLINK_DEPENDS.kdenetwork?= kdenetwork>=3.1 BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork3 EVAL_PREFIX+= BUILDLINK_PREFIX.kdenetwork=kdenetwork diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 09e9dcf62fc..ebc9b0ca42d 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.10 2003/02/26 10:46:12 dmcmahill Exp $ +$NetBSD: distinfo,v 1.11 2003/03/11 13:13:27 markd Exp $ -SHA1 (kdenetwork-3.0.5a.tar.bz2) = 325800806aa027073b7f0523140ade65e86614f1 -Size (kdenetwork-3.0.5a.tar.bz2) = 3863844 bytes -SHA1 (patch-aa) = 287271ca343a5b47d7740ba4ea19eb84d60ca23d +SHA1 (kdenetwork-3.1.tar.bz2) = 35ce01f47203cc43c08756de3ce3f77ae2402bad +Size (kdenetwork-3.1.tar.bz2) = 4962256 bytes +SHA1 (patch-aa) = adbcc98afa079a4f282416e8723c7ebfbc26bcfe SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855 SHA1 (patch-ad) = 916bcbe11ca71f7a0f5f03c91fa18a6af9197be2 -SHA1 (patch-ae) = f223a5e3923d6d45866ea89119bacba5fd107eb9 -SHA1 (patch-af) = ff30acf2b2300464fcfeafdd2f438cf75cdc3ca7 +SHA1 (patch-ae) = 8b58afa071bd3f47577e5aeb46210ae77690b8bb +SHA1 (patch-af) = e17a91edb5c74de34098595a249fb9fd580a4e1b SHA1 (patch-ag) = 41838a86a06877deb2635470a79aeb104cd56474 -SHA1 (patch-ai) = e4c5fa35a4731300d75067b7eebb6f0969775db6 -SHA1 (patch-aj) = 54cbd3edb6dfeea4576ba5d484d348e5981273a4 +SHA1 (patch-ai) = 90a97f8354c477ddb1d4600e715520adde329417 +SHA1 (patch-aj) = c7ff50863e5b69cb62b36a0305886db7f2bc4279 SHA1 (patch-al) = 13c6bfb20fc49ae22d30029044808c9b77747754 -SHA1 (patch-am) = ea75731f5c51c7a4868f4e63e3b97b9a78d6d80c +SHA1 (patch-am) = 6c698e49cb342b619df7c05ff6b54049af67a0aa diff --git a/net/kdenetwork3/patches/patch-aa b/net/kdenetwork3/patches/patch-aa index e0c09c6d07c..f4fdd54764b 100644 --- a/net/kdenetwork3/patches/patch-aa +++ b/net/kdenetwork3/patches/patch-aa @@ -1,32 +1,28 @@ -$NetBSD: patch-aa,v 1.4 2003/02/26 10:46:13 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.5 2003/03/11 13:13:28 markd Exp $ ---- configure.orig Tue Dec 17 05:49:48 2002 +--- configure.orig Fri Jan 17 08:54:59 2003 +++ configure -@@ -22535,7 +22535,7 @@ main () +@@ -27870,65 +27870,6 @@ _ACEOF - char buf[20]; - buf[0]='\0'; -- strlat(buf, "KDE function test", sizeof(buf)); -+ strlcat(buf, "KDE function test", sizeof(buf)); - ; - return 0; -@@ -23147,57 +23147,6 @@ echo "${ECHO_T}$ac_cv_sizeof_unsigned_in - cat >>confdefs.h <<EOF - #define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int - EOF -- -- echo "$as_me:23151: checking sizeof(size_t) == sizeof(unsigned int)" >&5 --echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned int)... $ECHO_C" >&6 + +- echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5 +-echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 23154 "configure" +-#line $LINENO "configure" -#include "confdefs.h" - +-#ifdef F77_DUMMY_MAIN +-# ifdef __cplusplus +- extern "C" +-# endif +- int F77_DUMMY_MAIN() { return 1; } +-#endif -int -main () -{ - -- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT +- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG - choke me - #endif - @@ -35,37 +31,40 @@ $NetBSD: patch-aa,v 1.4 2003/02/26 10:46:13 dmcmahill Exp $ -} -_ACEOF -rm -f conftest.$ac_objext --if { (eval echo "$as_me:23170: \"$ac_compile\"") >&5 +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:23173: \$? = $ac_status" >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:23176: \"$ac_try\"") >&5 +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:23179: \$? = $ac_status" >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:23181: result: yes" >&5 +- echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - -- echo "$as_me:23187: result: no" >&5 +- echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -- { { echo "$as_me:23189: error: -- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned int) +- { { echo "$as_me:$LINENO: error: +- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long) - does not apply. Please mail kde-devel@kde.org with a description of your system! - " >&5 -echo "$as_me: error: -- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned int) +- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long) - does not apply. Please mail kde-devel@kde.org with a description of your system! - " >&2;} - { (exit 1); exit 1; }; } - -fi -rm -f conftest.$ac_objext conftest.$ac_ext +- +- +- - if test -z "$LIBPTHREAD" && test -z "$USE_THREADS"; then - DO_NOT_COMPILE="$DO_NOT_COMPILE knode kdict" + if test -z "$LIBPTHREAD"; then + if test -z "$USE_THREADS"; then diff --git a/net/kdenetwork3/patches/patch-ae b/net/kdenetwork3/patches/patch-ae index e70cc8a013c..b6f2b5d7ff8 100644 --- a/net/kdenetwork3/patches/patch-ae +++ b/net/kdenetwork3/patches/patch-ae @@ -1,9 +1,9 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:59:28 skrll Exp $ +$NetBSD: patch-ae,v 1.2 2003/03/11 13:13:28 markd Exp $ ---- ksirc/Makefile.am.orig Tue Feb 26 22:20:22 2002 +--- ksirc/Makefile.am.orig Tue Nov 5 05:02:30 2002 +++ ksirc/Makefile.am -@@ -17,13 +17,13 @@ - testview_LDADD = $(LIB_KDEUI) +@@ -17,13 +17,13 @@ testview_SOURCES = kstextviewtest.cpp + testview_LDADD = kstextview.lo $(LIB_KDEUI) testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lib_LTLIBRARIES = ksirc.la @@ -18,17 +18,20 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:59:28 skrll Exp $ toplevel.cpp \ charSelector.cpp \ chanButtons.cpp \ -@@ -57,6 +57,9 @@ +@@ -57,8 +57,11 @@ ksirc_la_SOURCES = \ colorpicker.cpp # the library search path +libksirc_main_la_LDFLAGS = $(all_libraries) ++libksirc_main_la_COMPILE_FIRST = cdate.h + +ksirc_la_SOURCES = ksirc_main.cpp ksirc_la_LDFLAGS = $(all_libraries) -module -avoid-version +-ksirc_la_COMPILE_FIRST = cdate.h all_ksirc_libraries = \ -@@ -67,10 +70,10 @@ + ./KSPrefs/libksprefs.la \ +@@ -68,10 +71,10 @@ all_ksirc_libraries = \ # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. @@ -42,7 +45,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:59:28 skrll Exp $ ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdoc: -@@ -135,6 +138,3 @@ +@@ -134,6 +137,3 @@ miscdir = $(kde_datadir)/ksirc conf_DATA = ksircrc confdir = $(kde_confdir) diff --git a/net/kdenetwork3/patches/patch-af b/net/kdenetwork3/patches/patch-af index 7240fec2bcf..b706aaaba91 100644 --- a/net/kdenetwork3/patches/patch-af +++ b/net/kdenetwork3/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ +$NetBSD: patch-af,v 1.4 2003/03/11 13:13:28 markd Exp $ ---- ksirc/Makefile.in.orig Sat Dec 28 08:53:51 2002 +--- ksirc/Makefile.in.orig Fri Jan 17 08:54:53 2003 +++ ksirc/Makefile.in -@@ -244,13 +244,13 @@ testview_SOURCES = kstextview.cpp kstext - testview_LDADD = $(LIB_KDEUI) +@@ -266,13 +266,13 @@ testview_SOURCES = kstextviewtest.cpp + testview_LDADD = kstextview.lo $(LIB_KDEUI) testview_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lib_LTLIBRARIES = ksirc.la @@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ #>- toplevel.cpp \ #>- charSelector.cpp \ #>- chanButtons.cpp \ -@@ -283,7 +283,7 @@ noinst_PROGRAMS = getdate +@@ -305,7 +305,7 @@ noinst_PROGRAMS = getdate #>- kstextview.cpp \ #>- colorpicker.cpp #>+ 32 @@ -27,17 +27,20 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ toplevel.cpp \ charSelector.cpp \ chanButtons.cpp \ -@@ -318,6 +318,9 @@ ksirc_la_SOURCES=\ +@@ -340,8 +340,11 @@ ksirc_la_SOURCES=\ # the library search path +libksirc_main_la_LDFLAGS = $(all_libraries) ++libksirc_main_la_COMPILE_FIRST = cdate.h + +ksirc_la_SOURCES = ksirc_main.cpp ksirc_la_LDFLAGS = $(all_libraries) -module -avoid-version +-ksirc_la_COMPILE_FIRST = cdate.h all_ksirc_libraries = \ -@@ -329,10 +332,10 @@ all_ksirc_libraries = \ + ./KSPrefs/libksprefs.la \ +@@ -352,10 +355,10 @@ all_ksirc_libraries = \ # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. @@ -51,7 +54,7 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH) getdate_SOURCES = getdate.c -@@ -391,9 +394,14 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -414,9 +417,14 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -68,7 +71,7 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \ NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \ ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \ -@@ -402,10 +410,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe +@@ -425,10 +433,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \ displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \ logfile.lo kstextview.lo colorpicker.lo @@ -82,10 +85,10 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \ NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \ ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \ -@@ -414,8 +422,8 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c +@@ -437,8 +445,8 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \ displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \ - logfile.lo kstextview.lo colorpicker.lo FilterRuleEditorData.lo + logfile.lo kstextview.lo colorpicker.lo FilterRuleWidget.lo -@KDE_USE_FINAL_FALSE@ksirc_la_OBJECTS = $(ksirc_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@ksirc_la_OBJECTS = $(ksirc_la_final_OBJECTS) +@KDE_USE_FINAL_FALSE@libksirc_main_la_OBJECTS = $(libksirc_main_la_nofinal_OBJECTS) @@ -93,7 +96,7 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ bin_PROGRAMS = ksirc$(EXEEXT) check_PROGRAMS = testview$(EXEEXT) noinst_PROGRAMS = getdate$(EXEEXT) -@@ -428,11 +436,11 @@ getdate_OBJECTS = getdate.$(OBJEXT) +@@ -451,11 +459,11 @@ getdate_OBJECTS = getdate.$(OBJEXT) getdate_LDADD = $(LDADD) getdate_DEPENDENCIES = getdate_LDFLAGS = @@ -105,99 +108,66 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ -ksirc_DEPENDENCIES = ksirc.la +ksirc_OBJECTS = ksirc_main.$(OBJEXT) +ksirc_DEPENDENCIES = libksirc_main.la - am_testview_OBJECTS = kstextview.$(OBJEXT) kstextviewtest.$(OBJEXT) + am_testview_OBJECTS = kstextviewtest.$(OBJEXT) #>- testview_OBJECTS = $(am_testview_OBJECTS) - #>+ 4 -@@ -458,15 +466,16 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - #>- @AMDEP_TRUE@ $(DEPDIR)/colorpicker.Plo $(DEPDIR)/dccDialog.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/dccDialogData.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/displayMgrMDI.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ $(DEPDIR)/getdate.Po $(DEPDIR)/ioBroadcast.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/ioDCC.Plo $(DEPDIR)/ioDiscard.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/ioLAG.Plo $(DEPDIR)/ioNotify.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/iocontroller.Plo $(DEPDIR)/ksirc.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/ksircprocess.Plo $(DEPDIR)/ksopts.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kstextview.Plo $(DEPDIR)/kstextview.Po \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kstextviewtest.Po $(DEPDIR)/ksview.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/logfile.Plo $(DEPDIR)/mditoplevel.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/getdate.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/ioBroadcast.Plo $(DEPDIR)/ioDCC.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/ioDiscard.Plo $(DEPDIR)/ioLAG.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/ioNotify.Plo $(DEPDIR)/iocontroller.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/ksirc.Plo $(DEPDIR)/ksirc_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/ksirc_main.Po $(DEPDIR)/ksircprocess.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/ksopts.Plo $(DEPDIR)/kstextview.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kstextview.Po $(DEPDIR)/kstextviewtest.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/ksview.Plo $(DEPDIR)/logfile.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/mditoplevel.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/messageReceiver.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/objFinder.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/servercontroller.Plo \ -@@ -474,8 +483,8 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - #>- @AMDEP_TRUE@ $(DEPDIR)/ssfepromptdata.Plo $(DEPDIR)/topic.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/usercontrolmenu.Plo --#>+ 49 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/FilterRuleEditorData.P $(DEPDIR)/ksirc_la.all_cpp.P $(DEPDIR)/testview.all_cpp.P $(DEPDIR)/FilterRuleEditor.Plo \ -+#>+ 51 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/FilterRuleEditorData.P $(DEPDIR)/libksirc_main_la.all_cpp.P $(DEPDIR)/testview.all_cpp.P $(DEPDIR)/FilterRuleEditor.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/NewWindowDialog.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ahistlineedit.Plo $(DEPDIR)/alistbox.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/baserules.Plo $(DEPDIR)/chanButtons.Plo \ -@@ -483,15 +492,16 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/colorpicker.Plo $(DEPDIR)/dccDialog.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dccDialogData.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrMDI.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/getdate.Po $(DEPDIR)/ioBroadcast.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioDCC.Plo $(DEPDIR)/ioDiscard.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioLAG.Plo $(DEPDIR)/ioNotify.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/iocontroller.Plo $(DEPDIR)/ksirc.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksircprocess.Plo $(DEPDIR)/ksopts.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kstextview.Plo $(DEPDIR)/kstextview.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kstextviewtest.Po $(DEPDIR)/ksview.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/logfile.Plo $(DEPDIR)/mditoplevel.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/getdate.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioBroadcast.Plo $(DEPDIR)/ioDCC.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioDiscard.Plo $(DEPDIR)/ioLAG.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ioNotify.Plo $(DEPDIR)/iocontroller.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksirc.Plo $(DEPDIR)/ksirc_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksirc_main.Po $(DEPDIR)/ksircprocess.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksopts.Plo $(DEPDIR)/kstextview.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kstextview.Po $(DEPDIR)/kstextviewtest.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksview.Plo $(DEPDIR)/logfile.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/mditoplevel.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/messageReceiver.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/objFinder.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/servercontroller.Plo \ -@@ -507,15 +517,16 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/colorpicker.Plo $(DEPDIR)/dccDialog.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dccDialogData.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrMDI.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/getdate.Po $(DEPDIR)/ioBroadcast.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioDCC.Plo $(DEPDIR)/ioDiscard.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioLAG.Plo $(DEPDIR)/ioNotify.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/iocontroller.Plo $(DEPDIR)/ksirc.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksircprocess.Plo $(DEPDIR)/ksopts.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kstextview.Plo $(DEPDIR)/kstextview.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kstextviewtest.Po $(DEPDIR)/ksview.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/logfile.Plo $(DEPDIR)/mditoplevel.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/displayMgrSDI.Plo $(DEPDIR)/getdate.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioBroadcast.Plo $(DEPDIR)/ioDCC.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioDiscard.Plo $(DEPDIR)/ioLAG.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ioNotify.Plo $(DEPDIR)/iocontroller.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksirc.Plo $(DEPDIR)/ksirc_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksirc_main.Po $(DEPDIR)/ksircprocess.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksopts.Plo $(DEPDIR)/kstextview.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kstextview.Po $(DEPDIR)/kstextviewtest.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksview.Plo $(DEPDIR)/logfile.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/mditoplevel.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/messageReceiver.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/objFinder.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/servercontroller.Plo \ -@@ -551,8 +562,8 @@ CXXLD = $(CXX) + #>+ 1 +@@ -482,11 +490,13 @@ am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrSDI.Plo ./$(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrSDI.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/getdate.Po ./$(DEPDIR)/ioBroadcast.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/ioDCC.Plo ./$(DEPDIR)/ioDiscard.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/ioLAG.Plo ./$(DEPDIR)/ioNotify.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/iocontroller.Plo ./$(DEPDIR)/ksirc.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksirc_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksirc_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \ +@@ -499,8 +509,8 @@ am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@ ./$(DEPDIR)/ssfepromptdata.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/topic.Plo ./$(DEPDIR)/toplevel.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/usercontrolmenu.Plo +-#>+ 57 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/FilterRuleWidget.P $(DEPDIR)/ksirc_la.all_cpp.P ./$(DEPDIR)/FilterRuleEditor.Plo \ ++#>+ 61 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/FilterRuleWidget.P $(DEPDIR)/libksirc_main_la.all_cpp.P ./$(DEPDIR)/FilterRuleEditor.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/NewWindowDialog.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ahistlineedit.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/alistbox.Plo ./$(DEPDIR)/baserules.Plo \ +@@ -511,11 +521,13 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrSDI.Plo ./$(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrSDI.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/getdate.Po ./$(DEPDIR)/ioBroadcast.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ioDCC.Plo ./$(DEPDIR)/ioDiscard.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ioLAG.Plo ./$(DEPDIR)/ioNotify.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/iocontroller.Plo ./$(DEPDIR)/ksirc.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksirc_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksirc_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \ +@@ -539,11 +551,13 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrSDI.Plo ./$(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrSDI.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/getdate.Po ./$(DEPDIR)/ioBroadcast.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ioDCC.Plo ./$(DEPDIR)/ioDiscard.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ioLAG.Plo ./$(DEPDIR)/ioNotify.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/iocontroller.Plo ./$(DEPDIR)/ksirc.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksirc_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksirc_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \ +@@ -584,8 +598,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -208,7 +178,7 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ DATA = $(apps_DATA) $(conf_DATA) $(misc_DATA) HEADERS = $(noinst_HEADERS) -@@ -564,7 +575,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -597,7 +611,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -217,42 +187,42 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -613,6 +624,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -644,6 +658,8 @@ clean-libLTLIBRARIES: + done ksirc.la: $(ksirc_la_OBJECTS) $(ksirc_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(ksirc_la_LDFLAGS) $(ksirc_la_OBJECTS) $(ksirc_la_LIBADD) $(LIBS) +libksirc_main.la: $(libksirc_main_la_OBJECTS) $(libksirc_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libksirc_main_la_LDFLAGS) $(libksirc_main_la_OBJECTS) $(libksirc_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -693,7 +706,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dccDialogData.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/displayMgrMDI.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/displayMgrSDI.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdate.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioBroadcast.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioDCC.Plo@am__quote@ -@@ -702,6 +714,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ioNotify.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/iocontroller.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksirc_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksircprocess.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksopts.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kstextview.Plo@am__quote@ -@@ -906,7 +920,7 @@ distclean-tags: - +@@ -736,7 +752,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccDialogData.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrMDI.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrSDI.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioBroadcast.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioDCC.Plo@am__quote@ +@@ -745,6 +760,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioNotify.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iocontroller.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksircprocess.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksopts.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstextview.Plo@am__quote@ +@@ -963,7 +980,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=sirc.help.gz mditoplevel.cpp ssfepromptdata.cpp FilterRuleEditor.cpp displayMgrMDI.h messageReceiver.cpp ahistlineedit.cpp Artistic ksview.cpp default.pl ioLAG.cpp kstextview.h charSelector.h chanButtons.cpp ksopts.cpp relnotes filters.pl displayMgrMDI.cpp openksircproc.dlg ioNotify.cpp servercontroller.dlg dccDialog.dlg FilterRuleEditorData.ui topic.cpp chanButtons.h ioDiscard.cpp topic.h ksircrc colorpicker.cpp ksirc.pl ksircprocess.cpp stringparserstate.h logfile.cpp FilterRuleEditor.dlg ksirc.desktop dccDialog.cpp ioDCC.cpp iocontroller.cpp objFinder.cpp ksirc.cpp FAQ baserules.cpp charSelector.cpp logfile.h colorpicker.h toplevel.cpp NewWindowDialog.cpp dsirc servercontroller.cpp dccDialogData.cpp ssfeprompt.cpp mditoplevel.h displayMgrSDI.cpp usercontrolmenu.cpp version.h ioBroadcast.cpp alistbox.cpp chanparser.cpp -+KDE_DIST=FilterRuleEditor.dlg stringparserstate.h ksview.cpp displayMgrSDI.cpp FAQ mditoplevel.cpp topic.cpp mditoplevel.h objFinder.cpp messageReceiver.cpp ahistlineedit.cpp ioNotify.cpp charSelector.cpp ksircrc usercontrolmenu.cpp displayMgrMDI.cpp dccDialog.cpp charSelector.h kstextview.h default.pl sirc.help.gz FilterRuleEditor.cpp ioDCC.cpp ioLAG.cpp dsirc filters.pl ssfepromptdata.cpp openksircproc.dlg baserules.cpp Artistic logfile.h ksopts.cpp NewWindowDialog.cpp alistbox.cpp servercontroller.dlg ksircprocess.cpp ssfeprompt.cpp dccDialogData.cpp FilterRuleEditorData.ui logfile.cpp topic.h displayMgrMDI.h ksirc.cpp chanButtons.h colorpicker.cpp ksirc.pl chanButtons.cpp chanparser.cpp ksirc.desktop iocontroller.cpp version.h relnotes ioBroadcast.cpp ioDiscard.cpp toplevel.cpp dccDialog.dlg colorpicker.h servercontroller.cpp +-KDE_DIST=sirc.help.gz mditoplevel.cpp ssfepromptdata.cpp FilterRuleEditor.cpp eventsrc displayMgrMDI.h messageReceiver.cpp ahistlineedit.cpp Artistic ksview.cpp default.pl ioLAG.cpp kstextview.cpp kstextview.h charSelector.h chanButtons.cpp ksopts.cpp relnotes filters.pl displayMgrMDI.cpp openksircproc.dlg ioNotify.cpp FilterRuleWidget.ui servercontroller.dlg dccDialog.dlg topic.cpp chanButtons.h ioDiscard.cpp topic.h ksircrc colorpicker.cpp ksirc.pl ksircprocess.cpp stringparserstate.h logfile.cpp FilterRuleEditor.dlg ksirc.desktop dccDialog.cpp ioDCC.cpp iocontroller.cpp objFinder.cpp ksirc.cpp FAQ baserules.cpp charSelector.cpp logfile.h colorpicker.h toplevel.cpp NewWindowDialog.cpp dsirc servercontroller.cpp dccDialogData.cpp ssfeprompt.cpp mditoplevel.h displayMgrSDI.cpp usercontrolmenu.cpp version.h ioBroadcast.cpp alistbox.cpp chanparser.cpp ++KDE_DIST=FilterRuleEditor.dlg stringparserstate.h ksview.cpp displayMgrSDI.cpp FAQ mditoplevel.cpp topic.cpp mditoplevel.h objFinder.cpp messageReceiver.cpp ahistlineedit.cpp ioNotify.cpp charSelector.cpp ksircrc usercontrolmenu.cpp FilterRuleWidget.ui displayMgrMDI.cpp dccDialog.cpp getdate charSelector.h kstextview.h default.pl sirc.help.gz FilterRuleEditor.cpp ioDCC.cpp ioLAG.cpp dsirc filters.pl ssfepromptdata.cpp openksircproc.dlg FilterRuleWidget.cpp baserules.cpp dummy.cpp Artistic logfile.h ksopts.cpp NewWindowDialog.cpp alistbox.cpp ksirc.la.blsav servercontroller.dlg ksircprocess.cpp ssfeprompt.cpp dccDialogData.cpp logfile.cpp topic.h displayMgrMDI.h ksirc.cpp chanButtons.h colorpicker.cpp ksirc.pl chanButtons.cpp chanparser.cpp ksirc.desktop iocontroller.cpp version.h relnotes eventsrc ioBroadcast.cpp ioDiscard.cpp toplevel.cpp dccDialog.dlg colorpicker.h kstextview.cpp servercontroller.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -1065,127 +1079,124 @@ messages: rc.cpp +@@ -1124,127 +1141,128 @@ messages: rc.cpp $(EXTRACTRC) KSOpenkSirc/*.ui >> rc.cpp $(EXTRACTRC) KSPrefs/*.ui >> rc.cpp $(XGETTEXT) *.cpp */*.cpp -o $(podir)/ksirc.pot @@ -264,22 +234,22 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ .NOEXPORT: -#>+ 14 --FilterRuleEditorData.cpp: $(srcdir)/FilterRuleEditorData.ui FilterRuleEditorData.h FilterRuleEditorData.moc -- rm -f FilterRuleEditorData.cpp -- echo '#include <klocale.h>' > FilterRuleEditorData.cpp -- $(UIC) -tr ${UIC_TR} -i FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui > FilterRuleEditorData.cpp.temp ; ret=$$?; \ -- sed -e "s,${UIC_TR}( \"\" ),QString::null,g" FilterRuleEditorData.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleEditorData,g" >> FilterRuleEditorData.cpp ;\ -- rm -f FilterRuleEditorData.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "FilterRuleEditorData.moc"' >> FilterRuleEditorData.cpp; else rm -f FilterRuleEditorData.cpp ; exit $$ret ; fi +-FilterRuleWidget.cpp: $(srcdir)/FilterRuleWidget.ui FilterRuleWidget.h FilterRuleWidget.moc +- rm -f FilterRuleWidget.cpp +- echo '#include <klocale.h>' > FilterRuleWidget.cpp +- $(UIC) -tr ${UIC_TR} -i FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui > FilterRuleWidget.cpp.temp ; ret=$$?; \ +- sed -e "s,${UIC_TR}( \"\" ),QString::null,g" FilterRuleWidget.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleWidget,g" >> FilterRuleWidget.cpp ;\ +- rm -f FilterRuleWidget.cpp.temp ;\ +- if test "$$ret" = 0; then echo '#include "FilterRuleWidget.moc"' >> FilterRuleWidget.cpp; else rm -f FilterRuleWidget.cpp ; exit $$ret ; fi - --FilterRuleEditorData.h: $(srcdir)/FilterRuleEditorData.ui -- $(UIC) -o FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui +-FilterRuleWidget.h: $(srcdir)/FilterRuleWidget.ui +- $(UIC) -o FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui +#>+ 3 +iocontroller.moc: $(srcdir)/iocontroller.h + $(MOC) $(srcdir)/iocontroller.h -o iocontroller.moc --FilterRuleEditorData.moc: FilterRuleEditorData.h -- $(MOC) FilterRuleEditorData.h -o FilterRuleEditorData.moc +-FilterRuleWidget.moc: FilterRuleWidget.h +- $(MOC) FilterRuleWidget.h -o FilterRuleWidget.moc +#>+ 3 +charSelector.moc: $(srcdir)/charSelector.h + $(MOC) $(srcdir)/charSelector.h -o charSelector.moc @@ -375,83 +345,90 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ #>+ 3 -objFinder.moc: $(srcdir)/objFinder.h - $(MOC) $(srcdir)/objFinder.h -o objFinder.moc -+alistbox.moc: $(srcdir)/alistbox.h -+ $(MOC) $(srcdir)/alistbox.h -o alistbox.moc ++FilterRuleWidget.moc: $(srcdir)/FilterRuleWidget.h ++ $(MOC) $(srcdir)/FilterRuleWidget.h -o FilterRuleWidget.moc #>+ 3 -displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h - $(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc -+ioNotify.moc: $(srcdir)/ioNotify.h -+ $(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc ++alistbox.moc: $(srcdir)/alistbox.h ++ $(MOC) $(srcdir)/alistbox.h -o alistbox.moc #>+ 3 -dccDialogData.moc: $(srcdir)/dccDialogData.h - $(MOC) $(srcdir)/dccDialogData.h -o dccDialogData.moc -+mditoplevel.moc: $(srcdir)/mditoplevel.h -+ $(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc ++ioNotify.moc: $(srcdir)/ioNotify.h ++ $(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc #>+ 3 -ssfepromptdata.moc: $(srcdir)/ssfepromptdata.h - $(MOC) $(srcdir)/ssfepromptdata.h -o ssfepromptdata.moc -+FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h -+ $(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc ++mditoplevel.moc: $(srcdir)/mditoplevel.h ++ $(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc #>+ 3 -charSelector.moc: $(srcdir)/charSelector.h - $(MOC) $(srcdir)/charSelector.h -o charSelector.moc -+dccDialog.moc: $(srcdir)/dccDialog.h -+ $(MOC) $(srcdir)/dccDialog.h -o dccDialog.moc ++FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h ++ $(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc #>+ 3 -NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h - $(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc -+ahistlineedit.moc: $(srcdir)/ahistlineedit.h -+ $(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc ++dccDialog.moc: $(srcdir)/dccDialog.h ++ $(MOC) $(srcdir)/dccDialog.h -o dccDialog.moc --#>+ 3 + #>+ 3 -toplevel.moc: $(srcdir)/toplevel.h - $(MOC) $(srcdir)/toplevel.h -o toplevel.moc -+#>+ 14 -+FilterRuleEditorData.cpp: $(srcdir)/FilterRuleEditorData.ui FilterRuleEditorData.h FilterRuleEditorData.moc -+ rm -f FilterRuleEditorData.cpp -+ echo '#include <klocale.h>' > FilterRuleEditorData.cpp -+ $(UIC) -tr ${UIC_TR} -i FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui > FilterRuleEditorData.cpp.temp ; ret=$$?; \ -+ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" FilterRuleEditorData.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleEditorData,g" >> FilterRuleEditorData.cpp ;\ -+ rm -f FilterRuleEditorData.cpp.temp ;\ -+ if test "$$ret" = 0; then echo '#include "FilterRuleEditorData.moc"' >> FilterRuleEditorData.cpp; else rm -f FilterRuleEditorData.cpp ; exit $$ret ; fi ++ahistlineedit.moc: $(srcdir)/ahistlineedit.h ++ $(MOC) $(srcdir)/ahistlineedit.h -o ahistlineedit.moc -#>+ 3 -kstextview.moc: $(srcdir)/kstextview.h - $(MOC) $(srcdir)/kstextview.h -o kstextview.moc -+FilterRuleEditorData.h: $(srcdir)/FilterRuleEditorData.ui -+ $(UIC) -o FilterRuleEditorData.h $(srcdir)/FilterRuleEditorData.ui ++#>+ 14 ++FilterRuleWidget.cpp: $(srcdir)/FilterRuleWidget.ui FilterRuleWidget.h FilterRuleWidget.moc ++ rm -f FilterRuleWidget.cpp ++ echo '#include <klocale.h>' > FilterRuleWidget.cpp ++ $(UIC) -tr ${UIC_TR} -i FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui > FilterRuleWidget.cpp.temp ; ret=$$?; \ ++ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" FilterRuleWidget.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_FilterRuleWidget,g" >> FilterRuleWidget.cpp ;\ ++ rm -f FilterRuleWidget.cpp.temp ;\ ++ if test "$$ret" = 0; then echo '#include "FilterRuleWidget.moc"' >> FilterRuleWidget.cpp; else rm -f FilterRuleWidget.cpp ; exit $$ret ; fi -#>+ 3 -ioNotify.moc: $(srcdir)/ioNotify.h - $(MOC) $(srcdir)/ioNotify.h -o ioNotify.moc -+FilterRuleEditorData.moc: FilterRuleEditorData.h -+ $(MOC) FilterRuleEditorData.h -o FilterRuleEditorData.moc ++FilterRuleWidget.h: $(srcdir)/FilterRuleWidget.ui ++ $(UIC) -o FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui ++ ++FilterRuleWidget.moc: FilterRuleWidget.h ++ $(MOC) FilterRuleWidget.h -o FilterRuleWidget.moc #>+ 3 clean-metasources: - -rm -f ksircprocess.moc servercontroller.moc ioDCC.moc ssfeprompt.moc FilterRuleEditor.moc ahistlineedit.moc chanButtons.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc NewWindowDialog.moc toplevel.moc kstextview.moc ioNotify.moc -+ -rm -f iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc alistbox.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc ++ -rm -f iocontroller.moc charSelector.moc ioLAG.moc NewWindowDialog.moc ssfepromptdata.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc servercontroller.moc topic.moc FilterRuleWidget.moc alistbox.moc ioNotify.moc mditoplevel.moc FilterRuleEditor.moc dccDialog.moc ahistlineedit.moc #>+ 4 clean-ui: -@@ -1203,16 +1214,16 @@ force-reedit: - +@@ -1365,36 +1383,36 @@ $(srcdir)/kstextview.cpp: FilterRuleWidg + #>- $(srcdir)/colorpicker.cpp: cdate.h + #>+ 1 + $(srcdir)/colorpicker.cpp: FilterRuleWidget.h cdate.h +-FilterRuleWidget.cpp: cdate.h ++$(srcdir)/FilterRuleWidget.cpp: cdate.h #>+ 11 --ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc FilterRuleEditorData.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc toplevel.moc NewWindowDialog.moc kstextview.moc ioNotify.moc +-ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleWidget.cpp servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccDialog.moc ksview.moc ioLAG.moc mditoplevel.moc colorpicker.moc topic.moc objFinder.moc displayMgrMDI.moc dccDialogData.moc ssfepromptdata.moc charSelector.moc toplevel.moc NewWindowDialog.moc FilterRuleWidget.moc kstextview.moc ioNotify.moc - @echo 'creating ksirc_la.all_cpp.cpp ...'; \ - rm -f ksirc_la.all_cpp.files ksirc_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> ksirc_la.all_cpp.final; \ -+libksirc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp FilterRuleEditorData.cpp iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc alistbox.moc FilterRuleEditorData.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc ++libksirc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/dccDialog.cpp $(srcdir)/dccDialogData.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp $(srcdir)/FilterRuleWidget.cpp iocontroller.moc charSelector.moc ioLAG.moc ssfepromptdata.moc NewWindowDialog.moc kstextview.moc ksview.moc objFinder.moc chanButtons.moc ioDCC.moc toplevel.moc displayMgrMDI.moc ksircprocess.moc dccDialogData.moc ssfeprompt.moc colorpicker.moc topic.moc servercontroller.moc FilterRuleWidget.moc alistbox.moc ioNotify.moc dccDialog.moc FilterRuleEditor.moc mditoplevel.moc ahistlineedit.moc + @echo 'creating libksirc_main_la.all_cpp.cpp ...'; \ + rm -f libksirc_main_la.all_cpp.files libksirc_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libksirc_main_la.all_cpp.final; \ - for file in toplevel.cpp charSelector.cpp chanButtons.cpp ksirc.cpp alistbox.cpp ahistlineedit.cpp iocontroller.cpp NewWindowDialog.cpp messageReceiver.cpp ioBroadcast.cpp ksircprocess.cpp servercontroller.cpp FilterRuleEditor.cpp ioDiscard.cpp ioDCC.cpp dccDialog.cpp dccDialogData.cpp ioLAG.cpp ioNotify.cpp ssfeprompt.cpp ssfepromptdata.cpp usercontrolmenu.cpp baserules.cpp chanparser.cpp objFinder.cpp displayMgrSDI.cpp displayMgrMDI.cpp mditoplevel.cpp ksopts.cpp topic.cpp ksview.cpp logfile.cpp kstextview.cpp colorpicker.cpp FilterRuleEditorData.cpp ; do \ + for file in toplevel.cpp charSelector.cpp chanButtons.cpp ksirc.cpp alistbox.cpp ahistlineedit.cpp iocontroller.cpp NewWindowDialog.cpp messageReceiver.cpp ioBroadcast.cpp ksircprocess.cpp servercontroller.cpp FilterRuleEditor.cpp ioDiscard.cpp ioDCC.cpp dccDialog.cpp dccDialogData.cpp ioLAG.cpp ioNotify.cpp ssfeprompt.cpp ssfepromptdata.cpp usercontrolmenu.cpp baserules.cpp chanparser.cpp objFinder.cpp displayMgrSDI.cpp displayMgrMDI.cpp mditoplevel.cpp ksopts.cpp topic.cpp ksview.cpp logfile.cpp kstextview.cpp colorpicker.cpp FilterRuleWidget.cpp ; do \ - echo "#include \"$$file\"" >> ksirc_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksirc_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libksirc_main_la.all_cpp.files; \ @@ -462,112 +439,80 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ + cat libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files > libksirc_main_la.all_cpp.cpp; \ + rm -f libksirc_main_la.all_cpp.final libksirc_main_la.all_cpp.files - #>+ 11 - testview.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kstextview.cpp $(srcdir)/kstextviewtest.cpp kstextview.moc -@@ -1228,20 +1239,20 @@ testview.all_cpp.cpp: $(srcdir)/Makefile - #>+ 3 clean-final: -- -rm -f ksirc_la.all_cpp.cpp testview.all_cpp.cpp -+ -rm -f libksirc_main_la.all_cpp.cpp testview.all_cpp.cpp +- -rm -f ksirc_la.all_cpp.cpp ++ -rm -f libksirc_main_la.all_cpp.cpp #>+ 2 final: -- $(MAKE) ksirc_la_OBJECTS="$(ksirc_la_final_OBJECTS)" testview_OBJECTS="$(testview_final_OBJECTS)" all-am -+ $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_final_OBJECTS)" testview_OBJECTS="$(testview_final_OBJECTS)" all-am +- $(MAKE) ksirc_la_OBJECTS="$(ksirc_la_final_OBJECTS)" all-am ++ $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) ksirc_la_OBJECTS="$(ksirc_la_final_OBJECTS)" testview_OBJECTS="$(testview_final_OBJECTS)" install-am -+ $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_final_OBJECTS)" testview_OBJECTS="$(testview_final_OBJECTS)" install-am +- $(MAKE) ksirc_la_OBJECTS="$(ksirc_la_final_OBJECTS)" install-am ++ $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) ksirc_la_OBJECTS="$(ksirc_la_nofinal_OBJECTS)" testview_OBJECTS="$(testview_nofinal_OBJECTS)" all-am -+ $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_nofinal_OBJECTS)" testview_OBJECTS="$(testview_nofinal_OBJECTS)" all-am +- $(MAKE) ksirc_la_OBJECTS="$(ksirc_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) ksirc_la_OBJECTS="$(ksirc_la_nofinal_OBJECTS)" testview_OBJECTS="$(testview_nofinal_OBJECTS)" install-am -+ $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_nofinal_OBJECTS)" testview_OBJECTS="$(testview_nofinal_OBJECTS)" install-am +- $(MAKE) ksirc_la_OBJECTS="$(ksirc_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libksirc_main_la_OBJECTS="$(libksirc_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1251,84 +1262,84 @@ kde-rpo-clean: +@@ -1403,52 +1421,54 @@ cvs-clean: + kde-rpo-clean: -rm -f *.rpo - #>+ 82 --$(srcdir)/ioDCC.cpp: FilterRuleEditorData.h --$(srcdir)/usercontrolmenu.cpp: FilterRuleEditorData.h +-#>+ 49 -dccDialog.o: dccDialog.moc ++#>+ 51 +ioLAG.lo: ioLAG.moc +ssfeprompt.lo: ssfeprompt.moc +ssfepromptdata.lo: ssfepromptdata.moc -+$(srcdir)/chanparser.cpp: FilterRuleEditorData.h +toplevel.lo: toplevel.moc +displayMgrMDI.lo: displayMgrMDI.moc +ioLAG.o: ioLAG.moc +ioNotify.o: ioNotify.moc -+$(srcdir)/kstextview.cpp: FilterRuleEditorData.h +mditoplevel.o: mditoplevel.moc NewWindowDialog.o: NewWindowDialog.moc -charSelector.lo: charSelector.moc --$(srcdir)/ksview.cpp: FilterRuleEditorData.h --ahistlineedit.o: ahistlineedit.moc ++kstextview.lo: kstextview.moc + ahistlineedit.o: ahistlineedit.moc -servercontroller.o: servercontroller.moc --$(srcdir)/iocontroller.cpp: FilterRuleEditorData.h -topic.o: topic.moc - $(srcdir)/toplevel.cpp: FilterRuleEditorData.h --$(srcdir)/colorpicker.cpp: FilterRuleEditorData.h --$(srcdir)/objFinder.cpp: FilterRuleEditorData.h --charSelector.o: charSelector.moc --$(srcdir)/logfile.cpp: FilterRuleEditorData.h --$(srcdir)/dccDialogData.cpp: FilterRuleEditorData.h --$(srcdir)/baserules.cpp: FilterRuleEditorData.h --$(srcdir)/chanButtons.cpp: FilterRuleEditorData.h ++mditoplevel.lo: mditoplevel.moc ++ioNotify.lo: ioNotify.moc ++FilterRuleWidget.o: FilterRuleWidget.moc ++iocontroller.o: iocontroller.moc ++ksview.o: ksview.moc ++ssfepromptdata.o: ssfepromptdata.moc ++ksview.lo: ksview.moc + charSelector.o: charSelector.moc -FilterRuleEditor.lo: FilterRuleEditor.moc -ssfeprompt.o: ssfeprompt.moc --kstextview.o: kstextview.moc + kstextview.o: kstextview.moc -ksircprocess.lo: ksircprocess.moc -ksview.lo: ksview.moc --$(srcdir)/ksopts.cpp: FilterRuleEditorData.h -+$(srcdir)/NewWindowDialog.cpp: FilterRuleEditorData.h - kstextview.lo: kstextview.moc --$(srcdir)/ssfepromptdata.cpp: FilterRuleEditorData.h --$(srcdir)/ioBroadcast.cpp: FilterRuleEditorData.h --$(srcdir)/kstextview.cpp: FilterRuleEditorData.h +-kstextview.lo: kstextview.moc -displayMgrMDI.lo: displayMgrMDI.moc -+ahistlineedit.o: ahistlineedit.moc -+$(srcdir)/ioDiscard.cpp: FilterRuleEditorData.h -+$(srcdir)/displayMgrSDI.cpp: FilterRuleEditorData.h -+mditoplevel.lo: mditoplevel.moc - ioNotify.lo: ioNotify.moc +-ioNotify.lo: ioNotify.moc -topic.lo: topic.moc --$(srcdir)/ioLAG.cpp: FilterRuleEditorData.h -+iocontroller.o: iocontroller.moc -+$(srcdir)/FilterRuleEditor.cpp: FilterRuleEditorData.h -+$(srcdir)/charSelector.cpp: FilterRuleEditorData.h -+ksview.o: ksview.moc -+ssfepromptdata.o: ssfepromptdata.moc -+ksview.lo: ksview.moc -+charSelector.o: charSelector.moc -+kstextview.o: kstextview.moc toplevel.o: toplevel.moc --$(srcdir)/messageReceiver.cpp: FilterRuleEditorData.h --$(srcdir)/ioNotify.cpp: FilterRuleEditorData.h --alistbox.o: alistbox.moc --$(srcdir)/alistbox.cpp: FilterRuleEditorData.h ++NewWindowDialog.lo: NewWindowDialog.moc + alistbox.o: alistbox.moc -iocontroller.lo: iocontroller.moc --$(srcdir)/ksircprocess.cpp: FilterRuleEditorData.h -dccDialogData.o: dccDialogData.moc -servercontroller.lo: servercontroller.moc -mditoplevel.o: mditoplevel.moc -ioDCC.o: ioDCC.moc --$(srcdir)/NewWindowDialog.cpp: FilterRuleEditorData.h -toplevel.lo: toplevel.moc -ssfeprompt.lo: ssfeprompt.moc - $(srcdir)/ahistlineedit.cpp: FilterRuleEditorData.h -ioLAG.o: ioLAG.moc --$(srcdir)/dccDialog.cpp: FilterRuleEditorData.h -objFinder.o: objFinder.moc --$(srcdir)/charSelector.cpp: FilterRuleEditorData.h -chanButtons.lo: chanButtons.moc -colorpicker.o: colorpicker.moc -iocontroller.o: iocontroller.moc @@ -575,71 +520,39 @@ $NetBSD: patch-af,v 1.3 2003/01/02 09:12:30 skrll Exp $ -ioLAG.lo: ioLAG.moc -ioDCC.lo: ioDCC.moc -ksircprocess.o: ksircprocess.moc -+NewWindowDialog.lo: NewWindowDialog.moc -+alistbox.o: alistbox.moc -+$(srcdir)/ksview.cpp: FilterRuleEditorData.h FilterRuleEditor.o: FilterRuleEditor.moc -+$(srcdir)/ssfepromptdata.cpp: FilterRuleEditorData.h -+$(srcdir)/displayMgrMDI.cpp: FilterRuleEditorData.h -+$(srcdir)/ioNotify.cpp: FilterRuleEditorData.h -+objFinder.o: objFinder.moc -+$(srcdir)/objFinder.cpp: FilterRuleEditorData.h -+dccDialogData.lo: dccDialogData.moc -+alistbox.lo: alistbox.moc - colorpicker.lo: colorpicker.moc --$(srcdir)/ioDiscard.cpp: FilterRuleEditorData.h +-colorpicker.lo: colorpicker.moc -ssfepromptdata.o: ssfepromptdata.moc --$(srcdir)/displayMgrSDI.cpp: FilterRuleEditorData.h +-objFinder.lo: objFinder.moc +-displayMgrMDI.o: displayMgrMDI.moc ++objFinder.o: objFinder.moc + dccDialogData.lo: dccDialogData.moc +-ioNotify.o: ioNotify.moc +-ssfepromptdata.lo: ssfepromptdata.moc +-NewWindowDialog.lo: NewWindowDialog.moc +-mditoplevel.lo: mditoplevel.moc + alistbox.lo: alistbox.moc +-ksview.o: ksview.moc ++colorpicker.lo: colorpicker.moc +ssfeprompt.o: ssfeprompt.moc +FilterRuleEditor.lo: FilterRuleEditor.moc -+dccDialog.lo: dccDialog.moc -+$(srcdir)/colorpicker.cpp: FilterRuleEditorData.h + dccDialog.lo: dccDialog.moc +ioDCC.lo: ioDCC.moc +ahistlineedit.lo: ahistlineedit.moc -+$(srcdir)/chanButtons.cpp: FilterRuleEditorData.h -+$(srcdir)/topic.cpp: FilterRuleEditorData.h -+$(srcdir)/dccDialog.cpp: FilterRuleEditorData.h -+$(srcdir)/logfile.cpp: FilterRuleEditorData.h +ksircprocess.lo: ksircprocess.moc -+$(srcdir)/ioBroadcast.cpp: FilterRuleEditorData.h +charSelector.lo: charSelector.moc +servercontroller.o: servercontroller.moc - objFinder.lo: objFinder.moc ++objFinder.lo: objFinder.moc +ioDCC.o: ioDCC.moc +servercontroller.lo: servercontroller.moc +dccDialog.o: dccDialog.moc +topic.o: topic.moc -+$(srcdir)/ksircprocess.cpp: FilterRuleEditorData.h +dccDialogData.o: dccDialogData.moc - displayMgrMDI.o: displayMgrMDI.moc --dccDialogData.lo: dccDialogData.moc --ioNotify.o: ioNotify.moc --ssfepromptdata.lo: ssfepromptdata.moc -+$(srcdir)/messageReceiver.cpp: FilterRuleEditorData.h -+chanButtons.o: chanButtons.moc ++displayMgrMDI.o: displayMgrMDI.moc + chanButtons.o: chanButtons.moc +topic.lo: topic.moc -+$(srcdir)/baserules.cpp: FilterRuleEditorData.h +iocontroller.lo: iocontroller.moc -+$(srcdir)/usercontrolmenu.cpp: FilterRuleEditorData.h -+$(srcdir)/alistbox.cpp: FilterRuleEditorData.h -+$(srcdir)/ioDCC.cpp: FilterRuleEditorData.h +ksircprocess.o: ksircprocess.moc - $(srcdir)/ssfeprompt.cpp: FilterRuleEditorData.h -+$(srcdir)/ioLAG.cpp: FilterRuleEditorData.h - $(srcdir)/mditoplevel.cpp: FilterRuleEditorData.h --$(srcdir)/topic.cpp: FilterRuleEditorData.h -+$(srcdir)/dccDialogData.cpp: FilterRuleEditorData.h -+$(srcdir)/ksopts.cpp: FilterRuleEditorData.h - $(srcdir)/servercontroller.cpp: FilterRuleEditorData.h --NewWindowDialog.lo: NewWindowDialog.moc --$(srcdir)/displayMgrMDI.cpp: FilterRuleEditorData.h --mditoplevel.lo: mditoplevel.moc --$(srcdir)/chanparser.cpp: FilterRuleEditorData.h --$(srcdir)/FilterRuleEditor.cpp: FilterRuleEditorData.h --alistbox.lo: alistbox.moc --ksview.o: ksview.moc --dccDialog.lo: dccDialog.moc --chanButtons.o: chanButtons.moc ++FilterRuleWidget.lo: FilterRuleWidget.moc +colorpicker.o: colorpicker.moc -+$(srcdir)/iocontroller.cpp: FilterRuleEditorData.h +chanButtons.lo: chanButtons.moc diff --git a/net/kdenetwork3/patches/patch-ai b/net/kdenetwork3/patches/patch-ai index 6d824abedbf..c5b007c9643 100644 --- a/net/kdenetwork3/patches/patch-ai +++ b/net/kdenetwork3/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $ +$NetBSD: patch-ai,v 1.2 2003/03/11 13:13:28 markd Exp $ ---- kxmlrpc/Makefile.am.orig Sat Dec 15 20:12:51 2001 +--- kxmlrpc/Makefile.am.orig Tue Sep 17 02:53:28 2002 +++ kxmlrpc/Makefile.am -@@ -5,16 +5,21 @@ +@@ -4,17 +4,22 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kxmlrpcd @@ -14,19 +14,20 @@ $NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $ -lib_LTLIBRARIES = kxmlrpcd.la +lib_LTLIBRARIES = libkxmlrpcd_main.la kxmlrpcd.la - kde_module_LTLIBRARIES = libkcm_xmlrpcd.la + kde_module_LTLIBRARIES = kcm_xmlrpcd.la + -kxmlrpcd_la_LIBADD = $(LIB_KSYCOCA) -kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version -kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \ +libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA) +libkxmlrpcd_main_la_LDFLAGS = $(all_libraries) +libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \ - kxmlrpcdaemon.cpp kxmlrpcutil.cpp + kxmlrpcdaemon.cpp kxmlrpcutil.cpp +libkxmlrpcd_main_la_METASOURCES = AUTO + +kxmlrpcd_la_LIBADD = libkxmlrpcd_main.la -+kxmlrpcd_la_LDFLAGS = $(all_libraries) -avoid-version -module ++kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version +kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp kxmlrpcd_la_METASOURCES = AUTO - libkcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) + kcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) diff --git a/net/kdenetwork3/patches/patch-aj b/net/kdenetwork3/patches/patch-aj index 1b63218732f..89b7bd8fecc 100644 --- a/net/kdenetwork3/patches/patch-aj +++ b/net/kdenetwork3/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.3 2003/01/02 09:12:31 skrll Exp $ +$NetBSD: patch-aj,v 1.4 2003/03/11 13:13:28 markd Exp $ ---- kxmlrpc/Makefile.in.orig Sat Dec 28 08:53:51 2002 +--- kxmlrpc/Makefile.in.orig Fri Jan 17 08:54:54 2003 +++ kxmlrpc/Makefile.in -@@ -233,17 +233,22 @@ SUBDIRS = gui +@@ -254,18 +254,23 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kxmlrpcd @@ -14,54 +14,48 @@ $NetBSD: patch-aj,v 1.3 2003/01/02 09:12:31 skrll Exp $ -lib_LTLIBRARIES = kxmlrpcd.la +lib_LTLIBRARIES = libkxmlrpcd_main.la kxmlrpcd.la - kde_module_LTLIBRARIES = libkcm_xmlrpcd.la + kde_module_LTLIBRARIES = kcm_xmlrpcd.la + -kxmlrpcd_la_LIBADD = $(LIB_KSYCOCA) -kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version -kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \ +libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA) +libkxmlrpcd_main_la_LDFLAGS = $(all_libraries) +libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \ - kxmlrpcdaemon.cpp kxmlrpcutil.cpp + kxmlrpcdaemon.cpp kxmlrpcutil.cpp +#>- libkxmlrpcd_main_la_METASOURCES = AUTO + +kxmlrpcd_la_LIBADD = libkxmlrpcd_main.la -+kxmlrpcd_la_LDFLAGS = $(all_libraries) -avoid-version -module ++kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version +kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp #>- kxmlrpcd_la_METASOURCES = AUTO - libkcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) -@@ -260,29 +265,34 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) - + kcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE) +@@ -287,24 +292,29 @@ am_kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit. + #>- kcm_xmlrpcd_la_OBJECTS = $(am_kcm_xmlrpcd_la_OBJECTS) + #>+ 1 + kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.lo -kxmlrpcd_la_DEPENDENCIES = -am_kxmlrpcd_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ - kxmlrpcdaemon.lo kxmlrpcutil.lo +kxmlrpcd_la_DEPENDENCIES = libkxmlrpcd_main.la +am_kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo #>- kxmlrpcd_la_OBJECTS = $(am_kxmlrpcd_la_OBJECTS) --#>+ 5 --kxmlrpcd_la_final_OBJECTS = kxmlrpcd_la.all_cpp.lo --kxmlrpcd_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ -- kxmlrpcdaemon.lo kxmlrpcutil.lo --@KDE_USE_FINAL_FALSE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_final_OBJECTS) +#>+ 1 +kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo - libkcm_xmlrpcd_la_DEPENDENCIES = - am_libkcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.lo - #>- libkcm_xmlrpcd_la_OBJECTS = $(am_libkcm_xmlrpcd_la_OBJECTS) - #>+ 1 - libkcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.lo +libkxmlrpcd_main_la_DEPENDENCIES = +am_libkxmlrpcd_main_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ + kxmlrpcdaemon.lo kxmlrpcutil.lo +#>- libkxmlrpcd_main_la_OBJECTS = $(am_libkxmlrpcd_main_la_OBJECTS) -+#>+ 5 + #>+ 5 +-kxmlrpcd_la_final_OBJECTS = kxmlrpcd_la.all_cpp.lo +-kxmlrpcd_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ +libkxmlrpcd_main_la_final_OBJECTS = libkxmlrpcd_main_la.all_cpp.lo +libkxmlrpcd_main_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \ -+ kxmlrpcdaemon.lo kxmlrpcutil.lo + kxmlrpcdaemon.lo kxmlrpcutil.lo +-@KDE_USE_FINAL_FALSE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_final_OBJECTS) +@KDE_USE_FINAL_FALSE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_final_OBJECTS) bin_PROGRAMS = kxmlrpcd$(EXEEXT) @@ -78,74 +72,71 @@ $NetBSD: patch-aj,v 1.3 2003/01/02 09:12:31 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -290,18 +300,24 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -313,20 +323,23 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kxmlrpcdaemon.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kxmlrpcd_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcd_main.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcdaemon.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcinit.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcparser.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcserver.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcutil.Plo --#>+ 11 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kxmlrpcd_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kxmlrpcdaemon.Plo \ + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kxmlrpcd_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcd_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcdaemon.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcinit.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcparser.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcserver.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcutil.Plo +-#>+ 13 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kxmlrpcd_la.all_cpp.P ./$(DEPDIR)/dummy.Po \ +#>+ 15 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkxmlrpcd_main_la.all_cpp.P $(DEPDIR)/kxmlrpcd_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcd_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcdaemon.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcinit.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcparser.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcserver.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcutil.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kxmlrpcdaemon.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kxmlrpcd_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcd_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcdaemon.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcinit.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcparser.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxmlrpcserver.Plo \ -@@ -327,7 +343,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkxmlrpcd_main_la.all_cpp.P ./$(DEPDIR)/kxmlrpcd_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcd_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcdaemon.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcinit.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcparser.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcserver.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcutil.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kxmlrpcd_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcd_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcdaemon.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcinit.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcparser.Plo \ +@@ -353,13 +366,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ - DIST_SOURCES = $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) \ + DIST_SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) \ - $(kxmlrpcd_SOURCES) + $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_SOURCES) DATA = $(service_DATA) HEADERS = $(noinst_HEADERS) -@@ -339,7 +355,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in - DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES) -+SOURCES = $(kxmlrpcd_la_SOURCES) $(libkcm_xmlrpcd_la_SOURCES) $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_SOURCES) +-SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES) ++SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_SOURCES) - #>- all: all-recursive + #>- all: all-am #>+ 1 -@@ -412,6 +428,8 @@ kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kx - @KDE_USE_CLOSURE_TRUE@libkcm_xmlrpcd.la: libkcm_xmlrpcd.la.closure $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_DEPENDENCIES) - @KDE_USE_CLOSURE_FALSE@libkcm_xmlrpcd.la: $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(libkcm_xmlrpcd_la_LDFLAGS) $(libkcm_xmlrpcd_la_OBJECTS) $(libkcm_xmlrpcd_la_LIBADD) $(LIBS) +@@ -439,6 +452,8 @@ clean-libLTLIBRARIES: + $(CXXLINK) -rpath $(kde_moduledir) $(kcm_xmlrpcd_la_LDFLAGS) $(kcm_xmlrpcd_la_OBJECTS) $(kcm_xmlrpcd_la_LIBADD) $(LIBS) + kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kxmlrpcd_la_LDFLAGS) $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_LIBADD) $(LIBS) +libkxmlrpcd_main.la: $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkxmlrpcd_main_la_LDFLAGS) $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -446,7 +464,8 @@ mostlyclean-compile: +@@ -478,7 +493,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcd_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcd_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcinit.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxmlrpcparser.Plo@am__quote@ -@@ -587,7 +606,7 @@ distclean-tags: - +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcinit.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcparser.Plo@am__quote@ +@@ -572,7 +588,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kxmlrpcd.desktop LICENSE @@ -153,8 +144,8 @@ $NetBSD: patch-aj,v 1.3 2003/01/02 09:12:31 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -754,8 +773,12 @@ libkcm_xmlrpcd.la.closure: $(libkcm_xmlr - +@@ -723,8 +739,12 @@ kxmlrpcserver.moc: $(srcdir)/kxmlrpcserv + $(MOC) $(srcdir)/kxmlrpcserver.h -o kxmlrpcserver.moc #>+ 3 +kxmlrpcserver.moc: $(srcdir)/kxmlrpcserver.h @@ -167,7 +158,7 @@ $NetBSD: patch-aj,v 1.3 2003/01/02 09:12:31 skrll Exp $ #>+ 3 clean-closures: -@@ -772,33 +795,33 @@ force-reedit: +@@ -741,33 +761,33 @@ force-reedit: #>+ 11 @@ -214,7 +205,7 @@ $NetBSD: patch-aj,v 1.3 2003/01/02 09:12:31 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -808,5 +831,5 @@ kde-rpo-clean: +@@ -777,5 +797,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/net/kdenetwork3/patches/patch-am b/net/kdenetwork3/patches/patch-am index cda6a53f401..4a7522119cc 100644 --- a/net/kdenetwork3/patches/patch-am +++ b/net/kdenetwork3/patches/patch-am @@ -1,66 +1,13 @@ -$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:59:29 skrll Exp $ +$NetBSD: patch-am,v 1.2 2003/03/11 13:13:29 markd Exp $ ---- libkdenetwork/kpgpbase.cpp.orig Sun Jan 20 20:23:35 2002 -+++ libkdenetwork/kpgpbase.cpp -@@ -264,9 +264,28 @@ - //kdDebug(5100) << "Read " << len << " bytes from pout[0]" << endl; - str[len] ='\0'; - output += str; -- } -- else -+ } else { -+ /* -+ * Apparently, on NetBSD when the child dies, the pipe begins -+ * receiving empty data packets *before* waitpid() has signaled -+ * that the child has died. Also, notice that this happens -+ * without any error bit being set in pollfd.revents (is this a -+ * NetBSD bug???). Notice that these anomalous packets exist -+ * according to poll(), but have length 0 according to read(). -+ * Thus, kde can remain stuck inside this loop. -+ * -+ * A solution to this problem is to get out of the inner loop -+ * when read() returns <=0. In this way, kde has another chance -+ * to call waitpid() to check if the child has died -- and this -+ * time the call should succeed. -+ * -+ * Setting POLLHUP in pollfd.revents is not necessary, but I just -+ * like the idea of signaling that something strange has -+ * happened. -+ */ -+ pollout.revents |= POLLHUP; - break; -+ } - } - } - else if (pollstatus == -1) { -@@ -289,9 +308,28 @@ - //kdDebug(5100) << "Read " << len << " bytes from perr[0]" << endl; - str[len] ='\0'; - error += str; -- } -- else -+ } else { -+ /* -+ * Apparently, on NetBSD when the child dies, the pipe begins -+ * receiving empty data packets *before* waitpid() has signaled -+ * that the child has died. Also, notice that this happens -+ * without any error bit being set in pollfd.revents (is this a -+ * NetBSD bug???). Notice that these anomalous packets exist -+ * according to poll(), but have length 0 according to read(). -+ * Thus, kde can remain stuck inside this loop. -+ * -+ * A solution to this problem is to get out of the inner loop -+ * when read() returns <=0. In this way, kde has another chance -+ * to call waitpid() to check if the child has died -- and this -+ * time the call should succeed. -+ * -+ * Setting POLLHUP in pollfd.revents is not necessary, but I just -+ * like the idea of signaling that something strange has -+ * happened. -+ */ -+ pollerr.revents |= POLLHUP; - break; -+ } - } - } - else if (pollstatus == -1) { +--- krfb/srvloc/kinetaddr.h.orig Mon Aug 12 23:26:39 2002 ++++ krfb/srvloc/kinetaddr.h +@@ -29,7 +29,7 @@ + + #include <arpa/inet.h> + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__NetBSD__) + #include <sys/socket.h> + #endif + |