From 5bb93a6db08302bfbcfc50ae2085a5b1bc1c040b Mon Sep 17 00:00:00 2001
From: markd <markd>
Date: Sat, 20 Oct 2007 10:45:26 +0000
Subject: Update to KDE 3.5.8

KTurtle
* Fix UTF8 bug when user language was UTF8.
* Make "else" work.
Kig
* If the loading of the document fails, completely cleanup ourselves to
  be able to open a new document in the same (untouched) window.
KVocTrain
* Enable word wrap for the labels in multiple choice query.
* Fix handling of hints.
* Fix handling of remote files.
* Fix search not searching in all columns.
KStars
* Galactic/Equatorial coordinates conversion does not work.
---
 misc/kdeedu3/Makefile         |  3 +--
 misc/kdeedu3/PLIST            |  4 +++-
 misc/kdeedu3/distinfo         | 10 +++++-----
 misc/kdeedu3/patches/patch-aa | 16 ++++++++--------
 4 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'misc/kdeedu3')

diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index e92eb5c2c99..5d7564c01d8 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2007/09/21 13:04:02 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2007/10/20 10:45:26 markd Exp $
 
 DISTNAME=	kdeedu-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdeedu3/PLIST b/misc/kdeedu3/PLIST
index 47fd84ce03f..c4a3daf03fd 100644
--- a/misc/kdeedu3/PLIST
+++ b/misc/kdeedu3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2007/05/23 13:27:17 markd Exp $
+@comment $NetBSD: PLIST,v 1.21 2007/10/20 10:45:26 markd Exp $
 bin/apmount
 bin/blinken
 bin/celestrongps
@@ -2254,6 +2254,7 @@ share/kde/apps/ktouch/he.keyboard
 share/kde/apps/ktouch/hu.keyboard
 share/kde/apps/ktouch/hungarian.ktouch.xml
 share/kde/apps/ktouch/hungarian_expert.ktouch.xml
+share/kde/apps/ktouch/it.keyboard
 share/kde/apps/ktouch/italian.ktouch.xml
 share/kde/apps/ktouch/ktouchui.rc
 share/kde/apps/ktouch/nederlands.ktouch.xml
@@ -2503,6 +2504,7 @@ share/kde/mimelnk/application/x-kig.desktop
 share/kde/mimelnk/application/x-kmplot.desktop
 share/kde/mimelnk/application/x-kseg.desktop
 share/kde/mimelnk/application/x-kwordquiz.desktop
+share/kde/mimelnk/text/x-kvtml.desktop
 share/kde/services/keduca_part.desktop
 share/kde/services/kfile_drgeo.desktop
 share/kde/services/kfile_kig.desktop
diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index 6bf5764dbd8..f0c7d682f11 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.38 2007/05/23 13:27:17 markd Exp $
+$NetBSD: distinfo,v 1.39 2007/10/20 10:45:26 markd Exp $
 
-SHA1 (kdeedu-3.5.7.tar.bz2) = 9a27207e63721da4869f4196b45ad1bbec2660d0
-RMD160 (kdeedu-3.5.7.tar.bz2) = 7fb9d10314d2617cb40b51cc4e8663838780633a
-Size (kdeedu-3.5.7.tar.bz2) = 30158516 bytes
-SHA1 (patch-aa) = cef7d7721efdd4193b6559fabd42115b35491790
+SHA1 (kdeedu-3.5.8.tar.bz2) = 7e225d8e9c6c0d69b780f96babbed569d31b0b70
+RMD160 (kdeedu-3.5.8.tar.bz2) = e15dc74c572da3035b3daceb66c75b14d6e14818
+Size (kdeedu-3.5.8.tar.bz2) = 30158456 bytes
+SHA1 (patch-aa) = 08c298cb546165f5fa4854b7ecb2b60e5da9c195
 SHA1 (patch-ab) = 6f7122f34d2894489b933d90644022f71192b023
 SHA1 (patch-ac) = 46e3c0ebf7172f937d919087bc06272fb377b4ae
 SHA1 (patch-ad) = f936f907fb1c283a5470498c4c78027804b8d13f
diff --git a/misc/kdeedu3/patches/patch-aa b/misc/kdeedu3/patches/patch-aa
index 760a1dbbb62..624d71ffe70 100644
--- a/misc/kdeedu3/patches/patch-aa
+++ b/misc/kdeedu3/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2005/05/31 14:50:56 markd Exp $
+$NetBSD: patch-aa,v 1.7 2007/10/20 10:45:26 markd Exp $
 
---- kiten/Makefile.in.orig	2005-05-24 03:53:47.000000000 +1200
+--- kiten/Makefile.in.orig	2007-10-09 03:23:05.000000000 +1300
 +++ kiten/Makefile.in
-@@ -106,7 +106,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
+@@ -119,7 +119,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	--mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-- 
cgit v1.2.3