Lo and behold, welcome KDE 2.1 to our ports tree. As a direct result of

the KDE team's excellent work, I am initiating burn sequence for KDE
1.x.  All base KDE1 ports are hereby nuked.  I am also reluctantly
reassuming maintainership of the KDE2 ports.  Official KDE 2.1 packages
built for FreeBSD 4.2-STABLE w/ XFree86 4.0.2 are available on KDE's
official ftp mirrors now.  Enjoy!

Note:  It seems that the KDE people rerolled their kdelibs and kdebase
packages, and a quick examination of diffs reveal minor changes, but the
port should still work.  I'll fix the packaging problems that bento runs
into.

Approved by:	kevlo

17 files changed, 282 insertions, 228 deletions

diff --git a/x11-clocks/Makefile b/x11-clocks/Makefile
index a95fea2bc469..7607d6f3ddcb 100644
--- a/x11-clocks/Makefile
+++ b/x11-clocks/Makefile
@@ -12,7 +12,6 @@
     SUBDIR += emiclock
     SUBDIR += eyeclock
     SUBDIR += glclock
-    SUBDIR += kdetoys11
     SUBDIR += kdetoys2
     SUBDIR += mlclock
     SUBDIR += mouseclock
diff --git a/x11-clocks/kdetoys11/Makefile b/x11-clocks/kdetoys11/Makefile
deleted file mode 100644
index 546cf8479754..000000000000
--- a/x11-clocks/kdetoys11/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for:	kdetoys
-# Date created:		18 may 1999
-# Whom:			imura@af.airnet.ne.jp
-#
-# $FreeBSD$
-#
-
-PORTNAME=	kdetoys
-PORTVERSION=	1.1.2
-CATEGORIES=	x11-clocks kde
-MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR=	Attic/old/1.1.2/distribution/tar/generic/source/bz2
-
-MAINTAINER=	ports@FreeBSD.org
-
-BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
-LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11
-
-NO_LATEST_LINK=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_NEWGCC=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	"--with-qt-includes=${QTDIR}/include/X11/qt" \
-		"--with-extra-includes=${LOCALBASE}/include" \
-		"--with-extra-libs=${LOCALBASE}/lib"
-CONFIGURE_ENV=	QTDIR=${QTDIR} \
-		DO_NOT_COMPILE=mouse
-
-.if defined(PREFIX)
-QTDIR?=		${PREFIX}
-.else
-QTDIR?=		${X11BASE}
-.endif
-
-.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys11/distinfo b/x11-clocks/kdetoys11/distinfo
deleted file mode 100644
index 1d075d1fe04d..000000000000
--- a/x11-clocks/kdetoys11/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (kdetoys-1.1.2.tar.bz2) = 0bf12bd887b497a3ba35beea198cd63f
diff --git a/x11-clocks/kdetoys11/files/patch-ba b/x11-clocks/kdetoys11/files/patch-ba
deleted file mode 100644
index 386ea82efbe2..000000000000
--- a/x11-clocks/kdetoys11/files/patch-ba
+++ /dev/null
@@ -1,39 +0,0 @@
---- kmoon/pics/Makefile.in.orig	Tue Aug 24 23:08:20 1999
-+++ kmoon/pics/Makefile.in	Mon Aug 30 23:39:51 1999
-@@ -157,7 +157,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--pics_DATA =  	moon1.gif    moon14.gif   moon19.gif   moon22.gif   moon27.gif   	moon5.gif    moon10.gif   moon15.gif   moon23.gif   moon9.gif    	moon28.gif   moon6.gif    moon11.gif   moon16.gif   moon2.gif    	moon24.gif   moon29.gif   moon7.gif    moon12.gif   moon17.gif   	moon20.gif   moon25.gif   moon3.gif    moon8.gif    moon13.gif   	moon18.gif   moon21.gif   moon26.gif   moon4.gif    
-+pics_DATA =  	moon1.xpm    moon14.xpm   moon19.xpm   moon22.xpm   moon27.xpm   	moon5.xpm    moon10.xpm   moon15.xpm   moon23.xpm   moon9.xpm    	moon28.xpm   moon6.xpm    moon11.xpm   moon16.xpm   moon2.xpm    	moon24.xpm   moon29.xpm   moon7.xpm    moon12.xpm   moon17.xpm   	moon20.xpm   moon25.xpm   moon3.xpm    moon8.xpm    moon13.xpm   	moon18.xpm   moon21.xpm   moon26.xpm   moon4.xpm    
- 
- 
- picsdir = $(kde_datadir)/kmoon/pics
-@@ -177,6 +177,7 @@
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
-+.SUFFIXES: .gif .xpm
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
- 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kmoon/pics/Makefile
- 
-@@ -284,6 +285,8 @@
- mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
-+.gif.xpm:
-+	$(LOCALBASE)/bin/convert $< $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- kmoon/kmoon.cpp.orig	Fri Aug 27 02:43:57 1999
-+++ kmoon/kmoon.cpp	Fri Aug 27 02:44:12 1999
-@@ -97,7 +97,7 @@
- 
-     for (int i = 1; i <= 29; i++) {
- 	QString name;
--	name.sprintf("%s/kmoon/pics/moon%d.gif",
-+	name.sprintf("%s/kmoon/pics/moon%d.xpm",
- 		     KApplication::kde_datadir().data(),
- 		     i);
- 	QImage *p = new QImage(name);
diff --git a/x11-clocks/kdetoys11/files/patch-bb b/x11-clocks/kdetoys11/files/patch-bb
deleted file mode 100644
index cd2f97541dfd..000000000000
--- a/x11-clocks/kdetoys11/files/patch-bb
+++ /dev/null
@@ -1,52 +0,0 @@
---- kworldwatch/pics/Makefile.in.orig	Tue Aug 24 23:08:20 1999
-+++ kworldwatch/pics/Makefile.in	Mon Aug 30 23:40:51 1999
-@@ -156,7 +156,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- 
--data_DATA = flag-blue.xpm flag-green.xpm flag-yellow.xpm flag-red.xpm             world.gif world2.gif world_dark.gif
-+data_DATA = flag-blue.xpm flag-green.xpm flag-yellow.xpm flag-red.xpm             world.xpm world2.xpm world_dark.xpm
- 
- 
- datadir = $(kde_datadir)/kworldwatch/pics
-@@ -174,6 +174,7 @@
- GZIP_ENV = --best
- all: all-redirect
- .SUFFIXES:
-+.SUFFIXES: .gif .xpm
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
- 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kworldwatch/pics/Makefile
- 
-@@ -281,6 +282,8 @@
- mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
-+.gif.xpm:
-+	$(LOCALBASE)/bin/convert $< $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- kworldwatch/world.cpp.orig	Fri Aug 27 02:50:27 1999
-+++ kworldwatch/world.cpp	Fri Aug 27 02:50:41 1999
-@@ -37,10 +37,10 @@
-   QFontMetrics metric(font);
-   KIconLoader  iconLoader;
- 
--  cleanMap = iconLoader.loadIcon("world.gif");
-+  cleanMap = iconLoader.loadIcon("world.xpm");
-   if (cleanMap.isNull())
-     abort();
--  darkMap = iconLoader.loadIcon("world_dark.gif");
-+  darkMap = iconLoader.loadIcon("world_dark.xpm");
-   if (darkMap.isNull())
-     abort();
-   map = cleanMap;
-@@ -259,7 +259,7 @@
-     button(klocale->translate("Close"), this)
- {
-   KIconLoader iconLoader;
--  QPixmap back(iconLoader.loadIcon("world2.gif"));
-+  QPixmap back(iconLoader.loadIcon("world2.xpm"));
- 
-   setCaption(klocale->translate("About KDE World Watch"));
-   setFixedSize(back.width(), back.height());
diff --git a/x11-clocks/kdetoys11/pkg-comment b/x11-clocks/kdetoys11/pkg-comment
deleted file mode 100644
index 678c9f72888f..000000000000
--- a/x11-clocks/kdetoys11/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small applications for the KDE integrated X11 desktop
diff --git a/x11-clocks/kdetoys11/pkg-descr b/x11-clocks/kdetoys11/pkg-descr
deleted file mode 100644
index 90ae45773bea..000000000000
--- a/x11-clocks/kdetoys11/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
diff --git a/x11-clocks/kdetoys11/pkg-plist b/x11-clocks/kdetoys11/pkg-plist
deleted file mode 100644
index 58fd567ff5f7..000000000000
--- a/x11-clocks/kdetoys11/pkg-plist
+++ /dev/null
@@ -1,88 +0,0 @@
-bin/kmoon
-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/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
-@dirrm share/apps/kworldwatch/pics
-@dirrm share/apps/kworldwatch
-@dirrm share/apps/kmoon/pics
-@dirrm share/apps/kmoon
diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index 76e7e3e983ee..4a5fca050001 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	kdetoys
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
-MAINTAINER=	kevlo@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo
index 87ddcb2e1333..c2f11fff9b47 100644
--- a/x11-clocks/kdetoys2/distinfo
+++ b/x11-clocks/kdetoys2/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-2.0.tar.bz2) = f65811ba3ad48c3b336e8464fc5b7df4
+MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627
diff --git a/x11-clocks/kdetoys2/pkg-plist b/x11-clocks/kdetoys2/pkg-plist
index f1dade72d425..2c1e204c3a69 100644
--- a/x11-clocks/kdetoys2/pkg-plist
+++ b/x11-clocks/kdetoys2/pkg-plist
@@ -1,10 +1,17 @@
 bin/amor
 bin/kmoon
+bin/kscore_excite.pl
 bin/kteatime
+bin/ktux
 bin/kworldwatch
+include/AmorIface.h
 lib/libkeyesapplet.la
 lib/libkeyesapplet.so
 lib/libkeyesapplet.so.1
+lib/libkscoreapplet.la
+lib/libkscoreapplet.so
+lib/libkscoreapplet.so.1
+share/applnk/System/ScreenSavers/ktux.desktop
 share/applnk/Toys/amor.desktop
 share/applnk/Toys/kmoon.desktop
 share/applnk/Toys/kteatime.desktop
@@ -304,6 +311,7 @@ share/apps/amor/pingu/walk_r6.xpm
 share/apps/amor/pingu/walk_r7.xpm
 share/apps/amor/pingu/walk_r8.xpm
 share/apps/amor/pingurc
+share/apps/amor/tips
 share/apps/amor/tips-en
 share/apps/amor/worm/w-a1.xpm
 share/apps/amor/worm/w-a2.xpm
@@ -344,6 +352,7 @@ share/apps/amor/worm/w-wr2.xpm
 share/apps/amor/wormrc
 share/apps/kdesktop/programs/kdeworld.desktop
 share/apps/kicker/applets/eyesapplet.desktop
+share/apps/kicker/applets/kscoreapplet.desktop
 share/apps/kmoon/pics/moon1.png
 share/apps/kmoon/pics/moon10.png
 share/apps/kmoon/pics/moon11.png
@@ -373,6 +382,22 @@ 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/ktux/sprites/anim0001.png
+share/apps/ktux/sprites/anim0002.png
+share/apps/ktux/sprites/anim0003.png
+share/apps/ktux/sprites/anim0004.png
+share/apps/ktux/sprites/anim0005.png
+share/apps/ktux/sprites/anim0006.png
+share/apps/ktux/sprites/anim0007.png
+share/apps/ktux/sprites/anim0008.png
+share/apps/ktux/sprites/anim0009.png
+share/apps/ktux/sprites/anim0010.png
+share/apps/ktux/sprites/bg.png
+share/apps/ktux/sprites/flare0001.png
+share/apps/ktux/sprites/flare0002.png
+share/apps/ktux/sprites/spriterc
+share/apps/ktux/sprites/star0001.png
+share/apps/ktux/sprites/star0002.png
 share/apps/kworldwatch/pics/bio_800.png
 share/apps/kworldwatch/pics/depths_400.png
 share/apps/kworldwatch/pics/flag-blue.xpm
@@ -381,7 +406,19 @@ share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
 share/apps/kworldwatch/pics/photo_400.png
 share/apps/kworldwatch/pics/world2.png
+share/doc/HTML/en/amor/.anchors
+share/doc/HTML/en/amor/common
+share/doc/HTML/en/amor/index.docbook
+share/doc/HTML/en/amor/index.html
+share/doc/HTML/en/amor/introduction.html
+share/doc/HTML/en/kmoon/.anchors
+share/doc/HTML/en/kmoon/carlosmail
+share/doc/HTML/en/kmoon/common
+share/doc/HTML/en/kmoon/index.docbook
+share/doc/HTML/en/kmoon/index.html
+share/doc/HTML/en/kmoon/introduction.html
 share/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
 share/doc/HTML/en/kodo/compilationandinstallation.html
 share/doc/HTML/en/kodo/guide.png
 share/doc/HTML/en/kodo/howitworks.html
@@ -391,6 +428,43 @@ share/doc/HTML/en/kodo/index.html
 share/doc/HTML/en/kodo/installation.html
 share/doc/HTML/en/kodo/introduction.html
 share/doc/HTML/en/kodo/onscreenoperation.html
+share/doc/HTML/en/kscore/.anchors
+share/doc/HTML/en/kscore/command-ref.html
+share/doc/HTML/en/kscore/common
+share/doc/HTML/en/kscore/compilation.html
+share/doc/HTML/en/kscore/credits-and-licenses.html
+share/doc/HTML/en/kscore/dl_fail.png
+share/doc/HTML/en/kscore/faq.html
+share/doc/HTML/en/kscore/index.docbook
+share/doc/HTML/en/kscore/index.html
+share/doc/HTML/en/kscore/installation.html
+share/doc/HTML/en/kscore/introduction.html
+share/doc/HTML/en/kscore/ncaaf.png
+share/doc/HTML/en/kscore/nhl.png
+share/doc/HTML/en/kscore/no_score.png
+share/doc/HTML/en/kscore/premr.png
+share/doc/HTML/en/kscore/q-and-a.html
+share/doc/HTML/en/kscore/requirements.html
+share/doc/HTML/en/kscore/settings.png
+share/doc/HTML/en/kscore/using-kscore.html
+share/doc/HTML/en/kteatime/.anchors
+share/doc/HTML/en/kteatime/common
+share/doc/HTML/en/kteatime/compilation-and-installation.html
+share/doc/HTML/en/kteatime/config.png
+share/doc/HTML/en/kteatime/configure.html
+share/doc/HTML/en/kteatime/credits.html
+share/doc/HTML/en/kteatime/how-to-use.html
+share/doc/HTML/en/kteatime/index.docbook
+share/doc/HTML/en/kteatime/index.html
+share/doc/HTML/en/kteatime/installation.html
+share/doc/HTML/en/kteatime/introduction.html
+share/doc/HTML/en/kteatime/menu-options.html
+share/doc/HTML/en/kteatime/start.html
+share/doc/HTML/en/kworldwatch/.anchors
+share/doc/HTML/en/kworldwatch/common
+share/doc/HTML/en/kworldwatch/index.docbook
+share/doc/HTML/en/kworldwatch/index.html
+share/doc/HTML/en/kworldwatch/introduction.html
 share/icons/hicolor/32x32/apps/amor.png
 share/icons/hicolor/32x32/apps/kmoon.png
 share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -399,12 +473,26 @@ 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/ktux.png
 share/icons/locolor/16x16/apps/kworldwatch.png
 share/icons/locolor/32x32/apps/kmoon.png
+share/icons/locolor/32x32/apps/ktux.png
 share/icons/locolor/32x32/apps/kworldwatch.png
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/doc/HTML/en/kworldwatch
+@dirrm share/doc/HTML/en/kteatime
+@dirrm share/doc/HTML/en/kscore
 @dirrm share/doc/HTML/en/kodo
+@dirrm share/doc/HTML/en/kmoon
+@dirrm share/doc/HTML/en/amor
+@dirrm share/doc/HTML/en
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
+@dirrm share/apps/ktux/sprites
+@dirrm share/apps/ktux
 @dirrm share/apps/kmoon/pics
 @dirrm share/apps/kmoon
 @dirrm share/apps/kicker/applets
@@ -417,3 +505,6 @@ share/icons/locolor/32x32/apps/kworldwatch.png
 @dirrm share/apps/amor/blob
 @dirrm share/apps/amor/b
 @dirrm share/apps/amor
+@dirrm share/apps
+@dirrm share/applnk/Toys
+@dirrm share/applnk/System/ScreenSavers
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 76e7e3e983ee..4a5fca050001 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	kdetoys
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
-MAINTAINER=	kevlo@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index 87ddcb2e1333..c2f11fff9b47 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-2.0.tar.bz2) = f65811ba3ad48c3b336e8464fc5b7df4
+MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index f1dade72d425..2c1e204c3a69 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -1,10 +1,17 @@
 bin/amor
 bin/kmoon
+bin/kscore_excite.pl
 bin/kteatime
+bin/ktux
 bin/kworldwatch
+include/AmorIface.h
 lib/libkeyesapplet.la
 lib/libkeyesapplet.so
 lib/libkeyesapplet.so.1
+lib/libkscoreapplet.la
+lib/libkscoreapplet.so
+lib/libkscoreapplet.so.1
+share/applnk/System/ScreenSavers/ktux.desktop
 share/applnk/Toys/amor.desktop
 share/applnk/Toys/kmoon.desktop
 share/applnk/Toys/kteatime.desktop
@@ -304,6 +311,7 @@ share/apps/amor/pingu/walk_r6.xpm
 share/apps/amor/pingu/walk_r7.xpm
 share/apps/amor/pingu/walk_r8.xpm
 share/apps/amor/pingurc
+share/apps/amor/tips
 share/apps/amor/tips-en
 share/apps/amor/worm/w-a1.xpm
 share/apps/amor/worm/w-a2.xpm
@@ -344,6 +352,7 @@ share/apps/amor/worm/w-wr2.xpm
 share/apps/amor/wormrc
 share/apps/kdesktop/programs/kdeworld.desktop
 share/apps/kicker/applets/eyesapplet.desktop
+share/apps/kicker/applets/kscoreapplet.desktop
 share/apps/kmoon/pics/moon1.png
 share/apps/kmoon/pics/moon10.png
 share/apps/kmoon/pics/moon11.png
@@ -373,6 +382,22 @@ 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/ktux/sprites/anim0001.png
+share/apps/ktux/sprites/anim0002.png
+share/apps/ktux/sprites/anim0003.png
+share/apps/ktux/sprites/anim0004.png
+share/apps/ktux/sprites/anim0005.png
+share/apps/ktux/sprites/anim0006.png
+share/apps/ktux/sprites/anim0007.png
+share/apps/ktux/sprites/anim0008.png
+share/apps/ktux/sprites/anim0009.png
+share/apps/ktux/sprites/anim0010.png
+share/apps/ktux/sprites/bg.png
+share/apps/ktux/sprites/flare0001.png
+share/apps/ktux/sprites/flare0002.png
+share/apps/ktux/sprites/spriterc
+share/apps/ktux/sprites/star0001.png
+share/apps/ktux/sprites/star0002.png
 share/apps/kworldwatch/pics/bio_800.png
 share/apps/kworldwatch/pics/depths_400.png
 share/apps/kworldwatch/pics/flag-blue.xpm
@@ -381,7 +406,19 @@ share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
 share/apps/kworldwatch/pics/photo_400.png
 share/apps/kworldwatch/pics/world2.png
+share/doc/HTML/en/amor/.anchors
+share/doc/HTML/en/amor/common
+share/doc/HTML/en/amor/index.docbook
+share/doc/HTML/en/amor/index.html
+share/doc/HTML/en/amor/introduction.html
+share/doc/HTML/en/kmoon/.anchors
+share/doc/HTML/en/kmoon/carlosmail
+share/doc/HTML/en/kmoon/common
+share/doc/HTML/en/kmoon/index.docbook
+share/doc/HTML/en/kmoon/index.html
+share/doc/HTML/en/kmoon/introduction.html
 share/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
 share/doc/HTML/en/kodo/compilationandinstallation.html
 share/doc/HTML/en/kodo/guide.png
 share/doc/HTML/en/kodo/howitworks.html
@@ -391,6 +428,43 @@ share/doc/HTML/en/kodo/index.html
 share/doc/HTML/en/kodo/installation.html
 share/doc/HTML/en/kodo/introduction.html
 share/doc/HTML/en/kodo/onscreenoperation.html
+share/doc/HTML/en/kscore/.anchors
+share/doc/HTML/en/kscore/command-ref.html
+share/doc/HTML/en/kscore/common
+share/doc/HTML/en/kscore/compilation.html
+share/doc/HTML/en/kscore/credits-and-licenses.html
+share/doc/HTML/en/kscore/dl_fail.png
+share/doc/HTML/en/kscore/faq.html
+share/doc/HTML/en/kscore/index.docbook
+share/doc/HTML/en/kscore/index.html
+share/doc/HTML/en/kscore/installation.html
+share/doc/HTML/en/kscore/introduction.html
+share/doc/HTML/en/kscore/ncaaf.png
+share/doc/HTML/en/kscore/nhl.png
+share/doc/HTML/en/kscore/no_score.png
+share/doc/HTML/en/kscore/premr.png
+share/doc/HTML/en/kscore/q-and-a.html
+share/doc/HTML/en/kscore/requirements.html
+share/doc/HTML/en/kscore/settings.png
+share/doc/HTML/en/kscore/using-kscore.html
+share/doc/HTML/en/kteatime/.anchors
+share/doc/HTML/en/kteatime/common
+share/doc/HTML/en/kteatime/compilation-and-installation.html
+share/doc/HTML/en/kteatime/config.png
+share/doc/HTML/en/kteatime/configure.html
+share/doc/HTML/en/kteatime/credits.html
+share/doc/HTML/en/kteatime/how-to-use.html
+share/doc/HTML/en/kteatime/index.docbook
+share/doc/HTML/en/kteatime/index.html
+share/doc/HTML/en/kteatime/installation.html
+share/doc/HTML/en/kteatime/introduction.html
+share/doc/HTML/en/kteatime/menu-options.html
+share/doc/HTML/en/kteatime/start.html
+share/doc/HTML/en/kworldwatch/.anchors
+share/doc/HTML/en/kworldwatch/common
+share/doc/HTML/en/kworldwatch/index.docbook
+share/doc/HTML/en/kworldwatch/index.html
+share/doc/HTML/en/kworldwatch/introduction.html
 share/icons/hicolor/32x32/apps/amor.png
 share/icons/hicolor/32x32/apps/kmoon.png
 share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -399,12 +473,26 @@ 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/ktux.png
 share/icons/locolor/16x16/apps/kworldwatch.png
 share/icons/locolor/32x32/apps/kmoon.png
+share/icons/locolor/32x32/apps/ktux.png
 share/icons/locolor/32x32/apps/kworldwatch.png
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/doc/HTML/en/kworldwatch
+@dirrm share/doc/HTML/en/kteatime
+@dirrm share/doc/HTML/en/kscore
 @dirrm share/doc/HTML/en/kodo
+@dirrm share/doc/HTML/en/kmoon
+@dirrm share/doc/HTML/en/amor
+@dirrm share/doc/HTML/en
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
+@dirrm share/apps/ktux/sprites
+@dirrm share/apps/ktux
 @dirrm share/apps/kmoon/pics
 @dirrm share/apps/kmoon
 @dirrm share/apps/kicker/applets
@@ -417,3 +505,6 @@ share/icons/locolor/32x32/apps/kworldwatch.png
 @dirrm share/apps/amor/blob
 @dirrm share/apps/amor/b
 @dirrm share/apps/amor
+@dirrm share/apps
+@dirrm share/applnk/Toys
+@dirrm share/applnk/System/ScreenSavers
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 76e7e3e983ee..4a5fca050001 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	kdetoys
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
 
-MAINTAINER=	kevlo@FreeBSD.org
+MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	kdecore.4:${PORTSDIR}/x11/kdelibs2
 
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index 87ddcb2e1333..c2f11fff9b47 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1 +1 @@
-MD5 (kdetoys-2.0.tar.bz2) = f65811ba3ad48c3b336e8464fc5b7df4
+MD5 (kdetoys-2.1.tar.bz2) = fa4a8e6a77cd0c37ab0ff58de2c34627
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index f1dade72d425..2c1e204c3a69 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -1,10 +1,17 @@
 bin/amor
 bin/kmoon
+bin/kscore_excite.pl
 bin/kteatime
+bin/ktux
 bin/kworldwatch
+include/AmorIface.h
 lib/libkeyesapplet.la
 lib/libkeyesapplet.so
 lib/libkeyesapplet.so.1
+lib/libkscoreapplet.la
+lib/libkscoreapplet.so
+lib/libkscoreapplet.so.1
+share/applnk/System/ScreenSavers/ktux.desktop
 share/applnk/Toys/amor.desktop
 share/applnk/Toys/kmoon.desktop
 share/applnk/Toys/kteatime.desktop
@@ -304,6 +311,7 @@ share/apps/amor/pingu/walk_r6.xpm
 share/apps/amor/pingu/walk_r7.xpm
 share/apps/amor/pingu/walk_r8.xpm
 share/apps/amor/pingurc
+share/apps/amor/tips
 share/apps/amor/tips-en
 share/apps/amor/worm/w-a1.xpm
 share/apps/amor/worm/w-a2.xpm
@@ -344,6 +352,7 @@ share/apps/amor/worm/w-wr2.xpm
 share/apps/amor/wormrc
 share/apps/kdesktop/programs/kdeworld.desktop
 share/apps/kicker/applets/eyesapplet.desktop
+share/apps/kicker/applets/kscoreapplet.desktop
 share/apps/kmoon/pics/moon1.png
 share/apps/kmoon/pics/moon10.png
 share/apps/kmoon/pics/moon11.png
@@ -373,6 +382,22 @@ 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/ktux/sprites/anim0001.png
+share/apps/ktux/sprites/anim0002.png
+share/apps/ktux/sprites/anim0003.png
+share/apps/ktux/sprites/anim0004.png
+share/apps/ktux/sprites/anim0005.png
+share/apps/ktux/sprites/anim0006.png
+share/apps/ktux/sprites/anim0007.png
+share/apps/ktux/sprites/anim0008.png
+share/apps/ktux/sprites/anim0009.png
+share/apps/ktux/sprites/anim0010.png
+share/apps/ktux/sprites/bg.png
+share/apps/ktux/sprites/flare0001.png
+share/apps/ktux/sprites/flare0002.png
+share/apps/ktux/sprites/spriterc
+share/apps/ktux/sprites/star0001.png
+share/apps/ktux/sprites/star0002.png
 share/apps/kworldwatch/pics/bio_800.png
 share/apps/kworldwatch/pics/depths_400.png
 share/apps/kworldwatch/pics/flag-blue.xpm
@@ -381,7 +406,19 @@ share/apps/kworldwatch/pics/flag-red.xpm
 share/apps/kworldwatch/pics/flag-yellow.xpm
 share/apps/kworldwatch/pics/photo_400.png
 share/apps/kworldwatch/pics/world2.png
+share/doc/HTML/en/amor/.anchors
+share/doc/HTML/en/amor/common
+share/doc/HTML/en/amor/index.docbook
+share/doc/HTML/en/amor/index.html
+share/doc/HTML/en/amor/introduction.html
+share/doc/HTML/en/kmoon/.anchors
+share/doc/HTML/en/kmoon/carlosmail
+share/doc/HTML/en/kmoon/common
+share/doc/HTML/en/kmoon/index.docbook
+share/doc/HTML/en/kmoon/index.html
+share/doc/HTML/en/kmoon/introduction.html
 share/doc/HTML/en/kodo/.anchors
+share/doc/HTML/en/kodo/common
 share/doc/HTML/en/kodo/compilationandinstallation.html
 share/doc/HTML/en/kodo/guide.png
 share/doc/HTML/en/kodo/howitworks.html
@@ -391,6 +428,43 @@ share/doc/HTML/en/kodo/index.html
 share/doc/HTML/en/kodo/installation.html
 share/doc/HTML/en/kodo/introduction.html
 share/doc/HTML/en/kodo/onscreenoperation.html
+share/doc/HTML/en/kscore/.anchors
+share/doc/HTML/en/kscore/command-ref.html
+share/doc/HTML/en/kscore/common
+share/doc/HTML/en/kscore/compilation.html
+share/doc/HTML/en/kscore/credits-and-licenses.html
+share/doc/HTML/en/kscore/dl_fail.png
+share/doc/HTML/en/kscore/faq.html
+share/doc/HTML/en/kscore/index.docbook
+share/doc/HTML/en/kscore/index.html
+share/doc/HTML/en/kscore/installation.html
+share/doc/HTML/en/kscore/introduction.html
+share/doc/HTML/en/kscore/ncaaf.png
+share/doc/HTML/en/kscore/nhl.png
+share/doc/HTML/en/kscore/no_score.png
+share/doc/HTML/en/kscore/premr.png
+share/doc/HTML/en/kscore/q-and-a.html
+share/doc/HTML/en/kscore/requirements.html
+share/doc/HTML/en/kscore/settings.png
+share/doc/HTML/en/kscore/using-kscore.html
+share/doc/HTML/en/kteatime/.anchors
+share/doc/HTML/en/kteatime/common
+share/doc/HTML/en/kteatime/compilation-and-installation.html
+share/doc/HTML/en/kteatime/config.png
+share/doc/HTML/en/kteatime/configure.html
+share/doc/HTML/en/kteatime/credits.html
+share/doc/HTML/en/kteatime/how-to-use.html
+share/doc/HTML/en/kteatime/index.docbook
+share/doc/HTML/en/kteatime/index.html
+share/doc/HTML/en/kteatime/installation.html
+share/doc/HTML/en/kteatime/introduction.html
+share/doc/HTML/en/kteatime/menu-options.html
+share/doc/HTML/en/kteatime/start.html
+share/doc/HTML/en/kworldwatch/.anchors
+share/doc/HTML/en/kworldwatch/common
+share/doc/HTML/en/kworldwatch/index.docbook
+share/doc/HTML/en/kworldwatch/index.html
+share/doc/HTML/en/kworldwatch/introduction.html
 share/icons/hicolor/32x32/apps/amor.png
 share/icons/hicolor/32x32/apps/kmoon.png
 share/icons/hicolor/32x32/apps/kworldwatch.png
@@ -399,12 +473,26 @@ 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/ktux.png
 share/icons/locolor/16x16/apps/kworldwatch.png
 share/icons/locolor/32x32/apps/kmoon.png
+share/icons/locolor/32x32/apps/ktux.png
 share/icons/locolor/32x32/apps/kworldwatch.png
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/doc/HTML/en/kworldwatch
+@dirrm share/doc/HTML/en/kteatime
+@dirrm share/doc/HTML/en/kscore
 @dirrm share/doc/HTML/en/kodo
+@dirrm share/doc/HTML/en/kmoon
+@dirrm share/doc/HTML/en/amor
+@dirrm share/doc/HTML/en
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
+@dirrm share/apps/ktux/sprites
+@dirrm share/apps/ktux
 @dirrm share/apps/kmoon/pics
 @dirrm share/apps/kmoon
 @dirrm share/apps/kicker/applets
@@ -417,3 +505,6 @@ share/icons/locolor/32x32/apps/kworldwatch.png
 @dirrm share/apps/amor/blob
 @dirrm share/apps/amor/b
 @dirrm share/apps/amor
+@dirrm share/apps
+@dirrm share/applnk/Toys
+@dirrm share/applnk/System/ScreenSavers