Update to QT 2.2.1 / KDE 2.0 final release. At last! What a long road...

All KDE2 ports now use default USE_QT2. Still todo: Merge in MTREE stuff.

3 files changed, 44 insertions, 89 deletions

diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 8d663c89be7b..7028ea9bcd80 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	1.94
+PORTVERSION=	2.0
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	unstable/distribution/2.0Beta5/tar/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kdecore.4:${PORTSDIR}/x11/kdelibs2 \
-		qt2.4:${PORTSDIR}/x11-toolkits/qt22
+		kdecore.4:${PORTSDIR}/x11/kdelibs2
 
+USE_QT2=	yes
 MOC?=		${X11BASE}/bin/moc2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index bd41c46cb806..4ecdaf0a64ec 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1 +1 @@
-MD5 (kdeutils-1.94.tar.bz2) = f53d885f089a88bb3adbb3d7f0f752fe
+MD5 (kdeutils-2.0.tar.bz2) = 1d0ce54af511f44402b3758f386fcfa5
diff --git a/misc/kdeutils4/pkg-plist b/misc/kdeutils4/pkg-plist
index b7d52a17fd29..14d99bc1caf8 100644
--- a/misc/kdeutils4/pkg-plist
+++ b/misc/kdeutils4/pkg-plist
@@ -5,7 +5,6 @@ bin/kcalc
 bin/kcharselect
 bin/kdepasswd
 bin/kdessh
-bin/kdf
 bin/kedit
 bin/kfind
 bin/kfloppy
@@ -15,29 +14,21 @@ bin/klaptopdaemon
 bin/kljettool
 bin/klpq
 bin/knotes
-bin/kwikdisk
 lib/kedit.la
-lib/kedit.so
 lib/kedit.so.0
 lib/kfind.la
 lib/kfind.so
-lib/libkcm_kdf.la
-lib/libkcm_kdf.so
 lib/libkcm_laptop.la
 lib/libkcm_laptop.so
 lib/libktimemon.la
-lib/libktimemon.so
 lib/libktimemon.so.1
 share/applnk/Editors/KEdit.desktop
 share/applnk/Kfind.desktop
-share/applnk/Settings/Information/kcmdf.desktop
 share/applnk/Settings/Information/pcmcia.desktop
 share/applnk/Settings/PowerControl/battery.desktop
 share/applnk/Settings/PowerControl/bwarning.desktop
 share/applnk/Settings/PowerControl/cwarning.desktop
 share/applnk/Settings/PowerControl/power.desktop
-share/applnk/System/kdf.desktop
-share/applnk/System/kwikdisk.desktop
 share/applnk/Utilities/KCharSelect.desktop
 share/applnk/Utilities/KFloppy.desktop
 share/applnk/Utilities/KLJetTool.desktop
@@ -82,7 +73,6 @@ share/apps/kedit/pics/fonts.png
 share/apps/kedit/pics/keditlogo.png
 share/apps/kedit/pics/misc.png
 share/apps/kedit/toolbar/filenew2.png
-share/apps/kedit/toolbar/send.png
 share/apps/kfind/icons/locolor/22x22/actions/archive.png
 share/apps/kfind/icons/locolor/22x22/actions/delete.png
 share/apps/kfind/icons/locolor/22x22/actions/idea.png
@@ -96,7 +86,15 @@ share/apps/khexedit/toolbar/hexmask.png
 share/apps/khexedit/toolbar/hexwrite.png
 share/apps/kicker/applets/ktimemon.desktop
 share/apps/kjots/pics/filedel.png
-share/apps/kljetool/pics/kljetlogo.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/locolor/32x32/actions/power.png
+share/apps/kljettool/pics/kljetlogo.png
 share/apps/knotes/pics/knotesclose.png
 share/apps/knotes/pics/knoteslogo.png
 share/config/knotesrc
@@ -106,7 +104,6 @@ share/doc/HTML/en/ark/ark-create.html
 share/doc/HTML/en/ark/ark-extract.html
 share/doc/HTML/en/ark/ark-work-files.html
 share/doc/HTML/en/ark/commands.html
-share/doc/HTML/en/ark/common
 share/doc/HTML/en/ark/compilation.html
 share/doc/HTML/en/ark/credits.html
 share/doc/HTML/en/ark/editmenu.html
@@ -118,13 +115,11 @@ share/doc/HTML/en/ark/requirements.html
 share/doc/HTML/en/ark/settingsmenu.html
 share/doc/HTML/en/ark/using-ark.html
 share/doc/HTML/en/kab/.anchors
-share/doc/HTML/en/kab/common
 share/doc/HTML/en/kab/index.cvlog
 share/doc/HTML/en/kab/index.docbook
 share/doc/HTML/en/kab/index.html
 share/doc/HTML/en/kab/temp.html
 share/doc/HTML/en/karm/.anchors
-share/doc/HTML/en/karm/common
 share/doc/HTML/en/karm/credits.html
 share/doc/HTML/en/karm/general-use.html
 share/doc/HTML/en/karm/index.docbook
@@ -137,7 +132,6 @@ share/doc/HTML/en/karm/status-bar.html
 share/doc/HTML/en/karm/using-karm.html
 share/doc/HTML/en/kcalc/.anchors
 share/doc/HTML/en/kcalc/commentsonspecificfunctions.html
-share/doc/HTML/en/kcalc/common
 share/doc/HTML/en/kcalc/compilationandinstallation.html
 share/doc/HTML/en/kcalc/copyright.html
 share/doc/HTML/en/kcalc/cutandpaste.html
@@ -164,7 +158,6 @@ share/doc/HTML/en/kcalc/trigonometricmode.html
 share/doc/HTML/en/kcalc/usage.html
 share/doc/HTML/en/kcalc/whataboutprecision.html
 share/doc/HTML/en/kdf/.anchors
-share/doc/HTML/en/kdf/common
 share/doc/HTML/en/kdf/credits.html
 share/doc/HTML/en/kdf/index.docbook
 share/doc/HTML/en/kdf/index.html
@@ -175,7 +168,6 @@ share/doc/HTML/en/kdf/the-menus.html
 share/doc/HTML/en/kdf/using-kdf.html
 share/doc/HTML/en/kedit/.anchors
 share/doc/HTML/en/kedit/command-line-options.html
-share/doc/HTML/en/kedit/common
 share/doc/HTML/en/kedit/credits.html
 share/doc/HTML/en/kedit/edit.html
 share/doc/HTML/en/kedit/go.html
@@ -194,7 +186,6 @@ share/doc/HTML/en/kedit/the-menu-entries.html
 share/doc/HTML/en/kedit/tools.html
 share/doc/HTML/en/kfind/.anchors
 share/doc/HTML/en/kfind/authors.html
-share/doc/HTML/en/kfind/common
 share/doc/HTML/en/kfind/compilation-and-installation.html
 share/doc/HTML/en/kfind/configuration.html
 share/doc/HTML/en/kfind/edit.html
@@ -213,7 +204,6 @@ share/doc/HTML/en/kfind/viewing-area.html
 share/doc/HTML/en/kfloppy/.anchors
 share/doc/HTML/en/kfloppy/buttons.html
 share/doc/HTML/en/kfloppy/command-line.html
-share/doc/HTML/en/kfloppy/common
 share/doc/HTML/en/kfloppy/credits.html
 share/doc/HTML/en/kfloppy/formatting-options.html
 share/doc/HTML/en/kfloppy/index.docbook
@@ -222,7 +212,6 @@ share/doc/HTML/en/kfloppy/introduction.html
 share/doc/HTML/en/kfloppy/usingkfloppy.html
 share/doc/HTML/en/khexedit/.anchors
 share/doc/HTML/en/khexedit/bookmarks.html
-share/doc/HTML/en/khexedit/common
 share/doc/HTML/en/khexedit/credits.html
 share/doc/HTML/en/khexedit/document-menu.html
 share/doc/HTML/en/khexedit/edit-menu.html
@@ -240,7 +229,6 @@ share/doc/HTML/en/khexedit/toolbar.html
 share/doc/HTML/en/khexedit/tools-menu.html
 share/doc/HTML/en/khexedit/view-menu.html
 share/doc/HTML/en/kjots/.anchors
-share/doc/HTML/en/kjots/common
 share/doc/HTML/en/kjots/index.cvlog
 share/doc/HTML/en/kjots/index.docbook
 share/doc/HTML/en/kjots/index.html
@@ -249,22 +237,8 @@ share/doc/HTML/en/kjots/keyboardshortcuts.html
 share/doc/HTML/en/kjots/subjectlist.html
 share/doc/HTML/en/kjots/todo.html
 share/doc/HTML/en/kjots/usage.html
-share/doc/HTML/en/klipper/.anchors
-share/doc/HTML/en/klipper/actions.html
-share/doc/HTML/en/klipper/common
-share/doc/HTML/en/klipper/compilation.html
-share/doc/HTML/en/klipper/configuration.html
-share/doc/HTML/en/klipper/credits.html
-share/doc/HTML/en/klipper/index.docbook
-share/doc/HTML/en/klipper/index.html
-share/doc/HTML/en/klipper/installation.html
-share/doc/HTML/en/klipper/introduction.html
-share/doc/HTML/en/klipper/requirements.html
-share/doc/HTML/en/klipper/screenshot.png
-share/doc/HTML/en/klipper/using-klipper.html
 share/doc/HTML/en/kljettool/.anchors
 share/doc/HTML/en/kljettool/README
-share/doc/HTML/en/kljettool/common
 share/doc/HTML/en/kljettool/compilation-and-installation.html
 share/doc/HTML/en/kljettool/credits.html
 share/doc/HTML/en/kljettool/djcdoscommands.txt
@@ -281,7 +255,6 @@ share/doc/HTML/en/kljettool/screenshot.png
 share/doc/HTML/en/kljettool/usage.html
 share/doc/HTML/en/klpq/.anchors
 share/doc/HTML/en/klpq/author.html
-share/doc/HTML/en/klpq/common
 share/doc/HTML/en/klpq/compilation-and-installation.html
 share/doc/HTML/en/klpq/index.docbook
 share/doc/HTML/en/klpq/index.html
@@ -293,38 +266,30 @@ share/doc/HTML/en/klpq/spooler-dialog.html
 share/doc/HTML/en/klpq/todo.html
 share/doc/HTML/en/klpq/usage.html
 share/doc/HTML/en/knotes/.anchors
-share/doc/HTML/en/knotes/alarm.html
-share/doc/HTML/en/knotes/autoindent.html
-share/doc/HTML/en/knotes/calendar.html
-share/doc/HTML/en/knotes/clear.html
-share/doc/HTML/en/knotes/colors.html
-share/doc/HTML/en/knotes/common
-share/doc/HTML/en/knotes/compilationandinstallation.html
-share/doc/HTML/en/knotes/deleteknote.html
-share/doc/HTML/en/knotes/dframe.html
-share/doc/HTML/en/knotes/doubleclickonurls.html
-share/doc/HTML/en/knotes/font.html
-share/doc/HTML/en/knotes/index.cvlog
+share/doc/HTML/en/knotes/compilation.html
+share/doc/HTML/en/knotes/configuration.html
+share/doc/HTML/en/knotes/credits.html
+share/doc/HTML/en/knotes/customizingactions.html
+share/doc/HTML/en/knotes/customizingdisplay.html
+share/doc/HTML/en/knotes/customizingeditor.html
+share/doc/HTML/en/knotes/deleting-a-note.html
+share/doc/HTML/en/knotes/desktop-functions.html
+share/doc/HTML/en/knotes/displaying-notes.html
+share/doc/HTML/en/knotes/hiding-a-note.html
 share/doc/HTML/en/knotes/index.docbook
 share/doc/HTML/en/knotes/index.html
+share/doc/HTML/en/knotes/inserting-the-date.html
 share/doc/HTML/en/knotes/installation.html
 share/doc/HTML/en/knotes/introduction.html
-share/doc/HTML/en/knotes/keybindings.html
-share/doc/HTML/en/knotes/mailnote.html
-share/doc/HTML/en/knotes/newknote.html
-share/doc/HTML/en/knotes/onscreenfundamentals.html
-share/doc/HTML/en/knotes/printing.html
-share/doc/HTML/en/knotes/printnote.html
-share/doc/HTML/en/knotes/questionsandanswers.html
-share/doc/HTML/en/knotes/quit.html
-share/doc/HTML/en/knotes/renameknote.html
+share/doc/HTML/en/knotes/mailing-a-note.html
+share/doc/HTML/en/knotes/printing-a-note.html
+share/doc/HTML/en/knotes/quit-knotes.html
+share/doc/HTML/en/knotes/renaming-a-note.html
 share/doc/HTML/en/knotes/requirements.html
-share/doc/HTML/en/knotes/resizingknotes.html
-share/doc/HTML/en/knotes/setdefaults.html
-share/doc/HTML/en/knotes/themenuentries.html
+share/doc/HTML/en/knotes/typing-the-note.html
+share/doc/HTML/en/knotes/using-knotes.html
 share/doc/HTML/en/kpm/.anchors
 share/doc/HTML/en/kpm/commands.html
-share/doc/HTML/en/kpm/common
 share/doc/HTML/en/kpm/compilation.html
 share/doc/HTML/en/kpm/credits.html
 share/doc/HTML/en/kpm/faq.html
@@ -347,7 +312,6 @@ share/doc/HTML/en/kpm/signals.html
 share/doc/HTML/en/kpm/using-kpm.html
 share/doc/HTML/en/ktimemon/.anchors
 share/doc/HTML/en/ktimemon/autoscaling.html
-share/doc/HTML/en/ktimemon/common
 share/doc/HTML/en/ktimemon/config.html
 share/doc/HTML/en/ktimemon/fund.html
 share/doc/HTML/en/ktimemon/index.cvlog
@@ -371,11 +335,11 @@ share/icons/hicolor/32x32/apps/klpq.png
 share/icons/hicolor/32x32/apps/knotes.png
 share/icons/hicolor/32x32/apps/laptop_battery.png
 share/icons/hicolor/32x32/apps/laptop_pcmcia.png
-share/icons/hicolor/32x32/apps/laptop_settings.png
 share/icons/hicolor/48x48/apps/ark.png
 share/icons/hicolor/48x48/apps/kab.png
 share/icons/hicolor/48x48/apps/karm.png
 share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kcharselect.png
 share/icons/hicolor/48x48/apps/kedit.png
 share/icons/hicolor/48x48/apps/kfind.png
 share/icons/hicolor/48x48/apps/kfloppy.png
@@ -386,14 +350,11 @@ share/icons/hicolor/48x48/apps/klpq.png
 share/icons/hicolor/48x48/apps/knotes.png
 share/icons/hicolor/48x48/apps/laptop_battery.png
 share/icons/hicolor/48x48/apps/laptop_pcmcia.png
-share/icons/hicolor/48x48/apps/laptop_settings.png
 share/icons/locolor/16x16/apps/ark.png
 share/icons/locolor/16x16/apps/kab.png
 share/icons/locolor/16x16/apps/karm.png
 share/icons/locolor/16x16/apps/kcalc.png
 share/icons/locolor/16x16/apps/kcharselect.png
-share/icons/locolor/16x16/apps/kcmdf.png
-share/icons/locolor/16x16/apps/kdf.png
 share/icons/locolor/16x16/apps/kedit.png
 share/icons/locolor/16x16/apps/kfind.png
 share/icons/locolor/16x16/apps/kfloppy.png
@@ -403,22 +364,13 @@ share/icons/locolor/16x16/apps/kljettool.png
 share/icons/locolor/16x16/apps/klpq.png
 share/icons/locolor/16x16/apps/knotes.png
 share/icons/locolor/16x16/apps/ktimemon.png
-share/icons/locolor/16x16/apps/kwikdisk.png
 share/icons/locolor/16x16/apps/laptop_battery.png
-share/icons/locolor/16x16/apps/laptop_charge.png
-share/icons/locolor/16x16/apps/laptop_nobattery.png
-share/icons/locolor/16x16/apps/laptop_nocharge.png
 share/icons/locolor/16x16/apps/laptop_pcmcia.png
-share/icons/locolor/16x16/apps/laptop_settings.png
-share/icons/locolor/16x16/apps/power.png
-share/icons/locolor/16x16/devices/nfs_mount.png
-share/icons/locolor/16x16/devices/nfs_unmount.png
 share/icons/locolor/32x32/apps/ark.png
 share/icons/locolor/32x32/apps/kab.png
 share/icons/locolor/32x32/apps/karm.png
 share/icons/locolor/32x32/apps/kcalc.png
-share/icons/locolor/32x32/apps/kcmdf.png
-share/icons/locolor/32x32/apps/kdf.png
+share/icons/locolor/32x32/apps/kcharselect.png
 share/icons/locolor/32x32/apps/kedit.png
 share/icons/locolor/32x32/apps/kfind.png
 share/icons/locolor/32x32/apps/kfloppy.png
@@ -428,20 +380,13 @@ share/icons/locolor/32x32/apps/kljettool.png
 share/icons/locolor/32x32/apps/klpq.png
 share/icons/locolor/32x32/apps/knotes.png
 share/icons/locolor/32x32/apps/ktimemon.png
-share/icons/locolor/32x32/apps/kwikdisk.png
 share/icons/locolor/32x32/apps/laptop_battery.png
-share/icons/locolor/32x32/apps/laptop_charge.png
-share/icons/locolor/32x32/apps/laptop_nobattery.png
-share/icons/locolor/32x32/apps/laptop_nocharge.png
 share/icons/locolor/32x32/apps/laptop_pcmcia.png
-share/icons/locolor/32x32/apps/laptop_settings.png
-share/icons/locolor/32x32/apps/power.png
 @dirrm share/doc/HTML/en/ktimemon
 @dirrm share/doc/HTML/en/kpm
 @dirrm share/doc/HTML/en/knotes
 @dirrm share/doc/HTML/en/klpq
 @dirrm share/doc/HTML/en/kljettool
-@dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kjots
 @dirrm share/doc/HTML/en/khexedit
 @dirrm share/doc/HTML/en/kfloppy
@@ -453,18 +398,28 @@ share/icons/locolor/32x32/apps/power.png
 @dirrm share/doc/HTML/en/kab
 @dirrm share/doc/HTML/en/ark
 @dirrm share/apps/knotes/pics
-@dirrm share/apps/kljetool/pics
+@dirrm share/apps/knotes
+@dirrm share/apps/kljettool/pics
+@dirrm share/apps/klaptopdaemon/icons/locolor/32x32/actions
+@dirrm share/apps/klaptopdaemon/icons/locolor/16x16/actions
 @dirrm share/apps/kjots/pics
+@dirrm share/apps/kjots
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/khexedit/toolbar
+@dirrm share/apps/khexedit
 @dirrm share/apps/kfloppy/pics
+@dirrm share/apps/kfloppy
 @dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
 @dirrm share/apps/kedit/toolbar
 @dirrm share/apps/kedit/pics
 @dirrm share/apps/kedit
 @dirrm share/apps/kcalc/pics
+@dirrm share/apps/kcalc
 @dirrm share/apps/karm/pics
 @dirrm share/apps/karm
 @dirrm share/apps/kab/pics
+@dirrm share/apps/kab
 @dirrm share/apps/ark/icons/locolor/22x22/actions
+@dirrm share/apps/ark/icons/locolor/22x22
 @dirrm share/apps/ark