Update to KDE 3.3

8 files changed, 48 insertions, 26 deletions

diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index c2b84393ba4..c8605982ee1 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	kdetoys
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index d702e86f2a5..2302766fb45 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdetoys-3.2.3.tar.bz2) = 22bb5193eaaea38a7eb9a16d935af20f
-SIZE (KDE/kdetoys-3.2.3.tar.bz2) = 2348640
+MD5 (KDE/kdetoys-3.3.0.tar.bz2) = 935e3e2e6d84c9fedb2f8acb8e36cdc7
+SIZE (KDE/kdetoys-3.3.0.tar.bz2) = 2761629
diff --git a/x11-clocks/kdetoys3/files/patch-kworldwatch-zone.tab b/x11-clocks/kdetoys3/files/patch-kworldwatch-zone.tab
index 794c08565f9..0454c3d486f 100644
--- a/x11-clocks/kdetoys3/files/patch-kworldwatch-zone.tab
+++ b/x11-clocks/kdetoys3/files/patch-kworldwatch-zone.tab
@@ -1,5 +1,5 @@
---- kworldwatch/zone.tab	Wed Sep  4 02:18:48 2002
-+++ kworldwatch/zone.tab	Tue Feb 10 21:28:18 2004
+--- kworldwatch/zone.tab	Sat May 22 22:59:07 2004
++++ kwordlwatch/zone.tab	Wed Aug 11 14:48:53 2004
 @@ -1,16 +1,18 @@
 +# @(#)zone.tab	1.29
 +#
@@ -252,7 +252,7 @@
  TN	+3648+01011	Africa/Tunis
  TO	-2110+17510	Pacific/Tongatapu
  TR	+4101+02858	Europe/Istanbul
-@@ -327,20 +354,24 @@
+@@ -327,21 +354,24 @@
  TW	+2503+12130	Asia/Taipei
  TZ	-0648+03917	Africa/Dar_es_Salaam
  UA	+5026+03031	Europe/Kiev	most locations
@@ -274,12 +274,13 @@
  US	+411745-0863730	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County
  US	+384452-0850402	America/Indiana/Vevay	Eastern Standard Time - Indiana - Switzerland County
  US	+415100-0873900	America/Chicago	Central Time
+-US	+383738-0901152	America/St_Louis	Central Time
  US	+450628-0873651	America/Menominee	Central Time - Michigan - Wisconsin border
 +US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
  US	+394421-1045903	America/Denver	Mountain Time
  US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
  US	+364708-1084111	America/Shiprock	Mountain Time - Navajo
-@@ -353,7 +384,8 @@
+@@ -354,7 +384,8 @@
  US	+515248-1763929	America/Adak	Aleutian Islands
  US	+211825-1575130	Pacific/Honolulu	Hawaii
  UY	-3453-05611	America/Montevideo
@@ -289,7 +290,7 @@
  VA	+4154+01227	Europe/Vatican
  VC	+1309-06114	America/St_Vincent
  VE	+1030-06656	America/Caracas
-@@ -365,7 +397,6 @@
+@@ -366,7 +397,6 @@
  WS	-1350-17144	Pacific/Apia
  YE	+1245+04512	Asia/Aden
  YT	-1247+04514	Indian/Mayotte
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index 489e8f42f55..4f33bde749f 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -1,5 +1,4 @@
 bin/amor
-bin/kmoon
 bin/kodo
 bin/kteatime
 bin/ktux
@@ -15,6 +14,8 @@ lib/kde3/kcm_weather.la
 lib/kde3/kcm_weather.so
 lib/kde3/kcm_weatherservice.la
 lib/kde3/kcm_weatherservice.so
+lib/kde3/kmoon_panelapplet.la
+lib/kde3/kmoon_panelapplet.so
 lib/kde3/kweatherreport.la
 lib/kde3/kweatherreport.so
 lib/kde3/weather_panelapplet.la
@@ -24,7 +25,6 @@ lib/kde3/ww_panelapplet.so
 lib/libkdeinit_kweatherreport.la
 lib/libkdeinit_kweatherreport.so
 share/applications/kde/amor.desktop
-share/applications/kde/kmoon.desktop
 share/applications/kde/kodo.desktop
 share/applications/kde/kteatime.desktop
 share/applications/kde/kworldclock.desktop
@@ -419,6 +419,7 @@ 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
@@ -512,6 +513,7 @@ share/apps/kweather/tstorm2.png
 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
@@ -553,6 +555,17 @@ 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/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/crystalsvg/16x16/apps/amor.png
 share/icons/crystalsvg/16x16/apps/kmoon.png
 share/icons/crystalsvg/16x16/apps/kodo.png
@@ -578,9 +591,6 @@ share/services/kweatherservice.desktop
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/16x16/apps
 @dirrm share/doc/HTML/en/kworldclock
 @dirrm share/doc/HTML/en/kweather
 @dirrm share/doc/HTML/en/kteatime
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index c2b84393ba4..c8605982ee1 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	kdetoys
 PORTVERSION=	${KDE_VERSION}
 CATEGORIES=	x11-clocks kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index d702e86f2a5..2302766fb45 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdetoys-3.2.3.tar.bz2) = 22bb5193eaaea38a7eb9a16d935af20f
-SIZE (KDE/kdetoys-3.2.3.tar.bz2) = 2348640
+MD5 (KDE/kdetoys-3.3.0.tar.bz2) = 935e3e2e6d84c9fedb2f8acb8e36cdc7
+SIZE (KDE/kdetoys-3.3.0.tar.bz2) = 2761629
diff --git a/x11-clocks/kdetoys4/files/patch-kworldwatch-zone.tab b/x11-clocks/kdetoys4/files/patch-kworldwatch-zone.tab
index 794c08565f9..0454c3d486f 100644
--- a/x11-clocks/kdetoys4/files/patch-kworldwatch-zone.tab
+++ b/x11-clocks/kdetoys4/files/patch-kworldwatch-zone.tab
@@ -1,5 +1,5 @@
---- kworldwatch/zone.tab	Wed Sep  4 02:18:48 2002
-+++ kworldwatch/zone.tab	Tue Feb 10 21:28:18 2004
+--- kworldwatch/zone.tab	Sat May 22 22:59:07 2004
++++ kwordlwatch/zone.tab	Wed Aug 11 14:48:53 2004
 @@ -1,16 +1,18 @@
 +# @(#)zone.tab	1.29
 +#
@@ -252,7 +252,7 @@
  TN	+3648+01011	Africa/Tunis
  TO	-2110+17510	Pacific/Tongatapu
  TR	+4101+02858	Europe/Istanbul
-@@ -327,20 +354,24 @@
+@@ -327,21 +354,24 @@
  TW	+2503+12130	Asia/Taipei
  TZ	-0648+03917	Africa/Dar_es_Salaam
  UA	+5026+03031	Europe/Kiev	most locations
@@ -274,12 +274,13 @@
  US	+411745-0863730	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County
  US	+384452-0850402	America/Indiana/Vevay	Eastern Standard Time - Indiana - Switzerland County
  US	+415100-0873900	America/Chicago	Central Time
+-US	+383738-0901152	America/St_Louis	Central Time
  US	+450628-0873651	America/Menominee	Central Time - Michigan - Wisconsin border
 +US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
  US	+394421-1045903	America/Denver	Mountain Time
  US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
  US	+364708-1084111	America/Shiprock	Mountain Time - Navajo
-@@ -353,7 +384,8 @@
+@@ -354,7 +384,8 @@
  US	+515248-1763929	America/Adak	Aleutian Islands
  US	+211825-1575130	Pacific/Honolulu	Hawaii
  UY	-3453-05611	America/Montevideo
@@ -289,7 +290,7 @@
  VA	+4154+01227	Europe/Vatican
  VC	+1309-06114	America/St_Vincent
  VE	+1030-06656	America/Caracas
-@@ -365,7 +397,6 @@
+@@ -366,7 +397,6 @@
  WS	-1350-17144	Pacific/Apia
  YE	+1245+04512	Asia/Aden
  YT	-1247+04514	Indian/Mayotte
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index 489e8f42f55..4f33bde749f 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -1,5 +1,4 @@
 bin/amor
-bin/kmoon
 bin/kodo
 bin/kteatime
 bin/ktux
@@ -15,6 +14,8 @@ lib/kde3/kcm_weather.la
 lib/kde3/kcm_weather.so
 lib/kde3/kcm_weatherservice.la
 lib/kde3/kcm_weatherservice.so
+lib/kde3/kmoon_panelapplet.la
+lib/kde3/kmoon_panelapplet.so
 lib/kde3/kweatherreport.la
 lib/kde3/kweatherreport.so
 lib/kde3/weather_panelapplet.la
@@ -24,7 +25,6 @@ lib/kde3/ww_panelapplet.so
 lib/libkdeinit_kweatherreport.la
 lib/libkdeinit_kweatherreport.so
 share/applications/kde/amor.desktop
-share/applications/kde/kmoon.desktop
 share/applications/kde/kodo.desktop
 share/applications/kde/kteatime.desktop
 share/applications/kde/kworldclock.desktop
@@ -419,6 +419,7 @@ 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
@@ -512,6 +513,7 @@ share/apps/kweather/tstorm2.png
 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
@@ -553,6 +555,17 @@ 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/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/crystalsvg/16x16/apps/amor.png
 share/icons/crystalsvg/16x16/apps/kmoon.png
 share/icons/crystalsvg/16x16/apps/kodo.png
@@ -578,9 +591,6 @@ share/services/kweatherservice.desktop
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/16x16/apps
 @dirrm share/doc/HTML/en/kworldclock
 @dirrm share/doc/HTML/en/kweather
 @dirrm share/doc/HTML/en/kteatime