aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/ark/Makefile16
-rw-r--r--archivers/ark/distinfo2
-rw-r--r--archivers/ark/pkg-plist390
-rw-r--r--comms/kremotecontrol/Makefile16
-rw-r--r--comms/kremotecontrol/distinfo2
-rw-r--r--comms/kremotecontrol/pkg-plist390
-rw-r--r--deskutils/kcharselect/Makefile16
-rw-r--r--deskutils/kcharselect/distinfo2
-rw-r--r--deskutils/kcharselect/pkg-plist390
-rw-r--r--math/kcalc/Makefile16
-rw-r--r--math/kcalc/distinfo2
-rw-r--r--math/kcalc/pkg-plist390
-rw-r--r--misc/kdeutils2/Makefile16
-rw-r--r--misc/kdeutils2/distinfo2
-rw-r--r--misc/kdeutils2/pkg-plist390
-rw-r--r--misc/kdeutils3/Makefile16
-rw-r--r--misc/kdeutils3/distinfo2
-rw-r--r--misc/kdeutils3/pkg-plist390
-rw-r--r--misc/kdeutils4/Makefile16
-rw-r--r--misc/kdeutils4/distinfo2
-rw-r--r--misc/kdeutils4/pkg-plist390
-rw-r--r--net/kdenetwork2/Makefile9
-rw-r--r--net/kdenetwork2/distinfo2
-rw-r--r--net/kdenetwork2/pkg-plist185
-rw-r--r--net/kdenetwork3/Makefile9
-rw-r--r--net/kdenetwork3/distinfo2
-rw-r--r--net/kdenetwork3/pkg-plist185
-rw-r--r--net/kdenetwork4/Makefile9
-rw-r--r--net/kdenetwork4/distinfo2
-rw-r--r--net/kdenetwork4/pkg-plist185
-rw-r--r--security/kgpg-kde4/Makefile16
-rw-r--r--security/kgpg-kde4/distinfo2
-rw-r--r--security/kgpg-kde4/pkg-plist390
-rw-r--r--security/kwallet/Makefile16
-rw-r--r--security/kwallet/distinfo2
-rw-r--r--security/kwallet/pkg-plist390
-rw-r--r--sysutils/kdf/Makefile16
-rw-r--r--sysutils/kdf/distinfo2
-rw-r--r--sysutils/kdf/pkg-plist390
-rw-r--r--sysutils/kfloppy/Makefile16
-rw-r--r--sysutils/kfloppy/distinfo2
-rw-r--r--sysutils/kfloppy/pkg-plist390
-rw-r--r--sysutils/sweeper/Makefile16
-rw-r--r--sysutils/sweeper/distinfo2
-rw-r--r--sysutils/sweeper/pkg-plist390
-rw-r--r--x11/kde2/Makefile7
-rw-r--r--x11/kde3/Makefile7
-rw-r--r--x11/kde4/Makefile7
48 files changed, 2100 insertions, 3405 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/archivers/ark/pkg-plist b/archivers/ark/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/comms/kremotecontrol/pkg-plist b/comms/kremotecontrol/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/comms/kremotecontrol/pkg-plist
+++ b/comms/kremotecontrol/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/math/kcalc/pkg-plist
+++ b/math/kcalc/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/misc/kdeutils2/distinfo b/misc/kdeutils2/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/misc/kdeutils2/distinfo
+++ b/misc/kdeutils2/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/misc/kdeutils2/pkg-plist b/misc/kdeutils2/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/misc/kdeutils2/pkg-plist
+++ b/misc/kdeutils2/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/misc/kdeutils3/pkg-plist b/misc/kdeutils3/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/misc/kdeutils3/pkg-plist
+++ b/misc/kdeutils3/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/misc/kdeutils4/pkg-plist
+++ b/misc/kdeutils4/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile
index 2857c274dd51..5fc7c4f497d5 100644
--- a/net/kdenetwork2/Makefile
+++ b/net/kdenetwork2/Makefile
@@ -6,20 +6,17 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 20000724A
+PORTVERSION= 20000829A
CATEGORIES= net news kde
-MASTER_SITES= $(MASTER_SITE_LOCAL)
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MASTER_SITE_SUBDIR= will
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- QwSpriteField.8:${PORTSDIR}/converters/kdesupport2
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
-BROKEN= "Does not use current snapshot"
-WRKSRC= ${WRKDIR}/kdenetwork
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
USE_NEWGCC= yes
diff --git a/net/kdenetwork2/distinfo b/net/kdenetwork2/distinfo
index a19c3f52393f..6a197445ce00 100644
--- a/net/kdenetwork2/distinfo
+++ b/net/kdenetwork2/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-20000724A.tar.bz2) = d4557cd2bfbfcea1803c035d4f5c6120
+MD5 (kdenetwork-20000829A.tar.bz2) = bb387eeed72e4a172e3e46719ef9e0fa
diff --git a/net/kdenetwork2/pkg-plist b/net/kdenetwork2/pkg-plist
index c98d947947af..5eefae0f4ce7 100644
--- a/net/kdenetwork2/pkg-plist
+++ b/net/kdenetwork2/pkg-plist
@@ -1,9 +1,7 @@
bin/dsirc
-bin/karchie
bin/keystone
bin/kit
bin/kmail
-bin/knode
bin/korn
bin/kotalkd
bin/kppp
@@ -14,20 +12,13 @@ bin/ktalkd
bin/ktalkdlg
bin/mail.local
include/kmailIface.h
-include/ksearch/ftpsearch.h
-include/ksearch/peoplesearch.h
-include/ksearch/websearch.h
lib/ksirc.la
lib/ksirc.so
lib/libkcm_ktalkd.la
lib/libkcm_ktalkd.so
-lib/libksearch.la
-lib/libksearch.so.3
share/applnk/Internet/KMail.desktop
-share/applnk/Internet/KNode.desktop
share/applnk/Internet/KOrn.desktop
share/applnk/Internet/Kppp.desktop
-share/applnk/Internet/karchie.desktop
share/applnk/Internet/keystone.desktop
share/applnk/Internet/kit.desktop
share/applnk/Internet/kppplogview.desktop
@@ -35,10 +26,6 @@ share/applnk/Internet/ksirc.desktop
share/applnk/Settings/Network/kcmktalkd.desktop
share/apps/keystone/keystoneui.rc
share/apps/kit/eventsrc
-share/apps/kit/pics/kit_away.png
-share/apps/kit/pics/kit_group.png
-share/apps/kit/pics/kit_offline.png
-share/apps/kit/pics/kit_online.png
share/apps/kmail/kmcomposerui.rc
share/apps/kmail/kmmainwin.rc
share/apps/kmail/pics/abdown.png
@@ -67,57 +54,6 @@ share/apps/kmail/pics/pub_key_red.png
share/apps/kmail/pics/red-bullet.png
share/apps/kmail/pics/stopwatch.xbm
share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/knode/filters/1.fltr
-share/apps/knode/filters/2.fltr
-share/apps/knode/filters/3.fltr
-share/apps/knode/filters/4.fltr
-share/apps/knode/filters/5.fltr
-share/apps/knode/filters/6.fltr
-share/apps/knode/filters/filters.rc
-share/apps/knode/headers.rc
-share/apps/knode/kncomposerui.rc
-share/apps/knode/knodeui.rc
-share/apps/knode/knreaderui.rc
-share/apps/knode/pics/accmail.png
-share/apps/knode/pics/arrow_left.png
-share/apps/knode/pics/arrow_right.png
-share/apps/knode/pics/ctlart.png
-share/apps/knode/pics/eyes.png
-share/apps/knode/pics/fltrblue.png
-share/apps/knode/pics/fltrgrey.png
-share/apps/knode/pics/folder.png
-share/apps/knode/pics/greyball.png
-share/apps/knode/pics/greyballchk.png
-share/apps/knode/pics/group.png
-share/apps/knode/pics/groupkat.png
-share/apps/knode/pics/mail.png
-share/apps/knode/pics/newsubs.png
-share/apps/knode/pics/pen.png
-share/apps/knode/pics/posting.png
-share/apps/knode/pics/redball.png
-share/apps/knode/pics/redballchk.png
-share/apps/knode/pics/server.png
-share/apps/knode/pics/smile.png
-share/apps/knode/pics/snderr.png
-share/apps/knode/pics/stat_cncl.png
-share/apps/knode/pics/stat_edit.png
-share/apps/knode/pics/stat_saved.png
-share/apps/knode/pics/stat_sent.png
-share/apps/knode/toolbar/delete.png
-share/apps/knode/toolbar/dlall.png
-share/apps/knode/toolbar/filter.png
-share/apps/knode/toolbar/fwd.png
-share/apps/knode/toolbar/grpdlg.png
-share/apps/knode/toolbar/newmsg.png
-share/apps/knode/toolbar/nextart.png
-share/apps/knode/toolbar/nextthr.png
-share/apps/knode/toolbar/remail.png
-share/apps/knode/toolbar/reply.png
-share/apps/knode/toolbar/save.png
-share/apps/knode/toolbar/search.png
-share/apps/knode/toolbar/sendnow.png
-share/apps/knode/toolbar/settings.png
-share/apps/knode/toolbar/signature.png
share/apps/kppp/Provider/Austria/.directory
share/apps/kppp/Provider/Austria/Simon%032Media
share/apps/kppp/Provider/Denmark/.directory
@@ -162,6 +98,7 @@ share/apps/kppp/Rules/Austria/Minimum/Online.rst
share/apps/kppp/Rules/Austria/Standard/Local.rst
share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst
share/apps/kppp/Rules/Austria/Standard/Online.rst
+share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
share/apps/kppp/Rules/Bangladesh/ATT00007.rst
share/apps/kppp/Rules/Bangladesh/ATT00010.rst
share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
@@ -194,12 +131,15 @@ share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
share/apps/kppp/Rules/England/BritishTelecom_Local.rst
share/apps/kppp/Rules/England/BritishTelecom_National.rst
share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
-share/apps/kppp/Rules/France/Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
+share/apps/kppp/Rules/France/France_Telecom_National.rst
share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
share/apps/kppp/Rules/Germany/Addcom.rst
share/apps/kppp/Rules/Germany/CallOkaynet.rst
share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
+share/apps/kppp/Rules/Germany/MSN.rst
share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst
share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst
share/apps/kppp/Rules/Germany/Nikoma.rst
@@ -291,12 +231,28 @@ share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst
share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst
-share/apps/kppp/Rules/Sweden/Local.rst
-share/apps/kppp/Rules/Sweden/Local_Telebonus_1.rst
-share/apps/kppp/Rules/Sweden/Local_Telebonus_2.rst
-share/apps/kppp/Rules/Sweden/Long_Distance.rst
-share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_1.rst
-share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_2.rst
+share/apps/kppp/Rules/Sweden/ACN.rst
+share/apps/kppp/Rules/Sweden/Abonnera.rst
+share/apps/kppp/Rules/Sweden/Affinity-Crossnet.rst
+share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+share/apps/kppp/Rules/Sweden/Glocalnet.rst
+share/apps/kppp/Rules/Sweden/Nemtel.rst
+share/apps/kppp/Rules/Sweden/RSLCom.rst
+share/apps/kppp/Rules/Sweden/RixTelecom.rst
+share/apps/kppp/Rules/Sweden/Supertel.rst
+share/apps/kppp/Rules/Sweden/SvenskTelekom.rst
+share/apps/kppp/Rules/Sweden/Tele1Europe.rst
+share/apps/kppp/Rules/Sweden/Tele2.rst
+share/apps/kppp/Rules/Sweden/Tele8.rst
+share/apps/kppp/Rules/Sweden/Telenordia.rst
+share/apps/kppp/Rules/Sweden/Telerian.rst
+share/apps/kppp/Rules/Sweden/Telia.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst
+share/apps/kppp/Rules/Sweden/Telitel.rst
+share/apps/kppp/Rules/Sweden/UniversalTelecom.rst
+share/apps/kppp/Rules/Sweden/Utfors.rst
+share/apps/kppp/Rules/Sweden/Vattenfall.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Internet.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
@@ -365,17 +321,6 @@ share/apps/ksirc/sirc.help.gz
share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
-share/apps/libksearch/ftp-sites/lycos.columbo
-share/apps/libksearch/people-sites/bigfoot.columbo
-share/apps/libksearch/people-sites/humboldt.columbo
-share/apps/libksearch/people-sites/nldap.columbo
-share/apps/libksearch/web-sites/altavista.columbo
-share/apps/libksearch/web-sites/cnn.columbo
-share/apps/libksearch/web-sites/excite.columbo
-share/apps/libksearch/web-sites/google.columbo
-share/apps/libksearch/web-sites/raging.columbo
-share/config/karchierc
-share/config/ktalkdrc
share/config/protocols/vnc.desktop
share/doc/HTML/en/caitoo/.anchors
share/doc/HTML/en/caitoo/addnew.html
@@ -422,25 +367,6 @@ share/doc/HTML/en/columbo/introduction.html
share/doc/HTML/en/columbo/nic-search.html
share/doc/HTML/en/columbo/plugins.html
share/doc/HTML/en/columbo/web-search.html
-share/doc/HTML/en/karchie/.anchors
-share/doc/HTML/en/karchie/advancedconfiguring.html
-share/doc/HTML/en/karchie/authorsandrecendversions.html
-share/doc/HTML/en/karchie/compilationandinstallation.html
-share/doc/HTML/en/karchie/draganddrop.html
-share/doc/HTML/en/karchie/featuresanddetails.html
-share/doc/HTML/en/karchie/frequentlyaskedquestionsandanswers.html
-share/doc/HTML/en/karchie/gettingkarchiestarted.html
-share/doc/HTML/en/karchie/index.cvlog
-share/doc/HTML/en/karchie/index.docbook
-share/doc/HTML/en/karchie/index.html
-share/doc/HTML/en/karchie/installation.html
-share/doc/HTML/en/karchie/introduction.html
-share/doc/HTML/en/karchie/karchie.html
-share/doc/HTML/en/karchie/keyboard.html
-share/doc/HTML/en/karchie/more.html
-share/doc/HTML/en/karchie/queryresults.html
-share/doc/HTML/en/karchie/startquery.html
-share/doc/HTML/en/karchie/xarchie.html
share/doc/HTML/en/kbiff/.anchors
share/doc/HTML/en/kbiff/checkmailnow.html
share/doc/HTML/en/kbiff/clickingonyouremailaddressinaboutdoesnothing.html
@@ -485,6 +411,7 @@ share/doc/HTML/en/kfinger/setupw.png
share/doc/HTML/en/kfinger/statusbar.html
share/doc/HTML/en/kfinger/toolbar.html
share/doc/HTML/en/kmail/.anchors
+share/doc/HTML/en/kmail/appearancetab.html
share/doc/HTML/en/kmail/composertab.html
share/doc/HTML/en/kmail/copyright.html
share/doc/HTML/en/kmail/documentation.html
@@ -495,6 +422,7 @@ share/doc/HTML/en/kmail/index.cvlog
share/doc/HTML/en/kmail/index.docbook
share/doc/HTML/en/kmail/index.html
share/doc/HTML/en/kmail/misctab.html
+share/doc/HTML/en/kmail/networktab.html
share/doc/HTML/en/kmail/seccustomizing.html
share/doc/HTML/en/kmail/secfolders.html
share/doc/HTML/en/kmail/secgettingstarted.html
@@ -540,20 +468,14 @@ share/doc/HTML/en/knu/themtrtab.html
share/doc/HTML/en/knu/thepingtab.html
share/doc/HTML/en/knu/thetraceroutetab.html
share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/authors.html
-share/doc/HTML/en/korn/command-lineoptions.html
-share/doc/HTML/en/korn/compilationandinstallation.html
-share/doc/HTML/en/korn/epilogue.html
-share/doc/HTML/en/korn/forwhomiskornwritten.html
-share/doc/HTML/en/korn/fundamentals.html
share/doc/HTML/en/korn/index.cvlog
share/doc/HTML/en/korn/index.docbook
share/doc/HTML/en/korn/index.html
-share/doc/HTML/en/korn/installation.html
share/doc/HTML/en/korn/introduction.html
-share/doc/HTML/en/korn/knownbugsandlimitations.html
-share/doc/HTML/en/korn/requirements.html
-share/doc/HTML/en/korn/whyisitnamedkorn.html
+share/doc/HTML/en/korn/licenses-and-credits.html
+share/doc/HTML/en/korn/the-display-tab.html
+share/doc/HTML/en/korn/the-new-dialog.html
+share/doc/HTML/en/korn/the-preferences-dialog.html
share/doc/HTML/en/kppp/.anchors
share/doc/HTML/en/kppp/BackGround.png
share/doc/HTML/en/kppp/accounting.html
@@ -642,24 +564,13 @@ share/doc/HTML/en/pws/index.html
share/doc/HTML/en/pws/installation.html
share/doc/HTML/en/pws/introduction.html
share/doc/HTML/en/pws/requirements.html
-share/icons/hicolor/22x22/actions/message_delete.png
-share/icons/hicolor/22x22/actions/message_forward.png
share/icons/hicolor/22x22/actions/message_get.png
-share/icons/hicolor/22x22/actions/message_reply.png
-share/icons/hicolor/22x22/actions/message_replyall.png
-share/icons/hicolor/32x32/actions/message_delete.png
-share/icons/hicolor/32x32/actions/message_forward.png
-share/icons/hicolor/32x32/actions/message_get.png
-share/icons/hicolor/32x32/actions/message_reply.png
-share/icons/hicolor/32x32/actions/message_replyall.png
-share/icons/hicolor/32x32/apps/karchie.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
share/icons/hicolor/32x32/apps/korn.png
share/icons/hicolor/32x32/apps/kppp.png
share/icons/hicolor/32x32/apps/ksirc.png
share/icons/hicolor/32x32/apps/ktalkd.png
-share/icons/hicolor/48x48/apps/karchie.png
share/icons/hicolor/48x48/apps/kit.png
share/icons/hicolor/48x48/apps/kmail.png
share/icons/hicolor/48x48/apps/korn.png
@@ -667,36 +578,31 @@ share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
share/icons/hicolor/48x48/apps/ktalkd.png
share/icons/locolor/16x16/actions/kit_anonwarning.png
+share/icons/locolor/16x16/actions/kit_away.png
share/icons/locolor/16x16/actions/kit_bold.png
+share/icons/locolor/16x16/actions/kit_group.png
share/icons/locolor/16x16/actions/kit_info.png
share/icons/locolor/16x16/actions/kit_logging.png
+share/icons/locolor/16x16/actions/kit_offline.png
+share/icons/locolor/16x16/actions/kit_online.png
share/icons/locolor/16x16/actions/kit_sound.png
share/icons/locolor/16x16/actions/kit_status.png
share/icons/locolor/16x16/actions/kit_timestamping.png
share/icons/locolor/16x16/actions/kit_warning.png
-share/icons/locolor/16x16/actions/message_delete.png
-share/icons/locolor/16x16/actions/message_forward.png
-share/icons/locolor/16x16/actions/message_get.png
-share/icons/locolor/16x16/actions/message_reply.png
-share/icons/locolor/16x16/actions/message_replyall.png
-share/icons/locolor/16x16/apps/karchie.png
share/icons/locolor/16x16/apps/kit.png
share/icons/locolor/16x16/apps/kmail.png
-share/icons/locolor/16x16/apps/knode.png
share/icons/locolor/16x16/apps/korn.png
share/icons/locolor/16x16/apps/kppp.png
share/icons/locolor/16x16/apps/ksirc.png
share/icons/locolor/16x16/apps/ktalkd.png
-share/icons/locolor/32x32/apps/karchie.png
share/icons/locolor/32x32/apps/kit.png
share/icons/locolor/32x32/apps/kmail.png
-share/icons/locolor/32x32/apps/knode.png
share/icons/locolor/32x32/apps/korn.png
share/icons/locolor/32x32/apps/kppp.png
share/icons/locolor/32x32/apps/ksirc.png
share/icons/locolor/32x32/apps/ktalkd.png
-share/mimelnk/application/x-columbo.desktop
share/sounds/ktalkd.wav
+@unexec sh -c 'for i in pws ktalkd ksirc kppp korn knu kmail kfinger kbiff columbo caitoo;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/pws
@dirrm share/doc/HTML/en/ktalkd
@dirrm share/doc/HTML/en/ksirc
@@ -706,14 +612,9 @@ share/sounds/ktalkd.wav
@dirrm share/doc/HTML/en/kmail
@dirrm share/doc/HTML/en/kfinger
@dirrm share/doc/HTML/en/kbiff
-@dirrm share/doc/HTML/en/karchie
@dirrm share/doc/HTML/en/columbo
@dirrm share/doc/HTML/en/caitoo
-@dirrm share/doc/HTML/en
-@dirrm share/apps/libksearch/web-sites
-@dirrm share/apps/libksearch/people-sites
-@dirrm share/apps/libksearch/ftp-sites
-@dirrm share/apps/libksearch
+@dirrm share/config/protocols
@dirrm share/apps/ksirc/pics
@dirrm share/apps/ksirc
@dirrm share/apps/kppp/pics
@@ -766,15 +667,7 @@ share/sounds/ktalkd.wav
@dirrm share/apps/kppp/Provider/Germany
@dirrm share/apps/kppp/Provider/Denmark
@dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/knode/toolbar
-@dirrm share/apps/knode/pics
-@dirrm share/apps/knode/filters
-@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
-@dirrm share/apps/kit/pics
@dirrm share/apps/kit
@dirrm share/apps/keystone
-@dirrm include/ksearch
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 2857c274dd51..5fc7c4f497d5 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -6,20 +6,17 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 20000724A
+PORTVERSION= 20000829A
CATEGORIES= net news kde
-MASTER_SITES= $(MASTER_SITE_LOCAL)
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MASTER_SITE_SUBDIR= will
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- QwSpriteField.8:${PORTSDIR}/converters/kdesupport2
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
-BROKEN= "Does not use current snapshot"
-WRKSRC= ${WRKDIR}/kdenetwork
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
USE_NEWGCC= yes
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index a19c3f52393f..6a197445ce00 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-20000724A.tar.bz2) = d4557cd2bfbfcea1803c035d4f5c6120
+MD5 (kdenetwork-20000829A.tar.bz2) = bb387eeed72e4a172e3e46719ef9e0fa
diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist
index c98d947947af..5eefae0f4ce7 100644
--- a/net/kdenetwork3/pkg-plist
+++ b/net/kdenetwork3/pkg-plist
@@ -1,9 +1,7 @@
bin/dsirc
-bin/karchie
bin/keystone
bin/kit
bin/kmail
-bin/knode
bin/korn
bin/kotalkd
bin/kppp
@@ -14,20 +12,13 @@ bin/ktalkd
bin/ktalkdlg
bin/mail.local
include/kmailIface.h
-include/ksearch/ftpsearch.h
-include/ksearch/peoplesearch.h
-include/ksearch/websearch.h
lib/ksirc.la
lib/ksirc.so
lib/libkcm_ktalkd.la
lib/libkcm_ktalkd.so
-lib/libksearch.la
-lib/libksearch.so.3
share/applnk/Internet/KMail.desktop
-share/applnk/Internet/KNode.desktop
share/applnk/Internet/KOrn.desktop
share/applnk/Internet/Kppp.desktop
-share/applnk/Internet/karchie.desktop
share/applnk/Internet/keystone.desktop
share/applnk/Internet/kit.desktop
share/applnk/Internet/kppplogview.desktop
@@ -35,10 +26,6 @@ share/applnk/Internet/ksirc.desktop
share/applnk/Settings/Network/kcmktalkd.desktop
share/apps/keystone/keystoneui.rc
share/apps/kit/eventsrc
-share/apps/kit/pics/kit_away.png
-share/apps/kit/pics/kit_group.png
-share/apps/kit/pics/kit_offline.png
-share/apps/kit/pics/kit_online.png
share/apps/kmail/kmcomposerui.rc
share/apps/kmail/kmmainwin.rc
share/apps/kmail/pics/abdown.png
@@ -67,57 +54,6 @@ share/apps/kmail/pics/pub_key_red.png
share/apps/kmail/pics/red-bullet.png
share/apps/kmail/pics/stopwatch.xbm
share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/knode/filters/1.fltr
-share/apps/knode/filters/2.fltr
-share/apps/knode/filters/3.fltr
-share/apps/knode/filters/4.fltr
-share/apps/knode/filters/5.fltr
-share/apps/knode/filters/6.fltr
-share/apps/knode/filters/filters.rc
-share/apps/knode/headers.rc
-share/apps/knode/kncomposerui.rc
-share/apps/knode/knodeui.rc
-share/apps/knode/knreaderui.rc
-share/apps/knode/pics/accmail.png
-share/apps/knode/pics/arrow_left.png
-share/apps/knode/pics/arrow_right.png
-share/apps/knode/pics/ctlart.png
-share/apps/knode/pics/eyes.png
-share/apps/knode/pics/fltrblue.png
-share/apps/knode/pics/fltrgrey.png
-share/apps/knode/pics/folder.png
-share/apps/knode/pics/greyball.png
-share/apps/knode/pics/greyballchk.png
-share/apps/knode/pics/group.png
-share/apps/knode/pics/groupkat.png
-share/apps/knode/pics/mail.png
-share/apps/knode/pics/newsubs.png
-share/apps/knode/pics/pen.png
-share/apps/knode/pics/posting.png
-share/apps/knode/pics/redball.png
-share/apps/knode/pics/redballchk.png
-share/apps/knode/pics/server.png
-share/apps/knode/pics/smile.png
-share/apps/knode/pics/snderr.png
-share/apps/knode/pics/stat_cncl.png
-share/apps/knode/pics/stat_edit.png
-share/apps/knode/pics/stat_saved.png
-share/apps/knode/pics/stat_sent.png
-share/apps/knode/toolbar/delete.png
-share/apps/knode/toolbar/dlall.png
-share/apps/knode/toolbar/filter.png
-share/apps/knode/toolbar/fwd.png
-share/apps/knode/toolbar/grpdlg.png
-share/apps/knode/toolbar/newmsg.png
-share/apps/knode/toolbar/nextart.png
-share/apps/knode/toolbar/nextthr.png
-share/apps/knode/toolbar/remail.png
-share/apps/knode/toolbar/reply.png
-share/apps/knode/toolbar/save.png
-share/apps/knode/toolbar/search.png
-share/apps/knode/toolbar/sendnow.png
-share/apps/knode/toolbar/settings.png
-share/apps/knode/toolbar/signature.png
share/apps/kppp/Provider/Austria/.directory
share/apps/kppp/Provider/Austria/Simon%032Media
share/apps/kppp/Provider/Denmark/.directory
@@ -162,6 +98,7 @@ share/apps/kppp/Rules/Austria/Minimum/Online.rst
share/apps/kppp/Rules/Austria/Standard/Local.rst
share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst
share/apps/kppp/Rules/Austria/Standard/Online.rst
+share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
share/apps/kppp/Rules/Bangladesh/ATT00007.rst
share/apps/kppp/Rules/Bangladesh/ATT00010.rst
share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
@@ -194,12 +131,15 @@ share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
share/apps/kppp/Rules/England/BritishTelecom_Local.rst
share/apps/kppp/Rules/England/BritishTelecom_National.rst
share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
-share/apps/kppp/Rules/France/Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
+share/apps/kppp/Rules/France/France_Telecom_National.rst
share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
share/apps/kppp/Rules/Germany/Addcom.rst
share/apps/kppp/Rules/Germany/CallOkaynet.rst
share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
+share/apps/kppp/Rules/Germany/MSN.rst
share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst
share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst
share/apps/kppp/Rules/Germany/Nikoma.rst
@@ -291,12 +231,28 @@ share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst
share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst
-share/apps/kppp/Rules/Sweden/Local.rst
-share/apps/kppp/Rules/Sweden/Local_Telebonus_1.rst
-share/apps/kppp/Rules/Sweden/Local_Telebonus_2.rst
-share/apps/kppp/Rules/Sweden/Long_Distance.rst
-share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_1.rst
-share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_2.rst
+share/apps/kppp/Rules/Sweden/ACN.rst
+share/apps/kppp/Rules/Sweden/Abonnera.rst
+share/apps/kppp/Rules/Sweden/Affinity-Crossnet.rst
+share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+share/apps/kppp/Rules/Sweden/Glocalnet.rst
+share/apps/kppp/Rules/Sweden/Nemtel.rst
+share/apps/kppp/Rules/Sweden/RSLCom.rst
+share/apps/kppp/Rules/Sweden/RixTelecom.rst
+share/apps/kppp/Rules/Sweden/Supertel.rst
+share/apps/kppp/Rules/Sweden/SvenskTelekom.rst
+share/apps/kppp/Rules/Sweden/Tele1Europe.rst
+share/apps/kppp/Rules/Sweden/Tele2.rst
+share/apps/kppp/Rules/Sweden/Tele8.rst
+share/apps/kppp/Rules/Sweden/Telenordia.rst
+share/apps/kppp/Rules/Sweden/Telerian.rst
+share/apps/kppp/Rules/Sweden/Telia.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst
+share/apps/kppp/Rules/Sweden/Telitel.rst
+share/apps/kppp/Rules/Sweden/UniversalTelecom.rst
+share/apps/kppp/Rules/Sweden/Utfors.rst
+share/apps/kppp/Rules/Sweden/Vattenfall.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Internet.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
@@ -365,17 +321,6 @@ share/apps/ksirc/sirc.help.gz
share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
-share/apps/libksearch/ftp-sites/lycos.columbo
-share/apps/libksearch/people-sites/bigfoot.columbo
-share/apps/libksearch/people-sites/humboldt.columbo
-share/apps/libksearch/people-sites/nldap.columbo
-share/apps/libksearch/web-sites/altavista.columbo
-share/apps/libksearch/web-sites/cnn.columbo
-share/apps/libksearch/web-sites/excite.columbo
-share/apps/libksearch/web-sites/google.columbo
-share/apps/libksearch/web-sites/raging.columbo
-share/config/karchierc
-share/config/ktalkdrc
share/config/protocols/vnc.desktop
share/doc/HTML/en/caitoo/.anchors
share/doc/HTML/en/caitoo/addnew.html
@@ -422,25 +367,6 @@ share/doc/HTML/en/columbo/introduction.html
share/doc/HTML/en/columbo/nic-search.html
share/doc/HTML/en/columbo/plugins.html
share/doc/HTML/en/columbo/web-search.html
-share/doc/HTML/en/karchie/.anchors
-share/doc/HTML/en/karchie/advancedconfiguring.html
-share/doc/HTML/en/karchie/authorsandrecendversions.html
-share/doc/HTML/en/karchie/compilationandinstallation.html
-share/doc/HTML/en/karchie/draganddrop.html
-share/doc/HTML/en/karchie/featuresanddetails.html
-share/doc/HTML/en/karchie/frequentlyaskedquestionsandanswers.html
-share/doc/HTML/en/karchie/gettingkarchiestarted.html
-share/doc/HTML/en/karchie/index.cvlog
-share/doc/HTML/en/karchie/index.docbook
-share/doc/HTML/en/karchie/index.html
-share/doc/HTML/en/karchie/installation.html
-share/doc/HTML/en/karchie/introduction.html
-share/doc/HTML/en/karchie/karchie.html
-share/doc/HTML/en/karchie/keyboard.html
-share/doc/HTML/en/karchie/more.html
-share/doc/HTML/en/karchie/queryresults.html
-share/doc/HTML/en/karchie/startquery.html
-share/doc/HTML/en/karchie/xarchie.html
share/doc/HTML/en/kbiff/.anchors
share/doc/HTML/en/kbiff/checkmailnow.html
share/doc/HTML/en/kbiff/clickingonyouremailaddressinaboutdoesnothing.html
@@ -485,6 +411,7 @@ share/doc/HTML/en/kfinger/setupw.png
share/doc/HTML/en/kfinger/statusbar.html
share/doc/HTML/en/kfinger/toolbar.html
share/doc/HTML/en/kmail/.anchors
+share/doc/HTML/en/kmail/appearancetab.html
share/doc/HTML/en/kmail/composertab.html
share/doc/HTML/en/kmail/copyright.html
share/doc/HTML/en/kmail/documentation.html
@@ -495,6 +422,7 @@ share/doc/HTML/en/kmail/index.cvlog
share/doc/HTML/en/kmail/index.docbook
share/doc/HTML/en/kmail/index.html
share/doc/HTML/en/kmail/misctab.html
+share/doc/HTML/en/kmail/networktab.html
share/doc/HTML/en/kmail/seccustomizing.html
share/doc/HTML/en/kmail/secfolders.html
share/doc/HTML/en/kmail/secgettingstarted.html
@@ -540,20 +468,14 @@ share/doc/HTML/en/knu/themtrtab.html
share/doc/HTML/en/knu/thepingtab.html
share/doc/HTML/en/knu/thetraceroutetab.html
share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/authors.html
-share/doc/HTML/en/korn/command-lineoptions.html
-share/doc/HTML/en/korn/compilationandinstallation.html
-share/doc/HTML/en/korn/epilogue.html
-share/doc/HTML/en/korn/forwhomiskornwritten.html
-share/doc/HTML/en/korn/fundamentals.html
share/doc/HTML/en/korn/index.cvlog
share/doc/HTML/en/korn/index.docbook
share/doc/HTML/en/korn/index.html
-share/doc/HTML/en/korn/installation.html
share/doc/HTML/en/korn/introduction.html
-share/doc/HTML/en/korn/knownbugsandlimitations.html
-share/doc/HTML/en/korn/requirements.html
-share/doc/HTML/en/korn/whyisitnamedkorn.html
+share/doc/HTML/en/korn/licenses-and-credits.html
+share/doc/HTML/en/korn/the-display-tab.html
+share/doc/HTML/en/korn/the-new-dialog.html
+share/doc/HTML/en/korn/the-preferences-dialog.html
share/doc/HTML/en/kppp/.anchors
share/doc/HTML/en/kppp/BackGround.png
share/doc/HTML/en/kppp/accounting.html
@@ -642,24 +564,13 @@ share/doc/HTML/en/pws/index.html
share/doc/HTML/en/pws/installation.html
share/doc/HTML/en/pws/introduction.html
share/doc/HTML/en/pws/requirements.html
-share/icons/hicolor/22x22/actions/message_delete.png
-share/icons/hicolor/22x22/actions/message_forward.png
share/icons/hicolor/22x22/actions/message_get.png
-share/icons/hicolor/22x22/actions/message_reply.png
-share/icons/hicolor/22x22/actions/message_replyall.png
-share/icons/hicolor/32x32/actions/message_delete.png
-share/icons/hicolor/32x32/actions/message_forward.png
-share/icons/hicolor/32x32/actions/message_get.png
-share/icons/hicolor/32x32/actions/message_reply.png
-share/icons/hicolor/32x32/actions/message_replyall.png
-share/icons/hicolor/32x32/apps/karchie.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
share/icons/hicolor/32x32/apps/korn.png
share/icons/hicolor/32x32/apps/kppp.png
share/icons/hicolor/32x32/apps/ksirc.png
share/icons/hicolor/32x32/apps/ktalkd.png
-share/icons/hicolor/48x48/apps/karchie.png
share/icons/hicolor/48x48/apps/kit.png
share/icons/hicolor/48x48/apps/kmail.png
share/icons/hicolor/48x48/apps/korn.png
@@ -667,36 +578,31 @@ share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
share/icons/hicolor/48x48/apps/ktalkd.png
share/icons/locolor/16x16/actions/kit_anonwarning.png
+share/icons/locolor/16x16/actions/kit_away.png
share/icons/locolor/16x16/actions/kit_bold.png
+share/icons/locolor/16x16/actions/kit_group.png
share/icons/locolor/16x16/actions/kit_info.png
share/icons/locolor/16x16/actions/kit_logging.png
+share/icons/locolor/16x16/actions/kit_offline.png
+share/icons/locolor/16x16/actions/kit_online.png
share/icons/locolor/16x16/actions/kit_sound.png
share/icons/locolor/16x16/actions/kit_status.png
share/icons/locolor/16x16/actions/kit_timestamping.png
share/icons/locolor/16x16/actions/kit_warning.png
-share/icons/locolor/16x16/actions/message_delete.png
-share/icons/locolor/16x16/actions/message_forward.png
-share/icons/locolor/16x16/actions/message_get.png
-share/icons/locolor/16x16/actions/message_reply.png
-share/icons/locolor/16x16/actions/message_replyall.png
-share/icons/locolor/16x16/apps/karchie.png
share/icons/locolor/16x16/apps/kit.png
share/icons/locolor/16x16/apps/kmail.png
-share/icons/locolor/16x16/apps/knode.png
share/icons/locolor/16x16/apps/korn.png
share/icons/locolor/16x16/apps/kppp.png
share/icons/locolor/16x16/apps/ksirc.png
share/icons/locolor/16x16/apps/ktalkd.png
-share/icons/locolor/32x32/apps/karchie.png
share/icons/locolor/32x32/apps/kit.png
share/icons/locolor/32x32/apps/kmail.png
-share/icons/locolor/32x32/apps/knode.png
share/icons/locolor/32x32/apps/korn.png
share/icons/locolor/32x32/apps/kppp.png
share/icons/locolor/32x32/apps/ksirc.png
share/icons/locolor/32x32/apps/ktalkd.png
-share/mimelnk/application/x-columbo.desktop
share/sounds/ktalkd.wav
+@unexec sh -c 'for i in pws ktalkd ksirc kppp korn knu kmail kfinger kbiff columbo caitoo;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/pws
@dirrm share/doc/HTML/en/ktalkd
@dirrm share/doc/HTML/en/ksirc
@@ -706,14 +612,9 @@ share/sounds/ktalkd.wav
@dirrm share/doc/HTML/en/kmail
@dirrm share/doc/HTML/en/kfinger
@dirrm share/doc/HTML/en/kbiff
-@dirrm share/doc/HTML/en/karchie
@dirrm share/doc/HTML/en/columbo
@dirrm share/doc/HTML/en/caitoo
-@dirrm share/doc/HTML/en
-@dirrm share/apps/libksearch/web-sites
-@dirrm share/apps/libksearch/people-sites
-@dirrm share/apps/libksearch/ftp-sites
-@dirrm share/apps/libksearch
+@dirrm share/config/protocols
@dirrm share/apps/ksirc/pics
@dirrm share/apps/ksirc
@dirrm share/apps/kppp/pics
@@ -766,15 +667,7 @@ share/sounds/ktalkd.wav
@dirrm share/apps/kppp/Provider/Germany
@dirrm share/apps/kppp/Provider/Denmark
@dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/knode/toolbar
-@dirrm share/apps/knode/pics
-@dirrm share/apps/knode/filters
-@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
-@dirrm share/apps/kit/pics
@dirrm share/apps/kit
@dirrm share/apps/keystone
-@dirrm include/ksearch
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 2857c274dd51..5fc7c4f497d5 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,20 +6,17 @@
#
PORTNAME= kdenetwork
-PORTVERSION= 20000724A
+PORTVERSION= 20000829A
CATEGORIES= net news kde
-MASTER_SITES= $(MASTER_SITE_LOCAL)
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MASTER_SITE_SUBDIR= will
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib \
qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
- kdecore.4:${PORTSDIR}/x11/kdelibs2 \
- QwSpriteField.8:${PORTSDIR}/converters/kdesupport2
+ kdecore.4:${PORTSDIR}/x11/kdelibs2
-BROKEN= "Does not use current snapshot"
-WRKSRC= ${WRKDIR}/kdenetwork
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
USE_NEWGCC= yes
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index a19c3f52393f..6a197445ce00 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1 +1 @@
-MD5 (kdenetwork-20000724A.tar.bz2) = d4557cd2bfbfcea1803c035d4f5c6120
+MD5 (kdenetwork-20000829A.tar.bz2) = bb387eeed72e4a172e3e46719ef9e0fa
diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist
index c98d947947af..5eefae0f4ce7 100644
--- a/net/kdenetwork4/pkg-plist
+++ b/net/kdenetwork4/pkg-plist
@@ -1,9 +1,7 @@
bin/dsirc
-bin/karchie
bin/keystone
bin/kit
bin/kmail
-bin/knode
bin/korn
bin/kotalkd
bin/kppp
@@ -14,20 +12,13 @@ bin/ktalkd
bin/ktalkdlg
bin/mail.local
include/kmailIface.h
-include/ksearch/ftpsearch.h
-include/ksearch/peoplesearch.h
-include/ksearch/websearch.h
lib/ksirc.la
lib/ksirc.so
lib/libkcm_ktalkd.la
lib/libkcm_ktalkd.so
-lib/libksearch.la
-lib/libksearch.so.3
share/applnk/Internet/KMail.desktop
-share/applnk/Internet/KNode.desktop
share/applnk/Internet/KOrn.desktop
share/applnk/Internet/Kppp.desktop
-share/applnk/Internet/karchie.desktop
share/applnk/Internet/keystone.desktop
share/applnk/Internet/kit.desktop
share/applnk/Internet/kppplogview.desktop
@@ -35,10 +26,6 @@ share/applnk/Internet/ksirc.desktop
share/applnk/Settings/Network/kcmktalkd.desktop
share/apps/keystone/keystoneui.rc
share/apps/kit/eventsrc
-share/apps/kit/pics/kit_away.png
-share/apps/kit/pics/kit_group.png
-share/apps/kit/pics/kit_offline.png
-share/apps/kit/pics/kit_online.png
share/apps/kmail/kmcomposerui.rc
share/apps/kmail/kmmainwin.rc
share/apps/kmail/pics/abdown.png
@@ -67,57 +54,6 @@ share/apps/kmail/pics/pub_key_red.png
share/apps/kmail/pics/red-bullet.png
share/apps/kmail/pics/stopwatch.xbm
share/apps/kmail/pics/stopwatchMask.xbm
-share/apps/knode/filters/1.fltr
-share/apps/knode/filters/2.fltr
-share/apps/knode/filters/3.fltr
-share/apps/knode/filters/4.fltr
-share/apps/knode/filters/5.fltr
-share/apps/knode/filters/6.fltr
-share/apps/knode/filters/filters.rc
-share/apps/knode/headers.rc
-share/apps/knode/kncomposerui.rc
-share/apps/knode/knodeui.rc
-share/apps/knode/knreaderui.rc
-share/apps/knode/pics/accmail.png
-share/apps/knode/pics/arrow_left.png
-share/apps/knode/pics/arrow_right.png
-share/apps/knode/pics/ctlart.png
-share/apps/knode/pics/eyes.png
-share/apps/knode/pics/fltrblue.png
-share/apps/knode/pics/fltrgrey.png
-share/apps/knode/pics/folder.png
-share/apps/knode/pics/greyball.png
-share/apps/knode/pics/greyballchk.png
-share/apps/knode/pics/group.png
-share/apps/knode/pics/groupkat.png
-share/apps/knode/pics/mail.png
-share/apps/knode/pics/newsubs.png
-share/apps/knode/pics/pen.png
-share/apps/knode/pics/posting.png
-share/apps/knode/pics/redball.png
-share/apps/knode/pics/redballchk.png
-share/apps/knode/pics/server.png
-share/apps/knode/pics/smile.png
-share/apps/knode/pics/snderr.png
-share/apps/knode/pics/stat_cncl.png
-share/apps/knode/pics/stat_edit.png
-share/apps/knode/pics/stat_saved.png
-share/apps/knode/pics/stat_sent.png
-share/apps/knode/toolbar/delete.png
-share/apps/knode/toolbar/dlall.png
-share/apps/knode/toolbar/filter.png
-share/apps/knode/toolbar/fwd.png
-share/apps/knode/toolbar/grpdlg.png
-share/apps/knode/toolbar/newmsg.png
-share/apps/knode/toolbar/nextart.png
-share/apps/knode/toolbar/nextthr.png
-share/apps/knode/toolbar/remail.png
-share/apps/knode/toolbar/reply.png
-share/apps/knode/toolbar/save.png
-share/apps/knode/toolbar/search.png
-share/apps/knode/toolbar/sendnow.png
-share/apps/knode/toolbar/settings.png
-share/apps/knode/toolbar/signature.png
share/apps/kppp/Provider/Austria/.directory
share/apps/kppp/Provider/Austria/Simon%032Media
share/apps/kppp/Provider/Denmark/.directory
@@ -162,6 +98,7 @@ share/apps/kppp/Rules/Austria/Minimum/Online.rst
share/apps/kppp/Rules/Austria/Standard/Local.rst
share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst
share/apps/kppp/Rules/Austria/Standard/Online.rst
+share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
share/apps/kppp/Rules/Bangladesh/ATT00007.rst
share/apps/kppp/Rules/Bangladesh/ATT00010.rst
share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
@@ -194,12 +131,15 @@ share/apps/kppp/Rules/England/BirminghamCable_SameTelco.rst
share/apps/kppp/Rules/England/BritishTelecom_Local.rst
share/apps/kppp/Rules/England/BritishTelecom_National.rst
share/apps/kppp/Rules/England/BritishTelecom_Regional.rst
-share/apps/kppp/Rules/France/Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local.rst
+share/apps/kppp/Rules/France/France_Telecom_Local_Primaliste_Internet.rst
+share/apps/kppp/Rules/France/France_Telecom_National.rst
share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
share/apps/kppp/Rules/Germany/Addcom.rst
share/apps/kppp/Rules/Germany/CallOkaynet.rst
share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
+share/apps/kppp/Rules/Germany/MSN.rst
share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst
share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst
share/apps/kppp/Rules/Germany/Nikoma.rst
@@ -291,12 +231,28 @@ share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst
share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst
-share/apps/kppp/Rules/Sweden/Local.rst
-share/apps/kppp/Rules/Sweden/Local_Telebonus_1.rst
-share/apps/kppp/Rules/Sweden/Local_Telebonus_2.rst
-share/apps/kppp/Rules/Sweden/Long_Distance.rst
-share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_1.rst
-share/apps/kppp/Rules/Sweden/Long_Distance_Telebonus_2.rst
+share/apps/kppp/Rules/Sweden/ACN.rst
+share/apps/kppp/Rules/Sweden/Abonnera.rst
+share/apps/kppp/Rules/Sweden/Affinity-Crossnet.rst
+share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+share/apps/kppp/Rules/Sweden/Glocalnet.rst
+share/apps/kppp/Rules/Sweden/Nemtel.rst
+share/apps/kppp/Rules/Sweden/RSLCom.rst
+share/apps/kppp/Rules/Sweden/RixTelecom.rst
+share/apps/kppp/Rules/Sweden/Supertel.rst
+share/apps/kppp/Rules/Sweden/SvenskTelekom.rst
+share/apps/kppp/Rules/Sweden/Tele1Europe.rst
+share/apps/kppp/Rules/Sweden/Tele2.rst
+share/apps/kppp/Rules/Sweden/Tele8.rst
+share/apps/kppp/Rules/Sweden/Telenordia.rst
+share/apps/kppp/Rules/Sweden/Telerian.rst
+share/apps/kppp/Rules/Sweden/Telia.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst
+share/apps/kppp/Rules/Sweden/Telitel.rst
+share/apps/kppp/Rules/Sweden/UniversalTelecom.rst
+share/apps/kppp/Rules/Sweden/Utfors.rst
+share/apps/kppp/Rules/Sweden/Vattenfall.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Internet.rst
share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
@@ -365,17 +321,6 @@ share/apps/ksirc/sirc.help.gz
share/apps/ksirc/small.pl
share/apps/ksirc/test.pl
share/apps/ksirc/tester.pl
-share/apps/libksearch/ftp-sites/lycos.columbo
-share/apps/libksearch/people-sites/bigfoot.columbo
-share/apps/libksearch/people-sites/humboldt.columbo
-share/apps/libksearch/people-sites/nldap.columbo
-share/apps/libksearch/web-sites/altavista.columbo
-share/apps/libksearch/web-sites/cnn.columbo
-share/apps/libksearch/web-sites/excite.columbo
-share/apps/libksearch/web-sites/google.columbo
-share/apps/libksearch/web-sites/raging.columbo
-share/config/karchierc
-share/config/ktalkdrc
share/config/protocols/vnc.desktop
share/doc/HTML/en/caitoo/.anchors
share/doc/HTML/en/caitoo/addnew.html
@@ -422,25 +367,6 @@ share/doc/HTML/en/columbo/introduction.html
share/doc/HTML/en/columbo/nic-search.html
share/doc/HTML/en/columbo/plugins.html
share/doc/HTML/en/columbo/web-search.html
-share/doc/HTML/en/karchie/.anchors
-share/doc/HTML/en/karchie/advancedconfiguring.html
-share/doc/HTML/en/karchie/authorsandrecendversions.html
-share/doc/HTML/en/karchie/compilationandinstallation.html
-share/doc/HTML/en/karchie/draganddrop.html
-share/doc/HTML/en/karchie/featuresanddetails.html
-share/doc/HTML/en/karchie/frequentlyaskedquestionsandanswers.html
-share/doc/HTML/en/karchie/gettingkarchiestarted.html
-share/doc/HTML/en/karchie/index.cvlog
-share/doc/HTML/en/karchie/index.docbook
-share/doc/HTML/en/karchie/index.html
-share/doc/HTML/en/karchie/installation.html
-share/doc/HTML/en/karchie/introduction.html
-share/doc/HTML/en/karchie/karchie.html
-share/doc/HTML/en/karchie/keyboard.html
-share/doc/HTML/en/karchie/more.html
-share/doc/HTML/en/karchie/queryresults.html
-share/doc/HTML/en/karchie/startquery.html
-share/doc/HTML/en/karchie/xarchie.html
share/doc/HTML/en/kbiff/.anchors
share/doc/HTML/en/kbiff/checkmailnow.html
share/doc/HTML/en/kbiff/clickingonyouremailaddressinaboutdoesnothing.html
@@ -485,6 +411,7 @@ share/doc/HTML/en/kfinger/setupw.png
share/doc/HTML/en/kfinger/statusbar.html
share/doc/HTML/en/kfinger/toolbar.html
share/doc/HTML/en/kmail/.anchors
+share/doc/HTML/en/kmail/appearancetab.html
share/doc/HTML/en/kmail/composertab.html
share/doc/HTML/en/kmail/copyright.html
share/doc/HTML/en/kmail/documentation.html
@@ -495,6 +422,7 @@ share/doc/HTML/en/kmail/index.cvlog
share/doc/HTML/en/kmail/index.docbook
share/doc/HTML/en/kmail/index.html
share/doc/HTML/en/kmail/misctab.html
+share/doc/HTML/en/kmail/networktab.html
share/doc/HTML/en/kmail/seccustomizing.html
share/doc/HTML/en/kmail/secfolders.html
share/doc/HTML/en/kmail/secgettingstarted.html
@@ -540,20 +468,14 @@ share/doc/HTML/en/knu/themtrtab.html
share/doc/HTML/en/knu/thepingtab.html
share/doc/HTML/en/knu/thetraceroutetab.html
share/doc/HTML/en/korn/.anchors
-share/doc/HTML/en/korn/authors.html
-share/doc/HTML/en/korn/command-lineoptions.html
-share/doc/HTML/en/korn/compilationandinstallation.html
-share/doc/HTML/en/korn/epilogue.html
-share/doc/HTML/en/korn/forwhomiskornwritten.html
-share/doc/HTML/en/korn/fundamentals.html
share/doc/HTML/en/korn/index.cvlog
share/doc/HTML/en/korn/index.docbook
share/doc/HTML/en/korn/index.html
-share/doc/HTML/en/korn/installation.html
share/doc/HTML/en/korn/introduction.html
-share/doc/HTML/en/korn/knownbugsandlimitations.html
-share/doc/HTML/en/korn/requirements.html
-share/doc/HTML/en/korn/whyisitnamedkorn.html
+share/doc/HTML/en/korn/licenses-and-credits.html
+share/doc/HTML/en/korn/the-display-tab.html
+share/doc/HTML/en/korn/the-new-dialog.html
+share/doc/HTML/en/korn/the-preferences-dialog.html
share/doc/HTML/en/kppp/.anchors
share/doc/HTML/en/kppp/BackGround.png
share/doc/HTML/en/kppp/accounting.html
@@ -642,24 +564,13 @@ share/doc/HTML/en/pws/index.html
share/doc/HTML/en/pws/installation.html
share/doc/HTML/en/pws/introduction.html
share/doc/HTML/en/pws/requirements.html
-share/icons/hicolor/22x22/actions/message_delete.png
-share/icons/hicolor/22x22/actions/message_forward.png
share/icons/hicolor/22x22/actions/message_get.png
-share/icons/hicolor/22x22/actions/message_reply.png
-share/icons/hicolor/22x22/actions/message_replyall.png
-share/icons/hicolor/32x32/actions/message_delete.png
-share/icons/hicolor/32x32/actions/message_forward.png
-share/icons/hicolor/32x32/actions/message_get.png
-share/icons/hicolor/32x32/actions/message_reply.png
-share/icons/hicolor/32x32/actions/message_replyall.png
-share/icons/hicolor/32x32/apps/karchie.png
share/icons/hicolor/32x32/apps/kit.png
share/icons/hicolor/32x32/apps/kmail.png
share/icons/hicolor/32x32/apps/korn.png
share/icons/hicolor/32x32/apps/kppp.png
share/icons/hicolor/32x32/apps/ksirc.png
share/icons/hicolor/32x32/apps/ktalkd.png
-share/icons/hicolor/48x48/apps/karchie.png
share/icons/hicolor/48x48/apps/kit.png
share/icons/hicolor/48x48/apps/kmail.png
share/icons/hicolor/48x48/apps/korn.png
@@ -667,36 +578,31 @@ share/icons/hicolor/48x48/apps/kppp.png
share/icons/hicolor/48x48/apps/ksirc.png
share/icons/hicolor/48x48/apps/ktalkd.png
share/icons/locolor/16x16/actions/kit_anonwarning.png
+share/icons/locolor/16x16/actions/kit_away.png
share/icons/locolor/16x16/actions/kit_bold.png
+share/icons/locolor/16x16/actions/kit_group.png
share/icons/locolor/16x16/actions/kit_info.png
share/icons/locolor/16x16/actions/kit_logging.png
+share/icons/locolor/16x16/actions/kit_offline.png
+share/icons/locolor/16x16/actions/kit_online.png
share/icons/locolor/16x16/actions/kit_sound.png
share/icons/locolor/16x16/actions/kit_status.png
share/icons/locolor/16x16/actions/kit_timestamping.png
share/icons/locolor/16x16/actions/kit_warning.png
-share/icons/locolor/16x16/actions/message_delete.png
-share/icons/locolor/16x16/actions/message_forward.png
-share/icons/locolor/16x16/actions/message_get.png
-share/icons/locolor/16x16/actions/message_reply.png
-share/icons/locolor/16x16/actions/message_replyall.png
-share/icons/locolor/16x16/apps/karchie.png
share/icons/locolor/16x16/apps/kit.png
share/icons/locolor/16x16/apps/kmail.png
-share/icons/locolor/16x16/apps/knode.png
share/icons/locolor/16x16/apps/korn.png
share/icons/locolor/16x16/apps/kppp.png
share/icons/locolor/16x16/apps/ksirc.png
share/icons/locolor/16x16/apps/ktalkd.png
-share/icons/locolor/32x32/apps/karchie.png
share/icons/locolor/32x32/apps/kit.png
share/icons/locolor/32x32/apps/kmail.png
-share/icons/locolor/32x32/apps/knode.png
share/icons/locolor/32x32/apps/korn.png
share/icons/locolor/32x32/apps/kppp.png
share/icons/locolor/32x32/apps/ksirc.png
share/icons/locolor/32x32/apps/ktalkd.png
-share/mimelnk/application/x-columbo.desktop
share/sounds/ktalkd.wav
+@unexec sh -c 'for i in pws ktalkd ksirc kppp korn knu kmail kfinger kbiff columbo caitoo;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/pws
@dirrm share/doc/HTML/en/ktalkd
@dirrm share/doc/HTML/en/ksirc
@@ -706,14 +612,9 @@ share/sounds/ktalkd.wav
@dirrm share/doc/HTML/en/kmail
@dirrm share/doc/HTML/en/kfinger
@dirrm share/doc/HTML/en/kbiff
-@dirrm share/doc/HTML/en/karchie
@dirrm share/doc/HTML/en/columbo
@dirrm share/doc/HTML/en/caitoo
-@dirrm share/doc/HTML/en
-@dirrm share/apps/libksearch/web-sites
-@dirrm share/apps/libksearch/people-sites
-@dirrm share/apps/libksearch/ftp-sites
-@dirrm share/apps/libksearch
+@dirrm share/config/protocols
@dirrm share/apps/ksirc/pics
@dirrm share/apps/ksirc
@dirrm share/apps/kppp/pics
@@ -766,15 +667,7 @@ share/sounds/ktalkd.wav
@dirrm share/apps/kppp/Provider/Germany
@dirrm share/apps/kppp/Provider/Denmark
@dirrm share/apps/kppp/Provider/Austria
-@dirrm share/apps/kppp/Provider
-@dirrm share/apps/kppp
-@dirrm share/apps/knode/toolbar
-@dirrm share/apps/knode/pics
-@dirrm share/apps/knode/filters
-@dirrm share/apps/knode
@dirrm share/apps/kmail/pics
@dirrm share/apps/kmail
-@dirrm share/apps/kit/pics
@dirrm share/apps/kit
@dirrm share/apps/keystone
-@dirrm include/ksearch
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/security/kgpg-kde4/pkg-plist
+++ b/security/kgpg-kde4/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/security/kwallet/pkg-plist
+++ b/security/kwallet/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 473eb031817c..a0b3728b1547 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= kdeutils
-PORTVERSION= 1.90
+PORTVERSION= 20000829A
CATEGORIES= misc kde
-MASTER_SITES= $(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= unstable/distribution/tar/src
+MASTER_SITES= http://www.physics.purdue.edu/~will/
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- kdecore.4:${PORTSDIR}/x11/kdelibs2
-
-BROKEN= "Does not compile/run properly"
+ kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ qt2.4:${PORTSDIR}/x11-toolkits/qt22
MOC?= ${X11BASE}/bin/moc2
USE_BZIP2= yes
-USE_QT2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
--with-qt-includes=${X11BASE}/include/qt2 \
--with-qt-libraries=${X11BASE}/lib
-CONFIGURE_ENV+= MOC="${MOC}"
+CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc" \
+ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -lqt2 -ljpeg -lstdc++ -lgcc"
USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 688e0274a449..6694e5bc9f40 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.90.tar.bz2) = 3fd9d5c14254dd0f3d45eeaa99c43da9
+MD5 (kdeutils-20000829A.tar.bz2) = f06b1a62abe9c52b6c257b71bcc2b32d
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index e337e8930d38..03b075385e46 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/pkg-plist
@@ -1,6 +1,4 @@
bin/ark
-bin/conttest
-bin/iconpackager
bin/kab
bin/karm
bin/kcalc
@@ -10,43 +8,36 @@ bin/kdessh
bin/kdf
bin/kedit
bin/kfind
+bin/kfloppy
bin/khexedit
bin/kjots
bin/klaptopdaemon
-bin/klipper
bin/kljettool
bin/klpq
bin/knotes
-bin/ktimemon
-bin/ktop
bin/kwikdisk
-bin/kwrite
-include/ccont.h
lib/kedit.la
lib/kedit.so.0
-lib/libccont.a
-lib/libkcm_fontmanager.la
-lib/libkcm_fontmanager.so
+lib/kfind.la
+lib/kfind.so
lib/libkcm_kdf.la
lib/libkcm_kdf.so
lib/libkcm_laptop.la
lib/libkcm_laptop.so
-share/applnk/Applications/KEdit.desktop
-share/applnk/Applications/kwrite.desktop
+lib/libktimemon.la
+lib/libktimemon.so.1
+share/applnk/Editors/KEdit.desktop
share/applnk/Kfind.desktop
share/applnk/Settings/Information/kcmdf.desktop
-share/applnk/Settings/Laptop/.directory
-share/applnk/Settings/Laptop/battery.desktop
-share/applnk/Settings/Laptop/bwarning.desktop
-share/applnk/Settings/Laptop/cwarning.desktop
-share/applnk/Settings/Laptop/pcmcia.desktop
-share/applnk/Settings/Laptop/power.desktop
-share/applnk/Settings/LookNFeel/fontmanager.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/ktop.desktop
share/applnk/System/kwikdisk.desktop
-share/applnk/Utilities/Iconpackager.desktop
share/applnk/Utilities/KCharSelect.desktop
+share/applnk/Utilities/KFloppy.desktop
share/applnk/Utilities/KLJetTool.desktop
share/applnk/Utilities/KLpq.desktop
share/applnk/Utilities/Kjots.desktop
@@ -56,23 +47,32 @@ share/applnk/Utilities/karm.desktop
share/applnk/Utilities/kcalc.desktop
share/applnk/Utilities/kdepasswd.desktop
share/applnk/Utilities/khexedit.desktop
-share/applnk/Utilities/klipper.desktop
share/applnk/Utilities/knotes.desktop
-share/applnk/Utilities/ktimemon.desktop
share/apps/ark/arkui.rc
-share/apps/ark/toolbar/ark_adddir.png
-share/apps/ark/toolbar/ark_addfile.png
-share/apps/ark/toolbar/ark_delete.png
-share/apps/ark/toolbar/ark_extract.png
-share/apps/ark/toolbar/ark_help.png
-share/apps/ark/toolbar/ark_new.png
-share/apps/ark/toolbar/ark_open.png
-share/apps/ark/toolbar/ark_options.png
-share/apps/ark/toolbar/ark_selectall.png
-share/apps/ark/toolbar/ark_view.png
+share/apps/ark/icons/locolor/22x22/actions/ark_adddir.png
+share/apps/ark/icons/locolor/22x22/actions/ark_addfile.png
+share/apps/ark/icons/locolor/22x22/actions/ark_delete.png
+share/apps/ark/icons/locolor/22x22/actions/ark_extract.png
+share/apps/ark/icons/locolor/22x22/actions/ark_help.png
+share/apps/ark/icons/locolor/22x22/actions/ark_new.png
+share/apps/ark/icons/locolor/22x22/actions/ark_open.png
+share/apps/ark/icons/locolor/22x22/actions/ark_options.png
+share/apps/ark/icons/locolor/22x22/actions/ark_selectall.png
+share/apps/ark/icons/locolor/22x22/actions/ark_view.png
share/apps/kab/pics/addressbook_logo.png
-share/apps/kab/template.config
-share/apps/kab/template.kab
+share/apps/karm/karmui.rc
+share/apps/karm/pics/clock.xpm
+share/apps/karm/pics/clockedit.xpm
+share/apps/karm/pics/empty-watch.xpm
+share/apps/karm/pics/filedel.xpm
+share/apps/karm/pics/watch-0.xpm
+share/apps/karm/pics/watch-1.xpm
+share/apps/karm/pics/watch-2.xpm
+share/apps/karm/pics/watch-3.xpm
+share/apps/karm/pics/watch-4.xpm
+share/apps/karm/pics/watch-5.xpm
+share/apps/karm/pics/watch-6.xpm
+share/apps/karm/pics/watch-7.xpm
share/apps/kcalc/pics/kcalclogo.png
share/apps/kedit/keditui.rc
share/apps/kedit/pics/colors.png
@@ -81,92 +81,57 @@ 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/toolbar/archive.png
-share/apps/kfind/toolbar/delete.png
-share/apps/kfind/toolbar/idea.png
-share/apps/kfind/toolbar/info.png
-share/apps/kfind/toolbar/openfile.png
-share/apps/kfind/toolbar/save.png
-share/apps/kfind/toolbar/search.png
-share/apps/khexedit/pics/colors.png
-share/apps/khexedit/pics/cursor.png
-share/apps/khexedit/pics/files.png
-share/apps/khexedit/pics/fonts.png
-share/apps/khexedit/pics/layout.png
-share/apps/khexedit/pics/misc.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
+share/apps/kfind/icons/locolor/22x22/actions/info.png
+share/apps/kfind/icons/locolor/22x22/actions/openfile.png
+share/apps/kfind/icons/locolor/22x22/actions/save.png
+share/apps/kfind/icons/locolor/22x22/actions/search.png
+share/apps/kfloppy/pics/kfloppylogo.png
share/apps/khexedit/toolbar/hexdrag.png
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/knotes/pics/knotesclose.png
share/apps/knotes/pics/knoteslogo.png
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
-share/apps/kwrite/kwrite_shell.rc
-share/config/klipperrc
+share/config/knotesrc
share/doc/HTML/en/ark/.anchors
-share/doc/HTML/en/ark/creatingandaddingfilestoarchives.html
-share/doc/HTML/en/ark/edit.html
-share/doc/HTML/en/ark/extractingarchives.html
-share/doc/HTML/en/ark/help.html
+share/doc/HTML/en/ark/actionmenu.html
+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/compilation.html
+share/doc/HTML/en/ark/credits.html
+share/doc/HTML/en/ark/editmenu.html
share/doc/HTML/en/ark/index.cvlog
share/doc/HTML/en/ark/index.docbook
share/doc/HTML/en/ark/index.html
share/doc/HTML/en/ark/installation.html
share/doc/HTML/en/ark/introduction.html
-share/doc/HTML/en/ark/onscreenfundamentals.html
-share/doc/HTML/en/ark/openingandviewingarchives.html
-share/doc/HTML/en/ark/options.html
share/doc/HTML/en/ark/requirements.html
-share/doc/HTML/en/ark/themenuentries.html
-share/doc/HTML/en/ark/workingwithfiles.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/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/author.html
-share/doc/HTML/en/karm/bugs.html
+share/doc/HTML/en/karm/credits.html
+share/doc/HTML/en/karm/general-use.html
share/doc/HTML/en/karm/index.cvlog
share/doc/HTML/en/karm/index.docbook
share/doc/HTML/en/karm/index.html
+share/doc/HTML/en/karm/installation.html
+share/doc/HTML/en/karm/interface.html
share/doc/HTML/en/karm/introduction.html
-share/doc/HTML/en/karm/karm.png
-share/doc/HTML/en/karm/usingtimetracker.html
+share/doc/HTML/en/karm/menus.html
+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/compilationandinstallation.html
@@ -195,33 +160,34 @@ 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/comments.html
-share/doc/HTML/en/kdf/features.html
-share/doc/HTML/en/kdf/generalsettings.html
-share/doc/HTML/en/kdf/icons.html
+share/doc/HTML/en/kdf/credits.html
share/doc/HTML/en/kdf/index.cvlog
share/doc/HTML/en/kdf/index.docbook
share/doc/HTML/en/kdf/index.html
-share/doc/HTML/en/kdf/kdiskfree.html
-share/doc/HTML/en/kdf/kwikdisk.html
-share/doc/HTML/en/kdf/umountcommands.html
+share/doc/HTML/en/kdf/installation.html
+share/doc/HTML/en/kdf/introduction.html
+share/doc/HTML/en/kdf/main-window.html
+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/compilationandinstallation.html
+share/doc/HTML/en/kedit/command-line-options.html
+share/doc/HTML/en/kedit/credits.html
share/doc/HTML/en/kedit/edit.html
-share/doc/HTML/en/kedit/editingfilesontheinternet.html
+share/doc/HTML/en/kedit/go.html
share/doc/HTML/en/kedit/help.html
share/doc/HTML/en/kedit/index.cvlog
share/doc/HTML/en/kedit/index.docbook
share/doc/HTML/en/kedit/index.html
-share/doc/HTML/en/kedit/installation.html
share/doc/HTML/en/kedit/introduction.html
share/doc/HTML/en/kedit/keybindings.html
-share/doc/HTML/en/kedit/onscreenfundamentals.html
-share/doc/HTML/en/kedit/options.html
-share/doc/HTML/en/kedit/printing.html
-share/doc/HTML/en/kedit/questionsandanswers.html
-share/doc/HTML/en/kedit/requirements.html
-share/doc/HTML/en/kedit/themenuentries.html
+share/doc/HTML/en/kedit/on-screen-fundamentals.html
+share/doc/HTML/en/kedit/pref-dialog.html
+share/doc/HTML/en/kedit/prefcolors.html
+share/doc/HTML/en/kedit/prefmisc.html
+share/doc/HTML/en/kedit/prefspellchecker.html
+share/doc/HTML/en/kedit/settings.html
+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/compilation-and-installation.html
@@ -241,67 +207,33 @@ share/doc/HTML/en/kfind/search-parameters-dialog.html
share/doc/HTML/en/kfind/themenuentries.html
share/doc/HTML/en/kfind/viewing-area.html
share/doc/HTML/en/kfloppy/.anchors
-share/doc/HTML/en/kfloppy/compilationandinstallation.html
-share/doc/HTML/en/kfloppy/copyright.html
-share/doc/HTML/en/kfloppy/density.html
-share/doc/HTML/en/kfloppy/filesystems.html
-share/doc/HTML/en/kfloppy/formattingdiskswithkfloppy.html
-share/doc/HTML/en/kfloppy/formattingoptions.html
+share/doc/HTML/en/kfloppy/buttons.html
+share/doc/HTML/en/kfloppy/command-line.html
+share/doc/HTML/en/kfloppy/credits.html
+share/doc/HTML/en/kfloppy/formatting-options.html
share/doc/HTML/en/kfloppy/index.cvlog
share/doc/HTML/en/kfloppy/index.docbook
share/doc/HTML/en/kfloppy/index.html
-share/doc/HTML/en/kfloppy/installation.html
share/doc/HTML/en/kfloppy/introduction.html
-share/doc/HTML/en/kfloppy/requirements.html
+share/doc/HTML/en/kfloppy/usingkfloppy.html
share/doc/HTML/en/khexedit/.anchors
-share/doc/HTML/en/khexedit/binary-filter.html
-share/doc/HTML/en/khexedit/bookmarks-menu.html
share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/changes.html
-share/doc/HTML/en/khexedit/character-table.html
-share/doc/HTML/en/khexedit/command-line-arguments.html
-share/doc/HTML/en/khexedit/compilation-and-installation.html
-share/doc/HTML/en/khexedit/copy-and-paste.html
-share/doc/HTML/en/khexedit/cursor-.html
-share/doc/HTML/en/khexedit/customizedialog.html
-share/doc/HTML/en/khexedit/documentlist.html
-share/doc/HTML/en/khexedit/documents-menu.html
-share/doc/HTML/en/khexedit/drag-and-drop-.html
+share/doc/HTML/en/khexedit/credits.html
+share/doc/HTML/en/khexedit/document-menu.html
share/doc/HTML/en/khexedit/edit-menu.html
-share/doc/HTML/en/khexedit/editing-files-on-the-internet-.html
-share/doc/HTML/en/khexedit/editorimage.html
-share/doc/HTML/en/khexedit/encoding.html
-share/doc/HTML/en/khexedit/export.html
-share/doc/HTML/en/khexedit/exported-html-is-sometimes-hard-to-inspect-i.html
-share/doc/HTML/en/khexedit/find-and-replace.html
-share/doc/HTML/en/khexedit/find.html
-share/doc/HTML/en/khexedit/font.html
share/doc/HTML/en/khexedit/help-menu.html
share/doc/HTML/en/khexedit/index.cvlog
share/doc/HTML/en/khexedit/index.docbook
share/doc/HTML/en/khexedit/index.html
-share/doc/HTML/en/khexedit/insert-pattern.html
share/doc/HTML/en/khexedit/installation.html
share/doc/HTML/en/khexedit/introduction.html
-share/doc/HTML/en/khexedit/key-bindings.html
-share/doc/HTML/en/khexedit/khexedit.png
-share/doc/HTML/en/khexedit/menu-entries.html
-share/doc/HTML/en/khexedit/miscellaneous.html
-share/doc/HTML/en/khexedit/optioncolor.html
-share/doc/HTML/en/khexedit/optionfile.html
-share/doc/HTML/en/khexedit/options-menu.html
-share/doc/HTML/en/khexedit/options.html
-share/doc/HTML/en/khexedit/page-layout.html
-share/doc/HTML/en/khexedit/printing-to-disk-using-postscript-takes-ages.html
-share/doc/HTML/en/khexedit/printing.html
-share/doc/HTML/en/khexedit/progress-indicator-and-management.html
-share/doc/HTML/en/khexedit/questions-answers-and-tips.html
-share/doc/HTML/en/khexedit/requirements.html
-share/doc/HTML/en/khexedit/select-indicator.html
-share/doc/HTML/en/khexedit/statistics.html
-share/doc/HTML/en/khexedit/string-extractor.html
+share/doc/HTML/en/khexedit/khexedit1.png
+share/doc/HTML/en/khexedit/menu-commands.html
+share/doc/HTML/en/khexedit/nutshell.html
+share/doc/HTML/en/khexedit/settings-menu.html
+share/doc/HTML/en/khexedit/starting-khexedit.html
+share/doc/HTML/en/khexedit/toolbar.html
share/doc/HTML/en/khexedit/tools-menu.html
-share/doc/HTML/en/khexedit/tools.html
share/doc/HTML/en/khexedit/view-menu.html
share/doc/HTML/en/kjots/.anchors
share/doc/HTML/en/kjots/index.cvlog
@@ -314,11 +246,11 @@ share/doc/HTML/en/kjots/todo.html
share/doc/HTML/en/kjots/usage.html
share/doc/HTML/en/kljettool/.anchors
share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/compilationandinstallation.html
-share/doc/HTML/en/kljettool/copyright.html
+share/doc/HTML/en/kljettool/compilation-and-installation.html
+share/doc/HTML/en/kljettool/credits.html
share/doc/HTML/en/kljettool/djcdoscommands.txt
share/doc/HTML/en/kljettool/filter
-share/doc/HTML/en/kljettool/gettingkljettooltowork.html
+share/doc/HTML/en/kljettool/getting-kljettool-to-work.html
share/doc/HTML/en/kljettool/hp690c.zip
share/doc/HTML/en/kljettool/index.cvlog
share/doc/HTML/en/kljettool/index.docbook
@@ -327,6 +259,7 @@ share/doc/HTML/en/kljettool/installation.html
share/doc/HTML/en/kljettool/introduction.html
share/doc/HTML/en/kljettool/magic
share/doc/HTML/en/kljettool/requirements.html
+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
@@ -369,19 +302,27 @@ 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/kpm/.anchors
-share/doc/HTML/en/kpm/appendix.html
-share/doc/HTML/en/kpm/generalinformation.html
+share/doc/HTML/en/kpm/commands.html
+share/doc/HTML/en/kpm/compilation.html
+share/doc/HTML/en/kpm/credits.html
+share/doc/HTML/en/kpm/faq.html
share/doc/HTML/en/kpm/index.cvlog
share/doc/HTML/en/kpm/index.docbook
share/doc/HTML/en/kpm/index.html
-share/doc/HTML/en/kpm/knownbugsandproblems.html
-share/doc/HTML/en/kpm/kpmmainwindow.html
-share/doc/HTML/en/kpm/legalstuff.html
-share/doc/HTML/en/kpm/processmenu.html
-share/doc/HTML/en/kpm/requirementsforkpm.html
-share/doc/HTML/en/kpm/signalmenu.html
-share/doc/HTML/en/kpm/themenu.html
-share/doc/HTML/en/kpm/viewmenu.html
+share/doc/HTML/en/kpm/installation.html
+share/doc/HTML/en/kpm/introduction.html
+share/doc/HTML/en/kpm/kpmjobs.png
+share/doc/HTML/en/kpm/kpmmemory.png
+share/doc/HTML/en/kpm/kpmstart.png
+share/doc/HTML/en/kpm/kpmtext.png
+share/doc/HTML/en/kpm/managing-processes.html
+share/doc/HTML/en/kpm/monitoring-processes.html
+share/doc/HTML/en/kpm/monitoring-resources.html
+share/doc/HTML/en/kpm/other-signals.html
+share/doc/HTML/en/kpm/qps.1
+share/doc/HTML/en/kpm/requirements.html
+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/config.html
@@ -412,51 +353,57 @@ share/doc/HTML/en/ktop/theprocesstreepage.html
share/doc/HTML/en/ktop/usingthekdetaskmanager.html
share/doc/HTML/en/kwrite/.anchors
share/doc/HTML/en/kwrite/bookmarks.html
-share/doc/HTML/en/kwrite/compilationandinstallation.html
+share/doc/HTML/en/kwrite/command-line-options.html
+share/doc/HTML/en/kwrite/credits.html
share/doc/HTML/en/kwrite/edit.html
-share/doc/HTML/en/kwrite/editingfilesontheinternet.html
share/doc/HTML/en/kwrite/help.html
share/doc/HTML/en/kwrite/index.cvlog
share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kwrite/index.docbook.eric
share/doc/HTML/en/kwrite/index.html
-share/doc/HTML/en/kwrite/installation.html
share/doc/HTML/en/kwrite/introduction.html
share/doc/HTML/en/kwrite/keybindings.html
-share/doc/HTML/en/kwrite/onscreenfundamentals.html
-share/doc/HTML/en/kwrite/options.html
-share/doc/HTML/en/kwrite/printing.html
-share/doc/HTML/en/kwrite/questionsandanswers.html
-share/doc/HTML/en/kwrite/requirements.html
-share/doc/HTML/en/kwrite/themenuentries.html
+share/doc/HTML/en/kwrite/on-screen-fundamentals.html
+share/doc/HTML/en/kwrite/pref-dialog.html
+share/doc/HTML/en/kwrite/pref-edit.html
+share/doc/HTML/en/kwrite/pref-highlighting.html
+share/doc/HTML/en/kwrite/pref-keybindings.html
+share/doc/HTML/en/kwrite/pref-select.html
+share/doc/HTML/en/kwrite/prefcolors.html
+share/doc/HTML/en/kwrite/prefspellchecker.html
+share/doc/HTML/en/kwrite/search.html
+share/doc/HTML/en/kwrite/settings.html
+share/doc/HTML/en/kwrite/the-menu-entries.html
+share/doc/HTML/en/kwrite/tools.html
share/icons/hicolor/32x32/apps/ark.png
share/icons/hicolor/32x32/apps/kab.png
share/icons/hicolor/32x32/apps/karm.png
share/icons/hicolor/32x32/apps/kcalc.png
share/icons/hicolor/32x32/apps/kedit.png
share/icons/hicolor/32x32/apps/kfind.png
-share/icons/hicolor/32x32/apps/kfontmanager.png
+share/icons/hicolor/32x32/apps/kfloppy.png
share/icons/hicolor/32x32/apps/khexedit.png
share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/klipper.png
share/icons/hicolor/32x32/apps/klpq.png
share/icons/hicolor/32x32/apps/knotes.png
-share/icons/hicolor/32x32/apps/ktop.png
-share/icons/hicolor/32x32/apps/kwrite.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/kedit.png
share/icons/hicolor/48x48/apps/kfind.png
-share/icons/hicolor/48x48/apps/kfontmanager.png
+share/icons/hicolor/48x48/apps/kfloppy.png
share/icons/hicolor/48x48/apps/khexedit.png
share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/klipper.png
share/icons/hicolor/48x48/apps/kljettool.png
share/icons/hicolor/48x48/apps/klpq.png
share/icons/hicolor/48x48/apps/knotes.png
-share/icons/hicolor/48x48/apps/ktop.png
-share/icons/hicolor/48x48/apps/kwrite.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
@@ -466,23 +413,20 @@ 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/kfontmanager.png
+share/icons/locolor/16x16/apps/kfloppy.png
share/icons/locolor/16x16/apps/khexedit.png
share/icons/locolor/16x16/apps/kjots.png
-share/icons/locolor/16x16/apps/klipper.png
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/ktop.png
share/icons/locolor/16x16/apps/kwikdisk.png
-share/icons/locolor/16x16/apps/kwrite.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/pcmcia.png
share/icons/locolor/16x16/apps/power.png
share/icons/locolor/16x16/devices/nfs_mount.png
share/icons/locolor/16x16/devices/nfs_unmount.png
@@ -494,53 +438,22 @@ share/icons/locolor/32x32/apps/kcmdf.png
share/icons/locolor/32x32/apps/kdf.png
share/icons/locolor/32x32/apps/kedit.png
share/icons/locolor/32x32/apps/kfind.png
-share/icons/locolor/32x32/apps/kfontmanager.png
+share/icons/locolor/32x32/apps/kfloppy.png
share/icons/locolor/32x32/apps/khexedit.png
share/icons/locolor/32x32/apps/kjots.png
-share/icons/locolor/32x32/apps/klipper.png
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/ktop.png
share/icons/locolor/32x32/apps/kwikdisk.png
-share/icons/locolor/32x32/apps/kwrite.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/pcmcia.png
share/icons/locolor/32x32/apps/power.png
-share/toolbar/filedel.xpm
-@unexec rm -f %D/share/doc/HTML/en/ark/common
-@unexec rm -f %D/share/doc/HTML/en/kab/common
-@unexec rm -f %D/share/doc/HTML/en/karm/common
-@unexec rm -f %D/share/doc/HTML/en/kcalc/common
-@unexec rm -f %D/share/doc/HTML/en/kdf/common
-@unexec rm -f %D/share/doc/HTML/en/kedit/common
-@unexec rm -f %D/share/doc/HTML/en/kfind/common
-@unexec rm -f %D/share/doc/HTML/en/kfloppy/common
-@unexec rm -f %D/share/doc/HTML/en/khexedit/common
-@unexec rm -f %D/share/doc/HTML/en/kjots/common
-@unexec rm -f %D/share/doc/HTML/en/kljettool/common
-@unexec rm -f %D/share/doc/HTML/en/klpq/common
-@unexec rm -f %D/share/doc/HTML/en/knotes/common
-@unexec rm -f %D/share/doc/HTML/en/kpm/common
-@unexec rm -f %D/share/doc/HTML/en/ktimemon/common
-@unexec rm -f %D/share/doc/HTML/en/ktop/common
-@unexec rm -f %D/share/doc/HTML/en/kwrite/common
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/devices
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor
+@unexec sh -c 'for i in ark kab karm kcalc kdf kedit kfind kfloppy khexedit kpm kwrite kjots klpq kljettool knotes ktimemon ktop;do rm %D/share/doc/HTML/en/${i}/common;done'
@dirrm share/doc/HTML/en/kwrite
@dirrm share/doc/HTML/en/ktop
@dirrm share/doc/HTML/en/ktimemon
@@ -558,9 +471,6 @@ share/toolbar/filedel.xpm
@dirrm share/doc/HTML/en/karm
@dirrm share/doc/HTML/en/kab
@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/kwrite
-@dirrm share/apps/ktop/pics
-@dirrm share/apps/ktop
@dirrm share/apps/knotes/pics
@dirrm share/apps/knotes
@dirrm share/apps/kljetool/pics
@@ -568,16 +478,24 @@ share/toolbar/filedel.xpm
@dirrm share/apps/kjots/pics
@dirrm share/apps/kjots
@dirrm share/apps/khexedit/toolbar
-@dirrm share/apps/khexedit/pics
@dirrm share/apps/khexedit
-@dirrm share/apps/kfind/toolbar
+@dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
+@dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
@dirrm share/apps/kfind
@dirrm share/apps/kedit/toolbar
@dirrm share/apps/kedit/pics
@dirrm share/apps/kedit
@dirrm share/apps/kcalc/pics
@dirrm share/apps/kcalc
+@dirrm share/apps/karm/pics
+@dirrm share/apps/karm
@dirrm share/apps/kab/pics
-@dirrm share/apps/kab
-@dirrm share/apps/ark/toolbar
+@dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
+@dirrm share/apps/ark/icons/locolor
+@dirrm share/apps/ark/icons
@dirrm share/apps/ark
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index b4e9b873c299..2aa49b5eda4b 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -14,9 +14,12 @@ EXTRACT_ONLY= # empty
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ ksearch.3:${PORTSDIR}/net/kdenetwork2
RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \
- kjumpingcube:${PORTSDIR}/games/kdegames2
+ kjumpingcube:${PORTSDIR}/games/kdegames2 \
+ kdf:${PORTSDIR}/misc/kdeutils2 \
+ kword:${PORTSDIR}/editors/koffice
NO_BUILD= yes
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index b4e9b873c299..2aa49b5eda4b 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -14,9 +14,12 @@ EXTRACT_ONLY= # empty
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ ksearch.3:${PORTSDIR}/net/kdenetwork2
RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \
- kjumpingcube:${PORTSDIR}/games/kdegames2
+ kjumpingcube:${PORTSDIR}/games/kdegames2 \
+ kdf:${PORTSDIR}/misc/kdeutils2 \
+ kword:${PORTSDIR}/editors/koffice
NO_BUILD= yes
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index b4e9b873c299..2aa49b5eda4b 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -14,9 +14,12 @@ EXTRACT_ONLY= # empty
MAINTAINER= will@FreeBSD.org
-LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2
+LIB_DEPENDS= kdecore.4:${PORTSDIR}/x11/kdelibs2 \
+ ksearch.3:${PORTSDIR}/net/kdenetwork2
RUN_DEPENDS= konqueror:${PORTSDIR}/x11/kdebase2 \
- kjumpingcube:${PORTSDIR}/games/kdegames2
+ kjumpingcube:${PORTSDIR}/games/kdegames2 \
+ kdf:${PORTSDIR}/misc/kdeutils2 \
+ kword:${PORTSDIR}/editors/koffice
NO_BUILD= yes