Finish updating to KDE2 snapshot 20000829A. Re-add kdenetwork and kdeutils

dependencies to kde2, and add koffice to kde2, because it's part of the
2.0 release.  Fix my bogon in forgetting to remove obsolete qt22 patches.

The current state of the ports as far as building and installing is quite
good, but I expect minor problems with PLISTs other than for the ones I've
fixed here.  I'm going to let bento figure it out.  :-)

Please, test these ports and report bugs to submit@bugs.kde.org, and send
me problems with the ports themselves.  I've found that KDE2 seems to have
stabilized significantly since the last snapshot.

And now, I am removing the last patch remaining in the KDE2 ports, except
for the QT 2.2 snapshot.

3 files changed, 43 insertions, 153 deletions

diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 2857c274dd51..5fc7c4f497d5 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -6,20 +6,17 @@
 #
 
 PORTNAME=	kdenetwork
-PORTVERSION=	20000724A
+PORTVERSION=	20000829A
 CATEGORIES=	net news kde
-MASTER_SITES=	$(MASTER_SITE_LOCAL)
+MASTER_SITES=	http://www.physics.purdue.edu/~will/
 MASTER_SITE_SUBDIR=	will
 
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	uu.1:${PORTSDIR}/converters/uulib \
 		qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		QwSpriteField.8:${PORTSDIR}/converters/kdesupport2
+		kdecore.4:${PORTSDIR}/x11/kdelibs2
 
-BROKEN=		"Does not use current snapshot"
-WRKSRC=		${WRKDIR}/kdenetwork
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 USE_NEWGCC=	yes
diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index a19c3f52393f..6a197445ce00 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-20000724A.tar.bz2) = d4557cd2bfbfcea1803c035d4f5c6120
+MD5 (kdenetwork-20000829A.tar.bz2) = bb387eeed72e4a172e3e46719ef9e0fa
diff --git a/net/kdenetwork2/pkg-plist b/net/kdenetwork2/pkg-plist
index c98d947947af..5eefae0f4ce7 100644
--- a/net/kdenetwork2/pkg-plist
+++ b/net/kdenetwork2/pkg-plist
@@ -1,9 +1,7 @@
 bin/dsirc
-bin/karchie
 bin/keystone
 bin/kit
 bin/kmail
-bin/knode
 bin/korn
 bin/kotalkd
 bin/kppp
@@ -14,20 +12,13 @@ bin/ktalkd
 bin/ktalkdlg
 bin/mail.local
 include/kmailIface.h
-include/ksearch/ftpsearch.h
-include/ksearch/peoplesearch.h
-include/ksearch/websearch.h
 lib/ksirc.la
 lib/ksirc.so
 lib/libkcm_ktalkd.la
 lib/libkcm_ktalkd.so
-lib/libksearch.la
-lib/libksearch.so.3
 share/applnk/Internet/KMail.desktop
-share/applnk/Internet/KNode.desktop
 share/applnk/Internet/KOrn.desktop
 share/applnk/Internet/Kppp.desktop
-share/applnk/Internet/karchie.desktop
 share/applnk/Internet/keystone.desktop
 share/applnk/Internet/kit.desktop
 share/applnk/Internet/kppplogview.desktop
@@ -35,10 +26,6 @@ share/applnk/Internet/ksirc.desktop
 share/applnk/Settings/Network/kcmktalkd.desktop
 share/apps/keystone/keystoneui.rc
 share/apps/kit/eventsrc
-share/apps/kit/pics/kit_away.png
-share/apps/kit/pics/kit_group.png
-share/apps/kit/pics/kit_offline.png
-share/apps/kit/pics/kit_online.png
 share/apps/kmail/kmcomposerui.rc
 share/apps/kmail/kmmainwin.rc
 share/apps/kmail/pics/abdown.png
@@ -67,57 +54,6 @@ share/apps/kmail/pics/pub_key_red.png
 share/apps/kmail/pics/red-bullet.png
 share/apps/kmail/pics/stopwatch.xbm
 share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/knode/filters/1.fltr
-share/apps/knode/filters/2.fltr
-share/apps/knode/filters/3.fltr
-share/apps/knode/filters/4.fltr
-share/apps/knode/filters/5.fltr
-share/apps/knode/filters/6.fltr
-share/apps/knode/filters/filters.rc
-share/apps/knode/headers.rc
-share/apps/knode/kncomposerui.rc
-share/apps/knode/knodeui.rc
-share/apps/knode/knreaderui.rc
-share/apps/knode/pics/accmail.png
-share/apps/knode/pics/arrow_left.png
-share/apps/knode/pics/arrow_right.png
-share/apps/knode/pics/ctlart.png
-share/apps/knode/pics/eyes.png
-share/apps/knode/pics/fltrblue.png
-share/apps/knode/pics/fltrgrey.png
-share/apps/knode/pics/folder.png
-share/apps/knode/pics/greyball.png
-share/apps/knode/pics/greyballchk.png
-share/apps/knode/pics/group.png
-share/apps/knode/pics/groupkat.png
-share/apps/knode/pics/mail.png
-share/apps/knode/pics/newsubs.png
-share/apps/knode/pics/pen.png
-share/apps/knode/pics/posting.png
-share/apps/knode/pics/redball.png
-share/apps/knode/pics/redballchk.png
-share/apps/knode/pics/server.png
-share/apps/knode/pics/smile.png
-share/apps/knode/pics/snderr.png
-share/apps/knode/pics/stat_cncl.png
-share/apps/knode/pics/stat_edit.png
-share/apps/knode/pics/stat_saved.png
-share/apps/knode/pics/stat_sent.png
-share/apps/knode/toolbar/delete.png
-share/apps/knode/toolbar/dlall.png
-share/apps/knode/toolbar/filter.png
-share/apps/knode/toolbar/fwd.png
-share/apps/knode/toolbar/grpdlg.png
-share/apps/knode/toolbar/newmsg.png
-share/apps/knode/toolbar/nextart.png
-share/apps/knode/toolbar/nextthr.png
-share/apps/knode/toolbar/remail.png
-share/apps/knode/toolbar/reply.png
-share/apps/knode/toolbar/save.png
-share/apps/knode/toolbar/search.png
-share/apps/knode/toolbar/sendnow.png
-share/apps/knode/toolbar/settings.png
-share/apps/knode/toolbar/signature.png
 share/apps/kppp/Provider/Austria/.directory
 share/apps/kppp/Provider/Austria/Simon%032Media
 share/apps/kppp/Provider/Denmark/.directory
@@ -162,6 +98,7 @@ share/apps/kppp/Rules/Austria/Minimum/Online.rst
 share/apps/kppp/Rules/Austria/Standard/Local.rst
 share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst
 share/apps/kppp/Rules/Austria/Standard/Online.rst
+share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
 share/apps/kppp/Rules/Bangladesh/ATT00007.rst
 share/apps/kppp/Rules/Bangladesh/ATT00010.rst
 share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
@@ -194,12 +131,15 @@ share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
 share/apps/kppp/Rules/England/BritishTelecom_Local.rst
 share/apps/kppp/Rules/England/BritishTelecom_National.rst
 share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
-share/apps/kppp/Rules/France/Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
+share/apps/kppp/Rules/France/France_Telecom_National.rst
 share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
 share/apps/kppp/Rules/Germany/Addcom.rst
 share/apps/kppp/Rules/Germany/CallOkaynet.rst
 share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
 share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
+share/apps/kppp/Rules/Germany/MSN.rst
 share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst
 share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst
 share/apps/kppp/Rules/Germany/Nikoma.rst
@@ -291,12 +231,28 @@ share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst
 share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
 share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
 share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst
-share/apps/kppp/Rules/Sweden/Local.rst
-share/apps/kppp/Rules/Sweden/Local_Telebonus_1.rst
-share/apps/kppp/Rules/Sweden/Local_Telebonus_2.rst
-share/apps/kppp/Rules/Sweden/Long_Distance.rst
-share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_1.rst
-share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_2.rst
+share/apps/kppp/Rules/Sweden/ACN.rst
+share/apps/kppp/Rules/Sweden/Abonnera.rst
+share/apps/kppp/Rules/Sweden/Affinity-Crossnet.rst
+share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+share/apps/kppp/Rules/Sweden/Glocalnet.rst
+share/apps/kppp/Rules/Sweden/Nemtel.rst
+share/apps/kppp/Rules/Sweden/RSLCom.rst
+share/apps/kppp/Rules/Sweden/RixTelecom.rst
+share/apps/kppp/Rules/Sweden/Supertel.rst
+share/apps/kppp/Rules/Sweden/SvenskTelekom.rst
+share/apps/kppp/Rules/Sweden/Tele1Europe.rst
+share/apps/kppp/Rules/Sweden/Tele2.rst
+share/apps/kppp/Rules/Sweden/Tele8.rst
+share/apps/kppp/Rules/Sweden/Telenordia.rst
+share/apps/kppp/Rules/Sweden/Telerian.rst
+share/apps/kppp/Rules/Sweden/Telia.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst
+share/apps/kppp/Rules/Sweden/Telitel.rst
+share/apps/kppp/Rules/Sweden/UniversalTelecom.rst
+share/apps/kppp/Rules/Sweden/Utfors.rst
+share/apps/kppp/Rules/Sweden/Vattenfall.rst
 share/apps/kppp/Rules/Switzerland/Sunrise_Internet.rst
 share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
 share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
@@ -365,17 +321,6 @@ share/apps/ksirc/sirc.help.gz
 share/apps/ksirc/small.pl
 share/apps/ksirc/test.pl
 share/apps/ksirc/tester.pl
-share/apps/libksearch/ftp-sites/lycos.columbo
-share/apps/libksearch/people-sites/bigfoot.columbo
-share/apps/libksearch/people-sites/humboldt.columbo
-share/apps/libksearch/people-sites/nldap.columbo
-share/apps/libksearch/web-sites/altavista.columbo
-share/apps/libksearch/web-sites/cnn.columbo
-share/apps/libksearch/web-sites/excite.columbo
-share/apps/libksearch/web-sites/google.columbo
-share/apps/libksearch/web-sites/raging.columbo
-share/config/karchierc
-share/config/ktalkdrc
 share/config/protocols/vnc.desktop
 share/doc/HTML/en/caitoo/.anchors
 share/doc/HTML/en/caitoo/addnew.html
@@ -422,25 +367,6 @@ share/doc/HTML/en/columbo/introduction.html
 share/doc/HTML/en/columbo/nic-search.html
 share/doc/HTML/en/columbo/plugins.html
 share/doc/HTML/en/columbo/web-search.html
-share/doc/HTML/en/karchie/.anchors
-share/doc/HTML/en/karchie/advancedconfiguring.html
-share/doc/HTML/en/karchie/authorsandrecendversions.html
-share/doc/HTML/en/karchie/compilationandinstallation.html
-share/doc/HTML/en/karchie/draganddrop.html
-share/doc/HTML/en/karchie/featuresanddetails.html
-share/doc/HTML/en/karchie/frequentlyaskedquestionsandanswers.html
-share/doc/HTML/en/karchie/gettingkarchiestarted.html
-share/doc/HTML/en/karchie/index.cvlog
-share/doc/HTML/en/karchie/index.docbook
-share/doc/HTML/en/karchie/index.html
-share/doc/HTML/en/karchie/installation.html
-share/doc/HTML/en/karchie/introduction.html
-share/doc/HTML/en/karchie/karchie.html
-share/doc/HTML/en/karchie/keyboard.html
-share/doc/HTML/en/karchie/more.html
-share/doc/HTML/en/karchie/queryresults.html
-share/doc/HTML/en/karchie/startquery.html
-share/doc/HTML/en/karchie/xarchie.html
 share/doc/HTML/en/kbiff/.anchors
 share/doc/HTML/en/kbiff/checkmailnow.html
 share/doc/HTML/en/kbiff/clickingonyouremailaddressinaboutdoesnothing.html
@@ -485,6 +411,7 @@ share/doc/HTML/en/kfinger/setupw.png
 share/doc/HTML/en/kfinger/statusbar.html
 share/doc/HTML/en/kfinger/toolbar.html
 share/doc/HTML/en/kmail/.anchors
+share/doc/HTML/en/kmail/appearancetab.html
 share/doc/HTML/en/kmail/composertab.html
 share/doc/HTML/en/kmail/copyright.html
 share/doc/HTML/en/kmail/documentation.html
@@ -495,6 +422,7 @@ share/doc/HTML/en/kmail/index.cvlog
 share/doc/HTML/en/kmail/index.docbook
 share/doc/HTML/en/kmail/index.html
 share/doc/HTML/en/kmail/misctab.html
+share/doc/HTML/en/kmail/networktab.html
 share/doc/HTML/en/kmail/seccustomizing.html
 share/doc/HTML/en/kmail/secfolders.html
 share/doc/HTML/en/kmail/secgettingstarted.html
@@ -540,20 +468,14 @@ share/doc/HTML/en/knu/themtrtab.html
 share/doc/HTML/en/knu/thepingtab.html
 share/doc/HTML/en/knu/thetraceroutetab.html
 share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/authors.html
-share/doc/HTML/en/korn/command-lineoptions.html
-share/doc/HTML/en/korn/compilationandinstallation.html
-share/doc/HTML/en/korn/epilogue.html
-share/doc/HTML/en/korn/forwhomiskornwritten.html
-share/doc/HTML/en/korn/fundamentals.html
 share/doc/HTML/en/korn/index.cvlog
 share/doc/HTML/en/korn/index.docbook
 share/doc/HTML/en/korn/index.html
-share/doc/HTML/en/korn/installation.html
 share/doc/HTML/en/korn/introduction.html
-share/doc/HTML/en/korn/knownbugsandlimitations.html
-share/doc/HTML/en/korn/requirements.html
-share/doc/HTML/en/korn/whyisitnamedkorn.html
+share/doc/HTML/en/korn/licenses-and-credits.html
+share/doc/HTML/en/korn/the-display-tab.html
+share/doc/HTML/en/korn/the-new-dialog.html
+share/doc/HTML/en/korn/the-preferences-dialog.html
 share/doc/HTML/en/kppp/.anchors
 share/doc/HTML/en/kppp/BackGround.png
 share/doc/HTML/en/kppp/accounting.html
@@ -642,24 +564,13 @@ share/doc/HTML/en/pws/index.html
 share/doc/HTML/en/pws/installation.html
 share/doc/HTML/en/pws/introduction.html
 share/doc/HTML/en/pws/requirements.html
-share/icons/hicolor/22x22/actions/message_delete.png
-share/icons/hicolor/22x22/actions/message_forward.png
 share/icons/hicolor/22x22/actions/message_get.png
-share/icons/hicolor/22x22/actions/message_reply.png
-share/icons/hicolor/22x22/actions/message_replyall.png
-share/icons/hicolor/32x32/actions/message_delete.png
-share/icons/hicolor/32x32/actions/message_forward.png
-share/icons/hicolor/32x32/actions/message_get.png
-share/icons/hicolor/32x32/actions/message_reply.png
-share/icons/hicolor/32x32/actions/message_replyall.png
-share/icons/hicolor/32x32/apps/karchie.png
 share/icons/hicolor/32x32/apps/kit.png
 share/icons/hicolor/32x32/apps/kmail.png
 share/icons/hicolor/32x32/apps/korn.png
 share/icons/hicolor/32x32/apps/kppp.png
 share/icons/hicolor/32x32/apps/ksirc.png
 share/icons/hicolor/32x32/apps/ktalkd.png
-share/icons/hicolor/48x48/apps/karchie.png
 share/icons/hicolor/48x48/apps/kit.png
 share/icons/hicolor/48x48/apps/kmail.png
 share/icons/hicolor/48x48/apps/korn.png
@@ -667,36 +578,31 @@ share/icons/hicolor/48x48/apps/kppp.png
 share/icons/hicolor/48x48/apps/ksirc.png
 share/icons/hicolor/48x48/apps/ktalkd.png
 share/icons/locolor/16x16/actions/kit_anonwarning.png
+share/icons/locolor/16x16/actions/kit_away.png
 share/icons/locolor/16x16/actions/kit_bold.png
+share/icons/locolor/16x16/actions/kit_group.png
 share/icons/locolor/16x16/actions/kit_info.png
 share/icons/locolor/16x16/actions/kit_logging.png
+share/icons/locolor/16x16/actions/kit_offline.png
+share/icons/locolor/16x16/actions/kit_online.png
 share/icons/locolor/16x16/actions/kit_sound.png
 share/icons/locolor/16x16/actions/kit_status.png
 share/icons/locolor/16x16/actions/kit_timestamping.png
 share/icons/locolor/16x16/actions/kit_warning.png
-share/icons/locolor/16x16/actions/message_delete.png
-share/icons/locolor/16x16/actions/message_forward.png
-share/icons/locolor/16x16/actions/message_get.png
-share/icons/locolor/16x16/actions/message_reply.png
-share/icons/locolor/16x16/actions/message_replyall.png
-share/icons/locolor/16x16/apps/karchie.png
 share/icons/locolor/16x16/apps/kit.png
 share/icons/locolor/16x16/apps/kmail.png
-share/icons/locolor/16x16/apps/knode.png
 share/icons/locolor/16x16/apps/korn.png
 share/icons/locolor/16x16/apps/kppp.png
 share/icons/locolor/16x16/apps/ksirc.png
 share/icons/locolor/16x16/apps/ktalkd.png
-share/icons/locolor/32x32/apps/karchie.png
 share/icons/locolor/32x32/apps/kit.png
 share/icons/locolor/32x32/apps/kmail.png
-share/icons/locolor/32x32/apps/knode.png
 share/icons/locolor/32x32/apps/korn.png
 share/icons/locolor/32x32/apps/kppp.png
 share/icons/locolor/32x32/apps/ksirc.png
 share/icons/locolor/32x32/apps/ktalkd.png
-share/mimelnk/application/x-columbo.desktop
 share/sounds/ktalkd.wav
+@unexec sh -c 'for i in pws ktalkd ksirc kppp korn knu kmail kfinger kbiff columbo caitoo;do rm %D/share/doc/HTML/en/${i}/common;done'
 @dirrm share/doc/HTML/en/pws
 @dirrm share/doc/HTML/en/ktalkd
 @dirrm share/doc/HTML/en/ksirc
@@ -706,14 +612,9 @@ share/sounds/ktalkd.wav
 @dirrm share/doc/HTML/en/kmail
 @dirrm share/doc/HTML/en/kfinger
 @dirrm share/doc/HTML/en/kbiff
-@dirrm share/doc/HTML/en/karchie
 @dirrm share/doc/HTML/en/columbo
 @dirrm share/doc/HTML/en/caitoo
-@dirrm share/doc/HTML/en
-@dirrm share/apps/libksearch/web-sites
-@dirrm share/apps/libksearch/people-sites
-@dirrm share/apps/libksearch/ftp-sites
-@dirrm share/apps/libksearch
+@dirrm share/config/protocols
 @dirrm share/apps/ksirc/pics
 @dirrm share/apps/ksirc
 @dirrm share/apps/kppp/pics
@@ -766,15 +667,7 @@ share/sounds/ktalkd.wav
 @dirrm share/apps/kppp/Provider/Germany
 @dirrm share/apps/kppp/Provider/Denmark
 @dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/knode/toolbar
-@dirrm share/apps/knode/pics
-@dirrm share/apps/knode/filters
-@dirrm share/apps/knode
 @dirrm share/apps/kmail/pics
 @dirrm share/apps/kmail
-@dirrm share/apps/kit/pics
 @dirrm share/apps/kit
 @dirrm share/apps/keystone
-@dirrm include/ksearch