4 files changed, 52 insertions, 178 deletions

diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index db10fad78723..de421bfb6cc1 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -1,33 +1,28 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	kdetoys3
-# Date created:				14 May 2000 02:45:53
-# Whom:					Will Andrews <will@FreeBSD.org>
+# New ports collection Makefile for:	kdetoys
+# Date created:				2008-01-31
+# Whom:					Martin Wilke <miwi@FreeBSD.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	kdetoys
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
-CATEGORIES=	x11-clocks kde misc
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Small applications for KDE
+COMMENT=	Collection of entertaining, educational programs for KDE
 
-USE_KDELIBS_VER=3
-PREFIX=		${KDE_PREFIX}
+LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=  libtool:15
-USE_GMAKE=	yes
-
-USE_LDCONFIG=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
+USE_QT_VER=	4
+QT_COMPONENTS=	opengl gui moc rcc uic
+USE_KDE4=	kdelibs workspace kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
+post-extract:
+	${MKDIR} ${WRKSRC}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index d40acfae5b50..52e190ef91df 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdetoys-3.5.8.tar.bz2) = b42c1f08e5c4ac93a04aadb75679139f
-SHA256 (KDE/kdetoys-3.5.8.tar.bz2) = c8411d66fabd065642279e6bdf999e270f2caacf0b97d735bef337ea1ff1d147
-SIZE (KDE/kdetoys-3.5.8.tar.bz2) = 3269357
+MD5 (KDE/kdetoys-4.1.0.tar.bz2) = c8c9c2f66f65fc7acfa8060d08667406
+SHA256 (KDE/kdetoys-4.1.0.tar.bz2) = d6f82b3b9658009ffc9e53a195b747f7385b607387c325a7250ee6f7afb5eef0
+SIZE (KDE/kdetoys-4.1.0.tar.bz2) = 1292806
diff --git a/x11-clocks/kdetoys4/pkg-descr b/x11-clocks/kdetoys4/pkg-descr
index c7317e0ce83d..6c48fe335f9b 100644
--- a/x11-clocks/kdetoys4/pkg-descr
+++ b/x11-clocks/kdetoys4/pkg-descr
@@ -2,5 +2,3 @@ This port contains a set of KDE-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 cb17412c7442..add47e15bec4 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -1,43 +1,13 @@
 bin/amor
-bin/kodo
 bin/kteatime
 bin/ktux
 bin/kweatherreport
 bin/kweatherservice
-bin/kworldclock
-include/AmorIface.h
-lib/kde3/eyes_panelapplet.a
-lib/kde3/eyes_panelapplet.la
-lib/kde3/eyes_panelapplet.so
-lib/kde3/fifteen_panelapplet.a
-lib/kde3/fifteen_panelapplet.la
-lib/kde3/fifteen_panelapplet.so
-lib/kde3/kcm_weather.a
-lib/kde3/kcm_weather.la
-lib/kde3/kcm_weather.so
-lib/kde3/kcm_weatherservice.a
-lib/kde3/kcm_weatherservice.la
-lib/kde3/kcm_weatherservice.so
-lib/kde3/kmoon_panelapplet.a
-lib/kde3/kmoon_panelapplet.la
-lib/kde3/kmoon_panelapplet.so
-lib/kde3/kweatherreport.a
-lib/kde3/kweatherreport.la
-lib/kde3/kweatherreport.so
-lib/kde3/weather_panelapplet.a
-lib/kde3/weather_panelapplet.la
-lib/kde3/weather_panelapplet.so
-lib/kde3/ww_panelapplet.a
-lib/kde3/ww_panelapplet.la
-lib/kde3/ww_panelapplet.so
-lib/libkdeinit_kweatherreport.a
-lib/libkdeinit_kweatherreport.la
-lib/libkdeinit_kweatherreport.so
-share/applications/kde/amor.desktop
-share/applications/kde/kodo.desktop
-share/applications/kde/kteatime.desktop
-share/applications/kde/kworldclock.desktop
-share/applnk/System/ScreenSavers/ktux.desktop
+lib/kde4/kcm_weather.so
+lib/kde4/kcm_weatherservice.so
+lib/libkdeinit4_kweatherreport.so
+share/applications/kde4/amor.desktop
+share/applications/kde4/kteatime.desktop
 share/apps/amor/billyrc
 share/apps/amor/blobrc
 share/apps/amor/bonhommerc
@@ -430,54 +400,10 @@ share/apps/amor/pics/static/bsd.png
 share/apps/amor/pics/static/tux.png
 share/apps/amor/pingurc
 share/apps/amor/taorc
-share/apps/amor/tips
 share/apps/amor/tips-en
 share/apps/amor/tuxrc
 share/apps/amor/wormrc
-share/apps/kdesktop/programs/kdeworld.desktop
-share/apps/kicker/applets/eyesapplet.desktop
-share/apps/kicker/applets/kfifteenapplet.desktop
-share/apps/kicker/applets/kmoonapplet.desktop
-share/apps/kicker/applets/kweather.desktop
-share/apps/kicker/applets/kwwapplet.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/kodo/numbers.png
-share/apps/kteatime/eventsrc
-share/apps/kteatime/icons/crystalsvg/22x22/actions/mug.png
-share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_anim1.png
-share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_anim2.png
-share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_not_ready.png
-share/apps/kteatime/icons/hicolor/16x16/apps/kteatime.png
-share/apps/kteatime/icons/hicolor/32x32/apps/kteatime.png
-share/apps/kteatime/icons/hicolor/48x48/apps/kteatime.png
+share/apps/kteatime/kteatime.notifyrc
 share/apps/ktux/sprites/anim0001.png
 share/apps/ktux/sprites/anim0002.png
 share/apps/ktux/sprites/anim0003.png
@@ -534,21 +460,9 @@ share/apps/kweather/tstorm2_night.png
 share/apps/kweather/tstorm3.png
 share/apps/kweatherservice/stations.dat
 share/apps/kweatherservice/weather_stations.desktop
-share/apps/kworldclock/maps/depths/400.jpg
-share/apps/kworldclock/maps/depths/800.jpg
-share/apps/kworldclock/maps/depths/depths.desktop
-share/apps/kworldclock/maps/flatworld/1200.jpg
-share/apps/kworldclock/maps/flatworld/1600.jpg
-share/apps/kworldclock/maps/flatworld/200.jpg
-share/apps/kworldclock/maps/flatworld/400.jpg
-share/apps/kworldclock/maps/flatworld/800.jpg
-share/apps/kworldclock/maps/flatworld/flatworld.desktop
-share/apps/kworldclock/pics/flag-blue.png
-share/apps/kworldclock/pics/flag-green.png
-share/apps/kworldclock/pics/flag-mask.xpm
-share/apps/kworldclock/pics/flag-red.png
-share/apps/kworldclock/pics/flag.png
-share/apps/kworldclock/zone.tab
+share/dbus-1/interfaces/org.kde.amor.xml
+share/dbus-1/interfaces/org.kde.kweather.kweather.xml
+share/dbus-1/interfaces/org.kde.kweather.service.xml
 share/doc/HTML/en/amor/billy.png
 share/doc/HTML/en/amor/bonhomme.png
 share/doc/HTML/en/amor/bsd.png
@@ -564,14 +478,6 @@ 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/kmoon/carlosmail
-share/doc/HTML/en/kmoon/common
-share/doc/HTML/en/kmoon/index.cache.bz2
-share/doc/HTML/en/kmoon/index.docbook
-share/doc/HTML/en/kodo/common
-share/doc/HTML/en/kodo/guide.png
-share/doc/HTML/en/kodo/index.cache.bz2
-share/doc/HTML/en/kodo/index.docbook
 share/doc/HTML/en/kteatime/common
 share/doc/HTML/en/kteatime/config.png
 share/doc/HTML/en/kteatime/index.cache.bz2
@@ -579,76 +485,47 @@ share/doc/HTML/en/kteatime/index.docbook
 share/doc/HTML/en/kweather/common
 share/doc/HTML/en/kweather/index.cache.bz2
 share/doc/HTML/en/kweather/index.docbook
-share/doc/HTML/en/kworldclock/common
-share/doc/HTML/en/kworldclock/index.cache.bz2
-share/doc/HTML/en/kworldclock/index.docbook
-share/doc/HTML/en/kworldclock/man-kworldclock.1.docbook
-share/doc/HTML/en/kworldclock/screenshot-clock-dialog.png
-share/doc/HTML/en/kworldclock/screenshot-mlb.png
-share/doc/HTML/en/kworldclock/screenshot-quairading-clock.png
-share/doc/HTML/en/kworldclock/screenshot-quairading-dialog.png
-share/doc/HTML/en/kworldclock/screenshot-rmb-cities.png
-share/doc/HTML/en/kworldclock/screenshot-rmb-clock.png
-share/doc/HTML/en/kworldclock/screenshot-rmb-daylight.png
-share/doc/HTML/en/kworldclock/screenshot-rmb-flags.png
-share/doc/HTML/en/kworldclock/screenshot-withclocks.png
-share/doc/HTML/en/kworldclock/screenshot-withflags.png
-share/doc/HTML/en/kworldclock/screenshot.png
 share/icons/hicolor/16x16/apps/amor.png
-share/icons/hicolor/16x16/apps/kmoon.png
-share/icons/hicolor/16x16/apps/kodo.png
 share/icons/hicolor/16x16/apps/kteatime.png
 share/icons/hicolor/16x16/apps/ktux.png
 share/icons/hicolor/16x16/apps/kweather.png
-share/icons/hicolor/16x16/apps/kworldclock.png
 share/icons/hicolor/22x22/apps/amor.png
-share/icons/hicolor/22x22/apps/kworldclock.png
 share/icons/hicolor/32x32/apps/amor.png
-share/icons/hicolor/32x32/apps/kmoon.png
-share/icons/hicolor/32x32/apps/kodo.png
 share/icons/hicolor/32x32/apps/kteatime.png
 share/icons/hicolor/32x32/apps/ktux.png
 share/icons/hicolor/32x32/apps/kweather.png
-share/icons/hicolor/32x32/apps/kworldclock.png
 share/icons/hicolor/48x48/apps/amor.png
-share/icons/hicolor/48x48/apps/kmoon.png
-share/icons/hicolor/48x48/apps/kodo.png
 share/icons/hicolor/48x48/apps/kteatime.png
 share/icons/hicolor/48x48/apps/kweather.png
-share/icons/hicolor/48x48/apps/kworldclock.png
-share/services/kcmweather.desktop
-share/services/kcmweatherservice.desktop
-share/services/kweatherservice.desktop
-@dirrm share/doc/HTML/en/kworldclock
+share/kde4/services/ScreenSavers/ktux.desktop
+share/kde4/services/kcmweather.desktop
+share/kde4/services/kcmweatherservice.desktop
+share/kde4/services/kweatherservice.desktop
+@dirrmtry share/kde4/services/ScreenSavers
+@dirrmtry share/kde4/services
+@dirrmtry share/kde4
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/kweather
 @dirrm share/doc/HTML/en/kteatime
-@dirrm share/doc/HTML/en/kodo
-@dirrm share/doc/HTML/en/kmoon
 @dirrm share/doc/HTML/en/amor
-@dirrm share/apps/kworldclock/pics
-@dirrm share/apps/kworldclock/maps/flatworld
-@dirrm share/apps/kworldclock/maps/depths
-@dirrm share/apps/kworldclock/maps
-@dirrm share/apps/kworldclock
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/dbus-1/interfaces
+@dirrmtry share/dbus-1
 @dirrm share/apps/kweatherservice
 @dirrm share/apps/kweather
 @dirrm share/apps/ktux/sprites
 @dirrm share/apps/ktux
-@dirrm share/apps/kteatime/icons/hicolor/48x48/apps
-@dirrm share/apps/kteatime/icons/hicolor/48x48
-@dirrm share/apps/kteatime/icons/hicolor/32x32/apps
-@dirrm share/apps/kteatime/icons/hicolor/32x32
-@dirrm share/apps/kteatime/icons/hicolor/16x16/apps
-@dirrm share/apps/kteatime/icons/hicolor/16x16
-@dirrm share/apps/kteatime/icons/hicolor
-@dirrm share/apps/kteatime/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kteatime/icons/crystalsvg/22x22
-@dirrm share/apps/kteatime/icons/crystalsvg
-@dirrm share/apps/kteatime/icons
 @dirrm share/apps/kteatime
-@dirrm share/apps/kodo
-@dirrm share/apps/kmoon/pics
-@dirrm share/apps/kmoon
 @dirrm share/apps/amor/pics/static
 @dirrm share/apps/amor/pics/preview
 @dirrm share/apps/amor/pics/animated/worm
@@ -662,3 +539,7 @@ share/services/kweatherservice.desktop
 @dirrm share/apps/amor/pics/animated
 @dirrm share/apps/amor/pics
 @dirrm share/apps/amor
+@dirrmtry share/apps
+@dirrmtry share/applications/kde4
+@dirrmtry share/applications
+@dirrmtry lib/kde4