aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/ark/Makefile8
-rw-r--r--archivers/ark/distinfo2
-rw-r--r--archivers/ark/pkg-plist123
-rw-r--r--comms/kremotecontrol/Makefile8
-rw-r--r--comms/kremotecontrol/distinfo2
-rw-r--r--comms/kremotecontrol/pkg-plist123
-rw-r--r--deskutils/kcharselect/Makefile8
-rw-r--r--deskutils/kcharselect/distinfo2
-rw-r--r--deskutils/kcharselect/pkg-plist123
-rw-r--r--math/kcalc/Makefile8
-rw-r--r--math/kcalc/distinfo2
-rw-r--r--math/kcalc/pkg-plist123
-rw-r--r--misc/kdeutils2/Makefile8
-rw-r--r--misc/kdeutils2/distinfo2
-rw-r--r--misc/kdeutils2/pkg-plist123
-rw-r--r--misc/kdeutils3/Makefile8
-rw-r--r--misc/kdeutils3/distinfo2
-rw-r--r--misc/kdeutils3/pkg-plist123
-rw-r--r--misc/kdeutils4/Makefile8
-rw-r--r--misc/kdeutils4/distinfo2
-rw-r--r--misc/kdeutils4/pkg-plist123
-rw-r--r--net/kdenetwork2/Makefile7
-rw-r--r--net/kdenetwork2/distinfo2
-rw-r--r--net/kdenetwork2/pkg-plist132
-rw-r--r--net/kdenetwork3/Makefile7
-rw-r--r--net/kdenetwork3/distinfo2
-rw-r--r--net/kdenetwork3/pkg-plist132
-rw-r--r--net/kdenetwork4/Makefile7
-rw-r--r--net/kdenetwork4/distinfo2
-rw-r--r--net/kdenetwork4/pkg-plist132
-rw-r--r--security/kgpg-kde4/Makefile8
-rw-r--r--security/kgpg-kde4/distinfo2
-rw-r--r--security/kgpg-kde4/pkg-plist123
-rw-r--r--security/kwallet/Makefile8
-rw-r--r--security/kwallet/distinfo2
-rw-r--r--security/kwallet/pkg-plist123
-rw-r--r--sysutils/kdf/Makefile8
-rw-r--r--sysutils/kdf/distinfo2
-rw-r--r--sysutils/kdf/pkg-plist123
-rw-r--r--sysutils/kfloppy/Makefile8
-rw-r--r--sysutils/kfloppy/distinfo2
-rw-r--r--sysutils/kfloppy/pkg-plist123
-rw-r--r--sysutils/sweeper/Makefile8
-rw-r--r--sysutils/sweeper/distinfo2
-rw-r--r--sysutils/sweeper/pkg-plist123
45 files changed, 822 insertions, 1197 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/comms/kremotecontrol/pkg-plist
+++ b/comms/kremotecontrol/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/math/kcalc/pkg-plist
+++ b/math/kcalc/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/misc/kdeutils2/distinfo
+++ b/misc/kdeutils2/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/misc/kdeutils2/pkg-plist b/misc/kdeutils2/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/misc/kdeutils2/pkg-plist
+++ b/misc/kdeutils2/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/misc/kdeutils3/pkg-plist b/misc/kdeutils3/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/misc/kdeutils3/pkg-plist
+++ b/misc/kdeutils3/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/misc/kdeutils4/pkg-plist
+++ b/misc/kdeutils4/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index e0fa829cfd53..ce0540846e6c 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -6,20 +6,19 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= net news kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_NEWGCC= yes
INSTALLS_SHLIB= yes
USE_AUTOCONF= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index 459042e4346b..9ac64c236e7f 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-1.94.tar.bz2) = 8c40878559ae54032d89a690c8dd738f
+MD5 (kdenetwork-2.0.tar.bz2) = e9330d2a8b937abba44e1eaecec10004
diff --git a/net/kdenetwork2/pkg-plist b/net/kdenetwork2/pkg-plist
index e011d3b975ba..fff92a371ade 100644
--- a/net/kdenetwork2/pkg-plist
+++ b/net/kdenetwork2/pkg-plist
@@ -28,6 +28,18 @@ share/applnk/Internet/ksirc.desktop
share/applnk/Settings/Network/kcmktalkd.desktop
share/apps/keystone/keystoneui.rc
share/apps/kit/eventsrc
+share/apps/kit/icons/locolor/16x16/actions/kit_anonwarning.png
+share/apps/kit/icons/locolor/16x16/actions/kit_away.png
+share/apps/kit/icons/locolor/16x16/actions/kit_bold.png
+share/apps/kit/icons/locolor/16x16/actions/kit_group.png
+share/apps/kit/icons/locolor/16x16/actions/kit_info.png
+share/apps/kit/icons/locolor/16x16/actions/kit_logging.png
+share/apps/kit/icons/locolor/16x16/actions/kit_offline.png
+share/apps/kit/icons/locolor/16x16/actions/kit_online.png
+share/apps/kit/icons/locolor/16x16/actions/kit_sound.png
+share/apps/kit/icons/locolor/16x16/actions/kit_status.png
+share/apps/kit/icons/locolor/16x16/actions/kit_timestamping.png
+share/apps/kit/icons/locolor/16x16/actions/kit_warning.png
share/apps/kmail/kmcomposerui.rc
share/apps/kmail/kmmainwin.rc
share/apps/kmail/pics/abdown.png
@@ -67,28 +79,18 @@ 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/icons/locolor/16x16/actions/message_reply.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
@@ -99,7 +101,6 @@ 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
@@ -107,12 +108,14 @@ share/apps/kppp/Provider/Denmark/Get2Net
share/apps/kppp/Provider/Germany/.directory
share/apps/kppp/Provider/Germany/CityWeb
share/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041
+share/apps/kppp/Provider/Germany/MUC%046DE
share/apps/kppp/Provider/Germany/Netsurf
share/apps/kppp/Provider/NewZealand/.directory
share/apps/kppp/Provider/NewZealand/OrconInternet
share/apps/kppp/Provider/NewZealand/Paradise
share/apps/kppp/Provider/NewZealand/Voyager
share/apps/kppp/Provider/NewZealand/XTRA
+share/apps/kppp/Provider/NewZealand/ihug
share/apps/kppp/Provider/Norway/.directory
share/apps/kppp/Provider/Norway/BGNett
share/apps/kppp/Provider/Norway/Institutt%032for%032informatikk
@@ -120,6 +123,10 @@ share/apps/kppp/Provider/Portugal/.directory
share/apps/kppp/Provider/Portugal/Clix
share/apps/kppp/Provider/Portugal/Netc
share/apps/kppp/Provider/Portugal/OniNet
+share/apps/kppp/Provider/Taiwan/.directory
+share/apps/kppp/Provider/Taiwan/EraNet
+share/apps/kppp/Provider/Taiwan/HiNet
+share/apps/kppp/Provider/Taiwan/SeedNet
share/apps/kppp/Provider/United_Kingdom/.directory
share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
@@ -179,6 +186,7 @@ share/apps/kppp/Rules/England/BritishTelecom_Local.rst
share/apps/kppp/Rules/England/BritishTelecom_National.rst
share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
share/apps/kppp/Rules/France/France_Telecom_Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
share/apps/kppp/Rules/France/France_Telecom_National.rst
share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
@@ -236,11 +244,15 @@ share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst
share/apps/kppp/Rules/Luxembourg/Local.rst
share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
share/apps/kppp/Rules/Malaysia/malaysia.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst
share/apps/kppp/Rules/Netherlands/BelBasis_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Lokaal_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/BelBudget_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Lokaal_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst
share/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst
share/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst
share/apps/kppp/Rules/Norway/Local_Area.rst
@@ -305,8 +317,8 @@ 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
share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
+share/apps/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst
@@ -373,20 +385,18 @@ share/apps/ksirc/sirc.help.gz
share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
+share/config/ksircrc
share/config/protocols/vnc.desktop
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
@@ -414,12 +424,55 @@ 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/knode/.anchors
-share/doc/HTML/en/knode/common
+share/doc/HTML/en/knode/commands.html
+share/doc/HTML/en/knode/compilation.html
+share/doc/HTML/en/knode/configuration.html
+share/doc/HTML/en/knode/credits.html
+share/doc/HTML/en/knode/eyes.png
+share/doc/HTML/en/knode/faq.html
+share/doc/HTML/en/knode/greyball.png
+share/doc/HTML/en/knode/greyballchk.png
share/doc/HTML/en/knode/index.docbook
share/doc/HTML/en/knode/index.html
+share/doc/HTML/en/knode/infos-technical.html
+share/doc/HTML/en/knode/infos-testgroups.html
+share/doc/HTML/en/knode/installation.html
share/doc/HTML/en/knode/introduction.html
+share/doc/HTML/en/knode/knode-cleanup.png
+share/doc/HTML/en/knode/knode-colors-fonts.png
+share/doc/HTML/en/knode/knode-composer-attachments.png
+share/doc/HTML/en/knode/knode-composer-settings.png
+share/doc/HTML/en/knode/knode-edit-filter.png
+share/doc/HTML/en/knode/knode-edit-header1.png
+share/doc/HTML/en/knode/knode-edit-header2.png
+share/doc/HTML/en/knode/knode-editorwindow.html
+share/doc/HTML/en/knode/knode-filters.png
+share/doc/HTML/en/knode/knode-followup.png
+share/doc/HTML/en/knode/knode-header-settings.png
+share/doc/HTML/en/knode/knode-identity.png
+share/doc/HTML/en/knode/knode-journey.html
+share/doc/HTML/en/knode/knode-mail-account.png
+share/doc/HTML/en/knode/knode-more-info.html
+share/doc/HTML/en/knode/knode-new-article.png
+share/doc/HTML/en/knode/knode-news-account.png
+share/doc/HTML/en/knode/knode-post-settings.png
+share/doc/HTML/en/knode/knode-read-news-settings.png
+share/doc/HTML/en/knode/knode-reply.png
+share/doc/HTML/en/knode/knode-search.png
+share/doc/HTML/en/knode/knode-start.png
+share/doc/HTML/en/knode/knode-subscribe.png
+share/doc/HTML/en/knode/knode-views.png
+share/doc/HTML/en/knode/more-knode-features.html
+share/doc/HTML/en/knode/nettiquette.html
+share/doc/HTML/en/knode/newsubs.png
+share/doc/HTML/en/knode/redball.png
+share/doc/HTML/en/knode/redballchk.png
+share/doc/HTML/en/knode/requirements.html
+share/doc/HTML/en/knode/subscribing.html
+share/doc/HTML/en/knode/update-installation.html
+share/doc/HTML/en/knode/usenet-slang.html
+share/doc/HTML/en/knode/using-knode.html
share/doc/HTML/en/korn/.anchors
-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
@@ -433,7 +486,6 @@ 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
@@ -477,7 +529,6 @@ 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
@@ -496,7 +547,6 @@ 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
@@ -511,6 +561,7 @@ share/doc/HTML/en/ktalkd/supportedplatforms.html
share/doc/HTML/en/ktalkd/usage.html
share/doc/HTML/en/ktalkd/whydontiasanormaluserreceivekdeannouncements.html
share/icons/hicolor/22x22/actions/message_get.png
+share/icons/hicolor/32x32/apps/keystone.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
share/icons/hicolor/32x32/apps/knode.png
@@ -518,6 +569,7 @@ 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/keystone.png
share/icons/hicolor/48x48/apps/kit.png
share/icons/hicolor/48x48/apps/kmail.png
share/icons/hicolor/48x48/apps/knode.png
@@ -525,18 +577,7 @@ share/icons/hicolor/48x48/apps/korn.png
share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
share/icons/hicolor/48x48/apps/ktalkd.png
-share/icons/locolor/16x16/actions/kit_anonwarning.png
-share/icons/locolor/16x16/actions/kit_away.png
-share/icons/locolor/16x16/actions/kit_bold.png
-share/icons/locolor/16x16/actions/kit_group.png
-share/icons/locolor/16x16/actions/kit_info.png
-share/icons/locolor/16x16/actions/kit_logging.png
-share/icons/locolor/16x16/actions/kit_offline.png
-share/icons/locolor/16x16/actions/kit_online.png
-share/icons/locolor/16x16/actions/kit_sound.png
-share/icons/locolor/16x16/actions/kit_status.png
-share/icons/locolor/16x16/actions/kit_timestamping.png
-share/icons/locolor/16x16/actions/kit_warning.png
+share/icons/locolor/16x16/apps/keystone.png
share/icons/locolor/16x16/apps/kit.png
share/icons/locolor/16x16/apps/kmail.png
share/icons/locolor/16x16/apps/knode.png
@@ -544,6 +585,7 @@ 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/keystone.png
share/icons/locolor/32x32/apps/kit.png
share/icons/locolor/32x32/apps/kmail.png
share/icons/locolor/32x32/apps/knode.png
@@ -601,23 +643,37 @@ 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
@dirrm share/apps/kppp/Provider/United_Kingdom
+@dirrm share/apps/kppp/Provider/Taiwan
@dirrm share/apps/kppp/Provider/Portugal
@dirrm share/apps/kppp/Provider/Norway
@dirrm share/apps/kppp/Provider/NewZealand
@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/kppp/Provider
+@dirrm share/apps/kppp
@dirrm share/apps/knode/pics
@dirrm share/apps/knode/icons/locolor/16x16/actions
+@dirrm share/apps/knode/icons/locolor/16x16
+@dirrm share/apps/knode/icons/locolor
@dirrm share/apps/knode/icons/hicolor/32x32/actions
+@dirrm share/apps/knode/icons/hicolor/32x32
@dirrm share/apps/knode/icons/hicolor/22x22/actions
+@dirrm share/apps/knode/icons/hicolor/22x22
+@dirrm share/apps/knode/icons/hicolor
+@dirrm share/apps/knode/icons
@dirrm share/apps/knode/filters
@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
+@dirrm share/apps/kit/icons/locolor/16x16/actions
+@dirrm share/apps/kit/icons/locolor/16x16
+@dirrm share/apps/kit/icons/locolor
+@dirrm share/apps/kit/icons
@dirrm share/apps/kit
+@dirrm share/apps/keystone
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index e0fa829cfd53..ce0540846e6c 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -6,20 +6,19 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= net news kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_NEWGCC= yes
INSTALLS_SHLIB= yes
USE_AUTOCONF= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 459042e4346b..9ac64c236e7f 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-1.94.tar.bz2) = 8c40878559ae54032d89a690c8dd738f
+MD5 (kdenetwork-2.0.tar.bz2) = e9330d2a8b937abba44e1eaecec10004
diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist
index e011d3b975ba..fff92a371ade 100644
--- a/net/kdenetwork3/pkg-plist
+++ b/net/kdenetwork3/pkg-plist
@@ -28,6 +28,18 @@ share/applnk/Internet/ksirc.desktop
share/applnk/Settings/Network/kcmktalkd.desktop
share/apps/keystone/keystoneui.rc
share/apps/kit/eventsrc
+share/apps/kit/icons/locolor/16x16/actions/kit_anonwarning.png
+share/apps/kit/icons/locolor/16x16/actions/kit_away.png
+share/apps/kit/icons/locolor/16x16/actions/kit_bold.png
+share/apps/kit/icons/locolor/16x16/actions/kit_group.png
+share/apps/kit/icons/locolor/16x16/actions/kit_info.png
+share/apps/kit/icons/locolor/16x16/actions/kit_logging.png
+share/apps/kit/icons/locolor/16x16/actions/kit_offline.png
+share/apps/kit/icons/locolor/16x16/actions/kit_online.png
+share/apps/kit/icons/locolor/16x16/actions/kit_sound.png
+share/apps/kit/icons/locolor/16x16/actions/kit_status.png
+share/apps/kit/icons/locolor/16x16/actions/kit_timestamping.png
+share/apps/kit/icons/locolor/16x16/actions/kit_warning.png
share/apps/kmail/kmcomposerui.rc
share/apps/kmail/kmmainwin.rc
share/apps/kmail/pics/abdown.png
@@ -67,28 +79,18 @@ 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/icons/locolor/16x16/actions/message_reply.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
@@ -99,7 +101,6 @@ 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
@@ -107,12 +108,14 @@ share/apps/kppp/Provider/Denmark/Get2Net
share/apps/kppp/Provider/Germany/.directory
share/apps/kppp/Provider/Germany/CityWeb
share/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041
+share/apps/kppp/Provider/Germany/MUC%046DE
share/apps/kppp/Provider/Germany/Netsurf
share/apps/kppp/Provider/NewZealand/.directory
share/apps/kppp/Provider/NewZealand/OrconInternet
share/apps/kppp/Provider/NewZealand/Paradise
share/apps/kppp/Provider/NewZealand/Voyager
share/apps/kppp/Provider/NewZealand/XTRA
+share/apps/kppp/Provider/NewZealand/ihug
share/apps/kppp/Provider/Norway/.directory
share/apps/kppp/Provider/Norway/BGNett
share/apps/kppp/Provider/Norway/Institutt%032for%032informatikk
@@ -120,6 +123,10 @@ share/apps/kppp/Provider/Portugal/.directory
share/apps/kppp/Provider/Portugal/Clix
share/apps/kppp/Provider/Portugal/Netc
share/apps/kppp/Provider/Portugal/OniNet
+share/apps/kppp/Provider/Taiwan/.directory
+share/apps/kppp/Provider/Taiwan/EraNet
+share/apps/kppp/Provider/Taiwan/HiNet
+share/apps/kppp/Provider/Taiwan/SeedNet
share/apps/kppp/Provider/United_Kingdom/.directory
share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
@@ -179,6 +186,7 @@ share/apps/kppp/Rules/England/BritishTelecom_Local.rst
share/apps/kppp/Rules/England/BritishTelecom_National.rst
share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
share/apps/kppp/Rules/France/France_Telecom_Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
share/apps/kppp/Rules/France/France_Telecom_National.rst
share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
@@ -236,11 +244,15 @@ share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst
share/apps/kppp/Rules/Luxembourg/Local.rst
share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
share/apps/kppp/Rules/Malaysia/malaysia.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst
share/apps/kppp/Rules/Netherlands/BelBasis_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Lokaal_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/BelBudget_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Lokaal_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst
share/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst
share/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst
share/apps/kppp/Rules/Norway/Local_Area.rst
@@ -305,8 +317,8 @@ 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
share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
+share/apps/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst
@@ -373,20 +385,18 @@ share/apps/ksirc/sirc.help.gz
share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
+share/config/ksircrc
share/config/protocols/vnc.desktop
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
@@ -414,12 +424,55 @@ 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/knode/.anchors
-share/doc/HTML/en/knode/common
+share/doc/HTML/en/knode/commands.html
+share/doc/HTML/en/knode/compilation.html
+share/doc/HTML/en/knode/configuration.html
+share/doc/HTML/en/knode/credits.html
+share/doc/HTML/en/knode/eyes.png
+share/doc/HTML/en/knode/faq.html
+share/doc/HTML/en/knode/greyball.png
+share/doc/HTML/en/knode/greyballchk.png
share/doc/HTML/en/knode/index.docbook
share/doc/HTML/en/knode/index.html
+share/doc/HTML/en/knode/infos-technical.html
+share/doc/HTML/en/knode/infos-testgroups.html
+share/doc/HTML/en/knode/installation.html
share/doc/HTML/en/knode/introduction.html
+share/doc/HTML/en/knode/knode-cleanup.png
+share/doc/HTML/en/knode/knode-colors-fonts.png
+share/doc/HTML/en/knode/knode-composer-attachments.png
+share/doc/HTML/en/knode/knode-composer-settings.png
+share/doc/HTML/en/knode/knode-edit-filter.png
+share/doc/HTML/en/knode/knode-edit-header1.png
+share/doc/HTML/en/knode/knode-edit-header2.png
+share/doc/HTML/en/knode/knode-editorwindow.html
+share/doc/HTML/en/knode/knode-filters.png
+share/doc/HTML/en/knode/knode-followup.png
+share/doc/HTML/en/knode/knode-header-settings.png
+share/doc/HTML/en/knode/knode-identity.png
+share/doc/HTML/en/knode/knode-journey.html
+share/doc/HTML/en/knode/knode-mail-account.png
+share/doc/HTML/en/knode/knode-more-info.html
+share/doc/HTML/en/knode/knode-new-article.png
+share/doc/HTML/en/knode/knode-news-account.png
+share/doc/HTML/en/knode/knode-post-settings.png
+share/doc/HTML/en/knode/knode-read-news-settings.png
+share/doc/HTML/en/knode/knode-reply.png
+share/doc/HTML/en/knode/knode-search.png
+share/doc/HTML/en/knode/knode-start.png
+share/doc/HTML/en/knode/knode-subscribe.png
+share/doc/HTML/en/knode/knode-views.png
+share/doc/HTML/en/knode/more-knode-features.html
+share/doc/HTML/en/knode/nettiquette.html
+share/doc/HTML/en/knode/newsubs.png
+share/doc/HTML/en/knode/redball.png
+share/doc/HTML/en/knode/redballchk.png
+share/doc/HTML/en/knode/requirements.html
+share/doc/HTML/en/knode/subscribing.html
+share/doc/HTML/en/knode/update-installation.html
+share/doc/HTML/en/knode/usenet-slang.html
+share/doc/HTML/en/knode/using-knode.html
share/doc/HTML/en/korn/.anchors
-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
@@ -433,7 +486,6 @@ 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
@@ -477,7 +529,6 @@ 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
@@ -496,7 +547,6 @@ 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
@@ -511,6 +561,7 @@ share/doc/HTML/en/ktalkd/supportedplatforms.html
share/doc/HTML/en/ktalkd/usage.html
share/doc/HTML/en/ktalkd/whydontiasanormaluserreceivekdeannouncements.html
share/icons/hicolor/22x22/actions/message_get.png
+share/icons/hicolor/32x32/apps/keystone.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
share/icons/hicolor/32x32/apps/knode.png
@@ -518,6 +569,7 @@ 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/keystone.png
share/icons/hicolor/48x48/apps/kit.png
share/icons/hicolor/48x48/apps/kmail.png
share/icons/hicolor/48x48/apps/knode.png
@@ -525,18 +577,7 @@ share/icons/hicolor/48x48/apps/korn.png
share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
share/icons/hicolor/48x48/apps/ktalkd.png
-share/icons/locolor/16x16/actions/kit_anonwarning.png
-share/icons/locolor/16x16/actions/kit_away.png
-share/icons/locolor/16x16/actions/kit_bold.png
-share/icons/locolor/16x16/actions/kit_group.png
-share/icons/locolor/16x16/actions/kit_info.png
-share/icons/locolor/16x16/actions/kit_logging.png
-share/icons/locolor/16x16/actions/kit_offline.png
-share/icons/locolor/16x16/actions/kit_online.png
-share/icons/locolor/16x16/actions/kit_sound.png
-share/icons/locolor/16x16/actions/kit_status.png
-share/icons/locolor/16x16/actions/kit_timestamping.png
-share/icons/locolor/16x16/actions/kit_warning.png
+share/icons/locolor/16x16/apps/keystone.png
share/icons/locolor/16x16/apps/kit.png
share/icons/locolor/16x16/apps/kmail.png
share/icons/locolor/16x16/apps/knode.png
@@ -544,6 +585,7 @@ 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/keystone.png
share/icons/locolor/32x32/apps/kit.png
share/icons/locolor/32x32/apps/kmail.png
share/icons/locolor/32x32/apps/knode.png
@@ -601,23 +643,37 @@ 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
@dirrm share/apps/kppp/Provider/United_Kingdom
+@dirrm share/apps/kppp/Provider/Taiwan
@dirrm share/apps/kppp/Provider/Portugal
@dirrm share/apps/kppp/Provider/Norway
@dirrm share/apps/kppp/Provider/NewZealand
@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/kppp/Provider
+@dirrm share/apps/kppp
@dirrm share/apps/knode/pics
@dirrm share/apps/knode/icons/locolor/16x16/actions
+@dirrm share/apps/knode/icons/locolor/16x16
+@dirrm share/apps/knode/icons/locolor
@dirrm share/apps/knode/icons/hicolor/32x32/actions
+@dirrm share/apps/knode/icons/hicolor/32x32
@dirrm share/apps/knode/icons/hicolor/22x22/actions
+@dirrm share/apps/knode/icons/hicolor/22x22
+@dirrm share/apps/knode/icons/hicolor
+@dirrm share/apps/knode/icons
@dirrm share/apps/knode/filters
@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
+@dirrm share/apps/kit/icons/locolor/16x16/actions
+@dirrm share/apps/kit/icons/locolor/16x16
+@dirrm share/apps/kit/icons/locolor
+@dirrm share/apps/kit/icons
@dirrm share/apps/kit
+@dirrm share/apps/keystone
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index e0fa829cfd53..ce0540846e6c 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,20 +6,19 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= net news kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_NEWGCC= yes
INSTALLS_SHLIB= yes
USE_AUTOCONF= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 459042e4346b..9ac64c236e7f 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-1.94.tar.bz2) = 8c40878559ae54032d89a690c8dd738f
+MD5 (kdenetwork-2.0.tar.bz2) = e9330d2a8b937abba44e1eaecec10004
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index e011d3b975ba..fff92a371ade 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -28,6 +28,18 @@ share/applnk/Internet/ksirc.desktop
share/applnk/Settings/Network/kcmktalkd.desktop
share/apps/keystone/keystoneui.rc
share/apps/kit/eventsrc
+share/apps/kit/icons/locolor/16x16/actions/kit_anonwarning.png
+share/apps/kit/icons/locolor/16x16/actions/kit_away.png
+share/apps/kit/icons/locolor/16x16/actions/kit_bold.png
+share/apps/kit/icons/locolor/16x16/actions/kit_group.png
+share/apps/kit/icons/locolor/16x16/actions/kit_info.png
+share/apps/kit/icons/locolor/16x16/actions/kit_logging.png
+share/apps/kit/icons/locolor/16x16/actions/kit_offline.png
+share/apps/kit/icons/locolor/16x16/actions/kit_online.png
+share/apps/kit/icons/locolor/16x16/actions/kit_sound.png
+share/apps/kit/icons/locolor/16x16/actions/kit_status.png
+share/apps/kit/icons/locolor/16x16/actions/kit_timestamping.png
+share/apps/kit/icons/locolor/16x16/actions/kit_warning.png
share/apps/kmail/kmcomposerui.rc
share/apps/kmail/kmmainwin.rc
share/apps/kmail/pics/abdown.png
@@ -67,28 +79,18 @@ 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/icons/locolor/16x16/actions/message_reply.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
@@ -99,7 +101,6 @@ 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
@@ -107,12 +108,14 @@ share/apps/kppp/Provider/Denmark/Get2Net
share/apps/kppp/Provider/Germany/.directory
share/apps/kppp/Provider/Germany/CityWeb
share/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041
+share/apps/kppp/Provider/Germany/MUC%046DE
share/apps/kppp/Provider/Germany/Netsurf
share/apps/kppp/Provider/NewZealand/.directory
share/apps/kppp/Provider/NewZealand/OrconInternet
share/apps/kppp/Provider/NewZealand/Paradise
share/apps/kppp/Provider/NewZealand/Voyager
share/apps/kppp/Provider/NewZealand/XTRA
+share/apps/kppp/Provider/NewZealand/ihug
share/apps/kppp/Provider/Norway/.directory
share/apps/kppp/Provider/Norway/BGNett
share/apps/kppp/Provider/Norway/Institutt%032for%032informatikk
@@ -120,6 +123,10 @@ share/apps/kppp/Provider/Portugal/.directory
share/apps/kppp/Provider/Portugal/Clix
share/apps/kppp/Provider/Portugal/Netc
share/apps/kppp/Provider/Portugal/OniNet
+share/apps/kppp/Provider/Taiwan/.directory
+share/apps/kppp/Provider/Taiwan/EraNet
+share/apps/kppp/Provider/Taiwan/HiNet
+share/apps/kppp/Provider/Taiwan/SeedNet
share/apps/kppp/Provider/United_Kingdom/.directory
share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
@@ -179,6 +186,7 @@ share/apps/kppp/Rules/England/BritishTelecom_Local.rst
share/apps/kppp/Rules/England/BritishTelecom_National.rst
share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
share/apps/kppp/Rules/France/France_Telecom_Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local_Area.rst
share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
share/apps/kppp/Rules/France/France_Telecom_National.rst
share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
@@ -236,11 +244,15 @@ share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst
share/apps/kppp/Rules/Luxembourg/Local.rst
share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
share/apps/kppp/Rules/Malaysia/malaysia.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst
share/apps/kppp/Rules/Netherlands/BelBasis_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelBasis_Lokaal_Nummervoordeel.rst
-share/apps/kppp/Rules/Netherlands/BelBudget_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Lokaal.rst
-share/apps/kppp/Rules/Netherlands/BelPlus_Lokaal_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst
share/apps/kppp/Rules/Netherlands/NedpointBasis_Lokaal.rst
share/apps/kppp/Rules/Netherlands/NedpointBelBespaar_Lokaal.rst
share/apps/kppp/Rules/Norway/Local_Area.rst
@@ -305,8 +317,8 @@ 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
share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
+share/apps/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst
@@ -373,20 +385,18 @@ share/apps/ksirc/sirc.help.gz
share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
+share/config/ksircrc
share/config/protocols/vnc.desktop
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
@@ -414,12 +424,55 @@ 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/knode/.anchors
-share/doc/HTML/en/knode/common
+share/doc/HTML/en/knode/commands.html
+share/doc/HTML/en/knode/compilation.html
+share/doc/HTML/en/knode/configuration.html
+share/doc/HTML/en/knode/credits.html
+share/doc/HTML/en/knode/eyes.png
+share/doc/HTML/en/knode/faq.html
+share/doc/HTML/en/knode/greyball.png
+share/doc/HTML/en/knode/greyballchk.png
share/doc/HTML/en/knode/index.docbook
share/doc/HTML/en/knode/index.html
+share/doc/HTML/en/knode/infos-technical.html
+share/doc/HTML/en/knode/infos-testgroups.html
+share/doc/HTML/en/knode/installation.html
share/doc/HTML/en/knode/introduction.html
+share/doc/HTML/en/knode/knode-cleanup.png
+share/doc/HTML/en/knode/knode-colors-fonts.png
+share/doc/HTML/en/knode/knode-composer-attachments.png
+share/doc/HTML/en/knode/knode-composer-settings.png
+share/doc/HTML/en/knode/knode-edit-filter.png
+share/doc/HTML/en/knode/knode-edit-header1.png
+share/doc/HTML/en/knode/knode-edit-header2.png
+share/doc/HTML/en/knode/knode-editorwindow.html
+share/doc/HTML/en/knode/knode-filters.png
+share/doc/HTML/en/knode/knode-followup.png
+share/doc/HTML/en/knode/knode-header-settings.png
+share/doc/HTML/en/knode/knode-identity.png
+share/doc/HTML/en/knode/knode-journey.html
+share/doc/HTML/en/knode/knode-mail-account.png
+share/doc/HTML/en/knode/knode-more-info.html
+share/doc/HTML/en/knode/knode-new-article.png
+share/doc/HTML/en/knode/knode-news-account.png
+share/doc/HTML/en/knode/knode-post-settings.png
+share/doc/HTML/en/knode/knode-read-news-settings.png
+share/doc/HTML/en/knode/knode-reply.png
+share/doc/HTML/en/knode/knode-search.png
+share/doc/HTML/en/knode/knode-start.png
+share/doc/HTML/en/knode/knode-subscribe.png
+share/doc/HTML/en/knode/knode-views.png
+share/doc/HTML/en/knode/more-knode-features.html
+share/doc/HTML/en/knode/nettiquette.html
+share/doc/HTML/en/knode/newsubs.png
+share/doc/HTML/en/knode/redball.png
+share/doc/HTML/en/knode/redballchk.png
+share/doc/HTML/en/knode/requirements.html
+share/doc/HTML/en/knode/subscribing.html
+share/doc/HTML/en/knode/update-installation.html
+share/doc/HTML/en/knode/usenet-slang.html
+share/doc/HTML/en/knode/using-knode.html
share/doc/HTML/en/korn/.anchors
-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
@@ -433,7 +486,6 @@ 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
@@ -477,7 +529,6 @@ 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
@@ -496,7 +547,6 @@ 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
@@ -511,6 +561,7 @@ share/doc/HTML/en/ktalkd/supportedplatforms.html
share/doc/HTML/en/ktalkd/usage.html
share/doc/HTML/en/ktalkd/whydontiasanormaluserreceivekdeannouncements.html
share/icons/hicolor/22x22/actions/message_get.png
+share/icons/hicolor/32x32/apps/keystone.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
share/icons/hicolor/32x32/apps/knode.png
@@ -518,6 +569,7 @@ 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/keystone.png
share/icons/hicolor/48x48/apps/kit.png
share/icons/hicolor/48x48/apps/kmail.png
share/icons/hicolor/48x48/apps/knode.png
@@ -525,18 +577,7 @@ share/icons/hicolor/48x48/apps/korn.png
share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
share/icons/hicolor/48x48/apps/ktalkd.png
-share/icons/locolor/16x16/actions/kit_anonwarning.png
-share/icons/locolor/16x16/actions/kit_away.png
-share/icons/locolor/16x16/actions/kit_bold.png
-share/icons/locolor/16x16/actions/kit_group.png
-share/icons/locolor/16x16/actions/kit_info.png
-share/icons/locolor/16x16/actions/kit_logging.png
-share/icons/locolor/16x16/actions/kit_offline.png
-share/icons/locolor/16x16/actions/kit_online.png
-share/icons/locolor/16x16/actions/kit_sound.png
-share/icons/locolor/16x16/actions/kit_status.png
-share/icons/locolor/16x16/actions/kit_timestamping.png
-share/icons/locolor/16x16/actions/kit_warning.png
+share/icons/locolor/16x16/apps/keystone.png
share/icons/locolor/16x16/apps/kit.png
share/icons/locolor/16x16/apps/kmail.png
share/icons/locolor/16x16/apps/knode.png
@@ -544,6 +585,7 @@ 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/keystone.png
share/icons/locolor/32x32/apps/kit.png
share/icons/locolor/32x32/apps/kmail.png
share/icons/locolor/32x32/apps/knode.png
@@ -601,23 +643,37 @@ 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
@dirrm share/apps/kppp/Provider/United_Kingdom
+@dirrm share/apps/kppp/Provider/Taiwan
@dirrm share/apps/kppp/Provider/Portugal
@dirrm share/apps/kppp/Provider/Norway
@dirrm share/apps/kppp/Provider/NewZealand
@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/kppp/Provider
+@dirrm share/apps/kppp
@dirrm share/apps/knode/pics
@dirrm share/apps/knode/icons/locolor/16x16/actions
+@dirrm share/apps/knode/icons/locolor/16x16
+@dirrm share/apps/knode/icons/locolor
@dirrm share/apps/knode/icons/hicolor/32x32/actions
+@dirrm share/apps/knode/icons/hicolor/32x32
@dirrm share/apps/knode/icons/hicolor/22x22/actions
+@dirrm share/apps/knode/icons/hicolor/22x22
+@dirrm share/apps/knode/icons/hicolor
+@dirrm share/apps/knode/icons
@dirrm share/apps/knode/filters
@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
+@dirrm share/apps/kit/icons/locolor/16x16/actions
+@dirrm share/apps/kit/icons/locolor/16x16
+@dirrm share/apps/kit/icons/locolor
+@dirrm share/apps/kit/icons
@dirrm share/apps/kit
+@dirrm share/apps/keystone
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/security/kgpg-kde4/pkg-plist
+++ b/security/kgpg-kde4/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/security/kwallet/pkg-plist
+++ b/security/kwallet/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.94
+PORTVERSION= 2.0
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/distribution/tar/generic/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- qt2.4:${PORTSDIR}/x11-toolkits/qt22
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
+USE_QT2= yes
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
INSTALLS_SHLIB= yes
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
bin/kcharselect
bin/kdepasswd
bin/kdessh
-bin/kdf
bin/kedit
bin/kfind
bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
bin/kljettool
bin/klpq
bin/knotes
-bin/kwikdisk
lib/kedit.la
-lib/kedit.so
lib/kedit.so.0
lib/kfind.la
lib/kfind.so
-lib/libkcm_kdf.la
-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
-share/applnk/Settings/Information/kcmdf.desktop
share/applnk/Settings/Information/pcmcia.desktop
share/applnk/Settings/PowerControl/battery.desktop
share/applnk/Settings/PowerControl/bwarning.desktop
share/applnk/Settings/PowerControl/cwarning.desktop
share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
share/applnk/Utilities/KCharSelect.desktop
share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
share/apps/kedit/pics/keditlogo.png
share/apps/kedit/pics/misc.png
share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
share/apps/kfind/icons/locolor/22x22/actions/archive.png
share/apps/kfind/icons/locolor/22x22/actions/delete.png
share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
share/apps/khexedit/toolbar/hexwrite.png
share/apps/kicker/applets/ktimemon.desktop
share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
share/apps/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
share/config/knotesrc
@@ -106,7 +104,6 @@ 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
@@ -118,13 +115,11 @@ 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.docbook
@@ -137,7 +132,6 @@ 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
@@ -164,7 +158,6 @@ 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.docbook
share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ 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
@@ -194,7 +186,6 @@ 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
@@ -213,7 +204,6 @@ 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.docbook
@@ -222,7 +212,6 @@ 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
@@ -240,7 +229,6 @@ 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
@@ -249,22 +237,8 @@ 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
@@ -281,7 +255,6 @@ 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/common
share/doc/HTML/en/klpq/compilation-and-installation.html
share/doc/HTML/en/klpq/index.docbook
share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ 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
-share/doc/HTML/en/knotes/alarm.html
-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
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
share/doc/HTML/en/knotes/index.docbook
share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
share/doc/HTML/en/knotes/installation.html
share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.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
@@ -347,7 +312,6 @@ 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
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
share/icons/hicolor/32x32/apps/laptop_battery.png
share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
share/icons/hicolor/48x48/apps/ark.png
share/icons/hicolor/48x48/apps/kab.png
share/icons/hicolor/48x48/apps/karm.png
share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
share/icons/hicolor/48x48/apps/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
share/icons/hicolor/48x48/apps/laptop_battery.png
share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
share/icons/locolor/16x16/apps/ark.png
share/icons/locolor/16x16/apps/kab.png
share/icons/locolor/16x16/apps/karm.png
share/icons/locolor/16x16/apps/kcalc.png
share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
share/icons/locolor/16x16/apps/kedit.png
share/icons/locolor/16x16/apps/kfind.png
share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
share/icons/locolor/16x16/apps/klpq.png
share/icons/locolor/16x16/apps/knotes.png
share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
share/icons/locolor/32x32/apps/ark.png
share/icons/locolor/32x32/apps/kab.png
share/icons/locolor/32x32/apps/karm.png
share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
share/icons/locolor/32x32/apps/klpq.png
share/icons/locolor/32x32/apps/knotes.png
share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-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
@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
@@ -453,18 +398,28 @@ 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/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
@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/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/kab
@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
@dirrm share/apps/ark