3 files changed, 41 insertions, 71 deletions

diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	20000829A
+PORTVERSION=	1.94
 CATEGORIES=	misc kde
-MASTER_SITES=	http://www.physics.purdue.edu/~will/
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/math/kcalc/pkg-plist
+++ b/math/kcalc/pkg-plist
@@ -17,6 +17,7 @@ bin/klpq
 bin/knotes
 bin/kwikdisk
 lib/kedit.la
+lib/kedit.so
 lib/kedit.so.0
 lib/kfind.la
 lib/kfind.so
@@ -25,6 +26,7 @@ lib/libkcm_kdf.so
 lib/libkcm_laptop.la
 lib/libkcm_laptop.so
 lib/libktimemon.la
+lib/libktimemon.so
 lib/libktimemon.so.1
 share/applnk/Editors/KEdit.desktop
 share/applnk/Kfind.desktop
@@ -104,10 +106,10 @@ share/doc/HTML/en/ark/ark-create.html
 share/doc/HTML/en/ark/ark-extract.html
 share/doc/HTML/en/ark/ark-work-files.html
 share/doc/HTML/en/ark/commands.html
+share/doc/HTML/en/ark/common
 share/doc/HTML/en/ark/compilation.html
 share/doc/HTML/en/ark/credits.html
 share/doc/HTML/en/ark/editmenu.html
-share/doc/HTML/en/ark/index.cvlog
 share/doc/HTML/en/ark/index.docbook
 share/doc/HTML/en/ark/index.html
 share/doc/HTML/en/ark/installation.html
@@ -116,14 +118,15 @@ share/doc/HTML/en/ark/requirements.html
 share/doc/HTML/en/ark/settingsmenu.html
 share/doc/HTML/en/ark/using-ark.html
 share/doc/HTML/en/kab/.anchors
+share/doc/HTML/en/kab/common
 share/doc/HTML/en/kab/index.cvlog
 share/doc/HTML/en/kab/index.docbook
 share/doc/HTML/en/kab/index.html
 share/doc/HTML/en/kab/temp.html
 share/doc/HTML/en/karm/.anchors
+share/doc/HTML/en/karm/common
 share/doc/HTML/en/karm/credits.html
 share/doc/HTML/en/karm/general-use.html
-share/doc/HTML/en/karm/index.cvlog
 share/doc/HTML/en/karm/index.docbook
 share/doc/HTML/en/karm/index.html
 share/doc/HTML/en/karm/installation.html
@@ -134,6 +137,7 @@ share/doc/HTML/en/karm/status-bar.html
 share/doc/HTML/en/karm/using-karm.html
 share/doc/HTML/en/kcalc/.anchors
 share/doc/HTML/en/kcalc/commentsonspecificfunctions.html
+share/doc/HTML/en/kcalc/common
 share/doc/HTML/en/kcalc/compilationandinstallation.html
 share/doc/HTML/en/kcalc/copyright.html
 share/doc/HTML/en/kcalc/cutandpaste.html
@@ -160,8 +164,8 @@ share/doc/HTML/en/kcalc/trigonometricmode.html
 share/doc/HTML/en/kcalc/usage.html
 share/doc/HTML/en/kcalc/whataboutprecision.html
 share/doc/HTML/en/kdf/.anchors
+share/doc/HTML/en/kdf/common
 share/doc/HTML/en/kdf/credits.html
-share/doc/HTML/en/kdf/index.cvlog
 share/doc/HTML/en/kdf/index.docbook
 share/doc/HTML/en/kdf/index.html
 share/doc/HTML/en/kdf/installation.html
@@ -171,11 +175,11 @@ share/doc/HTML/en/kdf/the-menus.html
 share/doc/HTML/en/kdf/using-kdf.html
 share/doc/HTML/en/kedit/.anchors
 share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/common
 share/doc/HTML/en/kedit/credits.html
 share/doc/HTML/en/kedit/edit.html
 share/doc/HTML/en/kedit/go.html
 share/doc/HTML/en/kedit/help.html
-share/doc/HTML/en/kedit/index.cvlog
 share/doc/HTML/en/kedit/index.docbook
 share/doc/HTML/en/kedit/index.html
 share/doc/HTML/en/kedit/introduction.html
@@ -190,12 +194,12 @@ share/doc/HTML/en/kedit/the-menu-entries.html
 share/doc/HTML/en/kedit/tools.html
 share/doc/HTML/en/kfind/.anchors
 share/doc/HTML/en/kfind/authors.html
+share/doc/HTML/en/kfind/common
 share/doc/HTML/en/kfind/compilation-and-installation.html
 share/doc/HTML/en/kfind/configuration.html
 share/doc/HTML/en/kfind/edit.html
 share/doc/HTML/en/kfind/epilog.html
 share/doc/HTML/en/kfind/help.html
-share/doc/HTML/en/kfind/index.cvlog
 share/doc/HTML/en/kfind/index.docbook
 share/doc/HTML/en/kfind/index.html
 share/doc/HTML/en/kfind/installation.html
@@ -209,20 +213,20 @@ share/doc/HTML/en/kfind/viewing-area.html
 share/doc/HTML/en/kfloppy/.anchors
 share/doc/HTML/en/kfloppy/buttons.html
 share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/common
 share/doc/HTML/en/kfloppy/credits.html
 share/doc/HTML/en/kfloppy/formatting-options.html
-share/doc/HTML/en/kfloppy/index.cvlog
 share/doc/HTML/en/kfloppy/index.docbook
 share/doc/HTML/en/kfloppy/index.html
 share/doc/HTML/en/kfloppy/introduction.html
 share/doc/HTML/en/kfloppy/usingkfloppy.html
 share/doc/HTML/en/khexedit/.anchors
 share/doc/HTML/en/khexedit/bookmarks.html
+share/doc/HTML/en/khexedit/common
 share/doc/HTML/en/khexedit/credits.html
 share/doc/HTML/en/khexedit/document-menu.html
 share/doc/HTML/en/khexedit/edit-menu.html
 share/doc/HTML/en/khexedit/help-menu.html
-share/doc/HTML/en/khexedit/index.cvlog
 share/doc/HTML/en/khexedit/index.docbook
 share/doc/HTML/en/khexedit/index.html
 share/doc/HTML/en/khexedit/installation.html
@@ -236,6 +240,7 @@ share/doc/HTML/en/khexedit/toolbar.html
 share/doc/HTML/en/khexedit/tools-menu.html
 share/doc/HTML/en/khexedit/view-menu.html
 share/doc/HTML/en/kjots/.anchors
+share/doc/HTML/en/kjots/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -244,15 +249,28 @@ share/doc/HTML/en/kjots/keyboardshortcuts.html
 share/doc/HTML/en/kjots/subjectlist.html
 share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.html
+share/doc/HTML/en/klipper/.anchors
+share/doc/HTML/en/klipper/actions.html
+share/doc/HTML/en/klipper/common
+share/doc/HTML/en/klipper/compilation.html
+share/doc/HTML/en/klipper/configuration.html
+share/doc/HTML/en/klipper/credits.html
+share/doc/HTML/en/klipper/index.docbook
+share/doc/HTML/en/klipper/index.html
+share/doc/HTML/en/klipper/installation.html
+share/doc/HTML/en/klipper/introduction.html
+share/doc/HTML/en/klipper/requirements.html
+share/doc/HTML/en/klipper/screenshot.png
+share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kljettool/.anchors
 share/doc/HTML/en/kljettool/README
+share/doc/HTML/en/kljettool/common
 share/doc/HTML/en/kljettool/compilation-and-installation.html
 share/doc/HTML/en/kljettool/credits.html
 share/doc/HTML/en/kljettool/djcdoscommands.txt
 share/doc/HTML/en/kljettool/filter
 share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
 share/doc/HTML/en/kljettool/hp690c.zip
-share/doc/HTML/en/kljettool/index.cvlog
 share/doc/HTML/en/kljettool/index.docbook
 share/doc/HTML/en/kljettool/index.html
 share/doc/HTML/en/kljettool/installation.html
@@ -263,13 +281,15 @@ share/doc/HTML/en/kljettool/screenshot.png
 share/doc/HTML/en/kljettool/usage.html
 share/doc/HTML/en/klpq/.anchors
 share/doc/HTML/en/klpq/author.html
-share/doc/HTML/en/klpq/copyright.html
-share/doc/HTML/en/klpq/index.cvlog
+share/doc/HTML/en/klpq/common
+share/doc/HTML/en/klpq/compilation-and-installation.html
 share/doc/HTML/en/klpq/index.docbook
 share/doc/HTML/en/klpq/index.html
-share/doc/HTML/en/klpq/install.html
+share/doc/HTML/en/klpq/installation.html
 share/doc/HTML/en/klpq/introduction.html
-share/doc/HTML/en/klpq/thanks.html
+share/doc/HTML/en/klpq/mainwindow.html
+share/doc/HTML/en/klpq/requirements.html
+share/doc/HTML/en/klpq/spooler-dialog.html
 share/doc/HTML/en/klpq/todo.html
 share/doc/HTML/en/klpq/usage.html
 share/doc/HTML/en/knotes/.anchors
@@ -278,6 +298,7 @@ share/doc/HTML/en/knotes/autoindent.html
 share/doc/HTML/en/knotes/calendar.html
 share/doc/HTML/en/knotes/clear.html
 share/doc/HTML/en/knotes/colors.html
+share/doc/HTML/en/knotes/common
 share/doc/HTML/en/knotes/compilationandinstallation.html
 share/doc/HTML/en/knotes/deleteknote.html
 share/doc/HTML/en/knotes/dframe.html
@@ -303,6 +324,7 @@ share/doc/HTML/en/knotes/setdefaults.html
 share/doc/HTML/en/knotes/themenuentries.html
 share/doc/HTML/en/kpm/.anchors
 share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/common
 share/doc/HTML/en/kpm/compilation.html
 share/doc/HTML/en/kpm/credits.html
 share/doc/HTML/en/kpm/faq.html
@@ -325,6 +347,7 @@ share/doc/HTML/en/kpm/signals.html
 share/doc/HTML/en/kpm/using-kpm.html
 share/doc/HTML/en/ktimemon/.anchors
 share/doc/HTML/en/ktimemon/autoscaling.html
+share/doc/HTML/en/ktimemon/common
 share/doc/HTML/en/ktimemon/config.html
 share/doc/HTML/en/ktimemon/fund.html
 share/doc/HTML/en/ktimemon/index.cvlog
@@ -335,46 +358,6 @@ share/doc/HTML/en/ktimemon/introduction.html
 share/doc/HTML/en/ktimemon/menu.html
 share/doc/HTML/en/ktimemon/revisionhistory.html
 share/doc/HTML/en/ktimemon/thanksandacknowledgements.html
-share/doc/HTML/en/ktop/.anchors
-share/doc/HTML/en/ktop/authors.html
-share/doc/HTML/en/ktop/compilationandinstallation.html
-share/doc/HTML/en/ktop/index.cvlog
-share/doc/HTML/en/ktop/index.docbook
-share/doc/HTML/en/ktop/index.html
-share/doc/HTML/en/ktop/installation.html
-share/doc/HTML/en/ktop/installingthetaskmanagericonperformancemeter.html
-share/doc/HTML/en/ktop/introduction.html
-share/doc/HTML/en/ktop/licenseandwarranty.html
-share/doc/HTML/en/ktop/pop-upmenus.html
-share/doc/HTML/en/ktop/questionsandanswersnothinghereyet.html
-share/doc/HTML/en/ktop/requirements.html
-share/doc/HTML/en/ktop/theperformancemeterpage.html
-share/doc/HTML/en/ktop/theprocesstreepage.html
-share/doc/HTML/en/ktop/usingthekdetaskmanager.html
-share/doc/HTML/en/kwrite/.anchors
-share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/command-line-options.html
-share/doc/HTML/en/kwrite/credits.html
-share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/help.html
-share/doc/HTML/en/kwrite/index.cvlog
-share/doc/HTML/en/kwrite/index.docbook
-share/doc/HTML/en/kwrite/index.docbook.eric
-share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/introduction.html
-share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/on-screen-fundamentals.html
-share/doc/HTML/en/kwrite/pref-dialog.html
-share/doc/HTML/en/kwrite/pref-edit.html
-share/doc/HTML/en/kwrite/pref-highlighting.html
-share/doc/HTML/en/kwrite/pref-keybindings.html
-share/doc/HTML/en/kwrite/pref-select.html
-share/doc/HTML/en/kwrite/prefcolors.html
-share/doc/HTML/en/kwrite/prefspellchecker.html
-share/doc/HTML/en/kwrite/search.html
-share/doc/HTML/en/kwrite/settings.html
-share/doc/HTML/en/kwrite/the-menu-entries.html
-share/doc/HTML/en/kwrite/tools.html
 share/icons/hicolor/32x32/apps/ark.png
 share/icons/hicolor/32x32/apps/kab.png
 share/icons/hicolor/32x32/apps/karm.png
@@ -453,14 +436,12 @@ share/icons/locolor/32x32/apps/laptop_nocharge.png
 share/icons/locolor/32x32/apps/laptop_pcmcia.png
 share/icons/locolor/32x32/apps/laptop_settings.png
 share/icons/locolor/32x32/apps/power.png
-@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
-@dirrm share/doc/HTML/en/kwrite
-@dirrm share/doc/HTML/en/ktop
 @dirrm share/doc/HTML/en/ktimemon
 @dirrm share/doc/HTML/en/kpm
 @dirrm share/doc/HTML/en/knotes
 @dirrm share/doc/HTML/en/klpq
 @dirrm share/doc/HTML/en/kljettool
+@dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kjots
 @dirrm share/doc/HTML/en/khexedit
 @dirrm share/doc/HTML/en/kfloppy
@@ -472,30 +453,18 @@ share/icons/locolor/32x32/apps/power.png
 @dirrm share/doc/HTML/en/kab
 @dirrm share/doc/HTML/en/ark
 @dirrm share/apps/knotes/pics
-@dirrm share/apps/knotes
 @dirrm share/apps/kljetool/pics
-@dirrm share/apps/kljetool
 @dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
+@dirrm share/apps/kicker/applets
 @dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit
 @dirrm share/apps/kfloppy/pics
-@dirrm share/apps/kfloppy
 @dirrm share/apps/kfind/icons/locolor/22x22/actions
-@dirrm share/apps/kfind/icons/locolor/22x22
-@dirrm share/apps/kfind/icons/locolor
-@dirrm share/apps/kfind/icons
-@dirrm share/apps/kfind
 @dirrm share/apps/kedit/toolbar
 @dirrm share/apps/kedit/pics
 @dirrm share/apps/kedit
 @dirrm share/apps/kcalc/pics
-@dirrm share/apps/kcalc
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
 @dirrm share/apps/ark/icons/locolor/22x22/actions
-@dirrm share/apps/ark/icons/locolor/22x22
-@dirrm share/apps/ark/icons/locolor
-@dirrm share/apps/ark/icons
 @dirrm share/apps/ark