Update the KDE meta-port to KDE 1.90 (aka KDE2 beta) so people can use

it to install the basic KDE2 stuff.  Also update kdetoys to finally
remove ImageMagick dependency and allow non-i18n people to use it.

And now, KDE2 is fully imported into the tree.

Repo-copies by:	asami

24 files changed, 831 insertions, 309 deletions

diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index fe3f229dac05..8fe4e798a309 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -1,18 +1,28 @@
-# New ports collection makefile for:	kdetoys-i18n
-# Date created:		18 may 1999
-# Whom:			imura@cs.titech.ac.jp
+# New ports collection makefile for:	kdetoys2
+# Date created:				14 May 2000 02:45:53
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../../audio/kdemultimedia11-i18n
 PORTNAME=	kdetoys
+PORTVERSION=	1.90
 CATEGORIES=	x11-clocks kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	unstable/distribution/tar/src
 
-MAINTAINER=	imura@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
-BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
-.include "${MASTERDIR}/Makefile"
+MOC?=		${X11BASE}/bin/moc2
+USE_QT2=	yes
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+		--with-qt-includes=${X11BASE}/include/qt2 \
+		--with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse MOC="${MOC}"
+USE_GMAKE=	yes
 
-CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse
+.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo
index 1d075d1fe04d..a28c79c03130 100644
--- a/x11-clocks/kdetoys2/distinfo
+++ b/x11-clocks/kdetoys2/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-1.1.2.tar.bz2) = 0bf12bd887b497a3ba35beea198cd63f
+MD5 (kdetoys-1.90.tar.bz2) = 6f8883a62031af941dd2b6cd529c7f61
diff --git a/x11-clocks/kdetoys2/pkg-comment b/x11-clocks/kdetoys2/pkg-comment
index 678c9f72888f..a28f517fbfbc 100644
--- a/x11-clocks/kdetoys2/pkg-comment
+++ b/x11-clocks/kdetoys2/pkg-comment
@@ -1 +1 @@
-Small applications for the KDE integrated X11 desktop
+Small applications for KDE2
diff --git a/x11-clocks/kdetoys2/pkg-descr b/x11-clocks/kdetoys2/pkg-descr
index 90ae45773bea..516be6a71f6a 100644
--- a/x11-clocks/kdetoys2/pkg-descr
+++ b/x11-clocks/kdetoys2/pkg-descr
@@ -1 +1,6 @@
-KDE provides an integrated X11 based environment, much like CDE.
+This port contains a set of KDE2-based applications for
+miscellaneous use, like clocks.
+
+WWW: http://www.kde.org/
+
+--Will <andrews@technologist.com>
diff --git a/x11-clocks/kdetoys2/pkg-plist b/x11-clocks/kdetoys2/pkg-plist
index 58fd567ff5f7..c3145370d637 100644
--- a/x11-clocks/kdetoys2/pkg-plist
+++ b/x11-clocks/kdetoys2/pkg-plist
@@ -1,88 +1,247 @@
+bin/amor
 bin/kmoon
+bin/kteatime
 bin/kworldwatch
-share/applnk/Utilities/KWorldWatch.kdelnk
-share/applnk/Utilities/kmoon.kdelnk
-share/apps/kmoon/pics/moon1.xpm
-share/apps/kmoon/pics/moon10.xpm
-share/apps/kmoon/pics/moon11.xpm
-share/apps/kmoon/pics/moon12.xpm
-share/apps/kmoon/pics/moon13.xpm
-share/apps/kmoon/pics/moon14.xpm
-share/apps/kmoon/pics/moon15.xpm
-share/apps/kmoon/pics/moon16.xpm
-share/apps/kmoon/pics/moon17.xpm
-share/apps/kmoon/pics/moon18.xpm
-share/apps/kmoon/pics/moon19.xpm
-share/apps/kmoon/pics/moon2.xpm
-share/apps/kmoon/pics/moon20.xpm
-share/apps/kmoon/pics/moon21.xpm
-share/apps/kmoon/pics/moon22.xpm
-share/apps/kmoon/pics/moon23.xpm
-share/apps/kmoon/pics/moon24.xpm
-share/apps/kmoon/pics/moon25.xpm
-share/apps/kmoon/pics/moon26.xpm
-share/apps/kmoon/pics/moon27.xpm
-share/apps/kmoon/pics/moon28.xpm
-share/apps/kmoon/pics/moon29.xpm
-share/apps/kmoon/pics/moon3.xpm
-share/apps/kmoon/pics/moon4.xpm
-share/apps/kmoon/pics/moon5.xpm
-share/apps/kmoon/pics/moon6.xpm
-share/apps/kmoon/pics/moon7.xpm
-share/apps/kmoon/pics/moon8.xpm
-share/apps/kmoon/pics/moon9.xpm
+share/applnk/Games/amor.kdelnk
+share/applnk/Utilities/kmoon.desktop
+share/applnk/Utilities/kteatime.desktop
+share/applnk/Utilities/kworldwatch.desktop
+share/apps/amor/b/b-f.xpm
+share/apps/amor/b/b-f2.xpm
+share/apps/amor/b/b1-r.xpm
+share/apps/amor/b/b1.xpm
+share/apps/amor/b/b2-r.xpm
+share/apps/amor/b/b2.xpm
+share/apps/amor/b/b3-r.xpm
+share/apps/amor/b/b3.xpm
+share/apps/amor/b/b4-r.xpm
+share/apps/amor/b/b4.xpm
+share/apps/amor/b/bcol1.xpm
+share/apps/amor/b/bcol2.xpm
+share/apps/amor/b/bdrib1.xpm
+share/apps/amor/b/bdrib2.xpm
+share/apps/amor/b/bdrib3.xpm
+share/apps/amor/b/bdrib4.xpm
+share/apps/amor/b/bdrib5.xpm
+share/apps/amor/b/bdrib6.xpm
+share/apps/amor/b/bdrib7.xpm
+share/apps/amor/b/bdrop.xpm
+share/apps/amor/b/bgo1.xpm
+share/apps/amor/b/bgo2.xpm
+share/apps/amor/b/bgo3.xpm
+share/apps/amor/b/bgo4.xpm
+share/apps/amor/b/bgo5.xpm
+share/apps/amor/b/bgo6.xpm
+share/apps/amor/b/bgo7.xpm
+share/apps/amor/b/bh1.xpm
+share/apps/amor/b/bpof1.xpm
+share/apps/amor/b/bpof2.xpm
+share/apps/amor/b/bpof3.xpm
+share/apps/amor/b/bpof4.xpm
+share/apps/amor/b/bpof5.xpm
+share/apps/amor/b/bpof6.xpm
+share/apps/amor/b/sa1.xpm
+share/apps/amor/b/sa2.xpm
+share/apps/amor/b/sa2a.xpm
+share/apps/amor/b/sa2b.xpm
+share/apps/amor/b/sa2c.xpm
+share/apps/amor/b/salut.xpm
+share/apps/amor/b/salut1.xpm
+share/apps/amor/blob/blob.xpm
+share/apps/amor/blob/blob_BeamDown1.xpm
+share/apps/amor/blob/blob_BeamDown2.xpm
+share/apps/amor/blob/blob_BeamDown3.xpm
+share/apps/amor/blob/blob_BeamDown4.xpm
+share/apps/amor/blob/blob_BeamDown5.xpm
+share/apps/amor/blob/blob_BeamDown6.xpm
+share/apps/amor/blob/blob_BeamDown7.xpm
+share/apps/amor/blob/blob_BeamDown8.xpm
+share/apps/amor/blob/blob_BeamDown9.xpm
+share/apps/amor/blob/blob_BeamUp1.xpm
+share/apps/amor/blob/blob_BeamUp10.xpm
+share/apps/amor/blob/blob_BeamUp2.xpm
+share/apps/amor/blob/blob_BeamUp3.xpm
+share/apps/amor/blob/blob_BeamUp4.xpm
+share/apps/amor/blob/blob_BeamUp5.xpm
+share/apps/amor/blob/blob_BeamUp6.xpm
+share/apps/amor/blob/blob_BeamUp7.xpm
+share/apps/amor/blob/blob_BeamUp8.xpm
+share/apps/amor/blob/blob_BeamUp9.xpm
+share/apps/amor/blob/blob_b1.xpm
+share/apps/amor/blob/blob_b2.xpm
+share/apps/amor/blob/blob_e1.xpm
+share/apps/amor/blob/blob_ex1.xpm
+share/apps/amor/blob/blob_f1.xpm
+share/apps/amor/blob/blob_f2.xpm
+share/apps/amor/blob/blob_f3.xpm
+share/apps/amor/blob/blob_fire10.xpm
+share/apps/amor/blob/blob_fire11.xpm
+share/apps/amor/blob/blob_fire2.xpm
+share/apps/amor/blob/blob_fire3.xpm
+share/apps/amor/blob/blob_fire4.xpm
+share/apps/amor/blob/blob_fire5.xpm
+share/apps/amor/blob/blob_fire6.xpm
+share/apps/amor/blob/blob_fire7.xpm
+share/apps/amor/blob/blob_fire8.xpm
+share/apps/amor/blob/blob_fire9.xpm
+share/apps/amor/blob/blob_g1.xpm
+share/apps/amor/blob/blob_g2.xpm
+share/apps/amor/blob/blob_gl1.xpm
+share/apps/amor/blob/blob_gl2.xpm
+share/apps/amor/blob/blob_gl3.xpm
+share/apps/amor/blob/blob_h1.xpm
+share/apps/amor/blob/blob_h2.xpm
+share/apps/amor/blob/blob_h3.xpm
+share/apps/amor/blob/blob_jet1.xpm
+share/apps/amor/blob/blob_jet2.xpm
+share/apps/amor/blob/blob_jet3.xpm
+share/apps/amor/blob/blob_jet4.xpm
+share/apps/amor/blob/blob_l_jet1.xpm
+share/apps/amor/blob/blob_l_jet2.xpm
+share/apps/amor/blob/blob_l_jet3.xpm
+share/apps/amor/blob/blob_l_jet4.xpm
+share/apps/amor/blob/blob_l_turn1.xpm
+share/apps/amor/blob/blob_l_turn2.xpm
+share/apps/amor/blob/blob_l_turn3.xpm
+share/apps/amor/blob/blob_l_turn4.xpm
+share/apps/amor/blob/blob_r135.xpm
+share/apps/amor/blob/blob_r180.xpm
+share/apps/amor/blob/blob_r225.xpm
+share/apps/amor/blob/blob_r270.xpm
+share/apps/amor/blob/blob_r315.xpm
+share/apps/amor/blob/blob_r45.xpm
+share/apps/amor/blob/blob_r90.xpm
+share/apps/amor/blob/blob_r_turn1.xpm
+share/apps/amor/blob/blob_r_turn2.xpm
+share/apps/amor/blob/blob_r_turn3.xpm
+share/apps/amor/blob/blob_r_turn4.xpm
+share/apps/amor/blob/blob_s1.xpm
+share/apps/amor/blob/blob_s2.xpm
+share/apps/amor/blob/blob_s3.xpm
+share/apps/amor/blob/blob_sl1.xpm
+share/apps/amor/blob/blob_sl2.xpm
+share/apps/amor/blob/blob_sl3.xpm
+share/apps/amor/blob/blob_sl4.xpm
+share/apps/amor/blob/blob_z1.xpm
+share/apps/amor/blob/blob_z2.xpm
+share/apps/amor/blob/blob_z3.xpm
+share/apps/amor/blobrc
+share/apps/amor/brc
+share/apps/amor/eyes/eye_1.xpm
+share/apps/amor/eyes/eye_2.xpm
+share/apps/amor/eyes/eye_b.xpm
+share/apps/amor/eyes/eye_d.xpm
+share/apps/amor/eyes/eye_e.xpm
+share/apps/amor/eyes/eye_h1.xpm
+share/apps/amor/eyes/eye_h2.xpm
+share/apps/amor/eyes/eye_h3.xpm
+share/apps/amor/eyes/eye_h4.xpm
+share/apps/amor/eyes/eye_l.xpm
+share/apps/amor/eyes/eye_m1.xpm
+share/apps/amor/eyes/eye_m2.xpm
+share/apps/amor/eyes/eye_m3.xpm
+share/apps/amor/eyes/eye_m4.xpm
+share/apps/amor/eyes/eye_m5.xpm
+share/apps/amor/eyes/eye_m6.xpm
+share/apps/amor/eyes/eye_m7.xpm
+share/apps/amor/eyes/eye_s1.xpm
+share/apps/amor/eyes/eye_s2.xpm
+share/apps/amor/eyes/eye_s3.xpm
+share/apps/amor/eyes/eye_s4.xpm
+share/apps/amor/eyes/eye_u.xpm
+share/apps/amor/eyes/eye_z1.xpm
+share/apps/amor/eyes/eye_z2.xpm
+share/apps/amor/eyes/eye_z3.xpm
+share/apps/amor/eyes/eye_z4.xpm
+share/apps/amor/eyes/eye_z5.xpm
+share/apps/amor/eyesrc
+share/apps/amor/ghost/ghost_1.xpm
+share/apps/amor/ghost/ghost_2.xpm
+share/apps/amor/ghost/ghost_e.xpm
+share/apps/amor/ghost/ghost_m1.xpm
+share/apps/amor/ghost/ghost_m2.xpm
+share/apps/amor/ghost/ghost_m3.xpm
+share/apps/amor/ghost/ghost_m4.xpm
+share/apps/amor/ghost/ghost_m5.xpm
+share/apps/amor/ghost/ghost_m6.xpm
+share/apps/amor/ghost/ghost_m7.xpm
+share/apps/amor/ghost/ghost_z1.xpm
+share/apps/amor/ghost/ghost_z2.xpm
+share/apps/amor/ghost/ghost_z3.xpm
+share/apps/amor/ghost/ghost_z4.xpm
+share/apps/amor/ghost/ghost_z5.xpm
+share/apps/amor/ghostrc
+share/apps/amor/tips-en
+share/apps/kdesktop/programs/kdeworld.desktop
+share/apps/kmoon/pics/moon1.png
+share/apps/kmoon/pics/moon10.png
+share/apps/kmoon/pics/moon11.png
+share/apps/kmoon/pics/moon12.png
+share/apps/kmoon/pics/moon13.png
+share/apps/kmoon/pics/moon14.png
+share/apps/kmoon/pics/moon15.png
+share/apps/kmoon/pics/moon16.png
+share/apps/kmoon/pics/moon17.png
+share/apps/kmoon/pics/moon18.png
+share/apps/kmoon/pics/moon19.png
+share/apps/kmoon/pics/moon2.png
+share/apps/kmoon/pics/moon20.png
+share/apps/kmoon/pics/moon21.png
+share/apps/kmoon/pics/moon22.png
+share/apps/kmoon/pics/moon23.png
+share/apps/kmoon/pics/moon24.png
+share/apps/kmoon/pics/moon25.png
+share/apps/kmoon/pics/moon26.png
+share/apps/kmoon/pics/moon27.png
+share/apps/kmoon/pics/moon28.png
+share/apps/kmoon/pics/moon29.png
+share/apps/kmoon/pics/moon3.png
+share/apps/kmoon/pics/moon4.png
+share/apps/kmoon/pics/moon5.png
+share/apps/kmoon/pics/moon6.png
+share/apps/kmoon/pics/moon7.png
+share/apps/kmoon/pics/moon8.png
+share/apps/kmoon/pics/moon9.png
+share/apps/kworldwatch/pics/bio_800.jpg
+share/apps/kworldwatch/pics/depths_400.jpg
 share/apps/kworldwatch/pics/flag-blue.xpm
 share/apps/kworldwatch/pics/flag-green.xpm
 share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
-share/apps/kworldwatch/pics/world.xpm
-share/apps/kworldwatch/pics/world2.xpm
-share/apps/kworldwatch/pics/world_dark.xpm
-share/icons/kmoon.xpm
-share/icons/kworldwatch.xpm
-share/icons/large/kmoon.xpm
-share/icons/large/kworldwatch.xpm
-share/icons/mini/kmoon.xpm
-share/icons/mini/kworldwatch.xpm
-share/locale/br/LC_MESSAGES/kmoon.mo
-share/locale/br/LC_MESSAGES/kworldwatch.mo
-share/locale/cs/LC_MESSAGES/kmoon.mo
-share/locale/cs/LC_MESSAGES/kworldwatch.mo
-share/locale/da/LC_MESSAGES/kmoon.mo
-share/locale/da/LC_MESSAGES/kworldwatch.mo
-share/locale/de/LC_MESSAGES/kmoon.mo
-share/locale/de/LC_MESSAGES/kworldwatch.mo
-share/locale/es/LC_MESSAGES/kmoon.mo
-share/locale/es/LC_MESSAGES/kworldwatch.mo
-share/locale/et/LC_MESSAGES/kmoon.mo
-share/locale/et/LC_MESSAGES/kworldwatch.mo
-share/locale/fi/LC_MESSAGES/kmoon.mo
-share/locale/fi/LC_MESSAGES/kworldwatch.mo
-share/locale/fr/LC_MESSAGES/kmoon.mo
-share/locale/fr/LC_MESSAGES/kworldwatch.mo
-share/locale/hr/LC_MESSAGES/kmoon.mo
-share/locale/hr/LC_MESSAGES/kworldwatch.mo
-share/locale/is/LC_MESSAGES/kmoon.mo
-share/locale/is/LC_MESSAGES/kworldwatch.mo
-share/locale/ja/LC_MESSAGES/kmoon.mo
-share/locale/ja/LC_MESSAGES/kworldwatch.mo
-share/locale/no/LC_MESSAGES/kmoon.mo
-share/locale/no/LC_MESSAGES/kworldwatch.mo
-share/locale/pl/LC_MESSAGES/kmoon.mo
-share/locale/pl/LC_MESSAGES/kworldwatch.mo
-share/locale/pt/LC_MESSAGES/kmoon.mo
-share/locale/pt/LC_MESSAGES/kworldwatch.mo
-share/locale/pt_BR/LC_MESSAGES/kmoon.mo
-share/locale/pt_BR/LC_MESSAGES/kworldwatch.mo
-share/locale/ro/LC_MESSAGES/kworldwatch.mo
-share/locale/sk/LC_MESSAGES/kmoon.mo
-share/locale/sk/LC_MESSAGES/kworldwatch.mo
-share/locale/sl/LC_MESSAGES/kmoon.mo
-share/locale/sl/LC_MESSAGES/kworldwatch.mo
-share/locale/sv/LC_MESSAGES/kmoon.mo
-share/locale/sv/LC_MESSAGES/kworldwatch.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmoon.mo
+share/apps/kworldwatch/pics/photo_400.jpg
+share/apps/kworldwatch/pics/world2.png
+share/doc/HTML/en/mouse/.anchors
+share/doc/HTML/en/mouse/compilationandinstallation.html
+share/doc/HTML/en/mouse/guide.png
+share/doc/HTML/en/mouse/howitworks.html
+share/doc/HTML/en/mouse/index.cvlog
+share/doc/HTML/en/mouse/index.docbook
+share/doc/HTML/en/mouse/index.html
+share/doc/HTML/en/mouse/installation.html
+share/doc/HTML/en/mouse/introduction.html
+share/doc/HTML/en/mouse/onscreenoperation.html
+share/icons/hicolor/32x32/apps/kmoon.png
+share/icons/hicolor/32x32/apps/kworldwatch.png
+share/icons/hicolor/48x48/apps/kmoon.png
+share/icons/hicolor/48x48/apps/kworldwatch.png
+share/icons/locolor/16x16/apps/amor.png
+share/icons/locolor/16x16/apps/kmoon.png
+share/icons/locolor/16x16/apps/kteatime.png
+share/icons/locolor/16x16/apps/kworldwatch.png
+share/icons/locolor/32x32/apps/amor.png
+share/icons/locolor/32x32/apps/kmoon.png
+share/icons/locolor/32x32/apps/kworldwatch.png
+@unexec rm -f %D/share/apps/amor/tips-default
+@unexec rm -f %D/share/doc/HTML/en/mouse/common
+@dirrm share/doc/HTML/en/mouse
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
 @dirrm share/apps/kmoon
+@dirrm share/apps/kdesktop/programs
+@dirrm share/apps/kdesktop
+@dirrm share/apps/amor/ghost
+@dirrm share/apps/amor/eyes
+@dirrm share/apps/amor/blob
+@dirrm share/apps/amor/b
+@dirrm share/apps/amor
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index fe3f229dac05..8fe4e798a309 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -1,18 +1,28 @@
-# New ports collection makefile for:	kdetoys-i18n
-# Date created:		18 may 1999
-# Whom:			imura@cs.titech.ac.jp
+# New ports collection makefile for:	kdetoys2
+# Date created:				14 May 2000 02:45:53
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../../audio/kdemultimedia11-i18n
 PORTNAME=	kdetoys
+PORTVERSION=	1.90
 CATEGORIES=	x11-clocks kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	unstable/distribution/tar/src
 
-MAINTAINER=	imura@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
-BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
-.include "${MASTERDIR}/Makefile"
+MOC?=		${X11BASE}/bin/moc2
+USE_QT2=	yes
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+		--with-qt-includes=${X11BASE}/include/qt2 \
+		--with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse MOC="${MOC}"
+USE_GMAKE=	yes
 
-CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse
+.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index 1d075d1fe04d..a28c79c03130 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-1.1.2.tar.bz2) = 0bf12bd887b497a3ba35beea198cd63f
+MD5 (kdetoys-1.90.tar.bz2) = 6f8883a62031af941dd2b6cd529c7f61
diff --git a/x11-clocks/kdetoys3/pkg-comment b/x11-clocks/kdetoys3/pkg-comment
index 678c9f72888f..a28f517fbfbc 100644
--- a/x11-clocks/kdetoys3/pkg-comment
+++ b/x11-clocks/kdetoys3/pkg-comment
@@ -1 +1 @@
-Small applications for the KDE integrated X11 desktop
+Small applications for KDE2
diff --git a/x11-clocks/kdetoys3/pkg-descr b/x11-clocks/kdetoys3/pkg-descr
index 90ae45773bea..516be6a71f6a 100644
--- a/x11-clocks/kdetoys3/pkg-descr
+++ b/x11-clocks/kdetoys3/pkg-descr
@@ -1 +1,6 @@
-KDE provides an integrated X11 based environment, much like CDE.
+This port contains a set of KDE2-based applications for
+miscellaneous use, like clocks.
+
+WWW: http://www.kde.org/
+
+--Will <andrews@technologist.com>
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index 58fd567ff5f7..c3145370d637 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -1,88 +1,247 @@
+bin/amor
 bin/kmoon
+bin/kteatime
 bin/kworldwatch
-share/applnk/Utilities/KWorldWatch.kdelnk
-share/applnk/Utilities/kmoon.kdelnk
-share/apps/kmoon/pics/moon1.xpm
-share/apps/kmoon/pics/moon10.xpm
-share/apps/kmoon/pics/moon11.xpm
-share/apps/kmoon/pics/moon12.xpm
-share/apps/kmoon/pics/moon13.xpm
-share/apps/kmoon/pics/moon14.xpm
-share/apps/kmoon/pics/moon15.xpm
-share/apps/kmoon/pics/moon16.xpm
-share/apps/kmoon/pics/moon17.xpm
-share/apps/kmoon/pics/moon18.xpm
-share/apps/kmoon/pics/moon19.xpm
-share/apps/kmoon/pics/moon2.xpm
-share/apps/kmoon/pics/moon20.xpm
-share/apps/kmoon/pics/moon21.xpm
-share/apps/kmoon/pics/moon22.xpm
-share/apps/kmoon/pics/moon23.xpm
-share/apps/kmoon/pics/moon24.xpm
-share/apps/kmoon/pics/moon25.xpm
-share/apps/kmoon/pics/moon26.xpm
-share/apps/kmoon/pics/moon27.xpm
-share/apps/kmoon/pics/moon28.xpm
-share/apps/kmoon/pics/moon29.xpm
-share/apps/kmoon/pics/moon3.xpm
-share/apps/kmoon/pics/moon4.xpm
-share/apps/kmoon/pics/moon5.xpm
-share/apps/kmoon/pics/moon6.xpm
-share/apps/kmoon/pics/moon7.xpm
-share/apps/kmoon/pics/moon8.xpm
-share/apps/kmoon/pics/moon9.xpm
+share/applnk/Games/amor.kdelnk
+share/applnk/Utilities/kmoon.desktop
+share/applnk/Utilities/kteatime.desktop
+share/applnk/Utilities/kworldwatch.desktop
+share/apps/amor/b/b-f.xpm
+share/apps/amor/b/b-f2.xpm
+share/apps/amor/b/b1-r.xpm
+share/apps/amor/b/b1.xpm
+share/apps/amor/b/b2-r.xpm
+share/apps/amor/b/b2.xpm
+share/apps/amor/b/b3-r.xpm
+share/apps/amor/b/b3.xpm
+share/apps/amor/b/b4-r.xpm
+share/apps/amor/b/b4.xpm
+share/apps/amor/b/bcol1.xpm
+share/apps/amor/b/bcol2.xpm
+share/apps/amor/b/bdrib1.xpm
+share/apps/amor/b/bdrib2.xpm
+share/apps/amor/b/bdrib3.xpm
+share/apps/amor/b/bdrib4.xpm
+share/apps/amor/b/bdrib5.xpm
+share/apps/amor/b/bdrib6.xpm
+share/apps/amor/b/bdrib7.xpm
+share/apps/amor/b/bdrop.xpm
+share/apps/amor/b/bgo1.xpm
+share/apps/amor/b/bgo2.xpm
+share/apps/amor/b/bgo3.xpm
+share/apps/amor/b/bgo4.xpm
+share/apps/amor/b/bgo5.xpm
+share/apps/amor/b/bgo6.xpm
+share/apps/amor/b/bgo7.xpm
+share/apps/amor/b/bh1.xpm
+share/apps/amor/b/bpof1.xpm
+share/apps/amor/b/bpof2.xpm
+share/apps/amor/b/bpof3.xpm
+share/apps/amor/b/bpof4.xpm
+share/apps/amor/b/bpof5.xpm
+share/apps/amor/b/bpof6.xpm
+share/apps/amor/b/sa1.xpm
+share/apps/amor/b/sa2.xpm
+share/apps/amor/b/sa2a.xpm
+share/apps/amor/b/sa2b.xpm
+share/apps/amor/b/sa2c.xpm
+share/apps/amor/b/salut.xpm
+share/apps/amor/b/salut1.xpm
+share/apps/amor/blob/blob.xpm
+share/apps/amor/blob/blob_BeamDown1.xpm
+share/apps/amor/blob/blob_BeamDown2.xpm
+share/apps/amor/blob/blob_BeamDown3.xpm
+share/apps/amor/blob/blob_BeamDown4.xpm
+share/apps/amor/blob/blob_BeamDown5.xpm
+share/apps/amor/blob/blob_BeamDown6.xpm
+share/apps/amor/blob/blob_BeamDown7.xpm
+share/apps/amor/blob/blob_BeamDown8.xpm
+share/apps/amor/blob/blob_BeamDown9.xpm
+share/apps/amor/blob/blob_BeamUp1.xpm
+share/apps/amor/blob/blob_BeamUp10.xpm
+share/apps/amor/blob/blob_BeamUp2.xpm
+share/apps/amor/blob/blob_BeamUp3.xpm
+share/apps/amor/blob/blob_BeamUp4.xpm
+share/apps/amor/blob/blob_BeamUp5.xpm
+share/apps/amor/blob/blob_BeamUp6.xpm
+share/apps/amor/blob/blob_BeamUp7.xpm
+share/apps/amor/blob/blob_BeamUp8.xpm
+share/apps/amor/blob/blob_BeamUp9.xpm
+share/apps/amor/blob/blob_b1.xpm
+share/apps/amor/blob/blob_b2.xpm
+share/apps/amor/blob/blob_e1.xpm
+share/apps/amor/blob/blob_ex1.xpm
+share/apps/amor/blob/blob_f1.xpm
+share/apps/amor/blob/blob_f2.xpm
+share/apps/amor/blob/blob_f3.xpm
+share/apps/amor/blob/blob_fire10.xpm
+share/apps/amor/blob/blob_fire11.xpm
+share/apps/amor/blob/blob_fire2.xpm
+share/apps/amor/blob/blob_fire3.xpm
+share/apps/amor/blob/blob_fire4.xpm
+share/apps/amor/blob/blob_fire5.xpm
+share/apps/amor/blob/blob_fire6.xpm
+share/apps/amor/blob/blob_fire7.xpm
+share/apps/amor/blob/blob_fire8.xpm
+share/apps/amor/blob/blob_fire9.xpm
+share/apps/amor/blob/blob_g1.xpm
+share/apps/amor/blob/blob_g2.xpm
+share/apps/amor/blob/blob_gl1.xpm
+share/apps/amor/blob/blob_gl2.xpm
+share/apps/amor/blob/blob_gl3.xpm
+share/apps/amor/blob/blob_h1.xpm
+share/apps/amor/blob/blob_h2.xpm
+share/apps/amor/blob/blob_h3.xpm
+share/apps/amor/blob/blob_jet1.xpm
+share/apps/amor/blob/blob_jet2.xpm
+share/apps/amor/blob/blob_jet3.xpm
+share/apps/amor/blob/blob_jet4.xpm
+share/apps/amor/blob/blob_l_jet1.xpm
+share/apps/amor/blob/blob_l_jet2.xpm
+share/apps/amor/blob/blob_l_jet3.xpm
+share/apps/amor/blob/blob_l_jet4.xpm
+share/apps/amor/blob/blob_l_turn1.xpm
+share/apps/amor/blob/blob_l_turn2.xpm
+share/apps/amor/blob/blob_l_turn3.xpm
+share/apps/amor/blob/blob_l_turn4.xpm
+share/apps/amor/blob/blob_r135.xpm
+share/apps/amor/blob/blob_r180.xpm
+share/apps/amor/blob/blob_r225.xpm
+share/apps/amor/blob/blob_r270.xpm
+share/apps/amor/blob/blob_r315.xpm
+share/apps/amor/blob/blob_r45.xpm
+share/apps/amor/blob/blob_r90.xpm
+share/apps/amor/blob/blob_r_turn1.xpm
+share/apps/amor/blob/blob_r_turn2.xpm
+share/apps/amor/blob/blob_r_turn3.xpm
+share/apps/amor/blob/blob_r_turn4.xpm
+share/apps/amor/blob/blob_s1.xpm
+share/apps/amor/blob/blob_s2.xpm
+share/apps/amor/blob/blob_s3.xpm
+share/apps/amor/blob/blob_sl1.xpm
+share/apps/amor/blob/blob_sl2.xpm
+share/apps/amor/blob/blob_sl3.xpm
+share/apps/amor/blob/blob_sl4.xpm
+share/apps/amor/blob/blob_z1.xpm
+share/apps/amor/blob/blob_z2.xpm
+share/apps/amor/blob/blob_z3.xpm
+share/apps/amor/blobrc
+share/apps/amor/brc
+share/apps/amor/eyes/eye_1.xpm
+share/apps/amor/eyes/eye_2.xpm
+share/apps/amor/eyes/eye_b.xpm
+share/apps/amor/eyes/eye_d.xpm
+share/apps/amor/eyes/eye_e.xpm
+share/apps/amor/eyes/eye_h1.xpm
+share/apps/amor/eyes/eye_h2.xpm
+share/apps/amor/eyes/eye_h3.xpm
+share/apps/amor/eyes/eye_h4.xpm
+share/apps/amor/eyes/eye_l.xpm
+share/apps/amor/eyes/eye_m1.xpm
+share/apps/amor/eyes/eye_m2.xpm
+share/apps/amor/eyes/eye_m3.xpm
+share/apps/amor/eyes/eye_m4.xpm
+share/apps/amor/eyes/eye_m5.xpm
+share/apps/amor/eyes/eye_m6.xpm
+share/apps/amor/eyes/eye_m7.xpm
+share/apps/amor/eyes/eye_s1.xpm
+share/apps/amor/eyes/eye_s2.xpm
+share/apps/amor/eyes/eye_s3.xpm
+share/apps/amor/eyes/eye_s4.xpm
+share/apps/amor/eyes/eye_u.xpm
+share/apps/amor/eyes/eye_z1.xpm
+share/apps/amor/eyes/eye_z2.xpm
+share/apps/amor/eyes/eye_z3.xpm
+share/apps/amor/eyes/eye_z4.xpm
+share/apps/amor/eyes/eye_z5.xpm
+share/apps/amor/eyesrc
+share/apps/amor/ghost/ghost_1.xpm
+share/apps/amor/ghost/ghost_2.xpm
+share/apps/amor/ghost/ghost_e.xpm
+share/apps/amor/ghost/ghost_m1.xpm
+share/apps/amor/ghost/ghost_m2.xpm
+share/apps/amor/ghost/ghost_m3.xpm
+share/apps/amor/ghost/ghost_m4.xpm
+share/apps/amor/ghost/ghost_m5.xpm
+share/apps/amor/ghost/ghost_m6.xpm
+share/apps/amor/ghost/ghost_m7.xpm
+share/apps/amor/ghost/ghost_z1.xpm
+share/apps/amor/ghost/ghost_z2.xpm
+share/apps/amor/ghost/ghost_z3.xpm
+share/apps/amor/ghost/ghost_z4.xpm
+share/apps/amor/ghost/ghost_z5.xpm
+share/apps/amor/ghostrc
+share/apps/amor/tips-en
+share/apps/kdesktop/programs/kdeworld.desktop
+share/apps/kmoon/pics/moon1.png
+share/apps/kmoon/pics/moon10.png
+share/apps/kmoon/pics/moon11.png
+share/apps/kmoon/pics/moon12.png
+share/apps/kmoon/pics/moon13.png
+share/apps/kmoon/pics/moon14.png
+share/apps/kmoon/pics/moon15.png
+share/apps/kmoon/pics/moon16.png
+share/apps/kmoon/pics/moon17.png
+share/apps/kmoon/pics/moon18.png
+share/apps/kmoon/pics/moon19.png
+share/apps/kmoon/pics/moon2.png
+share/apps/kmoon/pics/moon20.png
+share/apps/kmoon/pics/moon21.png
+share/apps/kmoon/pics/moon22.png
+share/apps/kmoon/pics/moon23.png
+share/apps/kmoon/pics/moon24.png
+share/apps/kmoon/pics/moon25.png
+share/apps/kmoon/pics/moon26.png
+share/apps/kmoon/pics/moon27.png
+share/apps/kmoon/pics/moon28.png
+share/apps/kmoon/pics/moon29.png
+share/apps/kmoon/pics/moon3.png
+share/apps/kmoon/pics/moon4.png
+share/apps/kmoon/pics/moon5.png
+share/apps/kmoon/pics/moon6.png
+share/apps/kmoon/pics/moon7.png
+share/apps/kmoon/pics/moon8.png
+share/apps/kmoon/pics/moon9.png
+share/apps/kworldwatch/pics/bio_800.jpg
+share/apps/kworldwatch/pics/depths_400.jpg
 share/apps/kworldwatch/pics/flag-blue.xpm
 share/apps/kworldwatch/pics/flag-green.xpm
 share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
-share/apps/kworldwatch/pics/world.xpm
-share/apps/kworldwatch/pics/world2.xpm
-share/apps/kworldwatch/pics/world_dark.xpm
-share/icons/kmoon.xpm
-share/icons/kworldwatch.xpm
-share/icons/large/kmoon.xpm
-share/icons/large/kworldwatch.xpm
-share/icons/mini/kmoon.xpm
-share/icons/mini/kworldwatch.xpm
-share/locale/br/LC_MESSAGES/kmoon.mo
-share/locale/br/LC_MESSAGES/kworldwatch.mo
-share/locale/cs/LC_MESSAGES/kmoon.mo
-share/locale/cs/LC_MESSAGES/kworldwatch.mo
-share/locale/da/LC_MESSAGES/kmoon.mo
-share/locale/da/LC_MESSAGES/kworldwatch.mo
-share/locale/de/LC_MESSAGES/kmoon.mo
-share/locale/de/LC_MESSAGES/kworldwatch.mo
-share/locale/es/LC_MESSAGES/kmoon.mo
-share/locale/es/LC_MESSAGES/kworldwatch.mo
-share/locale/et/LC_MESSAGES/kmoon.mo
-share/locale/et/LC_MESSAGES/kworldwatch.mo
-share/locale/fi/LC_MESSAGES/kmoon.mo
-share/locale/fi/LC_MESSAGES/kworldwatch.mo
-share/locale/fr/LC_MESSAGES/kmoon.mo
-share/locale/fr/LC_MESSAGES/kworldwatch.mo
-share/locale/hr/LC_MESSAGES/kmoon.mo
-share/locale/hr/LC_MESSAGES/kworldwatch.mo
-share/locale/is/LC_MESSAGES/kmoon.mo
-share/locale/is/LC_MESSAGES/kworldwatch.mo
-share/locale/ja/LC_MESSAGES/kmoon.mo
-share/locale/ja/LC_MESSAGES/kworldwatch.mo
-share/locale/no/LC_MESSAGES/kmoon.mo
-share/locale/no/LC_MESSAGES/kworldwatch.mo
-share/locale/pl/LC_MESSAGES/kmoon.mo
-share/locale/pl/LC_MESSAGES/kworldwatch.mo
-share/locale/pt/LC_MESSAGES/kmoon.mo
-share/locale/pt/LC_MESSAGES/kworldwatch.mo
-share/locale/pt_BR/LC_MESSAGES/kmoon.mo
-share/locale/pt_BR/LC_MESSAGES/kworldwatch.mo
-share/locale/ro/LC_MESSAGES/kworldwatch.mo
-share/locale/sk/LC_MESSAGES/kmoon.mo
-share/locale/sk/LC_MESSAGES/kworldwatch.mo
-share/locale/sl/LC_MESSAGES/kmoon.mo
-share/locale/sl/LC_MESSAGES/kworldwatch.mo
-share/locale/sv/LC_MESSAGES/kmoon.mo
-share/locale/sv/LC_MESSAGES/kworldwatch.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmoon.mo
+share/apps/kworldwatch/pics/photo_400.jpg
+share/apps/kworldwatch/pics/world2.png
+share/doc/HTML/en/mouse/.anchors
+share/doc/HTML/en/mouse/compilationandinstallation.html
+share/doc/HTML/en/mouse/guide.png
+share/doc/HTML/en/mouse/howitworks.html
+share/doc/HTML/en/mouse/index.cvlog
+share/doc/HTML/en/mouse/index.docbook
+share/doc/HTML/en/mouse/index.html
+share/doc/HTML/en/mouse/installation.html
+share/doc/HTML/en/mouse/introduction.html
+share/doc/HTML/en/mouse/onscreenoperation.html
+share/icons/hicolor/32x32/apps/kmoon.png
+share/icons/hicolor/32x32/apps/kworldwatch.png
+share/icons/hicolor/48x48/apps/kmoon.png
+share/icons/hicolor/48x48/apps/kworldwatch.png
+share/icons/locolor/16x16/apps/amor.png
+share/icons/locolor/16x16/apps/kmoon.png
+share/icons/locolor/16x16/apps/kteatime.png
+share/icons/locolor/16x16/apps/kworldwatch.png
+share/icons/locolor/32x32/apps/amor.png
+share/icons/locolor/32x32/apps/kmoon.png
+share/icons/locolor/32x32/apps/kworldwatch.png
+@unexec rm -f %D/share/apps/amor/tips-default
+@unexec rm -f %D/share/doc/HTML/en/mouse/common
+@dirrm share/doc/HTML/en/mouse
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
 @dirrm share/apps/kmoon
+@dirrm share/apps/kdesktop/programs
+@dirrm share/apps/kdesktop
+@dirrm share/apps/amor/ghost
+@dirrm share/apps/amor/eyes
+@dirrm share/apps/amor/blob
+@dirrm share/apps/amor/b
+@dirrm share/apps/amor
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index fe3f229dac05..8fe4e798a309 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -1,18 +1,28 @@
-# New ports collection makefile for:	kdetoys-i18n
-# Date created:		18 may 1999
-# Whom:			imura@cs.titech.ac.jp
+# New ports collection makefile for:	kdetoys2
+# Date created:				14 May 2000 02:45:53
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-MASTERDIR=	${.CURDIR}/../../audio/kdemultimedia11-i18n
 PORTNAME=	kdetoys
+PORTVERSION=	1.90
 CATEGORIES=	x11-clocks kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	unstable/distribution/tar/src
 
-MAINTAINER=	imura@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
-BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
-.include "${MASTERDIR}/Makefile"
+MOC?=		${X11BASE}/bin/moc2
+USE_QT2=	yes
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \
+		--with-qt-includes=${X11BASE}/include/qt2 \
+		--with-qt-libraries=${X11BASE}/lib
+CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse MOC="${MOC}"
+USE_GMAKE=	yes
 
-CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse
+.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index 1d075d1fe04d..a28c79c03130 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-1.1.2.tar.bz2) = 0bf12bd887b497a3ba35beea198cd63f
+MD5 (kdetoys-1.90.tar.bz2) = 6f8883a62031af941dd2b6cd529c7f61
diff --git a/x11-clocks/kdetoys4/pkg-comment b/x11-clocks/kdetoys4/pkg-comment
index 678c9f72888f..a28f517fbfbc 100644
--- a/x11-clocks/kdetoys4/pkg-comment
+++ b/x11-clocks/kdetoys4/pkg-comment
@@ -1 +1 @@
-Small applications for the KDE integrated X11 desktop
+Small applications for KDE2
diff --git a/x11-clocks/kdetoys4/pkg-descr b/x11-clocks/kdetoys4/pkg-descr
index 90ae45773bea..516be6a71f6a 100644
--- a/x11-clocks/kdetoys4/pkg-descr
+++ b/x11-clocks/kdetoys4/pkg-descr
@@ -1 +1,6 @@
-KDE provides an integrated X11 based environment, much like CDE.
+This port contains a set of KDE2-based applications for
+miscellaneous use, like clocks.
+
+WWW: http://www.kde.org/
+
+--Will <andrews@technologist.com>
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index 58fd567ff5f7..c3145370d637 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -1,88 +1,247 @@
+bin/amor
 bin/kmoon
+bin/kteatime
 bin/kworldwatch
-share/applnk/Utilities/KWorldWatch.kdelnk
-share/applnk/Utilities/kmoon.kdelnk
-share/apps/kmoon/pics/moon1.xpm
-share/apps/kmoon/pics/moon10.xpm
-share/apps/kmoon/pics/moon11.xpm
-share/apps/kmoon/pics/moon12.xpm
-share/apps/kmoon/pics/moon13.xpm
-share/apps/kmoon/pics/moon14.xpm
-share/apps/kmoon/pics/moon15.xpm
-share/apps/kmoon/pics/moon16.xpm
-share/apps/kmoon/pics/moon17.xpm
-share/apps/kmoon/pics/moon18.xpm
-share/apps/kmoon/pics/moon19.xpm
-share/apps/kmoon/pics/moon2.xpm
-share/apps/kmoon/pics/moon20.xpm
-share/apps/kmoon/pics/moon21.xpm
-share/apps/kmoon/pics/moon22.xpm
-share/apps/kmoon/pics/moon23.xpm
-share/apps/kmoon/pics/moon24.xpm
-share/apps/kmoon/pics/moon25.xpm
-share/apps/kmoon/pics/moon26.xpm
-share/apps/kmoon/pics/moon27.xpm
-share/apps/kmoon/pics/moon28.xpm
-share/apps/kmoon/pics/moon29.xpm
-share/apps/kmoon/pics/moon3.xpm
-share/apps/kmoon/pics/moon4.xpm
-share/apps/kmoon/pics/moon5.xpm
-share/apps/kmoon/pics/moon6.xpm
-share/apps/kmoon/pics/moon7.xpm
-share/apps/kmoon/pics/moon8.xpm
-share/apps/kmoon/pics/moon9.xpm
+share/applnk/Games/amor.kdelnk
+share/applnk/Utilities/kmoon.desktop
+share/applnk/Utilities/kteatime.desktop
+share/applnk/Utilities/kworldwatch.desktop
+share/apps/amor/b/b-f.xpm
+share/apps/amor/b/b-f2.xpm
+share/apps/amor/b/b1-r.xpm
+share/apps/amor/b/b1.xpm
+share/apps/amor/b/b2-r.xpm
+share/apps/amor/b/b2.xpm
+share/apps/amor/b/b3-r.xpm
+share/apps/amor/b/b3.xpm
+share/apps/amor/b/b4-r.xpm
+share/apps/amor/b/b4.xpm
+share/apps/amor/b/bcol1.xpm
+share/apps/amor/b/bcol2.xpm
+share/apps/amor/b/bdrib1.xpm
+share/apps/amor/b/bdrib2.xpm
+share/apps/amor/b/bdrib3.xpm
+share/apps/amor/b/bdrib4.xpm
+share/apps/amor/b/bdrib5.xpm
+share/apps/amor/b/bdrib6.xpm
+share/apps/amor/b/bdrib7.xpm
+share/apps/amor/b/bdrop.xpm
+share/apps/amor/b/bgo1.xpm
+share/apps/amor/b/bgo2.xpm
+share/apps/amor/b/bgo3.xpm
+share/apps/amor/b/bgo4.xpm
+share/apps/amor/b/bgo5.xpm
+share/apps/amor/b/bgo6.xpm
+share/apps/amor/b/bgo7.xpm
+share/apps/amor/b/bh1.xpm
+share/apps/amor/b/bpof1.xpm
+share/apps/amor/b/bpof2.xpm
+share/apps/amor/b/bpof3.xpm
+share/apps/amor/b/bpof4.xpm
+share/apps/amor/b/bpof5.xpm
+share/apps/amor/b/bpof6.xpm
+share/apps/amor/b/sa1.xpm
+share/apps/amor/b/sa2.xpm
+share/apps/amor/b/sa2a.xpm
+share/apps/amor/b/sa2b.xpm
+share/apps/amor/b/sa2c.xpm
+share/apps/amor/b/salut.xpm
+share/apps/amor/b/salut1.xpm
+share/apps/amor/blob/blob.xpm
+share/apps/amor/blob/blob_BeamDown1.xpm
+share/apps/amor/blob/blob_BeamDown2.xpm
+share/apps/amor/blob/blob_BeamDown3.xpm
+share/apps/amor/blob/blob_BeamDown4.xpm
+share/apps/amor/blob/blob_BeamDown5.xpm
+share/apps/amor/blob/blob_BeamDown6.xpm
+share/apps/amor/blob/blob_BeamDown7.xpm
+share/apps/amor/blob/blob_BeamDown8.xpm
+share/apps/amor/blob/blob_BeamDown9.xpm
+share/apps/amor/blob/blob_BeamUp1.xpm
+share/apps/amor/blob/blob_BeamUp10.xpm
+share/apps/amor/blob/blob_BeamUp2.xpm
+share/apps/amor/blob/blob_BeamUp3.xpm
+share/apps/amor/blob/blob_BeamUp4.xpm
+share/apps/amor/blob/blob_BeamUp5.xpm
+share/apps/amor/blob/blob_BeamUp6.xpm
+share/apps/amor/blob/blob_BeamUp7.xpm
+share/apps/amor/blob/blob_BeamUp8.xpm
+share/apps/amor/blob/blob_BeamUp9.xpm
+share/apps/amor/blob/blob_b1.xpm
+share/apps/amor/blob/blob_b2.xpm
+share/apps/amor/blob/blob_e1.xpm
+share/apps/amor/blob/blob_ex1.xpm
+share/apps/amor/blob/blob_f1.xpm
+share/apps/amor/blob/blob_f2.xpm
+share/apps/amor/blob/blob_f3.xpm
+share/apps/amor/blob/blob_fire10.xpm
+share/apps/amor/blob/blob_fire11.xpm
+share/apps/amor/blob/blob_fire2.xpm
+share/apps/amor/blob/blob_fire3.xpm
+share/apps/amor/blob/blob_fire4.xpm
+share/apps/amor/blob/blob_fire5.xpm
+share/apps/amor/blob/blob_fire6.xpm
+share/apps/amor/blob/blob_fire7.xpm
+share/apps/amor/blob/blob_fire8.xpm
+share/apps/amor/blob/blob_fire9.xpm
+share/apps/amor/blob/blob_g1.xpm
+share/apps/amor/blob/blob_g2.xpm
+share/apps/amor/blob/blob_gl1.xpm
+share/apps/amor/blob/blob_gl2.xpm
+share/apps/amor/blob/blob_gl3.xpm
+share/apps/amor/blob/blob_h1.xpm
+share/apps/amor/blob/blob_h2.xpm
+share/apps/amor/blob/blob_h3.xpm
+share/apps/amor/blob/blob_jet1.xpm
+share/apps/amor/blob/blob_jet2.xpm
+share/apps/amor/blob/blob_jet3.xpm
+share/apps/amor/blob/blob_jet4.xpm
+share/apps/amor/blob/blob_l_jet1.xpm
+share/apps/amor/blob/blob_l_jet2.xpm
+share/apps/amor/blob/blob_l_jet3.xpm
+share/apps/amor/blob/blob_l_jet4.xpm
+share/apps/amor/blob/blob_l_turn1.xpm
+share/apps/amor/blob/blob_l_turn2.xpm
+share/apps/amor/blob/blob_l_turn3.xpm
+share/apps/amor/blob/blob_l_turn4.xpm
+share/apps/amor/blob/blob_r135.xpm
+share/apps/amor/blob/blob_r180.xpm
+share/apps/amor/blob/blob_r225.xpm
+share/apps/amor/blob/blob_r270.xpm
+share/apps/amor/blob/blob_r315.xpm
+share/apps/amor/blob/blob_r45.xpm
+share/apps/amor/blob/blob_r90.xpm
+share/apps/amor/blob/blob_r_turn1.xpm
+share/apps/amor/blob/blob_r_turn2.xpm
+share/apps/amor/blob/blob_r_turn3.xpm
+share/apps/amor/blob/blob_r_turn4.xpm
+share/apps/amor/blob/blob_s1.xpm
+share/apps/amor/blob/blob_s2.xpm
+share/apps/amor/blob/blob_s3.xpm
+share/apps/amor/blob/blob_sl1.xpm
+share/apps/amor/blob/blob_sl2.xpm
+share/apps/amor/blob/blob_sl3.xpm
+share/apps/amor/blob/blob_sl4.xpm
+share/apps/amor/blob/blob_z1.xpm
+share/apps/amor/blob/blob_z2.xpm
+share/apps/amor/blob/blob_z3.xpm
+share/apps/amor/blobrc
+share/apps/amor/brc
+share/apps/amor/eyes/eye_1.xpm
+share/apps/amor/eyes/eye_2.xpm
+share/apps/amor/eyes/eye_b.xpm
+share/apps/amor/eyes/eye_d.xpm
+share/apps/amor/eyes/eye_e.xpm
+share/apps/amor/eyes/eye_h1.xpm
+share/apps/amor/eyes/eye_h2.xpm
+share/apps/amor/eyes/eye_h3.xpm
+share/apps/amor/eyes/eye_h4.xpm
+share/apps/amor/eyes/eye_l.xpm
+share/apps/amor/eyes/eye_m1.xpm
+share/apps/amor/eyes/eye_m2.xpm
+share/apps/amor/eyes/eye_m3.xpm
+share/apps/amor/eyes/eye_m4.xpm
+share/apps/amor/eyes/eye_m5.xpm
+share/apps/amor/eyes/eye_m6.xpm
+share/apps/amor/eyes/eye_m7.xpm
+share/apps/amor/eyes/eye_s1.xpm
+share/apps/amor/eyes/eye_s2.xpm
+share/apps/amor/eyes/eye_s3.xpm
+share/apps/amor/eyes/eye_s4.xpm
+share/apps/amor/eyes/eye_u.xpm
+share/apps/amor/eyes/eye_z1.xpm
+share/apps/amor/eyes/eye_z2.xpm
+share/apps/amor/eyes/eye_z3.xpm
+share/apps/amor/eyes/eye_z4.xpm
+share/apps/amor/eyes/eye_z5.xpm
+share/apps/amor/eyesrc
+share/apps/amor/ghost/ghost_1.xpm
+share/apps/amor/ghost/ghost_2.xpm
+share/apps/amor/ghost/ghost_e.xpm
+share/apps/amor/ghost/ghost_m1.xpm
+share/apps/amor/ghost/ghost_m2.xpm
+share/apps/amor/ghost/ghost_m3.xpm
+share/apps/amor/ghost/ghost_m4.xpm
+share/apps/amor/ghost/ghost_m5.xpm
+share/apps/amor/ghost/ghost_m6.xpm
+share/apps/amor/ghost/ghost_m7.xpm
+share/apps/amor/ghost/ghost_z1.xpm
+share/apps/amor/ghost/ghost_z2.xpm
+share/apps/amor/ghost/ghost_z3.xpm
+share/apps/amor/ghost/ghost_z4.xpm
+share/apps/amor/ghost/ghost_z5.xpm
+share/apps/amor/ghostrc
+share/apps/amor/tips-en
+share/apps/kdesktop/programs/kdeworld.desktop
+share/apps/kmoon/pics/moon1.png
+share/apps/kmoon/pics/moon10.png
+share/apps/kmoon/pics/moon11.png
+share/apps/kmoon/pics/moon12.png
+share/apps/kmoon/pics/moon13.png
+share/apps/kmoon/pics/moon14.png
+share/apps/kmoon/pics/moon15.png
+share/apps/kmoon/pics/moon16.png
+share/apps/kmoon/pics/moon17.png
+share/apps/kmoon/pics/moon18.png
+share/apps/kmoon/pics/moon19.png
+share/apps/kmoon/pics/moon2.png
+share/apps/kmoon/pics/moon20.png
+share/apps/kmoon/pics/moon21.png
+share/apps/kmoon/pics/moon22.png
+share/apps/kmoon/pics/moon23.png
+share/apps/kmoon/pics/moon24.png
+share/apps/kmoon/pics/moon25.png
+share/apps/kmoon/pics/moon26.png
+share/apps/kmoon/pics/moon27.png
+share/apps/kmoon/pics/moon28.png
+share/apps/kmoon/pics/moon29.png
+share/apps/kmoon/pics/moon3.png
+share/apps/kmoon/pics/moon4.png
+share/apps/kmoon/pics/moon5.png
+share/apps/kmoon/pics/moon6.png
+share/apps/kmoon/pics/moon7.png
+share/apps/kmoon/pics/moon8.png
+share/apps/kmoon/pics/moon9.png
+share/apps/kworldwatch/pics/bio_800.jpg
+share/apps/kworldwatch/pics/depths_400.jpg
 share/apps/kworldwatch/pics/flag-blue.xpm
 share/apps/kworldwatch/pics/flag-green.xpm
 share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
-share/apps/kworldwatch/pics/world.xpm
-share/apps/kworldwatch/pics/world2.xpm
-share/apps/kworldwatch/pics/world_dark.xpm
-share/icons/kmoon.xpm
-share/icons/kworldwatch.xpm
-share/icons/large/kmoon.xpm
-share/icons/large/kworldwatch.xpm
-share/icons/mini/kmoon.xpm
-share/icons/mini/kworldwatch.xpm
-share/locale/br/LC_MESSAGES/kmoon.mo
-share/locale/br/LC_MESSAGES/kworldwatch.mo
-share/locale/cs/LC_MESSAGES/kmoon.mo
-share/locale/cs/LC_MESSAGES/kworldwatch.mo
-share/locale/da/LC_MESSAGES/kmoon.mo
-share/locale/da/LC_MESSAGES/kworldwatch.mo
-share/locale/de/LC_MESSAGES/kmoon.mo
-share/locale/de/LC_MESSAGES/kworldwatch.mo
-share/locale/es/LC_MESSAGES/kmoon.mo
-share/locale/es/LC_MESSAGES/kworldwatch.mo
-share/locale/et/LC_MESSAGES/kmoon.mo
-share/locale/et/LC_MESSAGES/kworldwatch.mo
-share/locale/fi/LC_MESSAGES/kmoon.mo
-share/locale/fi/LC_MESSAGES/kworldwatch.mo
-share/locale/fr/LC_MESSAGES/kmoon.mo
-share/locale/fr/LC_MESSAGES/kworldwatch.mo
-share/locale/hr/LC_MESSAGES/kmoon.mo
-share/locale/hr/LC_MESSAGES/kworldwatch.mo
-share/locale/is/LC_MESSAGES/kmoon.mo
-share/locale/is/LC_MESSAGES/kworldwatch.mo
-share/locale/ja/LC_MESSAGES/kmoon.mo
-share/locale/ja/LC_MESSAGES/kworldwatch.mo
-share/locale/no/LC_MESSAGES/kmoon.mo
-share/locale/no/LC_MESSAGES/kworldwatch.mo
-share/locale/pl/LC_MESSAGES/kmoon.mo
-share/locale/pl/LC_MESSAGES/kworldwatch.mo
-share/locale/pt/LC_MESSAGES/kmoon.mo
-share/locale/pt/LC_MESSAGES/kworldwatch.mo
-share/locale/pt_BR/LC_MESSAGES/kmoon.mo
-share/locale/pt_BR/LC_MESSAGES/kworldwatch.mo
-share/locale/ro/LC_MESSAGES/kworldwatch.mo
-share/locale/sk/LC_MESSAGES/kmoon.mo
-share/locale/sk/LC_MESSAGES/kworldwatch.mo
-share/locale/sl/LC_MESSAGES/kmoon.mo
-share/locale/sl/LC_MESSAGES/kworldwatch.mo
-share/locale/sv/LC_MESSAGES/kmoon.mo
-share/locale/sv/LC_MESSAGES/kworldwatch.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmoon.mo
+share/apps/kworldwatch/pics/photo_400.jpg
+share/apps/kworldwatch/pics/world2.png
+share/doc/HTML/en/mouse/.anchors
+share/doc/HTML/en/mouse/compilationandinstallation.html
+share/doc/HTML/en/mouse/guide.png
+share/doc/HTML/en/mouse/howitworks.html
+share/doc/HTML/en/mouse/index.cvlog
+share/doc/HTML/en/mouse/index.docbook
+share/doc/HTML/en/mouse/index.html
+share/doc/HTML/en/mouse/installation.html
+share/doc/HTML/en/mouse/introduction.html
+share/doc/HTML/en/mouse/onscreenoperation.html
+share/icons/hicolor/32x32/apps/kmoon.png
+share/icons/hicolor/32x32/apps/kworldwatch.png
+share/icons/hicolor/48x48/apps/kmoon.png
+share/icons/hicolor/48x48/apps/kworldwatch.png
+share/icons/locolor/16x16/apps/amor.png
+share/icons/locolor/16x16/apps/kmoon.png
+share/icons/locolor/16x16/apps/kteatime.png
+share/icons/locolor/16x16/apps/kworldwatch.png
+share/icons/locolor/32x32/apps/amor.png
+share/icons/locolor/32x32/apps/kmoon.png
+share/icons/locolor/32x32/apps/kworldwatch.png
+@unexec rm -f %D/share/apps/amor/tips-default
+@unexec rm -f %D/share/doc/HTML/en/mouse/common
+@dirrm share/doc/HTML/en/mouse
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
 @dirrm share/apps/kmoon
+@dirrm share/apps/kdesktop/programs
+@dirrm share/apps/kdesktop
+@dirrm share/apps/amor/ghost
+@dirrm share/apps/amor/eyes
+@dirrm share/apps/amor/blob
+@dirrm share/apps/amor/b
+@dirrm share/apps/amor
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index 083b9200fee8..8bd405dfe70d 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -1,26 +1,24 @@
-# New ports collection makefile for:   kde
-# Date created:        4 November 1997
-# Whom:                Satoshi Asami <asami@FreeBSD.org>
+# New ports collection makefile for:	KDE2
+# Date created:				Sun May 14 2000 00:50:02
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kde
-PORTVERSION=	1.1.2
+PORTVERSION=	1.90
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	se@freebsd.org
+MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11 \
-		kcalc:${PORTSDIR}/misc/kdeutils11 \
-		kmahjongg:${PORTSDIR}/games/kdegames11 \
-		kghostview:${PORTSDIR}/graphics/kdegraphics11 \
-		kmail:${PORTSDIR}/net/kdenetwork11 \
-		kmedia:${PORTSDIR}/audio/kdemultimedia11
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
+		kcalc:${PORTSDIR}/misc/kdeutils2 \
+		kmahjongg:${PORTSDIR}/games/kdegames2 \
+		kmail:${PORTSDIR}/net/kdenetwork2
 
 NO_BUILD=	yes
 
diff --git a/x11/kde2/pkg-comment b/x11/kde2/pkg-comment
index 82c382714d8e..4d7b170ccb85 100644
--- a/x11/kde2/pkg-comment
+++ b/x11/kde2/pkg-comment
@@ -1 +1 @@
-The "meta-port" for the KDE integrated X11 desktop
+The "meta-port" for KDE 2
diff --git a/x11/kde2/pkg-descr b/x11/kde2/pkg-descr
index 3947b85acf58..3fc0b789d994 100644
--- a/x11/kde2/pkg-descr
+++ b/x11/kde2/pkg-descr
@@ -4,4 +4,6 @@ This package does not contain anything by itself -- it is a
 "meta-port" that depends on other KDE packages.  Its sole purpose is
 to require dependencies so users can install this package only and
 have all the KDE stuff pulled in by the port/package dependency
-mechanism.
+mechanism.  This meta-port installs KDE version 2.
+
+WWW: http://www.kde.org/
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index 083b9200fee8..8bd405dfe70d 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -1,26 +1,24 @@
-# New ports collection makefile for:   kde
-# Date created:        4 November 1997
-# Whom:                Satoshi Asami <asami@FreeBSD.org>
+# New ports collection makefile for:	KDE2
+# Date created:				Sun May 14 2000 00:50:02
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kde
-PORTVERSION=	1.1.2
+PORTVERSION=	1.90
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	se@freebsd.org
+MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11 \
-		kcalc:${PORTSDIR}/misc/kdeutils11 \
-		kmahjongg:${PORTSDIR}/games/kdegames11 \
-		kghostview:${PORTSDIR}/graphics/kdegraphics11 \
-		kmail:${PORTSDIR}/net/kdenetwork11 \
-		kmedia:${PORTSDIR}/audio/kdemultimedia11
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
+		kcalc:${PORTSDIR}/misc/kdeutils2 \
+		kmahjongg:${PORTSDIR}/games/kdegames2 \
+		kmail:${PORTSDIR}/net/kdenetwork2
 
 NO_BUILD=	yes
 
diff --git a/x11/kde3/pkg-comment b/x11/kde3/pkg-comment
index 82c382714d8e..4d7b170ccb85 100644
--- a/x11/kde3/pkg-comment
+++ b/x11/kde3/pkg-comment
@@ -1 +1 @@
-The "meta-port" for the KDE integrated X11 desktop
+The "meta-port" for KDE 2
diff --git a/x11/kde3/pkg-descr b/x11/kde3/pkg-descr
index 3947b85acf58..3fc0b789d994 100644
--- a/x11/kde3/pkg-descr
+++ b/x11/kde3/pkg-descr
@@ -4,4 +4,6 @@ This package does not contain anything by itself -- it is a
 "meta-port" that depends on other KDE packages.  Its sole purpose is
 to require dependencies so users can install this package only and
 have all the KDE stuff pulled in by the port/package dependency
-mechanism.
+mechanism.  This meta-port installs KDE version 2.
+
+WWW: http://www.kde.org/
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 083b9200fee8..8bd405dfe70d 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -1,26 +1,24 @@
-# New ports collection makefile for:   kde
-# Date created:        4 November 1997
-# Whom:                Satoshi Asami <asami@FreeBSD.org>
+# New ports collection makefile for:	KDE2
+# Date created:				Sun May 14 2000 00:50:02
+# Whom:					Will Andrews <will@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kde
-PORTVERSION=	1.1.2
+PORTVERSION=	1.90
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	se@freebsd.org
+MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11 \
-		kcalc:${PORTSDIR}/misc/kdeutils11 \
-		kmahjongg:${PORTSDIR}/games/kdegames11 \
-		kghostview:${PORTSDIR}/graphics/kdegraphics11 \
-		kmail:${PORTSDIR}/net/kdenetwork11 \
-		kmedia:${PORTSDIR}/audio/kdemultimedia11
+LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
+RUN_DEPENDS=	konqueror:${PORTSDIR}/x11/kdebase2 \
+		kcalc:${PORTSDIR}/misc/kdeutils2 \
+		kmahjongg:${PORTSDIR}/games/kdegames2 \
+		kmail:${PORTSDIR}/net/kdenetwork2
 
 NO_BUILD=	yes
 
diff --git a/x11/kde4/pkg-comment b/x11/kde4/pkg-comment
index 82c382714d8e..4d7b170ccb85 100644
--- a/x11/kde4/pkg-comment
+++ b/x11/kde4/pkg-comment
@@ -1 +1 @@
-The "meta-port" for the KDE integrated X11 desktop
+The "meta-port" for KDE 2
diff --git a/x11/kde4/pkg-descr b/x11/kde4/pkg-descr
index 3947b85acf58..3fc0b789d994 100644
--- a/x11/kde4/pkg-descr
+++ b/x11/kde4/pkg-descr
@@ -4,4 +4,6 @@ This package does not contain anything by itself -- it is a
 "meta-port" that depends on other KDE packages.  Its sole purpose is
 to require dependencies so users can install this package only and
 have all the KDE stuff pulled in by the port/package dependency
-mechanism.
+mechanism.  This meta-port installs KDE version 2.
+
+WWW: http://www.kde.org/