17 files changed, 128 insertions, 61 deletions

diff --git a/x11-clocks/Makefile b/x11-clocks/Makefile
index e2288ac0e7a0..dc350c6a15a6 100644
--- a/x11-clocks/Makefile
+++ b/x11-clocks/Makefile
@@ -7,6 +7,7 @@
     SUBDIR += aclock
     SUBDIR += alarm-clock
     SUBDIR += alltraxclock
+    SUBDIR += amor
     SUBDIR += asclock
     SUBDIR += asclock-gtk
     SUBDIR += asclock-xlib
@@ -26,7 +27,9 @@
     SUBDIR += gtubeclock
     SUBDIR += intclock
     SUBDIR += kdetoys4
+    SUBDIR += kteatime
     SUBDIR += ktimer
+    SUBDIR += ktux
     SUBDIR += lmclock
     SUBDIR += mlclock
     SUBDIR += mouseclock
diff --git a/x11-clocks/amor/Makefile b/x11-clocks/amor/Makefile
new file mode 100644
index 000000000000..0cac86548d4f
--- /dev/null
+++ b/x11-clocks/amor/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	amor
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	x11-clocks kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Small animation which sits on top of active window
+
+USE_XZ=		yes
+USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USES=		cmake:outsource
+USE_QT4=	moc_build qmake_build rcc_build uic_build
+
+.include <bsd.port.mk>
diff --git a/x11-clocks/amor/distinfo b/x11-clocks/amor/distinfo
new file mode 100644
index 000000000000..6939db6f7fe7
--- /dev/null
+++ b/x11-clocks/amor/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/amor-4.12.2.tar.xz) = 5ae5dc7f989485ec69d02d532def2de1bd31cd8d7de39e348733abb435ebb454
+SIZE (KDE/4.12.2/amor-4.12.2.tar.xz) = 174100
diff --git a/x11-clocks/amor/pkg-descr b/x11-clocks/amor/pkg-descr
new file mode 100644
index 000000000000..5baa8403abaa
--- /dev/null
+++ b/x11-clocks/amor/pkg-descr
@@ -0,0 +1,4 @@
+AMOR (Amusing Misuse of Resources) - small animation which sits on
+top of active window.
+
+WWW: http://www.kde.org/
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/amor/pkg-plist
index 5e5c3c641137..18fbf5bf608b 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/amor/pkg-plist
@@ -1,8 +1,6 @@
 bin/amor
-bin/kteatime
-bin/ktux
+man/man6/amor.6.gz
 share/applications/kde4/amor.desktop
-share/applications/kde4/kteatime.desktop
 share/apps/amor/billyrc
 share/apps/amor/blobrc
 share/apps/amor/bonhommerc
@@ -427,23 +425,6 @@ share/apps/amor/taorc
 share/apps/amor/tips-en
 share/apps/amor/tuxrc
 share/apps/amor/wormrc
-share/apps/kteatime/kteatime.notifyrc
-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/dbus-1/interfaces/org.kde.amor.xml
 share/doc/HTML/en/amor/billy.png
 share/doc/HTML/en/amor/bonhomme.png
@@ -460,29 +441,11 @@ share/doc/HTML/en/amor/spot.png
 share/doc/HTML/en/amor/tao.png
 share/doc/HTML/en/amor/tux.png
 share/doc/HTML/en/amor/worm.png
-share/doc/HTML/en/kteatime/common
-share/doc/HTML/en/kteatime/config.png
-share/doc/HTML/en/kteatime/index.cache.bz2
-share/doc/HTML/en/kteatime/index.docbook
-share/icons/hicolor/128x128/apps/kteatime.png
 share/icons/hicolor/16x16/apps/amor.png
-share/icons/hicolor/16x16/apps/kteatime.png
-share/icons/hicolor/16x16/apps/ktux.png
 share/icons/hicolor/22x22/apps/amor.png
-share/icons/hicolor/22x22/apps/kteatime.png
 share/icons/hicolor/32x32/apps/amor.png
-share/icons/hicolor/32x32/apps/kteatime.png
-share/icons/hicolor/32x32/apps/ktux.png
 share/icons/hicolor/48x48/apps/amor.png
-share/icons/hicolor/48x48/apps/kteatime.png
-share/icons/hicolor/64x64/apps/kteatime.png
-share/icons/hicolor/scalable/apps/kteatime.svgz
-share/kde4/services/ScreenSavers/ktux.desktop
-@dirrm share/doc/HTML/en/kteatime
 @dirrm share/doc/HTML/en/amor
-@dirrm share/apps/ktux/sprites
-@dirrm share/apps/ktux
-@dirrm share/apps/kteatime
 @dirrm share/apps/amor/pics/static
 @dirrm share/apps/amor/pics/preview
 @dirrm share/apps/amor/pics/animated/worm
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 204064a1f98a..fc065c717d31 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -1,26 +1,28 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kdetoys
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-clocks kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE/${PORTVERSION}
+DISTFILES=	#
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Collection of entertaining programs for KDE
+COMMENT=	KDE miscellaneous applications (meta port)
 
-LATEST_LINK=	${PORTNAME}4
+USE_KDE4=	kdeprefix
+NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 
-USE_KDE4=	kdehier kdelibs kdeprefix workspace automoc4
-USES=		cmake:outsource
-USE_QT4=	qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11
-USE_XZ=		yes
+OPTIONS_DEFINE=	AMOR KTEATIME KTUX
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
-MAN6=	amor.6
+AMOR_DESC=		Small animation which sits on top of active window
+AMOR_RUN_DEPENDS=	${KDE4_PREFIX}/bin/amor:${PORTSDIR}/x11-clocks/amor
+
+KTEATIME_DESC=		Handy timer for steeping tea
+KTEATIME_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kteatime:${PORTSDIR}/x11-clocks/kteatime
+
+KTUX_DESC=		Tux-in-a-Spaceship screen saver
+KTUX_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ktux:${PORTSDIR}/x11-clocks/ktux
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
deleted file mode 100644
index 366dec26a40f..000000000000
--- a/x11-clocks/kdetoys4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/4.10.5/kdetoys-4.10.5.tar.xz) = 3711b51e23c3b0d081e1f826c8f52eb91dd5f76211f22430ef8edfd8208059e4
-SIZE (KDE/4.10.5/kdetoys-4.10.5.tar.xz) = 380504
diff --git a/x11-clocks/kteatime/Makefile b/x11-clocks/kteatime/Makefile
new file mode 100644
index 000000000000..fffa33d3c132
--- /dev/null
+++ b/x11-clocks/kteatime/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	kteatime
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	x11-clocks kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Handy timer for steeping tea
+
+USE_XZ=		yes
+USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USES=		cmake:outsource
+USE_QT4=	moc_build qmake_build rcc_build uic_build
+
+.include <bsd.port.mk>
diff --git a/x11-clocks/kteatime/distinfo b/x11-clocks/kteatime/distinfo
new file mode 100644
index 000000000000..d990b6244621
--- /dev/null
+++ b/x11-clocks/kteatime/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/kteatime-4.12.2.tar.xz) = fdddc8dc96f66ae6c8d0f7c83ff41d45600b88a650d49db84bb1dc62ba65a9f8
+SIZE (KDE/4.12.2/kteatime-4.12.2.tar.xz) = 100460
diff --git a/x11-clocks/kteatime/pkg-descr b/x11-clocks/kteatime/pkg-descr
new file mode 100644
index 000000000000..dbd470a1bfa4
--- /dev/null
+++ b/x11-clocks/kteatime/pkg-descr
@@ -0,0 +1,3 @@
+Handy timer for steeping tea.
+
+WWW: http://www.kde.org/
diff --git a/x11-clocks/kteatime/pkg-plist b/x11-clocks/kteatime/pkg-plist
new file mode 100644
index 000000000000..ddc9c81aacfb
--- /dev/null
+++ b/x11-clocks/kteatime/pkg-plist
@@ -0,0 +1,16 @@
+bin/kteatime
+share/applications/kde4/kteatime.desktop
+share/apps/kteatime/kteatime.notifyrc
+share/doc/HTML/en/kteatime/common
+share/doc/HTML/en/kteatime/config.png
+share/doc/HTML/en/kteatime/index.cache.bz2
+share/doc/HTML/en/kteatime/index.docbook
+share/icons/hicolor/128x128/apps/kteatime.png
+share/icons/hicolor/16x16/apps/kteatime.png
+share/icons/hicolor/22x22/apps/kteatime.png
+share/icons/hicolor/32x32/apps/kteatime.png
+share/icons/hicolor/48x48/apps/kteatime.png
+share/icons/hicolor/64x64/apps/kteatime.png
+share/icons/hicolor/scalable/apps/kteatime.svgz
+@dirrm share/doc/HTML/en/kteatime
+@dirrm share/apps/kteatime
diff --git a/x11-clocks/ktimer/Makefile b/x11-clocks/ktimer/Makefile
index ff7f31b0fa7a..8f1c1796b297 100644
--- a/x11-clocks/ktimer/Makefile
+++ b/x11-clocks/ktimer/Makefile
@@ -3,19 +3,15 @@
 PORTNAME=	ktimer
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	x11-clocks kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Countdown launcher for KDE
 
-CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
-
 USE_XZ=		yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11-clocks/ktimer/distinfo b/x11-clocks/ktimer/distinfo
index 79680a606060..904456acfe34 100644
--- a/x11-clocks/ktimer/distinfo
+++ b/x11-clocks/ktimer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/ktimer-4.10.5.tar.xz) = e8e12439e8bbb090d6efbcee6ea41141e9e810f35c2f21f4f86f7d645d224484
-SIZE (KDE/4.10.5/ktimer-4.10.5.tar.xz) = 150788
+SHA256 (KDE/4.12.2/ktimer-4.12.2.tar.xz) = c40252e6d55dbe9743575386186b89922868df3d2c73419736ba634a245bba94
+SIZE (KDE/4.12.2/ktimer-4.12.2.tar.xz) = 146772
diff --git a/x11-clocks/ktux/Makefile b/x11-clocks/ktux/Makefile
new file mode 100644
index 000000000000..77c1394fd4d9
--- /dev/null
+++ b/x11-clocks/ktux/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	ktux
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	x11-clocks kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Tux-in-a-Spaceship screen saver
+
+USE_XZ=		yes
+USE_KDE4=	kdelibs kdeprefix kdehier workspace automoc4
+USES=		cmake:outsource
+USE_QT4=	qt3support moc_build qmake_build rcc_build uic_build
+
+.include <bsd.port.mk>
diff --git a/x11-clocks/ktux/distinfo b/x11-clocks/ktux/distinfo
new file mode 100644
index 000000000000..619630b89387
--- /dev/null
+++ b/x11-clocks/ktux/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/ktux-4.12.2.tar.xz) = a5303208498dc9f1351f7e078ef39ad1d89109e622c73cbd2a113178087488cb
+SIZE (KDE/4.12.2/ktux-4.12.2.tar.xz) = 108640
diff --git a/x11-clocks/ktux/pkg-descr b/x11-clocks/ktux/pkg-descr
new file mode 100644
index 000000000000..7d0904a01a12
--- /dev/null
+++ b/x11-clocks/ktux/pkg-descr
@@ -0,0 +1,3 @@
+Tux-in-a-Spaceship screen saver.
+
+WWW: http://www.kde.org/
diff --git a/x11-clocks/ktux/pkg-plist b/x11-clocks/ktux/pkg-plist
new file mode 100644
index 000000000000..e3b138af9746
--- /dev/null
+++ b/x11-clocks/ktux/pkg-plist
@@ -0,0 +1,22 @@
+bin/ktux
+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/icons/hicolor/16x16/apps/ktux.png
+share/icons/hicolor/32x32/apps/ktux.png
+share/kde4/services/ScreenSavers/ktux.desktop
+@dirrm share/apps/ktux/sprites
+@dirrm share/apps/ktux