Update to KDE 3.4.3 / KOffice 1.4.2

13 files changed, 2 insertions, 207 deletions

diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index f53f5fa42e75..ff03ea61548a 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdeedu
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index 7b1af93ad29c..cfbcc1c89c5f 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeedu-3.4.2.tar.bz2) = e2c5cc083868dd4c35c1b50e04eb40eb
-SIZE (KDE/kdeedu-3.4.2.tar.bz2) = 24028133
+MD5 (KDE/kdeedu-3.4.3.tar.bz2) = 9f4059beb1c3495973dd80d11bcae462
+SIZE (KDE/kdeedu-3.4.3.tar.bz2) = 23983295
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-altvstimeui.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-altvstimeui.ui
deleted file mode 100644
index fd59797cc658..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-altvstimeui.ui
+++ /dev/null
@@ -1,12 +0,0 @@
---- kstars/kstars/tools/altvstimeui.ui.orig	Thu Sep 15 18:46:02 2005
-+++ kstars/kstars/tools/altvstimeui.ui	Thu Sep 15 18:46:13 2005
-@@ -529,9 +529,5 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>extdateedit.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
- </includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-argsetlocaltime.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-argsetlocaltime.ui
deleted file mode 100644
index bc59c620a988..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-argsetlocaltime.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kstars/kstars/tools/argsetlocaltime.ui.orig	Thu Sep 15 18:44:35 2005
-+++ kstars/kstars/tools/argsetlocaltime.ui	Thu Sep 15 18:44:43 2005
-@@ -102,7 +102,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>extdatewidget.h</includehint>
--</includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcapcoorddlg.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcapcoorddlg.ui
deleted file mode 100644
index 3fc52e4e89c9..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcapcoorddlg.ui
+++ /dev/null
@@ -1,16 +0,0 @@
---- kstars/kstars/tools/modcalcapcoorddlg.ui.orig	Thu Sep 15 18:43:01 2005
-+++ kstars/kstars/tools/modcalcapcoorddlg.ui	Thu Sep 15 18:43:22 2005
-@@ -853,13 +853,6 @@
- </slots>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>extdateedit.h</includehint>
-     <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>extdateedit.h</includehint>
- </includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcazeldlg.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcazeldlg.ui
deleted file mode 100644
index bc09f4485740..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcazeldlg.ui
+++ /dev/null
@@ -1,22 +0,0 @@
---- kstars/kstars/tools/modcalcazeldlg.ui.orig	Thu Sep 15 18:42:01 2005
-+++ kstars/kstars/tools/modcalcazeldlg.ui	Thu Sep 15 18:42:16 2005
-@@ -1019,19 +1019,6 @@
- </slots>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>extdateedit.h</includehint>
-     <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>extdateedit.h</includehint>
- </includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcdaylengthdlg.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcdaylengthdlg.ui
deleted file mode 100644
index beb9af15a1a4..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcdaylengthdlg.ui
+++ /dev/null
@@ -1,17 +0,0 @@
---- kstars/kstars/tools/modcalcdaylengthdlg.ui.orig	Thu Sep 15 18:40:46 2005
-+++ kstars/kstars/tools/modcalcdaylengthdlg.ui	Thu Sep 15 18:41:10 2005
-@@ -638,14 +638,6 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>extdateedit.h</includehint>
-     <includehint>timebox.h</includehint>
--    <includehint>timebox.h</includehint>
--    <includehint>timebox.h</includehint>
--    <includehint>timebox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
- </includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcequinoxdlg.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcequinoxdlg.ui
deleted file mode 100644
index ae14cb26fa24..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcequinoxdlg.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kstars/kstars/tools/modcalcequinoxdlg.ui.orig	Thu Sep 15 18:39:46 2005
-+++ kstars/kstars/tools/modcalcequinoxdlg.ui	Thu Sep 15 18:40:01 2005
-@@ -563,7 +563,4 @@
-     <slot>slotRunBatch()</slot>
- </slots>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>extdatetimeedit.h</includehint>
--</includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcjddlg.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcjddlg.ui
deleted file mode 100644
index e360ee290c68..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcjddlg.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kstars/kstars/tools/modcalcjddlg.ui.orig	Thu Sep 15 18:38:29 2005
-+++ kstars/kstars/tools/modcalcjddlg.ui	Thu Sep 15 18:38:39 2005
-@@ -537,7 +537,4 @@
-     <slot>showCurrentTime()</slot>
- </slots>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>extdateedit.h</includehint>
--</includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcplanetsdlg.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcplanetsdlg.ui
deleted file mode 100644
index 08657c36b123..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcplanetsdlg.ui
+++ /dev/null
@@ -1,22 +0,0 @@
---- kstars/kstars/tools/modcalcplanetsdlg.ui.orig	Thu Sep 15 18:37:06 2005
-+++ kstars/kstars/tools/modcalcplanetsdlg.ui	Thu Sep 15 18:37:32 2005
-@@ -1332,19 +1332,6 @@
- </slots>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>extdateedit.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>extdateedit.h</includehint>
-     <includehint>dmsbox.h</includehint>
- </includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcsidtimedlg.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcsidtimedlg.ui
deleted file mode 100644
index eccbc7f784d1..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-modcalcsidtimedlg.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- kstars/kstars/tools/modcalcsidtimedlg.ui.orig	Thu Sep 15 18:35:28 2005
-+++ kstars/kstars/tools/modcalcsidtimedlg.ui	Thu Sep 15 18:36:04 2005
-@@ -830,8 +830,5 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>dmsbox.h</includehint>
--    <includehint>extdateedit.h</includehint>
--    <includehint>dmsbox.h</includehint>
--    <includehint>extdateedit.h</includehint>
- </includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-kstars_kstars_tools-planetviewerui.ui b/misc/kdeedu3/files/patch-kstars_kstars_tools-planetviewerui.ui
deleted file mode 100644
index 207a8cb0f08c..000000000000
--- a/misc/kdeedu3/files/patch-kstars_kstars_tools-planetviewerui.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- kstars/kstars/tools/planetviewerui.ui.orig	Thu Sep 15 12:49:16 2005
-+++ kstars/kstars/tools/planetviewerui.ui	Thu Sep 15 12:49:56 2005
-@@ -145,8 +145,6 @@
- </images>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>pvplotwidget.h</includehint>
-     <includehint>timestepbox.h</includehint>
--    <includehint>extdateedit.h</includehint>
- </includehints>
- </UI>
diff --git a/misc/kdeedu3/files/patch-post-3.4.2-kdeedu.diff b/misc/kdeedu3/files/patch-post-3.4.2-kdeedu.diff
deleted file mode 100644
index 1d75c63bac18..000000000000
--- a/misc/kdeedu3/files/patch-post-3.4.2-kdeedu.diff
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: kvoctrain/kvoctrain/langen2kvtml
-===================================================================
---- kvoctrain/kvoctrain/langen2kvtml	(revision 443975)
-+++ kvoctrain/kvoctrain/langen2kvtml	(working copy)
-@@ -89,6 +89,9 @@
- 
- require "flush.pl";
- use Getopt::Long;
-+use File::Temp qw(tempdir);
-+my $tmpdir = tempdir(TEMPDIR => 1, CLEANUP => 1 );
-+
- $/="\r\n";	# we work with dos files
- 
- #
-@@ -165,10 +168,6 @@
-     $country="GB";
- }
- 
--# All logging information goes into this file
--$logfile = "/tmp/langen2kvtml.log";
--open(LOG, ">$logfile") || die "Cannot create $logfile: $!";
--
- &printflush(STDOUT,"Waiting for generating files ...\n");
- $tmp1=$#ARGV+1;
- &printflush(STDOUT,"... $tmp1 files given via command line ...\n");
-@@ -178,13 +177,11 @@
-     if ($proxy) {
-         &printflush(STDOUT,"... using proxy service $proxy ...\n");
-     }
--    `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip >/tmp/Voc-$country.zip`;
--    # unzip -u update only!
--    # unzip -o overwrite!
--    `unzip -u /tmp/Voc-$country.zip >/tmp/unzip.log`;
-+    `lwp-request $proxy http://www.vokabeln.de/files/Voc-$country.zip >$tmpdir/Voc-$country.zip`;
-     &printflush(STDOUT,"... updating Voc-$country.zip ...\n");
-     $/="\n";	# we work with a unix file
--    open(ZIP,"</tmp/unzip.log");
-+    # unzip -u update only!
-+    open(ZIP,"unzip -u $tmpdir/Voc-$country.zip |");
-     while(<ZIP>) {
- 	chomp;
- 	if( /voc/ ) {
-@@ -194,20 +191,16 @@
- 	}
-     }
-     close(ZIP);
--    unlink("/tmp/unzip.log");
-     $/="\r\n";	# we work with a dos file
- }
- 
- for my $file (@res, @ARGV) {
-     $vocfile = $file;
--    &printflush(LOG,"... generating \"$kvtfile\"...\n");
-     $lang		= "";		# initially unset
-     $filestage	= 0;		# file stage
-     &process_vocfile($vocfile);
- }
- print STDERR "...\tAll Complete.\n";
--&printflush(LOG,"\nAll Complete.\n");
--close(LOG);
- 
- exit;
-