Update KDE to the latest official release, KDE 3.1.3

Official KDE 3.1.3 announcement:
http://www.kde.org/announcements/announce-3.1.3.php

(may not work until a few hours after this commit - we jumped the gun a little
 in order to have the update in place at the time the security notifications for
 KDE 3.1.2 will be released together with the announcement of KDE 3.1.3).

Changelog from 3.1.2 to 3.1.3 release:
http://www.kde.org/announcements/changelogs/changelog3_1_2to3_1_3.php

Thanks and credits need to go to the whole KDE-FreeBSD team, as well
as everyone on kde@freebsd.org for providing feedback, reporting bugs
and just using the KDE ports.

Approved by: will (real mentor asleep)

3 files changed, 14 insertions, 17 deletions

diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index fec4a998c936..251614ef2b6e 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -21,10 +21,16 @@ PREFIX=		${KDE_PREFIX}
 USE_BZIP2=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+pre-configure::
+	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo
index 90fae25454e7..ebad78bbb29e 100644
--- a/misc/kdeedu4/distinfo
+++ b/misc/kdeedu4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeedu-3.1.2.tar.bz2) = ba2a96454b7d2a7d92c991b08d932242
+MD5 (KDE/kdeedu-3.1.3.tar.bz2) = 02996b08a1c2a2aa044406480c0eb8a7
diff --git a/misc/kdeedu4/pkg-plist b/misc/kdeedu4/pkg-plist
index 6d5495e8554f..add08e416e38 100644
--- a/misc/kdeedu4/pkg-plist
+++ b/misc/kdeedu4/pkg-plist
@@ -681,6 +681,7 @@ share/apps/kstars/venus.R3.vsop
 share/apps/kstars/venus.R4.vsop
 share/apps/kstars/venus.R5.vsop
 share/apps/kstars/venus.png
+share/apps/ktouch/danish-2.ktouch
 share/apps/ktouch/danish.ktouch
 share/apps/ktouch/de-ch.keyboard
 share/apps/ktouch/de.keyboard
@@ -693,9 +694,12 @@ share/apps/ktouch/english.ktouch
 share/apps/ktouch/es.keyboard
 share/apps/ktouch/fi.keyboard
 share/apps/ktouch/fr.keyboard
+share/apps/ktouch/fr_ch.keyboard
 share/apps/ktouch/french-2.ktouch
 share/apps/ktouch/french.ktouch
+share/apps/ktouch/german-2.ktouch
 share/apps/ktouch/german.ktouch
+share/apps/ktouch/he.keyboard
 share/apps/ktouch/it.keyboard
 share/apps/ktouch/ktouchui.rc
 share/apps/ktouch/la.keyboard
@@ -703,8 +707,10 @@ share/apps/ktouch/no.keyboard
 share/apps/ktouch/norwegian.ktouch
 share/apps/ktouch/number.keyboard
 share/apps/ktouch/number.ktouch
+share/apps/ktouch/portuguese.ktouch
 share/apps/ktouch/pt.keyboard
 share/apps/ktouch/se.keyboard
+share/apps/ktouch/spanish.ktouch
 share/apps/ktouch/splash.png
 share/apps/ktouch/up.wav
 share/apps/kverbos/kverbosui.rc
@@ -1035,8 +1041,6 @@ share/icons/locolor/32x32/apps/kpercentage.png
 share/icons/locolor/32x32/apps/kstars.png
 share/icons/locolor/48x48/apps/kstars.png
 share/mimelnk/application/x-edu.desktop
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
 @dirrm share/icons/locolor/48x48/apps
 @dirrm share/icons/locolor/48x48
 @dirrm share/icons/locolor/32x32/apps
@@ -1051,18 +1055,9 @@ share/mimelnk/application/x-edu.desktop
 @dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/22x22/apps
 @dirrm share/icons/hicolor/22x22
-@dirrm share/icons/hicolor
 @dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/48x48
 @dirrm share/icons/crystalsvg/32x32/apps
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
 @dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
 @dirrm share/doc/HTML/en/kvoctrain
 @dirrm share/doc/HTML/en/kverbos
 @dirrm share/doc/HTML/en/ktouch
@@ -1078,8 +1073,6 @@ share/mimelnk/application/x-edu.desktop
 @dirrm share/doc/HTML/en/keduca
 @dirrm share/doc/HTML/en/kalzium
 @dirrm share/doc/HTML/en/flashkard
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/kvoctrain/examples
 @dirrm share/apps/kvoctrain
 @dirrm share/apps/kverbos/pics
@@ -1143,11 +1136,9 @@ share/mimelnk/application/x-edu.desktop
 @dirrm share/apps/flashkard/icons/crystalsvg
 @dirrm share/apps/flashkard/icons
 @dirrm share/apps/flashkard
-@dirrm share/apps
 @dirrm share/applnk/Edutainment/Tools
 @dirrm share/applnk/Edutainment/Science
 @dirrm share/applnk/Edutainment/Miscellanous
 @dirrm share/applnk/Edutainment/Mathematics
 @dirrm share/applnk/Edutainment/Languages
 @dirrm share/applnk/Edutainment
-@dirrm share/applnk