aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2000-09-16 05:40:47 +0800
committerwill <will@FreeBSD.org>2000-09-16 05:40:47 +0800
commit71618465be1f276328d24be2f32bf35b63d88a6f (patch)
tree64aa73185fc99881a91f61ad14a73f70437115a2
parentf8205894e668af72e5c61060bc43b0b4e328548d (diff)
downloadfreebsd-ports-gnome-71618465be1f276328d24be2f32bf35b63d88a6f.tar.gz
freebsd-ports-gnome-71618465be1f276328d24be2f32bf35b63d88a6f.tar.zst
freebsd-ports-gnome-71618465be1f276328d24be2f32bf35b63d88a6f.zip
Update to KDE 1.94, the fifth and final beta release of KDE 2.0. If you
have not tried KDE 2.0 or haven't done so in awhile (i.e. since July or before), you should try this. This version is extremely stable and offers better functionality than before. This update also introduces the KDE2 modules kdegraphics and kdemultimedia to our ports tree. Additionally, this marks the first time FreeBSD packages were announced as part of the KDE2 beta release announcement! :-) Most (if not all) of the remaining modules in KDE2 will be added for the update WRT the final release. A hack was added to fix building with SSL in kdelibs; this has been merged in the main tree and will go away with 2.0 release update. Thanks to David Faure <david@mandrakesoft.com> for his help regarding this. Also, building the docs should now succeed because I've added a build dependency on jade and linuxdoc (should be enough). People can get my precompiled packages from the usual location on the KDE FTP server (should spread to the mirrors Real Soon Now (tm)): http://ftp.kde.org/pub/kde/unstable/distribution/2.0Beta5/tar/FreeBSD/ Have fun! Remember to reports bugs through http://bugs.kde.org/.
-rw-r--r--archivers/ark/Makefile5
-rw-r--r--archivers/ark/distinfo2
-rw-r--r--archivers/ark/pkg-plist105
-rw-r--r--audio/kdemultimedia2/Makefile34
-rw-r--r--audio/kdemultimedia2/distinfo2
-rw-r--r--audio/kdemultimedia2/pkg-comment2
-rw-r--r--audio/kdemultimedia2/pkg-plist669
-rw-r--r--audio/kdemultimedia3/Makefile34
-rw-r--r--audio/kdemultimedia3/distinfo2
-rw-r--r--audio/kdemultimedia3/pkg-comment2
-rw-r--r--audio/kdemultimedia3/pkg-plist669
-rw-r--r--comms/kremotecontrol/Makefile5
-rw-r--r--comms/kremotecontrol/distinfo2
-rw-r--r--comms/kremotecontrol/pkg-plist105
-rw-r--r--converters/kdesupport2/Makefile10
-rw-r--r--converters/kdesupport2/distinfo2
-rw-r--r--converters/kdesupport2/pkg-plist1
-rw-r--r--deskutils/kcharselect/Makefile5
-rw-r--r--deskutils/kcharselect/distinfo2
-rw-r--r--deskutils/kcharselect/pkg-plist105
-rw-r--r--editors/calligra/Makefile8
-rw-r--r--editors/calligra/distinfo2
-rw-r--r--editors/calligra/pkg-plist43
-rw-r--r--editors/koffice-kde3/Makefile8
-rw-r--r--editors/koffice-kde3/distinfo2
-rw-r--r--editors/koffice-kde3/pkg-plist43
-rw-r--r--editors/koffice-kde4/Makefile8
-rw-r--r--editors/koffice-kde4/distinfo2
-rw-r--r--editors/koffice-kde4/pkg-plist43
-rw-r--r--editors/koffice/Makefile8
-rw-r--r--editors/koffice/distinfo2
-rw-r--r--editors/koffice/pkg-plist43
-rw-r--r--games/kdegames2/Makefile8
-rw-r--r--games/kdegames2/distinfo2
-rw-r--r--games/kdegames2/pkg-plist229
-rw-r--r--games/kdegames3/Makefile8
-rw-r--r--games/kdegames3/distinfo2
-rw-r--r--games/kdegames3/pkg-plist229
-rw-r--r--games/kdegames4/Makefile8
-rw-r--r--games/kdegames4/distinfo2
-rw-r--r--games/kdegames4/pkg-plist229
-rw-r--r--graphics/kdegraphics2/Makefile34
-rw-r--r--graphics/kdegraphics2/distinfo2
-rw-r--r--graphics/kdegraphics2/pkg-comment2
-rw-r--r--graphics/kdegraphics2/pkg-plist538
-rw-r--r--graphics/kdegraphics3/Makefile34
-rw-r--r--graphics/kdegraphics3/distinfo2
-rw-r--r--graphics/kdegraphics3/pkg-comment2
-rw-r--r--graphics/kdegraphics3/pkg-plist538
-rw-r--r--graphics/kdegraphics4/Makefile34
-rw-r--r--graphics/kdegraphics4/distinfo2
-rw-r--r--graphics/kdegraphics4/pkg-comment2
-rw-r--r--graphics/kdegraphics4/pkg-plist538
-rw-r--r--math/kcalc/Makefile5
-rw-r--r--math/kcalc/distinfo2
-rw-r--r--math/kcalc/pkg-plist105
-rw-r--r--misc/kdeutils2/Makefile5
-rw-r--r--misc/kdeutils2/distinfo2
-rw-r--r--misc/kdeutils2/pkg-plist105
-rw-r--r--misc/kdeutils3/Makefile5
-rw-r--r--misc/kdeutils3/distinfo2
-rw-r--r--misc/kdeutils3/pkg-plist105
-rw-r--r--misc/kdeutils4/Makefile5
-rw-r--r--misc/kdeutils4/distinfo2
-rw-r--r--misc/kdeutils4/pkg-plist105
-rw-r--r--multimedia/kdemultimedia3/Makefile34
-rw-r--r--multimedia/kdemultimedia3/distinfo2
-rw-r--r--multimedia/kdemultimedia3/pkg-comment2
-rw-r--r--multimedia/kdemultimedia3/pkg-plist669
-rw-r--r--multimedia/kdemultimedia4/Makefile34
-rw-r--r--multimedia/kdemultimedia4/distinfo2
-rw-r--r--multimedia/kdemultimedia4/pkg-comment2
-rw-r--r--multimedia/kdemultimedia4/pkg-plist669
-rw-r--r--net/kdenetwork2/Makefile9
-rw-r--r--net/kdenetwork2/distinfo2
-rw-r--r--net/kdenetwork2/pkg-plist234
-rw-r--r--net/kdenetwork3/Makefile9
-rw-r--r--net/kdenetwork3/distinfo2
-rw-r--r--net/kdenetwork3/pkg-plist234
-rw-r--r--net/kdenetwork4/Makefile9
-rw-r--r--net/kdenetwork4/distinfo2
-rw-r--r--net/kdenetwork4/pkg-plist234
-rw-r--r--security/kgpg-kde4/Makefile5
-rw-r--r--security/kgpg-kde4/distinfo2
-rw-r--r--security/kgpg-kde4/pkg-plist105
-rw-r--r--security/kwallet/Makefile5
-rw-r--r--security/kwallet/distinfo2
-rw-r--r--security/kwallet/pkg-plist105
-rw-r--r--sysutils/kdf/Makefile5
-rw-r--r--sysutils/kdf/distinfo2
-rw-r--r--sysutils/kdf/pkg-plist105
-rw-r--r--sysutils/kfloppy/Makefile5
-rw-r--r--sysutils/kfloppy/distinfo2
-rw-r--r--sysutils/kfloppy/pkg-plist105
-rw-r--r--sysutils/sweeper/Makefile5
-rw-r--r--sysutils/sweeper/distinfo2
-rw-r--r--sysutils/sweeper/pkg-plist105
-rw-r--r--x11-clocks/kdetoys2/Makefile8
-rw-r--r--x11-clocks/kdetoys2/distinfo2
-rw-r--r--x11-clocks/kdetoys2/pkg-plist29
-rw-r--r--x11-clocks/kdetoys3/Makefile8
-rw-r--r--x11-clocks/kdetoys3/distinfo2
-rw-r--r--x11-clocks/kdetoys3/pkg-plist29
-rw-r--r--x11-clocks/kdetoys4/Makefile8
-rw-r--r--x11-clocks/kdetoys4/distinfo2
-rw-r--r--x11-clocks/kdetoys4/pkg-plist29
-rw-r--r--x11/kde2/Makefile6
-rw-r--r--x11/kde3/Makefile6
-rw-r--r--x11/kde4-baseapps/Makefile8
-rw-r--r--x11/kde4-baseapps/distinfo2
-rw-r--r--x11/kde4-baseapps/pkg-plist341
-rw-r--r--x11/kde4-runtime/Makefile8
-rw-r--r--x11/kde4-runtime/distinfo2
-rw-r--r--x11/kde4-runtime/pkg-plist341
-rw-r--r--x11/kde4-workspace/Makefile8
-rw-r--r--x11/kde4-workspace/distinfo2
-rw-r--r--x11/kde4-workspace/pkg-plist341
-rw-r--r--x11/kde4/Makefile6
-rw-r--r--x11/kdebase2/Makefile8
-rw-r--r--x11/kdebase2/distinfo2
-rw-r--r--x11/kdebase2/pkg-plist341
-rw-r--r--x11/kdebase3/Makefile8
-rw-r--r--x11/kdebase3/distinfo2
-rw-r--r--x11/kdebase3/pkg-plist341
-rw-r--r--x11/kdebase4-runtime/Makefile8
-rw-r--r--x11/kdebase4-runtime/distinfo2
-rw-r--r--x11/kdebase4-runtime/pkg-plist341
-rw-r--r--x11/kdebase4-workspace/Makefile8
-rw-r--r--x11/kdebase4-workspace/distinfo2
-rw-r--r--x11/kdebase4-workspace/pkg-plist341
-rw-r--r--x11/kdebase4/Makefile8
-rw-r--r--x11/kdebase4/distinfo2
-rw-r--r--x11/kdebase4/pkg-plist341
-rw-r--r--x11/kdelibs2/Makefile10
-rw-r--r--x11/kdelibs2/distinfo2
-rw-r--r--x11/kdelibs2/pkg-plist60
-rw-r--r--x11/kdelibs3/Makefile10
-rw-r--r--x11/kdelibs3/distinfo2
-rw-r--r--x11/kdelibs3/pkg-plist60
-rw-r--r--x11/kdelibs4/Makefile10
-rw-r--r--x11/kdelibs4/distinfo2
-rw-r--r--x11/kdelibs4/pkg-plist60
142 files changed, 5353 insertions, 5383 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/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/archivers/ark/distinfo b/archivers/ark/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark/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
diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile
index a790c0467e1b..7edc2afde790 100644
--- a/audio/kdemultimedia2/Makefile
+++ b/audio/kdemultimedia2/Makefile
@@ -1,27 +1,33 @@
-# New ports collection makefile for: kdemultimedia
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
+# New ports collection makefile for: KDE2 Multimedia
+# Date created: Saturday 2 September 2000
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= kdemultimedia
-PORTVERSION= 1.1.2
-CATEGORIES= audio kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+PORTVERSION= 1.94
+CATEGORIES= misc kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
-MAINTAINER= se@freebsd.org
+MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.3:${PORTSDIR}/x11/kdelibs11
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
+MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)"
-CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
- INSTALL_SCRIPT="install -c -m 555"
+INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+ --with-qt-includes=${X11BASE}/include/qt2 \
+ --with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/audio/kdemultimedia2/distinfo b/audio/kdemultimedia2/distinfo
index 745eae46729e..e1b274b524a1 100644
--- a/audio/kdemultimedia2/distinfo
+++ b/audio/kdemultimedia2/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-1.1.2.tar.bz2) = 91018d4cad9420d376d94aba034e1bbe
+MD5 (kdemultimedia-1.94.tar.bz2) = bae3c4421e28631a0646c59e47e13b32
diff --git a/audio/kdemultimedia2/pkg-comment b/audio/kdemultimedia2/pkg-comment
index 6f31b51504cc..186230f9287d 100644
--- a/audio/kdemultimedia2/pkg-comment
+++ b/audio/kdemultimedia2/pkg-comment
@@ -1 +1 @@
-KDE audio tools
+Utilities for the KDE integrated X11 desktop
diff --git a/audio/kdemultimedia2/pkg-plist b/audio/kdemultimedia2/pkg-plist
index 34fd257b8340..9686179e2512 100644
--- a/audio/kdemultimedia2/pkg-plist
+++ b/audio/kdemultimedia2/pkg-plist
@@ -1,30 +1,162 @@
-bin/cddaslave
-bin/kmedia
+bin/aktion
+bin/artsbuilder
+bin/artscontrol
+bin/kaiman
bin/kmid
bin/kmidi
bin/kmix
-bin/kscd
-bin/kscdmagic
-bin/workman2cddb.pl
-share/applnk/Multimedia/KMedia.kdelnk
-share/applnk/Multimedia/KMidi.kdelnk
-share/applnk/Multimedia/KMix.kdelnk
-share/applnk/Multimedia/kmid.kdelnk
-share/applnk/Multimedia/kscd.kdelnk
-share/apps/kmedia/pics/eject.xbm
-share/apps/kmedia/pics/ff.xbm
-share/apps/kmedia/pics/kmedia.xpm
-share/apps/kmedia/pics/kmedia_mini.xpm
-share/apps/kmedia/pics/lock.xbm
-share/apps/kmedia/pics/logo.xbm
-share/apps/kmedia/pics/nexttrk.xbm
-share/apps/kmedia/pics/playpause.xbm
-share/apps/kmedia/pics/playpause_both.xpm
-share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmedia/pics/poweroff.xbm
-share/apps/kmedia/pics/prevtrk.xbm
-share/apps/kmedia/pics/rew.xbm
-share/apps/kmedia/pics/stop.xbm
+bin/kmixctrl
+bin/midisend
+bin/sf2cfg
+bin/timidity
+lib/Arts/StructureBuilder.mcopclass
+lib/Arts/StructureDesc.mcopclass
+lib/Arts/Synth_ENVELOPE_ADSR.mcopclass
+lib/Arts/Synth_MIDI_TEST.mcopclass
+lib/Arts/Synth_NOISE.mcopclass
+lib/Arts/Synth_SHELVE_CUTOFF.mcopclass
+lib/Arts/Synth_WAVE_TRI.mcopclass
+lib/Arts/Synth_XFADE.mcopclass
+lib/artsmodules.mcopclass
+lib/artsmodules.mcoptype
+lib/libaktion.la
+lib/libaktion.so
+lib/libaktion.so.1
+lib/libartsbuilder.la
+lib/libartsbuilder.so
+lib/libartsbuilder.so.0
+lib/libartsmodules.la
+lib/libartsmodules.so
+lib/libartsmodules.so.0
+lib/libkcm_kmix.la
+lib/libkcm_kmix.so
+lib/libkmidpart.la
+lib/libkmidpart.so
+lib/libkmidpart.so.1
+lib/libkmixapplet.la
+lib/libkmixapplet.so
+lib/libkmixapplet.so.1
+share/applnk/Multimedia/aktion.desktop
+share/applnk/Multimedia/artsbuilder.desktop
+share/applnk/Multimedia/artscontrol.desktop
+share/applnk/Multimedia/kaiman.desktop
+share/applnk/Multimedia/kmid.desktop
+share/applnk/Multimedia/kmidi.desktop
+share/applnk/Multimedia/kmix.desktop
+share/applnk/Multimedia/timidity.desktop
+share/applnk/Settings/Sound/kmix.desktop
+share/apps/aktion/aktion_part.rc
+share/apps/aktion/toolbar/ak_maximize.png
+share/apps/aktion/toolbar/ak_setup.png
+share/apps/aktion/toolbar/aktion_logo.png
+share/apps/aktion/toolbar/avanzar.png
+share/apps/aktion/toolbar/ayuda.png
+share/apps/aktion/toolbar/double.png
+share/apps/aktion/toolbar/fullscreen.png
+share/apps/aktion/toolbar/half.png
+share/apps/aktion/toolbar/original.png
+share/apps/aktion/toolbar/parar.png
+share/apps/aktion/toolbar/pause.png
+share/apps/aktion/toolbar/retroceder.png
+share/apps/aktion/toolbar/tocar.png
+share/apps/artscontrol/artscontrol.rc
+share/apps/kaiman/Skins/car-preset/btn_exit.png
+share/apps/kaiman/Skins/car-preset/btn_iconify.png
+share/apps/kaiman/Skins/car-preset/btn_list.png
+share/apps/kaiman/Skins/car-preset/btn_next.png
+share/apps/kaiman/Skins/car-preset/btn_p1.png
+share/apps/kaiman/Skins/car-preset/btn_p2.png
+share/apps/kaiman/Skins/car-preset/btn_p3.png
+share/apps/kaiman/Skins/car-preset/btn_p4.png
+share/apps/kaiman/Skins/car-preset/btn_p5.png
+share/apps/kaiman/Skins/car-preset/btn_p6.png
+share/apps/kaiman/Skins/car-preset/btn_play.png
+share/apps/kaiman/Skins/car-preset/btn_prev.png
+share/apps/kaiman/Skins/car-preset/btn_sml.png
+share/apps/kaiman/Skins/car-preset/btn_stop.png
+share/apps/kaiman/Skins/car-preset/btn_voldn.png
+share/apps/kaiman/Skins/car-preset/btn_volup.png
+share/apps/kaiman/Skins/car-preset/digbig.png
+share/apps/kaiman/Skins/car-preset/digmed.png
+share/apps/kaiman/Skins/car-preset/letters.png
+share/apps/kaiman/Skins/car-preset/main.png
+share/apps/kaiman/Skins/car-preset/monoster.png
+share/apps/kaiman/Skins/car-preset/posbar.png
+share/apps/kaiman/Skins/car-preset/random.png
+share/apps/kaiman/Skins/car-preset/repeat.png
+share/apps/kaiman/Skins/car-preset/skindata
+share/apps/kaiman/Skins/car-preset/status.png
+share/apps/kaiman/Skins/car-preset/volume.png
+share/apps/kaiman/Skins/circle/back.png
+share/apps/kaiman/Skins/circle/back_mask.png
+share/apps/kaiman/Skins/circle/back_sm.png
+share/apps/kaiman/Skins/circle/back_sm_mask.png
+share/apps/kaiman/Skins/circle/bar_pos.png
+share/apps/kaiman/Skins/circle/bar_vol.png
+share/apps/kaiman/Skins/circle/btn_exit.png
+share/apps/kaiman/Skins/circle/btn_iconify.png
+share/apps/kaiman/Skins/circle/btn_list.png
+share/apps/kaiman/Skins/circle/btn_mode.png
+share/apps/kaiman/Skins/circle/btn_next.png
+share/apps/kaiman/Skins/circle/btn_play.png
+share/apps/kaiman/Skins/circle/btn_pref.png
+share/apps/kaiman/Skins/circle/btn_prev.png
+share/apps/kaiman/Skins/circle/btn_repeat.png
+share/apps/kaiman/Skins/circle/btn_shuffle.png
+share/apps/kaiman/Skins/circle/btn_sm_exit.png
+share/apps/kaiman/Skins/circle/btn_sm_iconify.png
+share/apps/kaiman/Skins/circle/btn_sm_mode.png
+share/apps/kaiman/Skins/circle/btn_sm_next.png
+share/apps/kaiman/Skins/circle/btn_sm_play.png
+share/apps/kaiman/Skins/circle/btn_sm_prev.png
+share/apps/kaiman/Skins/circle/btn_sm_stop.png
+share/apps/kaiman/Skins/circle/btn_stop.png
+share/apps/kaiman/Skins/circle/dig.png
+share/apps/kaiman/Skins/circle/digsml.png
+share/apps/kaiman/Skins/circle/letters.png
+share/apps/kaiman/Skins/circle/skindata
+share/apps/kaiman/Skins/circle/status.png
+share/apps/kaiman/Skins/k9/README
+share/apps/kaiman/Skins/k9/conf.jpg
+share/apps/kaiman/Skins/k9/conf.png
+share/apps/kaiman/Skins/k9/eject.jpg
+share/apps/kaiman/Skins/k9/icon.jpg
+share/apps/kaiman/Skins/k9/icon.png
+share/apps/kaiman/Skins/k9/kill.jpg
+share/apps/kaiman/Skins/k9/kill.png
+share/apps/kaiman/Skins/k9/knine-nfont.jpg
+share/apps/kaiman/Skins/k9/knine-nfont.png
+share/apps/kaiman/Skins/k9/knine-nfont2.jpg
+share/apps/kaiman/Skins/k9/knine-nfont2.png
+share/apps/kaiman/Skins/k9/knine-normal2.jpg
+share/apps/kaiman/Skins/k9/knine-normal2.png
+share/apps/kaiman/Skins/k9/knine-vfont.jpg
+share/apps/kaiman/Skins/k9/knine-vfont.png
+share/apps/kaiman/Skins/k9/long2.jpg
+share/apps/kaiman/Skins/k9/mask.png
+share/apps/kaiman/Skins/k9/newtext.jpg
+share/apps/kaiman/Skins/k9/newtext.png
+share/apps/kaiman/Skins/k9/next.jpg
+share/apps/kaiman/Skins/k9/pause.jpg
+share/apps/kaiman/Skins/k9/play.jpg
+share/apps/kaiman/Skins/k9/pos_item.jpg
+share/apps/kaiman/Skins/k9/repeat.jpg
+share/apps/kaiman/Skins/k9/repeat.png
+share/apps/kaiman/Skins/k9/reverse.jpg
+share/apps/kaiman/Skins/k9/shuffle.jpg
+share/apps/kaiman/Skins/k9/shuffle.png
+share/apps/kaiman/Skins/k9/skindata
+share/apps/kaiman/Skins/k9/small-k.jpg
+share/apps/kaiman/Skins/k9/small-k.png
+share/apps/kaiman/Skins/k9/square.jpg
+share/apps/kaiman/Skins/k9/square.png
+share/apps/kaiman/Skins/k9/status.jpg
+share/apps/kaiman/Skins/k9/status.png
+share/apps/kaiman/Skins/k9/stop.jpg
+share/apps/kaiman/Skins/k9/trans-pos.png
+share/apps/kaiman/Skins/k9/trans-slide.png
+share/apps/kaiman/kaimanui.rc
+share/apps/kicker/applets/kmixapplet.desktop
share/apps/kmid/AnotherGlitchInTheCall.kar
share/apps/kmid/OFortuna.kar
share/apps/kmid/StopInTheNameOfLove.kar
@@ -33,305 +165,222 @@ share/apps/kmid/fm/drums.o3
share/apps/kmid/fm/drums.sb
share/apps/kmid/fm/std.o3
share/apps/kmid/fm/std.sb
+share/apps/kmid/icons/button1.xpm
+share/apps/kmid/icons/button2.xpm
+share/apps/kmid/icons/hicolor/22x22/actions/piano.png
+share/apps/kmid/icons/hicolor/22x22/actions/volume.png
+share/apps/kmid/icons/hicolor/32x32/actions/piano.png
+share/apps/kmid/icons/hicolor/32x32/actions/volume.png
+share/apps/kmid/icons/keyboard.xpm
+share/apps/kmid/icons/locolor/16x16/actions/piano.png
+share/apps/kmid/icons/locolor/16x16/actions/volume.png
+share/apps/kmid/kmid_partui.rc
+share/apps/kmid/kmidui.rc
share/apps/kmid/maps/YamahaPSR500.map
share/apps/kmid/maps/YamahaPSS790.map
+share/apps/kmid/maps/YamahaQY10.map
share/apps/kmid/maps/gm.map
-share/apps/kmid/pics/button1.xpm
-share/apps/kmid/pics/button2.xpm
-share/apps/kmid/pics/keyboard.xpm
-share/apps/kmid/toolbar/kmid_chn.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
-share/apps/kmid/toolbar/kmid_volume.xpm
-share/apps/kmidi/config/chaos12-voices
-share/apps/kmidi/config/chaos8-voices
-share/apps/kmidi/config/gravis.cfg
-share/apps/kmidi/config/gsdrum.cfg
-share/apps/kmidi/config/megadrum
-share/apps/kmidi/config/megainst
-share/apps/kmidi/config/midia.cfg
-share/apps/kmidi/config/mt32.cfg
-share/apps/kmidi/config/patch/acpiano.pat
-share/apps/kmidi/config/patch/nylongt2.pat
-share/apps/kmidi/config/pila-voices
-share/apps/kmidi/config/sndfont.cfg
-share/apps/kmidi/config/sound-canvas-drums
-share/apps/kmidi/config/timidity.cfg
-share/apps/kmidi/config/wowpats.cfg
-share/apps/kmidi/pics/kmidilogo.xpm
-share/apps/kmix/pics/kmixdocked.xpm
-share/apps/kmix/pics/mix_audio.xpm
-share/apps/kmix/pics/mix_bass.xpm
-share/apps/kmix/pics/mix_cd.xpm
-share/apps/kmix/pics/mix_ext.xpm
-share/apps/kmix/pics/mix_microphone.xpm
-share/apps/kmix/pics/mix_midi.xpm
-share/apps/kmix/pics/mix_recmon.xpm
-share/apps/kmix/pics/mix_treble.xpm
-share/apps/kmix/pics/mix_unknown.xpm
-share/apps/kmix/pics/mix_volume.xpm
-share/apps/kscd/pics/cdsmall.xpm
-share/apps/kscd/pics/kscdlogo.xpm
-share/doc/HTML/de/kmidi/kmidi-1.html
-share/doc/HTML/de/kmidi/kmidi-2.html
-share/doc/HTML/de/kmidi/kmidi-3.html
-share/doc/HTML/de/kmidi/kmidi-4.html
-share/doc/HTML/de/kmidi/kmidi-5.html
-share/doc/HTML/de/kmidi/kmidi.html
-share/doc/HTML/de/kmidi/kmidi.sgml
-share/doc/HTML/de/kmidi/logotp3.gif
-share/doc/HTML/en/kmedia/index-1.html
-share/doc/HTML/en/kmedia/index-2.html
-share/doc/HTML/en/kmedia/index-3.html
-share/doc/HTML/en/kmedia/index-4.html
-share/doc/HTML/en/kmedia/index-5.html
-share/doc/HTML/en/kmedia/index.html
-share/doc/HTML/en/kmedia/logotp3.gif
-share/doc/HTML/en/kmid/index-1.html
-share/doc/HTML/en/kmid/index-2.html
-share/doc/HTML/en/kmid/index-3.html
-share/doc/HTML/en/kmid/index-4.html
-share/doc/HTML/en/kmid/index-5.html
-share/doc/HTML/en/kmid/index-6.html
-share/doc/HTML/en/kmid/index-7.html
-share/doc/HTML/en/kmid/index-8.html
-share/doc/HTML/en/kmid/index-9.html
+share/apps/kmidi/Axel_Elf.mid
+share/apps/kmidi/Cavatina.mid
+share/apps/kmidi/Jarre-Chung_Kuo.mid
+share/apps/kmidi/Malaguena.mid
+share/apps/kmidi/Mission_Impossible.mid
+share/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid
+share/apps/kmidi/georgia.mid
+share/apps/kmidi/mpostman.mid
+share/apps/kmidi/pics/kmidilogo.png
+share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/kmixdocked.png
+share/apps/kmix/pics/logo.png
+share/apps/kmix/pics/mix_audio.png
+share/apps/kmix/pics/mix_bass.png
+share/apps/kmix/pics/mix_cd.png
+share/apps/kmix/pics/mix_ext.png
+share/apps/kmix/pics/mix_microphone.png
+share/apps/kmix/pics/mix_midi.png
+share/apps/kmix/pics/mix_recmon.png
+share/apps/kmix/pics/mix_surround.png
+share/apps/kmix/pics/mix_treble.png
+share/apps/kmix/pics/mix_unknown.png
+share/apps/kmix/pics/mix_video.png
+share/apps/kmix/pics/mix_volume.png
+share/config/aktionrc
+share/doc/HTML/en/artsbuilder/.anchors
+share/doc/HTML/en/artsbuilder/common
+share/doc/HTML/en/artsbuilder/index.docbook
+share/doc/HTML/en/artsbuilder/index.html
+share/doc/HTML/en/artsbuilder/insidearts.html
+share/doc/HTML/en/artsbuilder/introduction.html
+share/doc/HTML/en/artsbuilder/quickstart.html
+share/doc/HTML/en/kmid/.anchors
+share/doc/HTML/en/kmid/abouttheauthor.html
+share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
+share/doc/HTML/en/kmid/advancedfeatures.html
+share/doc/HTML/en/kmid/collections.html
+share/doc/HTML/en/kmid/common
+share/doc/HTML/en/kmid/compilationandinstallation.html
+share/doc/HTML/en/kmid/creatingamidimap.html
+share/doc/HTML/en/kmid/deletingacollection.html
+share/doc/HTML/en/kmid/displayinglyrics.html
+share/doc/HTML/en/kmid/doineedamidimap.html
+share/doc/HTML/en/kmid/finalnotes.html
+share/doc/HTML/en/kmid/frequentlyaskedquestionsfaq.html
+share/doc/HTML/en/kmid/generalusage.html
+share/doc/HTML/en/kmid/hallofkmidsfriends.html
+share/doc/HTML/en/kmid/index.cvlog
+share/doc/HTML/en/kmid/index.docbook
share/doc/HTML/en/kmid/index.html
-share/doc/HTML/en/kmid/logotp3.gif
-share/doc/HTML/en/kmidi/kmidi-1.html
-share/doc/HTML/en/kmidi/kmidi-2.html
-share/doc/HTML/en/kmidi/kmidi-3.html
-share/doc/HTML/en/kmidi/kmidi-4.html
-share/doc/HTML/en/kmidi/kmidi-5.html
-share/doc/HTML/en/kmidi/kmidi.html
-share/doc/HTML/en/kmidi/kmidi.nif
-share/doc/HTML/en/kmidi/kmidi.sgml
-share/doc/HTML/en/kmidi/logotp3.gif
-share/doc/HTML/en/kmix/index-1.html
-share/doc/HTML/en/kmix/index-2.html
-share/doc/HTML/en/kmix/index-3.html
-share/doc/HTML/en/kmix/index-4.html
-share/doc/HTML/en/kmix/index-5.html
-share/doc/HTML/en/kmix/index-6.html
+share/doc/HTML/en/kmid/installation.html
+share/doc/HTML/en/kmid/introduction.html
+share/doc/HTML/en/kmid/keybindings.html
+share/doc/HTML/en/kmid/midimaps.html
+share/doc/HTML/en/kmid/playinginorderoratrandom.html
+share/doc/HTML/en/kmid/playingsongs.html
+share/doc/HTML/en/kmid/removingsongsfromcollections.html
+share/doc/HTML/en/kmid/requirements.html
+share/doc/HTML/en/kmid/selectingasongfromacollection.html
+share/doc/HTML/en/kmid/thetempolcd.html
+share/doc/HTML/en/kmid/thetemporarycollection.html
+share/doc/HTML/en/kmid/usingmidimaps.html
+share/doc/HTML/en/kmidi/.anchors
+share/doc/HTML/en/kmidi/FAQ
+share/doc/HTML/en/kmidi/commandlineoptions.html
+share/doc/HTML/en/kmidi/common
+share/doc/HTML/en/kmidi/compilationandinstallation.html
+share/doc/HTML/en/kmidi/computationissues.html
+share/doc/HTML/en/kmidi/configuring.html
+share/doc/HTML/en/kmidi/copyright.html
+share/doc/HTML/en/kmidi/credits.html
+share/doc/HTML/en/kmidi/design.html
+share/doc/HTML/en/kmidi/effects.html
+share/doc/HTML/en/kmidi/index.cvlog
+share/doc/HTML/en/kmidi/index.docbook
+share/doc/HTML/en/kmidi/index.html
+share/doc/HTML/en/kmidi/installation.html
+share/doc/HTML/en/kmidi/introduction.html
+share/doc/HTML/en/kmidi/memoryissues.html
+share/doc/HTML/en/kmidi/midifilenames.html
+share/doc/HTML/en/kmidi/midiimplementation.html
+share/doc/HTML/en/kmidi/patches.html
+share/doc/HTML/en/kmidi/patchsets.html
+share/doc/HTML/en/kmidi/playlists.html
+share/doc/HTML/en/kmidi/polyphony.html
+share/doc/HTML/en/kmidi/questionsandanswers.html
+share/doc/HTML/en/kmidi/requirements.html
+share/doc/HTML/en/kmidi/synthesismodel.html
+share/doc/HTML/en/kmidi/usage.html
+share/doc/HTML/en/kmidi/volume.html
+share/doc/HTML/en/kmix/.anchors
+share/doc/HTML/en/kmix/advancedfeatures.html
+share/doc/HTML/en/kmix/commandlinearguments.html
+share/doc/HTML/en/kmix/common
+share/doc/HTML/en/kmix/compilationandinstallation.html
+share/doc/HTML/en/kmix/configurationoptions.html
+share/doc/HTML/en/kmix/help.html
+share/doc/HTML/en/kmix/index.cvlog
+share/doc/HTML/en/kmix/index.docbook
share/doc/HTML/en/kmix/index.html
-share/doc/HTML/en/kmix/logotp3.gif
-share/doc/HTML/en/kscd/kscd-1.html
-share/doc/HTML/en/kscd/kscd-2.html
-share/doc/HTML/en/kscd/kscd-3.html
-share/doc/HTML/en/kscd/kscd-4.html
-share/doc/HTML/en/kscd/kscd-5.html
-share/doc/HTML/en/kscd/kscd-6.html
-share/doc/HTML/en/kscd/kscd-7.html
-share/doc/HTML/en/kscd/kscd-8.html
-share/doc/HTML/en/kscd/kscd.html
-share/doc/HTML/en/kscd/kscd1.gif
-share/doc/HTML/en/kscd/kscd10.gif
-share/doc/HTML/en/kscd/kscd11.gif
-share/doc/HTML/en/kscd/kscd12.gif
-share/doc/HTML/en/kscd/kscd13.gif
-share/doc/HTML/en/kscd/kscd14.gif
-share/doc/HTML/en/kscd/kscd15.gif
-share/doc/HTML/en/kscd/kscd16.gif
-share/doc/HTML/en/kscd/kscd2.gif
-share/doc/HTML/en/kscd/kscd2a.gif
-share/doc/HTML/en/kscd/kscd3.gif
-share/doc/HTML/en/kscd/kscd4.gif
-share/doc/HTML/en/kscd/kscd5.gif
-share/doc/HTML/en/kscd/kscd6.gif
-share/doc/HTML/en/kscd/kscd7.gif
-share/doc/HTML/en/kscd/kscd8.gif
-share/doc/HTML/en/kscd/kscd9.gif
-share/doc/HTML/en/kscd/logotp3.gif
-share/doc/HTML/es/kmid/index-1.html
-share/doc/HTML/es/kmid/index-2.html
-share/doc/HTML/es/kmid/index-3.html
-share/doc/HTML/es/kmid/index-4.html
-share/doc/HTML/es/kmid/index-5.html
-share/doc/HTML/es/kmid/index-6.html
-share/doc/HTML/es/kmid/index-7.html
-share/doc/HTML/es/kmid/index-8.html
-share/doc/HTML/es/kmid/index-9.html
-share/doc/HTML/es/kmid/index.html
-share/doc/HTML/es/kmid/logotp3.gif
-share/icons/cd.xpm
-share/icons/kmedia.xpm
-share/icons/kmid.xpm
-share/icons/kmidi.xpm
-share/icons/kmix.xpm
-share/icons/kscd.xpm
-share/icons/large/kmedia.xpm
-share/icons/large/kmid.xpm
-share/icons/large/kmidi.xpm
-share/icons/large/kmix.xpm
-share/icons/large/kscd.xpm
-share/icons/mini/kmedia.xpm
-share/icons/mini/kmid.xpm
-share/icons/mini/kmidi.xpm
-share/icons/mini/kmix.xpm
-share/icons/mini/kscd.xpm
-share/locale/br/LC_MESSAGES/kmedia.mo
-share/locale/br/LC_MESSAGES/kmid.mo
-share/locale/br/LC_MESSAGES/kmidi.mo
-share/locale/br/LC_MESSAGES/kmix.mo
-share/locale/br/LC_MESSAGES/kscd.mo
-share/locale/ca/LC_MESSAGES/kmedia.mo
-share/locale/ca/LC_MESSAGES/kmid.mo
-share/locale/ca/LC_MESSAGES/kmidi.mo
-share/locale/ca/LC_MESSAGES/kmix.mo
-share/locale/ca/LC_MESSAGES/kscd.mo
-share/locale/cs/LC_MESSAGES/kmedia.mo
-share/locale/cs/LC_MESSAGES/kmid.mo
-share/locale/cs/LC_MESSAGES/kmidi.mo
-share/locale/cs/LC_MESSAGES/kmix.mo
-share/locale/cs/LC_MESSAGES/kscd.mo
-share/locale/da/LC_MESSAGES/kmedia.mo
-share/locale/da/LC_MESSAGES/kmid.mo
-share/locale/da/LC_MESSAGES/kmidi.mo
-share/locale/da/LC_MESSAGES/kmix.mo
-share/locale/da/LC_MESSAGES/kscd.mo
-share/locale/de/LC_MESSAGES/kmedia.mo
-share/locale/de/LC_MESSAGES/kmid.mo
-share/locale/de/LC_MESSAGES/kmidi.mo
-share/locale/de/LC_MESSAGES/kmix.mo
-share/locale/de/LC_MESSAGES/kscd.mo
-share/locale/el/LC_MESSAGES/kmedia.mo
-share/locale/el/LC_MESSAGES/kmix.mo
-share/locale/el/LC_MESSAGES/kscd.mo
-share/locale/eo/LC_MESSAGES/kmedia.mo
-share/locale/eo/LC_MESSAGES/kmid.mo
-share/locale/eo/LC_MESSAGES/kmix.mo
-share/locale/eo/LC_MESSAGES/kscd.mo
-share/locale/es/LC_MESSAGES/kmedia.mo
-share/locale/es/LC_MESSAGES/kmid.mo
-share/locale/es/LC_MESSAGES/kmix.mo
-share/locale/es/LC_MESSAGES/kscd.mo
-share/locale/et/LC_MESSAGES/kmedia.mo
-share/locale/et/LC_MESSAGES/kmid.mo
-share/locale/et/LC_MESSAGES/kmidi.mo
-share/locale/et/LC_MESSAGES/kmix.mo
-share/locale/et/LC_MESSAGES/kscd.mo
-share/locale/fi/LC_MESSAGES/kmedia.mo
-share/locale/fi/LC_MESSAGES/kmid.mo
-share/locale/fi/LC_MESSAGES/kmix.mo
-share/locale/fi/LC_MESSAGES/kscd.mo
-share/locale/fr/LC_MESSAGES/kmedia.mo
-share/locale/fr/LC_MESSAGES/kmid.mo
-share/locale/fr/LC_MESSAGES/kmidi.mo
-share/locale/fr/LC_MESSAGES/kmix.mo
-share/locale/fr/LC_MESSAGES/kscd.mo
-share/locale/hr/LC_MESSAGES/kmedia.mo
-share/locale/hr/LC_MESSAGES/kmid.mo
-share/locale/hr/LC_MESSAGES/kmix.mo
-share/locale/hr/LC_MESSAGES/kscd.mo
-share/locale/hu/LC_MESSAGES/kmid.mo
-share/locale/hu/LC_MESSAGES/kmidi.mo
-share/locale/hu/LC_MESSAGES/kmix.mo
-share/locale/hu/LC_MESSAGES/kscd.mo
-share/locale/is/LC_MESSAGES/kmedia.mo
-share/locale/is/LC_MESSAGES/kmid.mo
-share/locale/is/LC_MESSAGES/kmidi.mo
-share/locale/is/LC_MESSAGES/kmix.mo
-share/locale/is/LC_MESSAGES/kscd.mo
-share/locale/it/LC_MESSAGES/kmedia.mo
-share/locale/it/LC_MESSAGES/kmidi.mo
-share/locale/it/LC_MESSAGES/kmix.mo
-share/locale/it/LC_MESSAGES/kscd.mo
-share/locale/ja/LC_MESSAGES/kmedia.mo
-share/locale/ja/LC_MESSAGES/kmid.mo
-share/locale/ja/LC_MESSAGES/kmidi.mo
-share/locale/ja/LC_MESSAGES/kmix.mo
-share/locale/ja/LC_MESSAGES/kscd.mo
-share/locale/ko/LC_MESSAGES/kmedia.mo
-share/locale/ko/LC_MESSAGES/kmid.mo
-share/locale/ko/LC_MESSAGES/kmix.mo
-share/locale/ko/LC_MESSAGES/kscd.mo
-share/locale/nl/LC_MESSAGES/kmedia.mo
-share/locale/nl/LC_MESSAGES/kscd.mo
-share/locale/no/LC_MESSAGES/kmedia.mo
-share/locale/no/LC_MESSAGES/kmid.mo
-share/locale/no/LC_MESSAGES/kmidi.mo
-share/locale/no/LC_MESSAGES/kmix.mo
-share/locale/no/LC_MESSAGES/kscd.mo
-share/locale/pl/LC_MESSAGES/kmedia.mo
-share/locale/pl/LC_MESSAGES/kmid.mo
-share/locale/pl/LC_MESSAGES/kmidi.mo
-share/locale/pl/LC_MESSAGES/kmix.mo
-share/locale/pl/LC_MESSAGES/kscd.mo
-share/locale/pt/LC_MESSAGES/kmedia.mo
-share/locale/pt/LC_MESSAGES/kmid.mo
-share/locale/pt/LC_MESSAGES/kmix.mo
-share/locale/pt/LC_MESSAGES/kscd.mo
-share/locale/pt_BR/LC_MESSAGES/kmedia.mo
-share/locale/pt_BR/LC_MESSAGES/kmid.mo
-share/locale/pt_BR/LC_MESSAGES/kmidi.mo
-share/locale/pt_BR/LC_MESSAGES/kmix.mo
-share/locale/pt_BR/LC_MESSAGES/kscd.mo
-share/locale/ro/LC_MESSAGES/kmedia.mo
-share/locale/ro/LC_MESSAGES/kmix.mo
-share/locale/sk/LC_MESSAGES/kmedia.mo
-share/locale/sk/LC_MESSAGES/kmid.mo
-share/locale/sk/LC_MESSAGES/kmidi.mo
-share/locale/sk/LC_MESSAGES/kmix.mo
-share/locale/sk/LC_MESSAGES/kscd.mo
-share/locale/sl/LC_MESSAGES/kmedia.mo
-share/locale/sl/LC_MESSAGES/kmid.mo
-share/locale/sl/LC_MESSAGES/kmidi.mo
-share/locale/sl/LC_MESSAGES/kmix.mo
-share/locale/sl/LC_MESSAGES/kscd.mo
-share/locale/sv/LC_MESSAGES/kmedia.mo
-share/locale/sv/LC_MESSAGES/kmid.mo
-share/locale/sv/LC_MESSAGES/kmix.mo
-share/locale/sv/LC_MESSAGES/kscd.mo
-share/locale/tr/LC_MESSAGES/kmedia.mo
-share/locale/tr/LC_MESSAGES/kmid.mo
-share/locale/tr/LC_MESSAGES/kmix.mo
-share/locale/tr/LC_MESSAGES/kscd.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmedia.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmix.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kscd.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmedia.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmix.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kscd.mo
-share/mimelnk/audio/x-karaoke.kdelnk
-share/mimelnk/text/xmcd.kdelnk
-@dirrm share/doc/HTML/es/kmid
+share/doc/HTML/en/kmix/installation.html
+share/doc/HTML/en/kmix/introduction.html
+share/doc/HTML/en/kmix/keybindings.html
+share/doc/HTML/en/kmix/multiplesoundcards.html
+share/doc/HTML/en/kmix/panningslider.html
+share/doc/HTML/en/kmix/questionsandanswers.html
+share/doc/HTML/en/kmix/requirements.html
+share/doc/HTML/en/kmix/themenuentries.html
+share/doc/HTML/en/kmix/workingwithkmix.html
+share/doc/HTML/en/kscd/.anchors
+share/doc/HTML/en/kscd/about.html
+share/doc/HTML/en/kscd/cddb-editor.html
+share/doc/HTML/en/kscd/cddb-support.html
+share/doc/HTML/en/kscd/cddb-tab.html
+share/doc/HTML/en/kscd/cddb.howto
+share/doc/HTML/en/kscd/common
+share/doc/HTML/en/kscd/configuring-kscd.html
+share/doc/HTML/en/kscd/credits-and-license.html
+share/doc/HTML/en/kscd/index.docbook
+share/doc/HTML/en/kscd/index.html
+share/doc/HTML/en/kscd/installation.html
+share/doc/HTML/en/kscd/introduction.html
+share/doc/HTML/en/kscd/kscd-options-tab.html
+share/doc/HTML/en/kscd/kscd.png
+share/doc/HTML/en/kscd/kscd1.png
+share/doc/HTML/en/kscd/kscd10.png
+share/doc/HTML/en/kscd/kscd11.png
+share/doc/HTML/en/kscd/kscd12.png
+share/doc/HTML/en/kscd/kscd13.png
+share/doc/HTML/en/kscd/kscd14.png
+share/doc/HTML/en/kscd/kscd15.png
+share/doc/HTML/en/kscd/kscd16.png
+share/doc/HTML/en/kscd/kscd17.png
+share/doc/HTML/en/kscd/kscd18.png
+share/doc/HTML/en/kscd/kscd19.png
+share/doc/HTML/en/kscd/kscd2.png
+share/doc/HTML/en/kscd/kscd2a.png
+share/doc/HTML/en/kscd/kscd3.png
+share/doc/HTML/en/kscd/kscd4.png
+share/doc/HTML/en/kscd/kscd5.png
+share/doc/HTML/en/kscd/kscd6.png
+share/doc/HTML/en/kscd/kscd7.png
+share/doc/HTML/en/kscd/kscd8.png
+share/doc/HTML/en/kscd/kscd9.png
+share/doc/HTML/en/kscd/onscreen-fundamentals.html
+share/doc/HTML/en/kscd/questions-and-answers.html
+share/doc/HTML/en/kscd/smtp-options.html
+share/doc/HTML/en/kscd/using-kscd-in-the-panel.html
+share/icons/hicolor/22x22/apps/kaiman.png
+share/icons/hicolor/32x32/apps/kaiman.png
+share/icons/hicolor/32x32/apps/kmid.png
+share/icons/hicolor/32x32/apps/kmidi.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/48x48/apps/kaiman.png
+share/icons/hicolor/48x48/apps/kmid.png
+share/icons/hicolor/48x48/apps/kmidi.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/locolor/16x16/apps/aktion.png
+share/icons/locolor/16x16/apps/kaiman.png
+share/icons/locolor/16x16/apps/kmid.png
+share/icons/locolor/16x16/apps/kmidi.png
+share/icons/locolor/16x16/apps/kmix.png
+share/icons/locolor/32x32/apps/aktion.png
+share/icons/locolor/32x32/apps/kaiman.png
+share/icons/locolor/32x32/apps/kmid.png
+share/icons/locolor/32x32/apps/kmidi.png
+share/icons/locolor/32x32/apps/kmix.png
+share/mimelnk/audio/x-karaoke.desktop
+@dirrm share/mimelnk/audio
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/22x22/apps
@dirrm share/doc/HTML/en/kscd
@dirrm share/doc/HTML/en/kmix
@dirrm share/doc/HTML/en/kmidi
@dirrm share/doc/HTML/en/kmid
-@dirrm share/doc/HTML/en/kmedia
-@dirrm share/doc/HTML/de/kmidi
-@dirrm share/apps/kscd/pics
-@dirrm share/apps/kscd/cddb/soundtrack
-@dirrm share/apps/kscd/cddb/rock
-@dirrm share/apps/kscd/cddb/reggae
-@dirrm share/apps/kscd/cddb/newage
-@dirrm share/apps/kscd/cddb/misc
-@dirrm share/apps/kscd/cddb/jazz
-@dirrm share/apps/kscd/cddb/folk
-@dirrm share/apps/kscd/cddb/data
-@dirrm share/apps/kscd/cddb/country
-@dirrm share/apps/kscd/cddb/classical
-@dirrm share/apps/kscd/cddb/blues
-@dirrm share/apps/kscd/cddb
-@dirrm share/apps/kscd
+@dirrm share/doc/HTML/en/artsbuilder
+@dirrm share/config
@dirrm share/apps/kmix/pics
@dirrm share/apps/kmix
@dirrm share/apps/kmidi/pics
-@dirrm share/apps/kmidi/config/patch
-@dirrm share/apps/kmidi/config
@dirrm share/apps/kmidi
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid/pics
@dirrm share/apps/kmid/maps
+@dirrm share/apps/kmid/icons/locolor/16x16/actions
+@dirrm share/apps/kmid/icons/hicolor/32x32/actions
+@dirrm share/apps/kmid/icons/hicolor/22x22/actions
+@dirrm share/apps/kmid/icons
@dirrm share/apps/kmid/fm
@dirrm share/apps/kmid
-@dirrm share/apps/kmedia/pics
-@dirrm share/apps/kmedia
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kaiman/Skins/k9
+@dirrm share/apps/kaiman/Skins/circle
+@dirrm share/apps/kaiman/Skins/car-preset
+@dirrm share/apps/kaiman
+@dirrm share/apps/artscontrol
+@dirrm share/apps/aktion/toolbar
+@dirrm share/apps/aktion
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Multimedia
+@dirrm lib/Arts
+@dirrm lib
+@dirrm bin
diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile
index a790c0467e1b..7edc2afde790 100644
--- a/audio/kdemultimedia3/Makefile
+++ b/audio/kdemultimedia3/Makefile
@@ -1,27 +1,33 @@
-# New ports collection makefile for: kdemultimedia
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
+# New ports collection makefile for: KDE2 Multimedia
+# Date created: Saturday 2 September 2000
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= kdemultimedia
-PORTVERSION= 1.1.2
-CATEGORIES= audio kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+PORTVERSION= 1.94
+CATEGORIES= misc kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
-MAINTAINER= se@freebsd.org
+MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.3:${PORTSDIR}/x11/kdelibs11
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
+MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)"
-CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
- INSTALL_SCRIPT="install -c -m 555"
+INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+ --with-qt-includes=${X11BASE}/include/qt2 \
+ --with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index 745eae46729e..e1b274b524a1 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-1.1.2.tar.bz2) = 91018d4cad9420d376d94aba034e1bbe
+MD5 (kdemultimedia-1.94.tar.bz2) = bae3c4421e28631a0646c59e47e13b32
diff --git a/audio/kdemultimedia3/pkg-comment b/audio/kdemultimedia3/pkg-comment
index 6f31b51504cc..186230f9287d 100644
--- a/audio/kdemultimedia3/pkg-comment
+++ b/audio/kdemultimedia3/pkg-comment
@@ -1 +1 @@
-KDE audio tools
+Utilities for the KDE integrated X11 desktop
diff --git a/audio/kdemultimedia3/pkg-plist b/audio/kdemultimedia3/pkg-plist
index 34fd257b8340..9686179e2512 100644
--- a/audio/kdemultimedia3/pkg-plist
+++ b/audio/kdemultimedia3/pkg-plist
@@ -1,30 +1,162 @@
-bin/cddaslave
-bin/kmedia
+bin/aktion
+bin/artsbuilder
+bin/artscontrol
+bin/kaiman
bin/kmid
bin/kmidi
bin/kmix
-bin/kscd
-bin/kscdmagic
-bin/workman2cddb.pl
-share/applnk/Multimedia/KMedia.kdelnk
-share/applnk/Multimedia/KMidi.kdelnk
-share/applnk/Multimedia/KMix.kdelnk
-share/applnk/Multimedia/kmid.kdelnk
-share/applnk/Multimedia/kscd.kdelnk
-share/apps/kmedia/pics/eject.xbm
-share/apps/kmedia/pics/ff.xbm
-share/apps/kmedia/pics/kmedia.xpm
-share/apps/kmedia/pics/kmedia_mini.xpm
-share/apps/kmedia/pics/lock.xbm
-share/apps/kmedia/pics/logo.xbm
-share/apps/kmedia/pics/nexttrk.xbm
-share/apps/kmedia/pics/playpause.xbm
-share/apps/kmedia/pics/playpause_both.xpm
-share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmedia/pics/poweroff.xbm
-share/apps/kmedia/pics/prevtrk.xbm
-share/apps/kmedia/pics/rew.xbm
-share/apps/kmedia/pics/stop.xbm
+bin/kmixctrl
+bin/midisend
+bin/sf2cfg
+bin/timidity
+lib/Arts/StructureBuilder.mcopclass
+lib/Arts/StructureDesc.mcopclass
+lib/Arts/Synth_ENVELOPE_ADSR.mcopclass
+lib/Arts/Synth_MIDI_TEST.mcopclass
+lib/Arts/Synth_NOISE.mcopclass
+lib/Arts/Synth_SHELVE_CUTOFF.mcopclass
+lib/Arts/Synth_WAVE_TRI.mcopclass
+lib/Arts/Synth_XFADE.mcopclass
+lib/artsmodules.mcopclass
+lib/artsmodules.mcoptype
+lib/libaktion.la
+lib/libaktion.so
+lib/libaktion.so.1
+lib/libartsbuilder.la
+lib/libartsbuilder.so
+lib/libartsbuilder.so.0
+lib/libartsmodules.la
+lib/libartsmodules.so
+lib/libartsmodules.so.0
+lib/libkcm_kmix.la
+lib/libkcm_kmix.so
+lib/libkmidpart.la
+lib/libkmidpart.so
+lib/libkmidpart.so.1
+lib/libkmixapplet.la
+lib/libkmixapplet.so
+lib/libkmixapplet.so.1
+share/applnk/Multimedia/aktion.desktop
+share/applnk/Multimedia/artsbuilder.desktop
+share/applnk/Multimedia/artscontrol.desktop
+share/applnk/Multimedia/kaiman.desktop
+share/applnk/Multimedia/kmid.desktop
+share/applnk/Multimedia/kmidi.desktop
+share/applnk/Multimedia/kmix.desktop
+share/applnk/Multimedia/timidity.desktop
+share/applnk/Settings/Sound/kmix.desktop
+share/apps/aktion/aktion_part.rc
+share/apps/aktion/toolbar/ak_maximize.png
+share/apps/aktion/toolbar/ak_setup.png
+share/apps/aktion/toolbar/aktion_logo.png
+share/apps/aktion/toolbar/avanzar.png
+share/apps/aktion/toolbar/ayuda.png
+share/apps/aktion/toolbar/double.png
+share/apps/aktion/toolbar/fullscreen.png
+share/apps/aktion/toolbar/half.png
+share/apps/aktion/toolbar/original.png
+share/apps/aktion/toolbar/parar.png
+share/apps/aktion/toolbar/pause.png
+share/apps/aktion/toolbar/retroceder.png
+share/apps/aktion/toolbar/tocar.png
+share/apps/artscontrol/artscontrol.rc
+share/apps/kaiman/Skins/car-preset/btn_exit.png
+share/apps/kaiman/Skins/car-preset/btn_iconify.png
+share/apps/kaiman/Skins/car-preset/btn_list.png
+share/apps/kaiman/Skins/car-preset/btn_next.png
+share/apps/kaiman/Skins/car-preset/btn_p1.png
+share/apps/kaiman/Skins/car-preset/btn_p2.png
+share/apps/kaiman/Skins/car-preset/btn_p3.png
+share/apps/kaiman/Skins/car-preset/btn_p4.png
+share/apps/kaiman/Skins/car-preset/btn_p5.png
+share/apps/kaiman/Skins/car-preset/btn_p6.png
+share/apps/kaiman/Skins/car-preset/btn_play.png
+share/apps/kaiman/Skins/car-preset/btn_prev.png
+share/apps/kaiman/Skins/car-preset/btn_sml.png
+share/apps/kaiman/Skins/car-preset/btn_stop.png
+share/apps/kaiman/Skins/car-preset/btn_voldn.png
+share/apps/kaiman/Skins/car-preset/btn_volup.png
+share/apps/kaiman/Skins/car-preset/digbig.png
+share/apps/kaiman/Skins/car-preset/digmed.png
+share/apps/kaiman/Skins/car-preset/letters.png
+share/apps/kaiman/Skins/car-preset/main.png
+share/apps/kaiman/Skins/car-preset/monoster.png
+share/apps/kaiman/Skins/car-preset/posbar.png
+share/apps/kaiman/Skins/car-preset/random.png
+share/apps/kaiman/Skins/car-preset/repeat.png
+share/apps/kaiman/Skins/car-preset/skindata
+share/apps/kaiman/Skins/car-preset/status.png
+share/apps/kaiman/Skins/car-preset/volume.png
+share/apps/kaiman/Skins/circle/back.png
+share/apps/kaiman/Skins/circle/back_mask.png
+share/apps/kaiman/Skins/circle/back_sm.png
+share/apps/kaiman/Skins/circle/back_sm_mask.png
+share/apps/kaiman/Skins/circle/bar_pos.png
+share/apps/kaiman/Skins/circle/bar_vol.png
+share/apps/kaiman/Skins/circle/btn_exit.png
+share/apps/kaiman/Skins/circle/btn_iconify.png
+share/apps/kaiman/Skins/circle/btn_list.png
+share/apps/kaiman/Skins/circle/btn_mode.png
+share/apps/kaiman/Skins/circle/btn_next.png
+share/apps/kaiman/Skins/circle/btn_play.png
+share/apps/kaiman/Skins/circle/btn_pref.png
+share/apps/kaiman/Skins/circle/btn_prev.png
+share/apps/kaiman/Skins/circle/btn_repeat.png
+share/apps/kaiman/Skins/circle/btn_shuffle.png
+share/apps/kaiman/Skins/circle/btn_sm_exit.png
+share/apps/kaiman/Skins/circle/btn_sm_iconify.png
+share/apps/kaiman/Skins/circle/btn_sm_mode.png
+share/apps/kaiman/Skins/circle/btn_sm_next.png
+share/apps/kaiman/Skins/circle/btn_sm_play.png
+share/apps/kaiman/Skins/circle/btn_sm_prev.png
+share/apps/kaiman/Skins/circle/btn_sm_stop.png
+share/apps/kaiman/Skins/circle/btn_stop.png
+share/apps/kaiman/Skins/circle/dig.png
+share/apps/kaiman/Skins/circle/digsml.png
+share/apps/kaiman/Skins/circle/letters.png
+share/apps/kaiman/Skins/circle/skindata
+share/apps/kaiman/Skins/circle/status.png
+share/apps/kaiman/Skins/k9/README
+share/apps/kaiman/Skins/k9/conf.jpg
+share/apps/kaiman/Skins/k9/conf.png
+share/apps/kaiman/Skins/k9/eject.jpg
+share/apps/kaiman/Skins/k9/icon.jpg
+share/apps/kaiman/Skins/k9/icon.png
+share/apps/kaiman/Skins/k9/kill.jpg
+share/apps/kaiman/Skins/k9/kill.png
+share/apps/kaiman/Skins/k9/knine-nfont.jpg
+share/apps/kaiman/Skins/k9/knine-nfont.png
+share/apps/kaiman/Skins/k9/knine-nfont2.jpg
+share/apps/kaiman/Skins/k9/knine-nfont2.png
+share/apps/kaiman/Skins/k9/knine-normal2.jpg
+share/apps/kaiman/Skins/k9/knine-normal2.png
+share/apps/kaiman/Skins/k9/knine-vfont.jpg
+share/apps/kaiman/Skins/k9/knine-vfont.png
+share/apps/kaiman/Skins/k9/long2.jpg
+share/apps/kaiman/Skins/k9/mask.png
+share/apps/kaiman/Skins/k9/newtext.jpg
+share/apps/kaiman/Skins/k9/newtext.png
+share/apps/kaiman/Skins/k9/next.jpg
+share/apps/kaiman/Skins/k9/pause.jpg
+share/apps/kaiman/Skins/k9/play.jpg
+share/apps/kaiman/Skins/k9/pos_item.jpg
+share/apps/kaiman/Skins/k9/repeat.jpg
+share/apps/kaiman/Skins/k9/repeat.png
+share/apps/kaiman/Skins/k9/reverse.jpg
+share/apps/kaiman/Skins/k9/shuffle.jpg
+share/apps/kaiman/Skins/k9/shuffle.png
+share/apps/kaiman/Skins/k9/skindata
+share/apps/kaiman/Skins/k9/small-k.jpg
+share/apps/kaiman/Skins/k9/small-k.png
+share/apps/kaiman/Skins/k9/square.jpg
+share/apps/kaiman/Skins/k9/square.png
+share/apps/kaiman/Skins/k9/status.jpg
+share/apps/kaiman/Skins/k9/status.png
+share/apps/kaiman/Skins/k9/stop.jpg
+share/apps/kaiman/Skins/k9/trans-pos.png
+share/apps/kaiman/Skins/k9/trans-slide.png
+share/apps/kaiman/kaimanui.rc
+share/apps/kicker/applets/kmixapplet.desktop
share/apps/kmid/AnotherGlitchInTheCall.kar
share/apps/kmid/OFortuna.kar
share/apps/kmid/StopInTheNameOfLove.kar
@@ -33,305 +165,222 @@ share/apps/kmid/fm/drums.o3
share/apps/kmid/fm/drums.sb
share/apps/kmid/fm/std.o3
share/apps/kmid/fm/std.sb
+share/apps/kmid/icons/button1.xpm
+share/apps/kmid/icons/button2.xpm
+share/apps/kmid/icons/hicolor/22x22/actions/piano.png
+share/apps/kmid/icons/hicolor/22x22/actions/volume.png
+share/apps/kmid/icons/hicolor/32x32/actions/piano.png
+share/apps/kmid/icons/hicolor/32x32/actions/volume.png
+share/apps/kmid/icons/keyboard.xpm
+share/apps/kmid/icons/locolor/16x16/actions/piano.png
+share/apps/kmid/icons/locolor/16x16/actions/volume.png
+share/apps/kmid/kmid_partui.rc
+share/apps/kmid/kmidui.rc
share/apps/kmid/maps/YamahaPSR500.map
share/apps/kmid/maps/YamahaPSS790.map
+share/apps/kmid/maps/YamahaQY10.map
share/apps/kmid/maps/gm.map
-share/apps/kmid/pics/button1.xpm
-share/apps/kmid/pics/button2.xpm
-share/apps/kmid/pics/keyboard.xpm
-share/apps/kmid/toolbar/kmid_chn.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
-share/apps/kmid/toolbar/kmid_volume.xpm
-share/apps/kmidi/config/chaos12-voices
-share/apps/kmidi/config/chaos8-voices
-share/apps/kmidi/config/gravis.cfg
-share/apps/kmidi/config/gsdrum.cfg
-share/apps/kmidi/config/megadrum
-share/apps/kmidi/config/megainst
-share/apps/kmidi/config/midia.cfg
-share/apps/kmidi/config/mt32.cfg
-share/apps/kmidi/config/patch/acpiano.pat
-share/apps/kmidi/config/patch/nylongt2.pat
-share/apps/kmidi/config/pila-voices
-share/apps/kmidi/config/sndfont.cfg
-share/apps/kmidi/config/sound-canvas-drums
-share/apps/kmidi/config/timidity.cfg
-share/apps/kmidi/config/wowpats.cfg
-share/apps/kmidi/pics/kmidilogo.xpm
-share/apps/kmix/pics/kmixdocked.xpm
-share/apps/kmix/pics/mix_audio.xpm
-share/apps/kmix/pics/mix_bass.xpm
-share/apps/kmix/pics/mix_cd.xpm
-share/apps/kmix/pics/mix_ext.xpm
-share/apps/kmix/pics/mix_microphone.xpm
-share/apps/kmix/pics/mix_midi.xpm
-share/apps/kmix/pics/mix_recmon.xpm
-share/apps/kmix/pics/mix_treble.xpm
-share/apps/kmix/pics/mix_unknown.xpm
-share/apps/kmix/pics/mix_volume.xpm
-share/apps/kscd/pics/cdsmall.xpm
-share/apps/kscd/pics/kscdlogo.xpm
-share/doc/HTML/de/kmidi/kmidi-1.html
-share/doc/HTML/de/kmidi/kmidi-2.html
-share/doc/HTML/de/kmidi/kmidi-3.html
-share/doc/HTML/de/kmidi/kmidi-4.html
-share/doc/HTML/de/kmidi/kmidi-5.html
-share/doc/HTML/de/kmidi/kmidi.html
-share/doc/HTML/de/kmidi/kmidi.sgml
-share/doc/HTML/de/kmidi/logotp3.gif
-share/doc/HTML/en/kmedia/index-1.html
-share/doc/HTML/en/kmedia/index-2.html
-share/doc/HTML/en/kmedia/index-3.html
-share/doc/HTML/en/kmedia/index-4.html
-share/doc/HTML/en/kmedia/index-5.html
-share/doc/HTML/en/kmedia/index.html
-share/doc/HTML/en/kmedia/logotp3.gif
-share/doc/HTML/en/kmid/index-1.html
-share/doc/HTML/en/kmid/index-2.html
-share/doc/HTML/en/kmid/index-3.html
-share/doc/HTML/en/kmid/index-4.html
-share/doc/HTML/en/kmid/index-5.html
-share/doc/HTML/en/kmid/index-6.html
-share/doc/HTML/en/kmid/index-7.html
-share/doc/HTML/en/kmid/index-8.html
-share/doc/HTML/en/kmid/index-9.html
+share/apps/kmidi/Axel_Elf.mid
+share/apps/kmidi/Cavatina.mid
+share/apps/kmidi/Jarre-Chung_Kuo.mid
+share/apps/kmidi/Malaguena.mid
+share/apps/kmidi/Mission_Impossible.mid
+share/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid
+share/apps/kmidi/georgia.mid
+share/apps/kmidi/mpostman.mid
+share/apps/kmidi/pics/kmidilogo.png
+share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/kmixdocked.png
+share/apps/kmix/pics/logo.png
+share/apps/kmix/pics/mix_audio.png
+share/apps/kmix/pics/mix_bass.png
+share/apps/kmix/pics/mix_cd.png
+share/apps/kmix/pics/mix_ext.png
+share/apps/kmix/pics/mix_microphone.png
+share/apps/kmix/pics/mix_midi.png
+share/apps/kmix/pics/mix_recmon.png
+share/apps/kmix/pics/mix_surround.png
+share/apps/kmix/pics/mix_treble.png
+share/apps/kmix/pics/mix_unknown.png
+share/apps/kmix/pics/mix_video.png
+share/apps/kmix/pics/mix_volume.png
+share/config/aktionrc
+share/doc/HTML/en/artsbuilder/.anchors
+share/doc/HTML/en/artsbuilder/common
+share/doc/HTML/en/artsbuilder/index.docbook
+share/doc/HTML/en/artsbuilder/index.html
+share/doc/HTML/en/artsbuilder/insidearts.html
+share/doc/HTML/en/artsbuilder/introduction.html
+share/doc/HTML/en/artsbuilder/quickstart.html
+share/doc/HTML/en/kmid/.anchors
+share/doc/HTML/en/kmid/abouttheauthor.html
+share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
+share/doc/HTML/en/kmid/advancedfeatures.html
+share/doc/HTML/en/kmid/collections.html
+share/doc/HTML/en/kmid/common
+share/doc/HTML/en/kmid/compilationandinstallation.html
+share/doc/HTML/en/kmid/creatingamidimap.html
+share/doc/HTML/en/kmid/deletingacollection.html
+share/doc/HTML/en/kmid/displayinglyrics.html
+share/doc/HTML/en/kmid/doineedamidimap.html
+share/doc/HTML/en/kmid/finalnotes.html
+share/doc/HTML/en/kmid/frequentlyaskedquestionsfaq.html
+share/doc/HTML/en/kmid/generalusage.html
+share/doc/HTML/en/kmid/hallofkmidsfriends.html
+share/doc/HTML/en/kmid/index.cvlog
+share/doc/HTML/en/kmid/index.docbook
share/doc/HTML/en/kmid/index.html
-share/doc/HTML/en/kmid/logotp3.gif
-share/doc/HTML/en/kmidi/kmidi-1.html
-share/doc/HTML/en/kmidi/kmidi-2.html
-share/doc/HTML/en/kmidi/kmidi-3.html
-share/doc/HTML/en/kmidi/kmidi-4.html
-share/doc/HTML/en/kmidi/kmidi-5.html
-share/doc/HTML/en/kmidi/kmidi.html
-share/doc/HTML/en/kmidi/kmidi.nif
-share/doc/HTML/en/kmidi/kmidi.sgml
-share/doc/HTML/en/kmidi/logotp3.gif
-share/doc/HTML/en/kmix/index-1.html
-share/doc/HTML/en/kmix/index-2.html
-share/doc/HTML/en/kmix/index-3.html
-share/doc/HTML/en/kmix/index-4.html
-share/doc/HTML/en/kmix/index-5.html
-share/doc/HTML/en/kmix/index-6.html
+share/doc/HTML/en/kmid/installation.html
+share/doc/HTML/en/kmid/introduction.html
+share/doc/HTML/en/kmid/keybindings.html
+share/doc/HTML/en/kmid/midimaps.html
+share/doc/HTML/en/kmid/playinginorderoratrandom.html
+share/doc/HTML/en/kmid/playingsongs.html
+share/doc/HTML/en/kmid/removingsongsfromcollections.html
+share/doc/HTML/en/kmid/requirements.html
+share/doc/HTML/en/kmid/selectingasongfromacollection.html
+share/doc/HTML/en/kmid/thetempolcd.html
+share/doc/HTML/en/kmid/thetemporarycollection.html
+share/doc/HTML/en/kmid/usingmidimaps.html
+share/doc/HTML/en/kmidi/.anchors
+share/doc/HTML/en/kmidi/FAQ
+share/doc/HTML/en/kmidi/commandlineoptions.html
+share/doc/HTML/en/kmidi/common
+share/doc/HTML/en/kmidi/compilationandinstallation.html
+share/doc/HTML/en/kmidi/computationissues.html
+share/doc/HTML/en/kmidi/configuring.html
+share/doc/HTML/en/kmidi/copyright.html
+share/doc/HTML/en/kmidi/credits.html
+share/doc/HTML/en/kmidi/design.html
+share/doc/HTML/en/kmidi/effects.html
+share/doc/HTML/en/kmidi/index.cvlog
+share/doc/HTML/en/kmidi/index.docbook
+share/doc/HTML/en/kmidi/index.html
+share/doc/HTML/en/kmidi/installation.html
+share/doc/HTML/en/kmidi/introduction.html
+share/doc/HTML/en/kmidi/memoryissues.html
+share/doc/HTML/en/kmidi/midifilenames.html
+share/doc/HTML/en/kmidi/midiimplementation.html
+share/doc/HTML/en/kmidi/patches.html
+share/doc/HTML/en/kmidi/patchsets.html
+share/doc/HTML/en/kmidi/playlists.html
+share/doc/HTML/en/kmidi/polyphony.html
+share/doc/HTML/en/kmidi/questionsandanswers.html
+share/doc/HTML/en/kmidi/requirements.html
+share/doc/HTML/en/kmidi/synthesismodel.html
+share/doc/HTML/en/kmidi/usage.html
+share/doc/HTML/en/kmidi/volume.html
+share/doc/HTML/en/kmix/.anchors
+share/doc/HTML/en/kmix/advancedfeatures.html
+share/doc/HTML/en/kmix/commandlinearguments.html
+share/doc/HTML/en/kmix/common
+share/doc/HTML/en/kmix/compilationandinstallation.html
+share/doc/HTML/en/kmix/configurationoptions.html
+share/doc/HTML/en/kmix/help.html
+share/doc/HTML/en/kmix/index.cvlog
+share/doc/HTML/en/kmix/index.docbook
share/doc/HTML/en/kmix/index.html
-share/doc/HTML/en/kmix/logotp3.gif
-share/doc/HTML/en/kscd/kscd-1.html
-share/doc/HTML/en/kscd/kscd-2.html
-share/doc/HTML/en/kscd/kscd-3.html
-share/doc/HTML/en/kscd/kscd-4.html
-share/doc/HTML/en/kscd/kscd-5.html
-share/doc/HTML/en/kscd/kscd-6.html
-share/doc/HTML/en/kscd/kscd-7.html
-share/doc/HTML/en/kscd/kscd-8.html
-share/doc/HTML/en/kscd/kscd.html
-share/doc/HTML/en/kscd/kscd1.gif
-share/doc/HTML/en/kscd/kscd10.gif
-share/doc/HTML/en/kscd/kscd11.gif
-share/doc/HTML/en/kscd/kscd12.gif
-share/doc/HTML/en/kscd/kscd13.gif
-share/doc/HTML/en/kscd/kscd14.gif
-share/doc/HTML/en/kscd/kscd15.gif
-share/doc/HTML/en/kscd/kscd16.gif
-share/doc/HTML/en/kscd/kscd2.gif
-share/doc/HTML/en/kscd/kscd2a.gif
-share/doc/HTML/en/kscd/kscd3.gif
-share/doc/HTML/en/kscd/kscd4.gif
-share/doc/HTML/en/kscd/kscd5.gif
-share/doc/HTML/en/kscd/kscd6.gif
-share/doc/HTML/en/kscd/kscd7.gif
-share/doc/HTML/en/kscd/kscd8.gif
-share/doc/HTML/en/kscd/kscd9.gif
-share/doc/HTML/en/kscd/logotp3.gif
-share/doc/HTML/es/kmid/index-1.html
-share/doc/HTML/es/kmid/index-2.html
-share/doc/HTML/es/kmid/index-3.html
-share/doc/HTML/es/kmid/index-4.html
-share/doc/HTML/es/kmid/index-5.html
-share/doc/HTML/es/kmid/index-6.html
-share/doc/HTML/es/kmid/index-7.html
-share/doc/HTML/es/kmid/index-8.html
-share/doc/HTML/es/kmid/index-9.html
-share/doc/HTML/es/kmid/index.html
-share/doc/HTML/es/kmid/logotp3.gif
-share/icons/cd.xpm
-share/icons/kmedia.xpm
-share/icons/kmid.xpm
-share/icons/kmidi.xpm
-share/icons/kmix.xpm
-share/icons/kscd.xpm
-share/icons/large/kmedia.xpm
-share/icons/large/kmid.xpm
-share/icons/large/kmidi.xpm
-share/icons/large/kmix.xpm
-share/icons/large/kscd.xpm
-share/icons/mini/kmedia.xpm
-share/icons/mini/kmid.xpm
-share/icons/mini/kmidi.xpm
-share/icons/mini/kmix.xpm
-share/icons/mini/kscd.xpm
-share/locale/br/LC_MESSAGES/kmedia.mo
-share/locale/br/LC_MESSAGES/kmid.mo
-share/locale/br/LC_MESSAGES/kmidi.mo
-share/locale/br/LC_MESSAGES/kmix.mo
-share/locale/br/LC_MESSAGES/kscd.mo
-share/locale/ca/LC_MESSAGES/kmedia.mo
-share/locale/ca/LC_MESSAGES/kmid.mo
-share/locale/ca/LC_MESSAGES/kmidi.mo
-share/locale/ca/LC_MESSAGES/kmix.mo
-share/locale/ca/LC_MESSAGES/kscd.mo
-share/locale/cs/LC_MESSAGES/kmedia.mo
-share/locale/cs/LC_MESSAGES/kmid.mo
-share/locale/cs/LC_MESSAGES/kmidi.mo
-share/locale/cs/LC_MESSAGES/kmix.mo
-share/locale/cs/LC_MESSAGES/kscd.mo
-share/locale/da/LC_MESSAGES/kmedia.mo
-share/locale/da/LC_MESSAGES/kmid.mo
-share/locale/da/LC_MESSAGES/kmidi.mo
-share/locale/da/LC_MESSAGES/kmix.mo
-share/locale/da/LC_MESSAGES/kscd.mo
-share/locale/de/LC_MESSAGES/kmedia.mo
-share/locale/de/LC_MESSAGES/kmid.mo
-share/locale/de/LC_MESSAGES/kmidi.mo
-share/locale/de/LC_MESSAGES/kmix.mo
-share/locale/de/LC_MESSAGES/kscd.mo
-share/locale/el/LC_MESSAGES/kmedia.mo
-share/locale/el/LC_MESSAGES/kmix.mo
-share/locale/el/LC_MESSAGES/kscd.mo
-share/locale/eo/LC_MESSAGES/kmedia.mo
-share/locale/eo/LC_MESSAGES/kmid.mo
-share/locale/eo/LC_MESSAGES/kmix.mo
-share/locale/eo/LC_MESSAGES/kscd.mo
-share/locale/es/LC_MESSAGES/kmedia.mo
-share/locale/es/LC_MESSAGES/kmid.mo
-share/locale/es/LC_MESSAGES/kmix.mo
-share/locale/es/LC_MESSAGES/kscd.mo
-share/locale/et/LC_MESSAGES/kmedia.mo
-share/locale/et/LC_MESSAGES/kmid.mo
-share/locale/et/LC_MESSAGES/kmidi.mo
-share/locale/et/LC_MESSAGES/kmix.mo
-share/locale/et/LC_MESSAGES/kscd.mo
-share/locale/fi/LC_MESSAGES/kmedia.mo
-share/locale/fi/LC_MESSAGES/kmid.mo
-share/locale/fi/LC_MESSAGES/kmix.mo
-share/locale/fi/LC_MESSAGES/kscd.mo
-share/locale/fr/LC_MESSAGES/kmedia.mo
-share/locale/fr/LC_MESSAGES/kmid.mo
-share/locale/fr/LC_MESSAGES/kmidi.mo
-share/locale/fr/LC_MESSAGES/kmix.mo
-share/locale/fr/LC_MESSAGES/kscd.mo
-share/locale/hr/LC_MESSAGES/kmedia.mo
-share/locale/hr/LC_MESSAGES/kmid.mo
-share/locale/hr/LC_MESSAGES/kmix.mo
-share/locale/hr/LC_MESSAGES/kscd.mo
-share/locale/hu/LC_MESSAGES/kmid.mo
-share/locale/hu/LC_MESSAGES/kmidi.mo
-share/locale/hu/LC_MESSAGES/kmix.mo
-share/locale/hu/LC_MESSAGES/kscd.mo
-share/locale/is/LC_MESSAGES/kmedia.mo
-share/locale/is/LC_MESSAGES/kmid.mo
-share/locale/is/LC_MESSAGES/kmidi.mo
-share/locale/is/LC_MESSAGES/kmix.mo
-share/locale/is/LC_MESSAGES/kscd.mo
-share/locale/it/LC_MESSAGES/kmedia.mo
-share/locale/it/LC_MESSAGES/kmidi.mo
-share/locale/it/LC_MESSAGES/kmix.mo
-share/locale/it/LC_MESSAGES/kscd.mo
-share/locale/ja/LC_MESSAGES/kmedia.mo
-share/locale/ja/LC_MESSAGES/kmid.mo
-share/locale/ja/LC_MESSAGES/kmidi.mo
-share/locale/ja/LC_MESSAGES/kmix.mo
-share/locale/ja/LC_MESSAGES/kscd.mo
-share/locale/ko/LC_MESSAGES/kmedia.mo
-share/locale/ko/LC_MESSAGES/kmid.mo
-share/locale/ko/LC_MESSAGES/kmix.mo
-share/locale/ko/LC_MESSAGES/kscd.mo
-share/locale/nl/LC_MESSAGES/kmedia.mo
-share/locale/nl/LC_MESSAGES/kscd.mo
-share/locale/no/LC_MESSAGES/kmedia.mo
-share/locale/no/LC_MESSAGES/kmid.mo
-share/locale/no/LC_MESSAGES/kmidi.mo
-share/locale/no/LC_MESSAGES/kmix.mo
-share/locale/no/LC_MESSAGES/kscd.mo
-share/locale/pl/LC_MESSAGES/kmedia.mo
-share/locale/pl/LC_MESSAGES/kmid.mo
-share/locale/pl/LC_MESSAGES/kmidi.mo
-share/locale/pl/LC_MESSAGES/kmix.mo
-share/locale/pl/LC_MESSAGES/kscd.mo
-share/locale/pt/LC_MESSAGES/kmedia.mo
-share/locale/pt/LC_MESSAGES/kmid.mo
-share/locale/pt/LC_MESSAGES/kmix.mo
-share/locale/pt/LC_MESSAGES/kscd.mo
-share/locale/pt_BR/LC_MESSAGES/kmedia.mo
-share/locale/pt_BR/LC_MESSAGES/kmid.mo
-share/locale/pt_BR/LC_MESSAGES/kmidi.mo
-share/locale/pt_BR/LC_MESSAGES/kmix.mo
-share/locale/pt_BR/LC_MESSAGES/kscd.mo
-share/locale/ro/LC_MESSAGES/kmedia.mo
-share/locale/ro/LC_MESSAGES/kmix.mo
-share/locale/sk/LC_MESSAGES/kmedia.mo
-share/locale/sk/LC_MESSAGES/kmid.mo
-share/locale/sk/LC_MESSAGES/kmidi.mo
-share/locale/sk/LC_MESSAGES/kmix.mo
-share/locale/sk/LC_MESSAGES/kscd.mo
-share/locale/sl/LC_MESSAGES/kmedia.mo
-share/locale/sl/LC_MESSAGES/kmid.mo
-share/locale/sl/LC_MESSAGES/kmidi.mo
-share/locale/sl/LC_MESSAGES/kmix.mo
-share/locale/sl/LC_MESSAGES/kscd.mo
-share/locale/sv/LC_MESSAGES/kmedia.mo
-share/locale/sv/LC_MESSAGES/kmid.mo
-share/locale/sv/LC_MESSAGES/kmix.mo
-share/locale/sv/LC_MESSAGES/kscd.mo
-share/locale/tr/LC_MESSAGES/kmedia.mo
-share/locale/tr/LC_MESSAGES/kmid.mo
-share/locale/tr/LC_MESSAGES/kmix.mo
-share/locale/tr/LC_MESSAGES/kscd.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmedia.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmix.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kscd.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmedia.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmix.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kscd.mo
-share/mimelnk/audio/x-karaoke.kdelnk
-share/mimelnk/text/xmcd.kdelnk
-@dirrm share/doc/HTML/es/kmid
+share/doc/HTML/en/kmix/installation.html
+share/doc/HTML/en/kmix/introduction.html
+share/doc/HTML/en/kmix/keybindings.html
+share/doc/HTML/en/kmix/multiplesoundcards.html
+share/doc/HTML/en/kmix/panningslider.html
+share/doc/HTML/en/kmix/questionsandanswers.html
+share/doc/HTML/en/kmix/requirements.html
+share/doc/HTML/en/kmix/themenuentries.html
+share/doc/HTML/en/kmix/workingwithkmix.html
+share/doc/HTML/en/kscd/.anchors
+share/doc/HTML/en/kscd/about.html
+share/doc/HTML/en/kscd/cddb-editor.html
+share/doc/HTML/en/kscd/cddb-support.html
+share/doc/HTML/en/kscd/cddb-tab.html
+share/doc/HTML/en/kscd/cddb.howto
+share/doc/HTML/en/kscd/common
+share/doc/HTML/en/kscd/configuring-kscd.html
+share/doc/HTML/en/kscd/credits-and-license.html
+share/doc/HTML/en/kscd/index.docbook
+share/doc/HTML/en/kscd/index.html
+share/doc/HTML/en/kscd/installation.html
+share/doc/HTML/en/kscd/introduction.html
+share/doc/HTML/en/kscd/kscd-options-tab.html
+share/doc/HTML/en/kscd/kscd.png
+share/doc/HTML/en/kscd/kscd1.png
+share/doc/HTML/en/kscd/kscd10.png
+share/doc/HTML/en/kscd/kscd11.png
+share/doc/HTML/en/kscd/kscd12.png
+share/doc/HTML/en/kscd/kscd13.png
+share/doc/HTML/en/kscd/kscd14.png
+share/doc/HTML/en/kscd/kscd15.png
+share/doc/HTML/en/kscd/kscd16.png
+share/doc/HTML/en/kscd/kscd17.png
+share/doc/HTML/en/kscd/kscd18.png
+share/doc/HTML/en/kscd/kscd19.png
+share/doc/HTML/en/kscd/kscd2.png
+share/doc/HTML/en/kscd/kscd2a.png
+share/doc/HTML/en/kscd/kscd3.png
+share/doc/HTML/en/kscd/kscd4.png
+share/doc/HTML/en/kscd/kscd5.png
+share/doc/HTML/en/kscd/kscd6.png
+share/doc/HTML/en/kscd/kscd7.png
+share/doc/HTML/en/kscd/kscd8.png
+share/doc/HTML/en/kscd/kscd9.png
+share/doc/HTML/en/kscd/onscreen-fundamentals.html
+share/doc/HTML/en/kscd/questions-and-answers.html
+share/doc/HTML/en/kscd/smtp-options.html
+share/doc/HTML/en/kscd/using-kscd-in-the-panel.html
+share/icons/hicolor/22x22/apps/kaiman.png
+share/icons/hicolor/32x32/apps/kaiman.png
+share/icons/hicolor/32x32/apps/kmid.png
+share/icons/hicolor/32x32/apps/kmidi.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/48x48/apps/kaiman.png
+share/icons/hicolor/48x48/apps/kmid.png
+share/icons/hicolor/48x48/apps/kmidi.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/locolor/16x16/apps/aktion.png
+share/icons/locolor/16x16/apps/kaiman.png
+share/icons/locolor/16x16/apps/kmid.png
+share/icons/locolor/16x16/apps/kmidi.png
+share/icons/locolor/16x16/apps/kmix.png
+share/icons/locolor/32x32/apps/aktion.png
+share/icons/locolor/32x32/apps/kaiman.png
+share/icons/locolor/32x32/apps/kmid.png
+share/icons/locolor/32x32/apps/kmidi.png
+share/icons/locolor/32x32/apps/kmix.png
+share/mimelnk/audio/x-karaoke.desktop
+@dirrm share/mimelnk/audio
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/22x22/apps
@dirrm share/doc/HTML/en/kscd
@dirrm share/doc/HTML/en/kmix
@dirrm share/doc/HTML/en/kmidi
@dirrm share/doc/HTML/en/kmid
-@dirrm share/doc/HTML/en/kmedia
-@dirrm share/doc/HTML/de/kmidi
-@dirrm share/apps/kscd/pics
-@dirrm share/apps/kscd/cddb/soundtrack
-@dirrm share/apps/kscd/cddb/rock
-@dirrm share/apps/kscd/cddb/reggae
-@dirrm share/apps/kscd/cddb/newage
-@dirrm share/apps/kscd/cddb/misc
-@dirrm share/apps/kscd/cddb/jazz
-@dirrm share/apps/kscd/cddb/folk
-@dirrm share/apps/kscd/cddb/data
-@dirrm share/apps/kscd/cddb/country
-@dirrm share/apps/kscd/cddb/classical
-@dirrm share/apps/kscd/cddb/blues
-@dirrm share/apps/kscd/cddb
-@dirrm share/apps/kscd
+@dirrm share/doc/HTML/en/artsbuilder
+@dirrm share/config
@dirrm share/apps/kmix/pics
@dirrm share/apps/kmix
@dirrm share/apps/kmidi/pics
-@dirrm share/apps/kmidi/config/patch
-@dirrm share/apps/kmidi/config
@dirrm share/apps/kmidi
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid/pics
@dirrm share/apps/kmid/maps
+@dirrm share/apps/kmid/icons/locolor/16x16/actions
+@dirrm share/apps/kmid/icons/hicolor/32x32/actions
+@dirrm share/apps/kmid/icons/hicolor/22x22/actions
+@dirrm share/apps/kmid/icons
@dirrm share/apps/kmid/fm
@dirrm share/apps/kmid
-@dirrm share/apps/kmedia/pics
-@dirrm share/apps/kmedia
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kaiman/Skins/k9
+@dirrm share/apps/kaiman/Skins/circle
+@dirrm share/apps/kaiman/Skins/car-preset
+@dirrm share/apps/kaiman
+@dirrm share/apps/artscontrol
+@dirrm share/apps/aktion/toolbar
+@dirrm share/apps/aktion
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Multimedia
+@dirrm lib/Arts
+@dirrm lib
+@dirrm bin
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/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/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/comms/kremotecontrol/pkg-plist
+++ b/comms/kremotecontrol/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
diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile
index 65efa73016bf..5993558c999f 100644
--- a/converters/kdesupport2/Makefile
+++ b/converters/kdesupport2/Makefile
@@ -6,12 +6,15 @@
#
PORTNAME= kdesupport
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= converters 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
+BUILD_DEPENDS= jade:${PORTSDIR}/textproc/jade \
+ ${PREFIX}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc
LIB_DEPENDS= qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC= ${X11BASE}/bin/moc2
@@ -38,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@TOPSUBDIRS libaps@TOPSUBDIRS@g" ${WRKSRC}/configure
${PERL} -pi -e "s@odbc libaps@odbc@g" ${WRKSRC}/configure
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/converters/kdesupport2/distinfo b/converters/kdesupport2/distinfo
index 5b28aa7c9d30..a071501482d2 100644
--- a/converters/kdesupport2/distinfo
+++ b/converters/kdesupport2/distinfo
@@ -1 +1 @@
-MD5 (kdesupport-20000829A.tar.bz2) = e09673ab49e02f6d67ccc33505223e35
+MD5 (kdesupport-1.94.tar.bz2) = a27ee8346667d4f6580837ef25b12215
diff --git a/converters/kdesupport2/pkg-plist b/converters/kdesupport2/pkg-plist
index 217bcb6c562c..feca650dc044 100644
--- a/converters/kdesupport2/pkg-plist
+++ b/converters/kdesupport2/pkg-plist
@@ -33,5 +33,6 @@ include/mimelib/token.h
include/mimelib/utility.h
include/mimelib/uuencode.h
lib/libmimelib.la
+lib/libmimelib.so
lib/libmimelib.so.3
@dirrm include/mimelib
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/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/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/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
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index c789d52ee3b2..ded176292282 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= koffice
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= editors 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
@@ -30,7 +31,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo
index 2968f603716c..4bb7735528b2 100644
--- a/editors/calligra/distinfo
+++ b/editors/calligra/distinfo
@@ -1 +1 @@
-MD5 (koffice-20000829A.tar.bz2) = 7ed0c9cd15ba22af970cacef00fbc908
+MD5 (koffice-1.94.tar.bz2) = 8d7bb47ab75e19e15c98bdd460bb72ee
diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist
index d9997a2b1000..e70e95ceaf77 100644
--- a/editors/calligra/pkg-plist
+++ b/editors/calligra/pkg-plist
@@ -110,11 +110,14 @@ share/applnk/Office/kpresenter.desktop
share/applnk/Office/kspread.desktop
share/applnk/Office/kword.desktop
share/apps/kchart/icons/locolor/22x22/actions/areas.png
+share/apps/kchart/icons/locolor/22x22/actions/areas3d.png
share/apps/kchart/icons/locolor/22x22/actions/bars.png
+share/apps/kchart/icons/locolor/22x22/actions/bars3d.png
share/apps/kchart/icons/locolor/22x22/actions/cakes.png
share/apps/kchart/icons/locolor/22x22/actions/cakes3d.png
share/apps/kchart/icons/locolor/22x22/actions/data.png
share/apps/kchart/icons/locolor/22x22/actions/lines.png
+share/apps/kchart/icons/locolor/22x22/actions/lines3d.png
share/apps/kchart/icons/locolor/22x22/actions/options.png
share/apps/kchart/icons/locolor/22x22/actions/wizard.png
share/apps/kchart/kchart.rc
@@ -508,18 +511,6 @@ share/doc/HTML/en/doc/koffice-misc.html
share/doc/HTML/en/doc/koffice-search-help.html
share/doc/HTML/en/doc/koffice-search.html
share/doc/HTML/en/doc/koffice.html
-share/doc/HTML/en/katabase/.anchors
-share/doc/HTML/en/katabase/another-section.html
-share/doc/HTML/en/katabase/compilation-and-installation.html
-share/doc/HTML/en/katabase/copyright.html
-share/doc/HTML/en/katabase/index.cvlog
-share/doc/HTML/en/katabase/index.docbook
-share/doc/HTML/en/katabase/index.html
-share/doc/HTML/en/katabase/installation.html
-share/doc/HTML/en/katabase/introduction.html
-share/doc/HTML/en/katabase/questions-and-answers.html
-share/doc/HTML/en/katabase/requirements.html
-share/doc/HTML/en/katabase/usage.html
share/doc/HTML/en/killustrator/.anchors
share/doc/HTML/en/killustrator/about-the-handbook.html
share/doc/HTML/en/killustrator/align.png
@@ -790,7 +781,9 @@ share/icons/locolor/16x16/actions/abs.png
share/icons/locolor/16x16/actions/adjustcol.png
share/icons/locolor/16x16/actions/adjustrow.png
share/icons/locolor/16x16/actions/areas.png
+share/icons/locolor/16x16/actions/areas3d.png
share/icons/locolor/16x16/actions/bars.png
+share/icons/locolor/16x16/actions/bars3d.png
share/icons/locolor/16x16/actions/black_sum.png
share/icons/locolor/16x16/actions/border_all.png
share/icons/locolor/16x16/actions/border_bottom.png
@@ -808,6 +801,7 @@ share/icons/locolor/16x16/actions/bottom.png
share/icons/locolor/16x16/actions/brace.png
share/icons/locolor/16x16/actions/brackets.png
share/icons/locolor/16x16/actions/cakes.png
+share/icons/locolor/16x16/actions/cakes3d.png
share/icons/locolor/16x16/actions/cell_edit.png
share/icons/locolor/16x16/actions/cell_layout.png
share/icons/locolor/16x16/actions/center.png
@@ -827,6 +821,7 @@ share/icons/locolor/16x16/actions/inserttable.png
share/icons/locolor/16x16/actions/int.png
share/icons/locolor/16x16/actions/left.png
share/icons/locolor/16x16/actions/lines.png
+share/icons/locolor/16x16/actions/lines3d.png
share/icons/locolor/16x16/actions/lower.png
share/icons/locolor/16x16/actions/lsub.png
share/icons/locolor/16x16/actions/lsup.png
@@ -835,6 +830,7 @@ share/icons/locolor/16x16/actions/mergecell.png
share/icons/locolor/16x16/actions/middle.png
share/icons/locolor/16x16/actions/money.png
share/icons/locolor/16x16/actions/multirow.png
+share/icons/locolor/16x16/actions/options.png
share/icons/locolor/16x16/actions/oscilloscope.png
share/icons/locolor/16x16/actions/paren.png
share/icons/locolor/16x16/actions/percent.png
@@ -903,28 +899,19 @@ share/servicetypes/kotool.desktop
@dirrm share/doc/HTML/en/kpresenter
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/killustrator
-@dirrm share/doc/HTML/en/katabase
-@dirrm share/doc/HTML/en/doc
@dirrm share/apps/kword/templates/Publishing/.source
@dirrm share/apps/kword/templates/Publishing/.icon
@dirrm share/apps/kword/templates/Publishing
@dirrm share/apps/kword/templates/Normal/.source
@dirrm share/apps/kword/templates/Normal/.icon
@dirrm share/apps/kword/templates/Normal
-@dirrm share/apps/kword/templates
@dirrm share/apps/kword/icons/locolor/22x22/actions
-@dirrm share/apps/kword/icons/locolor/22x22
-@dirrm share/apps/kword/icons/locolor
-@dirrm share/apps/kword/icons
@dirrm share/apps/kword/dtd
@dirrm share/apps/kword
@dirrm share/apps/kspread/tablestyles
@dirrm share/apps/kspread/scripts
@dirrm share/apps/kspread/kpartplugins
@dirrm share/apps/kspread/icons/locolor/22x22/actions
-@dirrm share/apps/kspread/icons/locolor/22x22
-@dirrm share/apps/kspread/icons/locolor
-@dirrm share/apps/kspread/icons
@dirrm share/apps/kspread/extensions
@dirrm share/apps/kspread/dtd
@dirrm share/apps/kspread
@@ -934,13 +921,9 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kpresenter/templates/Professional/.source
@dirrm share/apps/kpresenter/templates/Professional/.icon
@dirrm share/apps/kpresenter/templates/Professional
-@dirrm share/apps/kpresenter/templates
@dirrm share/apps/kpresenter/slideshow
@dirrm share/apps/kpresenter/pics
@dirrm share/apps/kpresenter/icons/locolor/22x22/actions
-@dirrm share/apps/kpresenter/icons/locolor/22x22
-@dirrm share/apps/kpresenter/icons/locolor
-@dirrm share/apps/kpresenter/icons
@dirrm share/apps/kpresenter/dtd
@dirrm share/apps/kpresenter/autoforms/Connections
@dirrm share/apps/kpresenter/autoforms/Arrows
@@ -949,16 +932,9 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/koffice/pics
@dirrm share/apps/koffice/icons/locolor/22x22/actions/part
@dirrm share/apps/koffice/icons/locolor/22x22/actions
-@dirrm share/apps/koffice/icons/locolor/22x22
@dirrm share/apps/koffice/icons/locolor/16x16/actions
-@dirrm share/apps/koffice/icons/locolor/16x16
-@dirrm share/apps/koffice/icons/locolor
@dirrm share/apps/koffice/icons/hicolor/32x32/actions
-@dirrm share/apps/koffice/icons/hicolor/32x32
@dirrm share/apps/koffice/icons/hicolor/22x22/actions
-@dirrm share/apps/koffice/icons/hicolor/22x22
-@dirrm share/apps/koffice/icons/hicolor
-@dirrm share/apps/koffice/icons
@dirrm share/apps/koffice
@dirrm share/apps/killustrator/templates/Simple/.source
@dirrm share/apps/killustrator/templates/Simple/.icon
@@ -967,7 +943,4 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/killustrator
@dirrm share/apps/kchart/pics
@dirrm share/apps/kchart/icons/locolor/22x22/actions
-@dirrm share/apps/kchart/icons/locolor/22x22
-@dirrm share/apps/kchart/icons/locolor
-@dirrm share/apps/kchart/icons
@dirrm share/apps/kchart
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index c789d52ee3b2..ded176292282 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= koffice
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= editors 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
@@ -30,7 +31,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo
index 2968f603716c..4bb7735528b2 100644
--- a/editors/koffice-kde3/distinfo
+++ b/editors/koffice-kde3/distinfo
@@ -1 +1 @@
-MD5 (koffice-20000829A.tar.bz2) = 7ed0c9cd15ba22af970cacef00fbc908
+MD5 (koffice-1.94.tar.bz2) = 8d7bb47ab75e19e15c98bdd460bb72ee
diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist
index d9997a2b1000..e70e95ceaf77 100644
--- a/editors/koffice-kde3/pkg-plist
+++ b/editors/koffice-kde3/pkg-plist
@@ -110,11 +110,14 @@ share/applnk/Office/kpresenter.desktop
share/applnk/Office/kspread.desktop
share/applnk/Office/kword.desktop
share/apps/kchart/icons/locolor/22x22/actions/areas.png
+share/apps/kchart/icons/locolor/22x22/actions/areas3d.png
share/apps/kchart/icons/locolor/22x22/actions/bars.png
+share/apps/kchart/icons/locolor/22x22/actions/bars3d.png
share/apps/kchart/icons/locolor/22x22/actions/cakes.png
share/apps/kchart/icons/locolor/22x22/actions/cakes3d.png
share/apps/kchart/icons/locolor/22x22/actions/data.png
share/apps/kchart/icons/locolor/22x22/actions/lines.png
+share/apps/kchart/icons/locolor/22x22/actions/lines3d.png
share/apps/kchart/icons/locolor/22x22/actions/options.png
share/apps/kchart/icons/locolor/22x22/actions/wizard.png
share/apps/kchart/kchart.rc
@@ -508,18 +511,6 @@ share/doc/HTML/en/doc/koffice-misc.html
share/doc/HTML/en/doc/koffice-search-help.html
share/doc/HTML/en/doc/koffice-search.html
share/doc/HTML/en/doc/koffice.html
-share/doc/HTML/en/katabase/.anchors
-share/doc/HTML/en/katabase/another-section.html
-share/doc/HTML/en/katabase/compilation-and-installation.html
-share/doc/HTML/en/katabase/copyright.html
-share/doc/HTML/en/katabase/index.cvlog
-share/doc/HTML/en/katabase/index.docbook
-share/doc/HTML/en/katabase/index.html
-share/doc/HTML/en/katabase/installation.html
-share/doc/HTML/en/katabase/introduction.html
-share/doc/HTML/en/katabase/questions-and-answers.html
-share/doc/HTML/en/katabase/requirements.html
-share/doc/HTML/en/katabase/usage.html
share/doc/HTML/en/killustrator/.anchors
share/doc/HTML/en/killustrator/about-the-handbook.html
share/doc/HTML/en/killustrator/align.png
@@ -790,7 +781,9 @@ share/icons/locolor/16x16/actions/abs.png
share/icons/locolor/16x16/actions/adjustcol.png
share/icons/locolor/16x16/actions/adjustrow.png
share/icons/locolor/16x16/actions/areas.png
+share/icons/locolor/16x16/actions/areas3d.png
share/icons/locolor/16x16/actions/bars.png
+share/icons/locolor/16x16/actions/bars3d.png
share/icons/locolor/16x16/actions/black_sum.png
share/icons/locolor/16x16/actions/border_all.png
share/icons/locolor/16x16/actions/border_bottom.png
@@ -808,6 +801,7 @@ share/icons/locolor/16x16/actions/bottom.png
share/icons/locolor/16x16/actions/brace.png
share/icons/locolor/16x16/actions/brackets.png
share/icons/locolor/16x16/actions/cakes.png
+share/icons/locolor/16x16/actions/cakes3d.png
share/icons/locolor/16x16/actions/cell_edit.png
share/icons/locolor/16x16/actions/cell_layout.png
share/icons/locolor/16x16/actions/center.png
@@ -827,6 +821,7 @@ share/icons/locolor/16x16/actions/inserttable.png
share/icons/locolor/16x16/actions/int.png
share/icons/locolor/16x16/actions/left.png
share/icons/locolor/16x16/actions/lines.png
+share/icons/locolor/16x16/actions/lines3d.png
share/icons/locolor/16x16/actions/lower.png
share/icons/locolor/16x16/actions/lsub.png
share/icons/locolor/16x16/actions/lsup.png
@@ -835,6 +830,7 @@ share/icons/locolor/16x16/actions/mergecell.png
share/icons/locolor/16x16/actions/middle.png
share/icons/locolor/16x16/actions/money.png
share/icons/locolor/16x16/actions/multirow.png
+share/icons/locolor/16x16/actions/options.png
share/icons/locolor/16x16/actions/oscilloscope.png
share/icons/locolor/16x16/actions/paren.png
share/icons/locolor/16x16/actions/percent.png
@@ -903,28 +899,19 @@ share/servicetypes/kotool.desktop
@dirrm share/doc/HTML/en/kpresenter
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/killustrator
-@dirrm share/doc/HTML/en/katabase
-@dirrm share/doc/HTML/en/doc
@dirrm share/apps/kword/templates/Publishing/.source
@dirrm share/apps/kword/templates/Publishing/.icon
@dirrm share/apps/kword/templates/Publishing
@dirrm share/apps/kword/templates/Normal/.source
@dirrm share/apps/kword/templates/Normal/.icon
@dirrm share/apps/kword/templates/Normal
-@dirrm share/apps/kword/templates
@dirrm share/apps/kword/icons/locolor/22x22/actions
-@dirrm share/apps/kword/icons/locolor/22x22
-@dirrm share/apps/kword/icons/locolor
-@dirrm share/apps/kword/icons
@dirrm share/apps/kword/dtd
@dirrm share/apps/kword
@dirrm share/apps/kspread/tablestyles
@dirrm share/apps/kspread/scripts
@dirrm share/apps/kspread/kpartplugins
@dirrm share/apps/kspread/icons/locolor/22x22/actions
-@dirrm share/apps/kspread/icons/locolor/22x22
-@dirrm share/apps/kspread/icons/locolor
-@dirrm share/apps/kspread/icons
@dirrm share/apps/kspread/extensions
@dirrm share/apps/kspread/dtd
@dirrm share/apps/kspread
@@ -934,13 +921,9 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kpresenter/templates/Professional/.source
@dirrm share/apps/kpresenter/templates/Professional/.icon
@dirrm share/apps/kpresenter/templates/Professional
-@dirrm share/apps/kpresenter/templates
@dirrm share/apps/kpresenter/slideshow
@dirrm share/apps/kpresenter/pics
@dirrm share/apps/kpresenter/icons/locolor/22x22/actions
-@dirrm share/apps/kpresenter/icons/locolor/22x22
-@dirrm share/apps/kpresenter/icons/locolor
-@dirrm share/apps/kpresenter/icons
@dirrm share/apps/kpresenter/dtd
@dirrm share/apps/kpresenter/autoforms/Connections
@dirrm share/apps/kpresenter/autoforms/Arrows
@@ -949,16 +932,9 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/koffice/pics
@dirrm share/apps/koffice/icons/locolor/22x22/actions/part
@dirrm share/apps/koffice/icons/locolor/22x22/actions
-@dirrm share/apps/koffice/icons/locolor/22x22
@dirrm share/apps/koffice/icons/locolor/16x16/actions
-@dirrm share/apps/koffice/icons/locolor/16x16
-@dirrm share/apps/koffice/icons/locolor
@dirrm share/apps/koffice/icons/hicolor/32x32/actions
-@dirrm share/apps/koffice/icons/hicolor/32x32
@dirrm share/apps/koffice/icons/hicolor/22x22/actions
-@dirrm share/apps/koffice/icons/hicolor/22x22
-@dirrm share/apps/koffice/icons/hicolor
-@dirrm share/apps/koffice/icons
@dirrm share/apps/koffice
@dirrm share/apps/killustrator/templates/Simple/.source
@dirrm share/apps/killustrator/templates/Simple/.icon
@@ -967,7 +943,4 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/killustrator
@dirrm share/apps/kchart/pics
@dirrm share/apps/kchart/icons/locolor/22x22/actions
-@dirrm share/apps/kchart/icons/locolor/22x22
-@dirrm share/apps/kchart/icons/locolor
-@dirrm share/apps/kchart/icons
@dirrm share/apps/kchart
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index c789d52ee3b2..ded176292282 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= koffice
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= editors 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
@@ -30,7 +31,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index 2968f603716c..4bb7735528b2 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1 +1 @@
-MD5 (koffice-20000829A.tar.bz2) = 7ed0c9cd15ba22af970cacef00fbc908
+MD5 (koffice-1.94.tar.bz2) = 8d7bb47ab75e19e15c98bdd460bb72ee
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index d9997a2b1000..e70e95ceaf77 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -110,11 +110,14 @@ share/applnk/Office/kpresenter.desktop
share/applnk/Office/kspread.desktop
share/applnk/Office/kword.desktop
share/apps/kchart/icons/locolor/22x22/actions/areas.png
+share/apps/kchart/icons/locolor/22x22/actions/areas3d.png
share/apps/kchart/icons/locolor/22x22/actions/bars.png
+share/apps/kchart/icons/locolor/22x22/actions/bars3d.png
share/apps/kchart/icons/locolor/22x22/actions/cakes.png
share/apps/kchart/icons/locolor/22x22/actions/cakes3d.png
share/apps/kchart/icons/locolor/22x22/actions/data.png
share/apps/kchart/icons/locolor/22x22/actions/lines.png
+share/apps/kchart/icons/locolor/22x22/actions/lines3d.png
share/apps/kchart/icons/locolor/22x22/actions/options.png
share/apps/kchart/icons/locolor/22x22/actions/wizard.png
share/apps/kchart/kchart.rc
@@ -508,18 +511,6 @@ share/doc/HTML/en/doc/koffice-misc.html
share/doc/HTML/en/doc/koffice-search-help.html
share/doc/HTML/en/doc/koffice-search.html
share/doc/HTML/en/doc/koffice.html
-share/doc/HTML/en/katabase/.anchors
-share/doc/HTML/en/katabase/another-section.html
-share/doc/HTML/en/katabase/compilation-and-installation.html
-share/doc/HTML/en/katabase/copyright.html
-share/doc/HTML/en/katabase/index.cvlog
-share/doc/HTML/en/katabase/index.docbook
-share/doc/HTML/en/katabase/index.html
-share/doc/HTML/en/katabase/installation.html
-share/doc/HTML/en/katabase/introduction.html
-share/doc/HTML/en/katabase/questions-and-answers.html
-share/doc/HTML/en/katabase/requirements.html
-share/doc/HTML/en/katabase/usage.html
share/doc/HTML/en/killustrator/.anchors
share/doc/HTML/en/killustrator/about-the-handbook.html
share/doc/HTML/en/killustrator/align.png
@@ -790,7 +781,9 @@ share/icons/locolor/16x16/actions/abs.png
share/icons/locolor/16x16/actions/adjustcol.png
share/icons/locolor/16x16/actions/adjustrow.png
share/icons/locolor/16x16/actions/areas.png
+share/icons/locolor/16x16/actions/areas3d.png
share/icons/locolor/16x16/actions/bars.png
+share/icons/locolor/16x16/actions/bars3d.png
share/icons/locolor/16x16/actions/black_sum.png
share/icons/locolor/16x16/actions/border_all.png
share/icons/locolor/16x16/actions/border_bottom.png
@@ -808,6 +801,7 @@ share/icons/locolor/16x16/actions/bottom.png
share/icons/locolor/16x16/actions/brace.png
share/icons/locolor/16x16/actions/brackets.png
share/icons/locolor/16x16/actions/cakes.png
+share/icons/locolor/16x16/actions/cakes3d.png
share/icons/locolor/16x16/actions/cell_edit.png
share/icons/locolor/16x16/actions/cell_layout.png
share/icons/locolor/16x16/actions/center.png
@@ -827,6 +821,7 @@ share/icons/locolor/16x16/actions/inserttable.png
share/icons/locolor/16x16/actions/int.png
share/icons/locolor/16x16/actions/left.png
share/icons/locolor/16x16/actions/lines.png
+share/icons/locolor/16x16/actions/lines3d.png
share/icons/locolor/16x16/actions/lower.png
share/icons/locolor/16x16/actions/lsub.png
share/icons/locolor/16x16/actions/lsup.png
@@ -835,6 +830,7 @@ share/icons/locolor/16x16/actions/mergecell.png
share/icons/locolor/16x16/actions/middle.png
share/icons/locolor/16x16/actions/money.png
share/icons/locolor/16x16/actions/multirow.png
+share/icons/locolor/16x16/actions/options.png
share/icons/locolor/16x16/actions/oscilloscope.png
share/icons/locolor/16x16/actions/paren.png
share/icons/locolor/16x16/actions/percent.png
@@ -903,28 +899,19 @@ share/servicetypes/kotool.desktop
@dirrm share/doc/HTML/en/kpresenter
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/killustrator
-@dirrm share/doc/HTML/en/katabase
-@dirrm share/doc/HTML/en/doc
@dirrm share/apps/kword/templates/Publishing/.source
@dirrm share/apps/kword/templates/Publishing/.icon
@dirrm share/apps/kword/templates/Publishing
@dirrm share/apps/kword/templates/Normal/.source
@dirrm share/apps/kword/templates/Normal/.icon
@dirrm share/apps/kword/templates/Normal
-@dirrm share/apps/kword/templates
@dirrm share/apps/kword/icons/locolor/22x22/actions
-@dirrm share/apps/kword/icons/locolor/22x22
-@dirrm share/apps/kword/icons/locolor
-@dirrm share/apps/kword/icons
@dirrm share/apps/kword/dtd
@dirrm share/apps/kword
@dirrm share/apps/kspread/tablestyles
@dirrm share/apps/kspread/scripts
@dirrm share/apps/kspread/kpartplugins
@dirrm share/apps/kspread/icons/locolor/22x22/actions
-@dirrm share/apps/kspread/icons/locolor/22x22
-@dirrm share/apps/kspread/icons/locolor
-@dirrm share/apps/kspread/icons
@dirrm share/apps/kspread/extensions
@dirrm share/apps/kspread/dtd
@dirrm share/apps/kspread
@@ -934,13 +921,9 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kpresenter/templates/Professional/.source
@dirrm share/apps/kpresenter/templates/Professional/.icon
@dirrm share/apps/kpresenter/templates/Professional
-@dirrm share/apps/kpresenter/templates
@dirrm share/apps/kpresenter/slideshow
@dirrm share/apps/kpresenter/pics
@dirrm share/apps/kpresenter/icons/locolor/22x22/actions
-@dirrm share/apps/kpresenter/icons/locolor/22x22
-@dirrm share/apps/kpresenter/icons/locolor
-@dirrm share/apps/kpresenter/icons
@dirrm share/apps/kpresenter/dtd
@dirrm share/apps/kpresenter/autoforms/Connections
@dirrm share/apps/kpresenter/autoforms/Arrows
@@ -949,16 +932,9 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/koffice/pics
@dirrm share/apps/koffice/icons/locolor/22x22/actions/part
@dirrm share/apps/koffice/icons/locolor/22x22/actions
-@dirrm share/apps/koffice/icons/locolor/22x22
@dirrm share/apps/koffice/icons/locolor/16x16/actions
-@dirrm share/apps/koffice/icons/locolor/16x16
-@dirrm share/apps/koffice/icons/locolor
@dirrm share/apps/koffice/icons/hicolor/32x32/actions
-@dirrm share/apps/koffice/icons/hicolor/32x32
@dirrm share/apps/koffice/icons/hicolor/22x22/actions
-@dirrm share/apps/koffice/icons/hicolor/22x22
-@dirrm share/apps/koffice/icons/hicolor
-@dirrm share/apps/koffice/icons
@dirrm share/apps/koffice
@dirrm share/apps/killustrator/templates/Simple/.source
@dirrm share/apps/killustrator/templates/Simple/.icon
@@ -967,7 +943,4 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/killustrator
@dirrm share/apps/kchart/pics
@dirrm share/apps/kchart/icons/locolor/22x22/actions
-@dirrm share/apps/kchart/icons/locolor/22x22
-@dirrm share/apps/kchart/icons/locolor
-@dirrm share/apps/kchart/icons
@dirrm share/apps/kchart
diff --git a/editors/koffice/Makefile b/editors/koffice/Makefile
index c789d52ee3b2..ded176292282 100644
--- a/editors/koffice/Makefile
+++ b/editors/koffice/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= koffice
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= editors 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
@@ -30,7 +31,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \
LIBS="-Wl,-export-dyanmic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/editors/koffice/distinfo b/editors/koffice/distinfo
index 2968f603716c..4bb7735528b2 100644
--- a/editors/koffice/distinfo
+++ b/editors/koffice/distinfo
@@ -1 +1 @@
-MD5 (koffice-20000829A.tar.bz2) = 7ed0c9cd15ba22af970cacef00fbc908
+MD5 (koffice-1.94.tar.bz2) = 8d7bb47ab75e19e15c98bdd460bb72ee
diff --git a/editors/koffice/pkg-plist b/editors/koffice/pkg-plist
index d9997a2b1000..e70e95ceaf77 100644
--- a/editors/koffice/pkg-plist
+++ b/editors/koffice/pkg-plist
@@ -110,11 +110,14 @@ share/applnk/Office/kpresenter.desktop
share/applnk/Office/kspread.desktop
share/applnk/Office/kword.desktop
share/apps/kchart/icons/locolor/22x22/actions/areas.png
+share/apps/kchart/icons/locolor/22x22/actions/areas3d.png
share/apps/kchart/icons/locolor/22x22/actions/bars.png
+share/apps/kchart/icons/locolor/22x22/actions/bars3d.png
share/apps/kchart/icons/locolor/22x22/actions/cakes.png
share/apps/kchart/icons/locolor/22x22/actions/cakes3d.png
share/apps/kchart/icons/locolor/22x22/actions/data.png
share/apps/kchart/icons/locolor/22x22/actions/lines.png
+share/apps/kchart/icons/locolor/22x22/actions/lines3d.png
share/apps/kchart/icons/locolor/22x22/actions/options.png
share/apps/kchart/icons/locolor/22x22/actions/wizard.png
share/apps/kchart/kchart.rc
@@ -508,18 +511,6 @@ share/doc/HTML/en/doc/koffice-misc.html
share/doc/HTML/en/doc/koffice-search-help.html
share/doc/HTML/en/doc/koffice-search.html
share/doc/HTML/en/doc/koffice.html
-share/doc/HTML/en/katabase/.anchors
-share/doc/HTML/en/katabase/another-section.html
-share/doc/HTML/en/katabase/compilation-and-installation.html
-share/doc/HTML/en/katabase/copyright.html
-share/doc/HTML/en/katabase/index.cvlog
-share/doc/HTML/en/katabase/index.docbook
-share/doc/HTML/en/katabase/index.html
-share/doc/HTML/en/katabase/installation.html
-share/doc/HTML/en/katabase/introduction.html
-share/doc/HTML/en/katabase/questions-and-answers.html
-share/doc/HTML/en/katabase/requirements.html
-share/doc/HTML/en/katabase/usage.html
share/doc/HTML/en/killustrator/.anchors
share/doc/HTML/en/killustrator/about-the-handbook.html
share/doc/HTML/en/killustrator/align.png
@@ -790,7 +781,9 @@ share/icons/locolor/16x16/actions/abs.png
share/icons/locolor/16x16/actions/adjustcol.png
share/icons/locolor/16x16/actions/adjustrow.png
share/icons/locolor/16x16/actions/areas.png
+share/icons/locolor/16x16/actions/areas3d.png
share/icons/locolor/16x16/actions/bars.png
+share/icons/locolor/16x16/actions/bars3d.png
share/icons/locolor/16x16/actions/black_sum.png
share/icons/locolor/16x16/actions/border_all.png
share/icons/locolor/16x16/actions/border_bottom.png
@@ -808,6 +801,7 @@ share/icons/locolor/16x16/actions/bottom.png
share/icons/locolor/16x16/actions/brace.png
share/icons/locolor/16x16/actions/brackets.png
share/icons/locolor/16x16/actions/cakes.png
+share/icons/locolor/16x16/actions/cakes3d.png
share/icons/locolor/16x16/actions/cell_edit.png
share/icons/locolor/16x16/actions/cell_layout.png
share/icons/locolor/16x16/actions/center.png
@@ -827,6 +821,7 @@ share/icons/locolor/16x16/actions/inserttable.png
share/icons/locolor/16x16/actions/int.png
share/icons/locolor/16x16/actions/left.png
share/icons/locolor/16x16/actions/lines.png
+share/icons/locolor/16x16/actions/lines3d.png
share/icons/locolor/16x16/actions/lower.png
share/icons/locolor/16x16/actions/lsub.png
share/icons/locolor/16x16/actions/lsup.png
@@ -835,6 +830,7 @@ share/icons/locolor/16x16/actions/mergecell.png
share/icons/locolor/16x16/actions/middle.png
share/icons/locolor/16x16/actions/money.png
share/icons/locolor/16x16/actions/multirow.png
+share/icons/locolor/16x16/actions/options.png
share/icons/locolor/16x16/actions/oscilloscope.png
share/icons/locolor/16x16/actions/paren.png
share/icons/locolor/16x16/actions/percent.png
@@ -903,28 +899,19 @@ share/servicetypes/kotool.desktop
@dirrm share/doc/HTML/en/kpresenter
@dirrm share/doc/HTML/en/koffice
@dirrm share/doc/HTML/en/killustrator
-@dirrm share/doc/HTML/en/katabase
-@dirrm share/doc/HTML/en/doc
@dirrm share/apps/kword/templates/Publishing/.source
@dirrm share/apps/kword/templates/Publishing/.icon
@dirrm share/apps/kword/templates/Publishing
@dirrm share/apps/kword/templates/Normal/.source
@dirrm share/apps/kword/templates/Normal/.icon
@dirrm share/apps/kword/templates/Normal
-@dirrm share/apps/kword/templates
@dirrm share/apps/kword/icons/locolor/22x22/actions
-@dirrm share/apps/kword/icons/locolor/22x22
-@dirrm share/apps/kword/icons/locolor
-@dirrm share/apps/kword/icons
@dirrm share/apps/kword/dtd
@dirrm share/apps/kword
@dirrm share/apps/kspread/tablestyles
@dirrm share/apps/kspread/scripts
@dirrm share/apps/kspread/kpartplugins
@dirrm share/apps/kspread/icons/locolor/22x22/actions
-@dirrm share/apps/kspread/icons/locolor/22x22
-@dirrm share/apps/kspread/icons/locolor
-@dirrm share/apps/kspread/icons
@dirrm share/apps/kspread/extensions
@dirrm share/apps/kspread/dtd
@dirrm share/apps/kspread
@@ -934,13 +921,9 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/kpresenter/templates/Professional/.source
@dirrm share/apps/kpresenter/templates/Professional/.icon
@dirrm share/apps/kpresenter/templates/Professional
-@dirrm share/apps/kpresenter/templates
@dirrm share/apps/kpresenter/slideshow
@dirrm share/apps/kpresenter/pics
@dirrm share/apps/kpresenter/icons/locolor/22x22/actions
-@dirrm share/apps/kpresenter/icons/locolor/22x22
-@dirrm share/apps/kpresenter/icons/locolor
-@dirrm share/apps/kpresenter/icons
@dirrm share/apps/kpresenter/dtd
@dirrm share/apps/kpresenter/autoforms/Connections
@dirrm share/apps/kpresenter/autoforms/Arrows
@@ -949,16 +932,9 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/koffice/pics
@dirrm share/apps/koffice/icons/locolor/22x22/actions/part
@dirrm share/apps/koffice/icons/locolor/22x22/actions
-@dirrm share/apps/koffice/icons/locolor/22x22
@dirrm share/apps/koffice/icons/locolor/16x16/actions
-@dirrm share/apps/koffice/icons/locolor/16x16
-@dirrm share/apps/koffice/icons/locolor
@dirrm share/apps/koffice/icons/hicolor/32x32/actions
-@dirrm share/apps/koffice/icons/hicolor/32x32
@dirrm share/apps/koffice/icons/hicolor/22x22/actions
-@dirrm share/apps/koffice/icons/hicolor/22x22
-@dirrm share/apps/koffice/icons/hicolor
-@dirrm share/apps/koffice/icons
@dirrm share/apps/koffice
@dirrm share/apps/killustrator/templates/Simple/.source
@dirrm share/apps/killustrator/templates/Simple/.icon
@@ -967,7 +943,4 @@ share/servicetypes/kotool.desktop
@dirrm share/apps/killustrator
@dirrm share/apps/kchart/pics
@dirrm share/apps/kchart/icons/locolor/22x22/actions
-@dirrm share/apps/kchart/icons/locolor/22x22
-@dirrm share/apps/kchart/icons/locolor
-@dirrm share/apps/kchart/icons
@dirrm share/apps/kchart
diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile
index 0a23c0e873d4..4a38258da921 100644
--- a/games/kdegames2/Makefile
+++ b/games/kdegames2/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdegames
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= games 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
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/games/kdegames2/distinfo b/games/kdegames2/distinfo
index 56f7e42953bc..0c6147bdfff1 100644
--- a/games/kdegames2/distinfo
+++ b/games/kdegames2/distinfo
@@ -1 +1 @@
-MD5 (kdegames-20000829A.tar.bz2) = c08579d40fae132c60804103818b3f2d
+MD5 (kdegames-1.94.tar.bz2) = f99790b50118278951c12acbc0fc0200
diff --git a/games/kdegames2/pkg-plist b/games/kdegames2/pkg-plist
index 0563caab595b..77d7a9233ec9 100644
--- a/games/kdegames2/pkg-plist
+++ b/games/kdegames2/pkg-plist
@@ -1,4 +1,5 @@
bin/kabalone
+bin/kasteroids
bin/katomic
bin/kblackbox
bin/kfouleggs
@@ -21,6 +22,7 @@ bin/ktuberling
bin/lskat
bin/lskatproc
share/applnk/Games/kabalone.desktop
+share/applnk/Games/kasteroids.desktop
share/applnk/Games/katomic.desktop
share/applnk/Games/kblackbox.desktop
share/applnk/Games/kfouleggs.desktop
@@ -57,6 +59,165 @@ share/apps/kabalone/toolbar/stop.xpm
share/apps/kabalone/toolbar/undo.xpm
share/apps/kabalone/toolbar/warning.xpm
share/apps/kabalone/toolbar/yellowball.xpm
+share/apps/kasteroids/sounds/Explosion.wav
+share/apps/kasteroids/sprites/bg.png
+share/apps/kasteroids/sprites/bits/bits0000.png
+share/apps/kasteroids/sprites/bits/bits0001.png
+share/apps/kasteroids/sprites/bits/bits0002.png
+share/apps/kasteroids/sprites/bits/bits0003.png
+share/apps/kasteroids/sprites/bits/bits0004.png
+share/apps/kasteroids/sprites/bits/bits0005.png
+share/apps/kasteroids/sprites/bits/bits0006.png
+share/apps/kasteroids/sprites/bits/bits0007.png
+share/apps/kasteroids/sprites/bits/bits0008.png
+share/apps/kasteroids/sprites/bits/bits0009.png
+share/apps/kasteroids/sprites/bits/bits0010.png
+share/apps/kasteroids/sprites/bits/bits0011.png
+share/apps/kasteroids/sprites/bits/bits0012.png
+share/apps/kasteroids/sprites/bits/bits0013.png
+share/apps/kasteroids/sprites/bits/bits0014.png
+share/apps/kasteroids/sprites/bits/bits0015.png
+share/apps/kasteroids/sprites/exhaust/exhaust.png
+share/apps/kasteroids/sprites/missile/missile.png
+share/apps/kasteroids/sprites/powerups/brake.png
+share/apps/kasteroids/sprites/powerups/energy.png
+share/apps/kasteroids/sprites/powerups/shield.png
+share/apps/kasteroids/sprites/powerups/teleport.png
+share/apps/kasteroids/sprites/rock1/rock10000.png
+share/apps/kasteroids/sprites/rock1/rock10001.png
+share/apps/kasteroids/sprites/rock1/rock10002.png
+share/apps/kasteroids/sprites/rock1/rock10003.png
+share/apps/kasteroids/sprites/rock1/rock10004.png
+share/apps/kasteroids/sprites/rock1/rock10005.png
+share/apps/kasteroids/sprites/rock1/rock10006.png
+share/apps/kasteroids/sprites/rock1/rock10007.png
+share/apps/kasteroids/sprites/rock1/rock10008.png
+share/apps/kasteroids/sprites/rock1/rock10009.png
+share/apps/kasteroids/sprites/rock1/rock10010.png
+share/apps/kasteroids/sprites/rock1/rock10011.png
+share/apps/kasteroids/sprites/rock1/rock10012.png
+share/apps/kasteroids/sprites/rock1/rock10013.png
+share/apps/kasteroids/sprites/rock1/rock10014.png
+share/apps/kasteroids/sprites/rock1/rock10015.png
+share/apps/kasteroids/sprites/rock1/rock10016.png
+share/apps/kasteroids/sprites/rock1/rock10017.png
+share/apps/kasteroids/sprites/rock1/rock10018.png
+share/apps/kasteroids/sprites/rock1/rock10019.png
+share/apps/kasteroids/sprites/rock1/rock10020.png
+share/apps/kasteroids/sprites/rock1/rock10021.png
+share/apps/kasteroids/sprites/rock1/rock10022.png
+share/apps/kasteroids/sprites/rock1/rock10023.png
+share/apps/kasteroids/sprites/rock1/rock10024.png
+share/apps/kasteroids/sprites/rock1/rock10025.png
+share/apps/kasteroids/sprites/rock1/rock10026.png
+share/apps/kasteroids/sprites/rock1/rock10027.png
+share/apps/kasteroids/sprites/rock1/rock10028.png
+share/apps/kasteroids/sprites/rock1/rock10029.png
+share/apps/kasteroids/sprites/rock1/rock10030.png
+share/apps/kasteroids/sprites/rock1/rock10031.png
+share/apps/kasteroids/sprites/rock2/rock20000.png
+share/apps/kasteroids/sprites/rock2/rock20001.png
+share/apps/kasteroids/sprites/rock2/rock20002.png
+share/apps/kasteroids/sprites/rock2/rock20003.png
+share/apps/kasteroids/sprites/rock2/rock20004.png
+share/apps/kasteroids/sprites/rock2/rock20005.png
+share/apps/kasteroids/sprites/rock2/rock20006.png
+share/apps/kasteroids/sprites/rock2/rock20007.png
+share/apps/kasteroids/sprites/rock2/rock20008.png
+share/apps/kasteroids/sprites/rock2/rock20009.png
+share/apps/kasteroids/sprites/rock2/rock20010.png
+share/apps/kasteroids/sprites/rock2/rock20011.png
+share/apps/kasteroids/sprites/rock2/rock20012.png
+share/apps/kasteroids/sprites/rock2/rock20013.png
+share/apps/kasteroids/sprites/rock2/rock20014.png
+share/apps/kasteroids/sprites/rock2/rock20015.png
+share/apps/kasteroids/sprites/rock2/rock20016.png
+share/apps/kasteroids/sprites/rock2/rock20017.png
+share/apps/kasteroids/sprites/rock2/rock20018.png
+share/apps/kasteroids/sprites/rock2/rock20019.png
+share/apps/kasteroids/sprites/rock2/rock20020.png
+share/apps/kasteroids/sprites/rock2/rock20021.png
+share/apps/kasteroids/sprites/rock2/rock20022.png
+share/apps/kasteroids/sprites/rock2/rock20023.png
+share/apps/kasteroids/sprites/rock2/rock20024.png
+share/apps/kasteroids/sprites/rock2/rock20025.png
+share/apps/kasteroids/sprites/rock2/rock20026.png
+share/apps/kasteroids/sprites/rock2/rock20027.png
+share/apps/kasteroids/sprites/rock2/rock20028.png
+share/apps/kasteroids/sprites/rock2/rock20029.png
+share/apps/kasteroids/sprites/rock2/rock20030.png
+share/apps/kasteroids/sprites/rock2/rock20031.png
+share/apps/kasteroids/sprites/rock3/rock30000.png
+share/apps/kasteroids/sprites/rock3/rock30001.png
+share/apps/kasteroids/sprites/rock3/rock30002.png
+share/apps/kasteroids/sprites/rock3/rock30003.png
+share/apps/kasteroids/sprites/rock3/rock30004.png
+share/apps/kasteroids/sprites/rock3/rock30005.png
+share/apps/kasteroids/sprites/rock3/rock30006.png
+share/apps/kasteroids/sprites/rock3/rock30007.png
+share/apps/kasteroids/sprites/rock3/rock30008.png
+share/apps/kasteroids/sprites/rock3/rock30009.png
+share/apps/kasteroids/sprites/rock3/rock30010.png
+share/apps/kasteroids/sprites/rock3/rock30011.png
+share/apps/kasteroids/sprites/rock3/rock30012.png
+share/apps/kasteroids/sprites/rock3/rock30013.png
+share/apps/kasteroids/sprites/rock3/rock30014.png
+share/apps/kasteroids/sprites/rock3/rock30015.png
+share/apps/kasteroids/sprites/rock3/rock30016.png
+share/apps/kasteroids/sprites/rock3/rock30017.png
+share/apps/kasteroids/sprites/rock3/rock30018.png
+share/apps/kasteroids/sprites/rock3/rock30019.png
+share/apps/kasteroids/sprites/rock3/rock30020.png
+share/apps/kasteroids/sprites/rock3/rock30021.png
+share/apps/kasteroids/sprites/rock3/rock30022.png
+share/apps/kasteroids/sprites/rock3/rock30023.png
+share/apps/kasteroids/sprites/rock3/rock30024.png
+share/apps/kasteroids/sprites/rock3/rock30025.png
+share/apps/kasteroids/sprites/rock3/rock30026.png
+share/apps/kasteroids/sprites/rock3/rock30027.png
+share/apps/kasteroids/sprites/rock3/rock30028.png
+share/apps/kasteroids/sprites/rock3/rock30029.png
+share/apps/kasteroids/sprites/rock3/rock30030.png
+share/apps/kasteroids/sprites/rock3/rock30031.png
+share/apps/kasteroids/sprites/shield/shield0000.png
+share/apps/kasteroids/sprites/shield/shield0001.png
+share/apps/kasteroids/sprites/shield/shield0002.png
+share/apps/kasteroids/sprites/shield/shield0003.png
+share/apps/kasteroids/sprites/shield/shield0004.png
+share/apps/kasteroids/sprites/shield/shield0005.png
+share/apps/kasteroids/sprites/shield/shield0006.png
+share/apps/kasteroids/sprites/ship/ship0000.png
+share/apps/kasteroids/sprites/ship/ship0001.png
+share/apps/kasteroids/sprites/ship/ship0002.png
+share/apps/kasteroids/sprites/ship/ship0003.png
+share/apps/kasteroids/sprites/ship/ship0004.png
+share/apps/kasteroids/sprites/ship/ship0005.png
+share/apps/kasteroids/sprites/ship/ship0006.png
+share/apps/kasteroids/sprites/ship/ship0007.png
+share/apps/kasteroids/sprites/ship/ship0008.png
+share/apps/kasteroids/sprites/ship/ship0009.png
+share/apps/kasteroids/sprites/ship/ship0010.png
+share/apps/kasteroids/sprites/ship/ship0011.png
+share/apps/kasteroids/sprites/ship/ship0012.png
+share/apps/kasteroids/sprites/ship/ship0013.png
+share/apps/kasteroids/sprites/ship/ship0014.png
+share/apps/kasteroids/sprites/ship/ship0015.png
+share/apps/kasteroids/sprites/ship/ship0016.png
+share/apps/kasteroids/sprites/ship/ship0017.png
+share/apps/kasteroids/sprites/ship/ship0018.png
+share/apps/kasteroids/sprites/ship/ship0019.png
+share/apps/kasteroids/sprites/ship/ship0020.png
+share/apps/kasteroids/sprites/ship/ship0021.png
+share/apps/kasteroids/sprites/ship/ship0022.png
+share/apps/kasteroids/sprites/ship/ship0023.png
+share/apps/kasteroids/sprites/ship/ship0024.png
+share/apps/kasteroids/sprites/ship/ship0025.png
+share/apps/kasteroids/sprites/ship/ship0026.png
+share/apps/kasteroids/sprites/ship/ship0027.png
+share/apps/kasteroids/sprites/ship/ship0028.png
+share/apps/kasteroids/sprites/ship/ship0029.png
+share/apps/kasteroids/sprites/ship/ship0030.png
+share/apps/kasteroids/sprites/ship/ship0031.png
share/apps/katomic/katomicui.rc
share/apps/katomic/levels/level_1
share/apps/katomic/levels/level_10
@@ -916,6 +1077,7 @@ share/apps/lskat/grafix/type3.png
share/doc/HTML/en/kabalone/.anchors
share/doc/HTML/en/kabalone/authors.html
share/doc/HTML/en/kabalone/commandlineoptions.html
+share/doc/HTML/en/kabalone/common
share/doc/HTML/en/kabalone/copyright.html
share/doc/HTML/en/kabalone/epilogue.html
share/doc/HTML/en/kabalone/index.cvlog
@@ -926,6 +1088,7 @@ share/doc/HTML/en/kabalone/rulesofthegame.html
share/doc/HTML/en/kabalone/theuserinterface.html
share/doc/HTML/en/kasteroids/.anchors
share/doc/HTML/en/kasteroids/authors.html
+share/doc/HTML/en/kasteroids/common
share/doc/HTML/en/kasteroids/controls.html
share/doc/HTML/en/kasteroids/epilogue.html
share/doc/HTML/en/kasteroids/index.cvlog
@@ -936,6 +1099,7 @@ share/doc/HTML/en/kasteroids/ship.html
share/doc/HTML/en/kasteroids/tips.html
share/doc/HTML/en/kasteroids/upgrades.html
share/doc/HTML/en/kblackbox/.anchors
+share/doc/HTML/en/kblackbox/common
share/doc/HTML/en/kblackbox/copyright.html
share/doc/HTML/en/kblackbox/epilogue.html
share/doc/HTML/en/kblackbox/game-rules.html
@@ -947,7 +1111,13 @@ share/doc/HTML/en/kblackbox/index.html
share/doc/HTML/en/kblackbox/installation.html
share/doc/HTML/en/kblackbox/user-interaction.html
share/doc/HTML/en/kblackbox/whatiskblackbox.html
+share/doc/HTML/en/kfouleggs/.anchors
+share/doc/HTML/en/kfouleggs/common
+share/doc/HTML/en/kfouleggs/index.docbook
+share/doc/HTML/en/kfouleggs/index.html
+share/doc/HTML/en/kfouleggs/introduction.html
share/doc/HTML/en/kjumpingcube/.anchors
+share/doc/HTML/en/kjumpingcube/common
share/doc/HTML/en/kjumpingcube/compilation.html
share/doc/HTML/en/kjumpingcube/credits.html
share/doc/HTML/en/kjumpingcube/index.docbook
@@ -958,6 +1128,7 @@ share/doc/HTML/en/kjumpingcube/playingkjumpingcube.html
share/doc/HTML/en/kjumpingcube/questionsanswersandtips.html
share/doc/HTML/en/kjumpingcube/requirements.html
share/doc/HTML/en/kmahjongg/.anchors
+share/doc/HTML/en/kmahjongg/common
share/doc/HTML/en/kmahjongg/epilogue.html
share/doc/HTML/en/kmahjongg/index.cvlog
share/doc/HTML/en/kmahjongg/index.docbook
@@ -965,11 +1136,11 @@ share/doc/HTML/en/kmahjongg/index.html
share/doc/HTML/en/kmahjongg/introduction.html
share/doc/HTML/en/kmines/.anchors
share/doc/HTML/en/kmines/command.html
+share/doc/HTML/en/kmines/common
share/doc/HTML/en/kmines/compilation.html
share/doc/HTML/en/kmines/credits.html
share/doc/HTML/en/kmines/help-menu.html
share/doc/HTML/en/kmines/howtoplay.html
-share/doc/HTML/en/kmines/index.cvlog
share/doc/HTML/en/kmines/index.docbook
share/doc/HTML/en/kmines/index.html
share/doc/HTML/en/kmines/installation.html
@@ -980,6 +1151,7 @@ share/doc/HTML/en/kmines/kmines2.png
share/doc/HTML/en/kmines/prefs.html
share/doc/HTML/en/kmines/settings-menu.html
share/doc/HTML/en/konquest/.anchors
+share/doc/HTML/en/konquest/common
share/doc/HTML/en/konquest/epilogue.html
share/doc/HTML/en/konquest/index.cvlog
share/doc/HTML/en/konquest/index.docbook
@@ -988,13 +1160,13 @@ share/doc/HTML/en/konquest/notes.html
share/doc/HTML/en/konquest/playingthegame.html
share/doc/HTML/en/kpat/.anchors
share/doc/HTML/en/kpat/calculation.html
+share/doc/HTML/en/kpat/common
share/doc/HTML/en/kpat/compilation.html
share/doc/HTML/en/kpat/credits.html
share/doc/HTML/en/kpat/edit-menu.html
share/doc/HTML/en/kpat/freecell.html
share/doc/HTML/en/kpat/grandfather.html
share/doc/HTML/en/kpat/help.html
-share/doc/HTML/en/kpat/index.cvlog
share/doc/HTML/en/kpat/index.docbook
share/doc/HTML/en/kpat/index.html
share/doc/HTML/en/kpat/installation.html
@@ -1009,11 +1181,11 @@ share/doc/HTML/en/kpat/the-idiot.html
share/doc/HTML/en/kpat/using-kpat.html
share/doc/HTML/en/kpoker/.anchors
share/doc/HTML/en/kpoker/command.html
+share/doc/HTML/en/kpoker/common
share/doc/HTML/en/kpoker/compilation.html
share/doc/HTML/en/kpoker/credits.html
share/doc/HTML/en/kpoker/hands.html
share/doc/HTML/en/kpoker/help-menu.html
-share/doc/HTML/en/kpoker/index.cvlog
share/doc/HTML/en/kpoker/index.docbook
share/doc/HTML/en/kpoker/index.html
share/doc/HTML/en/kpoker/installation.html
@@ -1031,6 +1203,7 @@ share/doc/HTML/en/kpoker/where-do-i-get-the-latest-version-of-kpoker.html
share/doc/HTML/en/kreversi/.anchors
share/doc/HTML/en/kreversi/a-minute-to-learn.html
share/doc/HTML/en/kreversi/authors.html
+share/doc/HTML/en/kreversi/common
share/doc/HTML/en/kreversi/copyright.html
share/doc/HTML/en/kreversi/epilogue.html
share/doc/HTML/en/kreversi/index.cvlog
@@ -1040,6 +1213,7 @@ share/doc/HTML/en/kreversi/introduction.html
share/doc/HTML/en/kreversi/rulesofthegame.html
share/doc/HTML/en/kreversi/strategyhints.html
share/doc/HTML/en/ksame/.anchors
+share/doc/HTML/en/ksame/common
share/doc/HTML/en/ksame/copyright.html
share/doc/HTML/en/ksame/epilogue.html
share/doc/HTML/en/ksame/index.cvlog
@@ -1049,6 +1223,7 @@ share/doc/HTML/en/ksame/introduction.html
share/doc/HTML/en/ksame/rules-of-the-game.html
share/doc/HTML/en/ksame/strategy-hint.html
share/doc/HTML/en/kshisen/.anchors
+share/doc/HTML/en/kshisen/common
share/doc/HTML/en/kshisen/compilation.html
share/doc/HTML/en/kshisen/configuration.html
share/doc/HTML/en/kshisen/credits.html
@@ -1062,6 +1237,7 @@ share/doc/HTML/en/kshisen/playing-kshisen.html
share/doc/HTML/en/kshisen/requirements.html
share/doc/HTML/en/ksirtet/.anchors
share/doc/HTML/en/ksirtet/authors.html
+share/doc/HTML/en/ksirtet/common
share/doc/HTML/en/ksirtet/epilogue.html
share/doc/HTML/en/ksirtet/how-to-gain-points.html
share/doc/HTML/en/ksirtet/howtoplay.html
@@ -1073,6 +1249,7 @@ share/doc/HTML/en/ksirtet/multiplayer.html
share/doc/HTML/en/ksirtet/options.html
share/doc/HTML/en/ksmiletris/.anchors
share/doc/HTML/en/ksmiletris/changes.html
+share/doc/HTML/en/ksmiletris/common
share/doc/HTML/en/ksmiletris/credits.html
share/doc/HTML/en/ksmiletris/developement.html
share/doc/HTML/en/ksmiletris/epilogue.html
@@ -1085,6 +1262,7 @@ share/doc/HTML/en/ksmiletris/license.html
share/doc/HTML/en/ksmiletris/to-do.html
share/doc/HTML/en/ksnake/.anchors
share/doc/HTML/en/ksnake/authors.html
+share/doc/HTML/en/ksnake/common
share/doc/HTML/en/ksnake/customization.html
share/doc/HTML/en/ksnake/epilogue.html
share/doc/HTML/en/ksnake/index.cvlog
@@ -1094,31 +1272,20 @@ share/doc/HTML/en/ksnake/introduction.html
share/doc/HTML/en/ksnake/rulesofthegame.html
share/doc/HTML/en/ksnake/scoring.html
share/doc/HTML/en/ksokoban/.anchors
+share/doc/HTML/en/ksokoban/common
share/doc/HTML/en/ksokoban/credits.html
share/doc/HTML/en/ksokoban/howtoplay.html
share/doc/HTML/en/ksokoban/index.docbook
share/doc/HTML/en/ksokoban/index.html
share/doc/HTML/en/ksokoban/introduction.html
share/doc/HTML/en/ksokoban/loadingexternallevels.html
-share/doc/HTML/en/kspaceduel/.anchors
-share/doc/HTML/en/kspaceduel/ai.html
-share/doc/HTML/en/kspaceduel/command.html
-share/doc/HTML/en/kspaceduel/compilation.html
-share/doc/HTML/en/kspaceduel/credits.html
-share/doc/HTML/en/kspaceduel/help-menu.html
-share/doc/HTML/en/kspaceduel/index.cvlog
+share/doc/HTML/en/kspaceduel/common
share/doc/HTML/en/kspaceduel/index.docbook
-share/doc/HTML/en/kspaceduel/index.html
-share/doc/HTML/en/kspaceduel/installation.html
-share/doc/HTML/en/kspaceduel/introduction.html
-share/doc/HTML/en/kspaceduel/keys.html
share/doc/HTML/en/kspaceduel/kspaceduel1.png
share/doc/HTML/en/kspaceduel/kspaceduel2.png
share/doc/HTML/en/kspaceduel/kspaceduel3.png
-share/doc/HTML/en/kspaceduel/options.html
-share/doc/HTML/en/kspaceduel/settings-menu.html
-share/doc/HTML/en/kspaceduel/thegame.html
share/doc/HTML/en/ktron/.anchors
+share/doc/HTML/en/ktron/common
share/doc/HTML/en/ktron/compilation.html
share/doc/HTML/en/ktron/computerplayer.html
share/doc/HTML/en/ktron/config-behaviour.html
@@ -1134,6 +1301,7 @@ share/doc/HTML/en/ktron/playingktron.html
share/doc/HTML/en/ktron/requirements.html
share/doc/HTML/en/ktron/usingkeyboard.html
share/doc/HTML/en/ktuberling/.anchors
+share/doc/HTML/en/ktuberling/common
share/doc/HTML/en/ktuberling/compilation-and-installation.html
share/doc/HTML/en/ktuberling/epilogue.html
share/doc/HTML/en/ktuberling/for-programmers.html
@@ -1150,6 +1318,7 @@ share/doc/HTML/en/ktuberling/technical-reference.html
share/doc/HTML/en/ktuberling/the-menu-items.html
share/doc/HTML/en/ktuberling/the-tool-bar.html
share/doc/HTML/en/lskat/.anchors
+share/doc/HTML/en/lskat/common
share/doc/HTML/en/lskat/compilation.html
share/doc/HTML/en/lskat/credits.html
share/doc/HTML/en/lskat/help.html
@@ -1164,6 +1333,7 @@ share/doc/HTML/en/lskat/requirements.html
share/doc/HTML/en/lskat/rules.html
share/doc/HTML/en/lskat/view-menu.html
share/icons/hicolor/32x32/apps/kabalone.png
+share/icons/hicolor/32x32/apps/kasteroids.png
share/icons/hicolor/32x32/apps/kblackbox.png
share/icons/hicolor/32x32/apps/kmahjongg.png
share/icons/hicolor/32x32/apps/kmines.png
@@ -1179,6 +1349,7 @@ share/icons/hicolor/32x32/apps/ksnake.png
share/icons/hicolor/32x32/apps/ksokoban.png
share/icons/hicolor/32x32/apps/lskat.png
share/icons/hicolor/48x48/apps/kabalone.png
+share/icons/hicolor/48x48/apps/kasteroids.png
share/icons/hicolor/48x48/apps/kblackbox.png
share/icons/hicolor/48x48/apps/kmahjongg.png
share/icons/hicolor/48x48/apps/kmines.png
@@ -1194,6 +1365,7 @@ share/icons/hicolor/48x48/apps/ksnake.png
share/icons/hicolor/48x48/apps/ksokoban.png
share/icons/hicolor/48x48/apps/lskat.png
share/icons/locolor/16x16/apps/kabalone.png
+share/icons/locolor/16x16/apps/kasteroids.png
share/icons/locolor/16x16/apps/kblackbox.png
share/icons/locolor/16x16/apps/kjumpingcube.png
share/icons/locolor/16x16/apps/kmahjongg.png
@@ -1212,6 +1384,7 @@ share/icons/locolor/16x16/apps/kspaceduel.png
share/icons/locolor/16x16/apps/ktron.png
share/icons/locolor/16x16/apps/lskat.png
share/icons/locolor/32x32/apps/kabalone.png
+share/icons/locolor/32x32/apps/kasteroids.png
share/icons/locolor/32x32/apps/katomic.png
share/icons/locolor/32x32/apps/kblackbox.png
share/icons/locolor/32x32/apps/kjumpingcube.png
@@ -1248,13 +1421,17 @@ share/icons/locolor/32x32/apps/lskat.png
@dirrm share/doc/HTML/en/kmines
@dirrm share/doc/HTML/en/kmahjongg
@dirrm share/doc/HTML/en/kjumpingcube
+@dirrm share/doc/HTML/en/kfouleggs
@dirrm share/doc/HTML/en/kblackbox
@dirrm share/doc/HTML/en/kasteroids
@dirrm share/doc/HTML/en/kabalone
@dirrm share/apps/lskat/grafix
+@dirrm share/apps/lskat
@dirrm share/apps/ktuberling/sounds/en
+@dirrm share/apps/ktuberling/sounds
@dirrm share/apps/ktuberling/pics
@dirrm share/apps/ktuberling/museum
+@dirrm share/apps/ktuberling
@dirrm share/apps/ktron
@dirrm share/apps/kspaceduel/sprites/sun
@dirrm share/apps/kspaceduel/sprites/ship2
@@ -1279,23 +1456,41 @@ share/icons/locolor/32x32/apps/lskat.png
@dirrm share/apps/ksnake
@dirrm share/apps/ksmiletris/sounds
@dirrm share/apps/ksmiletris/data
+@dirrm share/apps/ksmiletris
@dirrm share/apps/ksirtet
@dirrm share/apps/kshisen
@dirrm share/apps/ksame
@dirrm share/apps/kreversi/sounds
@dirrm share/apps/kreversi/pics/background
@dirrm share/apps/kreversi/pics
+@dirrm share/apps/kreversi
@dirrm share/apps/kpoker/sounds
@dirrm share/apps/kpoker/pics
+@dirrm share/apps/kpoker
@dirrm share/apps/kpat/pics
+@dirrm share/apps/kpat
@dirrm share/apps/konquest/pics
+@dirrm share/apps/konquest
@dirrm share/apps/kmines
@dirrm share/apps/kmahjongg/toolbar
@dirrm share/apps/kmahjongg/pics
+@dirrm share/apps/kmahjongg
@dirrm share/apps/kfouleggs
@dirrm share/apps/kblackbox/pics
+@dirrm share/apps/kblackbox
@dirrm share/apps/katomic/pics
@dirrm share/apps/katomic/levels
@dirrm share/apps/katomic
+@dirrm share/apps/kasteroids/sprites/ship
+@dirrm share/apps/kasteroids/sprites/shield
+@dirrm share/apps/kasteroids/sprites/rock3
+@dirrm share/apps/kasteroids/sprites/rock2
+@dirrm share/apps/kasteroids/sprites/rock1
+@dirrm share/apps/kasteroids/sprites/powerups
+@dirrm share/apps/kasteroids/sprites/missile
+@dirrm share/apps/kasteroids/sprites/exhaust
+@dirrm share/apps/kasteroids/sprites/bits
+@dirrm share/apps/kasteroids/sprites
+@dirrm share/apps/kasteroids/sounds
@dirrm share/apps/kabalone/toolbar
@dirrm share/apps/kabalone
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 0a23c0e873d4..4a38258da921 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdegames
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= games 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
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo
index 56f7e42953bc..0c6147bdfff1 100644
--- a/games/kdegames3/distinfo
+++ b/games/kdegames3/distinfo
@@ -1 +1 @@
-MD5 (kdegames-20000829A.tar.bz2) = c08579d40fae132c60804103818b3f2d
+MD5 (kdegames-1.94.tar.bz2) = f99790b50118278951c12acbc0fc0200
diff --git a/games/kdegames3/pkg-plist b/games/kdegames3/pkg-plist
index 0563caab595b..77d7a9233ec9 100644
--- a/games/kdegames3/pkg-plist
+++ b/games/kdegames3/pkg-plist
@@ -1,4 +1,5 @@
bin/kabalone
+bin/kasteroids
bin/katomic
bin/kblackbox
bin/kfouleggs
@@ -21,6 +22,7 @@ bin/ktuberling
bin/lskat
bin/lskatproc
share/applnk/Games/kabalone.desktop
+share/applnk/Games/kasteroids.desktop
share/applnk/Games/katomic.desktop
share/applnk/Games/kblackbox.desktop
share/applnk/Games/kfouleggs.desktop
@@ -57,6 +59,165 @@ share/apps/kabalone/toolbar/stop.xpm
share/apps/kabalone/toolbar/undo.xpm
share/apps/kabalone/toolbar/warning.xpm
share/apps/kabalone/toolbar/yellowball.xpm
+share/apps/kasteroids/sounds/Explosion.wav
+share/apps/kasteroids/sprites/bg.png
+share/apps/kasteroids/sprites/bits/bits0000.png
+share/apps/kasteroids/sprites/bits/bits0001.png
+share/apps/kasteroids/sprites/bits/bits0002.png
+share/apps/kasteroids/sprites/bits/bits0003.png
+share/apps/kasteroids/sprites/bits/bits0004.png
+share/apps/kasteroids/sprites/bits/bits0005.png
+share/apps/kasteroids/sprites/bits/bits0006.png
+share/apps/kasteroids/sprites/bits/bits0007.png
+share/apps/kasteroids/sprites/bits/bits0008.png
+share/apps/kasteroids/sprites/bits/bits0009.png
+share/apps/kasteroids/sprites/bits/bits0010.png
+share/apps/kasteroids/sprites/bits/bits0011.png
+share/apps/kasteroids/sprites/bits/bits0012.png
+share/apps/kasteroids/sprites/bits/bits0013.png
+share/apps/kasteroids/sprites/bits/bits0014.png
+share/apps/kasteroids/sprites/bits/bits0015.png
+share/apps/kasteroids/sprites/exhaust/exhaust.png
+share/apps/kasteroids/sprites/missile/missile.png
+share/apps/kasteroids/sprites/powerups/brake.png
+share/apps/kasteroids/sprites/powerups/energy.png
+share/apps/kasteroids/sprites/powerups/shield.png
+share/apps/kasteroids/sprites/powerups/teleport.png
+share/apps/kasteroids/sprites/rock1/rock10000.png
+share/apps/kasteroids/sprites/rock1/rock10001.png
+share/apps/kasteroids/sprites/rock1/rock10002.png
+share/apps/kasteroids/sprites/rock1/rock10003.png
+share/apps/kasteroids/sprites/rock1/rock10004.png
+share/apps/kasteroids/sprites/rock1/rock10005.png
+share/apps/kasteroids/sprites/rock1/rock10006.png
+share/apps/kasteroids/sprites/rock1/rock10007.png
+share/apps/kasteroids/sprites/rock1/rock10008.png
+share/apps/kasteroids/sprites/rock1/rock10009.png
+share/apps/kasteroids/sprites/rock1/rock10010.png
+share/apps/kasteroids/sprites/rock1/rock10011.png
+share/apps/kasteroids/sprites/rock1/rock10012.png
+share/apps/kasteroids/sprites/rock1/rock10013.png
+share/apps/kasteroids/sprites/rock1/rock10014.png
+share/apps/kasteroids/sprites/rock1/rock10015.png
+share/apps/kasteroids/sprites/rock1/rock10016.png
+share/apps/kasteroids/sprites/rock1/rock10017.png
+share/apps/kasteroids/sprites/rock1/rock10018.png
+share/apps/kasteroids/sprites/rock1/rock10019.png
+share/apps/kasteroids/sprites/rock1/rock10020.png
+share/apps/kasteroids/sprites/rock1/rock10021.png
+share/apps/kasteroids/sprites/rock1/rock10022.png
+share/apps/kasteroids/sprites/rock1/rock10023.png
+share/apps/kasteroids/sprites/rock1/rock10024.png
+share/apps/kasteroids/sprites/rock1/rock10025.png
+share/apps/kasteroids/sprites/rock1/rock10026.png
+share/apps/kasteroids/sprites/rock1/rock10027.png
+share/apps/kasteroids/sprites/rock1/rock10028.png
+share/apps/kasteroids/sprites/rock1/rock10029.png
+share/apps/kasteroids/sprites/rock1/rock10030.png
+share/apps/kasteroids/sprites/rock1/rock10031.png
+share/apps/kasteroids/sprites/rock2/rock20000.png
+share/apps/kasteroids/sprites/rock2/rock20001.png
+share/apps/kasteroids/sprites/rock2/rock20002.png
+share/apps/kasteroids/sprites/rock2/rock20003.png
+share/apps/kasteroids/sprites/rock2/rock20004.png
+share/apps/kasteroids/sprites/rock2/rock20005.png
+share/apps/kasteroids/sprites/rock2/rock20006.png
+share/apps/kasteroids/sprites/rock2/rock20007.png
+share/apps/kasteroids/sprites/rock2/rock20008.png
+share/apps/kasteroids/sprites/rock2/rock20009.png
+share/apps/kasteroids/sprites/rock2/rock20010.png
+share/apps/kasteroids/sprites/rock2/rock20011.png
+share/apps/kasteroids/sprites/rock2/rock20012.png
+share/apps/kasteroids/sprites/rock2/rock20013.png
+share/apps/kasteroids/sprites/rock2/rock20014.png
+share/apps/kasteroids/sprites/rock2/rock20015.png
+share/apps/kasteroids/sprites/rock2/rock20016.png
+share/apps/kasteroids/sprites/rock2/rock20017.png
+share/apps/kasteroids/sprites/rock2/rock20018.png
+share/apps/kasteroids/sprites/rock2/rock20019.png
+share/apps/kasteroids/sprites/rock2/rock20020.png
+share/apps/kasteroids/sprites/rock2/rock20021.png
+share/apps/kasteroids/sprites/rock2/rock20022.png
+share/apps/kasteroids/sprites/rock2/rock20023.png
+share/apps/kasteroids/sprites/rock2/rock20024.png
+share/apps/kasteroids/sprites/rock2/rock20025.png
+share/apps/kasteroids/sprites/rock2/rock20026.png
+share/apps/kasteroids/sprites/rock2/rock20027.png
+share/apps/kasteroids/sprites/rock2/rock20028.png
+share/apps/kasteroids/sprites/rock2/rock20029.png
+share/apps/kasteroids/sprites/rock2/rock20030.png
+share/apps/kasteroids/sprites/rock2/rock20031.png
+share/apps/kasteroids/sprites/rock3/rock30000.png
+share/apps/kasteroids/sprites/rock3/rock30001.png
+share/apps/kasteroids/sprites/rock3/rock30002.png
+share/apps/kasteroids/sprites/rock3/rock30003.png
+share/apps/kasteroids/sprites/rock3/rock30004.png
+share/apps/kasteroids/sprites/rock3/rock30005.png
+share/apps/kasteroids/sprites/rock3/rock30006.png
+share/apps/kasteroids/sprites/rock3/rock30007.png
+share/apps/kasteroids/sprites/rock3/rock30008.png
+share/apps/kasteroids/sprites/rock3/rock30009.png
+share/apps/kasteroids/sprites/rock3/rock30010.png
+share/apps/kasteroids/sprites/rock3/rock30011.png
+share/apps/kasteroids/sprites/rock3/rock30012.png
+share/apps/kasteroids/sprites/rock3/rock30013.png
+share/apps/kasteroids/sprites/rock3/rock30014.png
+share/apps/kasteroids/sprites/rock3/rock30015.png
+share/apps/kasteroids/sprites/rock3/rock30016.png
+share/apps/kasteroids/sprites/rock3/rock30017.png
+share/apps/kasteroids/sprites/rock3/rock30018.png
+share/apps/kasteroids/sprites/rock3/rock30019.png
+share/apps/kasteroids/sprites/rock3/rock30020.png
+share/apps/kasteroids/sprites/rock3/rock30021.png
+share/apps/kasteroids/sprites/rock3/rock30022.png
+share/apps/kasteroids/sprites/rock3/rock30023.png
+share/apps/kasteroids/sprites/rock3/rock30024.png
+share/apps/kasteroids/sprites/rock3/rock30025.png
+share/apps/kasteroids/sprites/rock3/rock30026.png
+share/apps/kasteroids/sprites/rock3/rock30027.png
+share/apps/kasteroids/sprites/rock3/rock30028.png
+share/apps/kasteroids/sprites/rock3/rock30029.png
+share/apps/kasteroids/sprites/rock3/rock30030.png
+share/apps/kasteroids/sprites/rock3/rock30031.png
+share/apps/kasteroids/sprites/shield/shield0000.png
+share/apps/kasteroids/sprites/shield/shield0001.png
+share/apps/kasteroids/sprites/shield/shield0002.png
+share/apps/kasteroids/sprites/shield/shield0003.png
+share/apps/kasteroids/sprites/shield/shield0004.png
+share/apps/kasteroids/sprites/shield/shield0005.png
+share/apps/kasteroids/sprites/shield/shield0006.png
+share/apps/kasteroids/sprites/ship/ship0000.png
+share/apps/kasteroids/sprites/ship/ship0001.png
+share/apps/kasteroids/sprites/ship/ship0002.png
+share/apps/kasteroids/sprites/ship/ship0003.png
+share/apps/kasteroids/sprites/ship/ship0004.png
+share/apps/kasteroids/sprites/ship/ship0005.png
+share/apps/kasteroids/sprites/ship/ship0006.png
+share/apps/kasteroids/sprites/ship/ship0007.png
+share/apps/kasteroids/sprites/ship/ship0008.png
+share/apps/kasteroids/sprites/ship/ship0009.png
+share/apps/kasteroids/sprites/ship/ship0010.png
+share/apps/kasteroids/sprites/ship/ship0011.png
+share/apps/kasteroids/sprites/ship/ship0012.png
+share/apps/kasteroids/sprites/ship/ship0013.png
+share/apps/kasteroids/sprites/ship/ship0014.png
+share/apps/kasteroids/sprites/ship/ship0015.png
+share/apps/kasteroids/sprites/ship/ship0016.png
+share/apps/kasteroids/sprites/ship/ship0017.png
+share/apps/kasteroids/sprites/ship/ship0018.png
+share/apps/kasteroids/sprites/ship/ship0019.png
+share/apps/kasteroids/sprites/ship/ship0020.png
+share/apps/kasteroids/sprites/ship/ship0021.png
+share/apps/kasteroids/sprites/ship/ship0022.png
+share/apps/kasteroids/sprites/ship/ship0023.png
+share/apps/kasteroids/sprites/ship/ship0024.png
+share/apps/kasteroids/sprites/ship/ship0025.png
+share/apps/kasteroids/sprites/ship/ship0026.png
+share/apps/kasteroids/sprites/ship/ship0027.png
+share/apps/kasteroids/sprites/ship/ship0028.png
+share/apps/kasteroids/sprites/ship/ship0029.png
+share/apps/kasteroids/sprites/ship/ship0030.png
+share/apps/kasteroids/sprites/ship/ship0031.png
share/apps/katomic/katomicui.rc
share/apps/katomic/levels/level_1
share/apps/katomic/levels/level_10
@@ -916,6 +1077,7 @@ share/apps/lskat/grafix/type3.png
share/doc/HTML/en/kabalone/.anchors
share/doc/HTML/en/kabalone/authors.html
share/doc/HTML/en/kabalone/commandlineoptions.html
+share/doc/HTML/en/kabalone/common
share/doc/HTML/en/kabalone/copyright.html
share/doc/HTML/en/kabalone/epilogue.html
share/doc/HTML/en/kabalone/index.cvlog
@@ -926,6 +1088,7 @@ share/doc/HTML/en/kabalone/rulesofthegame.html
share/doc/HTML/en/kabalone/theuserinterface.html
share/doc/HTML/en/kasteroids/.anchors
share/doc/HTML/en/kasteroids/authors.html
+share/doc/HTML/en/kasteroids/common
share/doc/HTML/en/kasteroids/controls.html
share/doc/HTML/en/kasteroids/epilogue.html
share/doc/HTML/en/kasteroids/index.cvlog
@@ -936,6 +1099,7 @@ share/doc/HTML/en/kasteroids/ship.html
share/doc/HTML/en/kasteroids/tips.html
share/doc/HTML/en/kasteroids/upgrades.html
share/doc/HTML/en/kblackbox/.anchors
+share/doc/HTML/en/kblackbox/common
share/doc/HTML/en/kblackbox/copyright.html
share/doc/HTML/en/kblackbox/epilogue.html
share/doc/HTML/en/kblackbox/game-rules.html
@@ -947,7 +1111,13 @@ share/doc/HTML/en/kblackbox/index.html
share/doc/HTML/en/kblackbox/installation.html
share/doc/HTML/en/kblackbox/user-interaction.html
share/doc/HTML/en/kblackbox/whatiskblackbox.html
+share/doc/HTML/en/kfouleggs/.anchors
+share/doc/HTML/en/kfouleggs/common
+share/doc/HTML/en/kfouleggs/index.docbook
+share/doc/HTML/en/kfouleggs/index.html
+share/doc/HTML/en/kfouleggs/introduction.html
share/doc/HTML/en/kjumpingcube/.anchors
+share/doc/HTML/en/kjumpingcube/common
share/doc/HTML/en/kjumpingcube/compilation.html
share/doc/HTML/en/kjumpingcube/credits.html
share/doc/HTML/en/kjumpingcube/index.docbook
@@ -958,6 +1128,7 @@ share/doc/HTML/en/kjumpingcube/playingkjumpingcube.html
share/doc/HTML/en/kjumpingcube/questionsanswersandtips.html
share/doc/HTML/en/kjumpingcube/requirements.html
share/doc/HTML/en/kmahjongg/.anchors
+share/doc/HTML/en/kmahjongg/common
share/doc/HTML/en/kmahjongg/epilogue.html
share/doc/HTML/en/kmahjongg/index.cvlog
share/doc/HTML/en/kmahjongg/index.docbook
@@ -965,11 +1136,11 @@ share/doc/HTML/en/kmahjongg/index.html
share/doc/HTML/en/kmahjongg/introduction.html
share/doc/HTML/en/kmines/.anchors
share/doc/HTML/en/kmines/command.html
+share/doc/HTML/en/kmines/common
share/doc/HTML/en/kmines/compilation.html
share/doc/HTML/en/kmines/credits.html
share/doc/HTML/en/kmines/help-menu.html
share/doc/HTML/en/kmines/howtoplay.html
-share/doc/HTML/en/kmines/index.cvlog
share/doc/HTML/en/kmines/index.docbook
share/doc/HTML/en/kmines/index.html
share/doc/HTML/en/kmines/installation.html
@@ -980,6 +1151,7 @@ share/doc/HTML/en/kmines/kmines2.png
share/doc/HTML/en/kmines/prefs.html
share/doc/HTML/en/kmines/settings-menu.html
share/doc/HTML/en/konquest/.anchors
+share/doc/HTML/en/konquest/common
share/doc/HTML/en/konquest/epilogue.html
share/doc/HTML/en/konquest/index.cvlog
share/doc/HTML/en/konquest/index.docbook
@@ -988,13 +1160,13 @@ share/doc/HTML/en/konquest/notes.html
share/doc/HTML/en/konquest/playingthegame.html
share/doc/HTML/en/kpat/.anchors
share/doc/HTML/en/kpat/calculation.html
+share/doc/HTML/en/kpat/common
share/doc/HTML/en/kpat/compilation.html
share/doc/HTML/en/kpat/credits.html
share/doc/HTML/en/kpat/edit-menu.html
share/doc/HTML/en/kpat/freecell.html
share/doc/HTML/en/kpat/grandfather.html
share/doc/HTML/en/kpat/help.html
-share/doc/HTML/en/kpat/index.cvlog
share/doc/HTML/en/kpat/index.docbook
share/doc/HTML/en/kpat/index.html
share/doc/HTML/en/kpat/installation.html
@@ -1009,11 +1181,11 @@ share/doc/HTML/en/kpat/the-idiot.html
share/doc/HTML/en/kpat/using-kpat.html
share/doc/HTML/en/kpoker/.anchors
share/doc/HTML/en/kpoker/command.html
+share/doc/HTML/en/kpoker/common
share/doc/HTML/en/kpoker/compilation.html
share/doc/HTML/en/kpoker/credits.html
share/doc/HTML/en/kpoker/hands.html
share/doc/HTML/en/kpoker/help-menu.html
-share/doc/HTML/en/kpoker/index.cvlog
share/doc/HTML/en/kpoker/index.docbook
share/doc/HTML/en/kpoker/index.html
share/doc/HTML/en/kpoker/installation.html
@@ -1031,6 +1203,7 @@ share/doc/HTML/en/kpoker/where-do-i-get-the-latest-version-of-kpoker.html
share/doc/HTML/en/kreversi/.anchors
share/doc/HTML/en/kreversi/a-minute-to-learn.html
share/doc/HTML/en/kreversi/authors.html
+share/doc/HTML/en/kreversi/common
share/doc/HTML/en/kreversi/copyright.html
share/doc/HTML/en/kreversi/epilogue.html
share/doc/HTML/en/kreversi/index.cvlog
@@ -1040,6 +1213,7 @@ share/doc/HTML/en/kreversi/introduction.html
share/doc/HTML/en/kreversi/rulesofthegame.html
share/doc/HTML/en/kreversi/strategyhints.html
share/doc/HTML/en/ksame/.anchors
+share/doc/HTML/en/ksame/common
share/doc/HTML/en/ksame/copyright.html
share/doc/HTML/en/ksame/epilogue.html
share/doc/HTML/en/ksame/index.cvlog
@@ -1049,6 +1223,7 @@ share/doc/HTML/en/ksame/introduction.html
share/doc/HTML/en/ksame/rules-of-the-game.html
share/doc/HTML/en/ksame/strategy-hint.html
share/doc/HTML/en/kshisen/.anchors
+share/doc/HTML/en/kshisen/common
share/doc/HTML/en/kshisen/compilation.html
share/doc/HTML/en/kshisen/configuration.html
share/doc/HTML/en/kshisen/credits.html
@@ -1062,6 +1237,7 @@ share/doc/HTML/en/kshisen/playing-kshisen.html
share/doc/HTML/en/kshisen/requirements.html
share/doc/HTML/en/ksirtet/.anchors
share/doc/HTML/en/ksirtet/authors.html
+share/doc/HTML/en/ksirtet/common
share/doc/HTML/en/ksirtet/epilogue.html
share/doc/HTML/en/ksirtet/how-to-gain-points.html
share/doc/HTML/en/ksirtet/howtoplay.html
@@ -1073,6 +1249,7 @@ share/doc/HTML/en/ksirtet/multiplayer.html
share/doc/HTML/en/ksirtet/options.html
share/doc/HTML/en/ksmiletris/.anchors
share/doc/HTML/en/ksmiletris/changes.html
+share/doc/HTML/en/ksmiletris/common
share/doc/HTML/en/ksmiletris/credits.html
share/doc/HTML/en/ksmiletris/developement.html
share/doc/HTML/en/ksmiletris/epilogue.html
@@ -1085,6 +1262,7 @@ share/doc/HTML/en/ksmiletris/license.html
share/doc/HTML/en/ksmiletris/to-do.html
share/doc/HTML/en/ksnake/.anchors
share/doc/HTML/en/ksnake/authors.html
+share/doc/HTML/en/ksnake/common
share/doc/HTML/en/ksnake/customization.html
share/doc/HTML/en/ksnake/epilogue.html
share/doc/HTML/en/ksnake/index.cvlog
@@ -1094,31 +1272,20 @@ share/doc/HTML/en/ksnake/introduction.html
share/doc/HTML/en/ksnake/rulesofthegame.html
share/doc/HTML/en/ksnake/scoring.html
share/doc/HTML/en/ksokoban/.anchors
+share/doc/HTML/en/ksokoban/common
share/doc/HTML/en/ksokoban/credits.html
share/doc/HTML/en/ksokoban/howtoplay.html
share/doc/HTML/en/ksokoban/index.docbook
share/doc/HTML/en/ksokoban/index.html
share/doc/HTML/en/ksokoban/introduction.html
share/doc/HTML/en/ksokoban/loadingexternallevels.html
-share/doc/HTML/en/kspaceduel/.anchors
-share/doc/HTML/en/kspaceduel/ai.html
-share/doc/HTML/en/kspaceduel/command.html
-share/doc/HTML/en/kspaceduel/compilation.html
-share/doc/HTML/en/kspaceduel/credits.html
-share/doc/HTML/en/kspaceduel/help-menu.html
-share/doc/HTML/en/kspaceduel/index.cvlog
+share/doc/HTML/en/kspaceduel/common
share/doc/HTML/en/kspaceduel/index.docbook
-share/doc/HTML/en/kspaceduel/index.html
-share/doc/HTML/en/kspaceduel/installation.html
-share/doc/HTML/en/kspaceduel/introduction.html
-share/doc/HTML/en/kspaceduel/keys.html
share/doc/HTML/en/kspaceduel/kspaceduel1.png
share/doc/HTML/en/kspaceduel/kspaceduel2.png
share/doc/HTML/en/kspaceduel/kspaceduel3.png
-share/doc/HTML/en/kspaceduel/options.html
-share/doc/HTML/en/kspaceduel/settings-menu.html
-share/doc/HTML/en/kspaceduel/thegame.html
share/doc/HTML/en/ktron/.anchors
+share/doc/HTML/en/ktron/common
share/doc/HTML/en/ktron/compilation.html
share/doc/HTML/en/ktron/computerplayer.html
share/doc/HTML/en/ktron/config-behaviour.html
@@ -1134,6 +1301,7 @@ share/doc/HTML/en/ktron/playingktron.html
share/doc/HTML/en/ktron/requirements.html
share/doc/HTML/en/ktron/usingkeyboard.html
share/doc/HTML/en/ktuberling/.anchors
+share/doc/HTML/en/ktuberling/common
share/doc/HTML/en/ktuberling/compilation-and-installation.html
share/doc/HTML/en/ktuberling/epilogue.html
share/doc/HTML/en/ktuberling/for-programmers.html
@@ -1150,6 +1318,7 @@ share/doc/HTML/en/ktuberling/technical-reference.html
share/doc/HTML/en/ktuberling/the-menu-items.html
share/doc/HTML/en/ktuberling/the-tool-bar.html
share/doc/HTML/en/lskat/.anchors
+share/doc/HTML/en/lskat/common
share/doc/HTML/en/lskat/compilation.html
share/doc/HTML/en/lskat/credits.html
share/doc/HTML/en/lskat/help.html
@@ -1164,6 +1333,7 @@ share/doc/HTML/en/lskat/requirements.html
share/doc/HTML/en/lskat/rules.html
share/doc/HTML/en/lskat/view-menu.html
share/icons/hicolor/32x32/apps/kabalone.png
+share/icons/hicolor/32x32/apps/kasteroids.png
share/icons/hicolor/32x32/apps/kblackbox.png
share/icons/hicolor/32x32/apps/kmahjongg.png
share/icons/hicolor/32x32/apps/kmines.png
@@ -1179,6 +1349,7 @@ share/icons/hicolor/32x32/apps/ksnake.png
share/icons/hicolor/32x32/apps/ksokoban.png
share/icons/hicolor/32x32/apps/lskat.png
share/icons/hicolor/48x48/apps/kabalone.png
+share/icons/hicolor/48x48/apps/kasteroids.png
share/icons/hicolor/48x48/apps/kblackbox.png
share/icons/hicolor/48x48/apps/kmahjongg.png
share/icons/hicolor/48x48/apps/kmines.png
@@ -1194,6 +1365,7 @@ share/icons/hicolor/48x48/apps/ksnake.png
share/icons/hicolor/48x48/apps/ksokoban.png
share/icons/hicolor/48x48/apps/lskat.png
share/icons/locolor/16x16/apps/kabalone.png
+share/icons/locolor/16x16/apps/kasteroids.png
share/icons/locolor/16x16/apps/kblackbox.png
share/icons/locolor/16x16/apps/kjumpingcube.png
share/icons/locolor/16x16/apps/kmahjongg.png
@@ -1212,6 +1384,7 @@ share/icons/locolor/16x16/apps/kspaceduel.png
share/icons/locolor/16x16/apps/ktron.png
share/icons/locolor/16x16/apps/lskat.png
share/icons/locolor/32x32/apps/kabalone.png
+share/icons/locolor/32x32/apps/kasteroids.png
share/icons/locolor/32x32/apps/katomic.png
share/icons/locolor/32x32/apps/kblackbox.png
share/icons/locolor/32x32/apps/kjumpingcube.png
@@ -1248,13 +1421,17 @@ share/icons/locolor/32x32/apps/lskat.png
@dirrm share/doc/HTML/en/kmines
@dirrm share/doc/HTML/en/kmahjongg
@dirrm share/doc/HTML/en/kjumpingcube
+@dirrm share/doc/HTML/en/kfouleggs
@dirrm share/doc/HTML/en/kblackbox
@dirrm share/doc/HTML/en/kasteroids
@dirrm share/doc/HTML/en/kabalone
@dirrm share/apps/lskat/grafix
+@dirrm share/apps/lskat
@dirrm share/apps/ktuberling/sounds/en
+@dirrm share/apps/ktuberling/sounds
@dirrm share/apps/ktuberling/pics
@dirrm share/apps/ktuberling/museum
+@dirrm share/apps/ktuberling
@dirrm share/apps/ktron
@dirrm share/apps/kspaceduel/sprites/sun
@dirrm share/apps/kspaceduel/sprites/ship2
@@ -1279,23 +1456,41 @@ share/icons/locolor/32x32/apps/lskat.png
@dirrm share/apps/ksnake
@dirrm share/apps/ksmiletris/sounds
@dirrm share/apps/ksmiletris/data
+@dirrm share/apps/ksmiletris
@dirrm share/apps/ksirtet
@dirrm share/apps/kshisen
@dirrm share/apps/ksame
@dirrm share/apps/kreversi/sounds
@dirrm share/apps/kreversi/pics/background
@dirrm share/apps/kreversi/pics
+@dirrm share/apps/kreversi
@dirrm share/apps/kpoker/sounds
@dirrm share/apps/kpoker/pics
+@dirrm share/apps/kpoker
@dirrm share/apps/kpat/pics
+@dirrm share/apps/kpat
@dirrm share/apps/konquest/pics
+@dirrm share/apps/konquest
@dirrm share/apps/kmines
@dirrm share/apps/kmahjongg/toolbar
@dirrm share/apps/kmahjongg/pics
+@dirrm share/apps/kmahjongg
@dirrm share/apps/kfouleggs
@dirrm share/apps/kblackbox/pics
+@dirrm share/apps/kblackbox
@dirrm share/apps/katomic/pics
@dirrm share/apps/katomic/levels
@dirrm share/apps/katomic
+@dirrm share/apps/kasteroids/sprites/ship
+@dirrm share/apps/kasteroids/sprites/shield
+@dirrm share/apps/kasteroids/sprites/rock3
+@dirrm share/apps/kasteroids/sprites/rock2
+@dirrm share/apps/kasteroids/sprites/rock1
+@dirrm share/apps/kasteroids/sprites/powerups
+@dirrm share/apps/kasteroids/sprites/missile
+@dirrm share/apps/kasteroids/sprites/exhaust
+@dirrm share/apps/kasteroids/sprites/bits
+@dirrm share/apps/kasteroids/sprites
+@dirrm share/apps/kasteroids/sounds
@dirrm share/apps/kabalone/toolbar
@dirrm share/apps/kabalone
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 0a23c0e873d4..4a38258da921 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdegames
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= games 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
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo
index 56f7e42953bc..0c6147bdfff1 100644
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@@ -1 +1 @@
-MD5 (kdegames-20000829A.tar.bz2) = c08579d40fae132c60804103818b3f2d
+MD5 (kdegames-1.94.tar.bz2) = f99790b50118278951c12acbc0fc0200
diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist
index 0563caab595b..77d7a9233ec9 100644
--- a/games/kdegames4/pkg-plist
+++ b/games/kdegames4/pkg-plist
@@ -1,4 +1,5 @@
bin/kabalone
+bin/kasteroids
bin/katomic
bin/kblackbox
bin/kfouleggs
@@ -21,6 +22,7 @@ bin/ktuberling
bin/lskat
bin/lskatproc
share/applnk/Games/kabalone.desktop
+share/applnk/Games/kasteroids.desktop
share/applnk/Games/katomic.desktop
share/applnk/Games/kblackbox.desktop
share/applnk/Games/kfouleggs.desktop
@@ -57,6 +59,165 @@ share/apps/kabalone/toolbar/stop.xpm
share/apps/kabalone/toolbar/undo.xpm
share/apps/kabalone/toolbar/warning.xpm
share/apps/kabalone/toolbar/yellowball.xpm
+share/apps/kasteroids/sounds/Explosion.wav
+share/apps/kasteroids/sprites/bg.png
+share/apps/kasteroids/sprites/bits/bits0000.png
+share/apps/kasteroids/sprites/bits/bits0001.png
+share/apps/kasteroids/sprites/bits/bits0002.png
+share/apps/kasteroids/sprites/bits/bits0003.png
+share/apps/kasteroids/sprites/bits/bits0004.png
+share/apps/kasteroids/sprites/bits/bits0005.png
+share/apps/kasteroids/sprites/bits/bits0006.png
+share/apps/kasteroids/sprites/bits/bits0007.png
+share/apps/kasteroids/sprites/bits/bits0008.png
+share/apps/kasteroids/sprites/bits/bits0009.png
+share/apps/kasteroids/sprites/bits/bits0010.png
+share/apps/kasteroids/sprites/bits/bits0011.png
+share/apps/kasteroids/sprites/bits/bits0012.png
+share/apps/kasteroids/sprites/bits/bits0013.png
+share/apps/kasteroids/sprites/bits/bits0014.png
+share/apps/kasteroids/sprites/bits/bits0015.png
+share/apps/kasteroids/sprites/exhaust/exhaust.png
+share/apps/kasteroids/sprites/missile/missile.png
+share/apps/kasteroids/sprites/powerups/brake.png
+share/apps/kasteroids/sprites/powerups/energy.png
+share/apps/kasteroids/sprites/powerups/shield.png
+share/apps/kasteroids/sprites/powerups/teleport.png
+share/apps/kasteroids/sprites/rock1/rock10000.png
+share/apps/kasteroids/sprites/rock1/rock10001.png
+share/apps/kasteroids/sprites/rock1/rock10002.png
+share/apps/kasteroids/sprites/rock1/rock10003.png
+share/apps/kasteroids/sprites/rock1/rock10004.png
+share/apps/kasteroids/sprites/rock1/rock10005.png
+share/apps/kasteroids/sprites/rock1/rock10006.png
+share/apps/kasteroids/sprites/rock1/rock10007.png
+share/apps/kasteroids/sprites/rock1/rock10008.png
+share/apps/kasteroids/sprites/rock1/rock10009.png
+share/apps/kasteroids/sprites/rock1/rock10010.png
+share/apps/kasteroids/sprites/rock1/rock10011.png
+share/apps/kasteroids/sprites/rock1/rock10012.png
+share/apps/kasteroids/sprites/rock1/rock10013.png
+share/apps/kasteroids/sprites/rock1/rock10014.png
+share/apps/kasteroids/sprites/rock1/rock10015.png
+share/apps/kasteroids/sprites/rock1/rock10016.png
+share/apps/kasteroids/sprites/rock1/rock10017.png
+share/apps/kasteroids/sprites/rock1/rock10018.png
+share/apps/kasteroids/sprites/rock1/rock10019.png
+share/apps/kasteroids/sprites/rock1/rock10020.png
+share/apps/kasteroids/sprites/rock1/rock10021.png
+share/apps/kasteroids/sprites/rock1/rock10022.png
+share/apps/kasteroids/sprites/rock1/rock10023.png
+share/apps/kasteroids/sprites/rock1/rock10024.png
+share/apps/kasteroids/sprites/rock1/rock10025.png
+share/apps/kasteroids/sprites/rock1/rock10026.png
+share/apps/kasteroids/sprites/rock1/rock10027.png
+share/apps/kasteroids/sprites/rock1/rock10028.png
+share/apps/kasteroids/sprites/rock1/rock10029.png
+share/apps/kasteroids/sprites/rock1/rock10030.png
+share/apps/kasteroids/sprites/rock1/rock10031.png
+share/apps/kasteroids/sprites/rock2/rock20000.png
+share/apps/kasteroids/sprites/rock2/rock20001.png
+share/apps/kasteroids/sprites/rock2/rock20002.png
+share/apps/kasteroids/sprites/rock2/rock20003.png
+share/apps/kasteroids/sprites/rock2/rock20004.png
+share/apps/kasteroids/sprites/rock2/rock20005.png
+share/apps/kasteroids/sprites/rock2/rock20006.png
+share/apps/kasteroids/sprites/rock2/rock20007.png
+share/apps/kasteroids/sprites/rock2/rock20008.png
+share/apps/kasteroids/sprites/rock2/rock20009.png
+share/apps/kasteroids/sprites/rock2/rock20010.png
+share/apps/kasteroids/sprites/rock2/rock20011.png
+share/apps/kasteroids/sprites/rock2/rock20012.png
+share/apps/kasteroids/sprites/rock2/rock20013.png
+share/apps/kasteroids/sprites/rock2/rock20014.png
+share/apps/kasteroids/sprites/rock2/rock20015.png
+share/apps/kasteroids/sprites/rock2/rock20016.png
+share/apps/kasteroids/sprites/rock2/rock20017.png
+share/apps/kasteroids/sprites/rock2/rock20018.png
+share/apps/kasteroids/sprites/rock2/rock20019.png
+share/apps/kasteroids/sprites/rock2/rock20020.png
+share/apps/kasteroids/sprites/rock2/rock20021.png
+share/apps/kasteroids/sprites/rock2/rock20022.png
+share/apps/kasteroids/sprites/rock2/rock20023.png
+share/apps/kasteroids/sprites/rock2/rock20024.png
+share/apps/kasteroids/sprites/rock2/rock20025.png
+share/apps/kasteroids/sprites/rock2/rock20026.png
+share/apps/kasteroids/sprites/rock2/rock20027.png
+share/apps/kasteroids/sprites/rock2/rock20028.png
+share/apps/kasteroids/sprites/rock2/rock20029.png
+share/apps/kasteroids/sprites/rock2/rock20030.png
+share/apps/kasteroids/sprites/rock2/rock20031.png
+share/apps/kasteroids/sprites/rock3/rock30000.png
+share/apps/kasteroids/sprites/rock3/rock30001.png
+share/apps/kasteroids/sprites/rock3/rock30002.png
+share/apps/kasteroids/sprites/rock3/rock30003.png
+share/apps/kasteroids/sprites/rock3/rock30004.png
+share/apps/kasteroids/sprites/rock3/rock30005.png
+share/apps/kasteroids/sprites/rock3/rock30006.png
+share/apps/kasteroids/sprites/rock3/rock30007.png
+share/apps/kasteroids/sprites/rock3/rock30008.png
+share/apps/kasteroids/sprites/rock3/rock30009.png
+share/apps/kasteroids/sprites/rock3/rock30010.png
+share/apps/kasteroids/sprites/rock3/rock30011.png
+share/apps/kasteroids/sprites/rock3/rock30012.png
+share/apps/kasteroids/sprites/rock3/rock30013.png
+share/apps/kasteroids/sprites/rock3/rock30014.png
+share/apps/kasteroids/sprites/rock3/rock30015.png
+share/apps/kasteroids/sprites/rock3/rock30016.png
+share/apps/kasteroids/sprites/rock3/rock30017.png
+share/apps/kasteroids/sprites/rock3/rock30018.png
+share/apps/kasteroids/sprites/rock3/rock30019.png
+share/apps/kasteroids/sprites/rock3/rock30020.png
+share/apps/kasteroids/sprites/rock3/rock30021.png
+share/apps/kasteroids/sprites/rock3/rock30022.png
+share/apps/kasteroids/sprites/rock3/rock30023.png
+share/apps/kasteroids/sprites/rock3/rock30024.png
+share/apps/kasteroids/sprites/rock3/rock30025.png
+share/apps/kasteroids/sprites/rock3/rock30026.png
+share/apps/kasteroids/sprites/rock3/rock30027.png
+share/apps/kasteroids/sprites/rock3/rock30028.png
+share/apps/kasteroids/sprites/rock3/rock30029.png
+share/apps/kasteroids/sprites/rock3/rock30030.png
+share/apps/kasteroids/sprites/rock3/rock30031.png
+share/apps/kasteroids/sprites/shield/shield0000.png
+share/apps/kasteroids/sprites/shield/shield0001.png
+share/apps/kasteroids/sprites/shield/shield0002.png
+share/apps/kasteroids/sprites/shield/shield0003.png
+share/apps/kasteroids/sprites/shield/shield0004.png
+share/apps/kasteroids/sprites/shield/shield0005.png
+share/apps/kasteroids/sprites/shield/shield0006.png
+share/apps/kasteroids/sprites/ship/ship0000.png
+share/apps/kasteroids/sprites/ship/ship0001.png
+share/apps/kasteroids/sprites/ship/ship0002.png
+share/apps/kasteroids/sprites/ship/ship0003.png
+share/apps/kasteroids/sprites/ship/ship0004.png
+share/apps/kasteroids/sprites/ship/ship0005.png
+share/apps/kasteroids/sprites/ship/ship0006.png
+share/apps/kasteroids/sprites/ship/ship0007.png
+share/apps/kasteroids/sprites/ship/ship0008.png
+share/apps/kasteroids/sprites/ship/ship0009.png
+share/apps/kasteroids/sprites/ship/ship0010.png
+share/apps/kasteroids/sprites/ship/ship0011.png
+share/apps/kasteroids/sprites/ship/ship0012.png
+share/apps/kasteroids/sprites/ship/ship0013.png
+share/apps/kasteroids/sprites/ship/ship0014.png
+share/apps/kasteroids/sprites/ship/ship0015.png
+share/apps/kasteroids/sprites/ship/ship0016.png
+share/apps/kasteroids/sprites/ship/ship0017.png
+share/apps/kasteroids/sprites/ship/ship0018.png
+share/apps/kasteroids/sprites/ship/ship0019.png
+share/apps/kasteroids/sprites/ship/ship0020.png
+share/apps/kasteroids/sprites/ship/ship0021.png
+share/apps/kasteroids/sprites/ship/ship0022.png
+share/apps/kasteroids/sprites/ship/ship0023.png
+share/apps/kasteroids/sprites/ship/ship0024.png
+share/apps/kasteroids/sprites/ship/ship0025.png
+share/apps/kasteroids/sprites/ship/ship0026.png
+share/apps/kasteroids/sprites/ship/ship0027.png
+share/apps/kasteroids/sprites/ship/ship0028.png
+share/apps/kasteroids/sprites/ship/ship0029.png
+share/apps/kasteroids/sprites/ship/ship0030.png
+share/apps/kasteroids/sprites/ship/ship0031.png
share/apps/katomic/katomicui.rc
share/apps/katomic/levels/level_1
share/apps/katomic/levels/level_10
@@ -916,6 +1077,7 @@ share/apps/lskat/grafix/type3.png
share/doc/HTML/en/kabalone/.anchors
share/doc/HTML/en/kabalone/authors.html
share/doc/HTML/en/kabalone/commandlineoptions.html
+share/doc/HTML/en/kabalone/common
share/doc/HTML/en/kabalone/copyright.html
share/doc/HTML/en/kabalone/epilogue.html
share/doc/HTML/en/kabalone/index.cvlog
@@ -926,6 +1088,7 @@ share/doc/HTML/en/kabalone/rulesofthegame.html
share/doc/HTML/en/kabalone/theuserinterface.html
share/doc/HTML/en/kasteroids/.anchors
share/doc/HTML/en/kasteroids/authors.html
+share/doc/HTML/en/kasteroids/common
share/doc/HTML/en/kasteroids/controls.html
share/doc/HTML/en/kasteroids/epilogue.html
share/doc/HTML/en/kasteroids/index.cvlog
@@ -936,6 +1099,7 @@ share/doc/HTML/en/kasteroids/ship.html
share/doc/HTML/en/kasteroids/tips.html
share/doc/HTML/en/kasteroids/upgrades.html
share/doc/HTML/en/kblackbox/.anchors
+share/doc/HTML/en/kblackbox/common
share/doc/HTML/en/kblackbox/copyright.html
share/doc/HTML/en/kblackbox/epilogue.html
share/doc/HTML/en/kblackbox/game-rules.html
@@ -947,7 +1111,13 @@ share/doc/HTML/en/kblackbox/index.html
share/doc/HTML/en/kblackbox/installation.html
share/doc/HTML/en/kblackbox/user-interaction.html
share/doc/HTML/en/kblackbox/whatiskblackbox.html
+share/doc/HTML/en/kfouleggs/.anchors
+share/doc/HTML/en/kfouleggs/common
+share/doc/HTML/en/kfouleggs/index.docbook
+share/doc/HTML/en/kfouleggs/index.html
+share/doc/HTML/en/kfouleggs/introduction.html
share/doc/HTML/en/kjumpingcube/.anchors
+share/doc/HTML/en/kjumpingcube/common
share/doc/HTML/en/kjumpingcube/compilation.html
share/doc/HTML/en/kjumpingcube/credits.html
share/doc/HTML/en/kjumpingcube/index.docbook
@@ -958,6 +1128,7 @@ share/doc/HTML/en/kjumpingcube/playingkjumpingcube.html
share/doc/HTML/en/kjumpingcube/questionsanswersandtips.html
share/doc/HTML/en/kjumpingcube/requirements.html
share/doc/HTML/en/kmahjongg/.anchors
+share/doc/HTML/en/kmahjongg/common
share/doc/HTML/en/kmahjongg/epilogue.html
share/doc/HTML/en/kmahjongg/index.cvlog
share/doc/HTML/en/kmahjongg/index.docbook
@@ -965,11 +1136,11 @@ share/doc/HTML/en/kmahjongg/index.html
share/doc/HTML/en/kmahjongg/introduction.html
share/doc/HTML/en/kmines/.anchors
share/doc/HTML/en/kmines/command.html
+share/doc/HTML/en/kmines/common
share/doc/HTML/en/kmines/compilation.html
share/doc/HTML/en/kmines/credits.html
share/doc/HTML/en/kmines/help-menu.html
share/doc/HTML/en/kmines/howtoplay.html
-share/doc/HTML/en/kmines/index.cvlog
share/doc/HTML/en/kmines/index.docbook
share/doc/HTML/en/kmines/index.html
share/doc/HTML/en/kmines/installation.html
@@ -980,6 +1151,7 @@ share/doc/HTML/en/kmines/kmines2.png
share/doc/HTML/en/kmines/prefs.html
share/doc/HTML/en/kmines/settings-menu.html
share/doc/HTML/en/konquest/.anchors
+share/doc/HTML/en/konquest/common
share/doc/HTML/en/konquest/epilogue.html
share/doc/HTML/en/konquest/index.cvlog
share/doc/HTML/en/konquest/index.docbook
@@ -988,13 +1160,13 @@ share/doc/HTML/en/konquest/notes.html
share/doc/HTML/en/konquest/playingthegame.html
share/doc/HTML/en/kpat/.anchors
share/doc/HTML/en/kpat/calculation.html
+share/doc/HTML/en/kpat/common
share/doc/HTML/en/kpat/compilation.html
share/doc/HTML/en/kpat/credits.html
share/doc/HTML/en/kpat/edit-menu.html
share/doc/HTML/en/kpat/freecell.html
share/doc/HTML/en/kpat/grandfather.html
share/doc/HTML/en/kpat/help.html
-share/doc/HTML/en/kpat/index.cvlog
share/doc/HTML/en/kpat/index.docbook
share/doc/HTML/en/kpat/index.html
share/doc/HTML/en/kpat/installation.html
@@ -1009,11 +1181,11 @@ share/doc/HTML/en/kpat/the-idiot.html
share/doc/HTML/en/kpat/using-kpat.html
share/doc/HTML/en/kpoker/.anchors
share/doc/HTML/en/kpoker/command.html
+share/doc/HTML/en/kpoker/common
share/doc/HTML/en/kpoker/compilation.html
share/doc/HTML/en/kpoker/credits.html
share/doc/HTML/en/kpoker/hands.html
share/doc/HTML/en/kpoker/help-menu.html
-share/doc/HTML/en/kpoker/index.cvlog
share/doc/HTML/en/kpoker/index.docbook
share/doc/HTML/en/kpoker/index.html
share/doc/HTML/en/kpoker/installation.html
@@ -1031,6 +1203,7 @@ share/doc/HTML/en/kpoker/where-do-i-get-the-latest-version-of-kpoker.html
share/doc/HTML/en/kreversi/.anchors
share/doc/HTML/en/kreversi/a-minute-to-learn.html
share/doc/HTML/en/kreversi/authors.html
+share/doc/HTML/en/kreversi/common
share/doc/HTML/en/kreversi/copyright.html
share/doc/HTML/en/kreversi/epilogue.html
share/doc/HTML/en/kreversi/index.cvlog
@@ -1040,6 +1213,7 @@ share/doc/HTML/en/kreversi/introduction.html
share/doc/HTML/en/kreversi/rulesofthegame.html
share/doc/HTML/en/kreversi/strategyhints.html
share/doc/HTML/en/ksame/.anchors
+share/doc/HTML/en/ksame/common
share/doc/HTML/en/ksame/copyright.html
share/doc/HTML/en/ksame/epilogue.html
share/doc/HTML/en/ksame/index.cvlog
@@ -1049,6 +1223,7 @@ share/doc/HTML/en/ksame/introduction.html
share/doc/HTML/en/ksame/rules-of-the-game.html
share/doc/HTML/en/ksame/strategy-hint.html
share/doc/HTML/en/kshisen/.anchors
+share/doc/HTML/en/kshisen/common
share/doc/HTML/en/kshisen/compilation.html
share/doc/HTML/en/kshisen/configuration.html
share/doc/HTML/en/kshisen/credits.html
@@ -1062,6 +1237,7 @@ share/doc/HTML/en/kshisen/playing-kshisen.html
share/doc/HTML/en/kshisen/requirements.html
share/doc/HTML/en/ksirtet/.anchors
share/doc/HTML/en/ksirtet/authors.html
+share/doc/HTML/en/ksirtet/common
share/doc/HTML/en/ksirtet/epilogue.html
share/doc/HTML/en/ksirtet/how-to-gain-points.html
share/doc/HTML/en/ksirtet/howtoplay.html
@@ -1073,6 +1249,7 @@ share/doc/HTML/en/ksirtet/multiplayer.html
share/doc/HTML/en/ksirtet/options.html
share/doc/HTML/en/ksmiletris/.anchors
share/doc/HTML/en/ksmiletris/changes.html
+share/doc/HTML/en/ksmiletris/common
share/doc/HTML/en/ksmiletris/credits.html
share/doc/HTML/en/ksmiletris/developement.html
share/doc/HTML/en/ksmiletris/epilogue.html
@@ -1085,6 +1262,7 @@ share/doc/HTML/en/ksmiletris/license.html
share/doc/HTML/en/ksmiletris/to-do.html
share/doc/HTML/en/ksnake/.anchors
share/doc/HTML/en/ksnake/authors.html
+share/doc/HTML/en/ksnake/common
share/doc/HTML/en/ksnake/customization.html
share/doc/HTML/en/ksnake/epilogue.html
share/doc/HTML/en/ksnake/index.cvlog
@@ -1094,31 +1272,20 @@ share/doc/HTML/en/ksnake/introduction.html
share/doc/HTML/en/ksnake/rulesofthegame.html
share/doc/HTML/en/ksnake/scoring.html
share/doc/HTML/en/ksokoban/.anchors
+share/doc/HTML/en/ksokoban/common
share/doc/HTML/en/ksokoban/credits.html
share/doc/HTML/en/ksokoban/howtoplay.html
share/doc/HTML/en/ksokoban/index.docbook
share/doc/HTML/en/ksokoban/index.html
share/doc/HTML/en/ksokoban/introduction.html
share/doc/HTML/en/ksokoban/loadingexternallevels.html
-share/doc/HTML/en/kspaceduel/.anchors
-share/doc/HTML/en/kspaceduel/ai.html
-share/doc/HTML/en/kspaceduel/command.html
-share/doc/HTML/en/kspaceduel/compilation.html
-share/doc/HTML/en/kspaceduel/credits.html
-share/doc/HTML/en/kspaceduel/help-menu.html
-share/doc/HTML/en/kspaceduel/index.cvlog
+share/doc/HTML/en/kspaceduel/common
share/doc/HTML/en/kspaceduel/index.docbook
-share/doc/HTML/en/kspaceduel/index.html
-share/doc/HTML/en/kspaceduel/installation.html
-share/doc/HTML/en/kspaceduel/introduction.html
-share/doc/HTML/en/kspaceduel/keys.html
share/doc/HTML/en/kspaceduel/kspaceduel1.png
share/doc/HTML/en/kspaceduel/kspaceduel2.png
share/doc/HTML/en/kspaceduel/kspaceduel3.png
-share/doc/HTML/en/kspaceduel/options.html
-share/doc/HTML/en/kspaceduel/settings-menu.html
-share/doc/HTML/en/kspaceduel/thegame.html
share/doc/HTML/en/ktron/.anchors
+share/doc/HTML/en/ktron/common
share/doc/HTML/en/ktron/compilation.html
share/doc/HTML/en/ktron/computerplayer.html
share/doc/HTML/en/ktron/config-behaviour.html
@@ -1134,6 +1301,7 @@ share/doc/HTML/en/ktron/playingktron.html
share/doc/HTML/en/ktron/requirements.html
share/doc/HTML/en/ktron/usingkeyboard.html
share/doc/HTML/en/ktuberling/.anchors
+share/doc/HTML/en/ktuberling/common
share/doc/HTML/en/ktuberling/compilation-and-installation.html
share/doc/HTML/en/ktuberling/epilogue.html
share/doc/HTML/en/ktuberling/for-programmers.html
@@ -1150,6 +1318,7 @@ share/doc/HTML/en/ktuberling/technical-reference.html
share/doc/HTML/en/ktuberling/the-menu-items.html
share/doc/HTML/en/ktuberling/the-tool-bar.html
share/doc/HTML/en/lskat/.anchors
+share/doc/HTML/en/lskat/common
share/doc/HTML/en/lskat/compilation.html
share/doc/HTML/en/lskat/credits.html
share/doc/HTML/en/lskat/help.html
@@ -1164,6 +1333,7 @@ share/doc/HTML/en/lskat/requirements.html
share/doc/HTML/en/lskat/rules.html
share/doc/HTML/en/lskat/view-menu.html
share/icons/hicolor/32x32/apps/kabalone.png
+share/icons/hicolor/32x32/apps/kasteroids.png
share/icons/hicolor/32x32/apps/kblackbox.png
share/icons/hicolor/32x32/apps/kmahjongg.png
share/icons/hicolor/32x32/apps/kmines.png
@@ -1179,6 +1349,7 @@ share/icons/hicolor/32x32/apps/ksnake.png
share/icons/hicolor/32x32/apps/ksokoban.png
share/icons/hicolor/32x32/apps/lskat.png
share/icons/hicolor/48x48/apps/kabalone.png
+share/icons/hicolor/48x48/apps/kasteroids.png
share/icons/hicolor/48x48/apps/kblackbox.png
share/icons/hicolor/48x48/apps/kmahjongg.png
share/icons/hicolor/48x48/apps/kmines.png
@@ -1194,6 +1365,7 @@ share/icons/hicolor/48x48/apps/ksnake.png
share/icons/hicolor/48x48/apps/ksokoban.png
share/icons/hicolor/48x48/apps/lskat.png
share/icons/locolor/16x16/apps/kabalone.png
+share/icons/locolor/16x16/apps/kasteroids.png
share/icons/locolor/16x16/apps/kblackbox.png
share/icons/locolor/16x16/apps/kjumpingcube.png
share/icons/locolor/16x16/apps/kmahjongg.png
@@ -1212,6 +1384,7 @@ share/icons/locolor/16x16/apps/kspaceduel.png
share/icons/locolor/16x16/apps/ktron.png
share/icons/locolor/16x16/apps/lskat.png
share/icons/locolor/32x32/apps/kabalone.png
+share/icons/locolor/32x32/apps/kasteroids.png
share/icons/locolor/32x32/apps/katomic.png
share/icons/locolor/32x32/apps/kblackbox.png
share/icons/locolor/32x32/apps/kjumpingcube.png
@@ -1248,13 +1421,17 @@ share/icons/locolor/32x32/apps/lskat.png
@dirrm share/doc/HTML/en/kmines
@dirrm share/doc/HTML/en/kmahjongg
@dirrm share/doc/HTML/en/kjumpingcube
+@dirrm share/doc/HTML/en/kfouleggs
@dirrm share/doc/HTML/en/kblackbox
@dirrm share/doc/HTML/en/kasteroids
@dirrm share/doc/HTML/en/kabalone
@dirrm share/apps/lskat/grafix
+@dirrm share/apps/lskat
@dirrm share/apps/ktuberling/sounds/en
+@dirrm share/apps/ktuberling/sounds
@dirrm share/apps/ktuberling/pics
@dirrm share/apps/ktuberling/museum
+@dirrm share/apps/ktuberling
@dirrm share/apps/ktron
@dirrm share/apps/kspaceduel/sprites/sun
@dirrm share/apps/kspaceduel/sprites/ship2
@@ -1279,23 +1456,41 @@ share/icons/locolor/32x32/apps/lskat.png
@dirrm share/apps/ksnake
@dirrm share/apps/ksmiletris/sounds
@dirrm share/apps/ksmiletris/data
+@dirrm share/apps/ksmiletris
@dirrm share/apps/ksirtet
@dirrm share/apps/kshisen
@dirrm share/apps/ksame
@dirrm share/apps/kreversi/sounds
@dirrm share/apps/kreversi/pics/background
@dirrm share/apps/kreversi/pics
+@dirrm share/apps/kreversi
@dirrm share/apps/kpoker/sounds
@dirrm share/apps/kpoker/pics
+@dirrm share/apps/kpoker
@dirrm share/apps/kpat/pics
+@dirrm share/apps/kpat
@dirrm share/apps/konquest/pics
+@dirrm share/apps/konquest
@dirrm share/apps/kmines
@dirrm share/apps/kmahjongg/toolbar
@dirrm share/apps/kmahjongg/pics
+@dirrm share/apps/kmahjongg
@dirrm share/apps/kfouleggs
@dirrm share/apps/kblackbox/pics
+@dirrm share/apps/kblackbox
@dirrm share/apps/katomic/pics
@dirrm share/apps/katomic/levels
@dirrm share/apps/katomic
+@dirrm share/apps/kasteroids/sprites/ship
+@dirrm share/apps/kasteroids/sprites/shield
+@dirrm share/apps/kasteroids/sprites/rock3
+@dirrm share/apps/kasteroids/sprites/rock2
+@dirrm share/apps/kasteroids/sprites/rock1
+@dirrm share/apps/kasteroids/sprites/powerups
+@dirrm share/apps/kasteroids/sprites/missile
+@dirrm share/apps/kasteroids/sprites/exhaust
+@dirrm share/apps/kasteroids/sprites/bits
+@dirrm share/apps/kasteroids/sprites
+@dirrm share/apps/kasteroids/sounds
@dirrm share/apps/kabalone/toolbar
@dirrm share/apps/kabalone
diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile
index 4df609862a09..2f011a022fa4 100644
--- a/graphics/kdegraphics2/Makefile
+++ b/graphics/kdegraphics2/Makefile
@@ -1,29 +1,33 @@
-# New ports collection makefile for: kdegraphics
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
+# New ports collection makefile for: KDE2 Graphics
+# Date created: Saturday 2 September 2000
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= kdegraphics
-PORTVERSION= 1.1.2
+PORTVERSION= 1.94
CATEGORIES= graphics kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
+MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)"
-CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
- INSTALL_SCRIPT="install -c -m 555"
-CFLAGS+= "-I${PREFIX}/include"
+INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+ --with-qt-includes=${X11BASE}/include/qt2 \
+ --with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/graphics/kdegraphics2/distinfo b/graphics/kdegraphics2/distinfo
index 623a28502528..918b62666824 100644
--- a/graphics/kdegraphics2/distinfo
+++ b/graphics/kdegraphics2/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-1.1.2.tar.bz2) = f79551371b5beacb543cac66aa8c42df
+MD5 (kdegraphics-1.94.tar.bz2) = 5d501f433aa949dec404c7fa21ddc530
diff --git a/graphics/kdegraphics2/pkg-comment b/graphics/kdegraphics2/pkg-comment
index 29b0369151c5..186230f9287d 100644
--- a/graphics/kdegraphics2/pkg-comment
+++ b/graphics/kdegraphics2/pkg-comment
@@ -1 +1 @@
-Graphics programs (PS,DVI,FAX,...) for the KDE integrated X11 desktop
+Utilities for the KDE integrated X11 desktop
diff --git a/graphics/kdegraphics2/pkg-plist b/graphics/kdegraphics2/pkg-plist
index e43cb9285a65..3274e9690901 100644
--- a/graphics/kdegraphics2/pkg-plist
+++ b/graphics/kdegraphics2/pkg-plist
@@ -2,332 +2,256 @@ bin/kdvi
bin/kfax
bin/kfract
bin/kghostview
-bin/kiconedit
-bin/kpaint
+bin/kpixmap2bitmap
bin/ksnapshot
bin/kview
-share/applnk/Graphics/KFax.kdelnk
-share/applnk/Graphics/kdvi.kdelnk
-share/applnk/Graphics/kfract.kdelnk
-share/applnk/Graphics/kghostview.kdelnk
-share/applnk/Graphics/kiconedit.kdelnk
-share/applnk/Graphics/kpaint.kdelnk
-share/applnk/Graphics/ksnapshot.kdelnk
-share/applnk/Graphics/kview.kdelnk
+bin/kviewshell
+bin/pixie
+include/ifplugin.h
+include/mini-magick/animate.h
+include/mini-magick/api.h
+include/mini-magick/blob.h
+include/mini-magick/cache.h
+include/mini-magick/cache_io.h
+include/mini-magick/classify.h
+include/mini-magick/compress.h
+include/mini-magick/defines.h
+include/mini-magick/delegates.h
+include/mini-magick/error.h
+include/mini-magick/gems.h
+include/mini-magick/image.h
+include/mini-magick/magick.h
+include/mini-magick/memory.h
+include/mini-magick/monitor.h
+include/mini-magick/quantize.h
+include/mini-magick/timer.h
+include/mini-magick/utility.h
+include/mini-magick/version.h
+lib/kview.la
+lib/kview.so
+lib/libbaglayout.la
+lib/libbaglayout.so.0
+lib/libkdvi.la
+lib/libkdvi.so
+lib/libkfax.la
+lib/libkfax.so
+lib/libkghostview.la
+lib/libkghostview.so.1
+lib/libkif_kdeeffects.la
+lib/libkif_kdeeffects.so.1
+lib/libkif_magick.la
+lib/libkif_magick.so.1
+lib/libkifplugin.la
+lib/libkifplugin.so.3
+lib/libkmultipage.la
+lib/libkmultipage.so.0
+lib/libkpagetest.la
+lib/libkpagetest.so
+lib/libkviewerpart.la
+lib/libkviewerpart.so
+lib/libkviewpart.la
+lib/libkviewpart.so
+lib/libminimagick.la
+lib/libminimagick.so.5
+lib/libpixie_color.la
+lib/libpixie_color.so.1
+lib/libpixie_thumb.la
+lib/libpixie_thumb.so.1
+share/applnk/Graphics/kdvi.desktop
+share/applnk/Graphics/kfax.desktop
+share/applnk/Graphics/kfract.desktop
+share/applnk/Graphics/kghostview.desktop
+share/applnk/Graphics/kpixmap2bitmap.desktop
+share/applnk/Graphics/ksnapshot.desktop
+share/applnk/Graphics/kview.desktop
+share/applnk/Graphics/pixie.desktop
+share/apps/kdvi/kdvi_part.rc
share/apps/kdvi/toolbar/forwpage.xpm
share/apps/kdvi/toolbar/largetext.xpm
share/apps/kdvi/toolbar/smalltext.xpm
+share/apps/kfax/kfax_part.rc
share/apps/kfax/pics/kfax.tif
share/apps/kfax/pics/kfaxlogo.xpm
-share/apps/kiconedit/pics/compressed.xpm
-share/apps/kiconedit/pics/folder.xpm
-share/apps/kiconedit/pics/mini-folder.xpm
-share/apps/kiconedit/pics/mini-package.xpm
-share/apps/kiconedit/pics/package.xpm
-share/apps/kiconedit/pics/source.xpm
-share/apps/kiconedit/pics/standard.xpm
-share/apps/kiconedit/toolbar/aim.xpm
-share/apps/kiconedit/toolbar/areaselect.xpm
-share/apps/kiconedit/toolbar/circle.xpm
-share/apps/kiconedit/toolbar/ellipse.xpm
-share/apps/kiconedit/toolbar/eraser.xpm
-share/apps/kiconedit/toolbar/fileclose.xpm
-share/apps/kiconedit/toolbar/filledcircle.xpm
-share/apps/kiconedit/toolbar/filledellipse.xpm
-share/apps/kiconedit/toolbar/filledrectangle.xpm
-share/apps/kiconedit/toolbar/flood.xpm
-share/apps/kiconedit/toolbar/grayscale.xpm
-share/apps/kiconedit/toolbar/grid.xpm
-share/apps/kiconedit/toolbar/kdepalette.xpm
-share/apps/kiconedit/toolbar/line.xpm
-share/apps/kiconedit/toolbar/newwin.xpm
-share/apps/kiconedit/toolbar/paintbrush.xpm
-share/apps/kiconedit/toolbar/pointer.xpm
-share/apps/kiconedit/toolbar/rectangle.xpm
-share/apps/kiconedit/toolbar/selectcircle.xpm
-share/apps/kiconedit/toolbar/selectrect.xpm
-share/apps/kiconedit/toolbar/spraycan.xpm
-share/apps/kiconedit/toolbar/transform.xpm
-share/apps/kpaint/toolbar/areaselect.xpm
-share/apps/kpaint/toolbar/circle.xpm
-share/apps/kpaint/toolbar/editcopy.xpm
-share/apps/kpaint/toolbar/editcut.xpm
-share/apps/kpaint/toolbar/editpaste.xpm
-share/apps/kpaint/toolbar/ellipse.xpm
-share/apps/kpaint/toolbar/filefloppy.xpm
-share/apps/kpaint/toolbar/filenew.xpm
-share/apps/kpaint/toolbar/fileopen.xpm
-share/apps/kpaint/toolbar/line.xpm
-share/apps/kpaint/toolbar/pen.xpm
-share/apps/kpaint/toolbar/rectangle.xpm
-share/apps/kpaint/toolbar/roundangle.xpm
-share/apps/kpaint/toolbar/spraycan.xpm
-share/apps/kpaint/toolbar/viewmag+.xpm
-share/apps/kpaint/toolbar/viewmag-.xpm
-share/doc/HTML/cs/ksnapshot/index.html
-share/doc/HTML/cs/ksnapshot/ksnapshot.gif
-share/doc/HTML/da/kiconedit/index-1.html
-share/doc/HTML/da/kiconedit/index-2.html
-share/doc/HTML/da/kiconedit/index-3.html
-share/doc/HTML/da/kiconedit/index-4.html
-share/doc/HTML/da/kiconedit/index.html
-share/doc/HTML/da/kiconedit/logotp3.gif
+share/apps/kfract/kfract.rc
+share/apps/kghostview/kghostviewui.rc
+share/apps/kghostview/kgv_part.rc
+share/apps/kview/kview_part.rc
+share/apps/kview/toolbar/rotate.png
+share/apps/kviewpart/kviewerpart.rc
+share/apps/kviewshell/kviewshell.rc
+share/apps/kviewshell/paper-formats
+share/apps/pixie/dec2.png
+share/apps/pixie/dec2high.png
+share/apps/pixie/inc2.png
+share/apps/pixie/inc2high.png
+share/apps/pixie/logo.png
+share/apps/pixie/plugins/kdeeffects.desktop
+share/apps/pixie/plugins/magick.desktop
+share/apps/pixie/progress1.png
+share/apps/pixie/progress2.png
+share/apps/pixie/thumbwallpaper.png
+share/apps/pixie/toolbar/back.png
+share/apps/pixie/toolbar/brightness+.png
+share/apps/pixie/toolbar/brightness-.png
+share/apps/pixie/toolbar/contrast+.png
+share/apps/pixie/toolbar/contrast-.png
+share/apps/pixie/toolbar/fliph.png
+share/apps/pixie/toolbar/flipv.png
+share/apps/pixie/toolbar/forward.png
+share/apps/pixie/toolbar/kwin.png
+share/apps/pixie/toolbar/mini-ray.png
+share/apps/pixie/toolbar/mini-run.png
+share/apps/pixie/toolbar/play.png
+share/apps/pixie/toolbar/scaledown.png
+share/apps/pixie/toolbar/scaleup.png
+share/apps/pixie/toolbar/stop.png
+share/apps/pixie/toolbar/thumb.png
+share/doc/HTML/en/kdvi/.anchors
+share/doc/HTML/en/kdvi/KDVI-features.dvi
+share/doc/HTML/en/kdvi/KDVI-features.tex
+share/doc/HTML/en/kdvi/aboutkde.ps
+share/doc/HTML/en/kdvi/index.cvlog
+share/doc/HTML/en/kdvi/index.docbook
share/doc/HTML/en/kdvi/index.html
-share/doc/HTML/en/kfax/index-1.html
-share/doc/HTML/en/kfax/index-2.html
-share/doc/HTML/en/kfax/index-3.html
-share/doc/HTML/en/kfax/index-4.html
-share/doc/HTML/en/kfax/index-5.html
-share/doc/HTML/en/kfax/index-6.html
+share/doc/HTML/en/kdvi/opt-rendering.html
+share/doc/HTML/en/kdvi/optionrequester1.png
+share/doc/HTML/en/kdvi/optionrequester2.png
+share/doc/HTML/en/kdvi/options.html
+share/doc/HTML/en/kdvi/printing.html
+share/doc/HTML/en/kdvi/qampa.html
+share/doc/HTML/en/kdvi/usage.html
+share/doc/HTML/en/kfax/.anchors
+share/doc/HTML/en/kfax/command-line-options.html
+share/doc/HTML/en/kfax/compilation-and-installation.html
+share/doc/HTML/en/kfax/copyright.html
+share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
+share/doc/HTML/en/kfax/fax-options.html
+share/doc/HTML/en/kfax/fundamentals.html
+share/doc/HTML/en/kfax/help.html
+share/doc/HTML/en/kfax/how-to-create-fax-files.html
+share/doc/HTML/en/kfax/index.cvlog
+share/doc/HTML/en/kfax/index.docbook
share/doc/HTML/en/kfax/index.html
-share/doc/HTML/en/kfax/logotp3.gif
+share/doc/HTML/en/kfax/installation.html
+share/doc/HTML/en/kfax/introduction.html
+share/doc/HTML/en/kfax/kfax-key-bindings.html
+share/doc/HTML/en/kfax/options.html
+share/doc/HTML/en/kfax/printing.html
+share/doc/HTML/en/kfax/questionsandanswers.html
+share/doc/HTML/en/kfax/requirements.html
+share/doc/HTML/en/kfax/themenuentries.html
+share/doc/HTML/en/kfax/view.html
+share/doc/HTML/en/kfract/.anchors
+share/doc/HTML/en/kfract/index.cvlog
+share/doc/HTML/en/kfract/index.docbook
share/doc/HTML/en/kfract/index.html
-share/doc/HTML/en/kfract/kfract.gif
-share/doc/HTML/en/kghostview/index-1.html
-share/doc/HTML/en/kghostview/index-2.html
-share/doc/HTML/en/kghostview/index-3.html
-share/doc/HTML/en/kghostview/index-4.html
-share/doc/HTML/en/kghostview/index-5.html
-share/doc/HTML/en/kghostview/index-6.html
+share/doc/HTML/en/kfract/introduction.html
+share/doc/HTML/en/kfract/kfract.png
+share/doc/HTML/en/kfract/onscreenfundamentals.html
+share/doc/HTML/en/kfract/the-file-menu.html
+share/doc/HTML/en/kfract/the-help-menu.html
+share/doc/HTML/en/kfract/the-options-menu.html
+share/doc/HTML/en/kfract/the-toolbar.html
+share/doc/HTML/en/kfract/the-types-menu.html
+share/doc/HTML/en/kghostview/.anchors
+share/doc/HTML/en/kghostview/authors.html
+share/doc/HTML/en/kghostview/configure-interpreter.html
+share/doc/HTML/en/kghostview/configure-key-bindings.html
+share/doc/HTML/en/kghostview/copyright.html
+share/doc/HTML/en/kghostview/dialogboxes.html
+share/doc/HTML/en/kghostview/epilogue.html
+share/doc/HTML/en/kghostview/fundamentals.html
+share/doc/HTML/en/kghostview/ghostscript-messages.html
+share/doc/HTML/en/kghostview/go-to-page.html
+share/doc/HTML/en/kghostview/go.html
+share/doc/HTML/en/kghostview/help.html
+share/doc/HTML/en/kghostview/index.cvlog
+share/doc/HTML/en/kghostview/index.docbook
share/doc/HTML/en/kghostview/index.html
-share/doc/HTML/en/kghostview/logotp3.gif
-share/doc/HTML/en/kiconedit/index-1.html
-share/doc/HTML/en/kiconedit/index-2.html
-share/doc/HTML/en/kiconedit/index-3.html
-share/doc/HTML/en/kiconedit/index-4.html
-share/doc/HTML/en/kiconedit/index.html
-share/doc/HTML/en/kiconedit/logotp3.gif
-share/doc/HTML/en/kpaint/Technic.gif
-share/doc/HTML/en/kpaint/index.html
-share/doc/HTML/en/kpaint/kpaint.html
+share/doc/HTML/en/kghostview/info.html
+share/doc/HTML/en/kghostview/introduction.html
+share/doc/HTML/en/kghostview/options.html
+share/doc/HTML/en/kghostview/page-list.html
+share/doc/HTML/en/kghostview/primarymenuitems.html
+share/doc/HTML/en/kghostview/tool-bar.html
+share/doc/HTML/en/kghostview/tutorial.html
+share/doc/HTML/en/kghostview/view-control.html
+share/doc/HTML/en/kghostview/view.html
+share/doc/HTML/en/ksnapshot/.anchors
+share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/ksnapshot/buttons.png
+share/doc/HTML/en/ksnapshot/compilation-installation.html
+share/doc/HTML/en/ksnapshot/credits.html
+share/doc/HTML/en/ksnapshot/delay_repeat.png
+share/doc/HTML/en/ksnapshot/filemenu.png
+share/doc/HTML/en/ksnapshot/index.docbook
share/doc/HTML/en/ksnapshot/index.html
-share/doc/HTML/en/ksnapshot/ksnapshot.gif
-share/doc/HTML/en/kview/kview-1.html
-share/doc/HTML/en/kview/kview-2.html
-share/doc/HTML/en/kview/kview-3.html
-share/doc/HTML/en/kview/kview-4.html
-share/doc/HTML/en/kview/kview-5.html
-share/doc/HTML/en/kview/kview.html
-share/doc/HTML/en/kview/kview.index
-share/doc/HTML/en/kview/logotp3.gif
-share/doc/HTML/fi/kdvi/index.html
-share/icons/kdvi.xpm
-share/icons/kfax.xpm
-share/icons/kfract.xpm
-share/icons/kghostview.xpm
-share/icons/kiconedit.xpm
-share/icons/kpaint.xpm
-share/icons/ksnapshot.xpm
-share/icons/kview.xpm
-share/icons/large/kdvi.xpm
-share/icons/large/kfax.xpm
-share/icons/large/kfract.xpm
-share/icons/large/kghostview.xpm
-share/icons/large/kiconedit.xpm
-share/icons/large/kpaint.xpm
-share/icons/large/ksnapshot.xpm
-share/icons/large/kview.xpm
-share/icons/mini/kdvi.xpm
-share/icons/mini/kfax.xpm
-share/icons/mini/kfract.xpm
-share/icons/mini/kghostview.xpm
-share/icons/mini/kiconedit.xpm
-share/icons/mini/kpaint.xpm
-share/icons/mini/ksnapshot.xpm
-share/icons/mini/kview.xpm
-share/locale/br/LC_MESSAGES/kdvi.mo
-share/locale/br/LC_MESSAGES/kfax.mo
-share/locale/br/LC_MESSAGES/kfract.mo
-share/locale/br/LC_MESSAGES/kghostview.mo
-share/locale/br/LC_MESSAGES/kiconedit.mo
-share/locale/br/LC_MESSAGES/kpaint.mo
-share/locale/br/LC_MESSAGES/ksnapshot.mo
-share/locale/br/LC_MESSAGES/kview.mo
-share/locale/ca/LC_MESSAGES/kdvi.mo
-share/locale/ca/LC_MESSAGES/kfax.mo
-share/locale/ca/LC_MESSAGES/kghostview.mo
-share/locale/ca/LC_MESSAGES/ksnapshot.mo
-share/locale/cs/LC_MESSAGES/kdvi.mo
-share/locale/cs/LC_MESSAGES/kfax.mo
-share/locale/cs/LC_MESSAGES/kfract.mo
-share/locale/cs/LC_MESSAGES/kghostview.mo
-share/locale/cs/LC_MESSAGES/kiconedit.mo
-share/locale/cs/LC_MESSAGES/kpaint.mo
-share/locale/cs/LC_MESSAGES/ksnapshot.mo
-share/locale/cs/LC_MESSAGES/kview.mo
-share/locale/da/LC_MESSAGES/kdvi.mo
-share/locale/da/LC_MESSAGES/kfax.mo
-share/locale/da/LC_MESSAGES/kfract.mo
-share/locale/da/LC_MESSAGES/kghostview.mo
-share/locale/da/LC_MESSAGES/kiconedit.mo
-share/locale/da/LC_MESSAGES/kpaint.mo
-share/locale/da/LC_MESSAGES/ksnapshot.mo
-share/locale/da/LC_MESSAGES/kview.mo
-share/locale/de/LC_MESSAGES/kdvi.mo
-share/locale/de/LC_MESSAGES/kfax.mo
-share/locale/de/LC_MESSAGES/kfract.mo
-share/locale/de/LC_MESSAGES/kghostview.mo
-share/locale/de/LC_MESSAGES/kiconedit.mo
-share/locale/de/LC_MESSAGES/kpaint.mo
-share/locale/de/LC_MESSAGES/ksnapshot.mo
-share/locale/de/LC_MESSAGES/kview.mo
-share/locale/el/LC_MESSAGES/kdvi.mo
-share/locale/el/LC_MESSAGES/kghostview.mo
-share/locale/el/LC_MESSAGES/kpaint.mo
-share/locale/eo/LC_MESSAGES/kdvi.mo
-share/locale/eo/LC_MESSAGES/kfax.mo
-share/locale/eo/LC_MESSAGES/kghostview.mo
-share/locale/eo/LC_MESSAGES/kpaint.mo
-share/locale/es/LC_MESSAGES/kdvi.mo
-share/locale/es/LC_MESSAGES/kfax.mo
-share/locale/es/LC_MESSAGES/kfract.mo
-share/locale/es/LC_MESSAGES/kghostview.mo
-share/locale/es/LC_MESSAGES/kiconedit.mo
-share/locale/es/LC_MESSAGES/kpaint.mo
-share/locale/es/LC_MESSAGES/ksnapshot.mo
-share/locale/es/LC_MESSAGES/kview.mo
-share/locale/fi/LC_MESSAGES/kdvi.mo
-share/locale/fi/LC_MESSAGES/kfax.mo
-share/locale/fi/LC_MESSAGES/kfract.mo
-share/locale/fi/LC_MESSAGES/kghostview.mo
-share/locale/fi/LC_MESSAGES/kiconedit.mo
-share/locale/fi/LC_MESSAGES/kpaint.mo
-share/locale/fi/LC_MESSAGES/ksnapshot.mo
-share/locale/fi/LC_MESSAGES/kview.mo
-share/locale/fr/LC_MESSAGES/kdvi.mo
-share/locale/fr/LC_MESSAGES/kfax.mo
-share/locale/fr/LC_MESSAGES/kfract.mo
-share/locale/fr/LC_MESSAGES/kghostview.mo
-share/locale/fr/LC_MESSAGES/kiconedit.mo
-share/locale/fr/LC_MESSAGES/kpaint.mo
-share/locale/fr/LC_MESSAGES/ksnapshot.mo
-share/locale/fr/LC_MESSAGES/kview.mo
-share/locale/hr/LC_MESSAGES/kdvi.mo
-share/locale/hr/LC_MESSAGES/kfax.mo
-share/locale/hr/LC_MESSAGES/kghostview.mo
-share/locale/hr/LC_MESSAGES/kpaint.mo
-share/locale/hr/LC_MESSAGES/kview.mo
-share/locale/hs/LC_MESSAGES/kdvi.mo
-share/locale/hu/LC_MESSAGES/kdvi.mo
-share/locale/hu/LC_MESSAGES/kghostview.mo
-share/locale/hu/LC_MESSAGES/kpaint.mo
-share/locale/hu/LC_MESSAGES/ksnapshot.mo
-share/locale/hu/LC_MESSAGES/kview.mo
-share/locale/is/LC_MESSAGES/kdvi.mo
-share/locale/is/LC_MESSAGES/kfax.mo
-share/locale/is/LC_MESSAGES/kfract.mo
-share/locale/is/LC_MESSAGES/kghostview.mo
-share/locale/is/LC_MESSAGES/kiconedit.mo
-share/locale/is/LC_MESSAGES/kpaint.mo
-share/locale/is/LC_MESSAGES/ksnapshot.mo
-share/locale/is/LC_MESSAGES/kview.mo
-share/locale/it/LC_MESSAGES/kdvi.mo
-share/locale/it/LC_MESSAGES/kfax.mo
-share/locale/it/LC_MESSAGES/kfrac.mo
-share/locale/it/LC_MESSAGES/kghostview.mo
-share/locale/it/LC_MESSAGES/kpaint.mo
-share/locale/ja/LC_MESSAGES/kdvi.mo
-share/locale/ja/LC_MESSAGES/kfax.mo
-share/locale/ja/LC_MESSAGES/kfract.mo
-share/locale/ja/LC_MESSAGES/kghostview.mo
-share/locale/ja/LC_MESSAGES/kiconedit.mo
-share/locale/ja/LC_MESSAGES/kpaint.mo
-share/locale/ja/LC_MESSAGES/ksnapshot.mo
-share/locale/ja/LC_MESSAGES/kview.mo
-share/locale/ko/LC_MESSAGES/kdvi.mo
-share/locale/ko/LC_MESSAGES/kfax.mo
-share/locale/ko/LC_MESSAGES/kghostview.mo
-share/locale/ko/LC_MESSAGES/kpaint.mo
-share/locale/mk/LC_MESSAGES/kfax.mo
-share/locale/mk/LC_MESSAGES/kghostview.mo
-share/locale/nl/LC_MESSAGES/kdvi.mo
-share/locale/nl/LC_MESSAGES/kfax.mo
-share/locale/nl/LC_MESSAGES/kghostview.mo
-share/locale/nl/LC_MESSAGES/kpaint.mo
-share/locale/no/LC_MESSAGES/kdvi.mo
-share/locale/no/LC_MESSAGES/kfax.mo
-share/locale/no/LC_MESSAGES/kfract.mo
-share/locale/no/LC_MESSAGES/kghostview.mo
-share/locale/no/LC_MESSAGES/kiconedit.mo
-share/locale/no/LC_MESSAGES/kpaint.mo
-share/locale/no/LC_MESSAGES/ksnapshot.mo
-share/locale/no/LC_MESSAGES/kview.mo
-share/locale/pl/LC_MESSAGES/kdvi.mo
-share/locale/pl/LC_MESSAGES/kfax.mo
-share/locale/pl/LC_MESSAGES/kfract.mo
-share/locale/pl/LC_MESSAGES/kghostview.mo
-share/locale/pl/LC_MESSAGES/kiconedit.mo
-share/locale/pl/LC_MESSAGES/kpaint.mo
-share/locale/pl/LC_MESSAGES/ksnapshot.mo
-share/locale/pl/LC_MESSAGES/kview.mo
-share/locale/pt/LC_MESSAGES/kdvi.mo
-share/locale/pt/LC_MESSAGES/kfax.mo
-share/locale/pt/LC_MESSAGES/kghostview.mo
-share/locale/pt/LC_MESSAGES/kpaint.mo
-share/locale/pt_BR/LC_MESSAGES/kdvi.mo
-share/locale/pt_BR/LC_MESSAGES/kfax.mo
-share/locale/pt_BR/LC_MESSAGES/kfract.mo
-share/locale/pt_BR/LC_MESSAGES/kghostview.mo
-share/locale/pt_BR/LC_MESSAGES/kiconedit.mo
-share/locale/pt_BR/LC_MESSAGES/kpaint.mo
-share/locale/pt_BR/LC_MESSAGES/ksnapshot.mo
-share/locale/pt_BR/LC_MESSAGES/kview.mo
-share/locale/ru/LC_MESSAGES/kdvi.mo
-share/locale/ru/LC_MESSAGES/kfax.mo
-share/locale/ru/LC_MESSAGES/kfract.mo
-share/locale/ru/LC_MESSAGES/kghostview.mo
-share/locale/ru/LC_MESSAGES/kiconedit.mo
-share/locale/ru/LC_MESSAGES/kpaint.mo
-share/locale/ru/LC_MESSAGES/ksnapshot.mo
-share/locale/ru/LC_MESSAGES/kview.mo
-share/locale/sk/LC_MESSAGES/kdvi.mo
-share/locale/sk/LC_MESSAGES/kfax.mo
-share/locale/sk/LC_MESSAGES/kfract.mo
-share/locale/sk/LC_MESSAGES/kghostview.mo
-share/locale/sk/LC_MESSAGES/kiconedit.mo
-share/locale/sk/LC_MESSAGES/kpaint.mo
-share/locale/sk/LC_MESSAGES/ksnapshot.mo
-share/locale/sk/LC_MESSAGES/kview.mo
-share/locale/sl/LC_MESSAGES/kdvi.mo
-share/locale/sl/LC_MESSAGES/kfax.mo
-share/locale/sl/LC_MESSAGES/kfract.mo
-share/locale/sl/LC_MESSAGES/kghostview.mo
-share/locale/sl/LC_MESSAGES/kiconedit.mo
-share/locale/sl/LC_MESSAGES/kpaint.mo
-share/locale/sl/LC_MESSAGES/ksnapshot.mo
-share/locale/sl/LC_MESSAGES/kview.mo
-share/locale/sv/LC_MESSAGES/kdvi.mo
-share/locale/sv/LC_MESSAGES/kfax.mo
-share/locale/sv/LC_MESSAGES/kghostview.mo
-share/locale/sv/LC_MESSAGES/kpaint.mo
-share/locale/tr/LC_MESSAGES/kdvi.mo
-share/locale/tr/LC_MESSAGES/kfax.mo
-share/locale/tr/LC_MESSAGES/kghostview.mo
-share/locale/tr/LC_MESSAGES/kpaint.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kdvi.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kfax.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kghostview.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kpaint.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kfax.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kghostview.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kpaint.mo
-@dirrm share/doc/HTML/fi/kdvi
+share/doc/HTML/en/ksnapshot/installation.html
+share/doc/HTML/en/ksnapshot/introduction.html
+share/doc/HTML/en/ksnapshot/ksnapshot.png
+share/doc/HTML/en/ksnapshot/ksnapshot_full.png
+share/doc/HTML/en/ksnapshot/minicmd.png
+share/doc/HTML/en/ksnapshot/options.png
+share/doc/HTML/en/ksnapshot/preview.png
+share/doc/HTML/en/ksnapshot/requirements.html
+share/doc/HTML/en/ksnapshot/taking-snapshot.html
+share/doc/HTML/en/ksnapshot/using-ksapshot.html
+share/doc/HTML/en/kview/.anchors
+share/doc/HTML/en/kview/cmdline.html
+share/doc/HTML/en/kview/how.html
+share/doc/HTML/en/kview/index.cvlog
+share/doc/HTML/en/kview/index.docbook
+share/doc/HTML/en/kview/index.html
+share/doc/HTML/en/kview/introduction.html
+share/doc/HTML/en/kview/notes.html
+share/doc/HTML/en/kview/what.html
+share/doc/HTML/en/pixie/.anchors
+share/doc/HTML/en/pixie/index.docbook
+share/doc/HTML/en/pixie/index.html
+share/doc/HTML/en/pixie/introduction.html
+share/icons/hicolor/32x32/apps/kdvi.png
+share/icons/hicolor/32x32/apps/kfax.png
+share/icons/hicolor/32x32/apps/kfract.png
+share/icons/hicolor/32x32/apps/kghostview.png
+share/icons/hicolor/32x32/apps/ksnapshot.png
+share/icons/hicolor/32x32/apps/kview.png
+share/icons/hicolor/48x48/apps/kdvi.png
+share/icons/hicolor/48x48/apps/kfax.png
+share/icons/hicolor/48x48/apps/kfract.png
+share/icons/hicolor/48x48/apps/kghostview.png
+share/icons/hicolor/48x48/apps/ksnapshot.png
+share/icons/hicolor/48x48/apps/kview.png
+share/icons/locolor/16x16/apps/kdvi.png
+share/icons/locolor/16x16/apps/kfax.png
+share/icons/locolor/16x16/apps/kfract.png
+share/icons/locolor/16x16/apps/kghostview.png
+share/icons/locolor/16x16/apps/ksnapshot.png
+share/icons/locolor/16x16/apps/kview.png
+share/icons/locolor/32x32/apps/kdvi.png
+share/icons/locolor/32x32/apps/kfax.png
+share/icons/locolor/32x32/apps/kfract.png
+share/icons/locolor/32x32/apps/kghostview.png
+share/icons/locolor/32x32/apps/ksnapshot.png
+share/icons/locolor/32x32/apps/kview.png
+@dirrm share/doc/HTML/en/pixie
@dirrm share/doc/HTML/en/kview
@dirrm share/doc/HTML/en/ksnapshot
-@dirrm share/doc/HTML/en/kpaint
-@dirrm share/doc/HTML/en/kiconedit
@dirrm share/doc/HTML/en/kghostview
@dirrm share/doc/HTML/en/kfract
@dirrm share/doc/HTML/en/kfax
@dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/da/kiconedit
-@dirrm share/doc/HTML/cs/ksnapshot
-@dirrm share/apps/kpaint/toolbar
-@dirrm share/apps/kpaint
-@dirrm share/apps/kiconedit/toolbar
-@dirrm share/apps/kiconedit/pics
-@dirrm share/apps/kiconedit
+@dirrm share/apps/pixie/toolbar
+@dirrm share/apps/pixie/plugins
+@dirrm share/apps/pixie
+@dirrm share/apps/kviewshell
+@dirrm share/apps/kviewpart
+@dirrm share/apps/kview/toolbar
+@dirrm share/apps/kview
+@dirrm share/apps/kghostview
+@dirrm share/apps/kfract
@dirrm share/apps/kfax/pics
@dirrm share/apps/kfax
@dirrm share/apps/kdvi/toolbar
@dirrm share/apps/kdvi
+@dirrm share/apps
+@dirrm include/mini-magick
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index 4df609862a09..2f011a022fa4 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -1,29 +1,33 @@
-# New ports collection makefile for: kdegraphics
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
+# New ports collection makefile for: KDE2 Graphics
+# Date created: Saturday 2 September 2000
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= kdegraphics
-PORTVERSION= 1.1.2
+PORTVERSION= 1.94
CATEGORIES= graphics kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
+MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)"
-CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
- INSTALL_SCRIPT="install -c -m 555"
-CFLAGS+= "-I${PREFIX}/include"
+INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+ --with-qt-includes=${X11BASE}/include/qt2 \
+ --with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo
index 623a28502528..918b62666824 100644
--- a/graphics/kdegraphics3/distinfo
+++ b/graphics/kdegraphics3/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-1.1.2.tar.bz2) = f79551371b5beacb543cac66aa8c42df
+MD5 (kdegraphics-1.94.tar.bz2) = 5d501f433aa949dec404c7fa21ddc530
diff --git a/graphics/kdegraphics3/pkg-comment b/graphics/kdegraphics3/pkg-comment
index 29b0369151c5..186230f9287d 100644
--- a/graphics/kdegraphics3/pkg-comment
+++ b/graphics/kdegraphics3/pkg-comment
@@ -1 +1 @@
-Graphics programs (PS,DVI,FAX,...) for the KDE integrated X11 desktop
+Utilities for the KDE integrated X11 desktop
diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index e43cb9285a65..3274e9690901 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -2,332 +2,256 @@ bin/kdvi
bin/kfax
bin/kfract
bin/kghostview
-bin/kiconedit
-bin/kpaint
+bin/kpixmap2bitmap
bin/ksnapshot
bin/kview
-share/applnk/Graphics/KFax.kdelnk
-share/applnk/Graphics/kdvi.kdelnk
-share/applnk/Graphics/kfract.kdelnk
-share/applnk/Graphics/kghostview.kdelnk
-share/applnk/Graphics/kiconedit.kdelnk
-share/applnk/Graphics/kpaint.kdelnk
-share/applnk/Graphics/ksnapshot.kdelnk
-share/applnk/Graphics/kview.kdelnk
+bin/kviewshell
+bin/pixie
+include/ifplugin.h
+include/mini-magick/animate.h
+include/mini-magick/api.h
+include/mini-magick/blob.h
+include/mini-magick/cache.h
+include/mini-magick/cache_io.h
+include/mini-magick/classify.h
+include/mini-magick/compress.h
+include/mini-magick/defines.h
+include/mini-magick/delegates.h
+include/mini-magick/error.h
+include/mini-magick/gems.h
+include/mini-magick/image.h
+include/mini-magick/magick.h
+include/mini-magick/memory.h
+include/mini-magick/monitor.h
+include/mini-magick/quantize.h
+include/mini-magick/timer.h
+include/mini-magick/utility.h
+include/mini-magick/version.h
+lib/kview.la
+lib/kview.so
+lib/libbaglayout.la
+lib/libbaglayout.so.0
+lib/libkdvi.la
+lib/libkdvi.so
+lib/libkfax.la
+lib/libkfax.so
+lib/libkghostview.la
+lib/libkghostview.so.1
+lib/libkif_kdeeffects.la
+lib/libkif_kdeeffects.so.1
+lib/libkif_magick.la
+lib/libkif_magick.so.1
+lib/libkifplugin.la
+lib/libkifplugin.so.3
+lib/libkmultipage.la
+lib/libkmultipage.so.0
+lib/libkpagetest.la
+lib/libkpagetest.so
+lib/libkviewerpart.la
+lib/libkviewerpart.so
+lib/libkviewpart.la
+lib/libkviewpart.so
+lib/libminimagick.la
+lib/libminimagick.so.5
+lib/libpixie_color.la
+lib/libpixie_color.so.1
+lib/libpixie_thumb.la
+lib/libpixie_thumb.so.1
+share/applnk/Graphics/kdvi.desktop
+share/applnk/Graphics/kfax.desktop
+share/applnk/Graphics/kfract.desktop
+share/applnk/Graphics/kghostview.desktop
+share/applnk/Graphics/kpixmap2bitmap.desktop
+share/applnk/Graphics/ksnapshot.desktop
+share/applnk/Graphics/kview.desktop
+share/applnk/Graphics/pixie.desktop
+share/apps/kdvi/kdvi_part.rc
share/apps/kdvi/toolbar/forwpage.xpm
share/apps/kdvi/toolbar/largetext.xpm
share/apps/kdvi/toolbar/smalltext.xpm
+share/apps/kfax/kfax_part.rc
share/apps/kfax/pics/kfax.tif
share/apps/kfax/pics/kfaxlogo.xpm
-share/apps/kiconedit/pics/compressed.xpm
-share/apps/kiconedit/pics/folder.xpm
-share/apps/kiconedit/pics/mini-folder.xpm
-share/apps/kiconedit/pics/mini-package.xpm
-share/apps/kiconedit/pics/package.xpm
-share/apps/kiconedit/pics/source.xpm
-share/apps/kiconedit/pics/standard.xpm
-share/apps/kiconedit/toolbar/aim.xpm
-share/apps/kiconedit/toolbar/areaselect.xpm
-share/apps/kiconedit/toolbar/circle.xpm
-share/apps/kiconedit/toolbar/ellipse.xpm
-share/apps/kiconedit/toolbar/eraser.xpm
-share/apps/kiconedit/toolbar/fileclose.xpm
-share/apps/kiconedit/toolbar/filledcircle.xpm
-share/apps/kiconedit/toolbar/filledellipse.xpm
-share/apps/kiconedit/toolbar/filledrectangle.xpm
-share/apps/kiconedit/toolbar/flood.xpm
-share/apps/kiconedit/toolbar/grayscale.xpm
-share/apps/kiconedit/toolbar/grid.xpm
-share/apps/kiconedit/toolbar/kdepalette.xpm
-share/apps/kiconedit/toolbar/line.xpm
-share/apps/kiconedit/toolbar/newwin.xpm
-share/apps/kiconedit/toolbar/paintbrush.xpm
-share/apps/kiconedit/toolbar/pointer.xpm
-share/apps/kiconedit/toolbar/rectangle.xpm
-share/apps/kiconedit/toolbar/selectcircle.xpm
-share/apps/kiconedit/toolbar/selectrect.xpm
-share/apps/kiconedit/toolbar/spraycan.xpm
-share/apps/kiconedit/toolbar/transform.xpm
-share/apps/kpaint/toolbar/areaselect.xpm
-share/apps/kpaint/toolbar/circle.xpm
-share/apps/kpaint/toolbar/editcopy.xpm
-share/apps/kpaint/toolbar/editcut.xpm
-share/apps/kpaint/toolbar/editpaste.xpm
-share/apps/kpaint/toolbar/ellipse.xpm
-share/apps/kpaint/toolbar/filefloppy.xpm
-share/apps/kpaint/toolbar/filenew.xpm
-share/apps/kpaint/toolbar/fileopen.xpm
-share/apps/kpaint/toolbar/line.xpm
-share/apps/kpaint/toolbar/pen.xpm
-share/apps/kpaint/toolbar/rectangle.xpm
-share/apps/kpaint/toolbar/roundangle.xpm
-share/apps/kpaint/toolbar/spraycan.xpm
-share/apps/kpaint/toolbar/viewmag+.xpm
-share/apps/kpaint/toolbar/viewmag-.xpm
-share/doc/HTML/cs/ksnapshot/index.html
-share/doc/HTML/cs/ksnapshot/ksnapshot.gif
-share/doc/HTML/da/kiconedit/index-1.html
-share/doc/HTML/da/kiconedit/index-2.html
-share/doc/HTML/da/kiconedit/index-3.html
-share/doc/HTML/da/kiconedit/index-4.html
-share/doc/HTML/da/kiconedit/index.html
-share/doc/HTML/da/kiconedit/logotp3.gif
+share/apps/kfract/kfract.rc
+share/apps/kghostview/kghostviewui.rc
+share/apps/kghostview/kgv_part.rc
+share/apps/kview/kview_part.rc
+share/apps/kview/toolbar/rotate.png
+share/apps/kviewpart/kviewerpart.rc
+share/apps/kviewshell/kviewshell.rc
+share/apps/kviewshell/paper-formats
+share/apps/pixie/dec2.png
+share/apps/pixie/dec2high.png
+share/apps/pixie/inc2.png
+share/apps/pixie/inc2high.png
+share/apps/pixie/logo.png
+share/apps/pixie/plugins/kdeeffects.desktop
+share/apps/pixie/plugins/magick.desktop
+share/apps/pixie/progress1.png
+share/apps/pixie/progress2.png
+share/apps/pixie/thumbwallpaper.png
+share/apps/pixie/toolbar/back.png
+share/apps/pixie/toolbar/brightness+.png
+share/apps/pixie/toolbar/brightness-.png
+share/apps/pixie/toolbar/contrast+.png
+share/apps/pixie/toolbar/contrast-.png
+share/apps/pixie/toolbar/fliph.png
+share/apps/pixie/toolbar/flipv.png
+share/apps/pixie/toolbar/forward.png
+share/apps/pixie/toolbar/kwin.png
+share/apps/pixie/toolbar/mini-ray.png
+share/apps/pixie/toolbar/mini-run.png
+share/apps/pixie/toolbar/play.png
+share/apps/pixie/toolbar/scaledown.png
+share/apps/pixie/toolbar/scaleup.png
+share/apps/pixie/toolbar/stop.png
+share/apps/pixie/toolbar/thumb.png
+share/doc/HTML/en/kdvi/.anchors
+share/doc/HTML/en/kdvi/KDVI-features.dvi
+share/doc/HTML/en/kdvi/KDVI-features.tex
+share/doc/HTML/en/kdvi/aboutkde.ps
+share/doc/HTML/en/kdvi/index.cvlog
+share/doc/HTML/en/kdvi/index.docbook
share/doc/HTML/en/kdvi/index.html
-share/doc/HTML/en/kfax/index-1.html
-share/doc/HTML/en/kfax/index-2.html
-share/doc/HTML/en/kfax/index-3.html
-share/doc/HTML/en/kfax/index-4.html
-share/doc/HTML/en/kfax/index-5.html
-share/doc/HTML/en/kfax/index-6.html
+share/doc/HTML/en/kdvi/opt-rendering.html
+share/doc/HTML/en/kdvi/optionrequester1.png
+share/doc/HTML/en/kdvi/optionrequester2.png
+share/doc/HTML/en/kdvi/options.html
+share/doc/HTML/en/kdvi/printing.html
+share/doc/HTML/en/kdvi/qampa.html
+share/doc/HTML/en/kdvi/usage.html
+share/doc/HTML/en/kfax/.anchors
+share/doc/HTML/en/kfax/command-line-options.html
+share/doc/HTML/en/kfax/compilation-and-installation.html
+share/doc/HTML/en/kfax/copyright.html
+share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
+share/doc/HTML/en/kfax/fax-options.html
+share/doc/HTML/en/kfax/fundamentals.html
+share/doc/HTML/en/kfax/help.html
+share/doc/HTML/en/kfax/how-to-create-fax-files.html
+share/doc/HTML/en/kfax/index.cvlog
+share/doc/HTML/en/kfax/index.docbook
share/doc/HTML/en/kfax/index.html
-share/doc/HTML/en/kfax/logotp3.gif
+share/doc/HTML/en/kfax/installation.html
+share/doc/HTML/en/kfax/introduction.html
+share/doc/HTML/en/kfax/kfax-key-bindings.html
+share/doc/HTML/en/kfax/options.html
+share/doc/HTML/en/kfax/printing.html
+share/doc/HTML/en/kfax/questionsandanswers.html
+share/doc/HTML/en/kfax/requirements.html
+share/doc/HTML/en/kfax/themenuentries.html
+share/doc/HTML/en/kfax/view.html
+share/doc/HTML/en/kfract/.anchors
+share/doc/HTML/en/kfract/index.cvlog
+share/doc/HTML/en/kfract/index.docbook
share/doc/HTML/en/kfract/index.html
-share/doc/HTML/en/kfract/kfract.gif
-share/doc/HTML/en/kghostview/index-1.html
-share/doc/HTML/en/kghostview/index-2.html
-share/doc/HTML/en/kghostview/index-3.html
-share/doc/HTML/en/kghostview/index-4.html
-share/doc/HTML/en/kghostview/index-5.html
-share/doc/HTML/en/kghostview/index-6.html
+share/doc/HTML/en/kfract/introduction.html
+share/doc/HTML/en/kfract/kfract.png
+share/doc/HTML/en/kfract/onscreenfundamentals.html
+share/doc/HTML/en/kfract/the-file-menu.html
+share/doc/HTML/en/kfract/the-help-menu.html
+share/doc/HTML/en/kfract/the-options-menu.html
+share/doc/HTML/en/kfract/the-toolbar.html
+share/doc/HTML/en/kfract/the-types-menu.html
+share/doc/HTML/en/kghostview/.anchors
+share/doc/HTML/en/kghostview/authors.html
+share/doc/HTML/en/kghostview/configure-interpreter.html
+share/doc/HTML/en/kghostview/configure-key-bindings.html
+share/doc/HTML/en/kghostview/copyright.html
+share/doc/HTML/en/kghostview/dialogboxes.html
+share/doc/HTML/en/kghostview/epilogue.html
+share/doc/HTML/en/kghostview/fundamentals.html
+share/doc/HTML/en/kghostview/ghostscript-messages.html
+share/doc/HTML/en/kghostview/go-to-page.html
+share/doc/HTML/en/kghostview/go.html
+share/doc/HTML/en/kghostview/help.html
+share/doc/HTML/en/kghostview/index.cvlog
+share/doc/HTML/en/kghostview/index.docbook
share/doc/HTML/en/kghostview/index.html
-share/doc/HTML/en/kghostview/logotp3.gif
-share/doc/HTML/en/kiconedit/index-1.html
-share/doc/HTML/en/kiconedit/index-2.html
-share/doc/HTML/en/kiconedit/index-3.html
-share/doc/HTML/en/kiconedit/index-4.html
-share/doc/HTML/en/kiconedit/index.html
-share/doc/HTML/en/kiconedit/logotp3.gif
-share/doc/HTML/en/kpaint/Technic.gif
-share/doc/HTML/en/kpaint/index.html
-share/doc/HTML/en/kpaint/kpaint.html
+share/doc/HTML/en/kghostview/info.html
+share/doc/HTML/en/kghostview/introduction.html
+share/doc/HTML/en/kghostview/options.html
+share/doc/HTML/en/kghostview/page-list.html
+share/doc/HTML/en/kghostview/primarymenuitems.html
+share/doc/HTML/en/kghostview/tool-bar.html
+share/doc/HTML/en/kghostview/tutorial.html
+share/doc/HTML/en/kghostview/view-control.html
+share/doc/HTML/en/kghostview/view.html
+share/doc/HTML/en/ksnapshot/.anchors
+share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/ksnapshot/buttons.png
+share/doc/HTML/en/ksnapshot/compilation-installation.html
+share/doc/HTML/en/ksnapshot/credits.html
+share/doc/HTML/en/ksnapshot/delay_repeat.png
+share/doc/HTML/en/ksnapshot/filemenu.png
+share/doc/HTML/en/ksnapshot/index.docbook
share/doc/HTML/en/ksnapshot/index.html
-share/doc/HTML/en/ksnapshot/ksnapshot.gif
-share/doc/HTML/en/kview/kview-1.html
-share/doc/HTML/en/kview/kview-2.html
-share/doc/HTML/en/kview/kview-3.html
-share/doc/HTML/en/kview/kview-4.html
-share/doc/HTML/en/kview/kview-5.html
-share/doc/HTML/en/kview/kview.html
-share/doc/HTML/en/kview/kview.index
-share/doc/HTML/en/kview/logotp3.gif
-share/doc/HTML/fi/kdvi/index.html
-share/icons/kdvi.xpm
-share/icons/kfax.xpm
-share/icons/kfract.xpm
-share/icons/kghostview.xpm
-share/icons/kiconedit.xpm
-share/icons/kpaint.xpm
-share/icons/ksnapshot.xpm
-share/icons/kview.xpm
-share/icons/large/kdvi.xpm
-share/icons/large/kfax.xpm
-share/icons/large/kfract.xpm
-share/icons/large/kghostview.xpm
-share/icons/large/kiconedit.xpm
-share/icons/large/kpaint.xpm
-share/icons/large/ksnapshot.xpm
-share/icons/large/kview.xpm
-share/icons/mini/kdvi.xpm
-share/icons/mini/kfax.xpm
-share/icons/mini/kfract.xpm
-share/icons/mini/kghostview.xpm
-share/icons/mini/kiconedit.xpm
-share/icons/mini/kpaint.xpm
-share/icons/mini/ksnapshot.xpm
-share/icons/mini/kview.xpm
-share/locale/br/LC_MESSAGES/kdvi.mo
-share/locale/br/LC_MESSAGES/kfax.mo
-share/locale/br/LC_MESSAGES/kfract.mo
-share/locale/br/LC_MESSAGES/kghostview.mo
-share/locale/br/LC_MESSAGES/kiconedit.mo
-share/locale/br/LC_MESSAGES/kpaint.mo
-share/locale/br/LC_MESSAGES/ksnapshot.mo
-share/locale/br/LC_MESSAGES/kview.mo
-share/locale/ca/LC_MESSAGES/kdvi.mo
-share/locale/ca/LC_MESSAGES/kfax.mo
-share/locale/ca/LC_MESSAGES/kghostview.mo
-share/locale/ca/LC_MESSAGES/ksnapshot.mo
-share/locale/cs/LC_MESSAGES/kdvi.mo
-share/locale/cs/LC_MESSAGES/kfax.mo
-share/locale/cs/LC_MESSAGES/kfract.mo
-share/locale/cs/LC_MESSAGES/kghostview.mo
-share/locale/cs/LC_MESSAGES/kiconedit.mo
-share/locale/cs/LC_MESSAGES/kpaint.mo
-share/locale/cs/LC_MESSAGES/ksnapshot.mo
-share/locale/cs/LC_MESSAGES/kview.mo
-share/locale/da/LC_MESSAGES/kdvi.mo
-share/locale/da/LC_MESSAGES/kfax.mo
-share/locale/da/LC_MESSAGES/kfract.mo
-share/locale/da/LC_MESSAGES/kghostview.mo
-share/locale/da/LC_MESSAGES/kiconedit.mo
-share/locale/da/LC_MESSAGES/kpaint.mo
-share/locale/da/LC_MESSAGES/ksnapshot.mo
-share/locale/da/LC_MESSAGES/kview.mo
-share/locale/de/LC_MESSAGES/kdvi.mo
-share/locale/de/LC_MESSAGES/kfax.mo
-share/locale/de/LC_MESSAGES/kfract.mo
-share/locale/de/LC_MESSAGES/kghostview.mo
-share/locale/de/LC_MESSAGES/kiconedit.mo
-share/locale/de/LC_MESSAGES/kpaint.mo
-share/locale/de/LC_MESSAGES/ksnapshot.mo
-share/locale/de/LC_MESSAGES/kview.mo
-share/locale/el/LC_MESSAGES/kdvi.mo
-share/locale/el/LC_MESSAGES/kghostview.mo
-share/locale/el/LC_MESSAGES/kpaint.mo
-share/locale/eo/LC_MESSAGES/kdvi.mo
-share/locale/eo/LC_MESSAGES/kfax.mo
-share/locale/eo/LC_MESSAGES/kghostview.mo
-share/locale/eo/LC_MESSAGES/kpaint.mo
-share/locale/es/LC_MESSAGES/kdvi.mo
-share/locale/es/LC_MESSAGES/kfax.mo
-share/locale/es/LC_MESSAGES/kfract.mo
-share/locale/es/LC_MESSAGES/kghostview.mo
-share/locale/es/LC_MESSAGES/kiconedit.mo
-share/locale/es/LC_MESSAGES/kpaint.mo
-share/locale/es/LC_MESSAGES/ksnapshot.mo
-share/locale/es/LC_MESSAGES/kview.mo
-share/locale/fi/LC_MESSAGES/kdvi.mo
-share/locale/fi/LC_MESSAGES/kfax.mo
-share/locale/fi/LC_MESSAGES/kfract.mo
-share/locale/fi/LC_MESSAGES/kghostview.mo
-share/locale/fi/LC_MESSAGES/kiconedit.mo
-share/locale/fi/LC_MESSAGES/kpaint.mo
-share/locale/fi/LC_MESSAGES/ksnapshot.mo
-share/locale/fi/LC_MESSAGES/kview.mo
-share/locale/fr/LC_MESSAGES/kdvi.mo
-share/locale/fr/LC_MESSAGES/kfax.mo
-share/locale/fr/LC_MESSAGES/kfract.mo
-share/locale/fr/LC_MESSAGES/kghostview.mo
-share/locale/fr/LC_MESSAGES/kiconedit.mo
-share/locale/fr/LC_MESSAGES/kpaint.mo
-share/locale/fr/LC_MESSAGES/ksnapshot.mo
-share/locale/fr/LC_MESSAGES/kview.mo
-share/locale/hr/LC_MESSAGES/kdvi.mo
-share/locale/hr/LC_MESSAGES/kfax.mo
-share/locale/hr/LC_MESSAGES/kghostview.mo
-share/locale/hr/LC_MESSAGES/kpaint.mo
-share/locale/hr/LC_MESSAGES/kview.mo
-share/locale/hs/LC_MESSAGES/kdvi.mo
-share/locale/hu/LC_MESSAGES/kdvi.mo
-share/locale/hu/LC_MESSAGES/kghostview.mo
-share/locale/hu/LC_MESSAGES/kpaint.mo
-share/locale/hu/LC_MESSAGES/ksnapshot.mo
-share/locale/hu/LC_MESSAGES/kview.mo
-share/locale/is/LC_MESSAGES/kdvi.mo
-share/locale/is/LC_MESSAGES/kfax.mo
-share/locale/is/LC_MESSAGES/kfract.mo
-share/locale/is/LC_MESSAGES/kghostview.mo
-share/locale/is/LC_MESSAGES/kiconedit.mo
-share/locale/is/LC_MESSAGES/kpaint.mo
-share/locale/is/LC_MESSAGES/ksnapshot.mo
-share/locale/is/LC_MESSAGES/kview.mo
-share/locale/it/LC_MESSAGES/kdvi.mo
-share/locale/it/LC_MESSAGES/kfax.mo
-share/locale/it/LC_MESSAGES/kfrac.mo
-share/locale/it/LC_MESSAGES/kghostview.mo
-share/locale/it/LC_MESSAGES/kpaint.mo
-share/locale/ja/LC_MESSAGES/kdvi.mo
-share/locale/ja/LC_MESSAGES/kfax.mo
-share/locale/ja/LC_MESSAGES/kfract.mo
-share/locale/ja/LC_MESSAGES/kghostview.mo
-share/locale/ja/LC_MESSAGES/kiconedit.mo
-share/locale/ja/LC_MESSAGES/kpaint.mo
-share/locale/ja/LC_MESSAGES/ksnapshot.mo
-share/locale/ja/LC_MESSAGES/kview.mo
-share/locale/ko/LC_MESSAGES/kdvi.mo
-share/locale/ko/LC_MESSAGES/kfax.mo
-share/locale/ko/LC_MESSAGES/kghostview.mo
-share/locale/ko/LC_MESSAGES/kpaint.mo
-share/locale/mk/LC_MESSAGES/kfax.mo
-share/locale/mk/LC_MESSAGES/kghostview.mo
-share/locale/nl/LC_MESSAGES/kdvi.mo
-share/locale/nl/LC_MESSAGES/kfax.mo
-share/locale/nl/LC_MESSAGES/kghostview.mo
-share/locale/nl/LC_MESSAGES/kpaint.mo
-share/locale/no/LC_MESSAGES/kdvi.mo
-share/locale/no/LC_MESSAGES/kfax.mo
-share/locale/no/LC_MESSAGES/kfract.mo
-share/locale/no/LC_MESSAGES/kghostview.mo
-share/locale/no/LC_MESSAGES/kiconedit.mo
-share/locale/no/LC_MESSAGES/kpaint.mo
-share/locale/no/LC_MESSAGES/ksnapshot.mo
-share/locale/no/LC_MESSAGES/kview.mo
-share/locale/pl/LC_MESSAGES/kdvi.mo
-share/locale/pl/LC_MESSAGES/kfax.mo
-share/locale/pl/LC_MESSAGES/kfract.mo
-share/locale/pl/LC_MESSAGES/kghostview.mo
-share/locale/pl/LC_MESSAGES/kiconedit.mo
-share/locale/pl/LC_MESSAGES/kpaint.mo
-share/locale/pl/LC_MESSAGES/ksnapshot.mo
-share/locale/pl/LC_MESSAGES/kview.mo
-share/locale/pt/LC_MESSAGES/kdvi.mo
-share/locale/pt/LC_MESSAGES/kfax.mo
-share/locale/pt/LC_MESSAGES/kghostview.mo
-share/locale/pt/LC_MESSAGES/kpaint.mo
-share/locale/pt_BR/LC_MESSAGES/kdvi.mo
-share/locale/pt_BR/LC_MESSAGES/kfax.mo
-share/locale/pt_BR/LC_MESSAGES/kfract.mo
-share/locale/pt_BR/LC_MESSAGES/kghostview.mo
-share/locale/pt_BR/LC_MESSAGES/kiconedit.mo
-share/locale/pt_BR/LC_MESSAGES/kpaint.mo
-share/locale/pt_BR/LC_MESSAGES/ksnapshot.mo
-share/locale/pt_BR/LC_MESSAGES/kview.mo
-share/locale/ru/LC_MESSAGES/kdvi.mo
-share/locale/ru/LC_MESSAGES/kfax.mo
-share/locale/ru/LC_MESSAGES/kfract.mo
-share/locale/ru/LC_MESSAGES/kghostview.mo
-share/locale/ru/LC_MESSAGES/kiconedit.mo
-share/locale/ru/LC_MESSAGES/kpaint.mo
-share/locale/ru/LC_MESSAGES/ksnapshot.mo
-share/locale/ru/LC_MESSAGES/kview.mo
-share/locale/sk/LC_MESSAGES/kdvi.mo
-share/locale/sk/LC_MESSAGES/kfax.mo
-share/locale/sk/LC_MESSAGES/kfract.mo
-share/locale/sk/LC_MESSAGES/kghostview.mo
-share/locale/sk/LC_MESSAGES/kiconedit.mo
-share/locale/sk/LC_MESSAGES/kpaint.mo
-share/locale/sk/LC_MESSAGES/ksnapshot.mo
-share/locale/sk/LC_MESSAGES/kview.mo
-share/locale/sl/LC_MESSAGES/kdvi.mo
-share/locale/sl/LC_MESSAGES/kfax.mo
-share/locale/sl/LC_MESSAGES/kfract.mo
-share/locale/sl/LC_MESSAGES/kghostview.mo
-share/locale/sl/LC_MESSAGES/kiconedit.mo
-share/locale/sl/LC_MESSAGES/kpaint.mo
-share/locale/sl/LC_MESSAGES/ksnapshot.mo
-share/locale/sl/LC_MESSAGES/kview.mo
-share/locale/sv/LC_MESSAGES/kdvi.mo
-share/locale/sv/LC_MESSAGES/kfax.mo
-share/locale/sv/LC_MESSAGES/kghostview.mo
-share/locale/sv/LC_MESSAGES/kpaint.mo
-share/locale/tr/LC_MESSAGES/kdvi.mo
-share/locale/tr/LC_MESSAGES/kfax.mo
-share/locale/tr/LC_MESSAGES/kghostview.mo
-share/locale/tr/LC_MESSAGES/kpaint.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kdvi.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kfax.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kghostview.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kpaint.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kfax.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kghostview.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kpaint.mo
-@dirrm share/doc/HTML/fi/kdvi
+share/doc/HTML/en/ksnapshot/installation.html
+share/doc/HTML/en/ksnapshot/introduction.html
+share/doc/HTML/en/ksnapshot/ksnapshot.png
+share/doc/HTML/en/ksnapshot/ksnapshot_full.png
+share/doc/HTML/en/ksnapshot/minicmd.png
+share/doc/HTML/en/ksnapshot/options.png
+share/doc/HTML/en/ksnapshot/preview.png
+share/doc/HTML/en/ksnapshot/requirements.html
+share/doc/HTML/en/ksnapshot/taking-snapshot.html
+share/doc/HTML/en/ksnapshot/using-ksapshot.html
+share/doc/HTML/en/kview/.anchors
+share/doc/HTML/en/kview/cmdline.html
+share/doc/HTML/en/kview/how.html
+share/doc/HTML/en/kview/index.cvlog
+share/doc/HTML/en/kview/index.docbook
+share/doc/HTML/en/kview/index.html
+share/doc/HTML/en/kview/introduction.html
+share/doc/HTML/en/kview/notes.html
+share/doc/HTML/en/kview/what.html
+share/doc/HTML/en/pixie/.anchors
+share/doc/HTML/en/pixie/index.docbook
+share/doc/HTML/en/pixie/index.html
+share/doc/HTML/en/pixie/introduction.html
+share/icons/hicolor/32x32/apps/kdvi.png
+share/icons/hicolor/32x32/apps/kfax.png
+share/icons/hicolor/32x32/apps/kfract.png
+share/icons/hicolor/32x32/apps/kghostview.png
+share/icons/hicolor/32x32/apps/ksnapshot.png
+share/icons/hicolor/32x32/apps/kview.png
+share/icons/hicolor/48x48/apps/kdvi.png
+share/icons/hicolor/48x48/apps/kfax.png
+share/icons/hicolor/48x48/apps/kfract.png
+share/icons/hicolor/48x48/apps/kghostview.png
+share/icons/hicolor/48x48/apps/ksnapshot.png
+share/icons/hicolor/48x48/apps/kview.png
+share/icons/locolor/16x16/apps/kdvi.png
+share/icons/locolor/16x16/apps/kfax.png
+share/icons/locolor/16x16/apps/kfract.png
+share/icons/locolor/16x16/apps/kghostview.png
+share/icons/locolor/16x16/apps/ksnapshot.png
+share/icons/locolor/16x16/apps/kview.png
+share/icons/locolor/32x32/apps/kdvi.png
+share/icons/locolor/32x32/apps/kfax.png
+share/icons/locolor/32x32/apps/kfract.png
+share/icons/locolor/32x32/apps/kghostview.png
+share/icons/locolor/32x32/apps/ksnapshot.png
+share/icons/locolor/32x32/apps/kview.png
+@dirrm share/doc/HTML/en/pixie
@dirrm share/doc/HTML/en/kview
@dirrm share/doc/HTML/en/ksnapshot
-@dirrm share/doc/HTML/en/kpaint
-@dirrm share/doc/HTML/en/kiconedit
@dirrm share/doc/HTML/en/kghostview
@dirrm share/doc/HTML/en/kfract
@dirrm share/doc/HTML/en/kfax
@dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/da/kiconedit
-@dirrm share/doc/HTML/cs/ksnapshot
-@dirrm share/apps/kpaint/toolbar
-@dirrm share/apps/kpaint
-@dirrm share/apps/kiconedit/toolbar
-@dirrm share/apps/kiconedit/pics
-@dirrm share/apps/kiconedit
+@dirrm share/apps/pixie/toolbar
+@dirrm share/apps/pixie/plugins
+@dirrm share/apps/pixie
+@dirrm share/apps/kviewshell
+@dirrm share/apps/kviewpart
+@dirrm share/apps/kview/toolbar
+@dirrm share/apps/kview
+@dirrm share/apps/kghostview
+@dirrm share/apps/kfract
@dirrm share/apps/kfax/pics
@dirrm share/apps/kfax
@dirrm share/apps/kdvi/toolbar
@dirrm share/apps/kdvi
+@dirrm share/apps
+@dirrm include/mini-magick
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 4df609862a09..2f011a022fa4 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -1,29 +1,33 @@
-# New ports collection makefile for: kdegraphics
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
+# New ports collection makefile for: KDE2 Graphics
+# Date created: Saturday 2 September 2000
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= kdegraphics
-PORTVERSION= 1.1.2
+PORTVERSION= 1.94
CATEGORIES= graphics kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
- jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.3:${PORTSDIR}/x11/kdelibs11
+LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
+MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)"
-CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
- INSTALL_SCRIPT="install -c -m 555"
-CFLAGS+= "-I${PREFIX}/include"
+INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+ --with-qt-includes=${X11BASE}/include/qt2 \
+ --with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 623a28502528..918b62666824 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1 +1 @@
-MD5 (kdegraphics-1.1.2.tar.bz2) = f79551371b5beacb543cac66aa8c42df
+MD5 (kdegraphics-1.94.tar.bz2) = 5d501f433aa949dec404c7fa21ddc530
diff --git a/graphics/kdegraphics4/pkg-comment b/graphics/kdegraphics4/pkg-comment
index 29b0369151c5..186230f9287d 100644
--- a/graphics/kdegraphics4/pkg-comment
+++ b/graphics/kdegraphics4/pkg-comment
@@ -1 +1 @@
-Graphics programs (PS,DVI,FAX,...) for the KDE integrated X11 desktop
+Utilities for the KDE integrated X11 desktop
diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist
index e43cb9285a65..3274e9690901 100644
--- a/graphics/kdegraphics4/pkg-plist
+++ b/graphics/kdegraphics4/pkg-plist
@@ -2,332 +2,256 @@ bin/kdvi
bin/kfax
bin/kfract
bin/kghostview
-bin/kiconedit
-bin/kpaint
+bin/kpixmap2bitmap
bin/ksnapshot
bin/kview
-share/applnk/Graphics/KFax.kdelnk
-share/applnk/Graphics/kdvi.kdelnk
-share/applnk/Graphics/kfract.kdelnk
-share/applnk/Graphics/kghostview.kdelnk
-share/applnk/Graphics/kiconedit.kdelnk
-share/applnk/Graphics/kpaint.kdelnk
-share/applnk/Graphics/ksnapshot.kdelnk
-share/applnk/Graphics/kview.kdelnk
+bin/kviewshell
+bin/pixie
+include/ifplugin.h
+include/mini-magick/animate.h
+include/mini-magick/api.h
+include/mini-magick/blob.h
+include/mini-magick/cache.h
+include/mini-magick/cache_io.h
+include/mini-magick/classify.h
+include/mini-magick/compress.h
+include/mini-magick/defines.h
+include/mini-magick/delegates.h
+include/mini-magick/error.h
+include/mini-magick/gems.h
+include/mini-magick/image.h
+include/mini-magick/magick.h
+include/mini-magick/memory.h
+include/mini-magick/monitor.h
+include/mini-magick/quantize.h
+include/mini-magick/timer.h
+include/mini-magick/utility.h
+include/mini-magick/version.h
+lib/kview.la
+lib/kview.so
+lib/libbaglayout.la
+lib/libbaglayout.so.0
+lib/libkdvi.la
+lib/libkdvi.so
+lib/libkfax.la
+lib/libkfax.so
+lib/libkghostview.la
+lib/libkghostview.so.1
+lib/libkif_kdeeffects.la
+lib/libkif_kdeeffects.so.1
+lib/libkif_magick.la
+lib/libkif_magick.so.1
+lib/libkifplugin.la
+lib/libkifplugin.so.3
+lib/libkmultipage.la
+lib/libkmultipage.so.0
+lib/libkpagetest.la
+lib/libkpagetest.so
+lib/libkviewerpart.la
+lib/libkviewerpart.so
+lib/libkviewpart.la
+lib/libkviewpart.so
+lib/libminimagick.la
+lib/libminimagick.so.5
+lib/libpixie_color.la
+lib/libpixie_color.so.1
+lib/libpixie_thumb.la
+lib/libpixie_thumb.so.1
+share/applnk/Graphics/kdvi.desktop
+share/applnk/Graphics/kfax.desktop
+share/applnk/Graphics/kfract.desktop
+share/applnk/Graphics/kghostview.desktop
+share/applnk/Graphics/kpixmap2bitmap.desktop
+share/applnk/Graphics/ksnapshot.desktop
+share/applnk/Graphics/kview.desktop
+share/applnk/Graphics/pixie.desktop
+share/apps/kdvi/kdvi_part.rc
share/apps/kdvi/toolbar/forwpage.xpm
share/apps/kdvi/toolbar/largetext.xpm
share/apps/kdvi/toolbar/smalltext.xpm
+share/apps/kfax/kfax_part.rc
share/apps/kfax/pics/kfax.tif
share/apps/kfax/pics/kfaxlogo.xpm
-share/apps/kiconedit/pics/compressed.xpm
-share/apps/kiconedit/pics/folder.xpm
-share/apps/kiconedit/pics/mini-folder.xpm
-share/apps/kiconedit/pics/mini-package.xpm
-share/apps/kiconedit/pics/package.xpm
-share/apps/kiconedit/pics/source.xpm
-share/apps/kiconedit/pics/standard.xpm
-share/apps/kiconedit/toolbar/aim.xpm
-share/apps/kiconedit/toolbar/areaselect.xpm
-share/apps/kiconedit/toolbar/circle.xpm
-share/apps/kiconedit/toolbar/ellipse.xpm
-share/apps/kiconedit/toolbar/eraser.xpm
-share/apps/kiconedit/toolbar/fileclose.xpm
-share/apps/kiconedit/toolbar/filledcircle.xpm
-share/apps/kiconedit/toolbar/filledellipse.xpm
-share/apps/kiconedit/toolbar/filledrectangle.xpm
-share/apps/kiconedit/toolbar/flood.xpm
-share/apps/kiconedit/toolbar/grayscale.xpm
-share/apps/kiconedit/toolbar/grid.xpm
-share/apps/kiconedit/toolbar/kdepalette.xpm
-share/apps/kiconedit/toolbar/line.xpm
-share/apps/kiconedit/toolbar/newwin.xpm
-share/apps/kiconedit/toolbar/paintbrush.xpm
-share/apps/kiconedit/toolbar/pointer.xpm
-share/apps/kiconedit/toolbar/rectangle.xpm
-share/apps/kiconedit/toolbar/selectcircle.xpm
-share/apps/kiconedit/toolbar/selectrect.xpm
-share/apps/kiconedit/toolbar/spraycan.xpm
-share/apps/kiconedit/toolbar/transform.xpm
-share/apps/kpaint/toolbar/areaselect.xpm
-share/apps/kpaint/toolbar/circle.xpm
-share/apps/kpaint/toolbar/editcopy.xpm
-share/apps/kpaint/toolbar/editcut.xpm
-share/apps/kpaint/toolbar/editpaste.xpm
-share/apps/kpaint/toolbar/ellipse.xpm
-share/apps/kpaint/toolbar/filefloppy.xpm
-share/apps/kpaint/toolbar/filenew.xpm
-share/apps/kpaint/toolbar/fileopen.xpm
-share/apps/kpaint/toolbar/line.xpm
-share/apps/kpaint/toolbar/pen.xpm
-share/apps/kpaint/toolbar/rectangle.xpm
-share/apps/kpaint/toolbar/roundangle.xpm
-share/apps/kpaint/toolbar/spraycan.xpm
-share/apps/kpaint/toolbar/viewmag+.xpm
-share/apps/kpaint/toolbar/viewmag-.xpm
-share/doc/HTML/cs/ksnapshot/index.html
-share/doc/HTML/cs/ksnapshot/ksnapshot.gif
-share/doc/HTML/da/kiconedit/index-1.html
-share/doc/HTML/da/kiconedit/index-2.html
-share/doc/HTML/da/kiconedit/index-3.html
-share/doc/HTML/da/kiconedit/index-4.html
-share/doc/HTML/da/kiconedit/index.html
-share/doc/HTML/da/kiconedit/logotp3.gif
+share/apps/kfract/kfract.rc
+share/apps/kghostview/kghostviewui.rc
+share/apps/kghostview/kgv_part.rc
+share/apps/kview/kview_part.rc
+share/apps/kview/toolbar/rotate.png
+share/apps/kviewpart/kviewerpart.rc
+share/apps/kviewshell/kviewshell.rc
+share/apps/kviewshell/paper-formats
+share/apps/pixie/dec2.png
+share/apps/pixie/dec2high.png
+share/apps/pixie/inc2.png
+share/apps/pixie/inc2high.png
+share/apps/pixie/logo.png
+share/apps/pixie/plugins/kdeeffects.desktop
+share/apps/pixie/plugins/magick.desktop
+share/apps/pixie/progress1.png
+share/apps/pixie/progress2.png
+share/apps/pixie/thumbwallpaper.png
+share/apps/pixie/toolbar/back.png
+share/apps/pixie/toolbar/brightness+.png
+share/apps/pixie/toolbar/brightness-.png
+share/apps/pixie/toolbar/contrast+.png
+share/apps/pixie/toolbar/contrast-.png
+share/apps/pixie/toolbar/fliph.png
+share/apps/pixie/toolbar/flipv.png
+share/apps/pixie/toolbar/forward.png
+share/apps/pixie/toolbar/kwin.png
+share/apps/pixie/toolbar/mini-ray.png
+share/apps/pixie/toolbar/mini-run.png
+share/apps/pixie/toolbar/play.png
+share/apps/pixie/toolbar/scaledown.png
+share/apps/pixie/toolbar/scaleup.png
+share/apps/pixie/toolbar/stop.png
+share/apps/pixie/toolbar/thumb.png
+share/doc/HTML/en/kdvi/.anchors
+share/doc/HTML/en/kdvi/KDVI-features.dvi
+share/doc/HTML/en/kdvi/KDVI-features.tex
+share/doc/HTML/en/kdvi/aboutkde.ps
+share/doc/HTML/en/kdvi/index.cvlog
+share/doc/HTML/en/kdvi/index.docbook
share/doc/HTML/en/kdvi/index.html
-share/doc/HTML/en/kfax/index-1.html
-share/doc/HTML/en/kfax/index-2.html
-share/doc/HTML/en/kfax/index-3.html
-share/doc/HTML/en/kfax/index-4.html
-share/doc/HTML/en/kfax/index-5.html
-share/doc/HTML/en/kfax/index-6.html
+share/doc/HTML/en/kdvi/opt-rendering.html
+share/doc/HTML/en/kdvi/optionrequester1.png
+share/doc/HTML/en/kdvi/optionrequester2.png
+share/doc/HTML/en/kdvi/options.html
+share/doc/HTML/en/kdvi/printing.html
+share/doc/HTML/en/kdvi/qampa.html
+share/doc/HTML/en/kdvi/usage.html
+share/doc/HTML/en/kfax/.anchors
+share/doc/HTML/en/kfax/command-line-options.html
+share/doc/HTML/en/kfax/compilation-and-installation.html
+share/doc/HTML/en/kfax/copyright.html
+share/doc/HTML/en/kfax/dealing-with-files-on-the-internet.html
+share/doc/HTML/en/kfax/fax-options.html
+share/doc/HTML/en/kfax/fundamentals.html
+share/doc/HTML/en/kfax/help.html
+share/doc/HTML/en/kfax/how-to-create-fax-files.html
+share/doc/HTML/en/kfax/index.cvlog
+share/doc/HTML/en/kfax/index.docbook
share/doc/HTML/en/kfax/index.html
-share/doc/HTML/en/kfax/logotp3.gif
+share/doc/HTML/en/kfax/installation.html
+share/doc/HTML/en/kfax/introduction.html
+share/doc/HTML/en/kfax/kfax-key-bindings.html
+share/doc/HTML/en/kfax/options.html
+share/doc/HTML/en/kfax/printing.html
+share/doc/HTML/en/kfax/questionsandanswers.html
+share/doc/HTML/en/kfax/requirements.html
+share/doc/HTML/en/kfax/themenuentries.html
+share/doc/HTML/en/kfax/view.html
+share/doc/HTML/en/kfract/.anchors
+share/doc/HTML/en/kfract/index.cvlog
+share/doc/HTML/en/kfract/index.docbook
share/doc/HTML/en/kfract/index.html
-share/doc/HTML/en/kfract/kfract.gif
-share/doc/HTML/en/kghostview/index-1.html
-share/doc/HTML/en/kghostview/index-2.html
-share/doc/HTML/en/kghostview/index-3.html
-share/doc/HTML/en/kghostview/index-4.html
-share/doc/HTML/en/kghostview/index-5.html
-share/doc/HTML/en/kghostview/index-6.html
+share/doc/HTML/en/kfract/introduction.html
+share/doc/HTML/en/kfract/kfract.png
+share/doc/HTML/en/kfract/onscreenfundamentals.html
+share/doc/HTML/en/kfract/the-file-menu.html
+share/doc/HTML/en/kfract/the-help-menu.html
+share/doc/HTML/en/kfract/the-options-menu.html
+share/doc/HTML/en/kfract/the-toolbar.html
+share/doc/HTML/en/kfract/the-types-menu.html
+share/doc/HTML/en/kghostview/.anchors
+share/doc/HTML/en/kghostview/authors.html
+share/doc/HTML/en/kghostview/configure-interpreter.html
+share/doc/HTML/en/kghostview/configure-key-bindings.html
+share/doc/HTML/en/kghostview/copyright.html
+share/doc/HTML/en/kghostview/dialogboxes.html
+share/doc/HTML/en/kghostview/epilogue.html
+share/doc/HTML/en/kghostview/fundamentals.html
+share/doc/HTML/en/kghostview/ghostscript-messages.html
+share/doc/HTML/en/kghostview/go-to-page.html
+share/doc/HTML/en/kghostview/go.html
+share/doc/HTML/en/kghostview/help.html
+share/doc/HTML/en/kghostview/index.cvlog
+share/doc/HTML/en/kghostview/index.docbook
share/doc/HTML/en/kghostview/index.html
-share/doc/HTML/en/kghostview/logotp3.gif
-share/doc/HTML/en/kiconedit/index-1.html
-share/doc/HTML/en/kiconedit/index-2.html
-share/doc/HTML/en/kiconedit/index-3.html
-share/doc/HTML/en/kiconedit/index-4.html
-share/doc/HTML/en/kiconedit/index.html
-share/doc/HTML/en/kiconedit/logotp3.gif
-share/doc/HTML/en/kpaint/Technic.gif
-share/doc/HTML/en/kpaint/index.html
-share/doc/HTML/en/kpaint/kpaint.html
+share/doc/HTML/en/kghostview/info.html
+share/doc/HTML/en/kghostview/introduction.html
+share/doc/HTML/en/kghostview/options.html
+share/doc/HTML/en/kghostview/page-list.html
+share/doc/HTML/en/kghostview/primarymenuitems.html
+share/doc/HTML/en/kghostview/tool-bar.html
+share/doc/HTML/en/kghostview/tutorial.html
+share/doc/HTML/en/kghostview/view-control.html
+share/doc/HTML/en/kghostview/view.html
+share/doc/HTML/en/ksnapshot/.anchors
+share/doc/HTML/en/ksnapshot/additional-features.html
+share/doc/HTML/en/ksnapshot/buttons.png
+share/doc/HTML/en/ksnapshot/compilation-installation.html
+share/doc/HTML/en/ksnapshot/credits.html
+share/doc/HTML/en/ksnapshot/delay_repeat.png
+share/doc/HTML/en/ksnapshot/filemenu.png
+share/doc/HTML/en/ksnapshot/index.docbook
share/doc/HTML/en/ksnapshot/index.html
-share/doc/HTML/en/ksnapshot/ksnapshot.gif
-share/doc/HTML/en/kview/kview-1.html
-share/doc/HTML/en/kview/kview-2.html
-share/doc/HTML/en/kview/kview-3.html
-share/doc/HTML/en/kview/kview-4.html
-share/doc/HTML/en/kview/kview-5.html
-share/doc/HTML/en/kview/kview.html
-share/doc/HTML/en/kview/kview.index
-share/doc/HTML/en/kview/logotp3.gif
-share/doc/HTML/fi/kdvi/index.html
-share/icons/kdvi.xpm
-share/icons/kfax.xpm
-share/icons/kfract.xpm
-share/icons/kghostview.xpm
-share/icons/kiconedit.xpm
-share/icons/kpaint.xpm
-share/icons/ksnapshot.xpm
-share/icons/kview.xpm
-share/icons/large/kdvi.xpm
-share/icons/large/kfax.xpm
-share/icons/large/kfract.xpm
-share/icons/large/kghostview.xpm
-share/icons/large/kiconedit.xpm
-share/icons/large/kpaint.xpm
-share/icons/large/ksnapshot.xpm
-share/icons/large/kview.xpm
-share/icons/mini/kdvi.xpm
-share/icons/mini/kfax.xpm
-share/icons/mini/kfract.xpm
-share/icons/mini/kghostview.xpm
-share/icons/mini/kiconedit.xpm
-share/icons/mini/kpaint.xpm
-share/icons/mini/ksnapshot.xpm
-share/icons/mini/kview.xpm
-share/locale/br/LC_MESSAGES/kdvi.mo
-share/locale/br/LC_MESSAGES/kfax.mo
-share/locale/br/LC_MESSAGES/kfract.mo
-share/locale/br/LC_MESSAGES/kghostview.mo
-share/locale/br/LC_MESSAGES/kiconedit.mo
-share/locale/br/LC_MESSAGES/kpaint.mo
-share/locale/br/LC_MESSAGES/ksnapshot.mo
-share/locale/br/LC_MESSAGES/kview.mo
-share/locale/ca/LC_MESSAGES/kdvi.mo
-share/locale/ca/LC_MESSAGES/kfax.mo
-share/locale/ca/LC_MESSAGES/kghostview.mo
-share/locale/ca/LC_MESSAGES/ksnapshot.mo
-share/locale/cs/LC_MESSAGES/kdvi.mo
-share/locale/cs/LC_MESSAGES/kfax.mo
-share/locale/cs/LC_MESSAGES/kfract.mo
-share/locale/cs/LC_MESSAGES/kghostview.mo
-share/locale/cs/LC_MESSAGES/kiconedit.mo
-share/locale/cs/LC_MESSAGES/kpaint.mo
-share/locale/cs/LC_MESSAGES/ksnapshot.mo
-share/locale/cs/LC_MESSAGES/kview.mo
-share/locale/da/LC_MESSAGES/kdvi.mo
-share/locale/da/LC_MESSAGES/kfax.mo
-share/locale/da/LC_MESSAGES/kfract.mo
-share/locale/da/LC_MESSAGES/kghostview.mo
-share/locale/da/LC_MESSAGES/kiconedit.mo
-share/locale/da/LC_MESSAGES/kpaint.mo
-share/locale/da/LC_MESSAGES/ksnapshot.mo
-share/locale/da/LC_MESSAGES/kview.mo
-share/locale/de/LC_MESSAGES/kdvi.mo
-share/locale/de/LC_MESSAGES/kfax.mo
-share/locale/de/LC_MESSAGES/kfract.mo
-share/locale/de/LC_MESSAGES/kghostview.mo
-share/locale/de/LC_MESSAGES/kiconedit.mo
-share/locale/de/LC_MESSAGES/kpaint.mo
-share/locale/de/LC_MESSAGES/ksnapshot.mo
-share/locale/de/LC_MESSAGES/kview.mo
-share/locale/el/LC_MESSAGES/kdvi.mo
-share/locale/el/LC_MESSAGES/kghostview.mo
-share/locale/el/LC_MESSAGES/kpaint.mo
-share/locale/eo/LC_MESSAGES/kdvi.mo
-share/locale/eo/LC_MESSAGES/kfax.mo
-share/locale/eo/LC_MESSAGES/kghostview.mo
-share/locale/eo/LC_MESSAGES/kpaint.mo
-share/locale/es/LC_MESSAGES/kdvi.mo
-share/locale/es/LC_MESSAGES/kfax.mo
-share/locale/es/LC_MESSAGES/kfract.mo
-share/locale/es/LC_MESSAGES/kghostview.mo
-share/locale/es/LC_MESSAGES/kiconedit.mo
-share/locale/es/LC_MESSAGES/kpaint.mo
-share/locale/es/LC_MESSAGES/ksnapshot.mo
-share/locale/es/LC_MESSAGES/kview.mo
-share/locale/fi/LC_MESSAGES/kdvi.mo
-share/locale/fi/LC_MESSAGES/kfax.mo
-share/locale/fi/LC_MESSAGES/kfract.mo
-share/locale/fi/LC_MESSAGES/kghostview.mo
-share/locale/fi/LC_MESSAGES/kiconedit.mo
-share/locale/fi/LC_MESSAGES/kpaint.mo
-share/locale/fi/LC_MESSAGES/ksnapshot.mo
-share/locale/fi/LC_MESSAGES/kview.mo
-share/locale/fr/LC_MESSAGES/kdvi.mo
-share/locale/fr/LC_MESSAGES/kfax.mo
-share/locale/fr/LC_MESSAGES/kfract.mo
-share/locale/fr/LC_MESSAGES/kghostview.mo
-share/locale/fr/LC_MESSAGES/kiconedit.mo
-share/locale/fr/LC_MESSAGES/kpaint.mo
-share/locale/fr/LC_MESSAGES/ksnapshot.mo
-share/locale/fr/LC_MESSAGES/kview.mo
-share/locale/hr/LC_MESSAGES/kdvi.mo
-share/locale/hr/LC_MESSAGES/kfax.mo
-share/locale/hr/LC_MESSAGES/kghostview.mo
-share/locale/hr/LC_MESSAGES/kpaint.mo
-share/locale/hr/LC_MESSAGES/kview.mo
-share/locale/hs/LC_MESSAGES/kdvi.mo
-share/locale/hu/LC_MESSAGES/kdvi.mo
-share/locale/hu/LC_MESSAGES/kghostview.mo
-share/locale/hu/LC_MESSAGES/kpaint.mo
-share/locale/hu/LC_MESSAGES/ksnapshot.mo
-share/locale/hu/LC_MESSAGES/kview.mo
-share/locale/is/LC_MESSAGES/kdvi.mo
-share/locale/is/LC_MESSAGES/kfax.mo
-share/locale/is/LC_MESSAGES/kfract.mo
-share/locale/is/LC_MESSAGES/kghostview.mo
-share/locale/is/LC_MESSAGES/kiconedit.mo
-share/locale/is/LC_MESSAGES/kpaint.mo
-share/locale/is/LC_MESSAGES/ksnapshot.mo
-share/locale/is/LC_MESSAGES/kview.mo
-share/locale/it/LC_MESSAGES/kdvi.mo
-share/locale/it/LC_MESSAGES/kfax.mo
-share/locale/it/LC_MESSAGES/kfrac.mo
-share/locale/it/LC_MESSAGES/kghostview.mo
-share/locale/it/LC_MESSAGES/kpaint.mo
-share/locale/ja/LC_MESSAGES/kdvi.mo
-share/locale/ja/LC_MESSAGES/kfax.mo
-share/locale/ja/LC_MESSAGES/kfract.mo
-share/locale/ja/LC_MESSAGES/kghostview.mo
-share/locale/ja/LC_MESSAGES/kiconedit.mo
-share/locale/ja/LC_MESSAGES/kpaint.mo
-share/locale/ja/LC_MESSAGES/ksnapshot.mo
-share/locale/ja/LC_MESSAGES/kview.mo
-share/locale/ko/LC_MESSAGES/kdvi.mo
-share/locale/ko/LC_MESSAGES/kfax.mo
-share/locale/ko/LC_MESSAGES/kghostview.mo
-share/locale/ko/LC_MESSAGES/kpaint.mo
-share/locale/mk/LC_MESSAGES/kfax.mo
-share/locale/mk/LC_MESSAGES/kghostview.mo
-share/locale/nl/LC_MESSAGES/kdvi.mo
-share/locale/nl/LC_MESSAGES/kfax.mo
-share/locale/nl/LC_MESSAGES/kghostview.mo
-share/locale/nl/LC_MESSAGES/kpaint.mo
-share/locale/no/LC_MESSAGES/kdvi.mo
-share/locale/no/LC_MESSAGES/kfax.mo
-share/locale/no/LC_MESSAGES/kfract.mo
-share/locale/no/LC_MESSAGES/kghostview.mo
-share/locale/no/LC_MESSAGES/kiconedit.mo
-share/locale/no/LC_MESSAGES/kpaint.mo
-share/locale/no/LC_MESSAGES/ksnapshot.mo
-share/locale/no/LC_MESSAGES/kview.mo
-share/locale/pl/LC_MESSAGES/kdvi.mo
-share/locale/pl/LC_MESSAGES/kfax.mo
-share/locale/pl/LC_MESSAGES/kfract.mo
-share/locale/pl/LC_MESSAGES/kghostview.mo
-share/locale/pl/LC_MESSAGES/kiconedit.mo
-share/locale/pl/LC_MESSAGES/kpaint.mo
-share/locale/pl/LC_MESSAGES/ksnapshot.mo
-share/locale/pl/LC_MESSAGES/kview.mo
-share/locale/pt/LC_MESSAGES/kdvi.mo
-share/locale/pt/LC_MESSAGES/kfax.mo
-share/locale/pt/LC_MESSAGES/kghostview.mo
-share/locale/pt/LC_MESSAGES/kpaint.mo
-share/locale/pt_BR/LC_MESSAGES/kdvi.mo
-share/locale/pt_BR/LC_MESSAGES/kfax.mo
-share/locale/pt_BR/LC_MESSAGES/kfract.mo
-share/locale/pt_BR/LC_MESSAGES/kghostview.mo
-share/locale/pt_BR/LC_MESSAGES/kiconedit.mo
-share/locale/pt_BR/LC_MESSAGES/kpaint.mo
-share/locale/pt_BR/LC_MESSAGES/ksnapshot.mo
-share/locale/pt_BR/LC_MESSAGES/kview.mo
-share/locale/ru/LC_MESSAGES/kdvi.mo
-share/locale/ru/LC_MESSAGES/kfax.mo
-share/locale/ru/LC_MESSAGES/kfract.mo
-share/locale/ru/LC_MESSAGES/kghostview.mo
-share/locale/ru/LC_MESSAGES/kiconedit.mo
-share/locale/ru/LC_MESSAGES/kpaint.mo
-share/locale/ru/LC_MESSAGES/ksnapshot.mo
-share/locale/ru/LC_MESSAGES/kview.mo
-share/locale/sk/LC_MESSAGES/kdvi.mo
-share/locale/sk/LC_MESSAGES/kfax.mo
-share/locale/sk/LC_MESSAGES/kfract.mo
-share/locale/sk/LC_MESSAGES/kghostview.mo
-share/locale/sk/LC_MESSAGES/kiconedit.mo
-share/locale/sk/LC_MESSAGES/kpaint.mo
-share/locale/sk/LC_MESSAGES/ksnapshot.mo
-share/locale/sk/LC_MESSAGES/kview.mo
-share/locale/sl/LC_MESSAGES/kdvi.mo
-share/locale/sl/LC_MESSAGES/kfax.mo
-share/locale/sl/LC_MESSAGES/kfract.mo
-share/locale/sl/LC_MESSAGES/kghostview.mo
-share/locale/sl/LC_MESSAGES/kiconedit.mo
-share/locale/sl/LC_MESSAGES/kpaint.mo
-share/locale/sl/LC_MESSAGES/ksnapshot.mo
-share/locale/sl/LC_MESSAGES/kview.mo
-share/locale/sv/LC_MESSAGES/kdvi.mo
-share/locale/sv/LC_MESSAGES/kfax.mo
-share/locale/sv/LC_MESSAGES/kghostview.mo
-share/locale/sv/LC_MESSAGES/kpaint.mo
-share/locale/tr/LC_MESSAGES/kdvi.mo
-share/locale/tr/LC_MESSAGES/kfax.mo
-share/locale/tr/LC_MESSAGES/kghostview.mo
-share/locale/tr/LC_MESSAGES/kpaint.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kdvi.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kfax.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kghostview.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kpaint.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kfax.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kghostview.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kpaint.mo
-@dirrm share/doc/HTML/fi/kdvi
+share/doc/HTML/en/ksnapshot/installation.html
+share/doc/HTML/en/ksnapshot/introduction.html
+share/doc/HTML/en/ksnapshot/ksnapshot.png
+share/doc/HTML/en/ksnapshot/ksnapshot_full.png
+share/doc/HTML/en/ksnapshot/minicmd.png
+share/doc/HTML/en/ksnapshot/options.png
+share/doc/HTML/en/ksnapshot/preview.png
+share/doc/HTML/en/ksnapshot/requirements.html
+share/doc/HTML/en/ksnapshot/taking-snapshot.html
+share/doc/HTML/en/ksnapshot/using-ksapshot.html
+share/doc/HTML/en/kview/.anchors
+share/doc/HTML/en/kview/cmdline.html
+share/doc/HTML/en/kview/how.html
+share/doc/HTML/en/kview/index.cvlog
+share/doc/HTML/en/kview/index.docbook
+share/doc/HTML/en/kview/index.html
+share/doc/HTML/en/kview/introduction.html
+share/doc/HTML/en/kview/notes.html
+share/doc/HTML/en/kview/what.html
+share/doc/HTML/en/pixie/.anchors
+share/doc/HTML/en/pixie/index.docbook
+share/doc/HTML/en/pixie/index.html
+share/doc/HTML/en/pixie/introduction.html
+share/icons/hicolor/32x32/apps/kdvi.png
+share/icons/hicolor/32x32/apps/kfax.png
+share/icons/hicolor/32x32/apps/kfract.png
+share/icons/hicolor/32x32/apps/kghostview.png
+share/icons/hicolor/32x32/apps/ksnapshot.png
+share/icons/hicolor/32x32/apps/kview.png
+share/icons/hicolor/48x48/apps/kdvi.png
+share/icons/hicolor/48x48/apps/kfax.png
+share/icons/hicolor/48x48/apps/kfract.png
+share/icons/hicolor/48x48/apps/kghostview.png
+share/icons/hicolor/48x48/apps/ksnapshot.png
+share/icons/hicolor/48x48/apps/kview.png
+share/icons/locolor/16x16/apps/kdvi.png
+share/icons/locolor/16x16/apps/kfax.png
+share/icons/locolor/16x16/apps/kfract.png
+share/icons/locolor/16x16/apps/kghostview.png
+share/icons/locolor/16x16/apps/ksnapshot.png
+share/icons/locolor/16x16/apps/kview.png
+share/icons/locolor/32x32/apps/kdvi.png
+share/icons/locolor/32x32/apps/kfax.png
+share/icons/locolor/32x32/apps/kfract.png
+share/icons/locolor/32x32/apps/kghostview.png
+share/icons/locolor/32x32/apps/ksnapshot.png
+share/icons/locolor/32x32/apps/kview.png
+@dirrm share/doc/HTML/en/pixie
@dirrm share/doc/HTML/en/kview
@dirrm share/doc/HTML/en/ksnapshot
-@dirrm share/doc/HTML/en/kpaint
-@dirrm share/doc/HTML/en/kiconedit
@dirrm share/doc/HTML/en/kghostview
@dirrm share/doc/HTML/en/kfract
@dirrm share/doc/HTML/en/kfax
@dirrm share/doc/HTML/en/kdvi
-@dirrm share/doc/HTML/da/kiconedit
-@dirrm share/doc/HTML/cs/ksnapshot
-@dirrm share/apps/kpaint/toolbar
-@dirrm share/apps/kpaint
-@dirrm share/apps/kiconedit/toolbar
-@dirrm share/apps/kiconedit/pics
-@dirrm share/apps/kiconedit
+@dirrm share/apps/pixie/toolbar
+@dirrm share/apps/pixie/plugins
+@dirrm share/apps/pixie
+@dirrm share/apps/kviewshell
+@dirrm share/apps/kviewpart
+@dirrm share/apps/kview/toolbar
+@dirrm share/apps/kview
+@dirrm share/apps/kghostview
+@dirrm share/apps/kfract
@dirrm share/apps/kfax/pics
@dirrm share/apps/kfax
@dirrm share/apps/kdvi/toolbar
@dirrm share/apps/kdvi
+@dirrm share/apps
+@dirrm include/mini-magick
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
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/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/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/misc/kdeutils2/distinfo
+++ b/misc/kdeutils2/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/misc/kdeutils2/pkg-plist b/misc/kdeutils2/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/misc/kdeutils2/pkg-plist
+++ b/misc/kdeutils2/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
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/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/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/misc/kdeutils3/pkg-plist b/misc/kdeutils3/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/misc/kdeutils3/pkg-plist
+++ b/misc/kdeutils3/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
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/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/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/misc/kdeutils4/pkg-plist
+++ b/misc/kdeutils4/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
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index a790c0467e1b..7edc2afde790 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,27 +1,33 @@
-# New ports collection makefile for: kdemultimedia
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
+# New ports collection makefile for: KDE2 Multimedia
+# Date created: Saturday 2 September 2000
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= kdemultimedia
-PORTVERSION= 1.1.2
-CATEGORIES= audio kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+PORTVERSION= 1.94
+CATEGORIES= misc kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
-MAINTAINER= se@freebsd.org
+MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.3:${PORTSDIR}/x11/kdelibs11
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
+MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)"
-CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
- INSTALL_SCRIPT="install -c -m 555"
+INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+ --with-qt-includes=${X11BASE}/include/qt2 \
+ --with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 745eae46729e..e1b274b524a1 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-1.1.2.tar.bz2) = 91018d4cad9420d376d94aba034e1bbe
+MD5 (kdemultimedia-1.94.tar.bz2) = bae3c4421e28631a0646c59e47e13b32
diff --git a/multimedia/kdemultimedia3/pkg-comment b/multimedia/kdemultimedia3/pkg-comment
index 6f31b51504cc..186230f9287d 100644
--- a/multimedia/kdemultimedia3/pkg-comment
+++ b/multimedia/kdemultimedia3/pkg-comment
@@ -1 +1 @@
-KDE audio tools
+Utilities for the KDE integrated X11 desktop
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index 34fd257b8340..9686179e2512 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -1,30 +1,162 @@
-bin/cddaslave
-bin/kmedia
+bin/aktion
+bin/artsbuilder
+bin/artscontrol
+bin/kaiman
bin/kmid
bin/kmidi
bin/kmix
-bin/kscd
-bin/kscdmagic
-bin/workman2cddb.pl
-share/applnk/Multimedia/KMedia.kdelnk
-share/applnk/Multimedia/KMidi.kdelnk
-share/applnk/Multimedia/KMix.kdelnk
-share/applnk/Multimedia/kmid.kdelnk
-share/applnk/Multimedia/kscd.kdelnk
-share/apps/kmedia/pics/eject.xbm
-share/apps/kmedia/pics/ff.xbm
-share/apps/kmedia/pics/kmedia.xpm
-share/apps/kmedia/pics/kmedia_mini.xpm
-share/apps/kmedia/pics/lock.xbm
-share/apps/kmedia/pics/logo.xbm
-share/apps/kmedia/pics/nexttrk.xbm
-share/apps/kmedia/pics/playpause.xbm
-share/apps/kmedia/pics/playpause_both.xpm
-share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmedia/pics/poweroff.xbm
-share/apps/kmedia/pics/prevtrk.xbm
-share/apps/kmedia/pics/rew.xbm
-share/apps/kmedia/pics/stop.xbm
+bin/kmixctrl
+bin/midisend
+bin/sf2cfg
+bin/timidity
+lib/Arts/StructureBuilder.mcopclass
+lib/Arts/StructureDesc.mcopclass
+lib/Arts/Synth_ENVELOPE_ADSR.mcopclass
+lib/Arts/Synth_MIDI_TEST.mcopclass
+lib/Arts/Synth_NOISE.mcopclass
+lib/Arts/Synth_SHELVE_CUTOFF.mcopclass
+lib/Arts/Synth_WAVE_TRI.mcopclass
+lib/Arts/Synth_XFADE.mcopclass
+lib/artsmodules.mcopclass
+lib/artsmodules.mcoptype
+lib/libaktion.la
+lib/libaktion.so
+lib/libaktion.so.1
+lib/libartsbuilder.la
+lib/libartsbuilder.so
+lib/libartsbuilder.so.0
+lib/libartsmodules.la
+lib/libartsmodules.so
+lib/libartsmodules.so.0
+lib/libkcm_kmix.la
+lib/libkcm_kmix.so
+lib/libkmidpart.la
+lib/libkmidpart.so
+lib/libkmidpart.so.1
+lib/libkmixapplet.la
+lib/libkmixapplet.so
+lib/libkmixapplet.so.1
+share/applnk/Multimedia/aktion.desktop
+share/applnk/Multimedia/artsbuilder.desktop
+share/applnk/Multimedia/artscontrol.desktop
+share/applnk/Multimedia/kaiman.desktop
+share/applnk/Multimedia/kmid.desktop
+share/applnk/Multimedia/kmidi.desktop
+share/applnk/Multimedia/kmix.desktop
+share/applnk/Multimedia/timidity.desktop
+share/applnk/Settings/Sound/kmix.desktop
+share/apps/aktion/aktion_part.rc
+share/apps/aktion/toolbar/ak_maximize.png
+share/apps/aktion/toolbar/ak_setup.png
+share/apps/aktion/toolbar/aktion_logo.png
+share/apps/aktion/toolbar/avanzar.png
+share/apps/aktion/toolbar/ayuda.png
+share/apps/aktion/toolbar/double.png
+share/apps/aktion/toolbar/fullscreen.png
+share/apps/aktion/toolbar/half.png
+share/apps/aktion/toolbar/original.png
+share/apps/aktion/toolbar/parar.png
+share/apps/aktion/toolbar/pause.png
+share/apps/aktion/toolbar/retroceder.png
+share/apps/aktion/toolbar/tocar.png
+share/apps/artscontrol/artscontrol.rc
+share/apps/kaiman/Skins/car-preset/btn_exit.png
+share/apps/kaiman/Skins/car-preset/btn_iconify.png
+share/apps/kaiman/Skins/car-preset/btn_list.png
+share/apps/kaiman/Skins/car-preset/btn_next.png
+share/apps/kaiman/Skins/car-preset/btn_p1.png
+share/apps/kaiman/Skins/car-preset/btn_p2.png
+share/apps/kaiman/Skins/car-preset/btn_p3.png
+share/apps/kaiman/Skins/car-preset/btn_p4.png
+share/apps/kaiman/Skins/car-preset/btn_p5.png
+share/apps/kaiman/Skins/car-preset/btn_p6.png
+share/apps/kaiman/Skins/car-preset/btn_play.png
+share/apps/kaiman/Skins/car-preset/btn_prev.png
+share/apps/kaiman/Skins/car-preset/btn_sml.png
+share/apps/kaiman/Skins/car-preset/btn_stop.png
+share/apps/kaiman/Skins/car-preset/btn_voldn.png
+share/apps/kaiman/Skins/car-preset/btn_volup.png
+share/apps/kaiman/Skins/car-preset/digbig.png
+share/apps/kaiman/Skins/car-preset/digmed.png
+share/apps/kaiman/Skins/car-preset/letters.png
+share/apps/kaiman/Skins/car-preset/main.png
+share/apps/kaiman/Skins/car-preset/monoster.png
+share/apps/kaiman/Skins/car-preset/posbar.png
+share/apps/kaiman/Skins/car-preset/random.png
+share/apps/kaiman/Skins/car-preset/repeat.png
+share/apps/kaiman/Skins/car-preset/skindata
+share/apps/kaiman/Skins/car-preset/status.png
+share/apps/kaiman/Skins/car-preset/volume.png
+share/apps/kaiman/Skins/circle/back.png
+share/apps/kaiman/Skins/circle/back_mask.png
+share/apps/kaiman/Skins/circle/back_sm.png
+share/apps/kaiman/Skins/circle/back_sm_mask.png
+share/apps/kaiman/Skins/circle/bar_pos.png
+share/apps/kaiman/Skins/circle/bar_vol.png
+share/apps/kaiman/Skins/circle/btn_exit.png
+share/apps/kaiman/Skins/circle/btn_iconify.png
+share/apps/kaiman/Skins/circle/btn_list.png
+share/apps/kaiman/Skins/circle/btn_mode.png
+share/apps/kaiman/Skins/circle/btn_next.png
+share/apps/kaiman/Skins/circle/btn_play.png
+share/apps/kaiman/Skins/circle/btn_pref.png
+share/apps/kaiman/Skins/circle/btn_prev.png
+share/apps/kaiman/Skins/circle/btn_repeat.png
+share/apps/kaiman/Skins/circle/btn_shuffle.png
+share/apps/kaiman/Skins/circle/btn_sm_exit.png
+share/apps/kaiman/Skins/circle/btn_sm_iconify.png
+share/apps/kaiman/Skins/circle/btn_sm_mode.png
+share/apps/kaiman/Skins/circle/btn_sm_next.png
+share/apps/kaiman/Skins/circle/btn_sm_play.png
+share/apps/kaiman/Skins/circle/btn_sm_prev.png
+share/apps/kaiman/Skins/circle/btn_sm_stop.png
+share/apps/kaiman/Skins/circle/btn_stop.png
+share/apps/kaiman/Skins/circle/dig.png
+share/apps/kaiman/Skins/circle/digsml.png
+share/apps/kaiman/Skins/circle/letters.png
+share/apps/kaiman/Skins/circle/skindata
+share/apps/kaiman/Skins/circle/status.png
+share/apps/kaiman/Skins/k9/README
+share/apps/kaiman/Skins/k9/conf.jpg
+share/apps/kaiman/Skins/k9/conf.png
+share/apps/kaiman/Skins/k9/eject.jpg
+share/apps/kaiman/Skins/k9/icon.jpg
+share/apps/kaiman/Skins/k9/icon.png
+share/apps/kaiman/Skins/k9/kill.jpg
+share/apps/kaiman/Skins/k9/kill.png
+share/apps/kaiman/Skins/k9/knine-nfont.jpg
+share/apps/kaiman/Skins/k9/knine-nfont.png
+share/apps/kaiman/Skins/k9/knine-nfont2.jpg
+share/apps/kaiman/Skins/k9/knine-nfont2.png
+share/apps/kaiman/Skins/k9/knine-normal2.jpg
+share/apps/kaiman/Skins/k9/knine-normal2.png
+share/apps/kaiman/Skins/k9/knine-vfont.jpg
+share/apps/kaiman/Skins/k9/knine-vfont.png
+share/apps/kaiman/Skins/k9/long2.jpg
+share/apps/kaiman/Skins/k9/mask.png
+share/apps/kaiman/Skins/k9/newtext.jpg
+share/apps/kaiman/Skins/k9/newtext.png
+share/apps/kaiman/Skins/k9/next.jpg
+share/apps/kaiman/Skins/k9/pause.jpg
+share/apps/kaiman/Skins/k9/play.jpg
+share/apps/kaiman/Skins/k9/pos_item.jpg
+share/apps/kaiman/Skins/k9/repeat.jpg
+share/apps/kaiman/Skins/k9/repeat.png
+share/apps/kaiman/Skins/k9/reverse.jpg
+share/apps/kaiman/Skins/k9/shuffle.jpg
+share/apps/kaiman/Skins/k9/shuffle.png
+share/apps/kaiman/Skins/k9/skindata
+share/apps/kaiman/Skins/k9/small-k.jpg
+share/apps/kaiman/Skins/k9/small-k.png
+share/apps/kaiman/Skins/k9/square.jpg
+share/apps/kaiman/Skins/k9/square.png
+share/apps/kaiman/Skins/k9/status.jpg
+share/apps/kaiman/Skins/k9/status.png
+share/apps/kaiman/Skins/k9/stop.jpg
+share/apps/kaiman/Skins/k9/trans-pos.png
+share/apps/kaiman/Skins/k9/trans-slide.png
+share/apps/kaiman/kaimanui.rc
+share/apps/kicker/applets/kmixapplet.desktop
share/apps/kmid/AnotherGlitchInTheCall.kar
share/apps/kmid/OFortuna.kar
share/apps/kmid/StopInTheNameOfLove.kar
@@ -33,305 +165,222 @@ share/apps/kmid/fm/drums.o3
share/apps/kmid/fm/drums.sb
share/apps/kmid/fm/std.o3
share/apps/kmid/fm/std.sb
+share/apps/kmid/icons/button1.xpm
+share/apps/kmid/icons/button2.xpm
+share/apps/kmid/icons/hicolor/22x22/actions/piano.png
+share/apps/kmid/icons/hicolor/22x22/actions/volume.png
+share/apps/kmid/icons/hicolor/32x32/actions/piano.png
+share/apps/kmid/icons/hicolor/32x32/actions/volume.png
+share/apps/kmid/icons/keyboard.xpm
+share/apps/kmid/icons/locolor/16x16/actions/piano.png
+share/apps/kmid/icons/locolor/16x16/actions/volume.png
+share/apps/kmid/kmid_partui.rc
+share/apps/kmid/kmidui.rc
share/apps/kmid/maps/YamahaPSR500.map
share/apps/kmid/maps/YamahaPSS790.map
+share/apps/kmid/maps/YamahaQY10.map
share/apps/kmid/maps/gm.map
-share/apps/kmid/pics/button1.xpm
-share/apps/kmid/pics/button2.xpm
-share/apps/kmid/pics/keyboard.xpm
-share/apps/kmid/toolbar/kmid_chn.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
-share/apps/kmid/toolbar/kmid_volume.xpm
-share/apps/kmidi/config/chaos12-voices
-share/apps/kmidi/config/chaos8-voices
-share/apps/kmidi/config/gravis.cfg
-share/apps/kmidi/config/gsdrum.cfg
-share/apps/kmidi/config/megadrum
-share/apps/kmidi/config/megainst
-share/apps/kmidi/config/midia.cfg
-share/apps/kmidi/config/mt32.cfg
-share/apps/kmidi/config/patch/acpiano.pat
-share/apps/kmidi/config/patch/nylongt2.pat
-share/apps/kmidi/config/pila-voices
-share/apps/kmidi/config/sndfont.cfg
-share/apps/kmidi/config/sound-canvas-drums
-share/apps/kmidi/config/timidity.cfg
-share/apps/kmidi/config/wowpats.cfg
-share/apps/kmidi/pics/kmidilogo.xpm
-share/apps/kmix/pics/kmixdocked.xpm
-share/apps/kmix/pics/mix_audio.xpm
-share/apps/kmix/pics/mix_bass.xpm
-share/apps/kmix/pics/mix_cd.xpm
-share/apps/kmix/pics/mix_ext.xpm
-share/apps/kmix/pics/mix_microphone.xpm
-share/apps/kmix/pics/mix_midi.xpm
-share/apps/kmix/pics/mix_recmon.xpm
-share/apps/kmix/pics/mix_treble.xpm
-share/apps/kmix/pics/mix_unknown.xpm
-share/apps/kmix/pics/mix_volume.xpm
-share/apps/kscd/pics/cdsmall.xpm
-share/apps/kscd/pics/kscdlogo.xpm
-share/doc/HTML/de/kmidi/kmidi-1.html
-share/doc/HTML/de/kmidi/kmidi-2.html
-share/doc/HTML/de/kmidi/kmidi-3.html
-share/doc/HTML/de/kmidi/kmidi-4.html
-share/doc/HTML/de/kmidi/kmidi-5.html
-share/doc/HTML/de/kmidi/kmidi.html
-share/doc/HTML/de/kmidi/kmidi.sgml
-share/doc/HTML/de/kmidi/logotp3.gif
-share/doc/HTML/en/kmedia/index-1.html
-share/doc/HTML/en/kmedia/index-2.html
-share/doc/HTML/en/kmedia/index-3.html
-share/doc/HTML/en/kmedia/index-4.html
-share/doc/HTML/en/kmedia/index-5.html
-share/doc/HTML/en/kmedia/index.html
-share/doc/HTML/en/kmedia/logotp3.gif
-share/doc/HTML/en/kmid/index-1.html
-share/doc/HTML/en/kmid/index-2.html
-share/doc/HTML/en/kmid/index-3.html
-share/doc/HTML/en/kmid/index-4.html
-share/doc/HTML/en/kmid/index-5.html
-share/doc/HTML/en/kmid/index-6.html
-share/doc/HTML/en/kmid/index-7.html
-share/doc/HTML/en/kmid/index-8.html
-share/doc/HTML/en/kmid/index-9.html
+share/apps/kmidi/Axel_Elf.mid
+share/apps/kmidi/Cavatina.mid
+share/apps/kmidi/Jarre-Chung_Kuo.mid
+share/apps/kmidi/Malaguena.mid
+share/apps/kmidi/Mission_Impossible.mid
+share/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid
+share/apps/kmidi/georgia.mid
+share/apps/kmidi/mpostman.mid
+share/apps/kmidi/pics/kmidilogo.png
+share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/kmixdocked.png
+share/apps/kmix/pics/logo.png
+share/apps/kmix/pics/mix_audio.png
+share/apps/kmix/pics/mix_bass.png
+share/apps/kmix/pics/mix_cd.png
+share/apps/kmix/pics/mix_ext.png
+share/apps/kmix/pics/mix_microphone.png
+share/apps/kmix/pics/mix_midi.png
+share/apps/kmix/pics/mix_recmon.png
+share/apps/kmix/pics/mix_surround.png
+share/apps/kmix/pics/mix_treble.png
+share/apps/kmix/pics/mix_unknown.png
+share/apps/kmix/pics/mix_video.png
+share/apps/kmix/pics/mix_volume.png
+share/config/aktionrc
+share/doc/HTML/en/artsbuilder/.anchors
+share/doc/HTML/en/artsbuilder/common
+share/doc/HTML/en/artsbuilder/index.docbook
+share/doc/HTML/en/artsbuilder/index.html
+share/doc/HTML/en/artsbuilder/insidearts.html
+share/doc/HTML/en/artsbuilder/introduction.html
+share/doc/HTML/en/artsbuilder/quickstart.html
+share/doc/HTML/en/kmid/.anchors
+share/doc/HTML/en/kmid/abouttheauthor.html
+share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
+share/doc/HTML/en/kmid/advancedfeatures.html
+share/doc/HTML/en/kmid/collections.html
+share/doc/HTML/en/kmid/common
+share/doc/HTML/en/kmid/compilationandinstallation.html
+share/doc/HTML/en/kmid/creatingamidimap.html
+share/doc/HTML/en/kmid/deletingacollection.html
+share/doc/HTML/en/kmid/displayinglyrics.html
+share/doc/HTML/en/kmid/doineedamidimap.html
+share/doc/HTML/en/kmid/finalnotes.html
+share/doc/HTML/en/kmid/frequentlyaskedquestionsfaq.html
+share/doc/HTML/en/kmid/generalusage.html
+share/doc/HTML/en/kmid/hallofkmidsfriends.html
+share/doc/HTML/en/kmid/index.cvlog
+share/doc/HTML/en/kmid/index.docbook
share/doc/HTML/en/kmid/index.html
-share/doc/HTML/en/kmid/logotp3.gif
-share/doc/HTML/en/kmidi/kmidi-1.html
-share/doc/HTML/en/kmidi/kmidi-2.html
-share/doc/HTML/en/kmidi/kmidi-3.html
-share/doc/HTML/en/kmidi/kmidi-4.html
-share/doc/HTML/en/kmidi/kmidi-5.html
-share/doc/HTML/en/kmidi/kmidi.html
-share/doc/HTML/en/kmidi/kmidi.nif
-share/doc/HTML/en/kmidi/kmidi.sgml
-share/doc/HTML/en/kmidi/logotp3.gif
-share/doc/HTML/en/kmix/index-1.html
-share/doc/HTML/en/kmix/index-2.html
-share/doc/HTML/en/kmix/index-3.html
-share/doc/HTML/en/kmix/index-4.html
-share/doc/HTML/en/kmix/index-5.html
-share/doc/HTML/en/kmix/index-6.html
+share/doc/HTML/en/kmid/installation.html
+share/doc/HTML/en/kmid/introduction.html
+share/doc/HTML/en/kmid/keybindings.html
+share/doc/HTML/en/kmid/midimaps.html
+share/doc/HTML/en/kmid/playinginorderoratrandom.html
+share/doc/HTML/en/kmid/playingsongs.html
+share/doc/HTML/en/kmid/removingsongsfromcollections.html
+share/doc/HTML/en/kmid/requirements.html
+share/doc/HTML/en/kmid/selectingasongfromacollection.html
+share/doc/HTML/en/kmid/thetempolcd.html
+share/doc/HTML/en/kmid/thetemporarycollection.html
+share/doc/HTML/en/kmid/usingmidimaps.html
+share/doc/HTML/en/kmidi/.anchors
+share/doc/HTML/en/kmidi/FAQ
+share/doc/HTML/en/kmidi/commandlineoptions.html
+share/doc/HTML/en/kmidi/common
+share/doc/HTML/en/kmidi/compilationandinstallation.html
+share/doc/HTML/en/kmidi/computationissues.html
+share/doc/HTML/en/kmidi/configuring.html
+share/doc/HTML/en/kmidi/copyright.html
+share/doc/HTML/en/kmidi/credits.html
+share/doc/HTML/en/kmidi/design.html
+share/doc/HTML/en/kmidi/effects.html
+share/doc/HTML/en/kmidi/index.cvlog
+share/doc/HTML/en/kmidi/index.docbook
+share/doc/HTML/en/kmidi/index.html
+share/doc/HTML/en/kmidi/installation.html
+share/doc/HTML/en/kmidi/introduction.html
+share/doc/HTML/en/kmidi/memoryissues.html
+share/doc/HTML/en/kmidi/midifilenames.html
+share/doc/HTML/en/kmidi/midiimplementation.html
+share/doc/HTML/en/kmidi/patches.html
+share/doc/HTML/en/kmidi/patchsets.html
+share/doc/HTML/en/kmidi/playlists.html
+share/doc/HTML/en/kmidi/polyphony.html
+share/doc/HTML/en/kmidi/questionsandanswers.html
+share/doc/HTML/en/kmidi/requirements.html
+share/doc/HTML/en/kmidi/synthesismodel.html
+share/doc/HTML/en/kmidi/usage.html
+share/doc/HTML/en/kmidi/volume.html
+share/doc/HTML/en/kmix/.anchors
+share/doc/HTML/en/kmix/advancedfeatures.html
+share/doc/HTML/en/kmix/commandlinearguments.html
+share/doc/HTML/en/kmix/common
+share/doc/HTML/en/kmix/compilationandinstallation.html
+share/doc/HTML/en/kmix/configurationoptions.html
+share/doc/HTML/en/kmix/help.html
+share/doc/HTML/en/kmix/index.cvlog
+share/doc/HTML/en/kmix/index.docbook
share/doc/HTML/en/kmix/index.html
-share/doc/HTML/en/kmix/logotp3.gif
-share/doc/HTML/en/kscd/kscd-1.html
-share/doc/HTML/en/kscd/kscd-2.html
-share/doc/HTML/en/kscd/kscd-3.html
-share/doc/HTML/en/kscd/kscd-4.html
-share/doc/HTML/en/kscd/kscd-5.html
-share/doc/HTML/en/kscd/kscd-6.html
-share/doc/HTML/en/kscd/kscd-7.html
-share/doc/HTML/en/kscd/kscd-8.html
-share/doc/HTML/en/kscd/kscd.html
-share/doc/HTML/en/kscd/kscd1.gif
-share/doc/HTML/en/kscd/kscd10.gif
-share/doc/HTML/en/kscd/kscd11.gif
-share/doc/HTML/en/kscd/kscd12.gif
-share/doc/HTML/en/kscd/kscd13.gif
-share/doc/HTML/en/kscd/kscd14.gif
-share/doc/HTML/en/kscd/kscd15.gif
-share/doc/HTML/en/kscd/kscd16.gif
-share/doc/HTML/en/kscd/kscd2.gif
-share/doc/HTML/en/kscd/kscd2a.gif
-share/doc/HTML/en/kscd/kscd3.gif
-share/doc/HTML/en/kscd/kscd4.gif
-share/doc/HTML/en/kscd/kscd5.gif
-share/doc/HTML/en/kscd/kscd6.gif
-share/doc/HTML/en/kscd/kscd7.gif
-share/doc/HTML/en/kscd/kscd8.gif
-share/doc/HTML/en/kscd/kscd9.gif
-share/doc/HTML/en/kscd/logotp3.gif
-share/doc/HTML/es/kmid/index-1.html
-share/doc/HTML/es/kmid/index-2.html
-share/doc/HTML/es/kmid/index-3.html
-share/doc/HTML/es/kmid/index-4.html
-share/doc/HTML/es/kmid/index-5.html
-share/doc/HTML/es/kmid/index-6.html
-share/doc/HTML/es/kmid/index-7.html
-share/doc/HTML/es/kmid/index-8.html
-share/doc/HTML/es/kmid/index-9.html
-share/doc/HTML/es/kmid/index.html
-share/doc/HTML/es/kmid/logotp3.gif
-share/icons/cd.xpm
-share/icons/kmedia.xpm
-share/icons/kmid.xpm
-share/icons/kmidi.xpm
-share/icons/kmix.xpm
-share/icons/kscd.xpm
-share/icons/large/kmedia.xpm
-share/icons/large/kmid.xpm
-share/icons/large/kmidi.xpm
-share/icons/large/kmix.xpm
-share/icons/large/kscd.xpm
-share/icons/mini/kmedia.xpm
-share/icons/mini/kmid.xpm
-share/icons/mini/kmidi.xpm
-share/icons/mini/kmix.xpm
-share/icons/mini/kscd.xpm
-share/locale/br/LC_MESSAGES/kmedia.mo
-share/locale/br/LC_MESSAGES/kmid.mo
-share/locale/br/LC_MESSAGES/kmidi.mo
-share/locale/br/LC_MESSAGES/kmix.mo
-share/locale/br/LC_MESSAGES/kscd.mo
-share/locale/ca/LC_MESSAGES/kmedia.mo
-share/locale/ca/LC_MESSAGES/kmid.mo
-share/locale/ca/LC_MESSAGES/kmidi.mo
-share/locale/ca/LC_MESSAGES/kmix.mo
-share/locale/ca/LC_MESSAGES/kscd.mo
-share/locale/cs/LC_MESSAGES/kmedia.mo
-share/locale/cs/LC_MESSAGES/kmid.mo
-share/locale/cs/LC_MESSAGES/kmidi.mo
-share/locale/cs/LC_MESSAGES/kmix.mo
-share/locale/cs/LC_MESSAGES/kscd.mo
-share/locale/da/LC_MESSAGES/kmedia.mo
-share/locale/da/LC_MESSAGES/kmid.mo
-share/locale/da/LC_MESSAGES/kmidi.mo
-share/locale/da/LC_MESSAGES/kmix.mo
-share/locale/da/LC_MESSAGES/kscd.mo
-share/locale/de/LC_MESSAGES/kmedia.mo
-share/locale/de/LC_MESSAGES/kmid.mo
-share/locale/de/LC_MESSAGES/kmidi.mo
-share/locale/de/LC_MESSAGES/kmix.mo
-share/locale/de/LC_MESSAGES/kscd.mo
-share/locale/el/LC_MESSAGES/kmedia.mo
-share/locale/el/LC_MESSAGES/kmix.mo
-share/locale/el/LC_MESSAGES/kscd.mo
-share/locale/eo/LC_MESSAGES/kmedia.mo
-share/locale/eo/LC_MESSAGES/kmid.mo
-share/locale/eo/LC_MESSAGES/kmix.mo
-share/locale/eo/LC_MESSAGES/kscd.mo
-share/locale/es/LC_MESSAGES/kmedia.mo
-share/locale/es/LC_MESSAGES/kmid.mo
-share/locale/es/LC_MESSAGES/kmix.mo
-share/locale/es/LC_MESSAGES/kscd.mo
-share/locale/et/LC_MESSAGES/kmedia.mo
-share/locale/et/LC_MESSAGES/kmid.mo
-share/locale/et/LC_MESSAGES/kmidi.mo
-share/locale/et/LC_MESSAGES/kmix.mo
-share/locale/et/LC_MESSAGES/kscd.mo
-share/locale/fi/LC_MESSAGES/kmedia.mo
-share/locale/fi/LC_MESSAGES/kmid.mo
-share/locale/fi/LC_MESSAGES/kmix.mo
-share/locale/fi/LC_MESSAGES/kscd.mo
-share/locale/fr/LC_MESSAGES/kmedia.mo
-share/locale/fr/LC_MESSAGES/kmid.mo
-share/locale/fr/LC_MESSAGES/kmidi.mo
-share/locale/fr/LC_MESSAGES/kmix.mo
-share/locale/fr/LC_MESSAGES/kscd.mo
-share/locale/hr/LC_MESSAGES/kmedia.mo
-share/locale/hr/LC_MESSAGES/kmid.mo
-share/locale/hr/LC_MESSAGES/kmix.mo
-share/locale/hr/LC_MESSAGES/kscd.mo
-share/locale/hu/LC_MESSAGES/kmid.mo
-share/locale/hu/LC_MESSAGES/kmidi.mo
-share/locale/hu/LC_MESSAGES/kmix.mo
-share/locale/hu/LC_MESSAGES/kscd.mo
-share/locale/is/LC_MESSAGES/kmedia.mo
-share/locale/is/LC_MESSAGES/kmid.mo
-share/locale/is/LC_MESSAGES/kmidi.mo
-share/locale/is/LC_MESSAGES/kmix.mo
-share/locale/is/LC_MESSAGES/kscd.mo
-share/locale/it/LC_MESSAGES/kmedia.mo
-share/locale/it/LC_MESSAGES/kmidi.mo
-share/locale/it/LC_MESSAGES/kmix.mo
-share/locale/it/LC_MESSAGES/kscd.mo
-share/locale/ja/LC_MESSAGES/kmedia.mo
-share/locale/ja/LC_MESSAGES/kmid.mo
-share/locale/ja/LC_MESSAGES/kmidi.mo
-share/locale/ja/LC_MESSAGES/kmix.mo
-share/locale/ja/LC_MESSAGES/kscd.mo
-share/locale/ko/LC_MESSAGES/kmedia.mo
-share/locale/ko/LC_MESSAGES/kmid.mo
-share/locale/ko/LC_MESSAGES/kmix.mo
-share/locale/ko/LC_MESSAGES/kscd.mo
-share/locale/nl/LC_MESSAGES/kmedia.mo
-share/locale/nl/LC_MESSAGES/kscd.mo
-share/locale/no/LC_MESSAGES/kmedia.mo
-share/locale/no/LC_MESSAGES/kmid.mo
-share/locale/no/LC_MESSAGES/kmidi.mo
-share/locale/no/LC_MESSAGES/kmix.mo
-share/locale/no/LC_MESSAGES/kscd.mo
-share/locale/pl/LC_MESSAGES/kmedia.mo
-share/locale/pl/LC_MESSAGES/kmid.mo
-share/locale/pl/LC_MESSAGES/kmidi.mo
-share/locale/pl/LC_MESSAGES/kmix.mo
-share/locale/pl/LC_MESSAGES/kscd.mo
-share/locale/pt/LC_MESSAGES/kmedia.mo
-share/locale/pt/LC_MESSAGES/kmid.mo
-share/locale/pt/LC_MESSAGES/kmix.mo
-share/locale/pt/LC_MESSAGES/kscd.mo
-share/locale/pt_BR/LC_MESSAGES/kmedia.mo
-share/locale/pt_BR/LC_MESSAGES/kmid.mo
-share/locale/pt_BR/LC_MESSAGES/kmidi.mo
-share/locale/pt_BR/LC_MESSAGES/kmix.mo
-share/locale/pt_BR/LC_MESSAGES/kscd.mo
-share/locale/ro/LC_MESSAGES/kmedia.mo
-share/locale/ro/LC_MESSAGES/kmix.mo
-share/locale/sk/LC_MESSAGES/kmedia.mo
-share/locale/sk/LC_MESSAGES/kmid.mo
-share/locale/sk/LC_MESSAGES/kmidi.mo
-share/locale/sk/LC_MESSAGES/kmix.mo
-share/locale/sk/LC_MESSAGES/kscd.mo
-share/locale/sl/LC_MESSAGES/kmedia.mo
-share/locale/sl/LC_MESSAGES/kmid.mo
-share/locale/sl/LC_MESSAGES/kmidi.mo
-share/locale/sl/LC_MESSAGES/kmix.mo
-share/locale/sl/LC_MESSAGES/kscd.mo
-share/locale/sv/LC_MESSAGES/kmedia.mo
-share/locale/sv/LC_MESSAGES/kmid.mo
-share/locale/sv/LC_MESSAGES/kmix.mo
-share/locale/sv/LC_MESSAGES/kscd.mo
-share/locale/tr/LC_MESSAGES/kmedia.mo
-share/locale/tr/LC_MESSAGES/kmid.mo
-share/locale/tr/LC_MESSAGES/kmix.mo
-share/locale/tr/LC_MESSAGES/kscd.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmedia.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmix.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kscd.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmedia.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmix.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kscd.mo
-share/mimelnk/audio/x-karaoke.kdelnk
-share/mimelnk/text/xmcd.kdelnk
-@dirrm share/doc/HTML/es/kmid
+share/doc/HTML/en/kmix/installation.html
+share/doc/HTML/en/kmix/introduction.html
+share/doc/HTML/en/kmix/keybindings.html
+share/doc/HTML/en/kmix/multiplesoundcards.html
+share/doc/HTML/en/kmix/panningslider.html
+share/doc/HTML/en/kmix/questionsandanswers.html
+share/doc/HTML/en/kmix/requirements.html
+share/doc/HTML/en/kmix/themenuentries.html
+share/doc/HTML/en/kmix/workingwithkmix.html
+share/doc/HTML/en/kscd/.anchors
+share/doc/HTML/en/kscd/about.html
+share/doc/HTML/en/kscd/cddb-editor.html
+share/doc/HTML/en/kscd/cddb-support.html
+share/doc/HTML/en/kscd/cddb-tab.html
+share/doc/HTML/en/kscd/cddb.howto
+share/doc/HTML/en/kscd/common
+share/doc/HTML/en/kscd/configuring-kscd.html
+share/doc/HTML/en/kscd/credits-and-license.html
+share/doc/HTML/en/kscd/index.docbook
+share/doc/HTML/en/kscd/index.html
+share/doc/HTML/en/kscd/installation.html
+share/doc/HTML/en/kscd/introduction.html
+share/doc/HTML/en/kscd/kscd-options-tab.html
+share/doc/HTML/en/kscd/kscd.png
+share/doc/HTML/en/kscd/kscd1.png
+share/doc/HTML/en/kscd/kscd10.png
+share/doc/HTML/en/kscd/kscd11.png
+share/doc/HTML/en/kscd/kscd12.png
+share/doc/HTML/en/kscd/kscd13.png
+share/doc/HTML/en/kscd/kscd14.png
+share/doc/HTML/en/kscd/kscd15.png
+share/doc/HTML/en/kscd/kscd16.png
+share/doc/HTML/en/kscd/kscd17.png
+share/doc/HTML/en/kscd/kscd18.png
+share/doc/HTML/en/kscd/kscd19.png
+share/doc/HTML/en/kscd/kscd2.png
+share/doc/HTML/en/kscd/kscd2a.png
+share/doc/HTML/en/kscd/kscd3.png
+share/doc/HTML/en/kscd/kscd4.png
+share/doc/HTML/en/kscd/kscd5.png
+share/doc/HTML/en/kscd/kscd6.png
+share/doc/HTML/en/kscd/kscd7.png
+share/doc/HTML/en/kscd/kscd8.png
+share/doc/HTML/en/kscd/kscd9.png
+share/doc/HTML/en/kscd/onscreen-fundamentals.html
+share/doc/HTML/en/kscd/questions-and-answers.html
+share/doc/HTML/en/kscd/smtp-options.html
+share/doc/HTML/en/kscd/using-kscd-in-the-panel.html
+share/icons/hicolor/22x22/apps/kaiman.png
+share/icons/hicolor/32x32/apps/kaiman.png
+share/icons/hicolor/32x32/apps/kmid.png
+share/icons/hicolor/32x32/apps/kmidi.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/48x48/apps/kaiman.png
+share/icons/hicolor/48x48/apps/kmid.png
+share/icons/hicolor/48x48/apps/kmidi.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/locolor/16x16/apps/aktion.png
+share/icons/locolor/16x16/apps/kaiman.png
+share/icons/locolor/16x16/apps/kmid.png
+share/icons/locolor/16x16/apps/kmidi.png
+share/icons/locolor/16x16/apps/kmix.png
+share/icons/locolor/32x32/apps/aktion.png
+share/icons/locolor/32x32/apps/kaiman.png
+share/icons/locolor/32x32/apps/kmid.png
+share/icons/locolor/32x32/apps/kmidi.png
+share/icons/locolor/32x32/apps/kmix.png
+share/mimelnk/audio/x-karaoke.desktop
+@dirrm share/mimelnk/audio
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/22x22/apps
@dirrm share/doc/HTML/en/kscd
@dirrm share/doc/HTML/en/kmix
@dirrm share/doc/HTML/en/kmidi
@dirrm share/doc/HTML/en/kmid
-@dirrm share/doc/HTML/en/kmedia
-@dirrm share/doc/HTML/de/kmidi
-@dirrm share/apps/kscd/pics
-@dirrm share/apps/kscd/cddb/soundtrack
-@dirrm share/apps/kscd/cddb/rock
-@dirrm share/apps/kscd/cddb/reggae
-@dirrm share/apps/kscd/cddb/newage
-@dirrm share/apps/kscd/cddb/misc
-@dirrm share/apps/kscd/cddb/jazz
-@dirrm share/apps/kscd/cddb/folk
-@dirrm share/apps/kscd/cddb/data
-@dirrm share/apps/kscd/cddb/country
-@dirrm share/apps/kscd/cddb/classical
-@dirrm share/apps/kscd/cddb/blues
-@dirrm share/apps/kscd/cddb
-@dirrm share/apps/kscd
+@dirrm share/doc/HTML/en/artsbuilder
+@dirrm share/config
@dirrm share/apps/kmix/pics
@dirrm share/apps/kmix
@dirrm share/apps/kmidi/pics
-@dirrm share/apps/kmidi/config/patch
-@dirrm share/apps/kmidi/config
@dirrm share/apps/kmidi
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid/pics
@dirrm share/apps/kmid/maps
+@dirrm share/apps/kmid/icons/locolor/16x16/actions
+@dirrm share/apps/kmid/icons/hicolor/32x32/actions
+@dirrm share/apps/kmid/icons/hicolor/22x22/actions
+@dirrm share/apps/kmid/icons
@dirrm share/apps/kmid/fm
@dirrm share/apps/kmid
-@dirrm share/apps/kmedia/pics
-@dirrm share/apps/kmedia
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kaiman/Skins/k9
+@dirrm share/apps/kaiman/Skins/circle
+@dirrm share/apps/kaiman/Skins/car-preset
+@dirrm share/apps/kaiman
+@dirrm share/apps/artscontrol
+@dirrm share/apps/aktion/toolbar
+@dirrm share/apps/aktion
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Multimedia
+@dirrm lib/Arts
+@dirrm lib
+@dirrm bin
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index a790c0467e1b..7edc2afde790 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,27 +1,33 @@
-# New ports collection makefile for: kdemultimedia
-# Date created: 28 October 1997
-# Whom: Stefan Eßer <se@freebsd.org>
+# New ports collection makefile for: KDE2 Multimedia
+# Date created: Saturday 2 September 2000
+# Whom: Will Andrews <will@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= kdemultimedia
-PORTVERSION= 1.1.2
-CATEGORIES= audio kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
+PORTVERSION= 1.94
+CATEGORIES= misc kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
-MAINTAINER= se@freebsd.org
+MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.3:${PORTSDIR}/x11/kdelibs11
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
+MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT= yes
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)"
-CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \
- INSTALL_SCRIPT="install -c -m 555"
+INSTALLS_SHLIB= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+ --with-qt-includes=${X11BASE}/include/qt2 \
+ --with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 745eae46729e..e1b274b524a1 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1 @@
-MD5 (kdemultimedia-1.1.2.tar.bz2) = 91018d4cad9420d376d94aba034e1bbe
+MD5 (kdemultimedia-1.94.tar.bz2) = bae3c4421e28631a0646c59e47e13b32
diff --git a/multimedia/kdemultimedia4/pkg-comment b/multimedia/kdemultimedia4/pkg-comment
index 6f31b51504cc..186230f9287d 100644
--- a/multimedia/kdemultimedia4/pkg-comment
+++ b/multimedia/kdemultimedia4/pkg-comment
@@ -1 +1 @@
-KDE audio tools
+Utilities for the KDE integrated X11 desktop
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index 34fd257b8340..9686179e2512 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -1,30 +1,162 @@
-bin/cddaslave
-bin/kmedia
+bin/aktion
+bin/artsbuilder
+bin/artscontrol
+bin/kaiman
bin/kmid
bin/kmidi
bin/kmix
-bin/kscd
-bin/kscdmagic
-bin/workman2cddb.pl
-share/applnk/Multimedia/KMedia.kdelnk
-share/applnk/Multimedia/KMidi.kdelnk
-share/applnk/Multimedia/KMix.kdelnk
-share/applnk/Multimedia/kmid.kdelnk
-share/applnk/Multimedia/kscd.kdelnk
-share/apps/kmedia/pics/eject.xbm
-share/apps/kmedia/pics/ff.xbm
-share/apps/kmedia/pics/kmedia.xpm
-share/apps/kmedia/pics/kmedia_mini.xpm
-share/apps/kmedia/pics/lock.xbm
-share/apps/kmedia/pics/logo.xbm
-share/apps/kmedia/pics/nexttrk.xbm
-share/apps/kmedia/pics/playpause.xbm
-share/apps/kmedia/pics/playpause_both.xpm
-share/apps/kmedia/pics/playpause_play.xpm
-share/apps/kmedia/pics/poweroff.xbm
-share/apps/kmedia/pics/prevtrk.xbm
-share/apps/kmedia/pics/rew.xbm
-share/apps/kmedia/pics/stop.xbm
+bin/kmixctrl
+bin/midisend
+bin/sf2cfg
+bin/timidity
+lib/Arts/StructureBuilder.mcopclass
+lib/Arts/StructureDesc.mcopclass
+lib/Arts/Synth_ENVELOPE_ADSR.mcopclass
+lib/Arts/Synth_MIDI_TEST.mcopclass
+lib/Arts/Synth_NOISE.mcopclass
+lib/Arts/Synth_SHELVE_CUTOFF.mcopclass
+lib/Arts/Synth_WAVE_TRI.mcopclass
+lib/Arts/Synth_XFADE.mcopclass
+lib/artsmodules.mcopclass
+lib/artsmodules.mcoptype
+lib/libaktion.la
+lib/libaktion.so
+lib/libaktion.so.1
+lib/libartsbuilder.la
+lib/libartsbuilder.so
+lib/libartsbuilder.so.0
+lib/libartsmodules.la
+lib/libartsmodules.so
+lib/libartsmodules.so.0
+lib/libkcm_kmix.la
+lib/libkcm_kmix.so
+lib/libkmidpart.la
+lib/libkmidpart.so
+lib/libkmidpart.so.1
+lib/libkmixapplet.la
+lib/libkmixapplet.so
+lib/libkmixapplet.so.1
+share/applnk/Multimedia/aktion.desktop
+share/applnk/Multimedia/artsbuilder.desktop
+share/applnk/Multimedia/artscontrol.desktop
+share/applnk/Multimedia/kaiman.desktop
+share/applnk/Multimedia/kmid.desktop
+share/applnk/Multimedia/kmidi.desktop
+share/applnk/Multimedia/kmix.desktop
+share/applnk/Multimedia/timidity.desktop
+share/applnk/Settings/Sound/kmix.desktop
+share/apps/aktion/aktion_part.rc
+share/apps/aktion/toolbar/ak_maximize.png
+share/apps/aktion/toolbar/ak_setup.png
+share/apps/aktion/toolbar/aktion_logo.png
+share/apps/aktion/toolbar/avanzar.png
+share/apps/aktion/toolbar/ayuda.png
+share/apps/aktion/toolbar/double.png
+share/apps/aktion/toolbar/fullscreen.png
+share/apps/aktion/toolbar/half.png
+share/apps/aktion/toolbar/original.png
+share/apps/aktion/toolbar/parar.png
+share/apps/aktion/toolbar/pause.png
+share/apps/aktion/toolbar/retroceder.png
+share/apps/aktion/toolbar/tocar.png
+share/apps/artscontrol/artscontrol.rc
+share/apps/kaiman/Skins/car-preset/btn_exit.png
+share/apps/kaiman/Skins/car-preset/btn_iconify.png
+share/apps/kaiman/Skins/car-preset/btn_list.png
+share/apps/kaiman/Skins/car-preset/btn_next.png
+share/apps/kaiman/Skins/car-preset/btn_p1.png
+share/apps/kaiman/Skins/car-preset/btn_p2.png
+share/apps/kaiman/Skins/car-preset/btn_p3.png
+share/apps/kaiman/Skins/car-preset/btn_p4.png
+share/apps/kaiman/Skins/car-preset/btn_p5.png
+share/apps/kaiman/Skins/car-preset/btn_p6.png
+share/apps/kaiman/Skins/car-preset/btn_play.png
+share/apps/kaiman/Skins/car-preset/btn_prev.png
+share/apps/kaiman/Skins/car-preset/btn_sml.png
+share/apps/kaiman/Skins/car-preset/btn_stop.png
+share/apps/kaiman/Skins/car-preset/btn_voldn.png
+share/apps/kaiman/Skins/car-preset/btn_volup.png
+share/apps/kaiman/Skins/car-preset/digbig.png
+share/apps/kaiman/Skins/car-preset/digmed.png
+share/apps/kaiman/Skins/car-preset/letters.png
+share/apps/kaiman/Skins/car-preset/main.png
+share/apps/kaiman/Skins/car-preset/monoster.png
+share/apps/kaiman/Skins/car-preset/posbar.png
+share/apps/kaiman/Skins/car-preset/random.png
+share/apps/kaiman/Skins/car-preset/repeat.png
+share/apps/kaiman/Skins/car-preset/skindata
+share/apps/kaiman/Skins/car-preset/status.png
+share/apps/kaiman/Skins/car-preset/volume.png
+share/apps/kaiman/Skins/circle/back.png
+share/apps/kaiman/Skins/circle/back_mask.png
+share/apps/kaiman/Skins/circle/back_sm.png
+share/apps/kaiman/Skins/circle/back_sm_mask.png
+share/apps/kaiman/Skins/circle/bar_pos.png
+share/apps/kaiman/Skins/circle/bar_vol.png
+share/apps/kaiman/Skins/circle/btn_exit.png
+share/apps/kaiman/Skins/circle/btn_iconify.png
+share/apps/kaiman/Skins/circle/btn_list.png
+share/apps/kaiman/Skins/circle/btn_mode.png
+share/apps/kaiman/Skins/circle/btn_next.png
+share/apps/kaiman/Skins/circle/btn_play.png
+share/apps/kaiman/Skins/circle/btn_pref.png
+share/apps/kaiman/Skins/circle/btn_prev.png
+share/apps/kaiman/Skins/circle/btn_repeat.png
+share/apps/kaiman/Skins/circle/btn_shuffle.png
+share/apps/kaiman/Skins/circle/btn_sm_exit.png
+share/apps/kaiman/Skins/circle/btn_sm_iconify.png
+share/apps/kaiman/Skins/circle/btn_sm_mode.png
+share/apps/kaiman/Skins/circle/btn_sm_next.png
+share/apps/kaiman/Skins/circle/btn_sm_play.png
+share/apps/kaiman/Skins/circle/btn_sm_prev.png
+share/apps/kaiman/Skins/circle/btn_sm_stop.png
+share/apps/kaiman/Skins/circle/btn_stop.png
+share/apps/kaiman/Skins/circle/dig.png
+share/apps/kaiman/Skins/circle/digsml.png
+share/apps/kaiman/Skins/circle/letters.png
+share/apps/kaiman/Skins/circle/skindata
+share/apps/kaiman/Skins/circle/status.png
+share/apps/kaiman/Skins/k9/README
+share/apps/kaiman/Skins/k9/conf.jpg
+share/apps/kaiman/Skins/k9/conf.png
+share/apps/kaiman/Skins/k9/eject.jpg
+share/apps/kaiman/Skins/k9/icon.jpg
+share/apps/kaiman/Skins/k9/icon.png
+share/apps/kaiman/Skins/k9/kill.jpg
+share/apps/kaiman/Skins/k9/kill.png
+share/apps/kaiman/Skins/k9/knine-nfont.jpg
+share/apps/kaiman/Skins/k9/knine-nfont.png
+share/apps/kaiman/Skins/k9/knine-nfont2.jpg
+share/apps/kaiman/Skins/k9/knine-nfont2.png
+share/apps/kaiman/Skins/k9/knine-normal2.jpg
+share/apps/kaiman/Skins/k9/knine-normal2.png
+share/apps/kaiman/Skins/k9/knine-vfont.jpg
+share/apps/kaiman/Skins/k9/knine-vfont.png
+share/apps/kaiman/Skins/k9/long2.jpg
+share/apps/kaiman/Skins/k9/mask.png
+share/apps/kaiman/Skins/k9/newtext.jpg
+share/apps/kaiman/Skins/k9/newtext.png
+share/apps/kaiman/Skins/k9/next.jpg
+share/apps/kaiman/Skins/k9/pause.jpg
+share/apps/kaiman/Skins/k9/play.jpg
+share/apps/kaiman/Skins/k9/pos_item.jpg
+share/apps/kaiman/Skins/k9/repeat.jpg
+share/apps/kaiman/Skins/k9/repeat.png
+share/apps/kaiman/Skins/k9/reverse.jpg
+share/apps/kaiman/Skins/k9/shuffle.jpg
+share/apps/kaiman/Skins/k9/shuffle.png
+share/apps/kaiman/Skins/k9/skindata
+share/apps/kaiman/Skins/k9/small-k.jpg
+share/apps/kaiman/Skins/k9/small-k.png
+share/apps/kaiman/Skins/k9/square.jpg
+share/apps/kaiman/Skins/k9/square.png
+share/apps/kaiman/Skins/k9/status.jpg
+share/apps/kaiman/Skins/k9/status.png
+share/apps/kaiman/Skins/k9/stop.jpg
+share/apps/kaiman/Skins/k9/trans-pos.png
+share/apps/kaiman/Skins/k9/trans-slide.png
+share/apps/kaiman/kaimanui.rc
+share/apps/kicker/applets/kmixapplet.desktop
share/apps/kmid/AnotherGlitchInTheCall.kar
share/apps/kmid/OFortuna.kar
share/apps/kmid/StopInTheNameOfLove.kar
@@ -33,305 +165,222 @@ share/apps/kmid/fm/drums.o3
share/apps/kmid/fm/drums.sb
share/apps/kmid/fm/std.o3
share/apps/kmid/fm/std.sb
+share/apps/kmid/icons/button1.xpm
+share/apps/kmid/icons/button2.xpm
+share/apps/kmid/icons/hicolor/22x22/actions/piano.png
+share/apps/kmid/icons/hicolor/22x22/actions/volume.png
+share/apps/kmid/icons/hicolor/32x32/actions/piano.png
+share/apps/kmid/icons/hicolor/32x32/actions/volume.png
+share/apps/kmid/icons/keyboard.xpm
+share/apps/kmid/icons/locolor/16x16/actions/piano.png
+share/apps/kmid/icons/locolor/16x16/actions/volume.png
+share/apps/kmid/kmid_partui.rc
+share/apps/kmid/kmidui.rc
share/apps/kmid/maps/YamahaPSR500.map
share/apps/kmid/maps/YamahaPSS790.map
+share/apps/kmid/maps/YamahaQY10.map
share/apps/kmid/maps/gm.map
-share/apps/kmid/pics/button1.xpm
-share/apps/kmid/pics/button2.xpm
-share/apps/kmid/pics/keyboard.xpm
-share/apps/kmid/toolbar/kmid_chn.xpm
-share/apps/kmid/toolbar/kmid_fforward.xpm
-share/apps/kmid/toolbar/kmid_frewind.xpm
-share/apps/kmid/toolbar/kmid_next.xpm
-share/apps/kmid/toolbar/kmid_pause.xpm
-share/apps/kmid/toolbar/kmid_play.xpm
-share/apps/kmid/toolbar/kmid_prev.xpm
-share/apps/kmid/toolbar/kmid_stop.xpm
-share/apps/kmid/toolbar/kmid_volume.xpm
-share/apps/kmidi/config/chaos12-voices
-share/apps/kmidi/config/chaos8-voices
-share/apps/kmidi/config/gravis.cfg
-share/apps/kmidi/config/gsdrum.cfg
-share/apps/kmidi/config/megadrum
-share/apps/kmidi/config/megainst
-share/apps/kmidi/config/midia.cfg
-share/apps/kmidi/config/mt32.cfg
-share/apps/kmidi/config/patch/acpiano.pat
-share/apps/kmidi/config/patch/nylongt2.pat
-share/apps/kmidi/config/pila-voices
-share/apps/kmidi/config/sndfont.cfg
-share/apps/kmidi/config/sound-canvas-drums
-share/apps/kmidi/config/timidity.cfg
-share/apps/kmidi/config/wowpats.cfg
-share/apps/kmidi/pics/kmidilogo.xpm
-share/apps/kmix/pics/kmixdocked.xpm
-share/apps/kmix/pics/mix_audio.xpm
-share/apps/kmix/pics/mix_bass.xpm
-share/apps/kmix/pics/mix_cd.xpm
-share/apps/kmix/pics/mix_ext.xpm
-share/apps/kmix/pics/mix_microphone.xpm
-share/apps/kmix/pics/mix_midi.xpm
-share/apps/kmix/pics/mix_recmon.xpm
-share/apps/kmix/pics/mix_treble.xpm
-share/apps/kmix/pics/mix_unknown.xpm
-share/apps/kmix/pics/mix_volume.xpm
-share/apps/kscd/pics/cdsmall.xpm
-share/apps/kscd/pics/kscdlogo.xpm
-share/doc/HTML/de/kmidi/kmidi-1.html
-share/doc/HTML/de/kmidi/kmidi-2.html
-share/doc/HTML/de/kmidi/kmidi-3.html
-share/doc/HTML/de/kmidi/kmidi-4.html
-share/doc/HTML/de/kmidi/kmidi-5.html
-share/doc/HTML/de/kmidi/kmidi.html
-share/doc/HTML/de/kmidi/kmidi.sgml
-share/doc/HTML/de/kmidi/logotp3.gif
-share/doc/HTML/en/kmedia/index-1.html
-share/doc/HTML/en/kmedia/index-2.html
-share/doc/HTML/en/kmedia/index-3.html
-share/doc/HTML/en/kmedia/index-4.html
-share/doc/HTML/en/kmedia/index-5.html
-share/doc/HTML/en/kmedia/index.html
-share/doc/HTML/en/kmedia/logotp3.gif
-share/doc/HTML/en/kmid/index-1.html
-share/doc/HTML/en/kmid/index-2.html
-share/doc/HTML/en/kmid/index-3.html
-share/doc/HTML/en/kmid/index-4.html
-share/doc/HTML/en/kmid/index-5.html
-share/doc/HTML/en/kmid/index-6.html
-share/doc/HTML/en/kmid/index-7.html
-share/doc/HTML/en/kmid/index-8.html
-share/doc/HTML/en/kmid/index-9.html
+share/apps/kmidi/Axel_Elf.mid
+share/apps/kmidi/Cavatina.mid
+share/apps/kmidi/Jarre-Chung_Kuo.mid
+share/apps/kmidi/Malaguena.mid
+share/apps/kmidi/Mission_Impossible.mid
+share/apps/kmidi/Take_The_A_Train-Seq_by_Dianne_Lewandowski.mid
+share/apps/kmidi/georgia.mid
+share/apps/kmidi/mpostman.mid
+share/apps/kmidi/pics/kmidilogo.png
+share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/kmixdocked.png
+share/apps/kmix/pics/logo.png
+share/apps/kmix/pics/mix_audio.png
+share/apps/kmix/pics/mix_bass.png
+share/apps/kmix/pics/mix_cd.png
+share/apps/kmix/pics/mix_ext.png
+share/apps/kmix/pics/mix_microphone.png
+share/apps/kmix/pics/mix_midi.png
+share/apps/kmix/pics/mix_recmon.png
+share/apps/kmix/pics/mix_surround.png
+share/apps/kmix/pics/mix_treble.png
+share/apps/kmix/pics/mix_unknown.png
+share/apps/kmix/pics/mix_video.png
+share/apps/kmix/pics/mix_volume.png
+share/config/aktionrc
+share/doc/HTML/en/artsbuilder/.anchors
+share/doc/HTML/en/artsbuilder/common
+share/doc/HTML/en/artsbuilder/index.docbook
+share/doc/HTML/en/artsbuilder/index.html
+share/doc/HTML/en/artsbuilder/insidearts.html
+share/doc/HTML/en/artsbuilder/introduction.html
+share/doc/HTML/en/artsbuilder/quickstart.html
+share/doc/HTML/en/kmid/.anchors
+share/doc/HTML/en/kmid/abouttheauthor.html
+share/doc/HTML/en/kmid/addingsongstoacollectionhowtouseautoadd.html
+share/doc/HTML/en/kmid/advancedfeatures.html
+share/doc/HTML/en/kmid/collections.html
+share/doc/HTML/en/kmid/common
+share/doc/HTML/en/kmid/compilationandinstallation.html
+share/doc/HTML/en/kmid/creatingamidimap.html
+share/doc/HTML/en/kmid/deletingacollection.html
+share/doc/HTML/en/kmid/displayinglyrics.html
+share/doc/HTML/en/kmid/doineedamidimap.html
+share/doc/HTML/en/kmid/finalnotes.html
+share/doc/HTML/en/kmid/frequentlyaskedquestionsfaq.html
+share/doc/HTML/en/kmid/generalusage.html
+share/doc/HTML/en/kmid/hallofkmidsfriends.html
+share/doc/HTML/en/kmid/index.cvlog
+share/doc/HTML/en/kmid/index.docbook
share/doc/HTML/en/kmid/index.html
-share/doc/HTML/en/kmid/logotp3.gif
-share/doc/HTML/en/kmidi/kmidi-1.html
-share/doc/HTML/en/kmidi/kmidi-2.html
-share/doc/HTML/en/kmidi/kmidi-3.html
-share/doc/HTML/en/kmidi/kmidi-4.html
-share/doc/HTML/en/kmidi/kmidi-5.html
-share/doc/HTML/en/kmidi/kmidi.html
-share/doc/HTML/en/kmidi/kmidi.nif
-share/doc/HTML/en/kmidi/kmidi.sgml
-share/doc/HTML/en/kmidi/logotp3.gif
-share/doc/HTML/en/kmix/index-1.html
-share/doc/HTML/en/kmix/index-2.html
-share/doc/HTML/en/kmix/index-3.html
-share/doc/HTML/en/kmix/index-4.html
-share/doc/HTML/en/kmix/index-5.html
-share/doc/HTML/en/kmix/index-6.html
+share/doc/HTML/en/kmid/installation.html
+share/doc/HTML/en/kmid/introduction.html
+share/doc/HTML/en/kmid/keybindings.html
+share/doc/HTML/en/kmid/midimaps.html
+share/doc/HTML/en/kmid/playinginorderoratrandom.html
+share/doc/HTML/en/kmid/playingsongs.html
+share/doc/HTML/en/kmid/removingsongsfromcollections.html
+share/doc/HTML/en/kmid/requirements.html
+share/doc/HTML/en/kmid/selectingasongfromacollection.html
+share/doc/HTML/en/kmid/thetempolcd.html
+share/doc/HTML/en/kmid/thetemporarycollection.html
+share/doc/HTML/en/kmid/usingmidimaps.html
+share/doc/HTML/en/kmidi/.anchors
+share/doc/HTML/en/kmidi/FAQ
+share/doc/HTML/en/kmidi/commandlineoptions.html
+share/doc/HTML/en/kmidi/common
+share/doc/HTML/en/kmidi/compilationandinstallation.html
+share/doc/HTML/en/kmidi/computationissues.html
+share/doc/HTML/en/kmidi/configuring.html
+share/doc/HTML/en/kmidi/copyright.html
+share/doc/HTML/en/kmidi/credits.html
+share/doc/HTML/en/kmidi/design.html
+share/doc/HTML/en/kmidi/effects.html
+share/doc/HTML/en/kmidi/index.cvlog
+share/doc/HTML/en/kmidi/index.docbook
+share/doc/HTML/en/kmidi/index.html
+share/doc/HTML/en/kmidi/installation.html
+share/doc/HTML/en/kmidi/introduction.html
+share/doc/HTML/en/kmidi/memoryissues.html
+share/doc/HTML/en/kmidi/midifilenames.html
+share/doc/HTML/en/kmidi/midiimplementation.html
+share/doc/HTML/en/kmidi/patches.html
+share/doc/HTML/en/kmidi/patchsets.html
+share/doc/HTML/en/kmidi/playlists.html
+share/doc/HTML/en/kmidi/polyphony.html
+share/doc/HTML/en/kmidi/questionsandanswers.html
+share/doc/HTML/en/kmidi/requirements.html
+share/doc/HTML/en/kmidi/synthesismodel.html
+share/doc/HTML/en/kmidi/usage.html
+share/doc/HTML/en/kmidi/volume.html
+share/doc/HTML/en/kmix/.anchors
+share/doc/HTML/en/kmix/advancedfeatures.html
+share/doc/HTML/en/kmix/commandlinearguments.html
+share/doc/HTML/en/kmix/common
+share/doc/HTML/en/kmix/compilationandinstallation.html
+share/doc/HTML/en/kmix/configurationoptions.html
+share/doc/HTML/en/kmix/help.html
+share/doc/HTML/en/kmix/index.cvlog
+share/doc/HTML/en/kmix/index.docbook
share/doc/HTML/en/kmix/index.html
-share/doc/HTML/en/kmix/logotp3.gif
-share/doc/HTML/en/kscd/kscd-1.html
-share/doc/HTML/en/kscd/kscd-2.html
-share/doc/HTML/en/kscd/kscd-3.html
-share/doc/HTML/en/kscd/kscd-4.html
-share/doc/HTML/en/kscd/kscd-5.html
-share/doc/HTML/en/kscd/kscd-6.html
-share/doc/HTML/en/kscd/kscd-7.html
-share/doc/HTML/en/kscd/kscd-8.html
-share/doc/HTML/en/kscd/kscd.html
-share/doc/HTML/en/kscd/kscd1.gif
-share/doc/HTML/en/kscd/kscd10.gif
-share/doc/HTML/en/kscd/kscd11.gif
-share/doc/HTML/en/kscd/kscd12.gif
-share/doc/HTML/en/kscd/kscd13.gif
-share/doc/HTML/en/kscd/kscd14.gif
-share/doc/HTML/en/kscd/kscd15.gif
-share/doc/HTML/en/kscd/kscd16.gif
-share/doc/HTML/en/kscd/kscd2.gif
-share/doc/HTML/en/kscd/kscd2a.gif
-share/doc/HTML/en/kscd/kscd3.gif
-share/doc/HTML/en/kscd/kscd4.gif
-share/doc/HTML/en/kscd/kscd5.gif
-share/doc/HTML/en/kscd/kscd6.gif
-share/doc/HTML/en/kscd/kscd7.gif
-share/doc/HTML/en/kscd/kscd8.gif
-share/doc/HTML/en/kscd/kscd9.gif
-share/doc/HTML/en/kscd/logotp3.gif
-share/doc/HTML/es/kmid/index-1.html
-share/doc/HTML/es/kmid/index-2.html
-share/doc/HTML/es/kmid/index-3.html
-share/doc/HTML/es/kmid/index-4.html
-share/doc/HTML/es/kmid/index-5.html
-share/doc/HTML/es/kmid/index-6.html
-share/doc/HTML/es/kmid/index-7.html
-share/doc/HTML/es/kmid/index-8.html
-share/doc/HTML/es/kmid/index-9.html
-share/doc/HTML/es/kmid/index.html
-share/doc/HTML/es/kmid/logotp3.gif
-share/icons/cd.xpm
-share/icons/kmedia.xpm
-share/icons/kmid.xpm
-share/icons/kmidi.xpm
-share/icons/kmix.xpm
-share/icons/kscd.xpm
-share/icons/large/kmedia.xpm
-share/icons/large/kmid.xpm
-share/icons/large/kmidi.xpm
-share/icons/large/kmix.xpm
-share/icons/large/kscd.xpm
-share/icons/mini/kmedia.xpm
-share/icons/mini/kmid.xpm
-share/icons/mini/kmidi.xpm
-share/icons/mini/kmix.xpm
-share/icons/mini/kscd.xpm
-share/locale/br/LC_MESSAGES/kmedia.mo
-share/locale/br/LC_MESSAGES/kmid.mo
-share/locale/br/LC_MESSAGES/kmidi.mo
-share/locale/br/LC_MESSAGES/kmix.mo
-share/locale/br/LC_MESSAGES/kscd.mo
-share/locale/ca/LC_MESSAGES/kmedia.mo
-share/locale/ca/LC_MESSAGES/kmid.mo
-share/locale/ca/LC_MESSAGES/kmidi.mo
-share/locale/ca/LC_MESSAGES/kmix.mo
-share/locale/ca/LC_MESSAGES/kscd.mo
-share/locale/cs/LC_MESSAGES/kmedia.mo
-share/locale/cs/LC_MESSAGES/kmid.mo
-share/locale/cs/LC_MESSAGES/kmidi.mo
-share/locale/cs/LC_MESSAGES/kmix.mo
-share/locale/cs/LC_MESSAGES/kscd.mo
-share/locale/da/LC_MESSAGES/kmedia.mo
-share/locale/da/LC_MESSAGES/kmid.mo
-share/locale/da/LC_MESSAGES/kmidi.mo
-share/locale/da/LC_MESSAGES/kmix.mo
-share/locale/da/LC_MESSAGES/kscd.mo
-share/locale/de/LC_MESSAGES/kmedia.mo
-share/locale/de/LC_MESSAGES/kmid.mo
-share/locale/de/LC_MESSAGES/kmidi.mo
-share/locale/de/LC_MESSAGES/kmix.mo
-share/locale/de/LC_MESSAGES/kscd.mo
-share/locale/el/LC_MESSAGES/kmedia.mo
-share/locale/el/LC_MESSAGES/kmix.mo
-share/locale/el/LC_MESSAGES/kscd.mo
-share/locale/eo/LC_MESSAGES/kmedia.mo
-share/locale/eo/LC_MESSAGES/kmid.mo
-share/locale/eo/LC_MESSAGES/kmix.mo
-share/locale/eo/LC_MESSAGES/kscd.mo
-share/locale/es/LC_MESSAGES/kmedia.mo
-share/locale/es/LC_MESSAGES/kmid.mo
-share/locale/es/LC_MESSAGES/kmix.mo
-share/locale/es/LC_MESSAGES/kscd.mo
-share/locale/et/LC_MESSAGES/kmedia.mo
-share/locale/et/LC_MESSAGES/kmid.mo
-share/locale/et/LC_MESSAGES/kmidi.mo
-share/locale/et/LC_MESSAGES/kmix.mo
-share/locale/et/LC_MESSAGES/kscd.mo
-share/locale/fi/LC_MESSAGES/kmedia.mo
-share/locale/fi/LC_MESSAGES/kmid.mo
-share/locale/fi/LC_MESSAGES/kmix.mo
-share/locale/fi/LC_MESSAGES/kscd.mo
-share/locale/fr/LC_MESSAGES/kmedia.mo
-share/locale/fr/LC_MESSAGES/kmid.mo
-share/locale/fr/LC_MESSAGES/kmidi.mo
-share/locale/fr/LC_MESSAGES/kmix.mo
-share/locale/fr/LC_MESSAGES/kscd.mo
-share/locale/hr/LC_MESSAGES/kmedia.mo
-share/locale/hr/LC_MESSAGES/kmid.mo
-share/locale/hr/LC_MESSAGES/kmix.mo
-share/locale/hr/LC_MESSAGES/kscd.mo
-share/locale/hu/LC_MESSAGES/kmid.mo
-share/locale/hu/LC_MESSAGES/kmidi.mo
-share/locale/hu/LC_MESSAGES/kmix.mo
-share/locale/hu/LC_MESSAGES/kscd.mo
-share/locale/is/LC_MESSAGES/kmedia.mo
-share/locale/is/LC_MESSAGES/kmid.mo
-share/locale/is/LC_MESSAGES/kmidi.mo
-share/locale/is/LC_MESSAGES/kmix.mo
-share/locale/is/LC_MESSAGES/kscd.mo
-share/locale/it/LC_MESSAGES/kmedia.mo
-share/locale/it/LC_MESSAGES/kmidi.mo
-share/locale/it/LC_MESSAGES/kmix.mo
-share/locale/it/LC_MESSAGES/kscd.mo
-share/locale/ja/LC_MESSAGES/kmedia.mo
-share/locale/ja/LC_MESSAGES/kmid.mo
-share/locale/ja/LC_MESSAGES/kmidi.mo
-share/locale/ja/LC_MESSAGES/kmix.mo
-share/locale/ja/LC_MESSAGES/kscd.mo
-share/locale/ko/LC_MESSAGES/kmedia.mo
-share/locale/ko/LC_MESSAGES/kmid.mo
-share/locale/ko/LC_MESSAGES/kmix.mo
-share/locale/ko/LC_MESSAGES/kscd.mo
-share/locale/nl/LC_MESSAGES/kmedia.mo
-share/locale/nl/LC_MESSAGES/kscd.mo
-share/locale/no/LC_MESSAGES/kmedia.mo
-share/locale/no/LC_MESSAGES/kmid.mo
-share/locale/no/LC_MESSAGES/kmidi.mo
-share/locale/no/LC_MESSAGES/kmix.mo
-share/locale/no/LC_MESSAGES/kscd.mo
-share/locale/pl/LC_MESSAGES/kmedia.mo
-share/locale/pl/LC_MESSAGES/kmid.mo
-share/locale/pl/LC_MESSAGES/kmidi.mo
-share/locale/pl/LC_MESSAGES/kmix.mo
-share/locale/pl/LC_MESSAGES/kscd.mo
-share/locale/pt/LC_MESSAGES/kmedia.mo
-share/locale/pt/LC_MESSAGES/kmid.mo
-share/locale/pt/LC_MESSAGES/kmix.mo
-share/locale/pt/LC_MESSAGES/kscd.mo
-share/locale/pt_BR/LC_MESSAGES/kmedia.mo
-share/locale/pt_BR/LC_MESSAGES/kmid.mo
-share/locale/pt_BR/LC_MESSAGES/kmidi.mo
-share/locale/pt_BR/LC_MESSAGES/kmix.mo
-share/locale/pt_BR/LC_MESSAGES/kscd.mo
-share/locale/ro/LC_MESSAGES/kmedia.mo
-share/locale/ro/LC_MESSAGES/kmix.mo
-share/locale/sk/LC_MESSAGES/kmedia.mo
-share/locale/sk/LC_MESSAGES/kmid.mo
-share/locale/sk/LC_MESSAGES/kmidi.mo
-share/locale/sk/LC_MESSAGES/kmix.mo
-share/locale/sk/LC_MESSAGES/kscd.mo
-share/locale/sl/LC_MESSAGES/kmedia.mo
-share/locale/sl/LC_MESSAGES/kmid.mo
-share/locale/sl/LC_MESSAGES/kmidi.mo
-share/locale/sl/LC_MESSAGES/kmix.mo
-share/locale/sl/LC_MESSAGES/kscd.mo
-share/locale/sv/LC_MESSAGES/kmedia.mo
-share/locale/sv/LC_MESSAGES/kmid.mo
-share/locale/sv/LC_MESSAGES/kmix.mo
-share/locale/sv/LC_MESSAGES/kscd.mo
-share/locale/tr/LC_MESSAGES/kmedia.mo
-share/locale/tr/LC_MESSAGES/kmid.mo
-share/locale/tr/LC_MESSAGES/kmix.mo
-share/locale/tr/LC_MESSAGES/kscd.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmedia.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmix.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kscd.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmedia.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kmix.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/kscd.mo
-share/mimelnk/audio/x-karaoke.kdelnk
-share/mimelnk/text/xmcd.kdelnk
-@dirrm share/doc/HTML/es/kmid
+share/doc/HTML/en/kmix/installation.html
+share/doc/HTML/en/kmix/introduction.html
+share/doc/HTML/en/kmix/keybindings.html
+share/doc/HTML/en/kmix/multiplesoundcards.html
+share/doc/HTML/en/kmix/panningslider.html
+share/doc/HTML/en/kmix/questionsandanswers.html
+share/doc/HTML/en/kmix/requirements.html
+share/doc/HTML/en/kmix/themenuentries.html
+share/doc/HTML/en/kmix/workingwithkmix.html
+share/doc/HTML/en/kscd/.anchors
+share/doc/HTML/en/kscd/about.html
+share/doc/HTML/en/kscd/cddb-editor.html
+share/doc/HTML/en/kscd/cddb-support.html
+share/doc/HTML/en/kscd/cddb-tab.html
+share/doc/HTML/en/kscd/cddb.howto
+share/doc/HTML/en/kscd/common
+share/doc/HTML/en/kscd/configuring-kscd.html
+share/doc/HTML/en/kscd/credits-and-license.html
+share/doc/HTML/en/kscd/index.docbook
+share/doc/HTML/en/kscd/index.html
+share/doc/HTML/en/kscd/installation.html
+share/doc/HTML/en/kscd/introduction.html
+share/doc/HTML/en/kscd/kscd-options-tab.html
+share/doc/HTML/en/kscd/kscd.png
+share/doc/HTML/en/kscd/kscd1.png
+share/doc/HTML/en/kscd/kscd10.png
+share/doc/HTML/en/kscd/kscd11.png
+share/doc/HTML/en/kscd/kscd12.png
+share/doc/HTML/en/kscd/kscd13.png
+share/doc/HTML/en/kscd/kscd14.png
+share/doc/HTML/en/kscd/kscd15.png
+share/doc/HTML/en/kscd/kscd16.png
+share/doc/HTML/en/kscd/kscd17.png
+share/doc/HTML/en/kscd/kscd18.png
+share/doc/HTML/en/kscd/kscd19.png
+share/doc/HTML/en/kscd/kscd2.png
+share/doc/HTML/en/kscd/kscd2a.png
+share/doc/HTML/en/kscd/kscd3.png
+share/doc/HTML/en/kscd/kscd4.png
+share/doc/HTML/en/kscd/kscd5.png
+share/doc/HTML/en/kscd/kscd6.png
+share/doc/HTML/en/kscd/kscd7.png
+share/doc/HTML/en/kscd/kscd8.png
+share/doc/HTML/en/kscd/kscd9.png
+share/doc/HTML/en/kscd/onscreen-fundamentals.html
+share/doc/HTML/en/kscd/questions-and-answers.html
+share/doc/HTML/en/kscd/smtp-options.html
+share/doc/HTML/en/kscd/using-kscd-in-the-panel.html
+share/icons/hicolor/22x22/apps/kaiman.png
+share/icons/hicolor/32x32/apps/kaiman.png
+share/icons/hicolor/32x32/apps/kmid.png
+share/icons/hicolor/32x32/apps/kmidi.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/48x48/apps/kaiman.png
+share/icons/hicolor/48x48/apps/kmid.png
+share/icons/hicolor/48x48/apps/kmidi.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/locolor/16x16/apps/aktion.png
+share/icons/locolor/16x16/apps/kaiman.png
+share/icons/locolor/16x16/apps/kmid.png
+share/icons/locolor/16x16/apps/kmidi.png
+share/icons/locolor/16x16/apps/kmix.png
+share/icons/locolor/32x32/apps/aktion.png
+share/icons/locolor/32x32/apps/kaiman.png
+share/icons/locolor/32x32/apps/kmid.png
+share/icons/locolor/32x32/apps/kmidi.png
+share/icons/locolor/32x32/apps/kmix.png
+share/mimelnk/audio/x-karaoke.desktop
+@dirrm share/mimelnk/audio
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/22x22/apps
@dirrm share/doc/HTML/en/kscd
@dirrm share/doc/HTML/en/kmix
@dirrm share/doc/HTML/en/kmidi
@dirrm share/doc/HTML/en/kmid
-@dirrm share/doc/HTML/en/kmedia
-@dirrm share/doc/HTML/de/kmidi
-@dirrm share/apps/kscd/pics
-@dirrm share/apps/kscd/cddb/soundtrack
-@dirrm share/apps/kscd/cddb/rock
-@dirrm share/apps/kscd/cddb/reggae
-@dirrm share/apps/kscd/cddb/newage
-@dirrm share/apps/kscd/cddb/misc
-@dirrm share/apps/kscd/cddb/jazz
-@dirrm share/apps/kscd/cddb/folk
-@dirrm share/apps/kscd/cddb/data
-@dirrm share/apps/kscd/cddb/country
-@dirrm share/apps/kscd/cddb/classical
-@dirrm share/apps/kscd/cddb/blues
-@dirrm share/apps/kscd/cddb
-@dirrm share/apps/kscd
+@dirrm share/doc/HTML/en/artsbuilder
+@dirrm share/config
@dirrm share/apps/kmix/pics
@dirrm share/apps/kmix
@dirrm share/apps/kmidi/pics
-@dirrm share/apps/kmidi/config/patch
-@dirrm share/apps/kmidi/config
@dirrm share/apps/kmidi
-@dirrm share/apps/kmid/toolbar
-@dirrm share/apps/kmid/pics
@dirrm share/apps/kmid/maps
+@dirrm share/apps/kmid/icons/locolor/16x16/actions
+@dirrm share/apps/kmid/icons/hicolor/32x32/actions
+@dirrm share/apps/kmid/icons/hicolor/22x22/actions
+@dirrm share/apps/kmid/icons
@dirrm share/apps/kmid/fm
@dirrm share/apps/kmid
-@dirrm share/apps/kmedia/pics
-@dirrm share/apps/kmedia
+@dirrm share/apps/kicker/applets
+@dirrm share/apps/kaiman/Skins/k9
+@dirrm share/apps/kaiman/Skins/circle
+@dirrm share/apps/kaiman/Skins/car-preset
+@dirrm share/apps/kaiman
+@dirrm share/apps/artscontrol
+@dirrm share/apps/aktion/toolbar
+@dirrm share/apps/aktion
+@dirrm share/applnk/Settings/Sound
+@dirrm share/applnk/Multimedia
+@dirrm lib/Arts
+@dirrm lib
+@dirrm bin
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 5fc7c4f497d5..e0fa829cfd53 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= net news kde
-MASTER_SITES= http://www.physics.purdue.edu/~will/
-MASTER_SITE_SUBDIR= will
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
@@ -34,7 +34,4 @@ USE_GMAKE= yes
pre-configure:
${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index 6a197445ce00..459042e4346b 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-20000829A.tar.bz2) = bb387eeed72e4a172e3e46719ef9e0fa
+MD5 (kdenetwork-1.94.tar.bz2) = 8c40878559ae54032d89a690c8dd738f
diff --git a/net/kdenetwork2/pkg-plist b/net/kdenetwork2/pkg-plist
index 5eefae0f4ce7..e011d3b975ba 100644
--- a/net/kdenetwork2/pkg-plist
+++ b/net/kdenetwork2/pkg-plist
@@ -2,6 +2,7 @@ bin/dsirc
bin/keystone
bin/kit
bin/kmail
+bin/knode
bin/korn
bin/kotalkd
bin/kppp
@@ -17,6 +18,7 @@ lib/ksirc.so
lib/libkcm_ktalkd.la
lib/libkcm_ktalkd.so
share/applnk/Internet/KMail.desktop
+share/applnk/Internet/KNode.desktop
share/applnk/Internet/KOrn.desktop
share/applnk/Internet/Kppp.desktop
share/applnk/Internet/keystone.desktop
@@ -54,6 +56,50 @@ 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/7.fltr
+share/apps/knode/filters/8.fltr
+share/apps/knode/filters/filters.rc
+share/apps/knode/headers.rc
+share/apps/knode/icons/hicolor/22x22/actions/message_reply.png
+share/apps/knode/icons/hicolor/22x22/actions/signature.png
+share/apps/knode/icons/hicolor/32x32/actions/message_reply.png
+share/apps/knode/icons/hicolor/32x32/actions/signature.png
+share/apps/knode/icons/locolor/16x16/actions/signature.png
+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/grpdlg.png
share/apps/kppp/Provider/Austria/.directory
share/apps/kppp/Provider/Austria/Simon%032Media
share/apps/kppp/Provider/Denmark/.directory
@@ -79,6 +125,7 @@ share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
share/apps/kppp/Provider/United_Kingdom/FreeServe
+share/apps/kppp/Rules/Argentina/Argentina_0610.rst
share/apps/kppp/Rules/Argentina/Argentina_Local.rst
share/apps/kppp/Rules/Australia/Local.rst
share/apps/kppp/Rules/Australia/Optus_Residential.rst
@@ -232,25 +279,30 @@ 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/ACN.rst
-share/apps/kppp/Rules/Sweden/Abonnera.rst
-share/apps/kppp/Rules/Sweden/Affinity-Crossnet.rst
+share/apps/kppp/Rules/Sweden/Abonnera_com.rst
share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+share/apps/kppp/Rules/Sweden/Crossnet-Affinity.rst
share/apps/kppp/Rules/Sweden/Glocalnet.rst
+share/apps/kppp/Rules/Sweden/Gts.rst
+share/apps/kppp/Rules/Sweden/Home_se.rst
share/apps/kppp/Rules/Sweden/Nemtel.rst
+share/apps/kppp/Rules/Sweden/Plusenergi.rst
share/apps/kppp/Rules/Sweden/RSLCom.rst
-share/apps/kppp/Rules/Sweden/RixTelecom.rst
+share/apps/kppp/Rules/Sweden/Rix_Telecom.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/Svensk_Telekom.rst
+share/apps/kppp/Rules/Sweden/Tele1_Europe.rst
share/apps/kppp/Rules/Sweden/Tele2.rst
share/apps/kppp/Rules/Sweden/Tele8.rst
+share/apps/kppp/Rules/Sweden/Teleman.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/Transnet.rst
+share/apps/kppp/Rules/Sweden/Universal_Telecom.rst
share/apps/kppp/Rules/Sweden/Utfors.rst
share/apps/kppp/Rules/Sweden/Vattenfall.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Internet.rst
@@ -322,103 +374,25 @@ share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
share/config/protocols/vnc.desktop
-share/doc/HTML/en/caitoo/.anchors
-share/doc/HTML/en/caitoo/addnew.html
-share/doc/HTML/en/caitoo/automation.html
-share/doc/HTML/en/caitoo/caitookeybindings.html
-share/doc/HTML/en/caitoo/caitoovskfm.html
-share/doc/HTML/en/caitoo/compilationandinstallation.html
-share/doc/HTML/en/caitoo/config.png
-share/doc/HTML/en/caitoo/copyright.html
-share/doc/HTML/en/caitoo/directories.html
-share/doc/HTML/en/caitoo/docked.png
-share/doc/HTML/en/caitoo/dockwidget.html
-share/doc/HTML/en/caitoo/droptarget.html
-share/doc/HTML/en/caitoo/index.cvlog
-share/doc/HTML/en/caitoo/index.docbook
-share/doc/HTML/en/caitoo/index.html
-share/doc/HTML/en/caitoo/individualprogressdialog.html
-share/doc/HTML/en/caitoo/installation.html
-share/doc/HTML/en/caitoo/introduction.html
-share/doc/HTML/en/caitoo/limits.html
-share/doc/HTML/en/caitoo/listbox.png
-share/doc/HTML/en/caitoo/logwindow.html
-share/doc/HTML/en/caitoo/mainmenu.html
-share/doc/HTML/en/caitoo/otherfeatures.html
-share/doc/HTML/en/caitoo/preferences.html
-share/doc/HTML/en/caitoo/progress.png
-share/doc/HTML/en/caitoo/proxy.html
-share/doc/HTML/en/caitoo/requirements.html
-share/doc/HTML/en/caitoo/rmb.png
-share/doc/HTML/en/caitoo/screenfundamentals.html
-share/doc/HTML/en/caitoo/statusbar.html
-share/doc/HTML/en/caitoo/system.html
-share/doc/HTML/en/caitoo/toolbar.html
-share/doc/HTML/en/caitoo/toolbar.png
-share/doc/HTML/en/caitoo/transferconfigdlg.html
-share/doc/HTML/en/caitoo/transfermodes.html
-share/doc/HTML/en/caitoo/workingwithcaitoo.html
-share/doc/HTML/en/columbo/.anchors
-share/doc/HTML/en/columbo/credits.html
-share/doc/HTML/en/columbo/ftp-search.html
-share/doc/HTML/en/columbo/index.docbook
-share/doc/HTML/en/columbo/index.html
-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/kbiff/.anchors
-share/doc/HTML/en/kbiff/checkmailnow.html
-share/doc/HTML/en/kbiff/clickingonyouremailaddressinaboutdoesnothing.html
-share/doc/HTML/en/kbiff/commandlineparameters.html
-share/doc/HTML/en/kbiff/compilationandinstallation.html
-share/doc/HTML/en/kbiff/doeskbiffworkwithoutsessionmanagement.html
-share/doc/HTML/en/kbiff/help.html
-share/doc/HTML/en/kbiff/howdoiuseelmormuttorpinewithkbiff.html
-share/doc/HTML/en/kbiff/howdoiusemyownpixmaps.html
-share/doc/HTML/en/kbiff/howdoiusenetscapemailwithkbiff.html
-share/doc/HTML/en/kbiff/ihavethisgreatfeatureiwantimplementedwhatsho.html
-share/doc/HTML/en/kbiff/index.cvlog
-share/doc/HTML/en/kbiff/index.docbook
-share/doc/HTML/en/kbiff/index.html
-share/doc/HTML/en/kbiff/installation.html
-share/doc/HTML/en/kbiff/introduction.html
-share/doc/HTML/en/kbiff/kbiff.png
-share/doc/HTML/en/kbiff/kbifftruncatestheinitialslashinimapmodeisthi.html
-share/doc/HTML/en/kbiff/preferencetabs.html
-share/doc/HTML/en/kbiff/questionsanswersandtips.html
-share/doc/HTML/en/kbiff/readmailnow.html
-share/doc/HTML/en/kbiff/requirements.html
-share/doc/HTML/en/kbiff/setup.html
-share/doc/HTML/en/kbiff/stopstart.html
-share/doc/HTML/en/kbiff/thepopupmenu.html
-share/doc/HTML/en/kbiff/thesetupdialog.html
-share/doc/HTML/en/kbiff/usingkbiff.html
-share/doc/HTML/en/kbiff/whatisthedifferencebetweenaprofileandamailbo.html
-share/doc/HTML/en/kbiff/wheniusekbifftomonitormymailboxallotherbiffu.html
-share/doc/HTML/en/kbiff/whywontkbiffplaymynewmailaufile.html
-share/doc/HTML/en/kfinger/.anchors
-share/doc/HTML/en/kfinger/formatex.png
-share/doc/HTML/en/kfinger/formatw.png
-share/doc/HTML/en/kfinger/index.cvlog
-share/doc/HTML/en/kfinger/index.docbook
-share/doc/HTML/en/kfinger/index.html
-share/doc/HTML/en/kfinger/introduction.html
-share/doc/HTML/en/kfinger/kfingermainwindow.html
-share/doc/HTML/en/kfinger/kfingersetup.html
-share/doc/HTML/en/kfinger/mainw.png
-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/keystone/.anchors
+share/doc/HTML/en/keystone/common
+share/doc/HTML/en/keystone/index.docbook
+share/doc/HTML/en/keystone/index.html
+share/doc/HTML/en/keystone/introduction.html
+share/doc/HTML/en/kit/.anchors
+share/doc/HTML/en/kit/common
+share/doc/HTML/en/kit/index.docbook
+share/doc/HTML/en/kit/index.html
+share/doc/HTML/en/kit/introduction.html
share/doc/HTML/en/kmail/.anchors
share/doc/HTML/en/kmail/appearancetab.html
+share/doc/HTML/en/kmail/common
share/doc/HTML/en/kmail/composertab.html
share/doc/HTML/en/kmail/copyright.html
share/doc/HTML/en/kmail/documentation.html
share/doc/HTML/en/kmail/epilogue.html
share/doc/HTML/en/kmail/faq.html
share/doc/HTML/en/kmail/filters.html
-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
@@ -439,36 +413,13 @@ share/doc/HTML/en/kmail/testingyoursetup.html
share/doc/HTML/en/kmail/theaddressbook.html
share/doc/HTML/en/kmail/thecomposerwindow.html
share/doc/HTML/en/kmail/thecomposerwindow2.html
-share/doc/HTML/en/knu/.anchors
-share/doc/HTML/en/knu/author.html
-share/doc/HTML/en/knu/configuration.html
-share/doc/HTML/en/knu/copyright.html
-share/doc/HTML/en/knu/descriptionmtr.html
-share/doc/HTML/en/knu/descriptionnslookup.html
-share/doc/HTML/en/knu/descriptionping.html
-share/doc/HTML/en/knu/descriptiontraceroute.html
-share/doc/HTML/en/knu/epilogue.html
-share/doc/HTML/en/knu/history.html
-share/doc/HTML/en/knu/index.cvlog
-share/doc/HTML/en/knu/index.docbook
-share/doc/HTML/en/knu/index.html
-share/doc/HTML/en/knu/introduction.html
-share/doc/HTML/en/knu/knu-config.png
-share/doc/HTML/en/knu/knu-finger.png
-share/doc/HTML/en/knu/knu-host.png
-share/doc/HTML/en/knu/knu-ping.png
-share/doc/HTML/en/knu/knu-traceroute.png
-share/doc/HTML/en/knu/optionsfinger.html
-share/doc/HTML/en/knu/optionsnslookup.html
-share/doc/HTML/en/knu/optionsping.html
-share/doc/HTML/en/knu/optionstraceroute.html
-share/doc/HTML/en/knu/thefingertab.html
-share/doc/HTML/en/knu/thehostresolutiontab.html
-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/knode/.anchors
+share/doc/HTML/en/knode/common
+share/doc/HTML/en/knode/index.docbook
+share/doc/HTML/en/knode/index.html
+share/doc/HTML/en/knode/introduction.html
share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/index.cvlog
+share/doc/HTML/en/korn/common
share/doc/HTML/en/korn/index.docbook
share/doc/HTML/en/korn/index.html
share/doc/HTML/en/korn/introduction.html
@@ -482,6 +433,7 @@ share/doc/HTML/en/kppp/accounting.html
share/doc/HTML/en/kppp/appendix.html
share/doc/HTML/en/kppp/autoconfigurehostname.html
share/doc/HTML/en/kppp/cb.html
+share/doc/HTML/en/kppp/common
share/doc/HTML/en/kppp/compilationandinstallation.html
share/doc/HTML/en/kppp/configuringanaccount.html
share/doc/HTML/en/kppp/costsgraphs.fig
@@ -525,6 +477,7 @@ share/doc/HTML/en/ksirc/.anchors
share/doc/HTML/en/ksirc/addingfilehandlestothemainselectloop.html
share/doc/HTML/en/ksirc/bots.html
share/doc/HTML/en/ksirc/colournumbers.html
+share/doc/HTML/en/ksirc/common
share/doc/HTML/en/ksirc/examplesfilters.html
share/doc/HTML/en/ksirc/examplessetcolors.html
share/doc/HTML/en/ksirc/filters.html
@@ -543,6 +496,7 @@ share/doc/HTML/en/ksirc/setvariables.html
share/doc/HTML/en/ksirc/timers.html
share/doc/HTML/en/ksirc/userhostrequests.html
share/doc/HTML/en/ktalkd/.anchors
+share/doc/HTML/en/ktalkd/common
share/doc/HTML/en/ktalkd/compilationandinstallation.html
share/doc/HTML/en/ktalkd/copyright.html
share/doc/HTML/en/ktalkd/howdoigetdebugoutputfromktalkd.html
@@ -556,23 +510,17 @@ share/doc/HTML/en/ktalkd/requirements.html
share/doc/HTML/en/ktalkd/supportedplatforms.html
share/doc/HTML/en/ktalkd/usage.html
share/doc/HTML/en/ktalkd/whydontiasanormaluserreceivekdeannouncements.html
-share/doc/HTML/en/pws/.anchors
-share/doc/HTML/en/pws/compilationandinstallation.html
-share/doc/HTML/en/pws/index.cvlog
-share/doc/HTML/en/pws/index.docbook
-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_get.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
+share/icons/hicolor/32x32/apps/knode.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/kit.png
share/icons/hicolor/48x48/apps/kmail.png
+share/icons/hicolor/48x48/apps/knode.png
share/icons/hicolor/48x48/apps/korn.png
share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
@@ -591,30 +539,27 @@ share/icons/locolor/16x16/actions/kit_timestamping.png
share/icons/locolor/16x16/actions/kit_warning.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/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/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
@dirrm share/doc/HTML/en/kppp
@dirrm share/doc/HTML/en/korn
-@dirrm share/doc/HTML/en/knu
+@dirrm share/doc/HTML/en/knode
@dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en/kfinger
-@dirrm share/doc/HTML/en/kbiff
-@dirrm share/doc/HTML/en/columbo
-@dirrm share/doc/HTML/en/caitoo
-@dirrm share/config/protocols
+@dirrm share/doc/HTML/en/kit
+@dirrm share/doc/HTML/en/keystone
@dirrm share/apps/ksirc/pics
@dirrm share/apps/ksirc
@dirrm share/apps/kppp/pics
@@ -656,7 +601,6 @@ share/sounds/ktalkd.wav
@dirrm share/apps/kppp/Rules/Austria/Minimum
@dirrm share/apps/kppp/Rules/Austria/Business_2
@dirrm share/apps/kppp/Rules/Austria/Business_1
-@dirrm share/apps/kppp/Rules/Austria
@dirrm share/apps/kppp/Rules/Australia
@dirrm share/apps/kppp/Rules/Argentina
@dirrm share/apps/kppp/Rules
@@ -667,7 +611,13 @@ 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/knode/toolbar
+@dirrm share/apps/knode/pics
+@dirrm share/apps/knode/icons/locolor/16x16/actions
+@dirrm share/apps/knode/icons/hicolor/32x32/actions
+@dirrm share/apps/knode/icons/hicolor/22x22/actions
+@dirrm share/apps/knode/filters
+@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
@dirrm share/apps/kit
-@dirrm share/apps/keystone
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 5fc7c4f497d5..e0fa829cfd53 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= net news kde
-MASTER_SITES= http://www.physics.purdue.edu/~will/
-MASTER_SITE_SUBDIR= will
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
@@ -34,7 +34,4 @@ USE_GMAKE= yes
pre-configure:
${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 6a197445ce00..459042e4346b 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-20000829A.tar.bz2) = bb387eeed72e4a172e3e46719ef9e0fa
+MD5 (kdenetwork-1.94.tar.bz2) = 8c40878559ae54032d89a690c8dd738f
diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist
index 5eefae0f4ce7..e011d3b975ba 100644
--- a/net/kdenetwork3/pkg-plist
+++ b/net/kdenetwork3/pkg-plist
@@ -2,6 +2,7 @@ bin/dsirc
bin/keystone
bin/kit
bin/kmail
+bin/knode
bin/korn
bin/kotalkd
bin/kppp
@@ -17,6 +18,7 @@ lib/ksirc.so
lib/libkcm_ktalkd.la
lib/libkcm_ktalkd.so
share/applnk/Internet/KMail.desktop
+share/applnk/Internet/KNode.desktop
share/applnk/Internet/KOrn.desktop
share/applnk/Internet/Kppp.desktop
share/applnk/Internet/keystone.desktop
@@ -54,6 +56,50 @@ 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/7.fltr
+share/apps/knode/filters/8.fltr
+share/apps/knode/filters/filters.rc
+share/apps/knode/headers.rc
+share/apps/knode/icons/hicolor/22x22/actions/message_reply.png
+share/apps/knode/icons/hicolor/22x22/actions/signature.png
+share/apps/knode/icons/hicolor/32x32/actions/message_reply.png
+share/apps/knode/icons/hicolor/32x32/actions/signature.png
+share/apps/knode/icons/locolor/16x16/actions/signature.png
+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/grpdlg.png
share/apps/kppp/Provider/Austria/.directory
share/apps/kppp/Provider/Austria/Simon%032Media
share/apps/kppp/Provider/Denmark/.directory
@@ -79,6 +125,7 @@ share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
share/apps/kppp/Provider/United_Kingdom/FreeServe
+share/apps/kppp/Rules/Argentina/Argentina_0610.rst
share/apps/kppp/Rules/Argentina/Argentina_Local.rst
share/apps/kppp/Rules/Australia/Local.rst
share/apps/kppp/Rules/Australia/Optus_Residential.rst
@@ -232,25 +279,30 @@ 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/ACN.rst
-share/apps/kppp/Rules/Sweden/Abonnera.rst
-share/apps/kppp/Rules/Sweden/Affinity-Crossnet.rst
+share/apps/kppp/Rules/Sweden/Abonnera_com.rst
share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+share/apps/kppp/Rules/Sweden/Crossnet-Affinity.rst
share/apps/kppp/Rules/Sweden/Glocalnet.rst
+share/apps/kppp/Rules/Sweden/Gts.rst
+share/apps/kppp/Rules/Sweden/Home_se.rst
share/apps/kppp/Rules/Sweden/Nemtel.rst
+share/apps/kppp/Rules/Sweden/Plusenergi.rst
share/apps/kppp/Rules/Sweden/RSLCom.rst
-share/apps/kppp/Rules/Sweden/RixTelecom.rst
+share/apps/kppp/Rules/Sweden/Rix_Telecom.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/Svensk_Telekom.rst
+share/apps/kppp/Rules/Sweden/Tele1_Europe.rst
share/apps/kppp/Rules/Sweden/Tele2.rst
share/apps/kppp/Rules/Sweden/Tele8.rst
+share/apps/kppp/Rules/Sweden/Teleman.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/Transnet.rst
+share/apps/kppp/Rules/Sweden/Universal_Telecom.rst
share/apps/kppp/Rules/Sweden/Utfors.rst
share/apps/kppp/Rules/Sweden/Vattenfall.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Internet.rst
@@ -322,103 +374,25 @@ share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
share/config/protocols/vnc.desktop
-share/doc/HTML/en/caitoo/.anchors
-share/doc/HTML/en/caitoo/addnew.html
-share/doc/HTML/en/caitoo/automation.html
-share/doc/HTML/en/caitoo/caitookeybindings.html
-share/doc/HTML/en/caitoo/caitoovskfm.html
-share/doc/HTML/en/caitoo/compilationandinstallation.html
-share/doc/HTML/en/caitoo/config.png
-share/doc/HTML/en/caitoo/copyright.html
-share/doc/HTML/en/caitoo/directories.html
-share/doc/HTML/en/caitoo/docked.png
-share/doc/HTML/en/caitoo/dockwidget.html
-share/doc/HTML/en/caitoo/droptarget.html
-share/doc/HTML/en/caitoo/index.cvlog
-share/doc/HTML/en/caitoo/index.docbook
-share/doc/HTML/en/caitoo/index.html
-share/doc/HTML/en/caitoo/individualprogressdialog.html
-share/doc/HTML/en/caitoo/installation.html
-share/doc/HTML/en/caitoo/introduction.html
-share/doc/HTML/en/caitoo/limits.html
-share/doc/HTML/en/caitoo/listbox.png
-share/doc/HTML/en/caitoo/logwindow.html
-share/doc/HTML/en/caitoo/mainmenu.html
-share/doc/HTML/en/caitoo/otherfeatures.html
-share/doc/HTML/en/caitoo/preferences.html
-share/doc/HTML/en/caitoo/progress.png
-share/doc/HTML/en/caitoo/proxy.html
-share/doc/HTML/en/caitoo/requirements.html
-share/doc/HTML/en/caitoo/rmb.png
-share/doc/HTML/en/caitoo/screenfundamentals.html
-share/doc/HTML/en/caitoo/statusbar.html
-share/doc/HTML/en/caitoo/system.html
-share/doc/HTML/en/caitoo/toolbar.html
-share/doc/HTML/en/caitoo/toolbar.png
-share/doc/HTML/en/caitoo/transferconfigdlg.html
-share/doc/HTML/en/caitoo/transfermodes.html
-share/doc/HTML/en/caitoo/workingwithcaitoo.html
-share/doc/HTML/en/columbo/.anchors
-share/doc/HTML/en/columbo/credits.html
-share/doc/HTML/en/columbo/ftp-search.html
-share/doc/HTML/en/columbo/index.docbook
-share/doc/HTML/en/columbo/index.html
-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/kbiff/.anchors
-share/doc/HTML/en/kbiff/checkmailnow.html
-share/doc/HTML/en/kbiff/clickingonyouremailaddressinaboutdoesnothing.html
-share/doc/HTML/en/kbiff/commandlineparameters.html
-share/doc/HTML/en/kbiff/compilationandinstallation.html
-share/doc/HTML/en/kbiff/doeskbiffworkwithoutsessionmanagement.html
-share/doc/HTML/en/kbiff/help.html
-share/doc/HTML/en/kbiff/howdoiuseelmormuttorpinewithkbiff.html
-share/doc/HTML/en/kbiff/howdoiusemyownpixmaps.html
-share/doc/HTML/en/kbiff/howdoiusenetscapemailwithkbiff.html
-share/doc/HTML/en/kbiff/ihavethisgreatfeatureiwantimplementedwhatsho.html
-share/doc/HTML/en/kbiff/index.cvlog
-share/doc/HTML/en/kbiff/index.docbook
-share/doc/HTML/en/kbiff/index.html
-share/doc/HTML/en/kbiff/installation.html
-share/doc/HTML/en/kbiff/introduction.html
-share/doc/HTML/en/kbiff/kbiff.png
-share/doc/HTML/en/kbiff/kbifftruncatestheinitialslashinimapmodeisthi.html
-share/doc/HTML/en/kbiff/preferencetabs.html
-share/doc/HTML/en/kbiff/questionsanswersandtips.html
-share/doc/HTML/en/kbiff/readmailnow.html
-share/doc/HTML/en/kbiff/requirements.html
-share/doc/HTML/en/kbiff/setup.html
-share/doc/HTML/en/kbiff/stopstart.html
-share/doc/HTML/en/kbiff/thepopupmenu.html
-share/doc/HTML/en/kbiff/thesetupdialog.html
-share/doc/HTML/en/kbiff/usingkbiff.html
-share/doc/HTML/en/kbiff/whatisthedifferencebetweenaprofileandamailbo.html
-share/doc/HTML/en/kbiff/wheniusekbifftomonitormymailboxallotherbiffu.html
-share/doc/HTML/en/kbiff/whywontkbiffplaymynewmailaufile.html
-share/doc/HTML/en/kfinger/.anchors
-share/doc/HTML/en/kfinger/formatex.png
-share/doc/HTML/en/kfinger/formatw.png
-share/doc/HTML/en/kfinger/index.cvlog
-share/doc/HTML/en/kfinger/index.docbook
-share/doc/HTML/en/kfinger/index.html
-share/doc/HTML/en/kfinger/introduction.html
-share/doc/HTML/en/kfinger/kfingermainwindow.html
-share/doc/HTML/en/kfinger/kfingersetup.html
-share/doc/HTML/en/kfinger/mainw.png
-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/keystone/.anchors
+share/doc/HTML/en/keystone/common
+share/doc/HTML/en/keystone/index.docbook
+share/doc/HTML/en/keystone/index.html
+share/doc/HTML/en/keystone/introduction.html
+share/doc/HTML/en/kit/.anchors
+share/doc/HTML/en/kit/common
+share/doc/HTML/en/kit/index.docbook
+share/doc/HTML/en/kit/index.html
+share/doc/HTML/en/kit/introduction.html
share/doc/HTML/en/kmail/.anchors
share/doc/HTML/en/kmail/appearancetab.html
+share/doc/HTML/en/kmail/common
share/doc/HTML/en/kmail/composertab.html
share/doc/HTML/en/kmail/copyright.html
share/doc/HTML/en/kmail/documentation.html
share/doc/HTML/en/kmail/epilogue.html
share/doc/HTML/en/kmail/faq.html
share/doc/HTML/en/kmail/filters.html
-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
@@ -439,36 +413,13 @@ share/doc/HTML/en/kmail/testingyoursetup.html
share/doc/HTML/en/kmail/theaddressbook.html
share/doc/HTML/en/kmail/thecomposerwindow.html
share/doc/HTML/en/kmail/thecomposerwindow2.html
-share/doc/HTML/en/knu/.anchors
-share/doc/HTML/en/knu/author.html
-share/doc/HTML/en/knu/configuration.html
-share/doc/HTML/en/knu/copyright.html
-share/doc/HTML/en/knu/descriptionmtr.html
-share/doc/HTML/en/knu/descriptionnslookup.html
-share/doc/HTML/en/knu/descriptionping.html
-share/doc/HTML/en/knu/descriptiontraceroute.html
-share/doc/HTML/en/knu/epilogue.html
-share/doc/HTML/en/knu/history.html
-share/doc/HTML/en/knu/index.cvlog
-share/doc/HTML/en/knu/index.docbook
-share/doc/HTML/en/knu/index.html
-share/doc/HTML/en/knu/introduction.html
-share/doc/HTML/en/knu/knu-config.png
-share/doc/HTML/en/knu/knu-finger.png
-share/doc/HTML/en/knu/knu-host.png
-share/doc/HTML/en/knu/knu-ping.png
-share/doc/HTML/en/knu/knu-traceroute.png
-share/doc/HTML/en/knu/optionsfinger.html
-share/doc/HTML/en/knu/optionsnslookup.html
-share/doc/HTML/en/knu/optionsping.html
-share/doc/HTML/en/knu/optionstraceroute.html
-share/doc/HTML/en/knu/thefingertab.html
-share/doc/HTML/en/knu/thehostresolutiontab.html
-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/knode/.anchors
+share/doc/HTML/en/knode/common
+share/doc/HTML/en/knode/index.docbook
+share/doc/HTML/en/knode/index.html
+share/doc/HTML/en/knode/introduction.html
share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/index.cvlog
+share/doc/HTML/en/korn/common
share/doc/HTML/en/korn/index.docbook
share/doc/HTML/en/korn/index.html
share/doc/HTML/en/korn/introduction.html
@@ -482,6 +433,7 @@ share/doc/HTML/en/kppp/accounting.html
share/doc/HTML/en/kppp/appendix.html
share/doc/HTML/en/kppp/autoconfigurehostname.html
share/doc/HTML/en/kppp/cb.html
+share/doc/HTML/en/kppp/common
share/doc/HTML/en/kppp/compilationandinstallation.html
share/doc/HTML/en/kppp/configuringanaccount.html
share/doc/HTML/en/kppp/costsgraphs.fig
@@ -525,6 +477,7 @@ share/doc/HTML/en/ksirc/.anchors
share/doc/HTML/en/ksirc/addingfilehandlestothemainselectloop.html
share/doc/HTML/en/ksirc/bots.html
share/doc/HTML/en/ksirc/colournumbers.html
+share/doc/HTML/en/ksirc/common
share/doc/HTML/en/ksirc/examplesfilters.html
share/doc/HTML/en/ksirc/examplessetcolors.html
share/doc/HTML/en/ksirc/filters.html
@@ -543,6 +496,7 @@ share/doc/HTML/en/ksirc/setvariables.html
share/doc/HTML/en/ksirc/timers.html
share/doc/HTML/en/ksirc/userhostrequests.html
share/doc/HTML/en/ktalkd/.anchors
+share/doc/HTML/en/ktalkd/common
share/doc/HTML/en/ktalkd/compilationandinstallation.html
share/doc/HTML/en/ktalkd/copyright.html
share/doc/HTML/en/ktalkd/howdoigetdebugoutputfromktalkd.html
@@ -556,23 +510,17 @@ share/doc/HTML/en/ktalkd/requirements.html
share/doc/HTML/en/ktalkd/supportedplatforms.html
share/doc/HTML/en/ktalkd/usage.html
share/doc/HTML/en/ktalkd/whydontiasanormaluserreceivekdeannouncements.html
-share/doc/HTML/en/pws/.anchors
-share/doc/HTML/en/pws/compilationandinstallation.html
-share/doc/HTML/en/pws/index.cvlog
-share/doc/HTML/en/pws/index.docbook
-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_get.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
+share/icons/hicolor/32x32/apps/knode.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/kit.png
share/icons/hicolor/48x48/apps/kmail.png
+share/icons/hicolor/48x48/apps/knode.png
share/icons/hicolor/48x48/apps/korn.png
share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
@@ -591,30 +539,27 @@ share/icons/locolor/16x16/actions/kit_timestamping.png
share/icons/locolor/16x16/actions/kit_warning.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/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/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
@dirrm share/doc/HTML/en/kppp
@dirrm share/doc/HTML/en/korn
-@dirrm share/doc/HTML/en/knu
+@dirrm share/doc/HTML/en/knode
@dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en/kfinger
-@dirrm share/doc/HTML/en/kbiff
-@dirrm share/doc/HTML/en/columbo
-@dirrm share/doc/HTML/en/caitoo
-@dirrm share/config/protocols
+@dirrm share/doc/HTML/en/kit
+@dirrm share/doc/HTML/en/keystone
@dirrm share/apps/ksirc/pics
@dirrm share/apps/ksirc
@dirrm share/apps/kppp/pics
@@ -656,7 +601,6 @@ share/sounds/ktalkd.wav
@dirrm share/apps/kppp/Rules/Austria/Minimum
@dirrm share/apps/kppp/Rules/Austria/Business_2
@dirrm share/apps/kppp/Rules/Austria/Business_1
-@dirrm share/apps/kppp/Rules/Austria
@dirrm share/apps/kppp/Rules/Australia
@dirrm share/apps/kppp/Rules/Argentina
@dirrm share/apps/kppp/Rules
@@ -667,7 +611,13 @@ 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/knode/toolbar
+@dirrm share/apps/knode/pics
+@dirrm share/apps/knode/icons/locolor/16x16/actions
+@dirrm share/apps/knode/icons/hicolor/32x32/actions
+@dirrm share/apps/knode/icons/hicolor/22x22/actions
+@dirrm share/apps/knode/filters
+@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
@dirrm share/apps/kit
-@dirrm share/apps/keystone
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 5fc7c4f497d5..e0fa829cfd53 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= net news kde
-MASTER_SITES= http://www.physics.purdue.edu/~will/
-MASTER_SITE_SUBDIR= will
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
@@ -34,7 +34,4 @@ USE_GMAKE= yes
pre-configure:
${PERL} -pi -e "s:-lpthread:-pthread:g" ${WRKSRC}/knode/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 6a197445ce00..459042e4346b 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-20000829A.tar.bz2) = bb387eeed72e4a172e3e46719ef9e0fa
+MD5 (kdenetwork-1.94.tar.bz2) = 8c40878559ae54032d89a690c8dd738f
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index 5eefae0f4ce7..e011d3b975ba 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -2,6 +2,7 @@ bin/dsirc
bin/keystone
bin/kit
bin/kmail
+bin/knode
bin/korn
bin/kotalkd
bin/kppp
@@ -17,6 +18,7 @@ lib/ksirc.so
lib/libkcm_ktalkd.la
lib/libkcm_ktalkd.so
share/applnk/Internet/KMail.desktop
+share/applnk/Internet/KNode.desktop
share/applnk/Internet/KOrn.desktop
share/applnk/Internet/Kppp.desktop
share/applnk/Internet/keystone.desktop
@@ -54,6 +56,50 @@ 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/7.fltr
+share/apps/knode/filters/8.fltr
+share/apps/knode/filters/filters.rc
+share/apps/knode/headers.rc
+share/apps/knode/icons/hicolor/22x22/actions/message_reply.png
+share/apps/knode/icons/hicolor/22x22/actions/signature.png
+share/apps/knode/icons/hicolor/32x32/actions/message_reply.png
+share/apps/knode/icons/hicolor/32x32/actions/signature.png
+share/apps/knode/icons/locolor/16x16/actions/signature.png
+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/grpdlg.png
share/apps/kppp/Provider/Austria/.directory
share/apps/kppp/Provider/Austria/Simon%032Media
share/apps/kppp/Provider/Denmark/.directory
@@ -79,6 +125,7 @@ share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
share/apps/kppp/Provider/United_Kingdom/FreeServe
+share/apps/kppp/Rules/Argentina/Argentina_0610.rst
share/apps/kppp/Rules/Argentina/Argentina_Local.rst
share/apps/kppp/Rules/Australia/Local.rst
share/apps/kppp/Rules/Australia/Optus_Residential.rst
@@ -232,25 +279,30 @@ 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/ACN.rst
-share/apps/kppp/Rules/Sweden/Abonnera.rst
-share/apps/kppp/Rules/Sweden/Affinity-Crossnet.rst
+share/apps/kppp/Rules/Sweden/Abonnera_com.rst
share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+share/apps/kppp/Rules/Sweden/Crossnet-Affinity.rst
share/apps/kppp/Rules/Sweden/Glocalnet.rst
+share/apps/kppp/Rules/Sweden/Gts.rst
+share/apps/kppp/Rules/Sweden/Home_se.rst
share/apps/kppp/Rules/Sweden/Nemtel.rst
+share/apps/kppp/Rules/Sweden/Plusenergi.rst
share/apps/kppp/Rules/Sweden/RSLCom.rst
-share/apps/kppp/Rules/Sweden/RixTelecom.rst
+share/apps/kppp/Rules/Sweden/Rix_Telecom.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/Svensk_Telekom.rst
+share/apps/kppp/Rules/Sweden/Tele1_Europe.rst
share/apps/kppp/Rules/Sweden/Tele2.rst
share/apps/kppp/Rules/Sweden/Tele8.rst
+share/apps/kppp/Rules/Sweden/Teleman.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/Transnet.rst
+share/apps/kppp/Rules/Sweden/Universal_Telecom.rst
share/apps/kppp/Rules/Sweden/Utfors.rst
share/apps/kppp/Rules/Sweden/Vattenfall.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Internet.rst
@@ -322,103 +374,25 @@ share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
share/config/protocols/vnc.desktop
-share/doc/HTML/en/caitoo/.anchors
-share/doc/HTML/en/caitoo/addnew.html
-share/doc/HTML/en/caitoo/automation.html
-share/doc/HTML/en/caitoo/caitookeybindings.html
-share/doc/HTML/en/caitoo/caitoovskfm.html
-share/doc/HTML/en/caitoo/compilationandinstallation.html
-share/doc/HTML/en/caitoo/config.png
-share/doc/HTML/en/caitoo/copyright.html
-share/doc/HTML/en/caitoo/directories.html
-share/doc/HTML/en/caitoo/docked.png
-share/doc/HTML/en/caitoo/dockwidget.html
-share/doc/HTML/en/caitoo/droptarget.html
-share/doc/HTML/en/caitoo/index.cvlog
-share/doc/HTML/en/caitoo/index.docbook
-share/doc/HTML/en/caitoo/index.html
-share/doc/HTML/en/caitoo/individualprogressdialog.html
-share/doc/HTML/en/caitoo/installation.html
-share/doc/HTML/en/caitoo/introduction.html
-share/doc/HTML/en/caitoo/limits.html
-share/doc/HTML/en/caitoo/listbox.png
-share/doc/HTML/en/caitoo/logwindow.html
-share/doc/HTML/en/caitoo/mainmenu.html
-share/doc/HTML/en/caitoo/otherfeatures.html
-share/doc/HTML/en/caitoo/preferences.html
-share/doc/HTML/en/caitoo/progress.png
-share/doc/HTML/en/caitoo/proxy.html
-share/doc/HTML/en/caitoo/requirements.html
-share/doc/HTML/en/caitoo/rmb.png
-share/doc/HTML/en/caitoo/screenfundamentals.html
-share/doc/HTML/en/caitoo/statusbar.html
-share/doc/HTML/en/caitoo/system.html
-share/doc/HTML/en/caitoo/toolbar.html
-share/doc/HTML/en/caitoo/toolbar.png
-share/doc/HTML/en/caitoo/transferconfigdlg.html
-share/doc/HTML/en/caitoo/transfermodes.html
-share/doc/HTML/en/caitoo/workingwithcaitoo.html
-share/doc/HTML/en/columbo/.anchors
-share/doc/HTML/en/columbo/credits.html
-share/doc/HTML/en/columbo/ftp-search.html
-share/doc/HTML/en/columbo/index.docbook
-share/doc/HTML/en/columbo/index.html
-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/kbiff/.anchors
-share/doc/HTML/en/kbiff/checkmailnow.html
-share/doc/HTML/en/kbiff/clickingonyouremailaddressinaboutdoesnothing.html
-share/doc/HTML/en/kbiff/commandlineparameters.html
-share/doc/HTML/en/kbiff/compilationandinstallation.html
-share/doc/HTML/en/kbiff/doeskbiffworkwithoutsessionmanagement.html
-share/doc/HTML/en/kbiff/help.html
-share/doc/HTML/en/kbiff/howdoiuseelmormuttorpinewithkbiff.html
-share/doc/HTML/en/kbiff/howdoiusemyownpixmaps.html
-share/doc/HTML/en/kbiff/howdoiusenetscapemailwithkbiff.html
-share/doc/HTML/en/kbiff/ihavethisgreatfeatureiwantimplementedwhatsho.html
-share/doc/HTML/en/kbiff/index.cvlog
-share/doc/HTML/en/kbiff/index.docbook
-share/doc/HTML/en/kbiff/index.html
-share/doc/HTML/en/kbiff/installation.html
-share/doc/HTML/en/kbiff/introduction.html
-share/doc/HTML/en/kbiff/kbiff.png
-share/doc/HTML/en/kbiff/kbifftruncatestheinitialslashinimapmodeisthi.html
-share/doc/HTML/en/kbiff/preferencetabs.html
-share/doc/HTML/en/kbiff/questionsanswersandtips.html
-share/doc/HTML/en/kbiff/readmailnow.html
-share/doc/HTML/en/kbiff/requirements.html
-share/doc/HTML/en/kbiff/setup.html
-share/doc/HTML/en/kbiff/stopstart.html
-share/doc/HTML/en/kbiff/thepopupmenu.html
-share/doc/HTML/en/kbiff/thesetupdialog.html
-share/doc/HTML/en/kbiff/usingkbiff.html
-share/doc/HTML/en/kbiff/whatisthedifferencebetweenaprofileandamailbo.html
-share/doc/HTML/en/kbiff/wheniusekbifftomonitormymailboxallotherbiffu.html
-share/doc/HTML/en/kbiff/whywontkbiffplaymynewmailaufile.html
-share/doc/HTML/en/kfinger/.anchors
-share/doc/HTML/en/kfinger/formatex.png
-share/doc/HTML/en/kfinger/formatw.png
-share/doc/HTML/en/kfinger/index.cvlog
-share/doc/HTML/en/kfinger/index.docbook
-share/doc/HTML/en/kfinger/index.html
-share/doc/HTML/en/kfinger/introduction.html
-share/doc/HTML/en/kfinger/kfingermainwindow.html
-share/doc/HTML/en/kfinger/kfingersetup.html
-share/doc/HTML/en/kfinger/mainw.png
-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/keystone/.anchors
+share/doc/HTML/en/keystone/common
+share/doc/HTML/en/keystone/index.docbook
+share/doc/HTML/en/keystone/index.html
+share/doc/HTML/en/keystone/introduction.html
+share/doc/HTML/en/kit/.anchors
+share/doc/HTML/en/kit/common
+share/doc/HTML/en/kit/index.docbook
+share/doc/HTML/en/kit/index.html
+share/doc/HTML/en/kit/introduction.html
share/doc/HTML/en/kmail/.anchors
share/doc/HTML/en/kmail/appearancetab.html
+share/doc/HTML/en/kmail/common
share/doc/HTML/en/kmail/composertab.html
share/doc/HTML/en/kmail/copyright.html
share/doc/HTML/en/kmail/documentation.html
share/doc/HTML/en/kmail/epilogue.html
share/doc/HTML/en/kmail/faq.html
share/doc/HTML/en/kmail/filters.html
-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
@@ -439,36 +413,13 @@ share/doc/HTML/en/kmail/testingyoursetup.html
share/doc/HTML/en/kmail/theaddressbook.html
share/doc/HTML/en/kmail/thecomposerwindow.html
share/doc/HTML/en/kmail/thecomposerwindow2.html
-share/doc/HTML/en/knu/.anchors
-share/doc/HTML/en/knu/author.html
-share/doc/HTML/en/knu/configuration.html
-share/doc/HTML/en/knu/copyright.html
-share/doc/HTML/en/knu/descriptionmtr.html
-share/doc/HTML/en/knu/descriptionnslookup.html
-share/doc/HTML/en/knu/descriptionping.html
-share/doc/HTML/en/knu/descriptiontraceroute.html
-share/doc/HTML/en/knu/epilogue.html
-share/doc/HTML/en/knu/history.html
-share/doc/HTML/en/knu/index.cvlog
-share/doc/HTML/en/knu/index.docbook
-share/doc/HTML/en/knu/index.html
-share/doc/HTML/en/knu/introduction.html
-share/doc/HTML/en/knu/knu-config.png
-share/doc/HTML/en/knu/knu-finger.png
-share/doc/HTML/en/knu/knu-host.png
-share/doc/HTML/en/knu/knu-ping.png
-share/doc/HTML/en/knu/knu-traceroute.png
-share/doc/HTML/en/knu/optionsfinger.html
-share/doc/HTML/en/knu/optionsnslookup.html
-share/doc/HTML/en/knu/optionsping.html
-share/doc/HTML/en/knu/optionstraceroute.html
-share/doc/HTML/en/knu/thefingertab.html
-share/doc/HTML/en/knu/thehostresolutiontab.html
-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/knode/.anchors
+share/doc/HTML/en/knode/common
+share/doc/HTML/en/knode/index.docbook
+share/doc/HTML/en/knode/index.html
+share/doc/HTML/en/knode/introduction.html
share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/index.cvlog
+share/doc/HTML/en/korn/common
share/doc/HTML/en/korn/index.docbook
share/doc/HTML/en/korn/index.html
share/doc/HTML/en/korn/introduction.html
@@ -482,6 +433,7 @@ share/doc/HTML/en/kppp/accounting.html
share/doc/HTML/en/kppp/appendix.html
share/doc/HTML/en/kppp/autoconfigurehostname.html
share/doc/HTML/en/kppp/cb.html
+share/doc/HTML/en/kppp/common
share/doc/HTML/en/kppp/compilationandinstallation.html
share/doc/HTML/en/kppp/configuringanaccount.html
share/doc/HTML/en/kppp/costsgraphs.fig
@@ -525,6 +477,7 @@ share/doc/HTML/en/ksirc/.anchors
share/doc/HTML/en/ksirc/addingfilehandlestothemainselectloop.html
share/doc/HTML/en/ksirc/bots.html
share/doc/HTML/en/ksirc/colournumbers.html
+share/doc/HTML/en/ksirc/common
share/doc/HTML/en/ksirc/examplesfilters.html
share/doc/HTML/en/ksirc/examplessetcolors.html
share/doc/HTML/en/ksirc/filters.html
@@ -543,6 +496,7 @@ share/doc/HTML/en/ksirc/setvariables.html
share/doc/HTML/en/ksirc/timers.html
share/doc/HTML/en/ksirc/userhostrequests.html
share/doc/HTML/en/ktalkd/.anchors
+share/doc/HTML/en/ktalkd/common
share/doc/HTML/en/ktalkd/compilationandinstallation.html
share/doc/HTML/en/ktalkd/copyright.html
share/doc/HTML/en/ktalkd/howdoigetdebugoutputfromktalkd.html
@@ -556,23 +510,17 @@ share/doc/HTML/en/ktalkd/requirements.html
share/doc/HTML/en/ktalkd/supportedplatforms.html
share/doc/HTML/en/ktalkd/usage.html
share/doc/HTML/en/ktalkd/whydontiasanormaluserreceivekdeannouncements.html
-share/doc/HTML/en/pws/.anchors
-share/doc/HTML/en/pws/compilationandinstallation.html
-share/doc/HTML/en/pws/index.cvlog
-share/doc/HTML/en/pws/index.docbook
-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_get.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
+share/icons/hicolor/32x32/apps/knode.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/kit.png
share/icons/hicolor/48x48/apps/kmail.png
+share/icons/hicolor/48x48/apps/knode.png
share/icons/hicolor/48x48/apps/korn.png
share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
@@ -591,30 +539,27 @@ share/icons/locolor/16x16/actions/kit_timestamping.png
share/icons/locolor/16x16/actions/kit_warning.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/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/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
@dirrm share/doc/HTML/en/kppp
@dirrm share/doc/HTML/en/korn
-@dirrm share/doc/HTML/en/knu
+@dirrm share/doc/HTML/en/knode
@dirrm share/doc/HTML/en/kmail
-@dirrm share/doc/HTML/en/kfinger
-@dirrm share/doc/HTML/en/kbiff
-@dirrm share/doc/HTML/en/columbo
-@dirrm share/doc/HTML/en/caitoo
-@dirrm share/config/protocols
+@dirrm share/doc/HTML/en/kit
+@dirrm share/doc/HTML/en/keystone
@dirrm share/apps/ksirc/pics
@dirrm share/apps/ksirc
@dirrm share/apps/kppp/pics
@@ -656,7 +601,6 @@ share/sounds/ktalkd.wav
@dirrm share/apps/kppp/Rules/Austria/Minimum
@dirrm share/apps/kppp/Rules/Austria/Business_2
@dirrm share/apps/kppp/Rules/Austria/Business_1
-@dirrm share/apps/kppp/Rules/Austria
@dirrm share/apps/kppp/Rules/Australia
@dirrm share/apps/kppp/Rules/Argentina
@dirrm share/apps/kppp/Rules
@@ -667,7 +611,13 @@ 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/knode/toolbar
+@dirrm share/apps/knode/pics
+@dirrm share/apps/knode/icons/locolor/16x16/actions
+@dirrm share/apps/knode/icons/hicolor/32x32/actions
+@dirrm share/apps/knode/icons/hicolor/22x22/actions
+@dirrm share/apps/knode/filters
+@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
@dirrm share/apps/kit
-@dirrm share/apps/keystone
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/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/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/security/kgpg-kde4/pkg-plist
+++ b/security/kgpg-kde4/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
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/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/security/kwallet/distinfo b/security/kwallet/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/security/kwallet/pkg-plist
+++ b/security/kwallet/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
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/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/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/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
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/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/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/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
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index a0b3728b1547..8d663c89be7b 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/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/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 6694e5bc9f40..bd41c46cb806 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
+MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index 03b075385e46..b7d52a17fd29 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/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
diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index 524c36102643..dc05a67cebad 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdetoys
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11-clocks 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
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt
LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo
index 2d22339988bc..8031ef277bc5 100644
--- a/x11-clocks/kdetoys2/distinfo
+++ b/x11-clocks/kdetoys2/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-20000829A.tar.bz2) = 7947fb94b033841c1d549a4bd882dd91
+MD5 (kdetoys-1.94.tar.bz2) = 19c419b3ddc32b9d96fb5c5c625b9a55
diff --git a/x11-clocks/kdetoys2/pkg-plist b/x11-clocks/kdetoys2/pkg-plist
index 926d645b995a..c205db7359ec 100644
--- a/x11-clocks/kdetoys2/pkg-plist
+++ b/x11-clocks/kdetoys2/pkg-plist
@@ -3,6 +3,7 @@ bin/kmoon
bin/kteatime
bin/kworldwatch
lib/libkeyesapplet.la
+lib/libkeyesapplet.so
lib/libkeyesapplet.so.1
share/applnk/Toys/amor.desktop
share/applnk/Toys/kmoon.desktop
@@ -303,6 +304,7 @@ share/apps/amor/pingu/walk_r6.xpm
share/apps/amor/pingu/walk_r7.xpm
share/apps/amor/pingu/walk_r8.xpm
share/apps/amor/pingurc
+share/apps/amor/tips-default
share/apps/amor/tips-en
share/apps/amor/worm/w-a1.xpm
share/apps/amor/worm/w-a2.xpm
@@ -380,16 +382,17 @@ share/apps/kworldwatch/pics/flag-red.xpm
share/apps/kworldwatch/pics/flag-yellow.xpm
share/apps/kworldwatch/pics/photo_400.png
share/apps/kworldwatch/pics/world2.png
-share/doc/HTML/en/mouse/.anchors
-share/doc/HTML/en/mouse/compilationandinstallation.html
-share/doc/HTML/en/mouse/guide.png
-share/doc/HTML/en/mouse/howitworks.html
-share/doc/HTML/en/mouse/index.cvlog
-share/doc/HTML/en/mouse/index.docbook
-share/doc/HTML/en/mouse/index.html
-share/doc/HTML/en/mouse/installation.html
-share/doc/HTML/en/mouse/introduction.html
-share/doc/HTML/en/mouse/onscreenoperation.html
+share/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
+share/doc/HTML/en/kodo/compilationandinstallation.html
+share/doc/HTML/en/kodo/guide.png
+share/doc/HTML/en/kodo/howitworks.html
+share/doc/HTML/en/kodo/index.cvlog
+share/doc/HTML/en/kodo/index.docbook
+share/doc/HTML/en/kodo/index.html
+share/doc/HTML/en/kodo/installation.html
+share/doc/HTML/en/kodo/introduction.html
+share/doc/HTML/en/kodo/onscreenoperation.html
share/icons/hicolor/32x32/apps/amor.png
share/icons/hicolor/32x32/apps/kmoon.png
share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -401,11 +404,7 @@ share/icons/locolor/16x16/apps/kteatime.png
share/icons/locolor/16x16/apps/kworldwatch.png
share/icons/locolor/32x32/apps/kmoon.png
share/icons/locolor/32x32/apps/kworldwatch.png
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/mouse
+@dirrm share/doc/HTML/en/kodo
@dirrm share/apps/kworldwatch/pics
@dirrm share/apps/kworldwatch
@dirrm share/apps/kmoon/pics
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 524c36102643..dc05a67cebad 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdetoys
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11-clocks 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
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt
LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index 2d22339988bc..8031ef277bc5 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-20000829A.tar.bz2) = 7947fb94b033841c1d549a4bd882dd91
+MD5 (kdetoys-1.94.tar.bz2) = 19c419b3ddc32b9d96fb5c5c625b9a55
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index 926d645b995a..c205db7359ec 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -3,6 +3,7 @@ bin/kmoon
bin/kteatime
bin/kworldwatch
lib/libkeyesapplet.la
+lib/libkeyesapplet.so
lib/libkeyesapplet.so.1
share/applnk/Toys/amor.desktop
share/applnk/Toys/kmoon.desktop
@@ -303,6 +304,7 @@ share/apps/amor/pingu/walk_r6.xpm
share/apps/amor/pingu/walk_r7.xpm
share/apps/amor/pingu/walk_r8.xpm
share/apps/amor/pingurc
+share/apps/amor/tips-default
share/apps/amor/tips-en
share/apps/amor/worm/w-a1.xpm
share/apps/amor/worm/w-a2.xpm
@@ -380,16 +382,17 @@ share/apps/kworldwatch/pics/flag-red.xpm
share/apps/kworldwatch/pics/flag-yellow.xpm
share/apps/kworldwatch/pics/photo_400.png
share/apps/kworldwatch/pics/world2.png
-share/doc/HTML/en/mouse/.anchors
-share/doc/HTML/en/mouse/compilationandinstallation.html
-share/doc/HTML/en/mouse/guide.png
-share/doc/HTML/en/mouse/howitworks.html
-share/doc/HTML/en/mouse/index.cvlog
-share/doc/HTML/en/mouse/index.docbook
-share/doc/HTML/en/mouse/index.html
-share/doc/HTML/en/mouse/installation.html
-share/doc/HTML/en/mouse/introduction.html
-share/doc/HTML/en/mouse/onscreenoperation.html
+share/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
+share/doc/HTML/en/kodo/compilationandinstallation.html
+share/doc/HTML/en/kodo/guide.png
+share/doc/HTML/en/kodo/howitworks.html
+share/doc/HTML/en/kodo/index.cvlog
+share/doc/HTML/en/kodo/index.docbook
+share/doc/HTML/en/kodo/index.html
+share/doc/HTML/en/kodo/installation.html
+share/doc/HTML/en/kodo/introduction.html
+share/doc/HTML/en/kodo/onscreenoperation.html
share/icons/hicolor/32x32/apps/amor.png
share/icons/hicolor/32x32/apps/kmoon.png
share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -401,11 +404,7 @@ share/icons/locolor/16x16/apps/kteatime.png
share/icons/locolor/16x16/apps/kworldwatch.png
share/icons/locolor/32x32/apps/kmoon.png
share/icons/locolor/32x32/apps/kworldwatch.png
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/mouse
+@dirrm share/doc/HTML/en/kodo
@dirrm share/apps/kworldwatch/pics
@dirrm share/apps/kworldwatch
@dirrm share/apps/kmoon/pics
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 524c36102643..dc05a67cebad 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdetoys
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11-clocks 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
@@ -28,7 +29,4 @@ CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt
LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lgcc -lstdc++"
USE_GMAKE= yes
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index 2d22339988bc..8031ef277bc5 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-20000829A.tar.bz2) = 7947fb94b033841c1d549a4bd882dd91
+MD5 (kdetoys-1.94.tar.bz2) = 19c419b3ddc32b9d96fb5c5c625b9a55
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index 926d645b995a..c205db7359ec 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -3,6 +3,7 @@ bin/kmoon
bin/kteatime
bin/kworldwatch
lib/libkeyesapplet.la
+lib/libkeyesapplet.so
lib/libkeyesapplet.so.1
share/applnk/Toys/amor.desktop
share/applnk/Toys/kmoon.desktop
@@ -303,6 +304,7 @@ share/apps/amor/pingu/walk_r6.xpm
share/apps/amor/pingu/walk_r7.xpm
share/apps/amor/pingu/walk_r8.xpm
share/apps/amor/pingurc
+share/apps/amor/tips-default
share/apps/amor/tips-en
share/apps/amor/worm/w-a1.xpm
share/apps/amor/worm/w-a2.xpm
@@ -380,16 +382,17 @@ share/apps/kworldwatch/pics/flag-red.xpm
share/apps/kworldwatch/pics/flag-yellow.xpm
share/apps/kworldwatch/pics/photo_400.png
share/apps/kworldwatch/pics/world2.png
-share/doc/HTML/en/mouse/.anchors
-share/doc/HTML/en/mouse/compilationandinstallation.html
-share/doc/HTML/en/mouse/guide.png
-share/doc/HTML/en/mouse/howitworks.html
-share/doc/HTML/en/mouse/index.cvlog
-share/doc/HTML/en/mouse/index.docbook
-share/doc/HTML/en/mouse/index.html
-share/doc/HTML/en/mouse/installation.html
-share/doc/HTML/en/mouse/introduction.html
-share/doc/HTML/en/mouse/onscreenoperation.html
+share/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
+share/doc/HTML/en/kodo/compilationandinstallation.html
+share/doc/HTML/en/kodo/guide.png
+share/doc/HTML/en/kodo/howitworks.html
+share/doc/HTML/en/kodo/index.cvlog
+share/doc/HTML/en/kodo/index.docbook
+share/doc/HTML/en/kodo/index.html
+share/doc/HTML/en/kodo/installation.html
+share/doc/HTML/en/kodo/introduction.html
+share/doc/HTML/en/kodo/onscreenoperation.html
share/icons/hicolor/32x32/apps/amor.png
share/icons/hicolor/32x32/apps/kmoon.png
share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -401,11 +404,7 @@ share/icons/locolor/16x16/apps/kteatime.png
share/icons/locolor/16x16/apps/kworldwatch.png
share/icons/locolor/32x32/apps/kmoon.png
share/icons/locolor/32x32/apps/kworldwatch.png
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/doc/HTML/en/mouse
+@dirrm share/doc/HTML/en/kodo
@dirrm share/apps/kworldwatch/pics
@dirrm share/apps/kworldwatch
@dirrm share/apps/kmoon/pics
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index 716040c2cfa2..58ccac30db20 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kde
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
@@ -19,7 +19,9 @@ RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \
kjumpingcube:${PORTSDIR}/games/kdegames2 \
kdf:${PORTSDIR}/misc/kdeutils2 \
kword:${PORTSDIR}/editors/koffice \
- kppp:${PORTSDIR}/net/kdenetwork2
+ kppp:${PORTSDIR}/net/kdenetwork2 \
+ pixie:${PORTSDIR}/graphics/kdegraphics2 \
+ kaiman:${PORTSDIR}/audio/kdemultimedia2
NO_BUILD= yes
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 716040c2cfa2..58ccac30db20 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kde
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
@@ -19,7 +19,9 @@ RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \
kjumpingcube:${PORTSDIR}/games/kdegames2 \
kdf:${PORTSDIR}/misc/kdeutils2 \
kword:${PORTSDIR}/editors/koffice \
- kppp:${PORTSDIR}/net/kdenetwork2
+ kppp:${PORTSDIR}/net/kdenetwork2 \
+ pixie:${PORTSDIR}/graphics/kdegraphics2 \
+ kaiman:${PORTSDIR}/audio/kdemultimedia2
NO_BUILD= yes
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 3fbd30c494dc..5219b5b00274 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdebase
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 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
@@ -40,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 094815fd3937..38387e559524 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
+MD5 (kdebase-1.94.tar.bz2) = a6617df687698e4954d7011a08625ec2
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index c63b81caa6cb..3737b07b7ed0 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -134,6 +134,7 @@ lib/klegacyimport.so
lib/klipper.la
lib/klipper.so
lib/kmenuedit.la
+lib/kmenuedit.so
lib/kmenuedit.so.0
lib/konqueror.la
lib/konqueror.so
@@ -149,13 +150,10 @@ lib/kxmlrpcd.la
lib/kxmlrpcd.so
lib/libccont.a
lib/libclockapplet.la
+lib/libclockapplet.so
lib/libclockapplet.so.1
-lib/libexampleapplet.la
-lib/libexampleapplet.so.1
lib/libhtmlsearch.la
lib/libhtmlsearch.so
-lib/libkasbarapplet.la
-lib/libkasbarapplet.so.1
lib/libkcm_access.la
lib/libkcm_access.so
lib/libkcm_arts.la
@@ -168,6 +166,8 @@ lib/libkcm_clock.la
lib/libkcm_clock.so
lib/libkcm_colors.la
lib/libkcm_colors.so
+lib/libkcm_crypto.la
+lib/libkcm_crypto.so
lib/libkcm_email.la
lib/libkcm_email.so
lib/libkcm_energy.la
@@ -226,11 +226,16 @@ lib/libkcm_taskbar.la
lib/libkcm_taskbar.so
lib/libkcm_virtualdesktops.la
lib/libkcm_virtualdesktops.so
+lib/libkcm_xmlrpcd.la
+lib/libkcm_xmlrpcd.so
lib/libkhelpcenter.la
+lib/libkhelpcenter.so
lib/libkhelpcenter.so.4
lib/libkminipagerapplet.la
+lib/libkminipagerapplet.so
lib/libkminipagerapplet.so.1
lib/libkonq.la
+lib/libkonq.so
lib/libkonq.so.4
lib/libkonqdirtree.la
lib/libkonqdirtree.so
@@ -241,20 +246,27 @@ lib/libkonqlistview.so
lib/libkonsolepart.la
lib/libkonsolepart.so
lib/libkrunapplet.la
+lib/libkrunapplet.so
lib/libkrunapplet.so.1
lib/libkshorturifilter.la
+lib/libkshorturifilter.so
lib/libkshorturifilter.so.1
lib/libksystemtrayapplet.la
+lib/libksystemtrayapplet.so
lib/libksystemtrayapplet.so.1
lib/libktaskbarapplet.la
+lib/libktaskbarapplet.so
lib/libktaskbarapplet.so.1
lib/libkuriikwsfilter.la
+lib/libkuriikwsfilter.so
lib/libkuriikwsfilter.so.1
lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so
lib/libkurisearchfilter.so.1
lib/libkwinb2.la
lib/libkwinb2.so
lib/libkwindefault.la
+lib/libkwindefault.so
lib/libkwindefault.so.0
lib/libkwinkde1.la
lib/libkwinkde1.so
@@ -271,23 +283,23 @@ lib/libkwinsystem.so
lib/libkwritepart.la
lib/libkwritepart.so
lib/libquicklauncher.la
+lib/libquicklauncher.so
lib/libquicklauncher.so.1
lib/libsmb++.la
+lib/libsmb++.so
lib/libsmb++.so.0
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
share/applnk/Development/designer.desktop
-share/applnk/Editors/gvim.desktop
share/applnk/Editors/kwrite.desktop
+share/applnk/Editors/xedit.desktop
share/applnk/Games/.directory
share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
share/applnk/Help.desktop
share/applnk/Home.desktop
share/applnk/Internet/.directory
share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/netscape.desktop
share/applnk/KControl.desktop
share/applnk/Multimedia/.directory
share/applnk/Office/.directory
@@ -337,6 +349,7 @@ share/applnk/Settings/Peripherals/.directory
share/applnk/Settings/Peripherals/keyboard.desktop
share/applnk/Settings/Peripherals/mouse.desktop
share/applnk/Settings/Personalization/.directory
+share/applnk/Settings/Personalization/crypto.desktop
share/applnk/Settings/Personalization/email.desktop
share/applnk/Settings/Personalization/kcmaccess.desktop
share/applnk/Settings/Personalization/kcmlayout.desktop
@@ -359,36 +372,6 @@ share/applnk/Settings/WebBrowsing/useragent.desktop
share/applnk/System/.directory
share/applnk/System/Arrange.desktop
share/applnk/System/ScreenSavers/.directory
-share/applnk/System/ScreenSavers/Ant.desktop
-share/applnk/System/ScreenSavers/Atlantis.desktop
-share/applnk/System/ScreenSavers/Attraction.desktop
-share/applnk/System/ScreenSavers/Bouboule.desktop
-share/applnk/System/ScreenSavers/Braid.desktop
-share/applnk/System/ScreenSavers/Bubble3d.desktop
-share/applnk/System/ScreenSavers/Bubbles.desktop
-share/applnk/System/ScreenSavers/Cage.desktop
-share/applnk/System/ScreenSavers/Compass.desktop
-share/applnk/System/ScreenSavers/Coral.desktop
-share/applnk/System/ScreenSavers/Crystal.desktop
-share/applnk/System/ScreenSavers/Cynosure.desktop
-share/applnk/System/ScreenSavers/Demon.desktop
-share/applnk/System/ScreenSavers/Drift.desktop
-share/applnk/System/ScreenSavers/Fadeplot.desktop
-share/applnk/System/ScreenSavers/Flag.desktop
-share/applnk/System/ScreenSavers/Flame.desktop
-share/applnk/System/ScreenSavers/Flow.desktop
-share/applnk/System/ScreenSavers/Forest.desktop
-share/applnk/System/ScreenSavers/GLPlanet.desktop
-share/applnk/System/ScreenSavers/Galaxy.desktop
-share/applnk/System/ScreenSavers/Gears.desktop
-share/applnk/System/ScreenSavers/Goop.desktop
-share/applnk/System/ScreenSavers/Grav.desktop
-share/applnk/System/ScreenSavers/Hopalong.desktop
-share/applnk/System/ScreenSavers/Hypercube.desktop
-share/applnk/System/ScreenSavers/Ifs.desktop
-share/applnk/System/ScreenSavers/Imsmap.desktop
-share/applnk/System/ScreenSavers/Interference.desktop
-share/applnk/System/ScreenSavers/Julia.desktop
share/applnk/System/ScreenSavers/KAttration.desktop
share/applnk/System/ScreenSavers/KBanner.desktop
share/applnk/System/ScreenSavers/KBlankscreen.desktop
@@ -416,34 +399,7 @@ share/applnk/System/ScreenSavers/KSlip.desktop
share/applnk/System/ScreenSavers/KSpace.desktop
share/applnk/System/ScreenSavers/KSwarm.desktop
share/applnk/System/ScreenSavers/KVm.desktop
-share/applnk/System/ScreenSavers/Kaleidescope.desktop
-share/applnk/System/ScreenSavers/Kumppa.desktop
-share/applnk/System/ScreenSavers/LMorph.desktop
-share/applnk/System/ScreenSavers/Lament.desktop
-share/applnk/System/ScreenSavers/Laser.desktop
-share/applnk/System/ScreenSavers/Lightning.desktop
-share/applnk/System/ScreenSavers/Lissie.desktop
-share/applnk/System/ScreenSavers/Moenius.desktop
-share/applnk/System/ScreenSavers/Penrose.desktop
-share/applnk/System/ScreenSavers/Phosphor.desktop
-share/applnk/System/ScreenSavers/Pulsar.desktop
-share/applnk/System/ScreenSavers/Rubik.desktop
-share/applnk/System/ScreenSavers/Slip.desktop
-share/applnk/System/ScreenSavers/Sonar.desktop
-share/applnk/System/ScreenSavers/Sproingies.desktop
-share/applnk/System/ScreenSavers/Stairs.desktop
-share/applnk/System/ScreenSavers/Starfish.desktop
-share/applnk/System/ScreenSavers/Strange.desktop
-share/applnk/System/ScreenSavers/Superquadrics.desktop
-share/applnk/System/ScreenSavers/Swirl.desktop
-share/applnk/System/ScreenSavers/T3d.desktop
-share/applnk/System/ScreenSavers/Triangle.desktop
-share/applnk/System/ScreenSavers/Vines.desktop
share/applnk/System/ScreenSavers/Worm.desktop
-share/applnk/System/ScreenSavers/XFlame.desktop
-share/applnk/System/ScreenSavers/XJack.desktop
-share/applnk/System/ScreenSavers/XMatrix.desktop
-share/applnk/System/ScreenSavers/XPipes.desktop
share/applnk/System/kappfinder.desktop
share/applnk/System/kfmclient.desktop
share/applnk/System/klegacyimport.desktop
@@ -452,17 +408,19 @@ share/applnk/System/konquerorsu.desktop
share/applnk/System/konsole.desktop
share/applnk/System/konsolesu.desktop
share/applnk/System/ksysguard.desktop
+share/applnk/Toys/xeyes.desktop
share/applnk/Utilities/.directory
share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/kpager.desktop
share/applnk/Utilities/ktip.desktop
share/applnk/Utilities/passwd.desktop
+share/applnk/Utilities/xcalc.desktop
share/applnk/Utilities/xclipboard.desktop
share/applnk/Utilities/xclock.desktop
share/applnk/Utilities/xconsole.desktop
+share/applnk/Utilities/xload.desktop
share/applnk/Utilities/xmag.desktop
share/applnk/Utilities/xterm.desktop
-share/applnk/WordProcessing/xpdf.desktop
share/apps/clockapplet/pics/lcd.png
share/apps/drkonqi/pics/konqi.png
share/apps/drkonqi/presets/developerrc
@@ -673,10 +631,8 @@ share/apps/khelpcenter/pics/star.png
share/apps/khelpcenter/pics/star_blank.png
share/apps/khelpcenter/pics/unchecked.xpm
share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.kdelnk
+share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/exampleapplet.desktop
-share/apps/kicker/applets/kasbarapplet.desktop
share/apps/kicker/applets/kminipagerapplet.desktop
share/apps/kicker/applets/krunapplet.desktop
share/apps/kicker/applets/ksystemtrayapplet.desktop
@@ -831,7 +787,7 @@ share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
-share/apps/ksysguard/ksysguard.rc
+share/apps/ksysguard/ksysguardui.rc
share/apps/kwin/b2.desktop
share/apps/kwin/eventsrc
share/apps/kwin/kde.desktop
@@ -893,18 +849,14 @@ share/config/penroserc
share/config/rocksrc
share/config/sliprc
share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/advanced.html
-share/doc/HTML/en/kcontrol/application.html
+share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
+share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
-share/doc/HTML/en/kcontrol/browsing-files.html
-share/doc/HTML/en/kcontrol/browsing-help.html
-share/doc/HTML/en/kcontrol/browsing-neighborhood.html
-share/doc/HTML/en/kcontrol/browsing-web.html
-share/doc/HTML/en/kcontrol/browsing.html
share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
share/doc/HTML/en/kcontrol/control-center-exiting.html
share/doc/HTML/en/kcontrol/control-center-menus.html
share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -921,25 +873,22 @@ share/doc/HTML/en/kcontrol/email.html
share/doc/HTML/en/kcontrol/energy.html
share/doc/HTML/en/kcontrol/file-assoc.html
share/doc/HTML/en/kcontrol/file-manager.html
-share/doc/HTML/en/kcontrol/fonts-man.html
share/doc/HTML/en/kcontrol/fonts.html
share/doc/HTML/en/kcontrol/help-index.html
share/doc/HTML/en/kcontrol/icons.html
-share/doc/HTML/en/kcontrol/index.cvlog
+share/doc/HTML/en/kcontrol/iconstyle.html
share/doc/HTML/en/kcontrol/index.docbook
share/doc/HTML/en/kcontrol/index.html
-share/doc/HTML/en/kcontrol/info.html
share/doc/HTML/en/kcontrol/interrupts.html
share/doc/HTML/en/kcontrol/introduction.html
share/doc/HTML/en/kcontrol/ioports.html
share/doc/HTML/en/kcontrol/kbd.html
+share/doc/HTML/en/kcontrol/kblayout.html
+share/doc/HTML/en/kcontrol/kcmaccess.docbook
share/doc/HTML/en/kcontrol/kcmaction.docbook
-share/doc/HTML/en/kcontrol/kcmadv.docbook
share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
share/doc/HTML/en/kcontrol/kcmbatmon.docbook
-share/doc/HTML/en/kcontrol/kcmbell.cvlog
share/doc/HTML/en/kcontrol/kcmbell.docbook
-share/doc/HTML/en/kcontrol/kcmbell.html
share/doc/HTML/en/kcontrol/kcmblockdev.docbook
share/doc/HTML/en/kcontrol/kcmborders.docbook
share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -947,8 +896,6 @@ share/doc/HTML/en/kcontrol/kcmcookie.docbook
share/doc/HTML/en/kcontrol/kcmdatetime.docbook
share/doc/HTML/en/kcontrol/kcmdesktop.docbook
share/doc/HTML/en/kcontrol/kcmdeviceinfo.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay.cvlog
-share/doc/HTML/en/kcontrol/kcmdisplay.docbook
share/doc/HTML/en/kcontrol/kcmdmainfo.docbook
share/doc/HTML/en/kcontrol/kcmdrkonqi.docbook
share/doc/HTML/en/kcontrol/kcmebrowse.docbook
@@ -956,29 +903,17 @@ share/doc/HTML/en/kcontrol/kcmemail.docbook
share/doc/HTML/en/kcontrol/kcmenergy.docbook
share/doc/HTML/en/kcontrol/kcmfile.docbook
share/doc/HTML/en/kcontrol/kcmfileman.docbook
-share/doc/HTML/en/kcontrol/kcmfontmanager.docbook
share/doc/HTML/en/kcontrol/kcmfonts.docbook
share/doc/HTML/en/kcontrol/kcmhelpindex.docbook
share/doc/HTML/en/kcontrol/kcmicon.docbook
-share/doc/HTML/en/kcontrol/kcminput.cvlog
-share/doc/HTML/en/kcontrol/kcminput.docbook
+share/doc/HTML/en/kcontrol/kcmiconstyle.docbook
share/doc/HTML/en/kcontrol/kcmintinfo.docbook
share/doc/HTML/en/kcontrol/kcmioportinfo.docbook
share/doc/HTML/en/kcontrol/kcmkbd.docbook
+share/doc/HTML/en/kcontrol/kcmkblayout.docbook
share/doc/HTML/en/kcontrol/kcmkbrowse.docbook
-share/doc/HTML/en/kcontrol/kcmkdesu.cvlog
-share/doc/HTML/en/kcontrol/kcmkdesu.docbook
share/doc/HTML/en/kcontrol/kcmkeybind.docbook
-share/doc/HTML/en/kcontrol/kcmkeys.cvlog
share/doc/HTML/en/kcontrol/kcmkeys.docbook
-share/doc/HTML/en/kcontrol/kcmkfm.cvlog
-share/doc/HTML/en/kcontrol/kcmkfm.docbook
-share/doc/HTML/en/kcontrol/kcmkpanel.cvlog
-share/doc/HTML/en/kcontrol/kcmkpanel.docbook
-share/doc/HTML/en/kcontrol/kcmkwm.cvlog
-share/doc/HTML/en/kcontrol/kcmkwm.docbook
-share/doc/HTML/en/kcontrol/kcmlocale.cvlog
-share/doc/HTML/en/kcontrol/kcmlocale.docbook
share/doc/HTML/en/kcontrol/kcmlocate.docbook
share/doc/HTML/en/kcontrol/kcmloginmanage.docbook
share/doc/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -986,26 +921,22 @@ share/doc/HTML/en/kcontrol/kcmlowbatwarn.docbook
share/doc/HTML/en/kcontrol/kcmmemoryinfo.docbook
share/doc/HTML/en/kcontrol/kcmmouse.docbook
share/doc/HTML/en/kcontrol/kcmmousebeh.docbook
+share/doc/HTML/en/kcontrol/kcmnumbername.docbook
share/doc/HTML/en/kcontrol/kcmpanel.docbook
share/doc/HTML/en/kcontrol/kcmpartitioninfo.docbook
share/doc/HTML/en/kcontrol/kcmpasswd.docbook
share/doc/HTML/en/kcontrol/kcmpciinfo.docbook
-share/doc/HTML/en/kcontrol/kcmpcmia.docbook
+share/doc/HTML/en/kcontrol/kcmpcmcia.docbook
share/doc/HTML/en/kcontrol/kcmpowerctrl.docbook
share/doc/HTML/en/kcontrol/kcmprocinfo.docbook
share/doc/HTML/en/kcontrol/kcmproxie.docbook
-share/doc/HTML/en/kcontrol/kcmsamba.cvlog
-share/doc/HTML/en/kcontrol/kcmsamba.docbook
share/doc/HTML/en/kcontrol/kcmscnsave.docbook
share/doc/HTML/en/kcontrol/kcmscsiinfo.docbook
share/doc/HTML/en/kcontrol/kcmsmbstat.docbook
share/doc/HTML/en/kcontrol/kcmsndinfo.docbook
share/doc/HTML/en/kcontrol/kcmsndsrv.docbook
-share/doc/HTML/en/kcontrol/kcmsounds.docbook
share/doc/HTML/en/kcontrol/kcmstyle.docbook
share/doc/HTML/en/kcontrol/kcmsysnotify.docbook
-share/doc/HTML/en/kcontrol/kcmsyssound.cvlog
-share/doc/HTML/en/kcontrol/kcmsyssound.docbook
share/doc/HTML/en/kcontrol/kcmtalk.docbook
share/doc/HTML/en/kcontrol/kcmtaskbar.docbook
share/doc/HTML/en/kcontrol/kcmuseragent.docbook
@@ -1013,16 +944,7 @@ share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/konq-browsing.html
-share/doc/HTML/en/kcontrol/konqui.html
-share/doc/HTML/en/kcontrol/kthememgr.cvlog
-share/doc/HTML/en/kcontrol/kthememgr.docbook
-share/doc/HTML/en/kcontrol/kthememgr.html
share/doc/HTML/en/kcontrol/laptop.html
-share/doc/HTML/en/kcontrol/lf-desktop.html
-share/doc/HTML/en/kcontrol/lf-panel.html
-share/doc/HTML/en/kcontrol/lf-themes.html
-share/doc/HTML/en/kcontrol/lf-window-behavior.html
-share/doc/HTML/en/kcontrol/lf.html
share/doc/HTML/en/kcontrol/locale.html
share/doc/HTML/en/kcontrol/login-manager.html
share/doc/HTML/en/kcontrol/lowbatcrit.html
@@ -1032,43 +954,38 @@ share/doc/HTML/en/kcontrol/module.html
share/doc/HTML/en/kcontrol/modules.html
share/doc/HTML/en/kcontrol/mouse-behav.html
share/doc/HTML/en/kcontrol/mouse.html
-share/doc/HTML/en/kcontrol/network.html
+share/doc/HTML/en/kcontrol/numbername.html
share/doc/HTML/en/kcontrol/panel.html
share/doc/HTML/en/kcontrol/partitions.html
share/doc/HTML/en/kcontrol/passwords.html
share/doc/HTML/en/kcontrol/pci.html
-share/doc/HTML/en/kcontrol/pcmia.html
-share/doc/HTML/en/kcontrol/periph.html
-share/doc/HTML/en/kcontrol/personalize.html
-share/doc/HTML/en/kcontrol/power.html
+share/doc/HTML/en/kcontrol/pcmcia.html
share/doc/HTML/en/kcontrol/powerctrl.html
share/doc/HTML/en/kcontrol/processor.html
share/doc/HTML/en/kcontrol/proxies.html
share/doc/HTML/en/kcontrol/sambastatus.html
share/doc/HTML/en/kcontrol/screensaver.html
+share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/scsi.html
share/doc/HTML/en/kcontrol/sndserver.html
-share/doc/HTML/en/kcontrol/sound.html
share/doc/HTML/en/kcontrol/soundinfo.html
share/doc/HTML/en/kcontrol/style.html
share/doc/HTML/en/kcontrol/sys-notify.html
-share/doc/HTML/en/kcontrol/sys-sounds.html
-share/doc/HTML/en/kcontrol/system1.html
-share/doc/HTML/en/kcontrol/systemmenu.html
share/doc/HTML/en/kcontrol/talk.html
share/doc/HTML/en/kcontrol/taskbar.html
share/doc/HTML/en/kcontrol/user-agent.html
share/doc/HTML/en/kcontrol/windows-shares.html
share/doc/HTML/en/kcontrol/xserver.html
share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdebugdialog/index.html
share/doc/HTML/en/kdebugdialog/introduction.html
share/doc/HTML/en/kdesu/.anchors
share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/compiling.html
share/doc/HTML/en/kdesu/configuration.html
-share/doc/HTML/en/kdesu/index.cvlog
share/doc/HTML/en/kdesu/index.docbook
share/doc/HTML/en/kdesu/index.html
share/doc/HTML/en/kdesu/installation.html
@@ -1076,15 +993,15 @@ share/doc/HTML/en/kdesu/interface-to-su.html
share/doc/HTML/en/kdesu/internals.html
share/doc/HTML/en/kdesu/introduction.html
share/doc/HTML/en/kdesu/password-checking.html
-share/doc/HTML/en/kdesu/secpasswordkeeping.html
-share/doc/HTML/en/kdesu/usingkdesu.html
+share/doc/HTML/en/kdesu/sec-password-keeping.html
+share/doc/HTML/en/kdesu/using-kdesu.html
share/doc/HTML/en/kdm/.anchors
share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/configuring-kdm.html
share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
share/doc/HTML/en/kdm/credits.html
share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
-share/doc/HTML/en/kdm/index.cvlog
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/index.html
share/doc/HTML/en/kdm/introduction.html
@@ -1093,12 +1010,14 @@ share/doc/HTML/en/kdm/lilo.html
share/doc/HTML/en/kdm/locale.html
share/doc/HTML/en/kdm/other-information.html
share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
share/doc/HTML/en/khelpcenter/contact-developers.html
share/doc/HTML/en/khelpcenter/contact-more-information.html
share/doc/HTML/en/khelpcenter/contact-official.html
share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/faq/.anchors
+share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/index.cvlog
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
@@ -1114,10 +1033,10 @@ share/doc/HTML/en/khelpcenter/quickstart/.anchors
share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
share/doc/HTML/en/khelpcenter/quickstart/configure.html
share/doc/HTML/en/khelpcenter/quickstart/credits.html
-share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/quickstart/index.html
share/doc/HTML/en/khelpcenter/quickstart/introduction.html
@@ -1141,6 +1060,7 @@ share/doc/HTML/en/khelpcenter/userguide/activating-the-screen-saver-by-moving-yo
share/doc/HTML/en/khelpcenter/userguide/addingprograms.html
share/doc/HTML/en/khelpcenter/userguide/allaboutyourdesktop.html
share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/contacting-the-authors.html
share/doc/HTML/en/khelpcenter/userguide/contactingauthors.html
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
@@ -1204,27 +1124,64 @@ share/doc/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
share/doc/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
share/doc/HTML/en/khelpcenter/what-is-kde.html
share/doc/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/HTML/en/kikbd/.anchors
-share/doc/HTML/en/kikbd/advanced.html
-share/doc/HTML/en/kikbd/advanced.png
-share/doc/HTML/en/kikbd/authors.html
-share/doc/HTML/en/kikbd/bug-reporting.html
-share/doc/HTML/en/kikbd/config.html
-share/doc/HTML/en/kikbd/create.html
-share/doc/HTML/en/kikbd/general.html
-share/doc/HTML/en/kikbd/general.png
-share/doc/HTML/en/kikbd/index.cvlog
-share/doc/HTML/en/kikbd/index.docbook
-share/doc/HTML/en/kikbd/index.html
-share/doc/HTML/en/kikbd/installation.html
-share/doc/HTML/en/kikbd/introduction.html
-share/doc/HTML/en/kikbd/nationalkeyboard.html
-share/doc/HTML/en/kikbd/screen-saver-password-problems..html
-share/doc/HTML/en/kikbd/startup.html
-share/doc/HTML/en/kikbd/startup.png
-share/doc/HTML/en/kikbd/style.html
-share/doc/HTML/en/kikbd/style.png
-share/doc/HTML/en/kikbd/troubleshooting.html
+share/doc/HTML/en/kicker/.anchors
+share/doc/HTML/en/kicker/access_config.png
+share/doc/HTML/en/kicker/basic_icons.png
+share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
+share/doc/HTML/en/kicker/config_window.png
+share/doc/HTML/en/kicker/configuration-adding-icons.html
+share/doc/HTML/en/kicker/configuration-config-window.html
+share/doc/HTML/en/kicker/configuration.html
+share/doc/HTML/en/kicker/credits.html
+share/doc/HTML/en/kicker/drag-and-drop.html
+share/doc/HTML/en/kicker/drag_applet.png
+share/doc/HTML/en/kicker/five-minute-course.html
+share/doc/HTML/en/kicker/glossary.html
+share/doc/HTML/en/kicker/handles.png
+share/doc/HTML/en/kicker/hide_buttons.png
+share/doc/HTML/en/kicker/i_adv_editor.png
+share/doc/HTML/en/kicker/i_control_center.png
+share/doc/HTML/en/kicker/i_desktop.png
+share/doc/HTML/en/kicker/i_help.png
+share/doc/HTML/en/kicker/i_home_dir.png
+share/doc/HTML/en/kicker/i_k_button.png
+share/doc/HTML/en/kicker/i_kandalfs_tips.png
+share/doc/HTML/en/kicker/i_shell.png
+share/doc/HTML/en/kicker/i_window_list.png
+share/doc/HTML/en/kicker/index.docbook
+share/doc/HTML/en/kicker/index.html
+share/doc/HTML/en/kicker/installation.html
+share/doc/HTML/en/kicker/introduction.html
+share/doc/HTML/en/kicker/kicker-for-admins-symbolic-links.html
+share/doc/HTML/en/kicker/kicker-for-admins.html
+share/doc/HTML/en/kicker/kicker-panel-elements.html
+share/doc/HTML/en/kicker/kicker_access_size.png
+share/doc/HTML/en/kicker/kicker_add_basic.png
+share/doc/HTML/en/kicker/kicker_basic_icons.png
+share/doc/HTML/en/kicker/kicker_basic_icons_2.png
+share/doc/HTML/en/kicker/other-features.html
+share/doc/HTML/en/kicker/qb_root.png
+share/doc/HTML/en/kicker/using-kicker.html
+share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
+share/doc/HTML/en/kmenuedit/credits.html
+share/doc/HTML/en/kmenuedit/details-advanced.html
+share/doc/HTML/en/kmenuedit/glossary.html
+share/doc/HTML/en/kmenuedit/i_copy.png
+share/doc/HTML/en/kmenuedit/i_cut.png
+share/doc/HTML/en/kmenuedit/i_delete.png
+share/doc/HTML/en/kmenuedit/i_k_button.png
+share/doc/HTML/en/kmenuedit/i_new_item.png
+share/doc/HTML/en/kmenuedit/i_new_submenu.png
+share/doc/HTML/en/kmenuedit/i_paste.png
+share/doc/HTML/en/kmenuedit/icon_sets.png
+share/doc/HTML/en/kmenuedit/icons.png
+share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/introduction.html
+share/doc/HTML/en/kmenuedit/menu-reference.html
+share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
@@ -1233,6 +1190,7 @@ share/doc/HTML/en/konqueror/bubble.html
share/doc/HTML/en/konqueror/cmndline.png
share/doc/HTML/en/konqueror/commandline.html
share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
@@ -1271,12 +1229,15 @@ share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/credits.html
share/doc/HTML/en/konsole/history-option.html
share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole1.gif
+share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
share/doc/HTML/en/konsole/mousebuttons.html
share/doc/HTML/en/konsole/techref.html
@@ -1284,6 +1245,7 @@ share/doc/HTML/en/konsole/toolbar.html
share/doc/HTML/en/konsole/use-of-konsole.html
share/doc/HTML/en/konsole/vt100.gif
share/doc/HTML/en/kpager/.anchors
+share/doc/HTML/en/kpager/common
share/doc/HTML/en/kpager/compilation-and-installation.html
share/doc/HTML/en/kpager/customizingkpageradvancedfeatures.html
share/doc/HTML/en/kpager/frequentlyaskedquestionsfaq.html
@@ -1299,25 +1261,43 @@ share/doc/HTML/en/kpager/rows-mode.html
share/doc/HTML/en/kpager/the-global-desktop.html
share/doc/HTML/en/kpager/the-window-properties-menu.html
share/doc/HTML/en/kpager/workingwithkpager.html
-share/doc/HTML/en/kwm/.anchors
-share/doc/HTML/en/kwm/authors.html
-share/doc/HTML/en/kwm/commands.html
-share/doc/HTML/en/kwm/configuration.html
-share/doc/HTML/en/kwm/does-kwm-support-shaded-windows-a-la-openste.html
-share/doc/HTML/en/kwm/epilogue.html
-share/doc/HTML/en/kwm/frequentlyaskedquestions.html
-share/doc/HTML/en/kwm/index.cvlog
-share/doc/HTML/en/kwm/index.docbook
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kwm/introduction.html
-share/doc/HTML/en/kwm/is-it-possible-to-add-kde-extensions-to-othe.html
-share/doc/HTML/en/kwm/minicli.html
-share/doc/HTML/en/kwm/mouse-control.html
-share/doc/HTML/en/kwm/shortcuts.html
-share/doc/HTML/en/kwm/soundevents.html
-share/doc/HTML/en/kwm/usingemphasiskwmemphasis.html
-share/doc/HTML/en/kwm/why-can-t-i-define-new-shortcuts-for-launchi.html
-share/doc/HTML/en/kwm/why-does-kwm-look-so-much-like-windows-95.html
+share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/authors.html
+share/doc/HTML/en/ksysguard/common
+share/doc/HTML/en/ksysguard/compilationandinstallation.html
+share/doc/HTML/en/ksysguard/frequentlyaskedquestions.html
+share/doc/HTML/en/ksysguard/index.docbook
+share/doc/HTML/en/ksysguard/index.html
+share/doc/HTML/en/ksysguard/installation.html
+share/doc/HTML/en/ksysguard/introduction.html
+share/doc/HTML/en/ksysguard/licenseandwarranty.html
+share/doc/HTML/en/ksysguard/requirements.html
+share/doc/HTML/en/ksysguard/thesensorbrowser.html
+share/doc/HTML/en/ksysguard/theworkspace.html
+share/doc/HTML/en/ksysguard/usingtheksysguard.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/common
+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.docbook
+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/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
@@ -1417,10 +1397,13 @@ share/icons/hicolor/32x32/devices/3floppy_mount.png
share/icons/hicolor/32x32/devices/3floppy_unmount.png
share/icons/hicolor/32x32/devices/5floppy_mount.png
share/icons/hicolor/32x32/devices/5floppy_unmount.png
+share/icons/hicolor/32x32/devices/cdaudio_mount.png
+share/icons/hicolor/32x32/devices/cdaudio_unmount.png
share/icons/hicolor/32x32/devices/cdrom_mount.png
share/icons/hicolor/32x32/devices/cdrom_unmount.png
share/icons/hicolor/32x32/devices/cdwriter_mount.png
share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_mount.png
share/icons/hicolor/32x32/devices/dvd_unmount.png
share/icons/hicolor/32x32/devices/hdd_mount.png
share/icons/hicolor/32x32/devices/hdd_unmount.png
@@ -1505,10 +1488,13 @@ share/icons/hicolor/48x48/devices/3floppy_mount.png
share/icons/hicolor/48x48/devices/3floppy_unmount.png
share/icons/hicolor/48x48/devices/5floppy_mount.png
share/icons/hicolor/48x48/devices/5floppy_unmount.png
+share/icons/hicolor/48x48/devices/cdaudio_mount.png
+share/icons/hicolor/48x48/devices/cdaudio_unmount.png
share/icons/hicolor/48x48/devices/cdrom_mount.png
share/icons/hicolor/48x48/devices/cdrom_unmount.png
share/icons/hicolor/48x48/devices/cdwriter_mount.png
share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_mount.png
share/icons/hicolor/48x48/devices/dvd_unmount.png
share/icons/hicolor/48x48/devices/hdd_mount.png
share/icons/hicolor/48x48/devices/hdd_unmount.png
@@ -1992,6 +1978,7 @@ share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
share/services/kurisearchfilter.desktop
+share/services/kxmlrpcd.desktop
share/services/man.protocol
share/services/nfs.protocol
share/services/nntp.protocol
@@ -2053,11 +2040,13 @@ share/wallpapers/northbeach.jpg
share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
-@dirrm share/doc/HTML/en/kwm
+@dirrm share/doc/HTML/en/kwrite
+@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kpager
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kikbd
+@dirrm share/doc/HTML/en/kmenuedit
+@dirrm share/doc/HTML/en/kicker
@dirrm share/doc/HTML/en/khelpcenter/userguide
@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/faq
@@ -2072,8 +2061,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
@dirrm share/apps/ksysguard/icons/locolor/16x16
-@dirrm share/apps/ksysguard/icons/locolor
-@dirrm share/apps/ksysguard/icons
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@dirrm share/apps/ksplash
@@ -2091,25 +2078,27 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/konqiconview
@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
@dirrm share/apps/kmenuedit/icons/locolor/16x16
-@dirrm share/apps/kmenuedit/icons/locolor
@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
@dirrm share/apps/kmenuedit/icons/hicolor/32x32
@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
@dirrm share/apps/kio_info
@dirrm share/apps/kicker/tiles
@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
@dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
@dirrm share/apps/khelpcenter/pics
@dirrm share/apps/khelpcenter/en
+@dirrm share/apps/khelpcenter
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
@dirrm share/apps/kdisplay/color-schemes
@dirrm share/apps/kdisplay/app-defaults
+@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
@dirrm share/apps/kdesktop/programs
@@ -2121,6 +2110,7 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kcontrol/pics
@dirrm share/apps/kcontrol
@dirrm share/apps/kcmlocale/pics
+@dirrm share/apps/kcmlocale
@dirrm share/apps/kcminput
@dirrm share/apps/kbookmark
@dirrm share/apps/kappfinder/apps/WordProcessing
@@ -2135,6 +2125,9 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kappfinder/apps/Editors
@dirrm share/apps/kappfinder/apps/Development
@dirrm share/apps/kappfinder/apps
+@dirrm share/apps/kappfinder
@dirrm share/apps/drkonqi/presets
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
+@dirrm share/apps/clockapplet
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 3fbd30c494dc..5219b5b00274 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdebase
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 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
@@ -40,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 094815fd3937..38387e559524 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
+MD5 (kdebase-1.94.tar.bz2) = a6617df687698e4954d7011a08625ec2
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index c63b81caa6cb..3737b07b7ed0 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -134,6 +134,7 @@ lib/klegacyimport.so
lib/klipper.la
lib/klipper.so
lib/kmenuedit.la
+lib/kmenuedit.so
lib/kmenuedit.so.0
lib/konqueror.la
lib/konqueror.so
@@ -149,13 +150,10 @@ lib/kxmlrpcd.la
lib/kxmlrpcd.so
lib/libccont.a
lib/libclockapplet.la
+lib/libclockapplet.so
lib/libclockapplet.so.1
-lib/libexampleapplet.la
-lib/libexampleapplet.so.1
lib/libhtmlsearch.la
lib/libhtmlsearch.so
-lib/libkasbarapplet.la
-lib/libkasbarapplet.so.1
lib/libkcm_access.la
lib/libkcm_access.so
lib/libkcm_arts.la
@@ -168,6 +166,8 @@ lib/libkcm_clock.la
lib/libkcm_clock.so
lib/libkcm_colors.la
lib/libkcm_colors.so
+lib/libkcm_crypto.la
+lib/libkcm_crypto.so
lib/libkcm_email.la
lib/libkcm_email.so
lib/libkcm_energy.la
@@ -226,11 +226,16 @@ lib/libkcm_taskbar.la
lib/libkcm_taskbar.so
lib/libkcm_virtualdesktops.la
lib/libkcm_virtualdesktops.so
+lib/libkcm_xmlrpcd.la
+lib/libkcm_xmlrpcd.so
lib/libkhelpcenter.la
+lib/libkhelpcenter.so
lib/libkhelpcenter.so.4
lib/libkminipagerapplet.la
+lib/libkminipagerapplet.so
lib/libkminipagerapplet.so.1
lib/libkonq.la
+lib/libkonq.so
lib/libkonq.so.4
lib/libkonqdirtree.la
lib/libkonqdirtree.so
@@ -241,20 +246,27 @@ lib/libkonqlistview.so
lib/libkonsolepart.la
lib/libkonsolepart.so
lib/libkrunapplet.la
+lib/libkrunapplet.so
lib/libkrunapplet.so.1
lib/libkshorturifilter.la
+lib/libkshorturifilter.so
lib/libkshorturifilter.so.1
lib/libksystemtrayapplet.la
+lib/libksystemtrayapplet.so
lib/libksystemtrayapplet.so.1
lib/libktaskbarapplet.la
+lib/libktaskbarapplet.so
lib/libktaskbarapplet.so.1
lib/libkuriikwsfilter.la
+lib/libkuriikwsfilter.so
lib/libkuriikwsfilter.so.1
lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so
lib/libkurisearchfilter.so.1
lib/libkwinb2.la
lib/libkwinb2.so
lib/libkwindefault.la
+lib/libkwindefault.so
lib/libkwindefault.so.0
lib/libkwinkde1.la
lib/libkwinkde1.so
@@ -271,23 +283,23 @@ lib/libkwinsystem.so
lib/libkwritepart.la
lib/libkwritepart.so
lib/libquicklauncher.la
+lib/libquicklauncher.so
lib/libquicklauncher.so.1
lib/libsmb++.la
+lib/libsmb++.so
lib/libsmb++.so.0
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
share/applnk/Development/designer.desktop
-share/applnk/Editors/gvim.desktop
share/applnk/Editors/kwrite.desktop
+share/applnk/Editors/xedit.desktop
share/applnk/Games/.directory
share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
share/applnk/Help.desktop
share/applnk/Home.desktop
share/applnk/Internet/.directory
share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/netscape.desktop
share/applnk/KControl.desktop
share/applnk/Multimedia/.directory
share/applnk/Office/.directory
@@ -337,6 +349,7 @@ share/applnk/Settings/Peripherals/.directory
share/applnk/Settings/Peripherals/keyboard.desktop
share/applnk/Settings/Peripherals/mouse.desktop
share/applnk/Settings/Personalization/.directory
+share/applnk/Settings/Personalization/crypto.desktop
share/applnk/Settings/Personalization/email.desktop
share/applnk/Settings/Personalization/kcmaccess.desktop
share/applnk/Settings/Personalization/kcmlayout.desktop
@@ -359,36 +372,6 @@ share/applnk/Settings/WebBrowsing/useragent.desktop
share/applnk/System/.directory
share/applnk/System/Arrange.desktop
share/applnk/System/ScreenSavers/.directory
-share/applnk/System/ScreenSavers/Ant.desktop
-share/applnk/System/ScreenSavers/Atlantis.desktop
-share/applnk/System/ScreenSavers/Attraction.desktop
-share/applnk/System/ScreenSavers/Bouboule.desktop
-share/applnk/System/ScreenSavers/Braid.desktop
-share/applnk/System/ScreenSavers/Bubble3d.desktop
-share/applnk/System/ScreenSavers/Bubbles.desktop
-share/applnk/System/ScreenSavers/Cage.desktop
-share/applnk/System/ScreenSavers/Compass.desktop
-share/applnk/System/ScreenSavers/Coral.desktop
-share/applnk/System/ScreenSavers/Crystal.desktop
-share/applnk/System/ScreenSavers/Cynosure.desktop
-share/applnk/System/ScreenSavers/Demon.desktop
-share/applnk/System/ScreenSavers/Drift.desktop
-share/applnk/System/ScreenSavers/Fadeplot.desktop
-share/applnk/System/ScreenSavers/Flag.desktop
-share/applnk/System/ScreenSavers/Flame.desktop
-share/applnk/System/ScreenSavers/Flow.desktop
-share/applnk/System/ScreenSavers/Forest.desktop
-share/applnk/System/ScreenSavers/GLPlanet.desktop
-share/applnk/System/ScreenSavers/Galaxy.desktop
-share/applnk/System/ScreenSavers/Gears.desktop
-share/applnk/System/ScreenSavers/Goop.desktop
-share/applnk/System/ScreenSavers/Grav.desktop
-share/applnk/System/ScreenSavers/Hopalong.desktop
-share/applnk/System/ScreenSavers/Hypercube.desktop
-share/applnk/System/ScreenSavers/Ifs.desktop
-share/applnk/System/ScreenSavers/Imsmap.desktop
-share/applnk/System/ScreenSavers/Interference.desktop
-share/applnk/System/ScreenSavers/Julia.desktop
share/applnk/System/ScreenSavers/KAttration.desktop
share/applnk/System/ScreenSavers/KBanner.desktop
share/applnk/System/ScreenSavers/KBlankscreen.desktop
@@ -416,34 +399,7 @@ share/applnk/System/ScreenSavers/KSlip.desktop
share/applnk/System/ScreenSavers/KSpace.desktop
share/applnk/System/ScreenSavers/KSwarm.desktop
share/applnk/System/ScreenSavers/KVm.desktop
-share/applnk/System/ScreenSavers/Kaleidescope.desktop
-share/applnk/System/ScreenSavers/Kumppa.desktop
-share/applnk/System/ScreenSavers/LMorph.desktop
-share/applnk/System/ScreenSavers/Lament.desktop
-share/applnk/System/ScreenSavers/Laser.desktop
-share/applnk/System/ScreenSavers/Lightning.desktop
-share/applnk/System/ScreenSavers/Lissie.desktop
-share/applnk/System/ScreenSavers/Moenius.desktop
-share/applnk/System/ScreenSavers/Penrose.desktop
-share/applnk/System/ScreenSavers/Phosphor.desktop
-share/applnk/System/ScreenSavers/Pulsar.desktop
-share/applnk/System/ScreenSavers/Rubik.desktop
-share/applnk/System/ScreenSavers/Slip.desktop
-share/applnk/System/ScreenSavers/Sonar.desktop
-share/applnk/System/ScreenSavers/Sproingies.desktop
-share/applnk/System/ScreenSavers/Stairs.desktop
-share/applnk/System/ScreenSavers/Starfish.desktop
-share/applnk/System/ScreenSavers/Strange.desktop
-share/applnk/System/ScreenSavers/Superquadrics.desktop
-share/applnk/System/ScreenSavers/Swirl.desktop
-share/applnk/System/ScreenSavers/T3d.desktop
-share/applnk/System/ScreenSavers/Triangle.desktop
-share/applnk/System/ScreenSavers/Vines.desktop
share/applnk/System/ScreenSavers/Worm.desktop
-share/applnk/System/ScreenSavers/XFlame.desktop
-share/applnk/System/ScreenSavers/XJack.desktop
-share/applnk/System/ScreenSavers/XMatrix.desktop
-share/applnk/System/ScreenSavers/XPipes.desktop
share/applnk/System/kappfinder.desktop
share/applnk/System/kfmclient.desktop
share/applnk/System/klegacyimport.desktop
@@ -452,17 +408,19 @@ share/applnk/System/konquerorsu.desktop
share/applnk/System/konsole.desktop
share/applnk/System/konsolesu.desktop
share/applnk/System/ksysguard.desktop
+share/applnk/Toys/xeyes.desktop
share/applnk/Utilities/.directory
share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/kpager.desktop
share/applnk/Utilities/ktip.desktop
share/applnk/Utilities/passwd.desktop
+share/applnk/Utilities/xcalc.desktop
share/applnk/Utilities/xclipboard.desktop
share/applnk/Utilities/xclock.desktop
share/applnk/Utilities/xconsole.desktop
+share/applnk/Utilities/xload.desktop
share/applnk/Utilities/xmag.desktop
share/applnk/Utilities/xterm.desktop
-share/applnk/WordProcessing/xpdf.desktop
share/apps/clockapplet/pics/lcd.png
share/apps/drkonqi/pics/konqi.png
share/apps/drkonqi/presets/developerrc
@@ -673,10 +631,8 @@ share/apps/khelpcenter/pics/star.png
share/apps/khelpcenter/pics/star_blank.png
share/apps/khelpcenter/pics/unchecked.xpm
share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.kdelnk
+share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/exampleapplet.desktop
-share/apps/kicker/applets/kasbarapplet.desktop
share/apps/kicker/applets/kminipagerapplet.desktop
share/apps/kicker/applets/krunapplet.desktop
share/apps/kicker/applets/ksystemtrayapplet.desktop
@@ -831,7 +787,7 @@ share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
-share/apps/ksysguard/ksysguard.rc
+share/apps/ksysguard/ksysguardui.rc
share/apps/kwin/b2.desktop
share/apps/kwin/eventsrc
share/apps/kwin/kde.desktop
@@ -893,18 +849,14 @@ share/config/penroserc
share/config/rocksrc
share/config/sliprc
share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/advanced.html
-share/doc/HTML/en/kcontrol/application.html
+share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
+share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
-share/doc/HTML/en/kcontrol/browsing-files.html
-share/doc/HTML/en/kcontrol/browsing-help.html
-share/doc/HTML/en/kcontrol/browsing-neighborhood.html
-share/doc/HTML/en/kcontrol/browsing-web.html
-share/doc/HTML/en/kcontrol/browsing.html
share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
share/doc/HTML/en/kcontrol/control-center-exiting.html
share/doc/HTML/en/kcontrol/control-center-menus.html
share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -921,25 +873,22 @@ share/doc/HTML/en/kcontrol/email.html
share/doc/HTML/en/kcontrol/energy.html
share/doc/HTML/en/kcontrol/file-assoc.html
share/doc/HTML/en/kcontrol/file-manager.html
-share/doc/HTML/en/kcontrol/fonts-man.html
share/doc/HTML/en/kcontrol/fonts.html
share/doc/HTML/en/kcontrol/help-index.html
share/doc/HTML/en/kcontrol/icons.html
-share/doc/HTML/en/kcontrol/index.cvlog
+share/doc/HTML/en/kcontrol/iconstyle.html
share/doc/HTML/en/kcontrol/index.docbook
share/doc/HTML/en/kcontrol/index.html
-share/doc/HTML/en/kcontrol/info.html
share/doc/HTML/en/kcontrol/interrupts.html
share/doc/HTML/en/kcontrol/introduction.html
share/doc/HTML/en/kcontrol/ioports.html
share/doc/HTML/en/kcontrol/kbd.html
+share/doc/HTML/en/kcontrol/kblayout.html
+share/doc/HTML/en/kcontrol/kcmaccess.docbook
share/doc/HTML/en/kcontrol/kcmaction.docbook
-share/doc/HTML/en/kcontrol/kcmadv.docbook
share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
share/doc/HTML/en/kcontrol/kcmbatmon.docbook
-share/doc/HTML/en/kcontrol/kcmbell.cvlog
share/doc/HTML/en/kcontrol/kcmbell.docbook
-share/doc/HTML/en/kcontrol/kcmbell.html
share/doc/HTML/en/kcontrol/kcmblockdev.docbook
share/doc/HTML/en/kcontrol/kcmborders.docbook
share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -947,8 +896,6 @@ share/doc/HTML/en/kcontrol/kcmcookie.docbook
share/doc/HTML/en/kcontrol/kcmdatetime.docbook
share/doc/HTML/en/kcontrol/kcmdesktop.docbook
share/doc/HTML/en/kcontrol/kcmdeviceinfo.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay.cvlog
-share/doc/HTML/en/kcontrol/kcmdisplay.docbook
share/doc/HTML/en/kcontrol/kcmdmainfo.docbook
share/doc/HTML/en/kcontrol/kcmdrkonqi.docbook
share/doc/HTML/en/kcontrol/kcmebrowse.docbook
@@ -956,29 +903,17 @@ share/doc/HTML/en/kcontrol/kcmemail.docbook
share/doc/HTML/en/kcontrol/kcmenergy.docbook
share/doc/HTML/en/kcontrol/kcmfile.docbook
share/doc/HTML/en/kcontrol/kcmfileman.docbook
-share/doc/HTML/en/kcontrol/kcmfontmanager.docbook
share/doc/HTML/en/kcontrol/kcmfonts.docbook
share/doc/HTML/en/kcontrol/kcmhelpindex.docbook
share/doc/HTML/en/kcontrol/kcmicon.docbook
-share/doc/HTML/en/kcontrol/kcminput.cvlog
-share/doc/HTML/en/kcontrol/kcminput.docbook
+share/doc/HTML/en/kcontrol/kcmiconstyle.docbook
share/doc/HTML/en/kcontrol/kcmintinfo.docbook
share/doc/HTML/en/kcontrol/kcmioportinfo.docbook
share/doc/HTML/en/kcontrol/kcmkbd.docbook
+share/doc/HTML/en/kcontrol/kcmkblayout.docbook
share/doc/HTML/en/kcontrol/kcmkbrowse.docbook
-share/doc/HTML/en/kcontrol/kcmkdesu.cvlog
-share/doc/HTML/en/kcontrol/kcmkdesu.docbook
share/doc/HTML/en/kcontrol/kcmkeybind.docbook
-share/doc/HTML/en/kcontrol/kcmkeys.cvlog
share/doc/HTML/en/kcontrol/kcmkeys.docbook
-share/doc/HTML/en/kcontrol/kcmkfm.cvlog
-share/doc/HTML/en/kcontrol/kcmkfm.docbook
-share/doc/HTML/en/kcontrol/kcmkpanel.cvlog
-share/doc/HTML/en/kcontrol/kcmkpanel.docbook
-share/doc/HTML/en/kcontrol/kcmkwm.cvlog
-share/doc/HTML/en/kcontrol/kcmkwm.docbook
-share/doc/HTML/en/kcontrol/kcmlocale.cvlog
-share/doc/HTML/en/kcontrol/kcmlocale.docbook
share/doc/HTML/en/kcontrol/kcmlocate.docbook
share/doc/HTML/en/kcontrol/kcmloginmanage.docbook
share/doc/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -986,26 +921,22 @@ share/doc/HTML/en/kcontrol/kcmlowbatwarn.docbook
share/doc/HTML/en/kcontrol/kcmmemoryinfo.docbook
share/doc/HTML/en/kcontrol/kcmmouse.docbook
share/doc/HTML/en/kcontrol/kcmmousebeh.docbook
+share/doc/HTML/en/kcontrol/kcmnumbername.docbook
share/doc/HTML/en/kcontrol/kcmpanel.docbook
share/doc/HTML/en/kcontrol/kcmpartitioninfo.docbook
share/doc/HTML/en/kcontrol/kcmpasswd.docbook
share/doc/HTML/en/kcontrol/kcmpciinfo.docbook
-share/doc/HTML/en/kcontrol/kcmpcmia.docbook
+share/doc/HTML/en/kcontrol/kcmpcmcia.docbook
share/doc/HTML/en/kcontrol/kcmpowerctrl.docbook
share/doc/HTML/en/kcontrol/kcmprocinfo.docbook
share/doc/HTML/en/kcontrol/kcmproxie.docbook
-share/doc/HTML/en/kcontrol/kcmsamba.cvlog
-share/doc/HTML/en/kcontrol/kcmsamba.docbook
share/doc/HTML/en/kcontrol/kcmscnsave.docbook
share/doc/HTML/en/kcontrol/kcmscsiinfo.docbook
share/doc/HTML/en/kcontrol/kcmsmbstat.docbook
share/doc/HTML/en/kcontrol/kcmsndinfo.docbook
share/doc/HTML/en/kcontrol/kcmsndsrv.docbook
-share/doc/HTML/en/kcontrol/kcmsounds.docbook
share/doc/HTML/en/kcontrol/kcmstyle.docbook
share/doc/HTML/en/kcontrol/kcmsysnotify.docbook
-share/doc/HTML/en/kcontrol/kcmsyssound.cvlog
-share/doc/HTML/en/kcontrol/kcmsyssound.docbook
share/doc/HTML/en/kcontrol/kcmtalk.docbook
share/doc/HTML/en/kcontrol/kcmtaskbar.docbook
share/doc/HTML/en/kcontrol/kcmuseragent.docbook
@@ -1013,16 +944,7 @@ share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/konq-browsing.html
-share/doc/HTML/en/kcontrol/konqui.html
-share/doc/HTML/en/kcontrol/kthememgr.cvlog
-share/doc/HTML/en/kcontrol/kthememgr.docbook
-share/doc/HTML/en/kcontrol/kthememgr.html
share/doc/HTML/en/kcontrol/laptop.html
-share/doc/HTML/en/kcontrol/lf-desktop.html
-share/doc/HTML/en/kcontrol/lf-panel.html
-share/doc/HTML/en/kcontrol/lf-themes.html
-share/doc/HTML/en/kcontrol/lf-window-behavior.html
-share/doc/HTML/en/kcontrol/lf.html
share/doc/HTML/en/kcontrol/locale.html
share/doc/HTML/en/kcontrol/login-manager.html
share/doc/HTML/en/kcontrol/lowbatcrit.html
@@ -1032,43 +954,38 @@ share/doc/HTML/en/kcontrol/module.html
share/doc/HTML/en/kcontrol/modules.html
share/doc/HTML/en/kcontrol/mouse-behav.html
share/doc/HTML/en/kcontrol/mouse.html
-share/doc/HTML/en/kcontrol/network.html
+share/doc/HTML/en/kcontrol/numbername.html
share/doc/HTML/en/kcontrol/panel.html
share/doc/HTML/en/kcontrol/partitions.html
share/doc/HTML/en/kcontrol/passwords.html
share/doc/HTML/en/kcontrol/pci.html
-share/doc/HTML/en/kcontrol/pcmia.html
-share/doc/HTML/en/kcontrol/periph.html
-share/doc/HTML/en/kcontrol/personalize.html
-share/doc/HTML/en/kcontrol/power.html
+share/doc/HTML/en/kcontrol/pcmcia.html
share/doc/HTML/en/kcontrol/powerctrl.html
share/doc/HTML/en/kcontrol/processor.html
share/doc/HTML/en/kcontrol/proxies.html
share/doc/HTML/en/kcontrol/sambastatus.html
share/doc/HTML/en/kcontrol/screensaver.html
+share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/scsi.html
share/doc/HTML/en/kcontrol/sndserver.html
-share/doc/HTML/en/kcontrol/sound.html
share/doc/HTML/en/kcontrol/soundinfo.html
share/doc/HTML/en/kcontrol/style.html
share/doc/HTML/en/kcontrol/sys-notify.html
-share/doc/HTML/en/kcontrol/sys-sounds.html
-share/doc/HTML/en/kcontrol/system1.html
-share/doc/HTML/en/kcontrol/systemmenu.html
share/doc/HTML/en/kcontrol/talk.html
share/doc/HTML/en/kcontrol/taskbar.html
share/doc/HTML/en/kcontrol/user-agent.html
share/doc/HTML/en/kcontrol/windows-shares.html
share/doc/HTML/en/kcontrol/xserver.html
share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdebugdialog/index.html
share/doc/HTML/en/kdebugdialog/introduction.html
share/doc/HTML/en/kdesu/.anchors
share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/compiling.html
share/doc/HTML/en/kdesu/configuration.html
-share/doc/HTML/en/kdesu/index.cvlog
share/doc/HTML/en/kdesu/index.docbook
share/doc/HTML/en/kdesu/index.html
share/doc/HTML/en/kdesu/installation.html
@@ -1076,15 +993,15 @@ share/doc/HTML/en/kdesu/interface-to-su.html
share/doc/HTML/en/kdesu/internals.html
share/doc/HTML/en/kdesu/introduction.html
share/doc/HTML/en/kdesu/password-checking.html
-share/doc/HTML/en/kdesu/secpasswordkeeping.html
-share/doc/HTML/en/kdesu/usingkdesu.html
+share/doc/HTML/en/kdesu/sec-password-keeping.html
+share/doc/HTML/en/kdesu/using-kdesu.html
share/doc/HTML/en/kdm/.anchors
share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/configuring-kdm.html
share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
share/doc/HTML/en/kdm/credits.html
share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
-share/doc/HTML/en/kdm/index.cvlog
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/index.html
share/doc/HTML/en/kdm/introduction.html
@@ -1093,12 +1010,14 @@ share/doc/HTML/en/kdm/lilo.html
share/doc/HTML/en/kdm/locale.html
share/doc/HTML/en/kdm/other-information.html
share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
share/doc/HTML/en/khelpcenter/contact-developers.html
share/doc/HTML/en/khelpcenter/contact-more-information.html
share/doc/HTML/en/khelpcenter/contact-official.html
share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/faq/.anchors
+share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/index.cvlog
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
@@ -1114,10 +1033,10 @@ share/doc/HTML/en/khelpcenter/quickstart/.anchors
share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
share/doc/HTML/en/khelpcenter/quickstart/configure.html
share/doc/HTML/en/khelpcenter/quickstart/credits.html
-share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/quickstart/index.html
share/doc/HTML/en/khelpcenter/quickstart/introduction.html
@@ -1141,6 +1060,7 @@ share/doc/HTML/en/khelpcenter/userguide/activating-the-screen-saver-by-moving-yo
share/doc/HTML/en/khelpcenter/userguide/addingprograms.html
share/doc/HTML/en/khelpcenter/userguide/allaboutyourdesktop.html
share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/contacting-the-authors.html
share/doc/HTML/en/khelpcenter/userguide/contactingauthors.html
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
@@ -1204,27 +1124,64 @@ share/doc/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
share/doc/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
share/doc/HTML/en/khelpcenter/what-is-kde.html
share/doc/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/HTML/en/kikbd/.anchors
-share/doc/HTML/en/kikbd/advanced.html
-share/doc/HTML/en/kikbd/advanced.png
-share/doc/HTML/en/kikbd/authors.html
-share/doc/HTML/en/kikbd/bug-reporting.html
-share/doc/HTML/en/kikbd/config.html
-share/doc/HTML/en/kikbd/create.html
-share/doc/HTML/en/kikbd/general.html
-share/doc/HTML/en/kikbd/general.png
-share/doc/HTML/en/kikbd/index.cvlog
-share/doc/HTML/en/kikbd/index.docbook
-share/doc/HTML/en/kikbd/index.html
-share/doc/HTML/en/kikbd/installation.html
-share/doc/HTML/en/kikbd/introduction.html
-share/doc/HTML/en/kikbd/nationalkeyboard.html
-share/doc/HTML/en/kikbd/screen-saver-password-problems..html
-share/doc/HTML/en/kikbd/startup.html
-share/doc/HTML/en/kikbd/startup.png
-share/doc/HTML/en/kikbd/style.html
-share/doc/HTML/en/kikbd/style.png
-share/doc/HTML/en/kikbd/troubleshooting.html
+share/doc/HTML/en/kicker/.anchors
+share/doc/HTML/en/kicker/access_config.png
+share/doc/HTML/en/kicker/basic_icons.png
+share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
+share/doc/HTML/en/kicker/config_window.png
+share/doc/HTML/en/kicker/configuration-adding-icons.html
+share/doc/HTML/en/kicker/configuration-config-window.html
+share/doc/HTML/en/kicker/configuration.html
+share/doc/HTML/en/kicker/credits.html
+share/doc/HTML/en/kicker/drag-and-drop.html
+share/doc/HTML/en/kicker/drag_applet.png
+share/doc/HTML/en/kicker/five-minute-course.html
+share/doc/HTML/en/kicker/glossary.html
+share/doc/HTML/en/kicker/handles.png
+share/doc/HTML/en/kicker/hide_buttons.png
+share/doc/HTML/en/kicker/i_adv_editor.png
+share/doc/HTML/en/kicker/i_control_center.png
+share/doc/HTML/en/kicker/i_desktop.png
+share/doc/HTML/en/kicker/i_help.png
+share/doc/HTML/en/kicker/i_home_dir.png
+share/doc/HTML/en/kicker/i_k_button.png
+share/doc/HTML/en/kicker/i_kandalfs_tips.png
+share/doc/HTML/en/kicker/i_shell.png
+share/doc/HTML/en/kicker/i_window_list.png
+share/doc/HTML/en/kicker/index.docbook
+share/doc/HTML/en/kicker/index.html
+share/doc/HTML/en/kicker/installation.html
+share/doc/HTML/en/kicker/introduction.html
+share/doc/HTML/en/kicker/kicker-for-admins-symbolic-links.html
+share/doc/HTML/en/kicker/kicker-for-admins.html
+share/doc/HTML/en/kicker/kicker-panel-elements.html
+share/doc/HTML/en/kicker/kicker_access_size.png
+share/doc/HTML/en/kicker/kicker_add_basic.png
+share/doc/HTML/en/kicker/kicker_basic_icons.png
+share/doc/HTML/en/kicker/kicker_basic_icons_2.png
+share/doc/HTML/en/kicker/other-features.html
+share/doc/HTML/en/kicker/qb_root.png
+share/doc/HTML/en/kicker/using-kicker.html
+share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
+share/doc/HTML/en/kmenuedit/credits.html
+share/doc/HTML/en/kmenuedit/details-advanced.html
+share/doc/HTML/en/kmenuedit/glossary.html
+share/doc/HTML/en/kmenuedit/i_copy.png
+share/doc/HTML/en/kmenuedit/i_cut.png
+share/doc/HTML/en/kmenuedit/i_delete.png
+share/doc/HTML/en/kmenuedit/i_k_button.png
+share/doc/HTML/en/kmenuedit/i_new_item.png
+share/doc/HTML/en/kmenuedit/i_new_submenu.png
+share/doc/HTML/en/kmenuedit/i_paste.png
+share/doc/HTML/en/kmenuedit/icon_sets.png
+share/doc/HTML/en/kmenuedit/icons.png
+share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/introduction.html
+share/doc/HTML/en/kmenuedit/menu-reference.html
+share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
@@ -1233,6 +1190,7 @@ share/doc/HTML/en/konqueror/bubble.html
share/doc/HTML/en/konqueror/cmndline.png
share/doc/HTML/en/konqueror/commandline.html
share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
@@ -1271,12 +1229,15 @@ share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/credits.html
share/doc/HTML/en/konsole/history-option.html
share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole1.gif
+share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
share/doc/HTML/en/konsole/mousebuttons.html
share/doc/HTML/en/konsole/techref.html
@@ -1284,6 +1245,7 @@ share/doc/HTML/en/konsole/toolbar.html
share/doc/HTML/en/konsole/use-of-konsole.html
share/doc/HTML/en/konsole/vt100.gif
share/doc/HTML/en/kpager/.anchors
+share/doc/HTML/en/kpager/common
share/doc/HTML/en/kpager/compilation-and-installation.html
share/doc/HTML/en/kpager/customizingkpageradvancedfeatures.html
share/doc/HTML/en/kpager/frequentlyaskedquestionsfaq.html
@@ -1299,25 +1261,43 @@ share/doc/HTML/en/kpager/rows-mode.html
share/doc/HTML/en/kpager/the-global-desktop.html
share/doc/HTML/en/kpager/the-window-properties-menu.html
share/doc/HTML/en/kpager/workingwithkpager.html
-share/doc/HTML/en/kwm/.anchors
-share/doc/HTML/en/kwm/authors.html
-share/doc/HTML/en/kwm/commands.html
-share/doc/HTML/en/kwm/configuration.html
-share/doc/HTML/en/kwm/does-kwm-support-shaded-windows-a-la-openste.html
-share/doc/HTML/en/kwm/epilogue.html
-share/doc/HTML/en/kwm/frequentlyaskedquestions.html
-share/doc/HTML/en/kwm/index.cvlog
-share/doc/HTML/en/kwm/index.docbook
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kwm/introduction.html
-share/doc/HTML/en/kwm/is-it-possible-to-add-kde-extensions-to-othe.html
-share/doc/HTML/en/kwm/minicli.html
-share/doc/HTML/en/kwm/mouse-control.html
-share/doc/HTML/en/kwm/shortcuts.html
-share/doc/HTML/en/kwm/soundevents.html
-share/doc/HTML/en/kwm/usingemphasiskwmemphasis.html
-share/doc/HTML/en/kwm/why-can-t-i-define-new-shortcuts-for-launchi.html
-share/doc/HTML/en/kwm/why-does-kwm-look-so-much-like-windows-95.html
+share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/authors.html
+share/doc/HTML/en/ksysguard/common
+share/doc/HTML/en/ksysguard/compilationandinstallation.html
+share/doc/HTML/en/ksysguard/frequentlyaskedquestions.html
+share/doc/HTML/en/ksysguard/index.docbook
+share/doc/HTML/en/ksysguard/index.html
+share/doc/HTML/en/ksysguard/installation.html
+share/doc/HTML/en/ksysguard/introduction.html
+share/doc/HTML/en/ksysguard/licenseandwarranty.html
+share/doc/HTML/en/ksysguard/requirements.html
+share/doc/HTML/en/ksysguard/thesensorbrowser.html
+share/doc/HTML/en/ksysguard/theworkspace.html
+share/doc/HTML/en/ksysguard/usingtheksysguard.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/common
+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.docbook
+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/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
@@ -1417,10 +1397,13 @@ share/icons/hicolor/32x32/devices/3floppy_mount.png
share/icons/hicolor/32x32/devices/3floppy_unmount.png
share/icons/hicolor/32x32/devices/5floppy_mount.png
share/icons/hicolor/32x32/devices/5floppy_unmount.png
+share/icons/hicolor/32x32/devices/cdaudio_mount.png
+share/icons/hicolor/32x32/devices/cdaudio_unmount.png
share/icons/hicolor/32x32/devices/cdrom_mount.png
share/icons/hicolor/32x32/devices/cdrom_unmount.png
share/icons/hicolor/32x32/devices/cdwriter_mount.png
share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_mount.png
share/icons/hicolor/32x32/devices/dvd_unmount.png
share/icons/hicolor/32x32/devices/hdd_mount.png
share/icons/hicolor/32x32/devices/hdd_unmount.png
@@ -1505,10 +1488,13 @@ share/icons/hicolor/48x48/devices/3floppy_mount.png
share/icons/hicolor/48x48/devices/3floppy_unmount.png
share/icons/hicolor/48x48/devices/5floppy_mount.png
share/icons/hicolor/48x48/devices/5floppy_unmount.png
+share/icons/hicolor/48x48/devices/cdaudio_mount.png
+share/icons/hicolor/48x48/devices/cdaudio_unmount.png
share/icons/hicolor/48x48/devices/cdrom_mount.png
share/icons/hicolor/48x48/devices/cdrom_unmount.png
share/icons/hicolor/48x48/devices/cdwriter_mount.png
share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_mount.png
share/icons/hicolor/48x48/devices/dvd_unmount.png
share/icons/hicolor/48x48/devices/hdd_mount.png
share/icons/hicolor/48x48/devices/hdd_unmount.png
@@ -1992,6 +1978,7 @@ share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
share/services/kurisearchfilter.desktop
+share/services/kxmlrpcd.desktop
share/services/man.protocol
share/services/nfs.protocol
share/services/nntp.protocol
@@ -2053,11 +2040,13 @@ share/wallpapers/northbeach.jpg
share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
-@dirrm share/doc/HTML/en/kwm
+@dirrm share/doc/HTML/en/kwrite
+@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kpager
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kikbd
+@dirrm share/doc/HTML/en/kmenuedit
+@dirrm share/doc/HTML/en/kicker
@dirrm share/doc/HTML/en/khelpcenter/userguide
@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/faq
@@ -2072,8 +2061,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
@dirrm share/apps/ksysguard/icons/locolor/16x16
-@dirrm share/apps/ksysguard/icons/locolor
-@dirrm share/apps/ksysguard/icons
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@dirrm share/apps/ksplash
@@ -2091,25 +2078,27 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/konqiconview
@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
@dirrm share/apps/kmenuedit/icons/locolor/16x16
-@dirrm share/apps/kmenuedit/icons/locolor
@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
@dirrm share/apps/kmenuedit/icons/hicolor/32x32
@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
@dirrm share/apps/kio_info
@dirrm share/apps/kicker/tiles
@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
@dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
@dirrm share/apps/khelpcenter/pics
@dirrm share/apps/khelpcenter/en
+@dirrm share/apps/khelpcenter
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
@dirrm share/apps/kdisplay/color-schemes
@dirrm share/apps/kdisplay/app-defaults
+@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
@dirrm share/apps/kdesktop/programs
@@ -2121,6 +2110,7 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kcontrol/pics
@dirrm share/apps/kcontrol
@dirrm share/apps/kcmlocale/pics
+@dirrm share/apps/kcmlocale
@dirrm share/apps/kcminput
@dirrm share/apps/kbookmark
@dirrm share/apps/kappfinder/apps/WordProcessing
@@ -2135,6 +2125,9 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kappfinder/apps/Editors
@dirrm share/apps/kappfinder/apps/Development
@dirrm share/apps/kappfinder/apps
+@dirrm share/apps/kappfinder
@dirrm share/apps/drkonqi/presets
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
+@dirrm share/apps/clockapplet
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 3fbd30c494dc..5219b5b00274 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdebase
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 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
@@ -40,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 094815fd3937..38387e559524 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
+MD5 (kdebase-1.94.tar.bz2) = a6617df687698e4954d7011a08625ec2
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index c63b81caa6cb..3737b07b7ed0 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -134,6 +134,7 @@ lib/klegacyimport.so
lib/klipper.la
lib/klipper.so
lib/kmenuedit.la
+lib/kmenuedit.so
lib/kmenuedit.so.0
lib/konqueror.la
lib/konqueror.so
@@ -149,13 +150,10 @@ lib/kxmlrpcd.la
lib/kxmlrpcd.so
lib/libccont.a
lib/libclockapplet.la
+lib/libclockapplet.so
lib/libclockapplet.so.1
-lib/libexampleapplet.la
-lib/libexampleapplet.so.1
lib/libhtmlsearch.la
lib/libhtmlsearch.so
-lib/libkasbarapplet.la
-lib/libkasbarapplet.so.1
lib/libkcm_access.la
lib/libkcm_access.so
lib/libkcm_arts.la
@@ -168,6 +166,8 @@ lib/libkcm_clock.la
lib/libkcm_clock.so
lib/libkcm_colors.la
lib/libkcm_colors.so
+lib/libkcm_crypto.la
+lib/libkcm_crypto.so
lib/libkcm_email.la
lib/libkcm_email.so
lib/libkcm_energy.la
@@ -226,11 +226,16 @@ lib/libkcm_taskbar.la
lib/libkcm_taskbar.so
lib/libkcm_virtualdesktops.la
lib/libkcm_virtualdesktops.so
+lib/libkcm_xmlrpcd.la
+lib/libkcm_xmlrpcd.so
lib/libkhelpcenter.la
+lib/libkhelpcenter.so
lib/libkhelpcenter.so.4
lib/libkminipagerapplet.la
+lib/libkminipagerapplet.so
lib/libkminipagerapplet.so.1
lib/libkonq.la
+lib/libkonq.so
lib/libkonq.so.4
lib/libkonqdirtree.la
lib/libkonqdirtree.so
@@ -241,20 +246,27 @@ lib/libkonqlistview.so
lib/libkonsolepart.la
lib/libkonsolepart.so
lib/libkrunapplet.la
+lib/libkrunapplet.so
lib/libkrunapplet.so.1
lib/libkshorturifilter.la
+lib/libkshorturifilter.so
lib/libkshorturifilter.so.1
lib/libksystemtrayapplet.la
+lib/libksystemtrayapplet.so
lib/libksystemtrayapplet.so.1
lib/libktaskbarapplet.la
+lib/libktaskbarapplet.so
lib/libktaskbarapplet.so.1
lib/libkuriikwsfilter.la
+lib/libkuriikwsfilter.so
lib/libkuriikwsfilter.so.1
lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so
lib/libkurisearchfilter.so.1
lib/libkwinb2.la
lib/libkwinb2.so
lib/libkwindefault.la
+lib/libkwindefault.so
lib/libkwindefault.so.0
lib/libkwinkde1.la
lib/libkwinkde1.so
@@ -271,23 +283,23 @@ lib/libkwinsystem.so
lib/libkwritepart.la
lib/libkwritepart.so
lib/libquicklauncher.la
+lib/libquicklauncher.so
lib/libquicklauncher.so.1
lib/libsmb++.la
+lib/libsmb++.so
lib/libsmb++.so.0
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
share/applnk/Development/designer.desktop
-share/applnk/Editors/gvim.desktop
share/applnk/Editors/kwrite.desktop
+share/applnk/Editors/xedit.desktop
share/applnk/Games/.directory
share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
share/applnk/Help.desktop
share/applnk/Home.desktop
share/applnk/Internet/.directory
share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/netscape.desktop
share/applnk/KControl.desktop
share/applnk/Multimedia/.directory
share/applnk/Office/.directory
@@ -337,6 +349,7 @@ share/applnk/Settings/Peripherals/.directory
share/applnk/Settings/Peripherals/keyboard.desktop
share/applnk/Settings/Peripherals/mouse.desktop
share/applnk/Settings/Personalization/.directory
+share/applnk/Settings/Personalization/crypto.desktop
share/applnk/Settings/Personalization/email.desktop
share/applnk/Settings/Personalization/kcmaccess.desktop
share/applnk/Settings/Personalization/kcmlayout.desktop
@@ -359,36 +372,6 @@ share/applnk/Settings/WebBrowsing/useragent.desktop
share/applnk/System/.directory
share/applnk/System/Arrange.desktop
share/applnk/System/ScreenSavers/.directory
-share/applnk/System/ScreenSavers/Ant.desktop
-share/applnk/System/ScreenSavers/Atlantis.desktop
-share/applnk/System/ScreenSavers/Attraction.desktop
-share/applnk/System/ScreenSavers/Bouboule.desktop
-share/applnk/System/ScreenSavers/Braid.desktop
-share/applnk/System/ScreenSavers/Bubble3d.desktop
-share/applnk/System/ScreenSavers/Bubbles.desktop
-share/applnk/System/ScreenSavers/Cage.desktop
-share/applnk/System/ScreenSavers/Compass.desktop
-share/applnk/System/ScreenSavers/Coral.desktop
-share/applnk/System/ScreenSavers/Crystal.desktop
-share/applnk/System/ScreenSavers/Cynosure.desktop
-share/applnk/System/ScreenSavers/Demon.desktop
-share/applnk/System/ScreenSavers/Drift.desktop
-share/applnk/System/ScreenSavers/Fadeplot.desktop
-share/applnk/System/ScreenSavers/Flag.desktop
-share/applnk/System/ScreenSavers/Flame.desktop
-share/applnk/System/ScreenSavers/Flow.desktop
-share/applnk/System/ScreenSavers/Forest.desktop
-share/applnk/System/ScreenSavers/GLPlanet.desktop
-share/applnk/System/ScreenSavers/Galaxy.desktop
-share/applnk/System/ScreenSavers/Gears.desktop
-share/applnk/System/ScreenSavers/Goop.desktop
-share/applnk/System/ScreenSavers/Grav.desktop
-share/applnk/System/ScreenSavers/Hopalong.desktop
-share/applnk/System/ScreenSavers/Hypercube.desktop
-share/applnk/System/ScreenSavers/Ifs.desktop
-share/applnk/System/ScreenSavers/Imsmap.desktop
-share/applnk/System/ScreenSavers/Interference.desktop
-share/applnk/System/ScreenSavers/Julia.desktop
share/applnk/System/ScreenSavers/KAttration.desktop
share/applnk/System/ScreenSavers/KBanner.desktop
share/applnk/System/ScreenSavers/KBlankscreen.desktop
@@ -416,34 +399,7 @@ share/applnk/System/ScreenSavers/KSlip.desktop
share/applnk/System/ScreenSavers/KSpace.desktop
share/applnk/System/ScreenSavers/KSwarm.desktop
share/applnk/System/ScreenSavers/KVm.desktop
-share/applnk/System/ScreenSavers/Kaleidescope.desktop
-share/applnk/System/ScreenSavers/Kumppa.desktop
-share/applnk/System/ScreenSavers/LMorph.desktop
-share/applnk/System/ScreenSavers/Lament.desktop
-share/applnk/System/ScreenSavers/Laser.desktop
-share/applnk/System/ScreenSavers/Lightning.desktop
-share/applnk/System/ScreenSavers/Lissie.desktop
-share/applnk/System/ScreenSavers/Moenius.desktop
-share/applnk/System/ScreenSavers/Penrose.desktop
-share/applnk/System/ScreenSavers/Phosphor.desktop
-share/applnk/System/ScreenSavers/Pulsar.desktop
-share/applnk/System/ScreenSavers/Rubik.desktop
-share/applnk/System/ScreenSavers/Slip.desktop
-share/applnk/System/ScreenSavers/Sonar.desktop
-share/applnk/System/ScreenSavers/Sproingies.desktop
-share/applnk/System/ScreenSavers/Stairs.desktop
-share/applnk/System/ScreenSavers/Starfish.desktop
-share/applnk/System/ScreenSavers/Strange.desktop
-share/applnk/System/ScreenSavers/Superquadrics.desktop
-share/applnk/System/ScreenSavers/Swirl.desktop
-share/applnk/System/ScreenSavers/T3d.desktop
-share/applnk/System/ScreenSavers/Triangle.desktop
-share/applnk/System/ScreenSavers/Vines.desktop
share/applnk/System/ScreenSavers/Worm.desktop
-share/applnk/System/ScreenSavers/XFlame.desktop
-share/applnk/System/ScreenSavers/XJack.desktop
-share/applnk/System/ScreenSavers/XMatrix.desktop
-share/applnk/System/ScreenSavers/XPipes.desktop
share/applnk/System/kappfinder.desktop
share/applnk/System/kfmclient.desktop
share/applnk/System/klegacyimport.desktop
@@ -452,17 +408,19 @@ share/applnk/System/konquerorsu.desktop
share/applnk/System/konsole.desktop
share/applnk/System/konsolesu.desktop
share/applnk/System/ksysguard.desktop
+share/applnk/Toys/xeyes.desktop
share/applnk/Utilities/.directory
share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/kpager.desktop
share/applnk/Utilities/ktip.desktop
share/applnk/Utilities/passwd.desktop
+share/applnk/Utilities/xcalc.desktop
share/applnk/Utilities/xclipboard.desktop
share/applnk/Utilities/xclock.desktop
share/applnk/Utilities/xconsole.desktop
+share/applnk/Utilities/xload.desktop
share/applnk/Utilities/xmag.desktop
share/applnk/Utilities/xterm.desktop
-share/applnk/WordProcessing/xpdf.desktop
share/apps/clockapplet/pics/lcd.png
share/apps/drkonqi/pics/konqi.png
share/apps/drkonqi/presets/developerrc
@@ -673,10 +631,8 @@ share/apps/khelpcenter/pics/star.png
share/apps/khelpcenter/pics/star_blank.png
share/apps/khelpcenter/pics/unchecked.xpm
share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.kdelnk
+share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/exampleapplet.desktop
-share/apps/kicker/applets/kasbarapplet.desktop
share/apps/kicker/applets/kminipagerapplet.desktop
share/apps/kicker/applets/krunapplet.desktop
share/apps/kicker/applets/ksystemtrayapplet.desktop
@@ -831,7 +787,7 @@ share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
-share/apps/ksysguard/ksysguard.rc
+share/apps/ksysguard/ksysguardui.rc
share/apps/kwin/b2.desktop
share/apps/kwin/eventsrc
share/apps/kwin/kde.desktop
@@ -893,18 +849,14 @@ share/config/penroserc
share/config/rocksrc
share/config/sliprc
share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/advanced.html
-share/doc/HTML/en/kcontrol/application.html
+share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
+share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
-share/doc/HTML/en/kcontrol/browsing-files.html
-share/doc/HTML/en/kcontrol/browsing-help.html
-share/doc/HTML/en/kcontrol/browsing-neighborhood.html
-share/doc/HTML/en/kcontrol/browsing-web.html
-share/doc/HTML/en/kcontrol/browsing.html
share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
share/doc/HTML/en/kcontrol/control-center-exiting.html
share/doc/HTML/en/kcontrol/control-center-menus.html
share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -921,25 +873,22 @@ share/doc/HTML/en/kcontrol/email.html
share/doc/HTML/en/kcontrol/energy.html
share/doc/HTML/en/kcontrol/file-assoc.html
share/doc/HTML/en/kcontrol/file-manager.html
-share/doc/HTML/en/kcontrol/fonts-man.html
share/doc/HTML/en/kcontrol/fonts.html
share/doc/HTML/en/kcontrol/help-index.html
share/doc/HTML/en/kcontrol/icons.html
-share/doc/HTML/en/kcontrol/index.cvlog
+share/doc/HTML/en/kcontrol/iconstyle.html
share/doc/HTML/en/kcontrol/index.docbook
share/doc/HTML/en/kcontrol/index.html
-share/doc/HTML/en/kcontrol/info.html
share/doc/HTML/en/kcontrol/interrupts.html
share/doc/HTML/en/kcontrol/introduction.html
share/doc/HTML/en/kcontrol/ioports.html
share/doc/HTML/en/kcontrol/kbd.html
+share/doc/HTML/en/kcontrol/kblayout.html
+share/doc/HTML/en/kcontrol/kcmaccess.docbook
share/doc/HTML/en/kcontrol/kcmaction.docbook
-share/doc/HTML/en/kcontrol/kcmadv.docbook
share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
share/doc/HTML/en/kcontrol/kcmbatmon.docbook
-share/doc/HTML/en/kcontrol/kcmbell.cvlog
share/doc/HTML/en/kcontrol/kcmbell.docbook
-share/doc/HTML/en/kcontrol/kcmbell.html
share/doc/HTML/en/kcontrol/kcmblockdev.docbook
share/doc/HTML/en/kcontrol/kcmborders.docbook
share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -947,8 +896,6 @@ share/doc/HTML/en/kcontrol/kcmcookie.docbook
share/doc/HTML/en/kcontrol/kcmdatetime.docbook
share/doc/HTML/en/kcontrol/kcmdesktop.docbook
share/doc/HTML/en/kcontrol/kcmdeviceinfo.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay.cvlog
-share/doc/HTML/en/kcontrol/kcmdisplay.docbook
share/doc/HTML/en/kcontrol/kcmdmainfo.docbook
share/doc/HTML/en/kcontrol/kcmdrkonqi.docbook
share/doc/HTML/en/kcontrol/kcmebrowse.docbook
@@ -956,29 +903,17 @@ share/doc/HTML/en/kcontrol/kcmemail.docbook
share/doc/HTML/en/kcontrol/kcmenergy.docbook
share/doc/HTML/en/kcontrol/kcmfile.docbook
share/doc/HTML/en/kcontrol/kcmfileman.docbook
-share/doc/HTML/en/kcontrol/kcmfontmanager.docbook
share/doc/HTML/en/kcontrol/kcmfonts.docbook
share/doc/HTML/en/kcontrol/kcmhelpindex.docbook
share/doc/HTML/en/kcontrol/kcmicon.docbook
-share/doc/HTML/en/kcontrol/kcminput.cvlog
-share/doc/HTML/en/kcontrol/kcminput.docbook
+share/doc/HTML/en/kcontrol/kcmiconstyle.docbook
share/doc/HTML/en/kcontrol/kcmintinfo.docbook
share/doc/HTML/en/kcontrol/kcmioportinfo.docbook
share/doc/HTML/en/kcontrol/kcmkbd.docbook
+share/doc/HTML/en/kcontrol/kcmkblayout.docbook
share/doc/HTML/en/kcontrol/kcmkbrowse.docbook
-share/doc/HTML/en/kcontrol/kcmkdesu.cvlog
-share/doc/HTML/en/kcontrol/kcmkdesu.docbook
share/doc/HTML/en/kcontrol/kcmkeybind.docbook
-share/doc/HTML/en/kcontrol/kcmkeys.cvlog
share/doc/HTML/en/kcontrol/kcmkeys.docbook
-share/doc/HTML/en/kcontrol/kcmkfm.cvlog
-share/doc/HTML/en/kcontrol/kcmkfm.docbook
-share/doc/HTML/en/kcontrol/kcmkpanel.cvlog
-share/doc/HTML/en/kcontrol/kcmkpanel.docbook
-share/doc/HTML/en/kcontrol/kcmkwm.cvlog
-share/doc/HTML/en/kcontrol/kcmkwm.docbook
-share/doc/HTML/en/kcontrol/kcmlocale.cvlog
-share/doc/HTML/en/kcontrol/kcmlocale.docbook
share/doc/HTML/en/kcontrol/kcmlocate.docbook
share/doc/HTML/en/kcontrol/kcmloginmanage.docbook
share/doc/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -986,26 +921,22 @@ share/doc/HTML/en/kcontrol/kcmlowbatwarn.docbook
share/doc/HTML/en/kcontrol/kcmmemoryinfo.docbook
share/doc/HTML/en/kcontrol/kcmmouse.docbook
share/doc/HTML/en/kcontrol/kcmmousebeh.docbook
+share/doc/HTML/en/kcontrol/kcmnumbername.docbook
share/doc/HTML/en/kcontrol/kcmpanel.docbook
share/doc/HTML/en/kcontrol/kcmpartitioninfo.docbook
share/doc/HTML/en/kcontrol/kcmpasswd.docbook
share/doc/HTML/en/kcontrol/kcmpciinfo.docbook
-share/doc/HTML/en/kcontrol/kcmpcmia.docbook
+share/doc/HTML/en/kcontrol/kcmpcmcia.docbook
share/doc/HTML/en/kcontrol/kcmpowerctrl.docbook
share/doc/HTML/en/kcontrol/kcmprocinfo.docbook
share/doc/HTML/en/kcontrol/kcmproxie.docbook
-share/doc/HTML/en/kcontrol/kcmsamba.cvlog
-share/doc/HTML/en/kcontrol/kcmsamba.docbook
share/doc/HTML/en/kcontrol/kcmscnsave.docbook
share/doc/HTML/en/kcontrol/kcmscsiinfo.docbook
share/doc/HTML/en/kcontrol/kcmsmbstat.docbook
share/doc/HTML/en/kcontrol/kcmsndinfo.docbook
share/doc/HTML/en/kcontrol/kcmsndsrv.docbook
-share/doc/HTML/en/kcontrol/kcmsounds.docbook
share/doc/HTML/en/kcontrol/kcmstyle.docbook
share/doc/HTML/en/kcontrol/kcmsysnotify.docbook
-share/doc/HTML/en/kcontrol/kcmsyssound.cvlog
-share/doc/HTML/en/kcontrol/kcmsyssound.docbook
share/doc/HTML/en/kcontrol/kcmtalk.docbook
share/doc/HTML/en/kcontrol/kcmtaskbar.docbook
share/doc/HTML/en/kcontrol/kcmuseragent.docbook
@@ -1013,16 +944,7 @@ share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/konq-browsing.html
-share/doc/HTML/en/kcontrol/konqui.html
-share/doc/HTML/en/kcontrol/kthememgr.cvlog
-share/doc/HTML/en/kcontrol/kthememgr.docbook
-share/doc/HTML/en/kcontrol/kthememgr.html
share/doc/HTML/en/kcontrol/laptop.html
-share/doc/HTML/en/kcontrol/lf-desktop.html
-share/doc/HTML/en/kcontrol/lf-panel.html
-share/doc/HTML/en/kcontrol/lf-themes.html
-share/doc/HTML/en/kcontrol/lf-window-behavior.html
-share/doc/HTML/en/kcontrol/lf.html
share/doc/HTML/en/kcontrol/locale.html
share/doc/HTML/en/kcontrol/login-manager.html
share/doc/HTML/en/kcontrol/lowbatcrit.html
@@ -1032,43 +954,38 @@ share/doc/HTML/en/kcontrol/module.html
share/doc/HTML/en/kcontrol/modules.html
share/doc/HTML/en/kcontrol/mouse-behav.html
share/doc/HTML/en/kcontrol/mouse.html
-share/doc/HTML/en/kcontrol/network.html
+share/doc/HTML/en/kcontrol/numbername.html
share/doc/HTML/en/kcontrol/panel.html
share/doc/HTML/en/kcontrol/partitions.html
share/doc/HTML/en/kcontrol/passwords.html
share/doc/HTML/en/kcontrol/pci.html
-share/doc/HTML/en/kcontrol/pcmia.html
-share/doc/HTML/en/kcontrol/periph.html
-share/doc/HTML/en/kcontrol/personalize.html
-share/doc/HTML/en/kcontrol/power.html
+share/doc/HTML/en/kcontrol/pcmcia.html
share/doc/HTML/en/kcontrol/powerctrl.html
share/doc/HTML/en/kcontrol/processor.html
share/doc/HTML/en/kcontrol/proxies.html
share/doc/HTML/en/kcontrol/sambastatus.html
share/doc/HTML/en/kcontrol/screensaver.html
+share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/scsi.html
share/doc/HTML/en/kcontrol/sndserver.html
-share/doc/HTML/en/kcontrol/sound.html
share/doc/HTML/en/kcontrol/soundinfo.html
share/doc/HTML/en/kcontrol/style.html
share/doc/HTML/en/kcontrol/sys-notify.html
-share/doc/HTML/en/kcontrol/sys-sounds.html
-share/doc/HTML/en/kcontrol/system1.html
-share/doc/HTML/en/kcontrol/systemmenu.html
share/doc/HTML/en/kcontrol/talk.html
share/doc/HTML/en/kcontrol/taskbar.html
share/doc/HTML/en/kcontrol/user-agent.html
share/doc/HTML/en/kcontrol/windows-shares.html
share/doc/HTML/en/kcontrol/xserver.html
share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdebugdialog/index.html
share/doc/HTML/en/kdebugdialog/introduction.html
share/doc/HTML/en/kdesu/.anchors
share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/compiling.html
share/doc/HTML/en/kdesu/configuration.html
-share/doc/HTML/en/kdesu/index.cvlog
share/doc/HTML/en/kdesu/index.docbook
share/doc/HTML/en/kdesu/index.html
share/doc/HTML/en/kdesu/installation.html
@@ -1076,15 +993,15 @@ share/doc/HTML/en/kdesu/interface-to-su.html
share/doc/HTML/en/kdesu/internals.html
share/doc/HTML/en/kdesu/introduction.html
share/doc/HTML/en/kdesu/password-checking.html
-share/doc/HTML/en/kdesu/secpasswordkeeping.html
-share/doc/HTML/en/kdesu/usingkdesu.html
+share/doc/HTML/en/kdesu/sec-password-keeping.html
+share/doc/HTML/en/kdesu/using-kdesu.html
share/doc/HTML/en/kdm/.anchors
share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/configuring-kdm.html
share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
share/doc/HTML/en/kdm/credits.html
share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
-share/doc/HTML/en/kdm/index.cvlog
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/index.html
share/doc/HTML/en/kdm/introduction.html
@@ -1093,12 +1010,14 @@ share/doc/HTML/en/kdm/lilo.html
share/doc/HTML/en/kdm/locale.html
share/doc/HTML/en/kdm/other-information.html
share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
share/doc/HTML/en/khelpcenter/contact-developers.html
share/doc/HTML/en/khelpcenter/contact-more-information.html
share/doc/HTML/en/khelpcenter/contact-official.html
share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/faq/.anchors
+share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/index.cvlog
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
@@ -1114,10 +1033,10 @@ share/doc/HTML/en/khelpcenter/quickstart/.anchors
share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
share/doc/HTML/en/khelpcenter/quickstart/configure.html
share/doc/HTML/en/khelpcenter/quickstart/credits.html
-share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/quickstart/index.html
share/doc/HTML/en/khelpcenter/quickstart/introduction.html
@@ -1141,6 +1060,7 @@ share/doc/HTML/en/khelpcenter/userguide/activating-the-screen-saver-by-moving-yo
share/doc/HTML/en/khelpcenter/userguide/addingprograms.html
share/doc/HTML/en/khelpcenter/userguide/allaboutyourdesktop.html
share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/contacting-the-authors.html
share/doc/HTML/en/khelpcenter/userguide/contactingauthors.html
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
@@ -1204,27 +1124,64 @@ share/doc/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
share/doc/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
share/doc/HTML/en/khelpcenter/what-is-kde.html
share/doc/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/HTML/en/kikbd/.anchors
-share/doc/HTML/en/kikbd/advanced.html
-share/doc/HTML/en/kikbd/advanced.png
-share/doc/HTML/en/kikbd/authors.html
-share/doc/HTML/en/kikbd/bug-reporting.html
-share/doc/HTML/en/kikbd/config.html
-share/doc/HTML/en/kikbd/create.html
-share/doc/HTML/en/kikbd/general.html
-share/doc/HTML/en/kikbd/general.png
-share/doc/HTML/en/kikbd/index.cvlog
-share/doc/HTML/en/kikbd/index.docbook
-share/doc/HTML/en/kikbd/index.html
-share/doc/HTML/en/kikbd/installation.html
-share/doc/HTML/en/kikbd/introduction.html
-share/doc/HTML/en/kikbd/nationalkeyboard.html
-share/doc/HTML/en/kikbd/screen-saver-password-problems..html
-share/doc/HTML/en/kikbd/startup.html
-share/doc/HTML/en/kikbd/startup.png
-share/doc/HTML/en/kikbd/style.html
-share/doc/HTML/en/kikbd/style.png
-share/doc/HTML/en/kikbd/troubleshooting.html
+share/doc/HTML/en/kicker/.anchors
+share/doc/HTML/en/kicker/access_config.png
+share/doc/HTML/en/kicker/basic_icons.png
+share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
+share/doc/HTML/en/kicker/config_window.png
+share/doc/HTML/en/kicker/configuration-adding-icons.html
+share/doc/HTML/en/kicker/configuration-config-window.html
+share/doc/HTML/en/kicker/configuration.html
+share/doc/HTML/en/kicker/credits.html
+share/doc/HTML/en/kicker/drag-and-drop.html
+share/doc/HTML/en/kicker/drag_applet.png
+share/doc/HTML/en/kicker/five-minute-course.html
+share/doc/HTML/en/kicker/glossary.html
+share/doc/HTML/en/kicker/handles.png
+share/doc/HTML/en/kicker/hide_buttons.png
+share/doc/HTML/en/kicker/i_adv_editor.png
+share/doc/HTML/en/kicker/i_control_center.png
+share/doc/HTML/en/kicker/i_desktop.png
+share/doc/HTML/en/kicker/i_help.png
+share/doc/HTML/en/kicker/i_home_dir.png
+share/doc/HTML/en/kicker/i_k_button.png
+share/doc/HTML/en/kicker/i_kandalfs_tips.png
+share/doc/HTML/en/kicker/i_shell.png
+share/doc/HTML/en/kicker/i_window_list.png
+share/doc/HTML/en/kicker/index.docbook
+share/doc/HTML/en/kicker/index.html
+share/doc/HTML/en/kicker/installation.html
+share/doc/HTML/en/kicker/introduction.html
+share/doc/HTML/en/kicker/kicker-for-admins-symbolic-links.html
+share/doc/HTML/en/kicker/kicker-for-admins.html
+share/doc/HTML/en/kicker/kicker-panel-elements.html
+share/doc/HTML/en/kicker/kicker_access_size.png
+share/doc/HTML/en/kicker/kicker_add_basic.png
+share/doc/HTML/en/kicker/kicker_basic_icons.png
+share/doc/HTML/en/kicker/kicker_basic_icons_2.png
+share/doc/HTML/en/kicker/other-features.html
+share/doc/HTML/en/kicker/qb_root.png
+share/doc/HTML/en/kicker/using-kicker.html
+share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
+share/doc/HTML/en/kmenuedit/credits.html
+share/doc/HTML/en/kmenuedit/details-advanced.html
+share/doc/HTML/en/kmenuedit/glossary.html
+share/doc/HTML/en/kmenuedit/i_copy.png
+share/doc/HTML/en/kmenuedit/i_cut.png
+share/doc/HTML/en/kmenuedit/i_delete.png
+share/doc/HTML/en/kmenuedit/i_k_button.png
+share/doc/HTML/en/kmenuedit/i_new_item.png
+share/doc/HTML/en/kmenuedit/i_new_submenu.png
+share/doc/HTML/en/kmenuedit/i_paste.png
+share/doc/HTML/en/kmenuedit/icon_sets.png
+share/doc/HTML/en/kmenuedit/icons.png
+share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/introduction.html
+share/doc/HTML/en/kmenuedit/menu-reference.html
+share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
@@ -1233,6 +1190,7 @@ share/doc/HTML/en/konqueror/bubble.html
share/doc/HTML/en/konqueror/cmndline.png
share/doc/HTML/en/konqueror/commandline.html
share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
@@ -1271,12 +1229,15 @@ share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/credits.html
share/doc/HTML/en/konsole/history-option.html
share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole1.gif
+share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
share/doc/HTML/en/konsole/mousebuttons.html
share/doc/HTML/en/konsole/techref.html
@@ -1284,6 +1245,7 @@ share/doc/HTML/en/konsole/toolbar.html
share/doc/HTML/en/konsole/use-of-konsole.html
share/doc/HTML/en/konsole/vt100.gif
share/doc/HTML/en/kpager/.anchors
+share/doc/HTML/en/kpager/common
share/doc/HTML/en/kpager/compilation-and-installation.html
share/doc/HTML/en/kpager/customizingkpageradvancedfeatures.html
share/doc/HTML/en/kpager/frequentlyaskedquestionsfaq.html
@@ -1299,25 +1261,43 @@ share/doc/HTML/en/kpager/rows-mode.html
share/doc/HTML/en/kpager/the-global-desktop.html
share/doc/HTML/en/kpager/the-window-properties-menu.html
share/doc/HTML/en/kpager/workingwithkpager.html
-share/doc/HTML/en/kwm/.anchors
-share/doc/HTML/en/kwm/authors.html
-share/doc/HTML/en/kwm/commands.html
-share/doc/HTML/en/kwm/configuration.html
-share/doc/HTML/en/kwm/does-kwm-support-shaded-windows-a-la-openste.html
-share/doc/HTML/en/kwm/epilogue.html
-share/doc/HTML/en/kwm/frequentlyaskedquestions.html
-share/doc/HTML/en/kwm/index.cvlog
-share/doc/HTML/en/kwm/index.docbook
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kwm/introduction.html
-share/doc/HTML/en/kwm/is-it-possible-to-add-kde-extensions-to-othe.html
-share/doc/HTML/en/kwm/minicli.html
-share/doc/HTML/en/kwm/mouse-control.html
-share/doc/HTML/en/kwm/shortcuts.html
-share/doc/HTML/en/kwm/soundevents.html
-share/doc/HTML/en/kwm/usingemphasiskwmemphasis.html
-share/doc/HTML/en/kwm/why-can-t-i-define-new-shortcuts-for-launchi.html
-share/doc/HTML/en/kwm/why-does-kwm-look-so-much-like-windows-95.html
+share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/authors.html
+share/doc/HTML/en/ksysguard/common
+share/doc/HTML/en/ksysguard/compilationandinstallation.html
+share/doc/HTML/en/ksysguard/frequentlyaskedquestions.html
+share/doc/HTML/en/ksysguard/index.docbook
+share/doc/HTML/en/ksysguard/index.html
+share/doc/HTML/en/ksysguard/installation.html
+share/doc/HTML/en/ksysguard/introduction.html
+share/doc/HTML/en/ksysguard/licenseandwarranty.html
+share/doc/HTML/en/ksysguard/requirements.html
+share/doc/HTML/en/ksysguard/thesensorbrowser.html
+share/doc/HTML/en/ksysguard/theworkspace.html
+share/doc/HTML/en/ksysguard/usingtheksysguard.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/common
+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.docbook
+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/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
@@ -1417,10 +1397,13 @@ share/icons/hicolor/32x32/devices/3floppy_mount.png
share/icons/hicolor/32x32/devices/3floppy_unmount.png
share/icons/hicolor/32x32/devices/5floppy_mount.png
share/icons/hicolor/32x32/devices/5floppy_unmount.png
+share/icons/hicolor/32x32/devices/cdaudio_mount.png
+share/icons/hicolor/32x32/devices/cdaudio_unmount.png
share/icons/hicolor/32x32/devices/cdrom_mount.png
share/icons/hicolor/32x32/devices/cdrom_unmount.png
share/icons/hicolor/32x32/devices/cdwriter_mount.png
share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_mount.png
share/icons/hicolor/32x32/devices/dvd_unmount.png
share/icons/hicolor/32x32/devices/hdd_mount.png
share/icons/hicolor/32x32/devices/hdd_unmount.png
@@ -1505,10 +1488,13 @@ share/icons/hicolor/48x48/devices/3floppy_mount.png
share/icons/hicolor/48x48/devices/3floppy_unmount.png
share/icons/hicolor/48x48/devices/5floppy_mount.png
share/icons/hicolor/48x48/devices/5floppy_unmount.png
+share/icons/hicolor/48x48/devices/cdaudio_mount.png
+share/icons/hicolor/48x48/devices/cdaudio_unmount.png
share/icons/hicolor/48x48/devices/cdrom_mount.png
share/icons/hicolor/48x48/devices/cdrom_unmount.png
share/icons/hicolor/48x48/devices/cdwriter_mount.png
share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_mount.png
share/icons/hicolor/48x48/devices/dvd_unmount.png
share/icons/hicolor/48x48/devices/hdd_mount.png
share/icons/hicolor/48x48/devices/hdd_unmount.png
@@ -1992,6 +1978,7 @@ share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
share/services/kurisearchfilter.desktop
+share/services/kxmlrpcd.desktop
share/services/man.protocol
share/services/nfs.protocol
share/services/nntp.protocol
@@ -2053,11 +2040,13 @@ share/wallpapers/northbeach.jpg
share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
-@dirrm share/doc/HTML/en/kwm
+@dirrm share/doc/HTML/en/kwrite
+@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kpager
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kikbd
+@dirrm share/doc/HTML/en/kmenuedit
+@dirrm share/doc/HTML/en/kicker
@dirrm share/doc/HTML/en/khelpcenter/userguide
@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/faq
@@ -2072,8 +2061,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
@dirrm share/apps/ksysguard/icons/locolor/16x16
-@dirrm share/apps/ksysguard/icons/locolor
-@dirrm share/apps/ksysguard/icons
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@dirrm share/apps/ksplash
@@ -2091,25 +2078,27 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/konqiconview
@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
@dirrm share/apps/kmenuedit/icons/locolor/16x16
-@dirrm share/apps/kmenuedit/icons/locolor
@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
@dirrm share/apps/kmenuedit/icons/hicolor/32x32
@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
@dirrm share/apps/kio_info
@dirrm share/apps/kicker/tiles
@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
@dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
@dirrm share/apps/khelpcenter/pics
@dirrm share/apps/khelpcenter/en
+@dirrm share/apps/khelpcenter
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
@dirrm share/apps/kdisplay/color-schemes
@dirrm share/apps/kdisplay/app-defaults
+@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
@dirrm share/apps/kdesktop/programs
@@ -2121,6 +2110,7 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kcontrol/pics
@dirrm share/apps/kcontrol
@dirrm share/apps/kcmlocale/pics
+@dirrm share/apps/kcmlocale
@dirrm share/apps/kcminput
@dirrm share/apps/kbookmark
@dirrm share/apps/kappfinder/apps/WordProcessing
@@ -2135,6 +2125,9 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kappfinder/apps/Editors
@dirrm share/apps/kappfinder/apps/Development
@dirrm share/apps/kappfinder/apps
+@dirrm share/apps/kappfinder
@dirrm share/apps/drkonqi/presets
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
+@dirrm share/apps/clockapplet
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 716040c2cfa2..58ccac30db20 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kde
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
@@ -19,7 +19,9 @@ RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \
kjumpingcube:${PORTSDIR}/games/kdegames2 \
kdf:${PORTSDIR}/misc/kdeutils2 \
kword:${PORTSDIR}/editors/koffice \
- kppp:${PORTSDIR}/net/kdenetwork2
+ kppp:${PORTSDIR}/net/kdenetwork2 \
+ pixie:${PORTSDIR}/graphics/kdegraphics2 \
+ kaiman:${PORTSDIR}/audio/kdemultimedia2
NO_BUILD= yes
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 3fbd30c494dc..5219b5b00274 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdebase
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 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
@@ -40,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index 094815fd3937..38387e559524 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
+MD5 (kdebase-1.94.tar.bz2) = a6617df687698e4954d7011a08625ec2
diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist
index c63b81caa6cb..3737b07b7ed0 100644
--- a/x11/kdebase2/pkg-plist
+++ b/x11/kdebase2/pkg-plist
@@ -134,6 +134,7 @@ lib/klegacyimport.so
lib/klipper.la
lib/klipper.so
lib/kmenuedit.la
+lib/kmenuedit.so
lib/kmenuedit.so.0
lib/konqueror.la
lib/konqueror.so
@@ -149,13 +150,10 @@ lib/kxmlrpcd.la
lib/kxmlrpcd.so
lib/libccont.a
lib/libclockapplet.la
+lib/libclockapplet.so
lib/libclockapplet.so.1
-lib/libexampleapplet.la
-lib/libexampleapplet.so.1
lib/libhtmlsearch.la
lib/libhtmlsearch.so
-lib/libkasbarapplet.la
-lib/libkasbarapplet.so.1
lib/libkcm_access.la
lib/libkcm_access.so
lib/libkcm_arts.la
@@ -168,6 +166,8 @@ lib/libkcm_clock.la
lib/libkcm_clock.so
lib/libkcm_colors.la
lib/libkcm_colors.so
+lib/libkcm_crypto.la
+lib/libkcm_crypto.so
lib/libkcm_email.la
lib/libkcm_email.so
lib/libkcm_energy.la
@@ -226,11 +226,16 @@ lib/libkcm_taskbar.la
lib/libkcm_taskbar.so
lib/libkcm_virtualdesktops.la
lib/libkcm_virtualdesktops.so
+lib/libkcm_xmlrpcd.la
+lib/libkcm_xmlrpcd.so
lib/libkhelpcenter.la
+lib/libkhelpcenter.so
lib/libkhelpcenter.so.4
lib/libkminipagerapplet.la
+lib/libkminipagerapplet.so
lib/libkminipagerapplet.so.1
lib/libkonq.la
+lib/libkonq.so
lib/libkonq.so.4
lib/libkonqdirtree.la
lib/libkonqdirtree.so
@@ -241,20 +246,27 @@ lib/libkonqlistview.so
lib/libkonsolepart.la
lib/libkonsolepart.so
lib/libkrunapplet.la
+lib/libkrunapplet.so
lib/libkrunapplet.so.1
lib/libkshorturifilter.la
+lib/libkshorturifilter.so
lib/libkshorturifilter.so.1
lib/libksystemtrayapplet.la
+lib/libksystemtrayapplet.so
lib/libksystemtrayapplet.so.1
lib/libktaskbarapplet.la
+lib/libktaskbarapplet.so
lib/libktaskbarapplet.so.1
lib/libkuriikwsfilter.la
+lib/libkuriikwsfilter.so
lib/libkuriikwsfilter.so.1
lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so
lib/libkurisearchfilter.so.1
lib/libkwinb2.la
lib/libkwinb2.so
lib/libkwindefault.la
+lib/libkwindefault.so
lib/libkwindefault.so.0
lib/libkwinkde1.la
lib/libkwinkde1.so
@@ -271,23 +283,23 @@ lib/libkwinsystem.so
lib/libkwritepart.la
lib/libkwritepart.so
lib/libquicklauncher.la
+lib/libquicklauncher.so
lib/libquicklauncher.so.1
lib/libsmb++.la
+lib/libsmb++.so
lib/libsmb++.so.0
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
share/applnk/Development/designer.desktop
-share/applnk/Editors/gvim.desktop
share/applnk/Editors/kwrite.desktop
+share/applnk/Editors/xedit.desktop
share/applnk/Games/.directory
share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
share/applnk/Help.desktop
share/applnk/Home.desktop
share/applnk/Internet/.directory
share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/netscape.desktop
share/applnk/KControl.desktop
share/applnk/Multimedia/.directory
share/applnk/Office/.directory
@@ -337,6 +349,7 @@ share/applnk/Settings/Peripherals/.directory
share/applnk/Settings/Peripherals/keyboard.desktop
share/applnk/Settings/Peripherals/mouse.desktop
share/applnk/Settings/Personalization/.directory
+share/applnk/Settings/Personalization/crypto.desktop
share/applnk/Settings/Personalization/email.desktop
share/applnk/Settings/Personalization/kcmaccess.desktop
share/applnk/Settings/Personalization/kcmlayout.desktop
@@ -359,36 +372,6 @@ share/applnk/Settings/WebBrowsing/useragent.desktop
share/applnk/System/.directory
share/applnk/System/Arrange.desktop
share/applnk/System/ScreenSavers/.directory
-share/applnk/System/ScreenSavers/Ant.desktop
-share/applnk/System/ScreenSavers/Atlantis.desktop
-share/applnk/System/ScreenSavers/Attraction.desktop
-share/applnk/System/ScreenSavers/Bouboule.desktop
-share/applnk/System/ScreenSavers/Braid.desktop
-share/applnk/System/ScreenSavers/Bubble3d.desktop
-share/applnk/System/ScreenSavers/Bubbles.desktop
-share/applnk/System/ScreenSavers/Cage.desktop
-share/applnk/System/ScreenSavers/Compass.desktop
-share/applnk/System/ScreenSavers/Coral.desktop
-share/applnk/System/ScreenSavers/Crystal.desktop
-share/applnk/System/ScreenSavers/Cynosure.desktop
-share/applnk/System/ScreenSavers/Demon.desktop
-share/applnk/System/ScreenSavers/Drift.desktop
-share/applnk/System/ScreenSavers/Fadeplot.desktop
-share/applnk/System/ScreenSavers/Flag.desktop
-share/applnk/System/ScreenSavers/Flame.desktop
-share/applnk/System/ScreenSavers/Flow.desktop
-share/applnk/System/ScreenSavers/Forest.desktop
-share/applnk/System/ScreenSavers/GLPlanet.desktop
-share/applnk/System/ScreenSavers/Galaxy.desktop
-share/applnk/System/ScreenSavers/Gears.desktop
-share/applnk/System/ScreenSavers/Goop.desktop
-share/applnk/System/ScreenSavers/Grav.desktop
-share/applnk/System/ScreenSavers/Hopalong.desktop
-share/applnk/System/ScreenSavers/Hypercube.desktop
-share/applnk/System/ScreenSavers/Ifs.desktop
-share/applnk/System/ScreenSavers/Imsmap.desktop
-share/applnk/System/ScreenSavers/Interference.desktop
-share/applnk/System/ScreenSavers/Julia.desktop
share/applnk/System/ScreenSavers/KAttration.desktop
share/applnk/System/ScreenSavers/KBanner.desktop
share/applnk/System/ScreenSavers/KBlankscreen.desktop
@@ -416,34 +399,7 @@ share/applnk/System/ScreenSavers/KSlip.desktop
share/applnk/System/ScreenSavers/KSpace.desktop
share/applnk/System/ScreenSavers/KSwarm.desktop
share/applnk/System/ScreenSavers/KVm.desktop
-share/applnk/System/ScreenSavers/Kaleidescope.desktop
-share/applnk/System/ScreenSavers/Kumppa.desktop
-share/applnk/System/ScreenSavers/LMorph.desktop
-share/applnk/System/ScreenSavers/Lament.desktop
-share/applnk/System/ScreenSavers/Laser.desktop
-share/applnk/System/ScreenSavers/Lightning.desktop
-share/applnk/System/ScreenSavers/Lissie.desktop
-share/applnk/System/ScreenSavers/Moenius.desktop
-share/applnk/System/ScreenSavers/Penrose.desktop
-share/applnk/System/ScreenSavers/Phosphor.desktop
-share/applnk/System/ScreenSavers/Pulsar.desktop
-share/applnk/System/ScreenSavers/Rubik.desktop
-share/applnk/System/ScreenSavers/Slip.desktop
-share/applnk/System/ScreenSavers/Sonar.desktop
-share/applnk/System/ScreenSavers/Sproingies.desktop
-share/applnk/System/ScreenSavers/Stairs.desktop
-share/applnk/System/ScreenSavers/Starfish.desktop
-share/applnk/System/ScreenSavers/Strange.desktop
-share/applnk/System/ScreenSavers/Superquadrics.desktop
-share/applnk/System/ScreenSavers/Swirl.desktop
-share/applnk/System/ScreenSavers/T3d.desktop
-share/applnk/System/ScreenSavers/Triangle.desktop
-share/applnk/System/ScreenSavers/Vines.desktop
share/applnk/System/ScreenSavers/Worm.desktop
-share/applnk/System/ScreenSavers/XFlame.desktop
-share/applnk/System/ScreenSavers/XJack.desktop
-share/applnk/System/ScreenSavers/XMatrix.desktop
-share/applnk/System/ScreenSavers/XPipes.desktop
share/applnk/System/kappfinder.desktop
share/applnk/System/kfmclient.desktop
share/applnk/System/klegacyimport.desktop
@@ -452,17 +408,19 @@ share/applnk/System/konquerorsu.desktop
share/applnk/System/konsole.desktop
share/applnk/System/konsolesu.desktop
share/applnk/System/ksysguard.desktop
+share/applnk/Toys/xeyes.desktop
share/applnk/Utilities/.directory
share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/kpager.desktop
share/applnk/Utilities/ktip.desktop
share/applnk/Utilities/passwd.desktop
+share/applnk/Utilities/xcalc.desktop
share/applnk/Utilities/xclipboard.desktop
share/applnk/Utilities/xclock.desktop
share/applnk/Utilities/xconsole.desktop
+share/applnk/Utilities/xload.desktop
share/applnk/Utilities/xmag.desktop
share/applnk/Utilities/xterm.desktop
-share/applnk/WordProcessing/xpdf.desktop
share/apps/clockapplet/pics/lcd.png
share/apps/drkonqi/pics/konqi.png
share/apps/drkonqi/presets/developerrc
@@ -673,10 +631,8 @@ share/apps/khelpcenter/pics/star.png
share/apps/khelpcenter/pics/star_blank.png
share/apps/khelpcenter/pics/unchecked.xpm
share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.kdelnk
+share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/exampleapplet.desktop
-share/apps/kicker/applets/kasbarapplet.desktop
share/apps/kicker/applets/kminipagerapplet.desktop
share/apps/kicker/applets/krunapplet.desktop
share/apps/kicker/applets/ksystemtrayapplet.desktop
@@ -831,7 +787,7 @@ share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
-share/apps/ksysguard/ksysguard.rc
+share/apps/ksysguard/ksysguardui.rc
share/apps/kwin/b2.desktop
share/apps/kwin/eventsrc
share/apps/kwin/kde.desktop
@@ -893,18 +849,14 @@ share/config/penroserc
share/config/rocksrc
share/config/sliprc
share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/advanced.html
-share/doc/HTML/en/kcontrol/application.html
+share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
+share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
-share/doc/HTML/en/kcontrol/browsing-files.html
-share/doc/HTML/en/kcontrol/browsing-help.html
-share/doc/HTML/en/kcontrol/browsing-neighborhood.html
-share/doc/HTML/en/kcontrol/browsing-web.html
-share/doc/HTML/en/kcontrol/browsing.html
share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
share/doc/HTML/en/kcontrol/control-center-exiting.html
share/doc/HTML/en/kcontrol/control-center-menus.html
share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -921,25 +873,22 @@ share/doc/HTML/en/kcontrol/email.html
share/doc/HTML/en/kcontrol/energy.html
share/doc/HTML/en/kcontrol/file-assoc.html
share/doc/HTML/en/kcontrol/file-manager.html
-share/doc/HTML/en/kcontrol/fonts-man.html
share/doc/HTML/en/kcontrol/fonts.html
share/doc/HTML/en/kcontrol/help-index.html
share/doc/HTML/en/kcontrol/icons.html
-share/doc/HTML/en/kcontrol/index.cvlog
+share/doc/HTML/en/kcontrol/iconstyle.html
share/doc/HTML/en/kcontrol/index.docbook
share/doc/HTML/en/kcontrol/index.html
-share/doc/HTML/en/kcontrol/info.html
share/doc/HTML/en/kcontrol/interrupts.html
share/doc/HTML/en/kcontrol/introduction.html
share/doc/HTML/en/kcontrol/ioports.html
share/doc/HTML/en/kcontrol/kbd.html
+share/doc/HTML/en/kcontrol/kblayout.html
+share/doc/HTML/en/kcontrol/kcmaccess.docbook
share/doc/HTML/en/kcontrol/kcmaction.docbook
-share/doc/HTML/en/kcontrol/kcmadv.docbook
share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
share/doc/HTML/en/kcontrol/kcmbatmon.docbook
-share/doc/HTML/en/kcontrol/kcmbell.cvlog
share/doc/HTML/en/kcontrol/kcmbell.docbook
-share/doc/HTML/en/kcontrol/kcmbell.html
share/doc/HTML/en/kcontrol/kcmblockdev.docbook
share/doc/HTML/en/kcontrol/kcmborders.docbook
share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -947,8 +896,6 @@ share/doc/HTML/en/kcontrol/kcmcookie.docbook
share/doc/HTML/en/kcontrol/kcmdatetime.docbook
share/doc/HTML/en/kcontrol/kcmdesktop.docbook
share/doc/HTML/en/kcontrol/kcmdeviceinfo.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay.cvlog
-share/doc/HTML/en/kcontrol/kcmdisplay.docbook
share/doc/HTML/en/kcontrol/kcmdmainfo.docbook
share/doc/HTML/en/kcontrol/kcmdrkonqi.docbook
share/doc/HTML/en/kcontrol/kcmebrowse.docbook
@@ -956,29 +903,17 @@ share/doc/HTML/en/kcontrol/kcmemail.docbook
share/doc/HTML/en/kcontrol/kcmenergy.docbook
share/doc/HTML/en/kcontrol/kcmfile.docbook
share/doc/HTML/en/kcontrol/kcmfileman.docbook
-share/doc/HTML/en/kcontrol/kcmfontmanager.docbook
share/doc/HTML/en/kcontrol/kcmfonts.docbook
share/doc/HTML/en/kcontrol/kcmhelpindex.docbook
share/doc/HTML/en/kcontrol/kcmicon.docbook
-share/doc/HTML/en/kcontrol/kcminput.cvlog
-share/doc/HTML/en/kcontrol/kcminput.docbook
+share/doc/HTML/en/kcontrol/kcmiconstyle.docbook
share/doc/HTML/en/kcontrol/kcmintinfo.docbook
share/doc/HTML/en/kcontrol/kcmioportinfo.docbook
share/doc/HTML/en/kcontrol/kcmkbd.docbook
+share/doc/HTML/en/kcontrol/kcmkblayout.docbook
share/doc/HTML/en/kcontrol/kcmkbrowse.docbook
-share/doc/HTML/en/kcontrol/kcmkdesu.cvlog
-share/doc/HTML/en/kcontrol/kcmkdesu.docbook
share/doc/HTML/en/kcontrol/kcmkeybind.docbook
-share/doc/HTML/en/kcontrol/kcmkeys.cvlog
share/doc/HTML/en/kcontrol/kcmkeys.docbook
-share/doc/HTML/en/kcontrol/kcmkfm.cvlog
-share/doc/HTML/en/kcontrol/kcmkfm.docbook
-share/doc/HTML/en/kcontrol/kcmkpanel.cvlog
-share/doc/HTML/en/kcontrol/kcmkpanel.docbook
-share/doc/HTML/en/kcontrol/kcmkwm.cvlog
-share/doc/HTML/en/kcontrol/kcmkwm.docbook
-share/doc/HTML/en/kcontrol/kcmlocale.cvlog
-share/doc/HTML/en/kcontrol/kcmlocale.docbook
share/doc/HTML/en/kcontrol/kcmlocate.docbook
share/doc/HTML/en/kcontrol/kcmloginmanage.docbook
share/doc/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -986,26 +921,22 @@ share/doc/HTML/en/kcontrol/kcmlowbatwarn.docbook
share/doc/HTML/en/kcontrol/kcmmemoryinfo.docbook
share/doc/HTML/en/kcontrol/kcmmouse.docbook
share/doc/HTML/en/kcontrol/kcmmousebeh.docbook
+share/doc/HTML/en/kcontrol/kcmnumbername.docbook
share/doc/HTML/en/kcontrol/kcmpanel.docbook
share/doc/HTML/en/kcontrol/kcmpartitioninfo.docbook
share/doc/HTML/en/kcontrol/kcmpasswd.docbook
share/doc/HTML/en/kcontrol/kcmpciinfo.docbook
-share/doc/HTML/en/kcontrol/kcmpcmia.docbook
+share/doc/HTML/en/kcontrol/kcmpcmcia.docbook
share/doc/HTML/en/kcontrol/kcmpowerctrl.docbook
share/doc/HTML/en/kcontrol/kcmprocinfo.docbook
share/doc/HTML/en/kcontrol/kcmproxie.docbook
-share/doc/HTML/en/kcontrol/kcmsamba.cvlog
-share/doc/HTML/en/kcontrol/kcmsamba.docbook
share/doc/HTML/en/kcontrol/kcmscnsave.docbook
share/doc/HTML/en/kcontrol/kcmscsiinfo.docbook
share/doc/HTML/en/kcontrol/kcmsmbstat.docbook
share/doc/HTML/en/kcontrol/kcmsndinfo.docbook
share/doc/HTML/en/kcontrol/kcmsndsrv.docbook
-share/doc/HTML/en/kcontrol/kcmsounds.docbook
share/doc/HTML/en/kcontrol/kcmstyle.docbook
share/doc/HTML/en/kcontrol/kcmsysnotify.docbook
-share/doc/HTML/en/kcontrol/kcmsyssound.cvlog
-share/doc/HTML/en/kcontrol/kcmsyssound.docbook
share/doc/HTML/en/kcontrol/kcmtalk.docbook
share/doc/HTML/en/kcontrol/kcmtaskbar.docbook
share/doc/HTML/en/kcontrol/kcmuseragent.docbook
@@ -1013,16 +944,7 @@ share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/konq-browsing.html
-share/doc/HTML/en/kcontrol/konqui.html
-share/doc/HTML/en/kcontrol/kthememgr.cvlog
-share/doc/HTML/en/kcontrol/kthememgr.docbook
-share/doc/HTML/en/kcontrol/kthememgr.html
share/doc/HTML/en/kcontrol/laptop.html
-share/doc/HTML/en/kcontrol/lf-desktop.html
-share/doc/HTML/en/kcontrol/lf-panel.html
-share/doc/HTML/en/kcontrol/lf-themes.html
-share/doc/HTML/en/kcontrol/lf-window-behavior.html
-share/doc/HTML/en/kcontrol/lf.html
share/doc/HTML/en/kcontrol/locale.html
share/doc/HTML/en/kcontrol/login-manager.html
share/doc/HTML/en/kcontrol/lowbatcrit.html
@@ -1032,43 +954,38 @@ share/doc/HTML/en/kcontrol/module.html
share/doc/HTML/en/kcontrol/modules.html
share/doc/HTML/en/kcontrol/mouse-behav.html
share/doc/HTML/en/kcontrol/mouse.html
-share/doc/HTML/en/kcontrol/network.html
+share/doc/HTML/en/kcontrol/numbername.html
share/doc/HTML/en/kcontrol/panel.html
share/doc/HTML/en/kcontrol/partitions.html
share/doc/HTML/en/kcontrol/passwords.html
share/doc/HTML/en/kcontrol/pci.html
-share/doc/HTML/en/kcontrol/pcmia.html
-share/doc/HTML/en/kcontrol/periph.html
-share/doc/HTML/en/kcontrol/personalize.html
-share/doc/HTML/en/kcontrol/power.html
+share/doc/HTML/en/kcontrol/pcmcia.html
share/doc/HTML/en/kcontrol/powerctrl.html
share/doc/HTML/en/kcontrol/processor.html
share/doc/HTML/en/kcontrol/proxies.html
share/doc/HTML/en/kcontrol/sambastatus.html
share/doc/HTML/en/kcontrol/screensaver.html
+share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/scsi.html
share/doc/HTML/en/kcontrol/sndserver.html
-share/doc/HTML/en/kcontrol/sound.html
share/doc/HTML/en/kcontrol/soundinfo.html
share/doc/HTML/en/kcontrol/style.html
share/doc/HTML/en/kcontrol/sys-notify.html
-share/doc/HTML/en/kcontrol/sys-sounds.html
-share/doc/HTML/en/kcontrol/system1.html
-share/doc/HTML/en/kcontrol/systemmenu.html
share/doc/HTML/en/kcontrol/talk.html
share/doc/HTML/en/kcontrol/taskbar.html
share/doc/HTML/en/kcontrol/user-agent.html
share/doc/HTML/en/kcontrol/windows-shares.html
share/doc/HTML/en/kcontrol/xserver.html
share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdebugdialog/index.html
share/doc/HTML/en/kdebugdialog/introduction.html
share/doc/HTML/en/kdesu/.anchors
share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/compiling.html
share/doc/HTML/en/kdesu/configuration.html
-share/doc/HTML/en/kdesu/index.cvlog
share/doc/HTML/en/kdesu/index.docbook
share/doc/HTML/en/kdesu/index.html
share/doc/HTML/en/kdesu/installation.html
@@ -1076,15 +993,15 @@ share/doc/HTML/en/kdesu/interface-to-su.html
share/doc/HTML/en/kdesu/internals.html
share/doc/HTML/en/kdesu/introduction.html
share/doc/HTML/en/kdesu/password-checking.html
-share/doc/HTML/en/kdesu/secpasswordkeeping.html
-share/doc/HTML/en/kdesu/usingkdesu.html
+share/doc/HTML/en/kdesu/sec-password-keeping.html
+share/doc/HTML/en/kdesu/using-kdesu.html
share/doc/HTML/en/kdm/.anchors
share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/configuring-kdm.html
share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
share/doc/HTML/en/kdm/credits.html
share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
-share/doc/HTML/en/kdm/index.cvlog
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/index.html
share/doc/HTML/en/kdm/introduction.html
@@ -1093,12 +1010,14 @@ share/doc/HTML/en/kdm/lilo.html
share/doc/HTML/en/kdm/locale.html
share/doc/HTML/en/kdm/other-information.html
share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
share/doc/HTML/en/khelpcenter/contact-developers.html
share/doc/HTML/en/khelpcenter/contact-more-information.html
share/doc/HTML/en/khelpcenter/contact-official.html
share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/faq/.anchors
+share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/index.cvlog
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
@@ -1114,10 +1033,10 @@ share/doc/HTML/en/khelpcenter/quickstart/.anchors
share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
share/doc/HTML/en/khelpcenter/quickstart/configure.html
share/doc/HTML/en/khelpcenter/quickstart/credits.html
-share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/quickstart/index.html
share/doc/HTML/en/khelpcenter/quickstart/introduction.html
@@ -1141,6 +1060,7 @@ share/doc/HTML/en/khelpcenter/userguide/activating-the-screen-saver-by-moving-yo
share/doc/HTML/en/khelpcenter/userguide/addingprograms.html
share/doc/HTML/en/khelpcenter/userguide/allaboutyourdesktop.html
share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/contacting-the-authors.html
share/doc/HTML/en/khelpcenter/userguide/contactingauthors.html
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
@@ -1204,27 +1124,64 @@ share/doc/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
share/doc/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
share/doc/HTML/en/khelpcenter/what-is-kde.html
share/doc/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/HTML/en/kikbd/.anchors
-share/doc/HTML/en/kikbd/advanced.html
-share/doc/HTML/en/kikbd/advanced.png
-share/doc/HTML/en/kikbd/authors.html
-share/doc/HTML/en/kikbd/bug-reporting.html
-share/doc/HTML/en/kikbd/config.html
-share/doc/HTML/en/kikbd/create.html
-share/doc/HTML/en/kikbd/general.html
-share/doc/HTML/en/kikbd/general.png
-share/doc/HTML/en/kikbd/index.cvlog
-share/doc/HTML/en/kikbd/index.docbook
-share/doc/HTML/en/kikbd/index.html
-share/doc/HTML/en/kikbd/installation.html
-share/doc/HTML/en/kikbd/introduction.html
-share/doc/HTML/en/kikbd/nationalkeyboard.html
-share/doc/HTML/en/kikbd/screen-saver-password-problems..html
-share/doc/HTML/en/kikbd/startup.html
-share/doc/HTML/en/kikbd/startup.png
-share/doc/HTML/en/kikbd/style.html
-share/doc/HTML/en/kikbd/style.png
-share/doc/HTML/en/kikbd/troubleshooting.html
+share/doc/HTML/en/kicker/.anchors
+share/doc/HTML/en/kicker/access_config.png
+share/doc/HTML/en/kicker/basic_icons.png
+share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
+share/doc/HTML/en/kicker/config_window.png
+share/doc/HTML/en/kicker/configuration-adding-icons.html
+share/doc/HTML/en/kicker/configuration-config-window.html
+share/doc/HTML/en/kicker/configuration.html
+share/doc/HTML/en/kicker/credits.html
+share/doc/HTML/en/kicker/drag-and-drop.html
+share/doc/HTML/en/kicker/drag_applet.png
+share/doc/HTML/en/kicker/five-minute-course.html
+share/doc/HTML/en/kicker/glossary.html
+share/doc/HTML/en/kicker/handles.png
+share/doc/HTML/en/kicker/hide_buttons.png
+share/doc/HTML/en/kicker/i_adv_editor.png
+share/doc/HTML/en/kicker/i_control_center.png
+share/doc/HTML/en/kicker/i_desktop.png
+share/doc/HTML/en/kicker/i_help.png
+share/doc/HTML/en/kicker/i_home_dir.png
+share/doc/HTML/en/kicker/i_k_button.png
+share/doc/HTML/en/kicker/i_kandalfs_tips.png
+share/doc/HTML/en/kicker/i_shell.png
+share/doc/HTML/en/kicker/i_window_list.png
+share/doc/HTML/en/kicker/index.docbook
+share/doc/HTML/en/kicker/index.html
+share/doc/HTML/en/kicker/installation.html
+share/doc/HTML/en/kicker/introduction.html
+share/doc/HTML/en/kicker/kicker-for-admins-symbolic-links.html
+share/doc/HTML/en/kicker/kicker-for-admins.html
+share/doc/HTML/en/kicker/kicker-panel-elements.html
+share/doc/HTML/en/kicker/kicker_access_size.png
+share/doc/HTML/en/kicker/kicker_add_basic.png
+share/doc/HTML/en/kicker/kicker_basic_icons.png
+share/doc/HTML/en/kicker/kicker_basic_icons_2.png
+share/doc/HTML/en/kicker/other-features.html
+share/doc/HTML/en/kicker/qb_root.png
+share/doc/HTML/en/kicker/using-kicker.html
+share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
+share/doc/HTML/en/kmenuedit/credits.html
+share/doc/HTML/en/kmenuedit/details-advanced.html
+share/doc/HTML/en/kmenuedit/glossary.html
+share/doc/HTML/en/kmenuedit/i_copy.png
+share/doc/HTML/en/kmenuedit/i_cut.png
+share/doc/HTML/en/kmenuedit/i_delete.png
+share/doc/HTML/en/kmenuedit/i_k_button.png
+share/doc/HTML/en/kmenuedit/i_new_item.png
+share/doc/HTML/en/kmenuedit/i_new_submenu.png
+share/doc/HTML/en/kmenuedit/i_paste.png
+share/doc/HTML/en/kmenuedit/icon_sets.png
+share/doc/HTML/en/kmenuedit/icons.png
+share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/introduction.html
+share/doc/HTML/en/kmenuedit/menu-reference.html
+share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
@@ -1233,6 +1190,7 @@ share/doc/HTML/en/konqueror/bubble.html
share/doc/HTML/en/konqueror/cmndline.png
share/doc/HTML/en/konqueror/commandline.html
share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
@@ -1271,12 +1229,15 @@ share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/credits.html
share/doc/HTML/en/konsole/history-option.html
share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole1.gif
+share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
share/doc/HTML/en/konsole/mousebuttons.html
share/doc/HTML/en/konsole/techref.html
@@ -1284,6 +1245,7 @@ share/doc/HTML/en/konsole/toolbar.html
share/doc/HTML/en/konsole/use-of-konsole.html
share/doc/HTML/en/konsole/vt100.gif
share/doc/HTML/en/kpager/.anchors
+share/doc/HTML/en/kpager/common
share/doc/HTML/en/kpager/compilation-and-installation.html
share/doc/HTML/en/kpager/customizingkpageradvancedfeatures.html
share/doc/HTML/en/kpager/frequentlyaskedquestionsfaq.html
@@ -1299,25 +1261,43 @@ share/doc/HTML/en/kpager/rows-mode.html
share/doc/HTML/en/kpager/the-global-desktop.html
share/doc/HTML/en/kpager/the-window-properties-menu.html
share/doc/HTML/en/kpager/workingwithkpager.html
-share/doc/HTML/en/kwm/.anchors
-share/doc/HTML/en/kwm/authors.html
-share/doc/HTML/en/kwm/commands.html
-share/doc/HTML/en/kwm/configuration.html
-share/doc/HTML/en/kwm/does-kwm-support-shaded-windows-a-la-openste.html
-share/doc/HTML/en/kwm/epilogue.html
-share/doc/HTML/en/kwm/frequentlyaskedquestions.html
-share/doc/HTML/en/kwm/index.cvlog
-share/doc/HTML/en/kwm/index.docbook
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kwm/introduction.html
-share/doc/HTML/en/kwm/is-it-possible-to-add-kde-extensions-to-othe.html
-share/doc/HTML/en/kwm/minicli.html
-share/doc/HTML/en/kwm/mouse-control.html
-share/doc/HTML/en/kwm/shortcuts.html
-share/doc/HTML/en/kwm/soundevents.html
-share/doc/HTML/en/kwm/usingemphasiskwmemphasis.html
-share/doc/HTML/en/kwm/why-can-t-i-define-new-shortcuts-for-launchi.html
-share/doc/HTML/en/kwm/why-does-kwm-look-so-much-like-windows-95.html
+share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/authors.html
+share/doc/HTML/en/ksysguard/common
+share/doc/HTML/en/ksysguard/compilationandinstallation.html
+share/doc/HTML/en/ksysguard/frequentlyaskedquestions.html
+share/doc/HTML/en/ksysguard/index.docbook
+share/doc/HTML/en/ksysguard/index.html
+share/doc/HTML/en/ksysguard/installation.html
+share/doc/HTML/en/ksysguard/introduction.html
+share/doc/HTML/en/ksysguard/licenseandwarranty.html
+share/doc/HTML/en/ksysguard/requirements.html
+share/doc/HTML/en/ksysguard/thesensorbrowser.html
+share/doc/HTML/en/ksysguard/theworkspace.html
+share/doc/HTML/en/ksysguard/usingtheksysguard.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/common
+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.docbook
+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/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
@@ -1417,10 +1397,13 @@ share/icons/hicolor/32x32/devices/3floppy_mount.png
share/icons/hicolor/32x32/devices/3floppy_unmount.png
share/icons/hicolor/32x32/devices/5floppy_mount.png
share/icons/hicolor/32x32/devices/5floppy_unmount.png
+share/icons/hicolor/32x32/devices/cdaudio_mount.png
+share/icons/hicolor/32x32/devices/cdaudio_unmount.png
share/icons/hicolor/32x32/devices/cdrom_mount.png
share/icons/hicolor/32x32/devices/cdrom_unmount.png
share/icons/hicolor/32x32/devices/cdwriter_mount.png
share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_mount.png
share/icons/hicolor/32x32/devices/dvd_unmount.png
share/icons/hicolor/32x32/devices/hdd_mount.png
share/icons/hicolor/32x32/devices/hdd_unmount.png
@@ -1505,10 +1488,13 @@ share/icons/hicolor/48x48/devices/3floppy_mount.png
share/icons/hicolor/48x48/devices/3floppy_unmount.png
share/icons/hicolor/48x48/devices/5floppy_mount.png
share/icons/hicolor/48x48/devices/5floppy_unmount.png
+share/icons/hicolor/48x48/devices/cdaudio_mount.png
+share/icons/hicolor/48x48/devices/cdaudio_unmount.png
share/icons/hicolor/48x48/devices/cdrom_mount.png
share/icons/hicolor/48x48/devices/cdrom_unmount.png
share/icons/hicolor/48x48/devices/cdwriter_mount.png
share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_mount.png
share/icons/hicolor/48x48/devices/dvd_unmount.png
share/icons/hicolor/48x48/devices/hdd_mount.png
share/icons/hicolor/48x48/devices/hdd_unmount.png
@@ -1992,6 +1978,7 @@ share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
share/services/kurisearchfilter.desktop
+share/services/kxmlrpcd.desktop
share/services/man.protocol
share/services/nfs.protocol
share/services/nntp.protocol
@@ -2053,11 +2040,13 @@ share/wallpapers/northbeach.jpg
share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
-@dirrm share/doc/HTML/en/kwm
+@dirrm share/doc/HTML/en/kwrite
+@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kpager
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kikbd
+@dirrm share/doc/HTML/en/kmenuedit
+@dirrm share/doc/HTML/en/kicker
@dirrm share/doc/HTML/en/khelpcenter/userguide
@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/faq
@@ -2072,8 +2061,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
@dirrm share/apps/ksysguard/icons/locolor/16x16
-@dirrm share/apps/ksysguard/icons/locolor
-@dirrm share/apps/ksysguard/icons
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@dirrm share/apps/ksplash
@@ -2091,25 +2078,27 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/konqiconview
@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
@dirrm share/apps/kmenuedit/icons/locolor/16x16
-@dirrm share/apps/kmenuedit/icons/locolor
@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
@dirrm share/apps/kmenuedit/icons/hicolor/32x32
@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
@dirrm share/apps/kio_info
@dirrm share/apps/kicker/tiles
@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
@dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
@dirrm share/apps/khelpcenter/pics
@dirrm share/apps/khelpcenter/en
+@dirrm share/apps/khelpcenter
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
@dirrm share/apps/kdisplay/color-schemes
@dirrm share/apps/kdisplay/app-defaults
+@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
@dirrm share/apps/kdesktop/programs
@@ -2121,6 +2110,7 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kcontrol/pics
@dirrm share/apps/kcontrol
@dirrm share/apps/kcmlocale/pics
+@dirrm share/apps/kcmlocale
@dirrm share/apps/kcminput
@dirrm share/apps/kbookmark
@dirrm share/apps/kappfinder/apps/WordProcessing
@@ -2135,6 +2125,9 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kappfinder/apps/Editors
@dirrm share/apps/kappfinder/apps/Development
@dirrm share/apps/kappfinder/apps
+@dirrm share/apps/kappfinder
@dirrm share/apps/drkonqi/presets
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
+@dirrm share/apps/clockapplet
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 3fbd30c494dc..5219b5b00274 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdebase
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 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
@@ -40,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 094815fd3937..38387e559524 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
+MD5 (kdebase-1.94.tar.bz2) = a6617df687698e4954d7011a08625ec2
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index c63b81caa6cb..3737b07b7ed0 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -134,6 +134,7 @@ lib/klegacyimport.so
lib/klipper.la
lib/klipper.so
lib/kmenuedit.la
+lib/kmenuedit.so
lib/kmenuedit.so.0
lib/konqueror.la
lib/konqueror.so
@@ -149,13 +150,10 @@ lib/kxmlrpcd.la
lib/kxmlrpcd.so
lib/libccont.a
lib/libclockapplet.la
+lib/libclockapplet.so
lib/libclockapplet.so.1
-lib/libexampleapplet.la
-lib/libexampleapplet.so.1
lib/libhtmlsearch.la
lib/libhtmlsearch.so
-lib/libkasbarapplet.la
-lib/libkasbarapplet.so.1
lib/libkcm_access.la
lib/libkcm_access.so
lib/libkcm_arts.la
@@ -168,6 +166,8 @@ lib/libkcm_clock.la
lib/libkcm_clock.so
lib/libkcm_colors.la
lib/libkcm_colors.so
+lib/libkcm_crypto.la
+lib/libkcm_crypto.so
lib/libkcm_email.la
lib/libkcm_email.so
lib/libkcm_energy.la
@@ -226,11 +226,16 @@ lib/libkcm_taskbar.la
lib/libkcm_taskbar.so
lib/libkcm_virtualdesktops.la
lib/libkcm_virtualdesktops.so
+lib/libkcm_xmlrpcd.la
+lib/libkcm_xmlrpcd.so
lib/libkhelpcenter.la
+lib/libkhelpcenter.so
lib/libkhelpcenter.so.4
lib/libkminipagerapplet.la
+lib/libkminipagerapplet.so
lib/libkminipagerapplet.so.1
lib/libkonq.la
+lib/libkonq.so
lib/libkonq.so.4
lib/libkonqdirtree.la
lib/libkonqdirtree.so
@@ -241,20 +246,27 @@ lib/libkonqlistview.so
lib/libkonsolepart.la
lib/libkonsolepart.so
lib/libkrunapplet.la
+lib/libkrunapplet.so
lib/libkrunapplet.so.1
lib/libkshorturifilter.la
+lib/libkshorturifilter.so
lib/libkshorturifilter.so.1
lib/libksystemtrayapplet.la
+lib/libksystemtrayapplet.so
lib/libksystemtrayapplet.so.1
lib/libktaskbarapplet.la
+lib/libktaskbarapplet.so
lib/libktaskbarapplet.so.1
lib/libkuriikwsfilter.la
+lib/libkuriikwsfilter.so
lib/libkuriikwsfilter.so.1
lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so
lib/libkurisearchfilter.so.1
lib/libkwinb2.la
lib/libkwinb2.so
lib/libkwindefault.la
+lib/libkwindefault.so
lib/libkwindefault.so.0
lib/libkwinkde1.la
lib/libkwinkde1.so
@@ -271,23 +283,23 @@ lib/libkwinsystem.so
lib/libkwritepart.la
lib/libkwritepart.so
lib/libquicklauncher.la
+lib/libquicklauncher.so
lib/libquicklauncher.so.1
lib/libsmb++.la
+lib/libsmb++.so
lib/libsmb++.so.0
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
share/applnk/Development/designer.desktop
-share/applnk/Editors/gvim.desktop
share/applnk/Editors/kwrite.desktop
+share/applnk/Editors/xedit.desktop
share/applnk/Games/.directory
share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
share/applnk/Help.desktop
share/applnk/Home.desktop
share/applnk/Internet/.directory
share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/netscape.desktop
share/applnk/KControl.desktop
share/applnk/Multimedia/.directory
share/applnk/Office/.directory
@@ -337,6 +349,7 @@ share/applnk/Settings/Peripherals/.directory
share/applnk/Settings/Peripherals/keyboard.desktop
share/applnk/Settings/Peripherals/mouse.desktop
share/applnk/Settings/Personalization/.directory
+share/applnk/Settings/Personalization/crypto.desktop
share/applnk/Settings/Personalization/email.desktop
share/applnk/Settings/Personalization/kcmaccess.desktop
share/applnk/Settings/Personalization/kcmlayout.desktop
@@ -359,36 +372,6 @@ share/applnk/Settings/WebBrowsing/useragent.desktop
share/applnk/System/.directory
share/applnk/System/Arrange.desktop
share/applnk/System/ScreenSavers/.directory
-share/applnk/System/ScreenSavers/Ant.desktop
-share/applnk/System/ScreenSavers/Atlantis.desktop
-share/applnk/System/ScreenSavers/Attraction.desktop
-share/applnk/System/ScreenSavers/Bouboule.desktop
-share/applnk/System/ScreenSavers/Braid.desktop
-share/applnk/System/ScreenSavers/Bubble3d.desktop
-share/applnk/System/ScreenSavers/Bubbles.desktop
-share/applnk/System/ScreenSavers/Cage.desktop
-share/applnk/System/ScreenSavers/Compass.desktop
-share/applnk/System/ScreenSavers/Coral.desktop
-share/applnk/System/ScreenSavers/Crystal.desktop
-share/applnk/System/ScreenSavers/Cynosure.desktop
-share/applnk/System/ScreenSavers/Demon.desktop
-share/applnk/System/ScreenSavers/Drift.desktop
-share/applnk/System/ScreenSavers/Fadeplot.desktop
-share/applnk/System/ScreenSavers/Flag.desktop
-share/applnk/System/ScreenSavers/Flame.desktop
-share/applnk/System/ScreenSavers/Flow.desktop
-share/applnk/System/ScreenSavers/Forest.desktop
-share/applnk/System/ScreenSavers/GLPlanet.desktop
-share/applnk/System/ScreenSavers/Galaxy.desktop
-share/applnk/System/ScreenSavers/Gears.desktop
-share/applnk/System/ScreenSavers/Goop.desktop
-share/applnk/System/ScreenSavers/Grav.desktop
-share/applnk/System/ScreenSavers/Hopalong.desktop
-share/applnk/System/ScreenSavers/Hypercube.desktop
-share/applnk/System/ScreenSavers/Ifs.desktop
-share/applnk/System/ScreenSavers/Imsmap.desktop
-share/applnk/System/ScreenSavers/Interference.desktop
-share/applnk/System/ScreenSavers/Julia.desktop
share/applnk/System/ScreenSavers/KAttration.desktop
share/applnk/System/ScreenSavers/KBanner.desktop
share/applnk/System/ScreenSavers/KBlankscreen.desktop
@@ -416,34 +399,7 @@ share/applnk/System/ScreenSavers/KSlip.desktop
share/applnk/System/ScreenSavers/KSpace.desktop
share/applnk/System/ScreenSavers/KSwarm.desktop
share/applnk/System/ScreenSavers/KVm.desktop
-share/applnk/System/ScreenSavers/Kaleidescope.desktop
-share/applnk/System/ScreenSavers/Kumppa.desktop
-share/applnk/System/ScreenSavers/LMorph.desktop
-share/applnk/System/ScreenSavers/Lament.desktop
-share/applnk/System/ScreenSavers/Laser.desktop
-share/applnk/System/ScreenSavers/Lightning.desktop
-share/applnk/System/ScreenSavers/Lissie.desktop
-share/applnk/System/ScreenSavers/Moenius.desktop
-share/applnk/System/ScreenSavers/Penrose.desktop
-share/applnk/System/ScreenSavers/Phosphor.desktop
-share/applnk/System/ScreenSavers/Pulsar.desktop
-share/applnk/System/ScreenSavers/Rubik.desktop
-share/applnk/System/ScreenSavers/Slip.desktop
-share/applnk/System/ScreenSavers/Sonar.desktop
-share/applnk/System/ScreenSavers/Sproingies.desktop
-share/applnk/System/ScreenSavers/Stairs.desktop
-share/applnk/System/ScreenSavers/Starfish.desktop
-share/applnk/System/ScreenSavers/Strange.desktop
-share/applnk/System/ScreenSavers/Superquadrics.desktop
-share/applnk/System/ScreenSavers/Swirl.desktop
-share/applnk/System/ScreenSavers/T3d.desktop
-share/applnk/System/ScreenSavers/Triangle.desktop
-share/applnk/System/ScreenSavers/Vines.desktop
share/applnk/System/ScreenSavers/Worm.desktop
-share/applnk/System/ScreenSavers/XFlame.desktop
-share/applnk/System/ScreenSavers/XJack.desktop
-share/applnk/System/ScreenSavers/XMatrix.desktop
-share/applnk/System/ScreenSavers/XPipes.desktop
share/applnk/System/kappfinder.desktop
share/applnk/System/kfmclient.desktop
share/applnk/System/klegacyimport.desktop
@@ -452,17 +408,19 @@ share/applnk/System/konquerorsu.desktop
share/applnk/System/konsole.desktop
share/applnk/System/konsolesu.desktop
share/applnk/System/ksysguard.desktop
+share/applnk/Toys/xeyes.desktop
share/applnk/Utilities/.directory
share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/kpager.desktop
share/applnk/Utilities/ktip.desktop
share/applnk/Utilities/passwd.desktop
+share/applnk/Utilities/xcalc.desktop
share/applnk/Utilities/xclipboard.desktop
share/applnk/Utilities/xclock.desktop
share/applnk/Utilities/xconsole.desktop
+share/applnk/Utilities/xload.desktop
share/applnk/Utilities/xmag.desktop
share/applnk/Utilities/xterm.desktop
-share/applnk/WordProcessing/xpdf.desktop
share/apps/clockapplet/pics/lcd.png
share/apps/drkonqi/pics/konqi.png
share/apps/drkonqi/presets/developerrc
@@ -673,10 +631,8 @@ share/apps/khelpcenter/pics/star.png
share/apps/khelpcenter/pics/star_blank.png
share/apps/khelpcenter/pics/unchecked.xpm
share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.kdelnk
+share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/exampleapplet.desktop
-share/apps/kicker/applets/kasbarapplet.desktop
share/apps/kicker/applets/kminipagerapplet.desktop
share/apps/kicker/applets/krunapplet.desktop
share/apps/kicker/applets/ksystemtrayapplet.desktop
@@ -831,7 +787,7 @@ share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
-share/apps/ksysguard/ksysguard.rc
+share/apps/ksysguard/ksysguardui.rc
share/apps/kwin/b2.desktop
share/apps/kwin/eventsrc
share/apps/kwin/kde.desktop
@@ -893,18 +849,14 @@ share/config/penroserc
share/config/rocksrc
share/config/sliprc
share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/advanced.html
-share/doc/HTML/en/kcontrol/application.html
+share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
+share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
-share/doc/HTML/en/kcontrol/browsing-files.html
-share/doc/HTML/en/kcontrol/browsing-help.html
-share/doc/HTML/en/kcontrol/browsing-neighborhood.html
-share/doc/HTML/en/kcontrol/browsing-web.html
-share/doc/HTML/en/kcontrol/browsing.html
share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
share/doc/HTML/en/kcontrol/control-center-exiting.html
share/doc/HTML/en/kcontrol/control-center-menus.html
share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -921,25 +873,22 @@ share/doc/HTML/en/kcontrol/email.html
share/doc/HTML/en/kcontrol/energy.html
share/doc/HTML/en/kcontrol/file-assoc.html
share/doc/HTML/en/kcontrol/file-manager.html
-share/doc/HTML/en/kcontrol/fonts-man.html
share/doc/HTML/en/kcontrol/fonts.html
share/doc/HTML/en/kcontrol/help-index.html
share/doc/HTML/en/kcontrol/icons.html
-share/doc/HTML/en/kcontrol/index.cvlog
+share/doc/HTML/en/kcontrol/iconstyle.html
share/doc/HTML/en/kcontrol/index.docbook
share/doc/HTML/en/kcontrol/index.html
-share/doc/HTML/en/kcontrol/info.html
share/doc/HTML/en/kcontrol/interrupts.html
share/doc/HTML/en/kcontrol/introduction.html
share/doc/HTML/en/kcontrol/ioports.html
share/doc/HTML/en/kcontrol/kbd.html
+share/doc/HTML/en/kcontrol/kblayout.html
+share/doc/HTML/en/kcontrol/kcmaccess.docbook
share/doc/HTML/en/kcontrol/kcmaction.docbook
-share/doc/HTML/en/kcontrol/kcmadv.docbook
share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
share/doc/HTML/en/kcontrol/kcmbatmon.docbook
-share/doc/HTML/en/kcontrol/kcmbell.cvlog
share/doc/HTML/en/kcontrol/kcmbell.docbook
-share/doc/HTML/en/kcontrol/kcmbell.html
share/doc/HTML/en/kcontrol/kcmblockdev.docbook
share/doc/HTML/en/kcontrol/kcmborders.docbook
share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -947,8 +896,6 @@ share/doc/HTML/en/kcontrol/kcmcookie.docbook
share/doc/HTML/en/kcontrol/kcmdatetime.docbook
share/doc/HTML/en/kcontrol/kcmdesktop.docbook
share/doc/HTML/en/kcontrol/kcmdeviceinfo.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay.cvlog
-share/doc/HTML/en/kcontrol/kcmdisplay.docbook
share/doc/HTML/en/kcontrol/kcmdmainfo.docbook
share/doc/HTML/en/kcontrol/kcmdrkonqi.docbook
share/doc/HTML/en/kcontrol/kcmebrowse.docbook
@@ -956,29 +903,17 @@ share/doc/HTML/en/kcontrol/kcmemail.docbook
share/doc/HTML/en/kcontrol/kcmenergy.docbook
share/doc/HTML/en/kcontrol/kcmfile.docbook
share/doc/HTML/en/kcontrol/kcmfileman.docbook
-share/doc/HTML/en/kcontrol/kcmfontmanager.docbook
share/doc/HTML/en/kcontrol/kcmfonts.docbook
share/doc/HTML/en/kcontrol/kcmhelpindex.docbook
share/doc/HTML/en/kcontrol/kcmicon.docbook
-share/doc/HTML/en/kcontrol/kcminput.cvlog
-share/doc/HTML/en/kcontrol/kcminput.docbook
+share/doc/HTML/en/kcontrol/kcmiconstyle.docbook
share/doc/HTML/en/kcontrol/kcmintinfo.docbook
share/doc/HTML/en/kcontrol/kcmioportinfo.docbook
share/doc/HTML/en/kcontrol/kcmkbd.docbook
+share/doc/HTML/en/kcontrol/kcmkblayout.docbook
share/doc/HTML/en/kcontrol/kcmkbrowse.docbook
-share/doc/HTML/en/kcontrol/kcmkdesu.cvlog
-share/doc/HTML/en/kcontrol/kcmkdesu.docbook
share/doc/HTML/en/kcontrol/kcmkeybind.docbook
-share/doc/HTML/en/kcontrol/kcmkeys.cvlog
share/doc/HTML/en/kcontrol/kcmkeys.docbook
-share/doc/HTML/en/kcontrol/kcmkfm.cvlog
-share/doc/HTML/en/kcontrol/kcmkfm.docbook
-share/doc/HTML/en/kcontrol/kcmkpanel.cvlog
-share/doc/HTML/en/kcontrol/kcmkpanel.docbook
-share/doc/HTML/en/kcontrol/kcmkwm.cvlog
-share/doc/HTML/en/kcontrol/kcmkwm.docbook
-share/doc/HTML/en/kcontrol/kcmlocale.cvlog
-share/doc/HTML/en/kcontrol/kcmlocale.docbook
share/doc/HTML/en/kcontrol/kcmlocate.docbook
share/doc/HTML/en/kcontrol/kcmloginmanage.docbook
share/doc/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -986,26 +921,22 @@ share/doc/HTML/en/kcontrol/kcmlowbatwarn.docbook
share/doc/HTML/en/kcontrol/kcmmemoryinfo.docbook
share/doc/HTML/en/kcontrol/kcmmouse.docbook
share/doc/HTML/en/kcontrol/kcmmousebeh.docbook
+share/doc/HTML/en/kcontrol/kcmnumbername.docbook
share/doc/HTML/en/kcontrol/kcmpanel.docbook
share/doc/HTML/en/kcontrol/kcmpartitioninfo.docbook
share/doc/HTML/en/kcontrol/kcmpasswd.docbook
share/doc/HTML/en/kcontrol/kcmpciinfo.docbook
-share/doc/HTML/en/kcontrol/kcmpcmia.docbook
+share/doc/HTML/en/kcontrol/kcmpcmcia.docbook
share/doc/HTML/en/kcontrol/kcmpowerctrl.docbook
share/doc/HTML/en/kcontrol/kcmprocinfo.docbook
share/doc/HTML/en/kcontrol/kcmproxie.docbook
-share/doc/HTML/en/kcontrol/kcmsamba.cvlog
-share/doc/HTML/en/kcontrol/kcmsamba.docbook
share/doc/HTML/en/kcontrol/kcmscnsave.docbook
share/doc/HTML/en/kcontrol/kcmscsiinfo.docbook
share/doc/HTML/en/kcontrol/kcmsmbstat.docbook
share/doc/HTML/en/kcontrol/kcmsndinfo.docbook
share/doc/HTML/en/kcontrol/kcmsndsrv.docbook
-share/doc/HTML/en/kcontrol/kcmsounds.docbook
share/doc/HTML/en/kcontrol/kcmstyle.docbook
share/doc/HTML/en/kcontrol/kcmsysnotify.docbook
-share/doc/HTML/en/kcontrol/kcmsyssound.cvlog
-share/doc/HTML/en/kcontrol/kcmsyssound.docbook
share/doc/HTML/en/kcontrol/kcmtalk.docbook
share/doc/HTML/en/kcontrol/kcmtaskbar.docbook
share/doc/HTML/en/kcontrol/kcmuseragent.docbook
@@ -1013,16 +944,7 @@ share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/konq-browsing.html
-share/doc/HTML/en/kcontrol/konqui.html
-share/doc/HTML/en/kcontrol/kthememgr.cvlog
-share/doc/HTML/en/kcontrol/kthememgr.docbook
-share/doc/HTML/en/kcontrol/kthememgr.html
share/doc/HTML/en/kcontrol/laptop.html
-share/doc/HTML/en/kcontrol/lf-desktop.html
-share/doc/HTML/en/kcontrol/lf-panel.html
-share/doc/HTML/en/kcontrol/lf-themes.html
-share/doc/HTML/en/kcontrol/lf-window-behavior.html
-share/doc/HTML/en/kcontrol/lf.html
share/doc/HTML/en/kcontrol/locale.html
share/doc/HTML/en/kcontrol/login-manager.html
share/doc/HTML/en/kcontrol/lowbatcrit.html
@@ -1032,43 +954,38 @@ share/doc/HTML/en/kcontrol/module.html
share/doc/HTML/en/kcontrol/modules.html
share/doc/HTML/en/kcontrol/mouse-behav.html
share/doc/HTML/en/kcontrol/mouse.html
-share/doc/HTML/en/kcontrol/network.html
+share/doc/HTML/en/kcontrol/numbername.html
share/doc/HTML/en/kcontrol/panel.html
share/doc/HTML/en/kcontrol/partitions.html
share/doc/HTML/en/kcontrol/passwords.html
share/doc/HTML/en/kcontrol/pci.html
-share/doc/HTML/en/kcontrol/pcmia.html
-share/doc/HTML/en/kcontrol/periph.html
-share/doc/HTML/en/kcontrol/personalize.html
-share/doc/HTML/en/kcontrol/power.html
+share/doc/HTML/en/kcontrol/pcmcia.html
share/doc/HTML/en/kcontrol/powerctrl.html
share/doc/HTML/en/kcontrol/processor.html
share/doc/HTML/en/kcontrol/proxies.html
share/doc/HTML/en/kcontrol/sambastatus.html
share/doc/HTML/en/kcontrol/screensaver.html
+share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/scsi.html
share/doc/HTML/en/kcontrol/sndserver.html
-share/doc/HTML/en/kcontrol/sound.html
share/doc/HTML/en/kcontrol/soundinfo.html
share/doc/HTML/en/kcontrol/style.html
share/doc/HTML/en/kcontrol/sys-notify.html
-share/doc/HTML/en/kcontrol/sys-sounds.html
-share/doc/HTML/en/kcontrol/system1.html
-share/doc/HTML/en/kcontrol/systemmenu.html
share/doc/HTML/en/kcontrol/talk.html
share/doc/HTML/en/kcontrol/taskbar.html
share/doc/HTML/en/kcontrol/user-agent.html
share/doc/HTML/en/kcontrol/windows-shares.html
share/doc/HTML/en/kcontrol/xserver.html
share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdebugdialog/index.html
share/doc/HTML/en/kdebugdialog/introduction.html
share/doc/HTML/en/kdesu/.anchors
share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/compiling.html
share/doc/HTML/en/kdesu/configuration.html
-share/doc/HTML/en/kdesu/index.cvlog
share/doc/HTML/en/kdesu/index.docbook
share/doc/HTML/en/kdesu/index.html
share/doc/HTML/en/kdesu/installation.html
@@ -1076,15 +993,15 @@ share/doc/HTML/en/kdesu/interface-to-su.html
share/doc/HTML/en/kdesu/internals.html
share/doc/HTML/en/kdesu/introduction.html
share/doc/HTML/en/kdesu/password-checking.html
-share/doc/HTML/en/kdesu/secpasswordkeeping.html
-share/doc/HTML/en/kdesu/usingkdesu.html
+share/doc/HTML/en/kdesu/sec-password-keeping.html
+share/doc/HTML/en/kdesu/using-kdesu.html
share/doc/HTML/en/kdm/.anchors
share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/configuring-kdm.html
share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
share/doc/HTML/en/kdm/credits.html
share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
-share/doc/HTML/en/kdm/index.cvlog
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/index.html
share/doc/HTML/en/kdm/introduction.html
@@ -1093,12 +1010,14 @@ share/doc/HTML/en/kdm/lilo.html
share/doc/HTML/en/kdm/locale.html
share/doc/HTML/en/kdm/other-information.html
share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
share/doc/HTML/en/khelpcenter/contact-developers.html
share/doc/HTML/en/khelpcenter/contact-more-information.html
share/doc/HTML/en/khelpcenter/contact-official.html
share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/faq/.anchors
+share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/index.cvlog
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
@@ -1114,10 +1033,10 @@ share/doc/HTML/en/khelpcenter/quickstart/.anchors
share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
share/doc/HTML/en/khelpcenter/quickstart/configure.html
share/doc/HTML/en/khelpcenter/quickstart/credits.html
-share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/quickstart/index.html
share/doc/HTML/en/khelpcenter/quickstart/introduction.html
@@ -1141,6 +1060,7 @@ share/doc/HTML/en/khelpcenter/userguide/activating-the-screen-saver-by-moving-yo
share/doc/HTML/en/khelpcenter/userguide/addingprograms.html
share/doc/HTML/en/khelpcenter/userguide/allaboutyourdesktop.html
share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/contacting-the-authors.html
share/doc/HTML/en/khelpcenter/userguide/contactingauthors.html
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
@@ -1204,27 +1124,64 @@ share/doc/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
share/doc/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
share/doc/HTML/en/khelpcenter/what-is-kde.html
share/doc/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/HTML/en/kikbd/.anchors
-share/doc/HTML/en/kikbd/advanced.html
-share/doc/HTML/en/kikbd/advanced.png
-share/doc/HTML/en/kikbd/authors.html
-share/doc/HTML/en/kikbd/bug-reporting.html
-share/doc/HTML/en/kikbd/config.html
-share/doc/HTML/en/kikbd/create.html
-share/doc/HTML/en/kikbd/general.html
-share/doc/HTML/en/kikbd/general.png
-share/doc/HTML/en/kikbd/index.cvlog
-share/doc/HTML/en/kikbd/index.docbook
-share/doc/HTML/en/kikbd/index.html
-share/doc/HTML/en/kikbd/installation.html
-share/doc/HTML/en/kikbd/introduction.html
-share/doc/HTML/en/kikbd/nationalkeyboard.html
-share/doc/HTML/en/kikbd/screen-saver-password-problems..html
-share/doc/HTML/en/kikbd/startup.html
-share/doc/HTML/en/kikbd/startup.png
-share/doc/HTML/en/kikbd/style.html
-share/doc/HTML/en/kikbd/style.png
-share/doc/HTML/en/kikbd/troubleshooting.html
+share/doc/HTML/en/kicker/.anchors
+share/doc/HTML/en/kicker/access_config.png
+share/doc/HTML/en/kicker/basic_icons.png
+share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
+share/doc/HTML/en/kicker/config_window.png
+share/doc/HTML/en/kicker/configuration-adding-icons.html
+share/doc/HTML/en/kicker/configuration-config-window.html
+share/doc/HTML/en/kicker/configuration.html
+share/doc/HTML/en/kicker/credits.html
+share/doc/HTML/en/kicker/drag-and-drop.html
+share/doc/HTML/en/kicker/drag_applet.png
+share/doc/HTML/en/kicker/five-minute-course.html
+share/doc/HTML/en/kicker/glossary.html
+share/doc/HTML/en/kicker/handles.png
+share/doc/HTML/en/kicker/hide_buttons.png
+share/doc/HTML/en/kicker/i_adv_editor.png
+share/doc/HTML/en/kicker/i_control_center.png
+share/doc/HTML/en/kicker/i_desktop.png
+share/doc/HTML/en/kicker/i_help.png
+share/doc/HTML/en/kicker/i_home_dir.png
+share/doc/HTML/en/kicker/i_k_button.png
+share/doc/HTML/en/kicker/i_kandalfs_tips.png
+share/doc/HTML/en/kicker/i_shell.png
+share/doc/HTML/en/kicker/i_window_list.png
+share/doc/HTML/en/kicker/index.docbook
+share/doc/HTML/en/kicker/index.html
+share/doc/HTML/en/kicker/installation.html
+share/doc/HTML/en/kicker/introduction.html
+share/doc/HTML/en/kicker/kicker-for-admins-symbolic-links.html
+share/doc/HTML/en/kicker/kicker-for-admins.html
+share/doc/HTML/en/kicker/kicker-panel-elements.html
+share/doc/HTML/en/kicker/kicker_access_size.png
+share/doc/HTML/en/kicker/kicker_add_basic.png
+share/doc/HTML/en/kicker/kicker_basic_icons.png
+share/doc/HTML/en/kicker/kicker_basic_icons_2.png
+share/doc/HTML/en/kicker/other-features.html
+share/doc/HTML/en/kicker/qb_root.png
+share/doc/HTML/en/kicker/using-kicker.html
+share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
+share/doc/HTML/en/kmenuedit/credits.html
+share/doc/HTML/en/kmenuedit/details-advanced.html
+share/doc/HTML/en/kmenuedit/glossary.html
+share/doc/HTML/en/kmenuedit/i_copy.png
+share/doc/HTML/en/kmenuedit/i_cut.png
+share/doc/HTML/en/kmenuedit/i_delete.png
+share/doc/HTML/en/kmenuedit/i_k_button.png
+share/doc/HTML/en/kmenuedit/i_new_item.png
+share/doc/HTML/en/kmenuedit/i_new_submenu.png
+share/doc/HTML/en/kmenuedit/i_paste.png
+share/doc/HTML/en/kmenuedit/icon_sets.png
+share/doc/HTML/en/kmenuedit/icons.png
+share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/introduction.html
+share/doc/HTML/en/kmenuedit/menu-reference.html
+share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
@@ -1233,6 +1190,7 @@ share/doc/HTML/en/konqueror/bubble.html
share/doc/HTML/en/konqueror/cmndline.png
share/doc/HTML/en/konqueror/commandline.html
share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
@@ -1271,12 +1229,15 @@ share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/credits.html
share/doc/HTML/en/konsole/history-option.html
share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole1.gif
+share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
share/doc/HTML/en/konsole/mousebuttons.html
share/doc/HTML/en/konsole/techref.html
@@ -1284,6 +1245,7 @@ share/doc/HTML/en/konsole/toolbar.html
share/doc/HTML/en/konsole/use-of-konsole.html
share/doc/HTML/en/konsole/vt100.gif
share/doc/HTML/en/kpager/.anchors
+share/doc/HTML/en/kpager/common
share/doc/HTML/en/kpager/compilation-and-installation.html
share/doc/HTML/en/kpager/customizingkpageradvancedfeatures.html
share/doc/HTML/en/kpager/frequentlyaskedquestionsfaq.html
@@ -1299,25 +1261,43 @@ share/doc/HTML/en/kpager/rows-mode.html
share/doc/HTML/en/kpager/the-global-desktop.html
share/doc/HTML/en/kpager/the-window-properties-menu.html
share/doc/HTML/en/kpager/workingwithkpager.html
-share/doc/HTML/en/kwm/.anchors
-share/doc/HTML/en/kwm/authors.html
-share/doc/HTML/en/kwm/commands.html
-share/doc/HTML/en/kwm/configuration.html
-share/doc/HTML/en/kwm/does-kwm-support-shaded-windows-a-la-openste.html
-share/doc/HTML/en/kwm/epilogue.html
-share/doc/HTML/en/kwm/frequentlyaskedquestions.html
-share/doc/HTML/en/kwm/index.cvlog
-share/doc/HTML/en/kwm/index.docbook
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kwm/introduction.html
-share/doc/HTML/en/kwm/is-it-possible-to-add-kde-extensions-to-othe.html
-share/doc/HTML/en/kwm/minicli.html
-share/doc/HTML/en/kwm/mouse-control.html
-share/doc/HTML/en/kwm/shortcuts.html
-share/doc/HTML/en/kwm/soundevents.html
-share/doc/HTML/en/kwm/usingemphasiskwmemphasis.html
-share/doc/HTML/en/kwm/why-can-t-i-define-new-shortcuts-for-launchi.html
-share/doc/HTML/en/kwm/why-does-kwm-look-so-much-like-windows-95.html
+share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/authors.html
+share/doc/HTML/en/ksysguard/common
+share/doc/HTML/en/ksysguard/compilationandinstallation.html
+share/doc/HTML/en/ksysguard/frequentlyaskedquestions.html
+share/doc/HTML/en/ksysguard/index.docbook
+share/doc/HTML/en/ksysguard/index.html
+share/doc/HTML/en/ksysguard/installation.html
+share/doc/HTML/en/ksysguard/introduction.html
+share/doc/HTML/en/ksysguard/licenseandwarranty.html
+share/doc/HTML/en/ksysguard/requirements.html
+share/doc/HTML/en/ksysguard/thesensorbrowser.html
+share/doc/HTML/en/ksysguard/theworkspace.html
+share/doc/HTML/en/ksysguard/usingtheksysguard.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/common
+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.docbook
+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/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
@@ -1417,10 +1397,13 @@ share/icons/hicolor/32x32/devices/3floppy_mount.png
share/icons/hicolor/32x32/devices/3floppy_unmount.png
share/icons/hicolor/32x32/devices/5floppy_mount.png
share/icons/hicolor/32x32/devices/5floppy_unmount.png
+share/icons/hicolor/32x32/devices/cdaudio_mount.png
+share/icons/hicolor/32x32/devices/cdaudio_unmount.png
share/icons/hicolor/32x32/devices/cdrom_mount.png
share/icons/hicolor/32x32/devices/cdrom_unmount.png
share/icons/hicolor/32x32/devices/cdwriter_mount.png
share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_mount.png
share/icons/hicolor/32x32/devices/dvd_unmount.png
share/icons/hicolor/32x32/devices/hdd_mount.png
share/icons/hicolor/32x32/devices/hdd_unmount.png
@@ -1505,10 +1488,13 @@ share/icons/hicolor/48x48/devices/3floppy_mount.png
share/icons/hicolor/48x48/devices/3floppy_unmount.png
share/icons/hicolor/48x48/devices/5floppy_mount.png
share/icons/hicolor/48x48/devices/5floppy_unmount.png
+share/icons/hicolor/48x48/devices/cdaudio_mount.png
+share/icons/hicolor/48x48/devices/cdaudio_unmount.png
share/icons/hicolor/48x48/devices/cdrom_mount.png
share/icons/hicolor/48x48/devices/cdrom_unmount.png
share/icons/hicolor/48x48/devices/cdwriter_mount.png
share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_mount.png
share/icons/hicolor/48x48/devices/dvd_unmount.png
share/icons/hicolor/48x48/devices/hdd_mount.png
share/icons/hicolor/48x48/devices/hdd_unmount.png
@@ -1992,6 +1978,7 @@ share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
share/services/kurisearchfilter.desktop
+share/services/kxmlrpcd.desktop
share/services/man.protocol
share/services/nfs.protocol
share/services/nntp.protocol
@@ -2053,11 +2040,13 @@ share/wallpapers/northbeach.jpg
share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
-@dirrm share/doc/HTML/en/kwm
+@dirrm share/doc/HTML/en/kwrite
+@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kpager
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kikbd
+@dirrm share/doc/HTML/en/kmenuedit
+@dirrm share/doc/HTML/en/kicker
@dirrm share/doc/HTML/en/khelpcenter/userguide
@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/faq
@@ -2072,8 +2061,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
@dirrm share/apps/ksysguard/icons/locolor/16x16
-@dirrm share/apps/ksysguard/icons/locolor
-@dirrm share/apps/ksysguard/icons
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@dirrm share/apps/ksplash
@@ -2091,25 +2078,27 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/konqiconview
@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
@dirrm share/apps/kmenuedit/icons/locolor/16x16
-@dirrm share/apps/kmenuedit/icons/locolor
@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
@dirrm share/apps/kmenuedit/icons/hicolor/32x32
@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
@dirrm share/apps/kio_info
@dirrm share/apps/kicker/tiles
@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
@dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
@dirrm share/apps/khelpcenter/pics
@dirrm share/apps/khelpcenter/en
+@dirrm share/apps/khelpcenter
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
@dirrm share/apps/kdisplay/color-schemes
@dirrm share/apps/kdisplay/app-defaults
+@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
@dirrm share/apps/kdesktop/programs
@@ -2121,6 +2110,7 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kcontrol/pics
@dirrm share/apps/kcontrol
@dirrm share/apps/kcmlocale/pics
+@dirrm share/apps/kcmlocale
@dirrm share/apps/kcminput
@dirrm share/apps/kbookmark
@dirrm share/apps/kappfinder/apps/WordProcessing
@@ -2135,6 +2125,9 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kappfinder/apps/Editors
@dirrm share/apps/kappfinder/apps/Development
@dirrm share/apps/kappfinder/apps
+@dirrm share/apps/kappfinder
@dirrm share/apps/drkonqi/presets
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
+@dirrm share/apps/clockapplet
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 3fbd30c494dc..5219b5b00274 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdebase
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 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
@@ -40,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 094815fd3937..38387e559524 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
+MD5 (kdebase-1.94.tar.bz2) = a6617df687698e4954d7011a08625ec2
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index c63b81caa6cb..3737b07b7ed0 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -134,6 +134,7 @@ lib/klegacyimport.so
lib/klipper.la
lib/klipper.so
lib/kmenuedit.la
+lib/kmenuedit.so
lib/kmenuedit.so.0
lib/konqueror.la
lib/konqueror.so
@@ -149,13 +150,10 @@ lib/kxmlrpcd.la
lib/kxmlrpcd.so
lib/libccont.a
lib/libclockapplet.la
+lib/libclockapplet.so
lib/libclockapplet.so.1
-lib/libexampleapplet.la
-lib/libexampleapplet.so.1
lib/libhtmlsearch.la
lib/libhtmlsearch.so
-lib/libkasbarapplet.la
-lib/libkasbarapplet.so.1
lib/libkcm_access.la
lib/libkcm_access.so
lib/libkcm_arts.la
@@ -168,6 +166,8 @@ lib/libkcm_clock.la
lib/libkcm_clock.so
lib/libkcm_colors.la
lib/libkcm_colors.so
+lib/libkcm_crypto.la
+lib/libkcm_crypto.so
lib/libkcm_email.la
lib/libkcm_email.so
lib/libkcm_energy.la
@@ -226,11 +226,16 @@ lib/libkcm_taskbar.la
lib/libkcm_taskbar.so
lib/libkcm_virtualdesktops.la
lib/libkcm_virtualdesktops.so
+lib/libkcm_xmlrpcd.la
+lib/libkcm_xmlrpcd.so
lib/libkhelpcenter.la
+lib/libkhelpcenter.so
lib/libkhelpcenter.so.4
lib/libkminipagerapplet.la
+lib/libkminipagerapplet.so
lib/libkminipagerapplet.so.1
lib/libkonq.la
+lib/libkonq.so
lib/libkonq.so.4
lib/libkonqdirtree.la
lib/libkonqdirtree.so
@@ -241,20 +246,27 @@ lib/libkonqlistview.so
lib/libkonsolepart.la
lib/libkonsolepart.so
lib/libkrunapplet.la
+lib/libkrunapplet.so
lib/libkrunapplet.so.1
lib/libkshorturifilter.la
+lib/libkshorturifilter.so
lib/libkshorturifilter.so.1
lib/libksystemtrayapplet.la
+lib/libksystemtrayapplet.so
lib/libksystemtrayapplet.so.1
lib/libktaskbarapplet.la
+lib/libktaskbarapplet.so
lib/libktaskbarapplet.so.1
lib/libkuriikwsfilter.la
+lib/libkuriikwsfilter.so
lib/libkuriikwsfilter.so.1
lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so
lib/libkurisearchfilter.so.1
lib/libkwinb2.la
lib/libkwinb2.so
lib/libkwindefault.la
+lib/libkwindefault.so
lib/libkwindefault.so.0
lib/libkwinkde1.la
lib/libkwinkde1.so
@@ -271,23 +283,23 @@ lib/libkwinsystem.so
lib/libkwritepart.la
lib/libkwritepart.so
lib/libquicklauncher.la
+lib/libquicklauncher.so
lib/libquicklauncher.so.1
lib/libsmb++.la
+lib/libsmb++.so
lib/libsmb++.so.0
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
share/applnk/Development/designer.desktop
-share/applnk/Editors/gvim.desktop
share/applnk/Editors/kwrite.desktop
+share/applnk/Editors/xedit.desktop
share/applnk/Games/.directory
share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
share/applnk/Help.desktop
share/applnk/Home.desktop
share/applnk/Internet/.directory
share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/netscape.desktop
share/applnk/KControl.desktop
share/applnk/Multimedia/.directory
share/applnk/Office/.directory
@@ -337,6 +349,7 @@ share/applnk/Settings/Peripherals/.directory
share/applnk/Settings/Peripherals/keyboard.desktop
share/applnk/Settings/Peripherals/mouse.desktop
share/applnk/Settings/Personalization/.directory
+share/applnk/Settings/Personalization/crypto.desktop
share/applnk/Settings/Personalization/email.desktop
share/applnk/Settings/Personalization/kcmaccess.desktop
share/applnk/Settings/Personalization/kcmlayout.desktop
@@ -359,36 +372,6 @@ share/applnk/Settings/WebBrowsing/useragent.desktop
share/applnk/System/.directory
share/applnk/System/Arrange.desktop
share/applnk/System/ScreenSavers/.directory
-share/applnk/System/ScreenSavers/Ant.desktop
-share/applnk/System/ScreenSavers/Atlantis.desktop
-share/applnk/System/ScreenSavers/Attraction.desktop
-share/applnk/System/ScreenSavers/Bouboule.desktop
-share/applnk/System/ScreenSavers/Braid.desktop
-share/applnk/System/ScreenSavers/Bubble3d.desktop
-share/applnk/System/ScreenSavers/Bubbles.desktop
-share/applnk/System/ScreenSavers/Cage.desktop
-share/applnk/System/ScreenSavers/Compass.desktop
-share/applnk/System/ScreenSavers/Coral.desktop
-share/applnk/System/ScreenSavers/Crystal.desktop
-share/applnk/System/ScreenSavers/Cynosure.desktop
-share/applnk/System/ScreenSavers/Demon.desktop
-share/applnk/System/ScreenSavers/Drift.desktop
-share/applnk/System/ScreenSavers/Fadeplot.desktop
-share/applnk/System/ScreenSavers/Flag.desktop
-share/applnk/System/ScreenSavers/Flame.desktop
-share/applnk/System/ScreenSavers/Flow.desktop
-share/applnk/System/ScreenSavers/Forest.desktop
-share/applnk/System/ScreenSavers/GLPlanet.desktop
-share/applnk/System/ScreenSavers/Galaxy.desktop
-share/applnk/System/ScreenSavers/Gears.desktop
-share/applnk/System/ScreenSavers/Goop.desktop
-share/applnk/System/ScreenSavers/Grav.desktop
-share/applnk/System/ScreenSavers/Hopalong.desktop
-share/applnk/System/ScreenSavers/Hypercube.desktop
-share/applnk/System/ScreenSavers/Ifs.desktop
-share/applnk/System/ScreenSavers/Imsmap.desktop
-share/applnk/System/ScreenSavers/Interference.desktop
-share/applnk/System/ScreenSavers/Julia.desktop
share/applnk/System/ScreenSavers/KAttration.desktop
share/applnk/System/ScreenSavers/KBanner.desktop
share/applnk/System/ScreenSavers/KBlankscreen.desktop
@@ -416,34 +399,7 @@ share/applnk/System/ScreenSavers/KSlip.desktop
share/applnk/System/ScreenSavers/KSpace.desktop
share/applnk/System/ScreenSavers/KSwarm.desktop
share/applnk/System/ScreenSavers/KVm.desktop
-share/applnk/System/ScreenSavers/Kaleidescope.desktop
-share/applnk/System/ScreenSavers/Kumppa.desktop
-share/applnk/System/ScreenSavers/LMorph.desktop
-share/applnk/System/ScreenSavers/Lament.desktop
-share/applnk/System/ScreenSavers/Laser.desktop
-share/applnk/System/ScreenSavers/Lightning.desktop
-share/applnk/System/ScreenSavers/Lissie.desktop
-share/applnk/System/ScreenSavers/Moenius.desktop
-share/applnk/System/ScreenSavers/Penrose.desktop
-share/applnk/System/ScreenSavers/Phosphor.desktop
-share/applnk/System/ScreenSavers/Pulsar.desktop
-share/applnk/System/ScreenSavers/Rubik.desktop
-share/applnk/System/ScreenSavers/Slip.desktop
-share/applnk/System/ScreenSavers/Sonar.desktop
-share/applnk/System/ScreenSavers/Sproingies.desktop
-share/applnk/System/ScreenSavers/Stairs.desktop
-share/applnk/System/ScreenSavers/Starfish.desktop
-share/applnk/System/ScreenSavers/Strange.desktop
-share/applnk/System/ScreenSavers/Superquadrics.desktop
-share/applnk/System/ScreenSavers/Swirl.desktop
-share/applnk/System/ScreenSavers/T3d.desktop
-share/applnk/System/ScreenSavers/Triangle.desktop
-share/applnk/System/ScreenSavers/Vines.desktop
share/applnk/System/ScreenSavers/Worm.desktop
-share/applnk/System/ScreenSavers/XFlame.desktop
-share/applnk/System/ScreenSavers/XJack.desktop
-share/applnk/System/ScreenSavers/XMatrix.desktop
-share/applnk/System/ScreenSavers/XPipes.desktop
share/applnk/System/kappfinder.desktop
share/applnk/System/kfmclient.desktop
share/applnk/System/klegacyimport.desktop
@@ -452,17 +408,19 @@ share/applnk/System/konquerorsu.desktop
share/applnk/System/konsole.desktop
share/applnk/System/konsolesu.desktop
share/applnk/System/ksysguard.desktop
+share/applnk/Toys/xeyes.desktop
share/applnk/Utilities/.directory
share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/kpager.desktop
share/applnk/Utilities/ktip.desktop
share/applnk/Utilities/passwd.desktop
+share/applnk/Utilities/xcalc.desktop
share/applnk/Utilities/xclipboard.desktop
share/applnk/Utilities/xclock.desktop
share/applnk/Utilities/xconsole.desktop
+share/applnk/Utilities/xload.desktop
share/applnk/Utilities/xmag.desktop
share/applnk/Utilities/xterm.desktop
-share/applnk/WordProcessing/xpdf.desktop
share/apps/clockapplet/pics/lcd.png
share/apps/drkonqi/pics/konqi.png
share/apps/drkonqi/presets/developerrc
@@ -673,10 +631,8 @@ share/apps/khelpcenter/pics/star.png
share/apps/khelpcenter/pics/star_blank.png
share/apps/khelpcenter/pics/unchecked.xpm
share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.kdelnk
+share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/exampleapplet.desktop
-share/apps/kicker/applets/kasbarapplet.desktop
share/apps/kicker/applets/kminipagerapplet.desktop
share/apps/kicker/applets/krunapplet.desktop
share/apps/kicker/applets/ksystemtrayapplet.desktop
@@ -831,7 +787,7 @@ share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
-share/apps/ksysguard/ksysguard.rc
+share/apps/ksysguard/ksysguardui.rc
share/apps/kwin/b2.desktop
share/apps/kwin/eventsrc
share/apps/kwin/kde.desktop
@@ -893,18 +849,14 @@ share/config/penroserc
share/config/rocksrc
share/config/sliprc
share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/advanced.html
-share/doc/HTML/en/kcontrol/application.html
+share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
+share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
-share/doc/HTML/en/kcontrol/browsing-files.html
-share/doc/HTML/en/kcontrol/browsing-help.html
-share/doc/HTML/en/kcontrol/browsing-neighborhood.html
-share/doc/HTML/en/kcontrol/browsing-web.html
-share/doc/HTML/en/kcontrol/browsing.html
share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
share/doc/HTML/en/kcontrol/control-center-exiting.html
share/doc/HTML/en/kcontrol/control-center-menus.html
share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -921,25 +873,22 @@ share/doc/HTML/en/kcontrol/email.html
share/doc/HTML/en/kcontrol/energy.html
share/doc/HTML/en/kcontrol/file-assoc.html
share/doc/HTML/en/kcontrol/file-manager.html
-share/doc/HTML/en/kcontrol/fonts-man.html
share/doc/HTML/en/kcontrol/fonts.html
share/doc/HTML/en/kcontrol/help-index.html
share/doc/HTML/en/kcontrol/icons.html
-share/doc/HTML/en/kcontrol/index.cvlog
+share/doc/HTML/en/kcontrol/iconstyle.html
share/doc/HTML/en/kcontrol/index.docbook
share/doc/HTML/en/kcontrol/index.html
-share/doc/HTML/en/kcontrol/info.html
share/doc/HTML/en/kcontrol/interrupts.html
share/doc/HTML/en/kcontrol/introduction.html
share/doc/HTML/en/kcontrol/ioports.html
share/doc/HTML/en/kcontrol/kbd.html
+share/doc/HTML/en/kcontrol/kblayout.html
+share/doc/HTML/en/kcontrol/kcmaccess.docbook
share/doc/HTML/en/kcontrol/kcmaction.docbook
-share/doc/HTML/en/kcontrol/kcmadv.docbook
share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
share/doc/HTML/en/kcontrol/kcmbatmon.docbook
-share/doc/HTML/en/kcontrol/kcmbell.cvlog
share/doc/HTML/en/kcontrol/kcmbell.docbook
-share/doc/HTML/en/kcontrol/kcmbell.html
share/doc/HTML/en/kcontrol/kcmblockdev.docbook
share/doc/HTML/en/kcontrol/kcmborders.docbook
share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -947,8 +896,6 @@ share/doc/HTML/en/kcontrol/kcmcookie.docbook
share/doc/HTML/en/kcontrol/kcmdatetime.docbook
share/doc/HTML/en/kcontrol/kcmdesktop.docbook
share/doc/HTML/en/kcontrol/kcmdeviceinfo.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay.cvlog
-share/doc/HTML/en/kcontrol/kcmdisplay.docbook
share/doc/HTML/en/kcontrol/kcmdmainfo.docbook
share/doc/HTML/en/kcontrol/kcmdrkonqi.docbook
share/doc/HTML/en/kcontrol/kcmebrowse.docbook
@@ -956,29 +903,17 @@ share/doc/HTML/en/kcontrol/kcmemail.docbook
share/doc/HTML/en/kcontrol/kcmenergy.docbook
share/doc/HTML/en/kcontrol/kcmfile.docbook
share/doc/HTML/en/kcontrol/kcmfileman.docbook
-share/doc/HTML/en/kcontrol/kcmfontmanager.docbook
share/doc/HTML/en/kcontrol/kcmfonts.docbook
share/doc/HTML/en/kcontrol/kcmhelpindex.docbook
share/doc/HTML/en/kcontrol/kcmicon.docbook
-share/doc/HTML/en/kcontrol/kcminput.cvlog
-share/doc/HTML/en/kcontrol/kcminput.docbook
+share/doc/HTML/en/kcontrol/kcmiconstyle.docbook
share/doc/HTML/en/kcontrol/kcmintinfo.docbook
share/doc/HTML/en/kcontrol/kcmioportinfo.docbook
share/doc/HTML/en/kcontrol/kcmkbd.docbook
+share/doc/HTML/en/kcontrol/kcmkblayout.docbook
share/doc/HTML/en/kcontrol/kcmkbrowse.docbook
-share/doc/HTML/en/kcontrol/kcmkdesu.cvlog
-share/doc/HTML/en/kcontrol/kcmkdesu.docbook
share/doc/HTML/en/kcontrol/kcmkeybind.docbook
-share/doc/HTML/en/kcontrol/kcmkeys.cvlog
share/doc/HTML/en/kcontrol/kcmkeys.docbook
-share/doc/HTML/en/kcontrol/kcmkfm.cvlog
-share/doc/HTML/en/kcontrol/kcmkfm.docbook
-share/doc/HTML/en/kcontrol/kcmkpanel.cvlog
-share/doc/HTML/en/kcontrol/kcmkpanel.docbook
-share/doc/HTML/en/kcontrol/kcmkwm.cvlog
-share/doc/HTML/en/kcontrol/kcmkwm.docbook
-share/doc/HTML/en/kcontrol/kcmlocale.cvlog
-share/doc/HTML/en/kcontrol/kcmlocale.docbook
share/doc/HTML/en/kcontrol/kcmlocate.docbook
share/doc/HTML/en/kcontrol/kcmloginmanage.docbook
share/doc/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -986,26 +921,22 @@ share/doc/HTML/en/kcontrol/kcmlowbatwarn.docbook
share/doc/HTML/en/kcontrol/kcmmemoryinfo.docbook
share/doc/HTML/en/kcontrol/kcmmouse.docbook
share/doc/HTML/en/kcontrol/kcmmousebeh.docbook
+share/doc/HTML/en/kcontrol/kcmnumbername.docbook
share/doc/HTML/en/kcontrol/kcmpanel.docbook
share/doc/HTML/en/kcontrol/kcmpartitioninfo.docbook
share/doc/HTML/en/kcontrol/kcmpasswd.docbook
share/doc/HTML/en/kcontrol/kcmpciinfo.docbook
-share/doc/HTML/en/kcontrol/kcmpcmia.docbook
+share/doc/HTML/en/kcontrol/kcmpcmcia.docbook
share/doc/HTML/en/kcontrol/kcmpowerctrl.docbook
share/doc/HTML/en/kcontrol/kcmprocinfo.docbook
share/doc/HTML/en/kcontrol/kcmproxie.docbook
-share/doc/HTML/en/kcontrol/kcmsamba.cvlog
-share/doc/HTML/en/kcontrol/kcmsamba.docbook
share/doc/HTML/en/kcontrol/kcmscnsave.docbook
share/doc/HTML/en/kcontrol/kcmscsiinfo.docbook
share/doc/HTML/en/kcontrol/kcmsmbstat.docbook
share/doc/HTML/en/kcontrol/kcmsndinfo.docbook
share/doc/HTML/en/kcontrol/kcmsndsrv.docbook
-share/doc/HTML/en/kcontrol/kcmsounds.docbook
share/doc/HTML/en/kcontrol/kcmstyle.docbook
share/doc/HTML/en/kcontrol/kcmsysnotify.docbook
-share/doc/HTML/en/kcontrol/kcmsyssound.cvlog
-share/doc/HTML/en/kcontrol/kcmsyssound.docbook
share/doc/HTML/en/kcontrol/kcmtalk.docbook
share/doc/HTML/en/kcontrol/kcmtaskbar.docbook
share/doc/HTML/en/kcontrol/kcmuseragent.docbook
@@ -1013,16 +944,7 @@ share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/konq-browsing.html
-share/doc/HTML/en/kcontrol/konqui.html
-share/doc/HTML/en/kcontrol/kthememgr.cvlog
-share/doc/HTML/en/kcontrol/kthememgr.docbook
-share/doc/HTML/en/kcontrol/kthememgr.html
share/doc/HTML/en/kcontrol/laptop.html
-share/doc/HTML/en/kcontrol/lf-desktop.html
-share/doc/HTML/en/kcontrol/lf-panel.html
-share/doc/HTML/en/kcontrol/lf-themes.html
-share/doc/HTML/en/kcontrol/lf-window-behavior.html
-share/doc/HTML/en/kcontrol/lf.html
share/doc/HTML/en/kcontrol/locale.html
share/doc/HTML/en/kcontrol/login-manager.html
share/doc/HTML/en/kcontrol/lowbatcrit.html
@@ -1032,43 +954,38 @@ share/doc/HTML/en/kcontrol/module.html
share/doc/HTML/en/kcontrol/modules.html
share/doc/HTML/en/kcontrol/mouse-behav.html
share/doc/HTML/en/kcontrol/mouse.html
-share/doc/HTML/en/kcontrol/network.html
+share/doc/HTML/en/kcontrol/numbername.html
share/doc/HTML/en/kcontrol/panel.html
share/doc/HTML/en/kcontrol/partitions.html
share/doc/HTML/en/kcontrol/passwords.html
share/doc/HTML/en/kcontrol/pci.html
-share/doc/HTML/en/kcontrol/pcmia.html
-share/doc/HTML/en/kcontrol/periph.html
-share/doc/HTML/en/kcontrol/personalize.html
-share/doc/HTML/en/kcontrol/power.html
+share/doc/HTML/en/kcontrol/pcmcia.html
share/doc/HTML/en/kcontrol/powerctrl.html
share/doc/HTML/en/kcontrol/processor.html
share/doc/HTML/en/kcontrol/proxies.html
share/doc/HTML/en/kcontrol/sambastatus.html
share/doc/HTML/en/kcontrol/screensaver.html
+share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/scsi.html
share/doc/HTML/en/kcontrol/sndserver.html
-share/doc/HTML/en/kcontrol/sound.html
share/doc/HTML/en/kcontrol/soundinfo.html
share/doc/HTML/en/kcontrol/style.html
share/doc/HTML/en/kcontrol/sys-notify.html
-share/doc/HTML/en/kcontrol/sys-sounds.html
-share/doc/HTML/en/kcontrol/system1.html
-share/doc/HTML/en/kcontrol/systemmenu.html
share/doc/HTML/en/kcontrol/talk.html
share/doc/HTML/en/kcontrol/taskbar.html
share/doc/HTML/en/kcontrol/user-agent.html
share/doc/HTML/en/kcontrol/windows-shares.html
share/doc/HTML/en/kcontrol/xserver.html
share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdebugdialog/index.html
share/doc/HTML/en/kdebugdialog/introduction.html
share/doc/HTML/en/kdesu/.anchors
share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/compiling.html
share/doc/HTML/en/kdesu/configuration.html
-share/doc/HTML/en/kdesu/index.cvlog
share/doc/HTML/en/kdesu/index.docbook
share/doc/HTML/en/kdesu/index.html
share/doc/HTML/en/kdesu/installation.html
@@ -1076,15 +993,15 @@ share/doc/HTML/en/kdesu/interface-to-su.html
share/doc/HTML/en/kdesu/internals.html
share/doc/HTML/en/kdesu/introduction.html
share/doc/HTML/en/kdesu/password-checking.html
-share/doc/HTML/en/kdesu/secpasswordkeeping.html
-share/doc/HTML/en/kdesu/usingkdesu.html
+share/doc/HTML/en/kdesu/sec-password-keeping.html
+share/doc/HTML/en/kdesu/using-kdesu.html
share/doc/HTML/en/kdm/.anchors
share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/configuring-kdm.html
share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
share/doc/HTML/en/kdm/credits.html
share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
-share/doc/HTML/en/kdm/index.cvlog
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/index.html
share/doc/HTML/en/kdm/introduction.html
@@ -1093,12 +1010,14 @@ share/doc/HTML/en/kdm/lilo.html
share/doc/HTML/en/kdm/locale.html
share/doc/HTML/en/kdm/other-information.html
share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
share/doc/HTML/en/khelpcenter/contact-developers.html
share/doc/HTML/en/khelpcenter/contact-more-information.html
share/doc/HTML/en/khelpcenter/contact-official.html
share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/faq/.anchors
+share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/index.cvlog
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
@@ -1114,10 +1033,10 @@ share/doc/HTML/en/khelpcenter/quickstart/.anchors
share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
share/doc/HTML/en/khelpcenter/quickstart/configure.html
share/doc/HTML/en/khelpcenter/quickstart/credits.html
-share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/quickstart/index.html
share/doc/HTML/en/khelpcenter/quickstart/introduction.html
@@ -1141,6 +1060,7 @@ share/doc/HTML/en/khelpcenter/userguide/activating-the-screen-saver-by-moving-yo
share/doc/HTML/en/khelpcenter/userguide/addingprograms.html
share/doc/HTML/en/khelpcenter/userguide/allaboutyourdesktop.html
share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/contacting-the-authors.html
share/doc/HTML/en/khelpcenter/userguide/contactingauthors.html
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
@@ -1204,27 +1124,64 @@ share/doc/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
share/doc/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
share/doc/HTML/en/khelpcenter/what-is-kde.html
share/doc/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/HTML/en/kikbd/.anchors
-share/doc/HTML/en/kikbd/advanced.html
-share/doc/HTML/en/kikbd/advanced.png
-share/doc/HTML/en/kikbd/authors.html
-share/doc/HTML/en/kikbd/bug-reporting.html
-share/doc/HTML/en/kikbd/config.html
-share/doc/HTML/en/kikbd/create.html
-share/doc/HTML/en/kikbd/general.html
-share/doc/HTML/en/kikbd/general.png
-share/doc/HTML/en/kikbd/index.cvlog
-share/doc/HTML/en/kikbd/index.docbook
-share/doc/HTML/en/kikbd/index.html
-share/doc/HTML/en/kikbd/installation.html
-share/doc/HTML/en/kikbd/introduction.html
-share/doc/HTML/en/kikbd/nationalkeyboard.html
-share/doc/HTML/en/kikbd/screen-saver-password-problems..html
-share/doc/HTML/en/kikbd/startup.html
-share/doc/HTML/en/kikbd/startup.png
-share/doc/HTML/en/kikbd/style.html
-share/doc/HTML/en/kikbd/style.png
-share/doc/HTML/en/kikbd/troubleshooting.html
+share/doc/HTML/en/kicker/.anchors
+share/doc/HTML/en/kicker/access_config.png
+share/doc/HTML/en/kicker/basic_icons.png
+share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
+share/doc/HTML/en/kicker/config_window.png
+share/doc/HTML/en/kicker/configuration-adding-icons.html
+share/doc/HTML/en/kicker/configuration-config-window.html
+share/doc/HTML/en/kicker/configuration.html
+share/doc/HTML/en/kicker/credits.html
+share/doc/HTML/en/kicker/drag-and-drop.html
+share/doc/HTML/en/kicker/drag_applet.png
+share/doc/HTML/en/kicker/five-minute-course.html
+share/doc/HTML/en/kicker/glossary.html
+share/doc/HTML/en/kicker/handles.png
+share/doc/HTML/en/kicker/hide_buttons.png
+share/doc/HTML/en/kicker/i_adv_editor.png
+share/doc/HTML/en/kicker/i_control_center.png
+share/doc/HTML/en/kicker/i_desktop.png
+share/doc/HTML/en/kicker/i_help.png
+share/doc/HTML/en/kicker/i_home_dir.png
+share/doc/HTML/en/kicker/i_k_button.png
+share/doc/HTML/en/kicker/i_kandalfs_tips.png
+share/doc/HTML/en/kicker/i_shell.png
+share/doc/HTML/en/kicker/i_window_list.png
+share/doc/HTML/en/kicker/index.docbook
+share/doc/HTML/en/kicker/index.html
+share/doc/HTML/en/kicker/installation.html
+share/doc/HTML/en/kicker/introduction.html
+share/doc/HTML/en/kicker/kicker-for-admins-symbolic-links.html
+share/doc/HTML/en/kicker/kicker-for-admins.html
+share/doc/HTML/en/kicker/kicker-panel-elements.html
+share/doc/HTML/en/kicker/kicker_access_size.png
+share/doc/HTML/en/kicker/kicker_add_basic.png
+share/doc/HTML/en/kicker/kicker_basic_icons.png
+share/doc/HTML/en/kicker/kicker_basic_icons_2.png
+share/doc/HTML/en/kicker/other-features.html
+share/doc/HTML/en/kicker/qb_root.png
+share/doc/HTML/en/kicker/using-kicker.html
+share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
+share/doc/HTML/en/kmenuedit/credits.html
+share/doc/HTML/en/kmenuedit/details-advanced.html
+share/doc/HTML/en/kmenuedit/glossary.html
+share/doc/HTML/en/kmenuedit/i_copy.png
+share/doc/HTML/en/kmenuedit/i_cut.png
+share/doc/HTML/en/kmenuedit/i_delete.png
+share/doc/HTML/en/kmenuedit/i_k_button.png
+share/doc/HTML/en/kmenuedit/i_new_item.png
+share/doc/HTML/en/kmenuedit/i_new_submenu.png
+share/doc/HTML/en/kmenuedit/i_paste.png
+share/doc/HTML/en/kmenuedit/icon_sets.png
+share/doc/HTML/en/kmenuedit/icons.png
+share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/introduction.html
+share/doc/HTML/en/kmenuedit/menu-reference.html
+share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
@@ -1233,6 +1190,7 @@ share/doc/HTML/en/konqueror/bubble.html
share/doc/HTML/en/konqueror/cmndline.png
share/doc/HTML/en/konqueror/commandline.html
share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
@@ -1271,12 +1229,15 @@ share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/credits.html
share/doc/HTML/en/konsole/history-option.html
share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole1.gif
+share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
share/doc/HTML/en/konsole/mousebuttons.html
share/doc/HTML/en/konsole/techref.html
@@ -1284,6 +1245,7 @@ share/doc/HTML/en/konsole/toolbar.html
share/doc/HTML/en/konsole/use-of-konsole.html
share/doc/HTML/en/konsole/vt100.gif
share/doc/HTML/en/kpager/.anchors
+share/doc/HTML/en/kpager/common
share/doc/HTML/en/kpager/compilation-and-installation.html
share/doc/HTML/en/kpager/customizingkpageradvancedfeatures.html
share/doc/HTML/en/kpager/frequentlyaskedquestionsfaq.html
@@ -1299,25 +1261,43 @@ share/doc/HTML/en/kpager/rows-mode.html
share/doc/HTML/en/kpager/the-global-desktop.html
share/doc/HTML/en/kpager/the-window-properties-menu.html
share/doc/HTML/en/kpager/workingwithkpager.html
-share/doc/HTML/en/kwm/.anchors
-share/doc/HTML/en/kwm/authors.html
-share/doc/HTML/en/kwm/commands.html
-share/doc/HTML/en/kwm/configuration.html
-share/doc/HTML/en/kwm/does-kwm-support-shaded-windows-a-la-openste.html
-share/doc/HTML/en/kwm/epilogue.html
-share/doc/HTML/en/kwm/frequentlyaskedquestions.html
-share/doc/HTML/en/kwm/index.cvlog
-share/doc/HTML/en/kwm/index.docbook
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kwm/introduction.html
-share/doc/HTML/en/kwm/is-it-possible-to-add-kde-extensions-to-othe.html
-share/doc/HTML/en/kwm/minicli.html
-share/doc/HTML/en/kwm/mouse-control.html
-share/doc/HTML/en/kwm/shortcuts.html
-share/doc/HTML/en/kwm/soundevents.html
-share/doc/HTML/en/kwm/usingemphasiskwmemphasis.html
-share/doc/HTML/en/kwm/why-can-t-i-define-new-shortcuts-for-launchi.html
-share/doc/HTML/en/kwm/why-does-kwm-look-so-much-like-windows-95.html
+share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/authors.html
+share/doc/HTML/en/ksysguard/common
+share/doc/HTML/en/ksysguard/compilationandinstallation.html
+share/doc/HTML/en/ksysguard/frequentlyaskedquestions.html
+share/doc/HTML/en/ksysguard/index.docbook
+share/doc/HTML/en/ksysguard/index.html
+share/doc/HTML/en/ksysguard/installation.html
+share/doc/HTML/en/ksysguard/introduction.html
+share/doc/HTML/en/ksysguard/licenseandwarranty.html
+share/doc/HTML/en/ksysguard/requirements.html
+share/doc/HTML/en/ksysguard/thesensorbrowser.html
+share/doc/HTML/en/ksysguard/theworkspace.html
+share/doc/HTML/en/ksysguard/usingtheksysguard.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/common
+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.docbook
+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/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
@@ -1417,10 +1397,13 @@ share/icons/hicolor/32x32/devices/3floppy_mount.png
share/icons/hicolor/32x32/devices/3floppy_unmount.png
share/icons/hicolor/32x32/devices/5floppy_mount.png
share/icons/hicolor/32x32/devices/5floppy_unmount.png
+share/icons/hicolor/32x32/devices/cdaudio_mount.png
+share/icons/hicolor/32x32/devices/cdaudio_unmount.png
share/icons/hicolor/32x32/devices/cdrom_mount.png
share/icons/hicolor/32x32/devices/cdrom_unmount.png
share/icons/hicolor/32x32/devices/cdwriter_mount.png
share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_mount.png
share/icons/hicolor/32x32/devices/dvd_unmount.png
share/icons/hicolor/32x32/devices/hdd_mount.png
share/icons/hicolor/32x32/devices/hdd_unmount.png
@@ -1505,10 +1488,13 @@ share/icons/hicolor/48x48/devices/3floppy_mount.png
share/icons/hicolor/48x48/devices/3floppy_unmount.png
share/icons/hicolor/48x48/devices/5floppy_mount.png
share/icons/hicolor/48x48/devices/5floppy_unmount.png
+share/icons/hicolor/48x48/devices/cdaudio_mount.png
+share/icons/hicolor/48x48/devices/cdaudio_unmount.png
share/icons/hicolor/48x48/devices/cdrom_mount.png
share/icons/hicolor/48x48/devices/cdrom_unmount.png
share/icons/hicolor/48x48/devices/cdwriter_mount.png
share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_mount.png
share/icons/hicolor/48x48/devices/dvd_unmount.png
share/icons/hicolor/48x48/devices/hdd_mount.png
share/icons/hicolor/48x48/devices/hdd_unmount.png
@@ -1992,6 +1978,7 @@ share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
share/services/kurisearchfilter.desktop
+share/services/kxmlrpcd.desktop
share/services/man.protocol
share/services/nfs.protocol
share/services/nntp.protocol
@@ -2053,11 +2040,13 @@ share/wallpapers/northbeach.jpg
share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
-@dirrm share/doc/HTML/en/kwm
+@dirrm share/doc/HTML/en/kwrite
+@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kpager
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kikbd
+@dirrm share/doc/HTML/en/kmenuedit
+@dirrm share/doc/HTML/en/kicker
@dirrm share/doc/HTML/en/khelpcenter/userguide
@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/faq
@@ -2072,8 +2061,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
@dirrm share/apps/ksysguard/icons/locolor/16x16
-@dirrm share/apps/ksysguard/icons/locolor
-@dirrm share/apps/ksysguard/icons
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@dirrm share/apps/ksplash
@@ -2091,25 +2078,27 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/konqiconview
@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
@dirrm share/apps/kmenuedit/icons/locolor/16x16
-@dirrm share/apps/kmenuedit/icons/locolor
@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
@dirrm share/apps/kmenuedit/icons/hicolor/32x32
@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
@dirrm share/apps/kio_info
@dirrm share/apps/kicker/tiles
@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
@dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
@dirrm share/apps/khelpcenter/pics
@dirrm share/apps/khelpcenter/en
+@dirrm share/apps/khelpcenter
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
@dirrm share/apps/kdisplay/color-schemes
@dirrm share/apps/kdisplay/app-defaults
+@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
@dirrm share/apps/kdesktop/programs
@@ -2121,6 +2110,7 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kcontrol/pics
@dirrm share/apps/kcontrol
@dirrm share/apps/kcmlocale/pics
+@dirrm share/apps/kcmlocale
@dirrm share/apps/kcminput
@dirrm share/apps/kbookmark
@dirrm share/apps/kappfinder/apps/WordProcessing
@@ -2135,6 +2125,9 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kappfinder/apps/Editors
@dirrm share/apps/kappfinder/apps/Development
@dirrm share/apps/kappfinder/apps
+@dirrm share/apps/kappfinder
@dirrm share/apps/drkonqi/presets
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
+@dirrm share/apps/clockapplet
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 3fbd30c494dc..5219b5b00274 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdebase
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 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
@@ -40,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 094815fd3937..38387e559524 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
+MD5 (kdebase-1.94.tar.bz2) = a6617df687698e4954d7011a08625ec2
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index c63b81caa6cb..3737b07b7ed0 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -134,6 +134,7 @@ lib/klegacyimport.so
lib/klipper.la
lib/klipper.so
lib/kmenuedit.la
+lib/kmenuedit.so
lib/kmenuedit.so.0
lib/konqueror.la
lib/konqueror.so
@@ -149,13 +150,10 @@ lib/kxmlrpcd.la
lib/kxmlrpcd.so
lib/libccont.a
lib/libclockapplet.la
+lib/libclockapplet.so
lib/libclockapplet.so.1
-lib/libexampleapplet.la
-lib/libexampleapplet.so.1
lib/libhtmlsearch.la
lib/libhtmlsearch.so
-lib/libkasbarapplet.la
-lib/libkasbarapplet.so.1
lib/libkcm_access.la
lib/libkcm_access.so
lib/libkcm_arts.la
@@ -168,6 +166,8 @@ lib/libkcm_clock.la
lib/libkcm_clock.so
lib/libkcm_colors.la
lib/libkcm_colors.so
+lib/libkcm_crypto.la
+lib/libkcm_crypto.so
lib/libkcm_email.la
lib/libkcm_email.so
lib/libkcm_energy.la
@@ -226,11 +226,16 @@ lib/libkcm_taskbar.la
lib/libkcm_taskbar.so
lib/libkcm_virtualdesktops.la
lib/libkcm_virtualdesktops.so
+lib/libkcm_xmlrpcd.la
+lib/libkcm_xmlrpcd.so
lib/libkhelpcenter.la
+lib/libkhelpcenter.so
lib/libkhelpcenter.so.4
lib/libkminipagerapplet.la
+lib/libkminipagerapplet.so
lib/libkminipagerapplet.so.1
lib/libkonq.la
+lib/libkonq.so
lib/libkonq.so.4
lib/libkonqdirtree.la
lib/libkonqdirtree.so
@@ -241,20 +246,27 @@ lib/libkonqlistview.so
lib/libkonsolepart.la
lib/libkonsolepart.so
lib/libkrunapplet.la
+lib/libkrunapplet.so
lib/libkrunapplet.so.1
lib/libkshorturifilter.la
+lib/libkshorturifilter.so
lib/libkshorturifilter.so.1
lib/libksystemtrayapplet.la
+lib/libksystemtrayapplet.so
lib/libksystemtrayapplet.so.1
lib/libktaskbarapplet.la
+lib/libktaskbarapplet.so
lib/libktaskbarapplet.so.1
lib/libkuriikwsfilter.la
+lib/libkuriikwsfilter.so
lib/libkuriikwsfilter.so.1
lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so
lib/libkurisearchfilter.so.1
lib/libkwinb2.la
lib/libkwinb2.so
lib/libkwindefault.la
+lib/libkwindefault.so
lib/libkwindefault.so.0
lib/libkwinkde1.la
lib/libkwinkde1.so
@@ -271,23 +283,23 @@ lib/libkwinsystem.so
lib/libkwritepart.la
lib/libkwritepart.so
lib/libquicklauncher.la
+lib/libquicklauncher.so
lib/libquicklauncher.so.1
lib/libsmb++.la
+lib/libsmb++.so
lib/libsmb++.so.0
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
share/applnk/Development/designer.desktop
-share/applnk/Editors/gvim.desktop
share/applnk/Editors/kwrite.desktop
+share/applnk/Editors/xedit.desktop
share/applnk/Games/.directory
share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
share/applnk/Help.desktop
share/applnk/Home.desktop
share/applnk/Internet/.directory
share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/netscape.desktop
share/applnk/KControl.desktop
share/applnk/Multimedia/.directory
share/applnk/Office/.directory
@@ -337,6 +349,7 @@ share/applnk/Settings/Peripherals/.directory
share/applnk/Settings/Peripherals/keyboard.desktop
share/applnk/Settings/Peripherals/mouse.desktop
share/applnk/Settings/Personalization/.directory
+share/applnk/Settings/Personalization/crypto.desktop
share/applnk/Settings/Personalization/email.desktop
share/applnk/Settings/Personalization/kcmaccess.desktop
share/applnk/Settings/Personalization/kcmlayout.desktop
@@ -359,36 +372,6 @@ share/applnk/Settings/WebBrowsing/useragent.desktop
share/applnk/System/.directory
share/applnk/System/Arrange.desktop
share/applnk/System/ScreenSavers/.directory
-share/applnk/System/ScreenSavers/Ant.desktop
-share/applnk/System/ScreenSavers/Atlantis.desktop
-share/applnk/System/ScreenSavers/Attraction.desktop
-share/applnk/System/ScreenSavers/Bouboule.desktop
-share/applnk/System/ScreenSavers/Braid.desktop
-share/applnk/System/ScreenSavers/Bubble3d.desktop
-share/applnk/System/ScreenSavers/Bubbles.desktop
-share/applnk/System/ScreenSavers/Cage.desktop
-share/applnk/System/ScreenSavers/Compass.desktop
-share/applnk/System/ScreenSavers/Coral.desktop
-share/applnk/System/ScreenSavers/Crystal.desktop
-share/applnk/System/ScreenSavers/Cynosure.desktop
-share/applnk/System/ScreenSavers/Demon.desktop
-share/applnk/System/ScreenSavers/Drift.desktop
-share/applnk/System/ScreenSavers/Fadeplot.desktop
-share/applnk/System/ScreenSavers/Flag.desktop
-share/applnk/System/ScreenSavers/Flame.desktop
-share/applnk/System/ScreenSavers/Flow.desktop
-share/applnk/System/ScreenSavers/Forest.desktop
-share/applnk/System/ScreenSavers/GLPlanet.desktop
-share/applnk/System/ScreenSavers/Galaxy.desktop
-share/applnk/System/ScreenSavers/Gears.desktop
-share/applnk/System/ScreenSavers/Goop.desktop
-share/applnk/System/ScreenSavers/Grav.desktop
-share/applnk/System/ScreenSavers/Hopalong.desktop
-share/applnk/System/ScreenSavers/Hypercube.desktop
-share/applnk/System/ScreenSavers/Ifs.desktop
-share/applnk/System/ScreenSavers/Imsmap.desktop
-share/applnk/System/ScreenSavers/Interference.desktop
-share/applnk/System/ScreenSavers/Julia.desktop
share/applnk/System/ScreenSavers/KAttration.desktop
share/applnk/System/ScreenSavers/KBanner.desktop
share/applnk/System/ScreenSavers/KBlankscreen.desktop
@@ -416,34 +399,7 @@ share/applnk/System/ScreenSavers/KSlip.desktop
share/applnk/System/ScreenSavers/KSpace.desktop
share/applnk/System/ScreenSavers/KSwarm.desktop
share/applnk/System/ScreenSavers/KVm.desktop
-share/applnk/System/ScreenSavers/Kaleidescope.desktop
-share/applnk/System/ScreenSavers/Kumppa.desktop
-share/applnk/System/ScreenSavers/LMorph.desktop
-share/applnk/System/ScreenSavers/Lament.desktop
-share/applnk/System/ScreenSavers/Laser.desktop
-share/applnk/System/ScreenSavers/Lightning.desktop
-share/applnk/System/ScreenSavers/Lissie.desktop
-share/applnk/System/ScreenSavers/Moenius.desktop
-share/applnk/System/ScreenSavers/Penrose.desktop
-share/applnk/System/ScreenSavers/Phosphor.desktop
-share/applnk/System/ScreenSavers/Pulsar.desktop
-share/applnk/System/ScreenSavers/Rubik.desktop
-share/applnk/System/ScreenSavers/Slip.desktop
-share/applnk/System/ScreenSavers/Sonar.desktop
-share/applnk/System/ScreenSavers/Sproingies.desktop
-share/applnk/System/ScreenSavers/Stairs.desktop
-share/applnk/System/ScreenSavers/Starfish.desktop
-share/applnk/System/ScreenSavers/Strange.desktop
-share/applnk/System/ScreenSavers/Superquadrics.desktop
-share/applnk/System/ScreenSavers/Swirl.desktop
-share/applnk/System/ScreenSavers/T3d.desktop
-share/applnk/System/ScreenSavers/Triangle.desktop
-share/applnk/System/ScreenSavers/Vines.desktop
share/applnk/System/ScreenSavers/Worm.desktop
-share/applnk/System/ScreenSavers/XFlame.desktop
-share/applnk/System/ScreenSavers/XJack.desktop
-share/applnk/System/ScreenSavers/XMatrix.desktop
-share/applnk/System/ScreenSavers/XPipes.desktop
share/applnk/System/kappfinder.desktop
share/applnk/System/kfmclient.desktop
share/applnk/System/klegacyimport.desktop
@@ -452,17 +408,19 @@ share/applnk/System/konquerorsu.desktop
share/applnk/System/konsole.desktop
share/applnk/System/konsolesu.desktop
share/applnk/System/ksysguard.desktop
+share/applnk/Toys/xeyes.desktop
share/applnk/Utilities/.directory
share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/kpager.desktop
share/applnk/Utilities/ktip.desktop
share/applnk/Utilities/passwd.desktop
+share/applnk/Utilities/xcalc.desktop
share/applnk/Utilities/xclipboard.desktop
share/applnk/Utilities/xclock.desktop
share/applnk/Utilities/xconsole.desktop
+share/applnk/Utilities/xload.desktop
share/applnk/Utilities/xmag.desktop
share/applnk/Utilities/xterm.desktop
-share/applnk/WordProcessing/xpdf.desktop
share/apps/clockapplet/pics/lcd.png
share/apps/drkonqi/pics/konqi.png
share/apps/drkonqi/presets/developerrc
@@ -673,10 +631,8 @@ share/apps/khelpcenter/pics/star.png
share/apps/khelpcenter/pics/star_blank.png
share/apps/khelpcenter/pics/unchecked.xpm
share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.kdelnk
+share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/exampleapplet.desktop
-share/apps/kicker/applets/kasbarapplet.desktop
share/apps/kicker/applets/kminipagerapplet.desktop
share/apps/kicker/applets/krunapplet.desktop
share/apps/kicker/applets/ksystemtrayapplet.desktop
@@ -831,7 +787,7 @@ share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
-share/apps/ksysguard/ksysguard.rc
+share/apps/ksysguard/ksysguardui.rc
share/apps/kwin/b2.desktop
share/apps/kwin/eventsrc
share/apps/kwin/kde.desktop
@@ -893,18 +849,14 @@ share/config/penroserc
share/config/rocksrc
share/config/sliprc
share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/advanced.html
-share/doc/HTML/en/kcontrol/application.html
+share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
+share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
-share/doc/HTML/en/kcontrol/browsing-files.html
-share/doc/HTML/en/kcontrol/browsing-help.html
-share/doc/HTML/en/kcontrol/browsing-neighborhood.html
-share/doc/HTML/en/kcontrol/browsing-web.html
-share/doc/HTML/en/kcontrol/browsing.html
share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
share/doc/HTML/en/kcontrol/control-center-exiting.html
share/doc/HTML/en/kcontrol/control-center-menus.html
share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -921,25 +873,22 @@ share/doc/HTML/en/kcontrol/email.html
share/doc/HTML/en/kcontrol/energy.html
share/doc/HTML/en/kcontrol/file-assoc.html
share/doc/HTML/en/kcontrol/file-manager.html
-share/doc/HTML/en/kcontrol/fonts-man.html
share/doc/HTML/en/kcontrol/fonts.html
share/doc/HTML/en/kcontrol/help-index.html
share/doc/HTML/en/kcontrol/icons.html
-share/doc/HTML/en/kcontrol/index.cvlog
+share/doc/HTML/en/kcontrol/iconstyle.html
share/doc/HTML/en/kcontrol/index.docbook
share/doc/HTML/en/kcontrol/index.html
-share/doc/HTML/en/kcontrol/info.html
share/doc/HTML/en/kcontrol/interrupts.html
share/doc/HTML/en/kcontrol/introduction.html
share/doc/HTML/en/kcontrol/ioports.html
share/doc/HTML/en/kcontrol/kbd.html
+share/doc/HTML/en/kcontrol/kblayout.html
+share/doc/HTML/en/kcontrol/kcmaccess.docbook
share/doc/HTML/en/kcontrol/kcmaction.docbook
-share/doc/HTML/en/kcontrol/kcmadv.docbook
share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
share/doc/HTML/en/kcontrol/kcmbatmon.docbook
-share/doc/HTML/en/kcontrol/kcmbell.cvlog
share/doc/HTML/en/kcontrol/kcmbell.docbook
-share/doc/HTML/en/kcontrol/kcmbell.html
share/doc/HTML/en/kcontrol/kcmblockdev.docbook
share/doc/HTML/en/kcontrol/kcmborders.docbook
share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -947,8 +896,6 @@ share/doc/HTML/en/kcontrol/kcmcookie.docbook
share/doc/HTML/en/kcontrol/kcmdatetime.docbook
share/doc/HTML/en/kcontrol/kcmdesktop.docbook
share/doc/HTML/en/kcontrol/kcmdeviceinfo.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay.cvlog
-share/doc/HTML/en/kcontrol/kcmdisplay.docbook
share/doc/HTML/en/kcontrol/kcmdmainfo.docbook
share/doc/HTML/en/kcontrol/kcmdrkonqi.docbook
share/doc/HTML/en/kcontrol/kcmebrowse.docbook
@@ -956,29 +903,17 @@ share/doc/HTML/en/kcontrol/kcmemail.docbook
share/doc/HTML/en/kcontrol/kcmenergy.docbook
share/doc/HTML/en/kcontrol/kcmfile.docbook
share/doc/HTML/en/kcontrol/kcmfileman.docbook
-share/doc/HTML/en/kcontrol/kcmfontmanager.docbook
share/doc/HTML/en/kcontrol/kcmfonts.docbook
share/doc/HTML/en/kcontrol/kcmhelpindex.docbook
share/doc/HTML/en/kcontrol/kcmicon.docbook
-share/doc/HTML/en/kcontrol/kcminput.cvlog
-share/doc/HTML/en/kcontrol/kcminput.docbook
+share/doc/HTML/en/kcontrol/kcmiconstyle.docbook
share/doc/HTML/en/kcontrol/kcmintinfo.docbook
share/doc/HTML/en/kcontrol/kcmioportinfo.docbook
share/doc/HTML/en/kcontrol/kcmkbd.docbook
+share/doc/HTML/en/kcontrol/kcmkblayout.docbook
share/doc/HTML/en/kcontrol/kcmkbrowse.docbook
-share/doc/HTML/en/kcontrol/kcmkdesu.cvlog
-share/doc/HTML/en/kcontrol/kcmkdesu.docbook
share/doc/HTML/en/kcontrol/kcmkeybind.docbook
-share/doc/HTML/en/kcontrol/kcmkeys.cvlog
share/doc/HTML/en/kcontrol/kcmkeys.docbook
-share/doc/HTML/en/kcontrol/kcmkfm.cvlog
-share/doc/HTML/en/kcontrol/kcmkfm.docbook
-share/doc/HTML/en/kcontrol/kcmkpanel.cvlog
-share/doc/HTML/en/kcontrol/kcmkpanel.docbook
-share/doc/HTML/en/kcontrol/kcmkwm.cvlog
-share/doc/HTML/en/kcontrol/kcmkwm.docbook
-share/doc/HTML/en/kcontrol/kcmlocale.cvlog
-share/doc/HTML/en/kcontrol/kcmlocale.docbook
share/doc/HTML/en/kcontrol/kcmlocate.docbook
share/doc/HTML/en/kcontrol/kcmloginmanage.docbook
share/doc/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -986,26 +921,22 @@ share/doc/HTML/en/kcontrol/kcmlowbatwarn.docbook
share/doc/HTML/en/kcontrol/kcmmemoryinfo.docbook
share/doc/HTML/en/kcontrol/kcmmouse.docbook
share/doc/HTML/en/kcontrol/kcmmousebeh.docbook
+share/doc/HTML/en/kcontrol/kcmnumbername.docbook
share/doc/HTML/en/kcontrol/kcmpanel.docbook
share/doc/HTML/en/kcontrol/kcmpartitioninfo.docbook
share/doc/HTML/en/kcontrol/kcmpasswd.docbook
share/doc/HTML/en/kcontrol/kcmpciinfo.docbook
-share/doc/HTML/en/kcontrol/kcmpcmia.docbook
+share/doc/HTML/en/kcontrol/kcmpcmcia.docbook
share/doc/HTML/en/kcontrol/kcmpowerctrl.docbook
share/doc/HTML/en/kcontrol/kcmprocinfo.docbook
share/doc/HTML/en/kcontrol/kcmproxie.docbook
-share/doc/HTML/en/kcontrol/kcmsamba.cvlog
-share/doc/HTML/en/kcontrol/kcmsamba.docbook
share/doc/HTML/en/kcontrol/kcmscnsave.docbook
share/doc/HTML/en/kcontrol/kcmscsiinfo.docbook
share/doc/HTML/en/kcontrol/kcmsmbstat.docbook
share/doc/HTML/en/kcontrol/kcmsndinfo.docbook
share/doc/HTML/en/kcontrol/kcmsndsrv.docbook
-share/doc/HTML/en/kcontrol/kcmsounds.docbook
share/doc/HTML/en/kcontrol/kcmstyle.docbook
share/doc/HTML/en/kcontrol/kcmsysnotify.docbook
-share/doc/HTML/en/kcontrol/kcmsyssound.cvlog
-share/doc/HTML/en/kcontrol/kcmsyssound.docbook
share/doc/HTML/en/kcontrol/kcmtalk.docbook
share/doc/HTML/en/kcontrol/kcmtaskbar.docbook
share/doc/HTML/en/kcontrol/kcmuseragent.docbook
@@ -1013,16 +944,7 @@ share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/konq-browsing.html
-share/doc/HTML/en/kcontrol/konqui.html
-share/doc/HTML/en/kcontrol/kthememgr.cvlog
-share/doc/HTML/en/kcontrol/kthememgr.docbook
-share/doc/HTML/en/kcontrol/kthememgr.html
share/doc/HTML/en/kcontrol/laptop.html
-share/doc/HTML/en/kcontrol/lf-desktop.html
-share/doc/HTML/en/kcontrol/lf-panel.html
-share/doc/HTML/en/kcontrol/lf-themes.html
-share/doc/HTML/en/kcontrol/lf-window-behavior.html
-share/doc/HTML/en/kcontrol/lf.html
share/doc/HTML/en/kcontrol/locale.html
share/doc/HTML/en/kcontrol/login-manager.html
share/doc/HTML/en/kcontrol/lowbatcrit.html
@@ -1032,43 +954,38 @@ share/doc/HTML/en/kcontrol/module.html
share/doc/HTML/en/kcontrol/modules.html
share/doc/HTML/en/kcontrol/mouse-behav.html
share/doc/HTML/en/kcontrol/mouse.html
-share/doc/HTML/en/kcontrol/network.html
+share/doc/HTML/en/kcontrol/numbername.html
share/doc/HTML/en/kcontrol/panel.html
share/doc/HTML/en/kcontrol/partitions.html
share/doc/HTML/en/kcontrol/passwords.html
share/doc/HTML/en/kcontrol/pci.html
-share/doc/HTML/en/kcontrol/pcmia.html
-share/doc/HTML/en/kcontrol/periph.html
-share/doc/HTML/en/kcontrol/personalize.html
-share/doc/HTML/en/kcontrol/power.html
+share/doc/HTML/en/kcontrol/pcmcia.html
share/doc/HTML/en/kcontrol/powerctrl.html
share/doc/HTML/en/kcontrol/processor.html
share/doc/HTML/en/kcontrol/proxies.html
share/doc/HTML/en/kcontrol/sambastatus.html
share/doc/HTML/en/kcontrol/screensaver.html
+share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/scsi.html
share/doc/HTML/en/kcontrol/sndserver.html
-share/doc/HTML/en/kcontrol/sound.html
share/doc/HTML/en/kcontrol/soundinfo.html
share/doc/HTML/en/kcontrol/style.html
share/doc/HTML/en/kcontrol/sys-notify.html
-share/doc/HTML/en/kcontrol/sys-sounds.html
-share/doc/HTML/en/kcontrol/system1.html
-share/doc/HTML/en/kcontrol/systemmenu.html
share/doc/HTML/en/kcontrol/talk.html
share/doc/HTML/en/kcontrol/taskbar.html
share/doc/HTML/en/kcontrol/user-agent.html
share/doc/HTML/en/kcontrol/windows-shares.html
share/doc/HTML/en/kcontrol/xserver.html
share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdebugdialog/index.html
share/doc/HTML/en/kdebugdialog/introduction.html
share/doc/HTML/en/kdesu/.anchors
share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/compiling.html
share/doc/HTML/en/kdesu/configuration.html
-share/doc/HTML/en/kdesu/index.cvlog
share/doc/HTML/en/kdesu/index.docbook
share/doc/HTML/en/kdesu/index.html
share/doc/HTML/en/kdesu/installation.html
@@ -1076,15 +993,15 @@ share/doc/HTML/en/kdesu/interface-to-su.html
share/doc/HTML/en/kdesu/internals.html
share/doc/HTML/en/kdesu/introduction.html
share/doc/HTML/en/kdesu/password-checking.html
-share/doc/HTML/en/kdesu/secpasswordkeeping.html
-share/doc/HTML/en/kdesu/usingkdesu.html
+share/doc/HTML/en/kdesu/sec-password-keeping.html
+share/doc/HTML/en/kdesu/using-kdesu.html
share/doc/HTML/en/kdm/.anchors
share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/configuring-kdm.html
share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
share/doc/HTML/en/kdm/credits.html
share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
-share/doc/HTML/en/kdm/index.cvlog
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/index.html
share/doc/HTML/en/kdm/introduction.html
@@ -1093,12 +1010,14 @@ share/doc/HTML/en/kdm/lilo.html
share/doc/HTML/en/kdm/locale.html
share/doc/HTML/en/kdm/other-information.html
share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
share/doc/HTML/en/khelpcenter/contact-developers.html
share/doc/HTML/en/khelpcenter/contact-more-information.html
share/doc/HTML/en/khelpcenter/contact-official.html
share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/faq/.anchors
+share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/index.cvlog
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
@@ -1114,10 +1033,10 @@ share/doc/HTML/en/khelpcenter/quickstart/.anchors
share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
share/doc/HTML/en/khelpcenter/quickstart/configure.html
share/doc/HTML/en/khelpcenter/quickstart/credits.html
-share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/quickstart/index.html
share/doc/HTML/en/khelpcenter/quickstart/introduction.html
@@ -1141,6 +1060,7 @@ share/doc/HTML/en/khelpcenter/userguide/activating-the-screen-saver-by-moving-yo
share/doc/HTML/en/khelpcenter/userguide/addingprograms.html
share/doc/HTML/en/khelpcenter/userguide/allaboutyourdesktop.html
share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/contacting-the-authors.html
share/doc/HTML/en/khelpcenter/userguide/contactingauthors.html
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
@@ -1204,27 +1124,64 @@ share/doc/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
share/doc/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
share/doc/HTML/en/khelpcenter/what-is-kde.html
share/doc/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/HTML/en/kikbd/.anchors
-share/doc/HTML/en/kikbd/advanced.html
-share/doc/HTML/en/kikbd/advanced.png
-share/doc/HTML/en/kikbd/authors.html
-share/doc/HTML/en/kikbd/bug-reporting.html
-share/doc/HTML/en/kikbd/config.html
-share/doc/HTML/en/kikbd/create.html
-share/doc/HTML/en/kikbd/general.html
-share/doc/HTML/en/kikbd/general.png
-share/doc/HTML/en/kikbd/index.cvlog
-share/doc/HTML/en/kikbd/index.docbook
-share/doc/HTML/en/kikbd/index.html
-share/doc/HTML/en/kikbd/installation.html
-share/doc/HTML/en/kikbd/introduction.html
-share/doc/HTML/en/kikbd/nationalkeyboard.html
-share/doc/HTML/en/kikbd/screen-saver-password-problems..html
-share/doc/HTML/en/kikbd/startup.html
-share/doc/HTML/en/kikbd/startup.png
-share/doc/HTML/en/kikbd/style.html
-share/doc/HTML/en/kikbd/style.png
-share/doc/HTML/en/kikbd/troubleshooting.html
+share/doc/HTML/en/kicker/.anchors
+share/doc/HTML/en/kicker/access_config.png
+share/doc/HTML/en/kicker/basic_icons.png
+share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
+share/doc/HTML/en/kicker/config_window.png
+share/doc/HTML/en/kicker/configuration-adding-icons.html
+share/doc/HTML/en/kicker/configuration-config-window.html
+share/doc/HTML/en/kicker/configuration.html
+share/doc/HTML/en/kicker/credits.html
+share/doc/HTML/en/kicker/drag-and-drop.html
+share/doc/HTML/en/kicker/drag_applet.png
+share/doc/HTML/en/kicker/five-minute-course.html
+share/doc/HTML/en/kicker/glossary.html
+share/doc/HTML/en/kicker/handles.png
+share/doc/HTML/en/kicker/hide_buttons.png
+share/doc/HTML/en/kicker/i_adv_editor.png
+share/doc/HTML/en/kicker/i_control_center.png
+share/doc/HTML/en/kicker/i_desktop.png
+share/doc/HTML/en/kicker/i_help.png
+share/doc/HTML/en/kicker/i_home_dir.png
+share/doc/HTML/en/kicker/i_k_button.png
+share/doc/HTML/en/kicker/i_kandalfs_tips.png
+share/doc/HTML/en/kicker/i_shell.png
+share/doc/HTML/en/kicker/i_window_list.png
+share/doc/HTML/en/kicker/index.docbook
+share/doc/HTML/en/kicker/index.html
+share/doc/HTML/en/kicker/installation.html
+share/doc/HTML/en/kicker/introduction.html
+share/doc/HTML/en/kicker/kicker-for-admins-symbolic-links.html
+share/doc/HTML/en/kicker/kicker-for-admins.html
+share/doc/HTML/en/kicker/kicker-panel-elements.html
+share/doc/HTML/en/kicker/kicker_access_size.png
+share/doc/HTML/en/kicker/kicker_add_basic.png
+share/doc/HTML/en/kicker/kicker_basic_icons.png
+share/doc/HTML/en/kicker/kicker_basic_icons_2.png
+share/doc/HTML/en/kicker/other-features.html
+share/doc/HTML/en/kicker/qb_root.png
+share/doc/HTML/en/kicker/using-kicker.html
+share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
+share/doc/HTML/en/kmenuedit/credits.html
+share/doc/HTML/en/kmenuedit/details-advanced.html
+share/doc/HTML/en/kmenuedit/glossary.html
+share/doc/HTML/en/kmenuedit/i_copy.png
+share/doc/HTML/en/kmenuedit/i_cut.png
+share/doc/HTML/en/kmenuedit/i_delete.png
+share/doc/HTML/en/kmenuedit/i_k_button.png
+share/doc/HTML/en/kmenuedit/i_new_item.png
+share/doc/HTML/en/kmenuedit/i_new_submenu.png
+share/doc/HTML/en/kmenuedit/i_paste.png
+share/doc/HTML/en/kmenuedit/icon_sets.png
+share/doc/HTML/en/kmenuedit/icons.png
+share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/introduction.html
+share/doc/HTML/en/kmenuedit/menu-reference.html
+share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
@@ -1233,6 +1190,7 @@ share/doc/HTML/en/konqueror/bubble.html
share/doc/HTML/en/konqueror/cmndline.png
share/doc/HTML/en/konqueror/commandline.html
share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
@@ -1271,12 +1229,15 @@ share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/credits.html
share/doc/HTML/en/konsole/history-option.html
share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole1.gif
+share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
share/doc/HTML/en/konsole/mousebuttons.html
share/doc/HTML/en/konsole/techref.html
@@ -1284,6 +1245,7 @@ share/doc/HTML/en/konsole/toolbar.html
share/doc/HTML/en/konsole/use-of-konsole.html
share/doc/HTML/en/konsole/vt100.gif
share/doc/HTML/en/kpager/.anchors
+share/doc/HTML/en/kpager/common
share/doc/HTML/en/kpager/compilation-and-installation.html
share/doc/HTML/en/kpager/customizingkpageradvancedfeatures.html
share/doc/HTML/en/kpager/frequentlyaskedquestionsfaq.html
@@ -1299,25 +1261,43 @@ share/doc/HTML/en/kpager/rows-mode.html
share/doc/HTML/en/kpager/the-global-desktop.html
share/doc/HTML/en/kpager/the-window-properties-menu.html
share/doc/HTML/en/kpager/workingwithkpager.html
-share/doc/HTML/en/kwm/.anchors
-share/doc/HTML/en/kwm/authors.html
-share/doc/HTML/en/kwm/commands.html
-share/doc/HTML/en/kwm/configuration.html
-share/doc/HTML/en/kwm/does-kwm-support-shaded-windows-a-la-openste.html
-share/doc/HTML/en/kwm/epilogue.html
-share/doc/HTML/en/kwm/frequentlyaskedquestions.html
-share/doc/HTML/en/kwm/index.cvlog
-share/doc/HTML/en/kwm/index.docbook
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kwm/introduction.html
-share/doc/HTML/en/kwm/is-it-possible-to-add-kde-extensions-to-othe.html
-share/doc/HTML/en/kwm/minicli.html
-share/doc/HTML/en/kwm/mouse-control.html
-share/doc/HTML/en/kwm/shortcuts.html
-share/doc/HTML/en/kwm/soundevents.html
-share/doc/HTML/en/kwm/usingemphasiskwmemphasis.html
-share/doc/HTML/en/kwm/why-can-t-i-define-new-shortcuts-for-launchi.html
-share/doc/HTML/en/kwm/why-does-kwm-look-so-much-like-windows-95.html
+share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/authors.html
+share/doc/HTML/en/ksysguard/common
+share/doc/HTML/en/ksysguard/compilationandinstallation.html
+share/doc/HTML/en/ksysguard/frequentlyaskedquestions.html
+share/doc/HTML/en/ksysguard/index.docbook
+share/doc/HTML/en/ksysguard/index.html
+share/doc/HTML/en/ksysguard/installation.html
+share/doc/HTML/en/ksysguard/introduction.html
+share/doc/HTML/en/ksysguard/licenseandwarranty.html
+share/doc/HTML/en/ksysguard/requirements.html
+share/doc/HTML/en/ksysguard/thesensorbrowser.html
+share/doc/HTML/en/ksysguard/theworkspace.html
+share/doc/HTML/en/ksysguard/usingtheksysguard.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/common
+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.docbook
+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/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
@@ -1417,10 +1397,13 @@ share/icons/hicolor/32x32/devices/3floppy_mount.png
share/icons/hicolor/32x32/devices/3floppy_unmount.png
share/icons/hicolor/32x32/devices/5floppy_mount.png
share/icons/hicolor/32x32/devices/5floppy_unmount.png
+share/icons/hicolor/32x32/devices/cdaudio_mount.png
+share/icons/hicolor/32x32/devices/cdaudio_unmount.png
share/icons/hicolor/32x32/devices/cdrom_mount.png
share/icons/hicolor/32x32/devices/cdrom_unmount.png
share/icons/hicolor/32x32/devices/cdwriter_mount.png
share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_mount.png
share/icons/hicolor/32x32/devices/dvd_unmount.png
share/icons/hicolor/32x32/devices/hdd_mount.png
share/icons/hicolor/32x32/devices/hdd_unmount.png
@@ -1505,10 +1488,13 @@ share/icons/hicolor/48x48/devices/3floppy_mount.png
share/icons/hicolor/48x48/devices/3floppy_unmount.png
share/icons/hicolor/48x48/devices/5floppy_mount.png
share/icons/hicolor/48x48/devices/5floppy_unmount.png
+share/icons/hicolor/48x48/devices/cdaudio_mount.png
+share/icons/hicolor/48x48/devices/cdaudio_unmount.png
share/icons/hicolor/48x48/devices/cdrom_mount.png
share/icons/hicolor/48x48/devices/cdrom_unmount.png
share/icons/hicolor/48x48/devices/cdwriter_mount.png
share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_mount.png
share/icons/hicolor/48x48/devices/dvd_unmount.png
share/icons/hicolor/48x48/devices/hdd_mount.png
share/icons/hicolor/48x48/devices/hdd_unmount.png
@@ -1992,6 +1978,7 @@ share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
share/services/kurisearchfilter.desktop
+share/services/kxmlrpcd.desktop
share/services/man.protocol
share/services/nfs.protocol
share/services/nntp.protocol
@@ -2053,11 +2040,13 @@ share/wallpapers/northbeach.jpg
share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
-@dirrm share/doc/HTML/en/kwm
+@dirrm share/doc/HTML/en/kwrite
+@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kpager
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kikbd
+@dirrm share/doc/HTML/en/kmenuedit
+@dirrm share/doc/HTML/en/kicker
@dirrm share/doc/HTML/en/khelpcenter/userguide
@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/faq
@@ -2072,8 +2061,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
@dirrm share/apps/ksysguard/icons/locolor/16x16
-@dirrm share/apps/ksysguard/icons/locolor
-@dirrm share/apps/ksysguard/icons
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@dirrm share/apps/ksplash
@@ -2091,25 +2078,27 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/konqiconview
@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
@dirrm share/apps/kmenuedit/icons/locolor/16x16
-@dirrm share/apps/kmenuedit/icons/locolor
@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
@dirrm share/apps/kmenuedit/icons/hicolor/32x32
@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
@dirrm share/apps/kio_info
@dirrm share/apps/kicker/tiles
@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
@dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
@dirrm share/apps/khelpcenter/pics
@dirrm share/apps/khelpcenter/en
+@dirrm share/apps/khelpcenter
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
@dirrm share/apps/kdisplay/color-schemes
@dirrm share/apps/kdisplay/app-defaults
+@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
@dirrm share/apps/kdesktop/programs
@@ -2121,6 +2110,7 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kcontrol/pics
@dirrm share/apps/kcontrol
@dirrm share/apps/kcmlocale/pics
+@dirrm share/apps/kcmlocale
@dirrm share/apps/kcminput
@dirrm share/apps/kbookmark
@dirrm share/apps/kappfinder/apps/WordProcessing
@@ -2135,6 +2125,9 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kappfinder/apps/Editors
@dirrm share/apps/kappfinder/apps/Development
@dirrm share/apps/kappfinder/apps
+@dirrm share/apps/kappfinder
@dirrm share/apps/drkonqi/presets
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
+@dirrm share/apps/clockapplet
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 3fbd30c494dc..5219b5b00274 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdebase
-PORTVERSION= 20000829A
+PORTVERSION= 1.94
CATEGORIES= x11 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
@@ -40,7 +41,4 @@ pre-configure:
${PERL} -pi -e "s@version-info 1:0:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/khelpcenter/Makefile.in
${PERL} -pi -e "s@version-info 1:1:0@version-info ${SOMAJOR}:${SOMINOR}@g" ${WRKSRC}/nsplugins/Makefile.in
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 094815fd3937..38387e559524 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
+MD5 (kdebase-1.94.tar.bz2) = a6617df687698e4954d7011a08625ec2
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index c63b81caa6cb..3737b07b7ed0 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -134,6 +134,7 @@ lib/klegacyimport.so
lib/klipper.la
lib/klipper.so
lib/kmenuedit.la
+lib/kmenuedit.so
lib/kmenuedit.so.0
lib/konqueror.la
lib/konqueror.so
@@ -149,13 +150,10 @@ lib/kxmlrpcd.la
lib/kxmlrpcd.so
lib/libccont.a
lib/libclockapplet.la
+lib/libclockapplet.so
lib/libclockapplet.so.1
-lib/libexampleapplet.la
-lib/libexampleapplet.so.1
lib/libhtmlsearch.la
lib/libhtmlsearch.so
-lib/libkasbarapplet.la
-lib/libkasbarapplet.so.1
lib/libkcm_access.la
lib/libkcm_access.so
lib/libkcm_arts.la
@@ -168,6 +166,8 @@ lib/libkcm_clock.la
lib/libkcm_clock.so
lib/libkcm_colors.la
lib/libkcm_colors.so
+lib/libkcm_crypto.la
+lib/libkcm_crypto.so
lib/libkcm_email.la
lib/libkcm_email.so
lib/libkcm_energy.la
@@ -226,11 +226,16 @@ lib/libkcm_taskbar.la
lib/libkcm_taskbar.so
lib/libkcm_virtualdesktops.la
lib/libkcm_virtualdesktops.so
+lib/libkcm_xmlrpcd.la
+lib/libkcm_xmlrpcd.so
lib/libkhelpcenter.la
+lib/libkhelpcenter.so
lib/libkhelpcenter.so.4
lib/libkminipagerapplet.la
+lib/libkminipagerapplet.so
lib/libkminipagerapplet.so.1
lib/libkonq.la
+lib/libkonq.so
lib/libkonq.so.4
lib/libkonqdirtree.la
lib/libkonqdirtree.so
@@ -241,20 +246,27 @@ lib/libkonqlistview.so
lib/libkonsolepart.la
lib/libkonsolepart.so
lib/libkrunapplet.la
+lib/libkrunapplet.so
lib/libkrunapplet.so.1
lib/libkshorturifilter.la
+lib/libkshorturifilter.so
lib/libkshorturifilter.so.1
lib/libksystemtrayapplet.la
+lib/libksystemtrayapplet.so
lib/libksystemtrayapplet.so.1
lib/libktaskbarapplet.la
+lib/libktaskbarapplet.so
lib/libktaskbarapplet.so.1
lib/libkuriikwsfilter.la
+lib/libkuriikwsfilter.so
lib/libkuriikwsfilter.so.1
lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so
lib/libkurisearchfilter.so.1
lib/libkwinb2.la
lib/libkwinb2.so
lib/libkwindefault.la
+lib/libkwindefault.so
lib/libkwindefault.so.0
lib/libkwinkde1.la
lib/libkwinkde1.so
@@ -271,23 +283,23 @@ lib/libkwinsystem.so
lib/libkwritepart.la
lib/libkwritepart.so
lib/libquicklauncher.la
+lib/libquicklauncher.so
lib/libquicklauncher.so.1
lib/libsmb++.la
+lib/libsmb++.so
lib/libsmb++.so.0
share/applnk/.directory
share/applnk/.hidden/konqfilemgr.desktop
share/applnk/Applications/.directory
share/applnk/Development/designer.desktop
-share/applnk/Editors/gvim.desktop
share/applnk/Editors/kwrite.desktop
+share/applnk/Editors/xedit.desktop
share/applnk/Games/.directory
share/applnk/Graphics/.directory
-share/applnk/Graphics/gimp.desktop
share/applnk/Help.desktop
share/applnk/Home.desktop
share/applnk/Internet/.directory
share/applnk/Internet/konqbrowser.desktop
-share/applnk/Internet/netscape.desktop
share/applnk/KControl.desktop
share/applnk/Multimedia/.directory
share/applnk/Office/.directory
@@ -337,6 +349,7 @@ share/applnk/Settings/Peripherals/.directory
share/applnk/Settings/Peripherals/keyboard.desktop
share/applnk/Settings/Peripherals/mouse.desktop
share/applnk/Settings/Personalization/.directory
+share/applnk/Settings/Personalization/crypto.desktop
share/applnk/Settings/Personalization/email.desktop
share/applnk/Settings/Personalization/kcmaccess.desktop
share/applnk/Settings/Personalization/kcmlayout.desktop
@@ -359,36 +372,6 @@ share/applnk/Settings/WebBrowsing/useragent.desktop
share/applnk/System/.directory
share/applnk/System/Arrange.desktop
share/applnk/System/ScreenSavers/.directory
-share/applnk/System/ScreenSavers/Ant.desktop
-share/applnk/System/ScreenSavers/Atlantis.desktop
-share/applnk/System/ScreenSavers/Attraction.desktop
-share/applnk/System/ScreenSavers/Bouboule.desktop
-share/applnk/System/ScreenSavers/Braid.desktop
-share/applnk/System/ScreenSavers/Bubble3d.desktop
-share/applnk/System/ScreenSavers/Bubbles.desktop
-share/applnk/System/ScreenSavers/Cage.desktop
-share/applnk/System/ScreenSavers/Compass.desktop
-share/applnk/System/ScreenSavers/Coral.desktop
-share/applnk/System/ScreenSavers/Crystal.desktop
-share/applnk/System/ScreenSavers/Cynosure.desktop
-share/applnk/System/ScreenSavers/Demon.desktop
-share/applnk/System/ScreenSavers/Drift.desktop
-share/applnk/System/ScreenSavers/Fadeplot.desktop
-share/applnk/System/ScreenSavers/Flag.desktop
-share/applnk/System/ScreenSavers/Flame.desktop
-share/applnk/System/ScreenSavers/Flow.desktop
-share/applnk/System/ScreenSavers/Forest.desktop
-share/applnk/System/ScreenSavers/GLPlanet.desktop
-share/applnk/System/ScreenSavers/Galaxy.desktop
-share/applnk/System/ScreenSavers/Gears.desktop
-share/applnk/System/ScreenSavers/Goop.desktop
-share/applnk/System/ScreenSavers/Grav.desktop
-share/applnk/System/ScreenSavers/Hopalong.desktop
-share/applnk/System/ScreenSavers/Hypercube.desktop
-share/applnk/System/ScreenSavers/Ifs.desktop
-share/applnk/System/ScreenSavers/Imsmap.desktop
-share/applnk/System/ScreenSavers/Interference.desktop
-share/applnk/System/ScreenSavers/Julia.desktop
share/applnk/System/ScreenSavers/KAttration.desktop
share/applnk/System/ScreenSavers/KBanner.desktop
share/applnk/System/ScreenSavers/KBlankscreen.desktop
@@ -416,34 +399,7 @@ share/applnk/System/ScreenSavers/KSlip.desktop
share/applnk/System/ScreenSavers/KSpace.desktop
share/applnk/System/ScreenSavers/KSwarm.desktop
share/applnk/System/ScreenSavers/KVm.desktop
-share/applnk/System/ScreenSavers/Kaleidescope.desktop
-share/applnk/System/ScreenSavers/Kumppa.desktop
-share/applnk/System/ScreenSavers/LMorph.desktop
-share/applnk/System/ScreenSavers/Lament.desktop
-share/applnk/System/ScreenSavers/Laser.desktop
-share/applnk/System/ScreenSavers/Lightning.desktop
-share/applnk/System/ScreenSavers/Lissie.desktop
-share/applnk/System/ScreenSavers/Moenius.desktop
-share/applnk/System/ScreenSavers/Penrose.desktop
-share/applnk/System/ScreenSavers/Phosphor.desktop
-share/applnk/System/ScreenSavers/Pulsar.desktop
-share/applnk/System/ScreenSavers/Rubik.desktop
-share/applnk/System/ScreenSavers/Slip.desktop
-share/applnk/System/ScreenSavers/Sonar.desktop
-share/applnk/System/ScreenSavers/Sproingies.desktop
-share/applnk/System/ScreenSavers/Stairs.desktop
-share/applnk/System/ScreenSavers/Starfish.desktop
-share/applnk/System/ScreenSavers/Strange.desktop
-share/applnk/System/ScreenSavers/Superquadrics.desktop
-share/applnk/System/ScreenSavers/Swirl.desktop
-share/applnk/System/ScreenSavers/T3d.desktop
-share/applnk/System/ScreenSavers/Triangle.desktop
-share/applnk/System/ScreenSavers/Vines.desktop
share/applnk/System/ScreenSavers/Worm.desktop
-share/applnk/System/ScreenSavers/XFlame.desktop
-share/applnk/System/ScreenSavers/XJack.desktop
-share/applnk/System/ScreenSavers/XMatrix.desktop
-share/applnk/System/ScreenSavers/XPipes.desktop
share/applnk/System/kappfinder.desktop
share/applnk/System/kfmclient.desktop
share/applnk/System/klegacyimport.desktop
@@ -452,17 +408,19 @@ share/applnk/System/konquerorsu.desktop
share/applnk/System/konsole.desktop
share/applnk/System/konsolesu.desktop
share/applnk/System/ksysguard.desktop
+share/applnk/Toys/xeyes.desktop
share/applnk/Utilities/.directory
share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/kpager.desktop
share/applnk/Utilities/ktip.desktop
share/applnk/Utilities/passwd.desktop
+share/applnk/Utilities/xcalc.desktop
share/applnk/Utilities/xclipboard.desktop
share/applnk/Utilities/xclock.desktop
share/applnk/Utilities/xconsole.desktop
+share/applnk/Utilities/xload.desktop
share/applnk/Utilities/xmag.desktop
share/applnk/Utilities/xterm.desktop
-share/applnk/WordProcessing/xpdf.desktop
share/apps/clockapplet/pics/lcd.png
share/apps/drkonqi/pics/konqi.png
share/apps/drkonqi/presets/developerrc
@@ -673,10 +631,8 @@ share/apps/khelpcenter/pics/star.png
share/apps/khelpcenter/pics/star_blank.png
share/apps/khelpcenter/pics/unchecked.xpm
share/apps/khelpcenter/plugins/Tutorials/.directory
-share/apps/khelpcenter/plugins/Tutorials/quickstart.kdelnk
+share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/exampleapplet.desktop
-share/apps/kicker/applets/kasbarapplet.desktop
share/apps/kicker/applets/kminipagerapplet.desktop
share/apps/kicker/applets/krunapplet.desktop
share/apps/kicker/applets/ksystemtrayapplet.desktop
@@ -831,7 +787,7 @@ share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
-share/apps/ksysguard/ksysguard.rc
+share/apps/ksysguard/ksysguardui.rc
share/apps/kwin/b2.desktop
share/apps/kwin/eventsrc
share/apps/kwin/kde.desktop
@@ -893,18 +849,14 @@ share/config/penroserc
share/config/rocksrc
share/config/sliprc
share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/advanced.html
-share/doc/HTML/en/kcontrol/application.html
+share/doc/HTML/en/kcontrol/action.html
share/doc/HTML/en/kcontrol/background.html
share/doc/HTML/en/kcontrol/batmon.html
+share/doc/HTML/en/kcontrol/bell.html
share/doc/HTML/en/kcontrol/blockdev.html
share/doc/HTML/en/kcontrol/borders.html
-share/doc/HTML/en/kcontrol/browsing-files.html
-share/doc/HTML/en/kcontrol/browsing-help.html
-share/doc/HTML/en/kcontrol/browsing-neighborhood.html
-share/doc/HTML/en/kcontrol/browsing-web.html
-share/doc/HTML/en/kcontrol/browsing.html
share/doc/HTML/en/kcontrol/color.html
+share/doc/HTML/en/kcontrol/common
share/doc/HTML/en/kcontrol/control-center-exiting.html
share/doc/HTML/en/kcontrol/control-center-menus.html
share/doc/HTML/en/kcontrol/control-center-run-indiv.html
@@ -921,25 +873,22 @@ share/doc/HTML/en/kcontrol/email.html
share/doc/HTML/en/kcontrol/energy.html
share/doc/HTML/en/kcontrol/file-assoc.html
share/doc/HTML/en/kcontrol/file-manager.html
-share/doc/HTML/en/kcontrol/fonts-man.html
share/doc/HTML/en/kcontrol/fonts.html
share/doc/HTML/en/kcontrol/help-index.html
share/doc/HTML/en/kcontrol/icons.html
-share/doc/HTML/en/kcontrol/index.cvlog
+share/doc/HTML/en/kcontrol/iconstyle.html
share/doc/HTML/en/kcontrol/index.docbook
share/doc/HTML/en/kcontrol/index.html
-share/doc/HTML/en/kcontrol/info.html
share/doc/HTML/en/kcontrol/interrupts.html
share/doc/HTML/en/kcontrol/introduction.html
share/doc/HTML/en/kcontrol/ioports.html
share/doc/HTML/en/kcontrol/kbd.html
+share/doc/HTML/en/kcontrol/kblayout.html
+share/doc/HTML/en/kcontrol/kcmaccess.docbook
share/doc/HTML/en/kcontrol/kcmaction.docbook
-share/doc/HTML/en/kcontrol/kcmadv.docbook
share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
share/doc/HTML/en/kcontrol/kcmbatmon.docbook
-share/doc/HTML/en/kcontrol/kcmbell.cvlog
share/doc/HTML/en/kcontrol/kcmbell.docbook
-share/doc/HTML/en/kcontrol/kcmbell.html
share/doc/HTML/en/kcontrol/kcmblockdev.docbook
share/doc/HTML/en/kcontrol/kcmborders.docbook
share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -947,8 +896,6 @@ share/doc/HTML/en/kcontrol/kcmcookie.docbook
share/doc/HTML/en/kcontrol/kcmdatetime.docbook
share/doc/HTML/en/kcontrol/kcmdesktop.docbook
share/doc/HTML/en/kcontrol/kcmdeviceinfo.docbook
-share/doc/HTML/en/kcontrol/kcmdisplay.cvlog
-share/doc/HTML/en/kcontrol/kcmdisplay.docbook
share/doc/HTML/en/kcontrol/kcmdmainfo.docbook
share/doc/HTML/en/kcontrol/kcmdrkonqi.docbook
share/doc/HTML/en/kcontrol/kcmebrowse.docbook
@@ -956,29 +903,17 @@ share/doc/HTML/en/kcontrol/kcmemail.docbook
share/doc/HTML/en/kcontrol/kcmenergy.docbook
share/doc/HTML/en/kcontrol/kcmfile.docbook
share/doc/HTML/en/kcontrol/kcmfileman.docbook
-share/doc/HTML/en/kcontrol/kcmfontmanager.docbook
share/doc/HTML/en/kcontrol/kcmfonts.docbook
share/doc/HTML/en/kcontrol/kcmhelpindex.docbook
share/doc/HTML/en/kcontrol/kcmicon.docbook
-share/doc/HTML/en/kcontrol/kcminput.cvlog
-share/doc/HTML/en/kcontrol/kcminput.docbook
+share/doc/HTML/en/kcontrol/kcmiconstyle.docbook
share/doc/HTML/en/kcontrol/kcmintinfo.docbook
share/doc/HTML/en/kcontrol/kcmioportinfo.docbook
share/doc/HTML/en/kcontrol/kcmkbd.docbook
+share/doc/HTML/en/kcontrol/kcmkblayout.docbook
share/doc/HTML/en/kcontrol/kcmkbrowse.docbook
-share/doc/HTML/en/kcontrol/kcmkdesu.cvlog
-share/doc/HTML/en/kcontrol/kcmkdesu.docbook
share/doc/HTML/en/kcontrol/kcmkeybind.docbook
-share/doc/HTML/en/kcontrol/kcmkeys.cvlog
share/doc/HTML/en/kcontrol/kcmkeys.docbook
-share/doc/HTML/en/kcontrol/kcmkfm.cvlog
-share/doc/HTML/en/kcontrol/kcmkfm.docbook
-share/doc/HTML/en/kcontrol/kcmkpanel.cvlog
-share/doc/HTML/en/kcontrol/kcmkpanel.docbook
-share/doc/HTML/en/kcontrol/kcmkwm.cvlog
-share/doc/HTML/en/kcontrol/kcmkwm.docbook
-share/doc/HTML/en/kcontrol/kcmlocale.cvlog
-share/doc/HTML/en/kcontrol/kcmlocale.docbook
share/doc/HTML/en/kcontrol/kcmlocate.docbook
share/doc/HTML/en/kcontrol/kcmloginmanage.docbook
share/doc/HTML/en/kcontrol/kcmlowbatcrit.docbook
@@ -986,26 +921,22 @@ share/doc/HTML/en/kcontrol/kcmlowbatwarn.docbook
share/doc/HTML/en/kcontrol/kcmmemoryinfo.docbook
share/doc/HTML/en/kcontrol/kcmmouse.docbook
share/doc/HTML/en/kcontrol/kcmmousebeh.docbook
+share/doc/HTML/en/kcontrol/kcmnumbername.docbook
share/doc/HTML/en/kcontrol/kcmpanel.docbook
share/doc/HTML/en/kcontrol/kcmpartitioninfo.docbook
share/doc/HTML/en/kcontrol/kcmpasswd.docbook
share/doc/HTML/en/kcontrol/kcmpciinfo.docbook
-share/doc/HTML/en/kcontrol/kcmpcmia.docbook
+share/doc/HTML/en/kcontrol/kcmpcmcia.docbook
share/doc/HTML/en/kcontrol/kcmpowerctrl.docbook
share/doc/HTML/en/kcontrol/kcmprocinfo.docbook
share/doc/HTML/en/kcontrol/kcmproxie.docbook
-share/doc/HTML/en/kcontrol/kcmsamba.cvlog
-share/doc/HTML/en/kcontrol/kcmsamba.docbook
share/doc/HTML/en/kcontrol/kcmscnsave.docbook
share/doc/HTML/en/kcontrol/kcmscsiinfo.docbook
share/doc/HTML/en/kcontrol/kcmsmbstat.docbook
share/doc/HTML/en/kcontrol/kcmsndinfo.docbook
share/doc/HTML/en/kcontrol/kcmsndsrv.docbook
-share/doc/HTML/en/kcontrol/kcmsounds.docbook
share/doc/HTML/en/kcontrol/kcmstyle.docbook
share/doc/HTML/en/kcontrol/kcmsysnotify.docbook
-share/doc/HTML/en/kcontrol/kcmsyssound.cvlog
-share/doc/HTML/en/kcontrol/kcmsyssound.docbook
share/doc/HTML/en/kcontrol/kcmtalk.docbook
share/doc/HTML/en/kcontrol/kcmtaskbar.docbook
share/doc/HTML/en/kcontrol/kcmuseragent.docbook
@@ -1013,16 +944,7 @@ share/doc/HTML/en/kcontrol/kcmwinshare.docbook
share/doc/HTML/en/kcontrol/kcmxservinfo.docbook
share/doc/HTML/en/kcontrol/key-bindings.html
share/doc/HTML/en/kcontrol/konq-browsing.html
-share/doc/HTML/en/kcontrol/konqui.html
-share/doc/HTML/en/kcontrol/kthememgr.cvlog
-share/doc/HTML/en/kcontrol/kthememgr.docbook
-share/doc/HTML/en/kcontrol/kthememgr.html
share/doc/HTML/en/kcontrol/laptop.html
-share/doc/HTML/en/kcontrol/lf-desktop.html
-share/doc/HTML/en/kcontrol/lf-panel.html
-share/doc/HTML/en/kcontrol/lf-themes.html
-share/doc/HTML/en/kcontrol/lf-window-behavior.html
-share/doc/HTML/en/kcontrol/lf.html
share/doc/HTML/en/kcontrol/locale.html
share/doc/HTML/en/kcontrol/login-manager.html
share/doc/HTML/en/kcontrol/lowbatcrit.html
@@ -1032,43 +954,38 @@ share/doc/HTML/en/kcontrol/module.html
share/doc/HTML/en/kcontrol/modules.html
share/doc/HTML/en/kcontrol/mouse-behav.html
share/doc/HTML/en/kcontrol/mouse.html
-share/doc/HTML/en/kcontrol/network.html
+share/doc/HTML/en/kcontrol/numbername.html
share/doc/HTML/en/kcontrol/panel.html
share/doc/HTML/en/kcontrol/partitions.html
share/doc/HTML/en/kcontrol/passwords.html
share/doc/HTML/en/kcontrol/pci.html
-share/doc/HTML/en/kcontrol/pcmia.html
-share/doc/HTML/en/kcontrol/periph.html
-share/doc/HTML/en/kcontrol/personalize.html
-share/doc/HTML/en/kcontrol/power.html
+share/doc/HTML/en/kcontrol/pcmcia.html
share/doc/HTML/en/kcontrol/powerctrl.html
share/doc/HTML/en/kcontrol/processor.html
share/doc/HTML/en/kcontrol/proxies.html
share/doc/HTML/en/kcontrol/sambastatus.html
share/doc/HTML/en/kcontrol/screensaver.html
+share/doc/HTML/en/kcontrol/screenshot.png
share/doc/HTML/en/kcontrol/scsi.html
share/doc/HTML/en/kcontrol/sndserver.html
-share/doc/HTML/en/kcontrol/sound.html
share/doc/HTML/en/kcontrol/soundinfo.html
share/doc/HTML/en/kcontrol/style.html
share/doc/HTML/en/kcontrol/sys-notify.html
-share/doc/HTML/en/kcontrol/sys-sounds.html
-share/doc/HTML/en/kcontrol/system1.html
-share/doc/HTML/en/kcontrol/systemmenu.html
share/doc/HTML/en/kcontrol/talk.html
share/doc/HTML/en/kcontrol/taskbar.html
share/doc/HTML/en/kcontrol/user-agent.html
share/doc/HTML/en/kcontrol/windows-shares.html
share/doc/HTML/en/kcontrol/xserver.html
share/doc/HTML/en/kdebugdialog/.anchors
+share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.docbook
share/doc/HTML/en/kdebugdialog/index.html
share/doc/HTML/en/kdebugdialog/introduction.html
share/doc/HTML/en/kdesu/.anchors
share/doc/HTML/en/kdesu/author.html
+share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/compiling.html
share/doc/HTML/en/kdesu/configuration.html
-share/doc/HTML/en/kdesu/index.cvlog
share/doc/HTML/en/kdesu/index.docbook
share/doc/HTML/en/kdesu/index.html
share/doc/HTML/en/kdesu/installation.html
@@ -1076,15 +993,15 @@ share/doc/HTML/en/kdesu/interface-to-su.html
share/doc/HTML/en/kdesu/internals.html
share/doc/HTML/en/kdesu/introduction.html
share/doc/HTML/en/kdesu/password-checking.html
-share/doc/HTML/en/kdesu/secpasswordkeeping.html
-share/doc/HTML/en/kdesu/usingkdesu.html
+share/doc/HTML/en/kdesu/sec-password-keeping.html
+share/doc/HTML/en/kdesu/using-kdesu.html
share/doc/HTML/en/kdm/.anchors
share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/common
share/doc/HTML/en/kdm/configuring-kdm.html
share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
share/doc/HTML/en/kdm/credits.html
share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
-share/doc/HTML/en/kdm/index.cvlog
share/doc/HTML/en/kdm/index.docbook
share/doc/HTML/en/kdm/index.html
share/doc/HTML/en/kdm/introduction.html
@@ -1093,12 +1010,14 @@ share/doc/HTML/en/kdm/lilo.html
share/doc/HTML/en/kdm/locale.html
share/doc/HTML/en/kdm/other-information.html
share/doc/HTML/en/khelpcenter/.anchors
+share/doc/HTML/en/khelpcenter/common
share/doc/HTML/en/khelpcenter/contact-developers.html
share/doc/HTML/en/khelpcenter/contact-more-information.html
share/doc/HTML/en/khelpcenter/contact-official.html
share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
share/doc/HTML/en/khelpcenter/contact.docbook
share/doc/HTML/en/khelpcenter/faq/.anchors
+share/doc/HTML/en/khelpcenter/faq/common
share/doc/HTML/en/khelpcenter/faq/index.cvlog
share/doc/HTML/en/khelpcenter/faq/index.docbook
share/doc/HTML/en/khelpcenter/faq/index.html
@@ -1114,10 +1033,10 @@ share/doc/HTML/en/khelpcenter/quickstart/.anchors
share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/common
share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
share/doc/HTML/en/khelpcenter/quickstart/configure.html
share/doc/HTML/en/khelpcenter/quickstart/credits.html
-share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
share/doc/HTML/en/khelpcenter/quickstart/index.docbook
share/doc/HTML/en/khelpcenter/quickstart/index.html
share/doc/HTML/en/khelpcenter/quickstart/introduction.html
@@ -1141,6 +1060,7 @@ share/doc/HTML/en/khelpcenter/userguide/activating-the-screen-saver-by-moving-yo
share/doc/HTML/en/khelpcenter/userguide/addingprograms.html
share/doc/HTML/en/khelpcenter/userguide/allaboutyourdesktop.html
share/doc/HTML/en/khelpcenter/userguide/background-of-kde.html
+share/doc/HTML/en/khelpcenter/userguide/common
share/doc/HTML/en/khelpcenter/userguide/contacting-the-authors.html
share/doc/HTML/en/khelpcenter/userguide/contactingauthors.html
share/doc/HTML/en/khelpcenter/userguide/creating-new-files-on-your-desktop.html
@@ -1204,27 +1124,64 @@ share/doc/HTML/en/khelpcenter/what-is-kde-the-development-framework.html
share/doc/HTML/en/khelpcenter/what-is-kde-the-office-suite.html
share/doc/HTML/en/khelpcenter/what-is-kde.html
share/doc/HTML/en/khelpcenter/whatiskde.docbook
-share/doc/HTML/en/kikbd/.anchors
-share/doc/HTML/en/kikbd/advanced.html
-share/doc/HTML/en/kikbd/advanced.png
-share/doc/HTML/en/kikbd/authors.html
-share/doc/HTML/en/kikbd/bug-reporting.html
-share/doc/HTML/en/kikbd/config.html
-share/doc/HTML/en/kikbd/create.html
-share/doc/HTML/en/kikbd/general.html
-share/doc/HTML/en/kikbd/general.png
-share/doc/HTML/en/kikbd/index.cvlog
-share/doc/HTML/en/kikbd/index.docbook
-share/doc/HTML/en/kikbd/index.html
-share/doc/HTML/en/kikbd/installation.html
-share/doc/HTML/en/kikbd/introduction.html
-share/doc/HTML/en/kikbd/nationalkeyboard.html
-share/doc/HTML/en/kikbd/screen-saver-password-problems..html
-share/doc/HTML/en/kikbd/startup.html
-share/doc/HTML/en/kikbd/startup.png
-share/doc/HTML/en/kikbd/style.html
-share/doc/HTML/en/kikbd/style.png
-share/doc/HTML/en/kikbd/troubleshooting.html
+share/doc/HTML/en/kicker/.anchors
+share/doc/HTML/en/kicker/access_config.png
+share/doc/HTML/en/kicker/basic_icons.png
+share/doc/HTML/en/kicker/button-preferences.html
+share/doc/HTML/en/kicker/common
+share/doc/HTML/en/kicker/config_window.png
+share/doc/HTML/en/kicker/configuration-adding-icons.html
+share/doc/HTML/en/kicker/configuration-config-window.html
+share/doc/HTML/en/kicker/configuration.html
+share/doc/HTML/en/kicker/credits.html
+share/doc/HTML/en/kicker/drag-and-drop.html
+share/doc/HTML/en/kicker/drag_applet.png
+share/doc/HTML/en/kicker/five-minute-course.html
+share/doc/HTML/en/kicker/glossary.html
+share/doc/HTML/en/kicker/handles.png
+share/doc/HTML/en/kicker/hide_buttons.png
+share/doc/HTML/en/kicker/i_adv_editor.png
+share/doc/HTML/en/kicker/i_control_center.png
+share/doc/HTML/en/kicker/i_desktop.png
+share/doc/HTML/en/kicker/i_help.png
+share/doc/HTML/en/kicker/i_home_dir.png
+share/doc/HTML/en/kicker/i_k_button.png
+share/doc/HTML/en/kicker/i_kandalfs_tips.png
+share/doc/HTML/en/kicker/i_shell.png
+share/doc/HTML/en/kicker/i_window_list.png
+share/doc/HTML/en/kicker/index.docbook
+share/doc/HTML/en/kicker/index.html
+share/doc/HTML/en/kicker/installation.html
+share/doc/HTML/en/kicker/introduction.html
+share/doc/HTML/en/kicker/kicker-for-admins-symbolic-links.html
+share/doc/HTML/en/kicker/kicker-for-admins.html
+share/doc/HTML/en/kicker/kicker-panel-elements.html
+share/doc/HTML/en/kicker/kicker_access_size.png
+share/doc/HTML/en/kicker/kicker_add_basic.png
+share/doc/HTML/en/kicker/kicker_basic_icons.png
+share/doc/HTML/en/kicker/kicker_basic_icons_2.png
+share/doc/HTML/en/kicker/other-features.html
+share/doc/HTML/en/kicker/qb_root.png
+share/doc/HTML/en/kicker/using-kicker.html
+share/doc/HTML/en/kmenuedit/.anchors
+share/doc/HTML/en/kmenuedit/common
+share/doc/HTML/en/kmenuedit/credits.html
+share/doc/HTML/en/kmenuedit/details-advanced.html
+share/doc/HTML/en/kmenuedit/glossary.html
+share/doc/HTML/en/kmenuedit/i_copy.png
+share/doc/HTML/en/kmenuedit/i_cut.png
+share/doc/HTML/en/kmenuedit/i_delete.png
+share/doc/HTML/en/kmenuedit/i_k_button.png
+share/doc/HTML/en/kmenuedit/i_new_item.png
+share/doc/HTML/en/kmenuedit/i_new_submenu.png
+share/doc/HTML/en/kmenuedit/i_paste.png
+share/doc/HTML/en/kmenuedit/icon_sets.png
+share/doc/HTML/en/kmenuedit/icons.png
+share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/kmenuedit/index.html
+share/doc/HTML/en/kmenuedit/introduction.html
+share/doc/HTML/en/kmenuedit/menu-reference.html
+share/doc/HTML/en/kmenuedit/using-kmenuedit.html
share/doc/HTML/en/konqueror/.anchors
share/doc/HTML/en/konqueror/basics.html
share/doc/HTML/en/konqueror/bookmarks.html
@@ -1233,6 +1190,7 @@ share/doc/HTML/en/konqueror/bubble.html
share/doc/HTML/en/konqueror/cmndline.png
share/doc/HTML/en/konqueror/commandline.html
share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/common
share/doc/HTML/en/konqueror/config-prox.html
share/doc/HTML/en/konqueror/config.html
share/doc/HTML/en/konqueror/configure-bars.html
@@ -1271,12 +1229,15 @@ share/doc/HTML/en/konqueror/save-print-web.html
share/doc/HTML/en/konqueror/surf.html
share/doc/HTML/en/konsole/.anchors
share/doc/HTML/en/konsole/command-line-options.html
+share/doc/HTML/en/konsole/common
share/doc/HTML/en/konsole/credits.html
share/doc/HTML/en/konsole/history-option.html
share/doc/HTML/en/konsole/index.docbook
share/doc/HTML/en/konsole/index.html
share/doc/HTML/en/konsole/installation.html
share/doc/HTML/en/konsole/introduction.html
+share/doc/HTML/en/konsole/konsole1.gif
+share/doc/HTML/en/konsole/konsole2.gif
share/doc/HTML/en/konsole/menubar.html
share/doc/HTML/en/konsole/mousebuttons.html
share/doc/HTML/en/konsole/techref.html
@@ -1284,6 +1245,7 @@ share/doc/HTML/en/konsole/toolbar.html
share/doc/HTML/en/konsole/use-of-konsole.html
share/doc/HTML/en/konsole/vt100.gif
share/doc/HTML/en/kpager/.anchors
+share/doc/HTML/en/kpager/common
share/doc/HTML/en/kpager/compilation-and-installation.html
share/doc/HTML/en/kpager/customizingkpageradvancedfeatures.html
share/doc/HTML/en/kpager/frequentlyaskedquestionsfaq.html
@@ -1299,25 +1261,43 @@ share/doc/HTML/en/kpager/rows-mode.html
share/doc/HTML/en/kpager/the-global-desktop.html
share/doc/HTML/en/kpager/the-window-properties-menu.html
share/doc/HTML/en/kpager/workingwithkpager.html
-share/doc/HTML/en/kwm/.anchors
-share/doc/HTML/en/kwm/authors.html
-share/doc/HTML/en/kwm/commands.html
-share/doc/HTML/en/kwm/configuration.html
-share/doc/HTML/en/kwm/does-kwm-support-shaded-windows-a-la-openste.html
-share/doc/HTML/en/kwm/epilogue.html
-share/doc/HTML/en/kwm/frequentlyaskedquestions.html
-share/doc/HTML/en/kwm/index.cvlog
-share/doc/HTML/en/kwm/index.docbook
-share/doc/HTML/en/kwm/index.html
-share/doc/HTML/en/kwm/introduction.html
-share/doc/HTML/en/kwm/is-it-possible-to-add-kde-extensions-to-othe.html
-share/doc/HTML/en/kwm/minicli.html
-share/doc/HTML/en/kwm/mouse-control.html
-share/doc/HTML/en/kwm/shortcuts.html
-share/doc/HTML/en/kwm/soundevents.html
-share/doc/HTML/en/kwm/usingemphasiskwmemphasis.html
-share/doc/HTML/en/kwm/why-can-t-i-define-new-shortcuts-for-launchi.html
-share/doc/HTML/en/kwm/why-does-kwm-look-so-much-like-windows-95.html
+share/doc/HTML/en/ksysguard/.anchors
+share/doc/HTML/en/ksysguard/authors.html
+share/doc/HTML/en/ksysguard/common
+share/doc/HTML/en/ksysguard/compilationandinstallation.html
+share/doc/HTML/en/ksysguard/frequentlyaskedquestions.html
+share/doc/HTML/en/ksysguard/index.docbook
+share/doc/HTML/en/ksysguard/index.html
+share/doc/HTML/en/ksysguard/installation.html
+share/doc/HTML/en/ksysguard/introduction.html
+share/doc/HTML/en/ksysguard/licenseandwarranty.html
+share/doc/HTML/en/ksysguard/requirements.html
+share/doc/HTML/en/ksysguard/thesensorbrowser.html
+share/doc/HTML/en/ksysguard/theworkspace.html
+share/doc/HTML/en/ksysguard/usingtheksysguard.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/common
+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.docbook
+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/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
@@ -1417,10 +1397,13 @@ share/icons/hicolor/32x32/devices/3floppy_mount.png
share/icons/hicolor/32x32/devices/3floppy_unmount.png
share/icons/hicolor/32x32/devices/5floppy_mount.png
share/icons/hicolor/32x32/devices/5floppy_unmount.png
+share/icons/hicolor/32x32/devices/cdaudio_mount.png
+share/icons/hicolor/32x32/devices/cdaudio_unmount.png
share/icons/hicolor/32x32/devices/cdrom_mount.png
share/icons/hicolor/32x32/devices/cdrom_unmount.png
share/icons/hicolor/32x32/devices/cdwriter_mount.png
share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_mount.png
share/icons/hicolor/32x32/devices/dvd_unmount.png
share/icons/hicolor/32x32/devices/hdd_mount.png
share/icons/hicolor/32x32/devices/hdd_unmount.png
@@ -1505,10 +1488,13 @@ share/icons/hicolor/48x48/devices/3floppy_mount.png
share/icons/hicolor/48x48/devices/3floppy_unmount.png
share/icons/hicolor/48x48/devices/5floppy_mount.png
share/icons/hicolor/48x48/devices/5floppy_unmount.png
+share/icons/hicolor/48x48/devices/cdaudio_mount.png
+share/icons/hicolor/48x48/devices/cdaudio_unmount.png
share/icons/hicolor/48x48/devices/cdrom_mount.png
share/icons/hicolor/48x48/devices/cdrom_unmount.png
share/icons/hicolor/48x48/devices/cdwriter_mount.png
share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_mount.png
share/icons/hicolor/48x48/devices/dvd_unmount.png
share/icons/hicolor/48x48/devices/hdd_mount.png
share/icons/hicolor/48x48/devices/hdd_unmount.png
@@ -1992,6 +1978,7 @@ share/services/konsolepart.desktop
share/services/kshorturifilter.desktop
share/services/kuriikwsfilter.desktop
share/services/kurisearchfilter.desktop
+share/services/kxmlrpcd.desktop
share/services/man.protocol
share/services/nfs.protocol
share/services/nntp.protocol
@@ -2053,11 +2040,13 @@ share/wallpapers/northbeach.jpg
share/wallpapers/simple_wallpaper.jpg
share/wallpapers/sunday_brunch.jpg
share/wallpapers/vegetative_fog.jpg
-@dirrm share/doc/HTML/en/kwm
+@dirrm share/doc/HTML/en/kwrite
+@dirrm share/doc/HTML/en/ksysguard
@dirrm share/doc/HTML/en/kpager
@dirrm share/doc/HTML/en/konsole
@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kikbd
+@dirrm share/doc/HTML/en/kmenuedit
+@dirrm share/doc/HTML/en/kicker
@dirrm share/doc/HTML/en/khelpcenter/userguide
@dirrm share/doc/HTML/en/khelpcenter/quickstart
@dirrm share/doc/HTML/en/khelpcenter/faq
@@ -2072,8 +2061,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kwin
@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
@dirrm share/apps/ksysguard/icons/locolor/16x16
-@dirrm share/apps/ksysguard/icons/locolor
-@dirrm share/apps/ksysguard/icons
@dirrm share/apps/ksysguard
@dirrm share/apps/ksplash/pics
@dirrm share/apps/ksplash
@@ -2091,25 +2078,27 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/konqiconview
@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
@dirrm share/apps/kmenuedit/icons/locolor/16x16
-@dirrm share/apps/kmenuedit/icons/locolor
@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
@dirrm share/apps/kmenuedit/icons/hicolor/32x32
@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
@dirrm share/apps/kmenuedit
@dirrm share/apps/kio_info
@dirrm share/apps/kicker/tiles
@dirrm share/apps/kicker/pics
@dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
@dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins
@dirrm share/apps/khelpcenter/pics
@dirrm share/apps/khelpcenter/en
+@dirrm share/apps/khelpcenter
@dirrm share/apps/kdm/pics/users
@dirrm share/apps/kdm/pics
+@dirrm share/apps/kdm
@dirrm share/apps/kdisplay/color-schemes
@dirrm share/apps/kdisplay/app-defaults
+@dirrm share/apps/kdisplay
@dirrm share/apps/kdewizard/pics
@dirrm share/apps/kdewizard
@dirrm share/apps/kdesktop/programs
@@ -2121,6 +2110,7 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kcontrol/pics
@dirrm share/apps/kcontrol
@dirrm share/apps/kcmlocale/pics
+@dirrm share/apps/kcmlocale
@dirrm share/apps/kcminput
@dirrm share/apps/kbookmark
@dirrm share/apps/kappfinder/apps/WordProcessing
@@ -2135,6 +2125,9 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/kappfinder/apps/Editors
@dirrm share/apps/kappfinder/apps/Development
@dirrm share/apps/kappfinder/apps
+@dirrm share/apps/kappfinder
@dirrm share/apps/drkonqi/presets
@dirrm share/apps/drkonqi/pics
+@dirrm share/apps/drkonqi
@dirrm share/apps/clockapplet/pics
+@dirrm share/apps/clockapplet
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index b5efbd5ea4af..631db1ecf2a5 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdelibs
-PORTVERSION= 20000829A
-CATEGORIES= x11
-MASTER_SITES= http://www.physics.purdue.edu/~will/
+PORTVERSION= 1.94
+CATEGORIES= x11-toolkits
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
@@ -52,7 +53,4 @@ post-install:
@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.0 ${PREFIX}/lib/lib${LIB}.so
.endfor
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index 9cb5216e11ad..5513fb65519d 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-20000829A.tar.bz2) = 100c2d81e6bae3f704d33e4517e19c9a
+MD5 (kdelibs-1.94.tar.bz2) = 1897e1deb2ed8adab3bff2b1912d09a9
diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist
index 65c4f40ff961..54fae5739e85 100644
--- a/x11/kdelibs2/pkg-plist
+++ b/x11/kdelibs2/pkg-plist
@@ -22,7 +22,6 @@ bin/kmailservice
bin/knotify
bin/lnusertemp
bin/mcopidl
-bin/mkusertemp
bin/settheme
include/addressbook.h
include/arts/anyref.h
@@ -161,6 +160,7 @@ include/kdesu/defaults.h
include/kdesu/kcookie.h
include/kdesu/kdesu_pty.h
include/kdesu/process.h
+include/kdesu/pty.h
include/kdesu/ssh.h
include/kdesu/stub.h
include/kdesu/su.h
@@ -217,6 +217,8 @@ include/kio/observer.h
include/kio/passdlg.h
include/kio/paste.h
include/kio/progressbase.h
+include/kio/renamedlg.h
+include/kio/skipdlg.h
include/kio/slavebase.h
include/kio/slaveinterface.h
include/kio/statusbarprogress.h
@@ -301,6 +303,15 @@ include/ksimpleconfig.h
include/ksock.h
include/kspell.h
include/kspelldlg.h
+include/kssl.h
+include/ksslcertificate.h
+include/ksslcertificatefactory.h
+include/ksslcertificatehome.h
+include/ksslconnectioninfo.h
+include/ksslinfodlg.h
+include/ksslpeerinfo.h
+include/ksslsettings.h
+include/ksslx509map.h
include/kstaticdeleter.h
include/kstatusbar.h
include/kstdaccel.h
@@ -432,58 +443,83 @@ lib/kstephighcolor.so
lib/kstepstyle.la
lib/kstepstyle.so
lib/libDCOP.la
+lib/libDCOP.so
lib/libDCOP.so.4
-lib/libDCOPC.la
-lib/libDCOPC.so.4
lib/libartsc.la
+lib/libartsc.so
lib/libartsc.so.0
lib/libartscbackend.la
+lib/libartscbackend.so
lib/libartscbackend.so.0
lib/libartsdsp.la
+lib/libartsdsp.so
lib/libartsdsp.so.0
lib/libartsflow.la
+lib/libartsflow.so
lib/libartsflow.so.0
lib/libartsflow_idl.la
+lib/libartsflow_idl.so
lib/libartsflow_idl.so.0
lib/libkab.la
+lib/libkab.so
lib/libkab.so.4
lib/libkdecore.la
+lib/libkdecore.so
lib/libkdecore.so.4
lib/libkdesu.la
+lib/libkdesu.so
lib/libkdesu.so.4
lib/libkdeui.la
+lib/libkdeui.so
lib/libkdeui.so.4
lib/libkfile.la
+lib/libkfile.so
lib/libkfile.so.4
+lib/libkformula.so
lib/libkhtml.la
+lib/libkhtml.so
lib/libkhtml.so.4
lib/libkio.la
+lib/libkio.so
lib/libkio.so.4
lib/libkjava.la
+lib/libkjava.so
lib/libkjava.so.4
lib/libkjs.la
+lib/libkjs.so
lib/libkjs.so.4
-lib/libkmapnotify.la
-lib/libkmapnotify.so.4
lib/libkmedia2_idl.la
+lib/libkmedia2_idl.so
lib/libkmedia2_idl.so.0
lib/libkmid.la
+lib/libkmid.so
lib/libkmid.so.0
lib/libkparts.la
+lib/libkparts.so
lib/libkparts.so.4
lib/libkspell.la
+lib/libkspell.so
lib/libkspell.so.4
+lib/libkssl.la
+lib/libkssl.so
+lib/libkssl.so.2
lib/libksycoca.la
+lib/libksycoca.so
lib/libksycoca.so.4
lib/libktexteditor.la
+lib/libktexteditor.so
lib/libktexteditor.so.0
lib/libmcop.la
+lib/libmcop.so
lib/libmcop.so.0
lib/libqtmcop.la
+lib/libqtmcop.so
lib/libqtmcop.so.0
lib/libsoundserver_idl.la
+lib/libsoundserver_idl.so
lib/libsoundserver_idl.so.0
lib/libx11globalcomm.la
+lib/libx11globalcomm.so
lib/libx11globalcomm.so.0
share/apps/LICENSES/ARTISTIC
share/apps/LICENSES/BSD
@@ -546,6 +582,8 @@ share/apps/ksgmltools/stylesheets/kde-l1fi.dsl
share/apps/ksgmltools/stylesheets/kde-l1fi.ent
share/apps/ksgmltools/stylesheets/kde-l1fr.dsl
share/apps/ksgmltools/stylesheets/kde-l1fr.ent
+share/apps/ksgmltools/stylesheets/kde-l1hu.dsl
+share/apps/ksgmltools/stylesheets/kde-l1hu.ent
share/apps/ksgmltools/stylesheets/kde-l1it.dsl
share/apps/ksgmltools/stylesheets/kde-l1it.ent
share/apps/ksgmltools/stylesheets/kde-l1ja.dsl
@@ -661,6 +699,7 @@ share/config/kde-config
share/config/kdebug.areas
share/config/kdebugrc
share/config/ui/ui_standards.rc
+share/doc/HTML/default
share/doc/HTML/en/common/artistic-licence.html
share/doc/HTML/en/common/bsd-licence.html
share/doc/HTML/en/common/caution.png
@@ -692,13 +731,8 @@ share/doc/HTML/en/common/up.png
share/doc/HTML/en/common/warning.png
share/doc/HTML/en/common/x11-licence.html
share/doc/HTML/en/common/xml.dcl
-share/doc/HTML/en/kdebug/.anchors
-share/doc/HTML/en/kdebug/how-to-use.html
-share/doc/HTML/en/kdebug/index.docbook
-share/doc/HTML/en/kdebug/index.html
-share/doc/HTML/en/kdebug/using-areas.html
-share/doc/HTML/en/kdebug/what-is-kdebug.html
share/doc/HTML/en/kspell/.anchors
+share/doc/HTML/en/kspell/common
share/doc/HTML/en/kspell/configuration-dialog-.html
share/doc/HTML/en/kspell/contact-information.html
share/doc/HTML/en/kspell/encodings.html
@@ -1116,6 +1150,7 @@ share/icons/hicolor/48x48/filesystems/trashcan_empty.png
share/icons/hicolor/48x48/filesystems/trashcan_full.png
share/icons/hicolor/48x48/filesystems/www.png
share/icons/hicolor/48x48/filesystems/zip.png
+share/icons/hicolor/48x48/mimetypes/applix.png
share/icons/hicolor/48x48/mimetypes/binary.png
share/icons/hicolor/48x48/mimetypes/binary2.png
share/icons/hicolor/48x48/mimetypes/blockdevice.png
@@ -1542,7 +1577,7 @@ share/servicetypes/krwp.desktop
share/servicetypes/ktexteditor.desktop
share/servicetypes/kurifilterplugin.desktop
@dirrm share/doc/HTML/en/kspell
-@dirrm share/doc/HTML/en/kdebug
+@dirrm share/doc/HTML/en/common
@dirrm share/apps/kstyle/themes
@dirrm share/apps/kstyle/pixmaps
@dirrm share/apps/ksgmltools/stylesheets
@@ -1553,7 +1588,6 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/khtml/css
@dirrm share/apps/khtml
@dirrm share/apps/kdeui/pics
-@dirrm share/apps/kab/pics
@dirrm share/apps/kab
@dirrm share/apps/LICENSES
@dirrm lib/Arts
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index b5efbd5ea4af..631db1ecf2a5 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdelibs
-PORTVERSION= 20000829A
-CATEGORIES= x11
-MASTER_SITES= http://www.physics.purdue.edu/~will/
+PORTVERSION= 1.94
+CATEGORIES= x11-toolkits
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
@@ -52,7 +53,4 @@ post-install:
@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.0 ${PREFIX}/lib/lib${LIB}.so
.endfor
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 9cb5216e11ad..5513fb65519d 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-20000829A.tar.bz2) = 100c2d81e6bae3f704d33e4517e19c9a
+MD5 (kdelibs-1.94.tar.bz2) = 1897e1deb2ed8adab3bff2b1912d09a9
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 65c4f40ff961..54fae5739e85 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -22,7 +22,6 @@ bin/kmailservice
bin/knotify
bin/lnusertemp
bin/mcopidl
-bin/mkusertemp
bin/settheme
include/addressbook.h
include/arts/anyref.h
@@ -161,6 +160,7 @@ include/kdesu/defaults.h
include/kdesu/kcookie.h
include/kdesu/kdesu_pty.h
include/kdesu/process.h
+include/kdesu/pty.h
include/kdesu/ssh.h
include/kdesu/stub.h
include/kdesu/su.h
@@ -217,6 +217,8 @@ include/kio/observer.h
include/kio/passdlg.h
include/kio/paste.h
include/kio/progressbase.h
+include/kio/renamedlg.h
+include/kio/skipdlg.h
include/kio/slavebase.h
include/kio/slaveinterface.h
include/kio/statusbarprogress.h
@@ -301,6 +303,15 @@ include/ksimpleconfig.h
include/ksock.h
include/kspell.h
include/kspelldlg.h
+include/kssl.h
+include/ksslcertificate.h
+include/ksslcertificatefactory.h
+include/ksslcertificatehome.h
+include/ksslconnectioninfo.h
+include/ksslinfodlg.h
+include/ksslpeerinfo.h
+include/ksslsettings.h
+include/ksslx509map.h
include/kstaticdeleter.h
include/kstatusbar.h
include/kstdaccel.h
@@ -432,58 +443,83 @@ lib/kstephighcolor.so
lib/kstepstyle.la
lib/kstepstyle.so
lib/libDCOP.la
+lib/libDCOP.so
lib/libDCOP.so.4
-lib/libDCOPC.la
-lib/libDCOPC.so.4
lib/libartsc.la
+lib/libartsc.so
lib/libartsc.so.0
lib/libartscbackend.la
+lib/libartscbackend.so
lib/libartscbackend.so.0
lib/libartsdsp.la
+lib/libartsdsp.so
lib/libartsdsp.so.0
lib/libartsflow.la
+lib/libartsflow.so
lib/libartsflow.so.0
lib/libartsflow_idl.la
+lib/libartsflow_idl.so
lib/libartsflow_idl.so.0
lib/libkab.la
+lib/libkab.so
lib/libkab.so.4
lib/libkdecore.la
+lib/libkdecore.so
lib/libkdecore.so.4
lib/libkdesu.la
+lib/libkdesu.so
lib/libkdesu.so.4
lib/libkdeui.la
+lib/libkdeui.so
lib/libkdeui.so.4
lib/libkfile.la
+lib/libkfile.so
lib/libkfile.so.4
+lib/libkformula.so
lib/libkhtml.la
+lib/libkhtml.so
lib/libkhtml.so.4
lib/libkio.la
+lib/libkio.so
lib/libkio.so.4
lib/libkjava.la
+lib/libkjava.so
lib/libkjava.so.4
lib/libkjs.la
+lib/libkjs.so
lib/libkjs.so.4
-lib/libkmapnotify.la
-lib/libkmapnotify.so.4
lib/libkmedia2_idl.la
+lib/libkmedia2_idl.so
lib/libkmedia2_idl.so.0
lib/libkmid.la
+lib/libkmid.so
lib/libkmid.so.0
lib/libkparts.la
+lib/libkparts.so
lib/libkparts.so.4
lib/libkspell.la
+lib/libkspell.so
lib/libkspell.so.4
+lib/libkssl.la
+lib/libkssl.so
+lib/libkssl.so.2
lib/libksycoca.la
+lib/libksycoca.so
lib/libksycoca.so.4
lib/libktexteditor.la
+lib/libktexteditor.so
lib/libktexteditor.so.0
lib/libmcop.la
+lib/libmcop.so
lib/libmcop.so.0
lib/libqtmcop.la
+lib/libqtmcop.so
lib/libqtmcop.so.0
lib/libsoundserver_idl.la
+lib/libsoundserver_idl.so
lib/libsoundserver_idl.so.0
lib/libx11globalcomm.la
+lib/libx11globalcomm.so
lib/libx11globalcomm.so.0
share/apps/LICENSES/ARTISTIC
share/apps/LICENSES/BSD
@@ -546,6 +582,8 @@ share/apps/ksgmltools/stylesheets/kde-l1fi.dsl
share/apps/ksgmltools/stylesheets/kde-l1fi.ent
share/apps/ksgmltools/stylesheets/kde-l1fr.dsl
share/apps/ksgmltools/stylesheets/kde-l1fr.ent
+share/apps/ksgmltools/stylesheets/kde-l1hu.dsl
+share/apps/ksgmltools/stylesheets/kde-l1hu.ent
share/apps/ksgmltools/stylesheets/kde-l1it.dsl
share/apps/ksgmltools/stylesheets/kde-l1it.ent
share/apps/ksgmltools/stylesheets/kde-l1ja.dsl
@@ -661,6 +699,7 @@ share/config/kde-config
share/config/kdebug.areas
share/config/kdebugrc
share/config/ui/ui_standards.rc
+share/doc/HTML/default
share/doc/HTML/en/common/artistic-licence.html
share/doc/HTML/en/common/bsd-licence.html
share/doc/HTML/en/common/caution.png
@@ -692,13 +731,8 @@ share/doc/HTML/en/common/up.png
share/doc/HTML/en/common/warning.png
share/doc/HTML/en/common/x11-licence.html
share/doc/HTML/en/common/xml.dcl
-share/doc/HTML/en/kdebug/.anchors
-share/doc/HTML/en/kdebug/how-to-use.html
-share/doc/HTML/en/kdebug/index.docbook
-share/doc/HTML/en/kdebug/index.html
-share/doc/HTML/en/kdebug/using-areas.html
-share/doc/HTML/en/kdebug/what-is-kdebug.html
share/doc/HTML/en/kspell/.anchors
+share/doc/HTML/en/kspell/common
share/doc/HTML/en/kspell/configuration-dialog-.html
share/doc/HTML/en/kspell/contact-information.html
share/doc/HTML/en/kspell/encodings.html
@@ -1116,6 +1150,7 @@ share/icons/hicolor/48x48/filesystems/trashcan_empty.png
share/icons/hicolor/48x48/filesystems/trashcan_full.png
share/icons/hicolor/48x48/filesystems/www.png
share/icons/hicolor/48x48/filesystems/zip.png
+share/icons/hicolor/48x48/mimetypes/applix.png
share/icons/hicolor/48x48/mimetypes/binary.png
share/icons/hicolor/48x48/mimetypes/binary2.png
share/icons/hicolor/48x48/mimetypes/blockdevice.png
@@ -1542,7 +1577,7 @@ share/servicetypes/krwp.desktop
share/servicetypes/ktexteditor.desktop
share/servicetypes/kurifilterplugin.desktop
@dirrm share/doc/HTML/en/kspell
-@dirrm share/doc/HTML/en/kdebug
+@dirrm share/doc/HTML/en/common
@dirrm share/apps/kstyle/themes
@dirrm share/apps/kstyle/pixmaps
@dirrm share/apps/ksgmltools/stylesheets
@@ -1553,7 +1588,6 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/khtml/css
@dirrm share/apps/khtml
@dirrm share/apps/kdeui/pics
-@dirrm share/apps/kab/pics
@dirrm share/apps/kab
@dirrm share/apps/LICENSES
@dirrm lib/Arts
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index b5efbd5ea4af..631db1ecf2a5 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= kdelibs
-PORTVERSION= 20000829A
-CATEGORIES= x11
-MASTER_SITES= http://www.physics.purdue.edu/~will/
+PORTVERSION= 1.94
+CATEGORIES= x11-toolkits
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
MAINTAINER= will@FreeBSD.org
@@ -52,7 +53,4 @@ post-install:
@${LN} -sf ${PREFIX}/lib/lib${LIB}.so.0 ${PREFIX}/lib/lib${LIB}.so
.endfor
-pre-install:
- @(find ${WRKSRC} -name CVS | xargs rm -rf)
-
.include <bsd.port.mk>
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 9cb5216e11ad..5513fb65519d 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-20000829A.tar.bz2) = 100c2d81e6bae3f704d33e4517e19c9a
+MD5 (kdelibs-1.94.tar.bz2) = 1897e1deb2ed8adab3bff2b1912d09a9
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 65c4f40ff961..54fae5739e85 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -22,7 +22,6 @@ bin/kmailservice
bin/knotify
bin/lnusertemp
bin/mcopidl
-bin/mkusertemp
bin/settheme
include/addressbook.h
include/arts/anyref.h
@@ -161,6 +160,7 @@ include/kdesu/defaults.h
include/kdesu/kcookie.h
include/kdesu/kdesu_pty.h
include/kdesu/process.h
+include/kdesu/pty.h
include/kdesu/ssh.h
include/kdesu/stub.h
include/kdesu/su.h
@@ -217,6 +217,8 @@ include/kio/observer.h
include/kio/passdlg.h
include/kio/paste.h
include/kio/progressbase.h
+include/kio/renamedlg.h
+include/kio/skipdlg.h
include/kio/slavebase.h
include/kio/slaveinterface.h
include/kio/statusbarprogress.h
@@ -301,6 +303,15 @@ include/ksimpleconfig.h
include/ksock.h
include/kspell.h
include/kspelldlg.h
+include/kssl.h
+include/ksslcertificate.h
+include/ksslcertificatefactory.h
+include/ksslcertificatehome.h
+include/ksslconnectioninfo.h
+include/ksslinfodlg.h
+include/ksslpeerinfo.h
+include/ksslsettings.h
+include/ksslx509map.h
include/kstaticdeleter.h
include/kstatusbar.h
include/kstdaccel.h
@@ -432,58 +443,83 @@ lib/kstephighcolor.so
lib/kstepstyle.la
lib/kstepstyle.so
lib/libDCOP.la
+lib/libDCOP.so
lib/libDCOP.so.4
-lib/libDCOPC.la
-lib/libDCOPC.so.4
lib/libartsc.la
+lib/libartsc.so
lib/libartsc.so.0
lib/libartscbackend.la
+lib/libartscbackend.so
lib/libartscbackend.so.0
lib/libartsdsp.la
+lib/libartsdsp.so
lib/libartsdsp.so.0
lib/libartsflow.la
+lib/libartsflow.so
lib/libartsflow.so.0
lib/libartsflow_idl.la
+lib/libartsflow_idl.so
lib/libartsflow_idl.so.0
lib/libkab.la
+lib/libkab.so
lib/libkab.so.4
lib/libkdecore.la
+lib/libkdecore.so
lib/libkdecore.so.4
lib/libkdesu.la
+lib/libkdesu.so
lib/libkdesu.so.4
lib/libkdeui.la
+lib/libkdeui.so
lib/libkdeui.so.4
lib/libkfile.la
+lib/libkfile.so
lib/libkfile.so.4
+lib/libkformula.so
lib/libkhtml.la
+lib/libkhtml.so
lib/libkhtml.so.4
lib/libkio.la
+lib/libkio.so
lib/libkio.so.4
lib/libkjava.la
+lib/libkjava.so
lib/libkjava.so.4
lib/libkjs.la
+lib/libkjs.so
lib/libkjs.so.4
-lib/libkmapnotify.la
-lib/libkmapnotify.so.4
lib/libkmedia2_idl.la
+lib/libkmedia2_idl.so
lib/libkmedia2_idl.so.0
lib/libkmid.la
+lib/libkmid.so
lib/libkmid.so.0
lib/libkparts.la
+lib/libkparts.so
lib/libkparts.so.4
lib/libkspell.la
+lib/libkspell.so
lib/libkspell.so.4
+lib/libkssl.la
+lib/libkssl.so
+lib/libkssl.so.2
lib/libksycoca.la
+lib/libksycoca.so
lib/libksycoca.so.4
lib/libktexteditor.la
+lib/libktexteditor.so
lib/libktexteditor.so.0
lib/libmcop.la
+lib/libmcop.so
lib/libmcop.so.0
lib/libqtmcop.la
+lib/libqtmcop.so
lib/libqtmcop.so.0
lib/libsoundserver_idl.la
+lib/libsoundserver_idl.so
lib/libsoundserver_idl.so.0
lib/libx11globalcomm.la
+lib/libx11globalcomm.so
lib/libx11globalcomm.so.0
share/apps/LICENSES/ARTISTIC
share/apps/LICENSES/BSD
@@ -546,6 +582,8 @@ share/apps/ksgmltools/stylesheets/kde-l1fi.dsl
share/apps/ksgmltools/stylesheets/kde-l1fi.ent
share/apps/ksgmltools/stylesheets/kde-l1fr.dsl
share/apps/ksgmltools/stylesheets/kde-l1fr.ent
+share/apps/ksgmltools/stylesheets/kde-l1hu.dsl
+share/apps/ksgmltools/stylesheets/kde-l1hu.ent
share/apps/ksgmltools/stylesheets/kde-l1it.dsl
share/apps/ksgmltools/stylesheets/kde-l1it.ent
share/apps/ksgmltools/stylesheets/kde-l1ja.dsl
@@ -661,6 +699,7 @@ share/config/kde-config
share/config/kdebug.areas
share/config/kdebugrc
share/config/ui/ui_standards.rc
+share/doc/HTML/default
share/doc/HTML/en/common/artistic-licence.html
share/doc/HTML/en/common/bsd-licence.html
share/doc/HTML/en/common/caution.png
@@ -692,13 +731,8 @@ share/doc/HTML/en/common/up.png
share/doc/HTML/en/common/warning.png
share/doc/HTML/en/common/x11-licence.html
share/doc/HTML/en/common/xml.dcl
-share/doc/HTML/en/kdebug/.anchors
-share/doc/HTML/en/kdebug/how-to-use.html
-share/doc/HTML/en/kdebug/index.docbook
-share/doc/HTML/en/kdebug/index.html
-share/doc/HTML/en/kdebug/using-areas.html
-share/doc/HTML/en/kdebug/what-is-kdebug.html
share/doc/HTML/en/kspell/.anchors
+share/doc/HTML/en/kspell/common
share/doc/HTML/en/kspell/configuration-dialog-.html
share/doc/HTML/en/kspell/contact-information.html
share/doc/HTML/en/kspell/encodings.html
@@ -1116,6 +1150,7 @@ share/icons/hicolor/48x48/filesystems/trashcan_empty.png
share/icons/hicolor/48x48/filesystems/trashcan_full.png
share/icons/hicolor/48x48/filesystems/www.png
share/icons/hicolor/48x48/filesystems/zip.png
+share/icons/hicolor/48x48/mimetypes/applix.png
share/icons/hicolor/48x48/mimetypes/binary.png
share/icons/hicolor/48x48/mimetypes/binary2.png
share/icons/hicolor/48x48/mimetypes/blockdevice.png
@@ -1542,7 +1577,7 @@ share/servicetypes/krwp.desktop
share/servicetypes/ktexteditor.desktop
share/servicetypes/kurifilterplugin.desktop
@dirrm share/doc/HTML/en/kspell
-@dirrm share/doc/HTML/en/kdebug
+@dirrm share/doc/HTML/en/common
@dirrm share/apps/kstyle/themes
@dirrm share/apps/kstyle/pixmaps
@dirrm share/apps/ksgmltools/stylesheets
@@ -1553,7 +1588,6 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/khtml/css
@dirrm share/apps/khtml
@dirrm share/apps/kdeui/pics
-@dirrm share/apps/kab/pics
@dirrm share/apps/kab
@dirrm share/apps/LICENSES
@dirrm lib/Arts