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)

18 files changed, 51 insertions, 39 deletions

diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index ce6cd2033253..f90eaf179320 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -22,9 +22,16 @@ PREFIX=		${KDE_PREFIX}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%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/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo
index 2ac90c236b8d..accd708e8cb3 100644
--- a/sysutils/kdeadmin3/distinfo
+++ b/sysutils/kdeadmin3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeadmin-3.1.2.tar.bz2) = 94c2981cd54bd02549664852fb82dd05
+MD5 (KDE/kdeadmin-3.1.3.tar.bz2) = e733972693e1f9196a11cc90953a93d8
diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist
index ebd5252ce2db..5fbabeb8dd2b 100644
--- a/sysutils/kdeadmin3/pkg-plist
+++ b/sysutils/kdeadmin3/pkg-plist
@@ -120,24 +120,14 @@ share/icons/locolor/16x16/apps/kxconfig.png
 share/mimelnk/application/x-debian-package.desktop
 share/services/kfile_deb.desktop
 share/services/kfile_rpm.desktop
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
 @dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64
 @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/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
 @dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
 @dirrm share/doc/HTML/en/kxconfig
 @dirrm share/doc/HTML/en/kwuftpd
 @dirrm share/doc/HTML/en/kuser
@@ -145,8 +135,6 @@ share/services/kfile_rpm.desktop
 @dirrm share/doc/HTML/en/kpackage
 @dirrm share/doc/HTML/en/kdat
 @dirrm share/doc/HTML/en/kcron
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/kxconfig/pics
 @dirrm share/apps/kxconfig/hwdata
 @dirrm share/apps/kxconfig
@@ -159,9 +147,5 @@ share/services/kfile_rpm.desktop
 @dirrm share/apps/kpackage/toolbar
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
-@dirrm share/apps
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Peripherals
-@dirrm share/applnk/Settings
-@dirrm share/applnk
-@dirrm lib/kde3
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index ce6cd2033253..f90eaf179320 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -22,9 +22,16 @@ PREFIX=		${KDE_PREFIX}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%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/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 2ac90c236b8d..accd708e8cb3 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeadmin-3.1.2.tar.bz2) = 94c2981cd54bd02549664852fb82dd05
+MD5 (KDE/kdeadmin-3.1.3.tar.bz2) = e733972693e1f9196a11cc90953a93d8
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index ebd5252ce2db..5fbabeb8dd2b 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -120,24 +120,14 @@ share/icons/locolor/16x16/apps/kxconfig.png
 share/mimelnk/application/x-debian-package.desktop
 share/services/kfile_deb.desktop
 share/services/kfile_rpm.desktop
-@dirrm share/services
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
 @dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/64x64
 @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/16x16/apps
-@dirrm share/icons/crystalsvg/16x16
 @dirrm share/icons/crystalsvg/128x128/apps
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
 @dirrm share/doc/HTML/en/kxconfig
 @dirrm share/doc/HTML/en/kwuftpd
 @dirrm share/doc/HTML/en/kuser
@@ -145,8 +135,6 @@ share/services/kfile_rpm.desktop
 @dirrm share/doc/HTML/en/kpackage
 @dirrm share/doc/HTML/en/kdat
 @dirrm share/doc/HTML/en/kcron
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
 @dirrm share/apps/kxconfig/pics
 @dirrm share/apps/kxconfig/hwdata
 @dirrm share/apps/kxconfig
@@ -159,9 +147,5 @@ share/services/kfile_rpm.desktop
 @dirrm share/apps/kpackage/toolbar
 @dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
-@dirrm share/apps
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Peripherals
-@dirrm share/applnk/Settings
-@dirrm share/applnk
-@dirrm lib/kde3
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index a2cdd777537f..5e1bc54866db 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -58,4 +58,8 @@ post-patch:
 .endif
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
+pre-configure::
+	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index b21b9d66641b..a42d2cff854a 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
+MD5 (KDE/kdeutils-3.1.3.tar.bz2) = 21f3fa1d110a8cf8cb1a140745f90211
diff --git a/sysutils/kdf/files/plist.klaptop b/sysutils/kdf/files/plist.klaptop
index 00f1bfdbc5c9..13c6fff6b0a9 100644
--- a/sysutils/kdf/files/plist.klaptop
+++ b/sysutils/kdf/files/plist.klaptop
@@ -9,6 +9,10 @@ share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
 share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
 share/icons/crystalsvg/128x128/apps/laptop_battery.png
 share/icons/crystalsvg/16x16/apps/klaptopdaemon.png
diff --git a/sysutils/kdf/files/plist.klaptop.rm b/sysutils/kdf/files/plist.klaptop.rm
index 34ce14d82234..312e3fb50138 100644
--- a/sysutils/kdf/files/plist.klaptop.rm
+++ b/sysutils/kdf/files/plist.klaptop.rm
@@ -1,5 +1,7 @@
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index a2cdd777537f..5e1bc54866db 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -58,4 +58,8 @@ post-patch:
 .endif
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
+pre-configure::
+	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index b21b9d66641b..a42d2cff854a 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
+MD5 (KDE/kdeutils-3.1.3.tar.bz2) = 21f3fa1d110a8cf8cb1a140745f90211
diff --git a/sysutils/kfloppy/files/plist.klaptop b/sysutils/kfloppy/files/plist.klaptop
index 00f1bfdbc5c9..13c6fff6b0a9 100644
--- a/sysutils/kfloppy/files/plist.klaptop
+++ b/sysutils/kfloppy/files/plist.klaptop
@@ -9,6 +9,10 @@ share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
 share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
 share/icons/crystalsvg/128x128/apps/laptop_battery.png
 share/icons/crystalsvg/16x16/apps/klaptopdaemon.png
diff --git a/sysutils/kfloppy/files/plist.klaptop.rm b/sysutils/kfloppy/files/plist.klaptop.rm
index 34ce14d82234..312e3fb50138 100644
--- a/sysutils/kfloppy/files/plist.klaptop.rm
+++ b/sysutils/kfloppy/files/plist.klaptop.rm
@@ -1,5 +1,7 @@
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index a2cdd777537f..5e1bc54866db 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -58,4 +58,8 @@ post-patch:
 .endif
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+
+pre-configure::
+	${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index b21b9d66641b..a42d2cff854a 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-3.1.2.tar.bz2) = 49611a79b2d77cf6e9913ffb445fa209
+MD5 (KDE/kdeutils-3.1.3.tar.bz2) = 21f3fa1d110a8cf8cb1a140745f90211
diff --git a/sysutils/sweeper/files/plist.klaptop b/sysutils/sweeper/files/plist.klaptop
index 00f1bfdbc5c9..13c6fff6b0a9 100644
--- a/sysutils/sweeper/files/plist.klaptop
+++ b/sysutils/sweeper/files/plist.klaptop
@@ -9,6 +9,10 @@ share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_charge.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nobattery.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/laptop_nocharge.png
 share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions/power.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_charge.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nobattery.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_nocharge.png
+share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions/laptop_power.png
 share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions/power.png
 share/icons/crystalsvg/128x128/apps/laptop_battery.png
 share/icons/crystalsvg/16x16/apps/klaptopdaemon.png
diff --git a/sysutils/sweeper/files/plist.klaptop.rm b/sysutils/sweeper/files/plist.klaptop.rm
index 34ce14d82234..312e3fb50138 100644
--- a/sysutils/sweeper/files/plist.klaptop.rm
+++ b/sysutils/sweeper/files/plist.klaptop.rm
@@ -1,5 +1,7 @@
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32/actions
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/32x32
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22/actions
+@dirrm share/apps/klaptopdaemon/icons/crystalsvg/22x22
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16/actions
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg/16x16
 @dirrm share/apps/klaptopdaemon/icons/crystalsvg