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, 8 insertions, 9 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index a7a376c53513..f25be3225cf9 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
@@ -45,10 +44,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-ltdl-install	\
 		--enable-mt		\
 		--enable-cups
+KDE_BUILD_PLIST=	yes
 
 FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
 FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/tcvn-0.enc
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
+
 # fam provides a measurable performance increase for file watching
 # operations within KDE
 .if exists(${LOCALBASE}/bin/fam)
@@ -60,18 +63,15 @@ LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif # !exists(/usr/bin/bzip2)
 
-KDE_BUILD_PLIST=	yes
 # kabc (the addressbook backend) can use ldap if it's available
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
 LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
 PLIST_APPEND+=	plist.ldap
 .endif
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
 pre-configure:
 	${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in
+	${REINPLACE_CMD} "s,-pedantic ,," ${WRKSRC}/configure
 
 post-install:
 	${MKDIR} ${PREFIX}/etc/rc.d
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 0841ea17391a..af67b6717e87 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.2.tar.bz2) = 2b896ce9a6942e4cc4fe1758236bafa3
+MD5 (KDE/kdelibs-3.1.3.tar.bz2) = 0069e199dd69f27f20afbd5b64449725
diff --git a/x11/kdelibs4/files/plist.base b/x11/kdelibs4/files/plist.base
index 1d4814ba46db..f4a1ed018194 100644
--- a/x11/kdelibs4/files/plist.base
+++ b/x11/kdelibs4/files/plist.base
@@ -560,7 +560,6 @@ include/libkmid/track.h
 include/libkmid/voiceman.h
 include/netwm.h
 include/netwm_def.h
-include/netwm_p.h
 include/qxembed.h
 include/renamedlgplugin.h
 include/scriptclientinterface.h
@@ -630,8 +629,6 @@ lib/kde3/kio_metainfo.la
 lib/kde3/kio_metainfo.so
 lib/kde3/kjavaappletviewer.la
 lib/kde3/kjavaappletviewer.so
-lib/kde3/kjs_html.la
-lib/kde3/kjs_html.so
 lib/kde3/ktexteditor_insertfile.la
 lib/kde3/ktexteditor_insertfile.so
 lib/kde3/ktexteditor_isearch.la
@@ -2244,6 +2241,7 @@ share/icons/crystalsvg/16x16/actions/flag.png
 share/icons/crystalsvg/16x16/actions/folder_new.png
 share/icons/crystalsvg/16x16/actions/fontsizedown.png
 share/icons/crystalsvg/16x16/actions/fontsizeup.png
+share/icons/crystalsvg/16x16/actions/fork.png
 share/icons/crystalsvg/16x16/actions/forward.png
 share/icons/crystalsvg/16x16/actions/frame_edit.png
 share/icons/crystalsvg/16x16/actions/frame_formula.png
@@ -2640,6 +2638,7 @@ share/icons/crystalsvg/22x22/actions/folder.png
 share/icons/crystalsvg/22x22/actions/folder_new.png
 share/icons/crystalsvg/22x22/actions/fontsizedown.png
 share/icons/crystalsvg/22x22/actions/fontsizeup.png
+share/icons/crystalsvg/22x22/actions/fork.png
 share/icons/crystalsvg/22x22/actions/forward.png
 share/icons/crystalsvg/22x22/actions/frame_chart.png
 share/icons/crystalsvg/22x22/actions/frame_edit.png