Update to KDE 3.1.2

31 files changed, 49 insertions, 117 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kde4-baseapps/files/plist.base b/x11/kde4-baseapps/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kde4-baseapps/files/plist.base
+++ b/x11/kde4-baseapps/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
 share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
 share/services/kuriikwsfilter.desktop
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kde4-runtime/files/plist.base b/x11/kde4-runtime/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kde4-runtime/files/plist.base
+++ b/x11/kde4-runtime/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
 share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
 share/services/kuriikwsfilter.desktop
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kde4-workspace/files/plist.base b/x11/kde4-workspace/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kde4-workspace/files/plist.base
+++ b/x11/kde4-workspace/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
 share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
 share/services/kuriikwsfilter.desktop
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kdebase3/files/plist.base b/x11/kdebase3/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kdebase3/files/plist.base
+++ b/x11/kdebase3/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
 share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
 share/services/kuriikwsfilter.desktop
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kdebase4-runtime/files/plist.base b/x11/kdebase4-runtime/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kdebase4-runtime/files/plist.base
+++ b/x11/kdebase4-runtime/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
 share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
 share/services/kuriikwsfilter.desktop
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kdebase4-workspace/files/plist.base b/x11/kdebase4-workspace/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kdebase4-workspace/files/plist.base
+++ b/x11/kdebase4-workspace/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
 share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
 share/services/kuriikwsfilter.desktop
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 432cddcea474..1ae4170f6ed5 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 4240fef3d834..2c406b62b08c 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdebase-3.1.1a.tar.bz2) = 66069257f56c7e8b931c853029e2b093
+MD5 (KDE/kdebase-3.1.2.tar.bz2) = a90feb5273e9f524a2b19d9021ece7a6
+
diff --git a/x11/kdebase4/files/plist.base b/x11/kdebase4/files/plist.base
index 80a9509368eb..31f8e3f166f0 100644
--- a/x11/kdebase4/files/plist.base
+++ b/x11/kdebase4/files/plist.base
@@ -2783,6 +2783,7 @@ share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
 share/services/konqueror_config.desktop
+share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
 share/services/kuriikwsfilter.desktop
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index f6eda1c101c2..a7a376c53513 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -7,15 +7,15 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=        This is the base set of libraries needed by KDE programs
+COMMENT=	This is the base set of libraries needed by KDE programs
 
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
@@ -63,7 +63,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/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+=	libldap.so:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index f75781c8d9b1..0841ea17391a 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.1a.tar.bz2) = 77cc0b44b43ea239cb3f8e37d7814f1a
+MD5 (KDE/kdelibs-3.1.2.tar.bz2) = 2b896ce9a6942e4cc4fe1758236bafa3
diff --git a/x11/kdelibs3/files/patch-kdoctools::xmlizer b/x11/kdelibs3/files/patch-kdoctools::xmlizer
deleted file mode 100644
index cf46f6cbca33..000000000000
--- a/x11/kdelibs3/files/patch-kdoctools::xmlizer
+++ /dev/null
@@ -1,8 +0,0 @@
---- kdoctools/xmlizer.orig	Wed Jan 29 17:17:40 2003
-+++ kdoctools/xmlizer	Wed Jan 29 17:17:57 2003
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#! /usr/bin/env python
- 
- import re, sys, os, string
- 
diff --git a/x11/kdelibs3/files/plist.base b/x11/kdelibs3/files/plist.base
index f5458c52a237..1d4814ba46db 100644
--- a/x11/kdelibs3/files/plist.base
+++ b/x11/kdelibs3/files/plist.base
@@ -103,6 +103,7 @@ include/kabc/distributionlistdialog.h
 include/kabc/distributionlisteditor.h
 include/kabc/errorhandler.h
 include/kabc/field.h
+include/kabc/format.h
 include/kabc/formatfactory.h
 include/kabc/formatplugin.h
 include/kabc/geo.h
@@ -3868,19 +3869,6 @@ share/servicetypes/ktexteditorplugin.desktop
 share/servicetypes/kurifilterplugin.desktop
 share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/bg/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/fo/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/lt/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/no-NY/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/stylesheets
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/wa/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xh/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xx/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/zh-CN/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/indexing
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/javahelp
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/template
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
diff --git a/x11/kdelibs3/files/plist.base.rm b/x11/kdelibs3/files/plist.base.rm
index 279b61cf447a..b5d360213c9b 100644
--- a/x11/kdelibs3/files/plist.base.rm
+++ b/x11/kdelibs3/files/plist.base.rm
@@ -13,19 +13,6 @@
 @unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html || true
 @unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html || true
 @unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/template || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/javahelp || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/indexing || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/zh-CN/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xx/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xh/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/wa/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/stylesheets || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/no-NY/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/lt/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/fo/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/bg/entities || true
 @dirrm share/servicetypes
 @dirrm share/services/kded
 @dirrm share/services
@@ -111,17 +98,12 @@
 @dirrm share/apps/ksgmltools2/docbook/xsl/html
 @dirrm share/apps/ksgmltools2/docbook/xsl/common
 @dirrm share/apps/ksgmltools2/docbook/xsl
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
 @dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
 @dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
 @dirrm share/apps/ksgmltools2/docbook
 @dirrm share/apps/ksgmltools2/customization/zh-TW/entities
 @dirrm share/apps/ksgmltools2/customization/zh-TW
-@dirrm share/apps/ksgmltools2/customization/zh-CN
-@dirrm share/apps/ksgmltools2/customization/xx
 @dirrm share/apps/ksgmltools2/customization/xsl
-@dirrm share/apps/ksgmltools2/customization/xh
-@dirrm share/apps/ksgmltools2/customization/wa
 @dirrm share/apps/ksgmltools2/customization/uk/entities
 @dirrm share/apps/ksgmltools2/customization/uk
 @dirrm share/apps/ksgmltools2/customization/tr/entities
@@ -146,13 +128,11 @@
 @dirrm share/apps/ksgmltools2/customization/pl
 @dirrm share/apps/ksgmltools2/customization/obsolete
 @dirrm share/apps/ksgmltools2/customization/no/entities
-@dirrm share/apps/ksgmltools2/customization/no-NY
 @dirrm share/apps/ksgmltools2/customization/no
 @dirrm share/apps/ksgmltools2/customization/nn/entities
 @dirrm share/apps/ksgmltools2/customization/nn
 @dirrm share/apps/ksgmltools2/customization/nl/entities
 @dirrm share/apps/ksgmltools2/customization/nl
-@dirrm share/apps/ksgmltools2/customization/lt
 @dirrm share/apps/ksgmltools2/customization/ko/entities
 @dirrm share/apps/ksgmltools2/customization/ko
 @dirrm share/apps/ksgmltools2/customization/ja/entities
@@ -167,7 +147,6 @@
 @dirrm share/apps/ksgmltools2/customization/he
 @dirrm share/apps/ksgmltools2/customization/fr/entities
 @dirrm share/apps/ksgmltools2/customization/fr
-@dirrm share/apps/ksgmltools2/customization/fo
 @dirrm share/apps/ksgmltools2/customization/fi/entities
 @dirrm share/apps/ksgmltools2/customization/fi
 @dirrm share/apps/ksgmltools2/customization/et/entities
@@ -190,7 +169,6 @@
 @dirrm share/apps/ksgmltools2/customization/cs
 @dirrm share/apps/ksgmltools2/customization/ca/entities
 @dirrm share/apps/ksgmltools2/customization/ca
-@dirrm share/apps/ksgmltools2/customization/bg
 @dirrm share/apps/ksgmltools2/customization/af/entities
 @dirrm share/apps/ksgmltools2/customization/af
 @dirrm share/apps/ksgmltools2/customization
@@ -260,3 +238,4 @@
 @dirrm include/kate
 @dirrm include/kabc
 @dirrm include/dom
+@unexec /bin/rmdir %D/include/arts || true
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index f6eda1c101c2..a7a376c53513 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -7,15 +7,15 @@
 #
 
 PORTNAME=	kdelibs
-PORTVERSION=	${KDE_VERSION}a
+PORTVERSION=	${KDE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}a/src
+MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=        This is the base set of libraries needed by KDE programs
+COMMENT=	This is the base set of libraries needed by KDE programs
 
 BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
@@ -63,7 +63,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/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+=	libldap.so:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index f75781c8d9b1..0841ea17391a 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.1a.tar.bz2) = 77cc0b44b43ea239cb3f8e37d7814f1a
+MD5 (KDE/kdelibs-3.1.2.tar.bz2) = 2b896ce9a6942e4cc4fe1758236bafa3
diff --git a/x11/kdelibs4/files/patch-kdoctools::xmlizer b/x11/kdelibs4/files/patch-kdoctools::xmlizer
deleted file mode 100644
index cf46f6cbca33..000000000000
--- a/x11/kdelibs4/files/patch-kdoctools::xmlizer
+++ /dev/null
@@ -1,8 +0,0 @@
---- kdoctools/xmlizer.orig	Wed Jan 29 17:17:40 2003
-+++ kdoctools/xmlizer	Wed Jan 29 17:17:57 2003
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#! /usr/bin/env python
- 
- import re, sys, os, string
- 
diff --git a/x11/kdelibs4/files/plist.base b/x11/kdelibs4/files/plist.base
index f5458c52a237..1d4814ba46db 100644
--- a/x11/kdelibs4/files/plist.base
+++ b/x11/kdelibs4/files/plist.base
@@ -103,6 +103,7 @@ include/kabc/distributionlistdialog.h
 include/kabc/distributionlisteditor.h
 include/kabc/errorhandler.h
 include/kabc/field.h
+include/kabc/format.h
 include/kabc/formatfactory.h
 include/kabc/formatplugin.h
 include/kabc/geo.h
@@ -3868,19 +3869,6 @@ share/servicetypes/ktexteditorplugin.desktop
 share/servicetypes/kurifilterplugin.desktop
 share/servicetypes/renamedlgplugin.desktop
 share/servicetypes/scriptinterface.desktop
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/bg/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/fo/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/lt/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/no-NY/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/stylesheets
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/wa/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xh/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/xx/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/customization/zh-CN/entities
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/indexing
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/javahelp
-@exec /bin/mkdir -p %D/share/apps/ksgmltools2/docbook/xsl/template
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
diff --git a/x11/kdelibs4/files/plist.base.rm b/x11/kdelibs4/files/plist.base.rm
index 279b61cf447a..b5d360213c9b 100644
--- a/x11/kdelibs4/files/plist.base.rm
+++ b/x11/kdelibs4/files/plist.base.rm
@@ -13,19 +13,6 @@
 @unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html || true
 @unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html || true
 @unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/template || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/javahelp || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xsl/indexing || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/docbook/xml-dtd-4.2/ent || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/zh-CN/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xx/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/xh/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/wa/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/stylesheets || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/no-NY/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/lt/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/fo/entities || true
-@unexec /bin/rmdir %D/share/apps/ksgmltools2/customization/bg/entities || true
 @dirrm share/servicetypes
 @dirrm share/services/kded
 @dirrm share/services
@@ -111,17 +98,12 @@
 @dirrm share/apps/ksgmltools2/docbook/xsl/html
 @dirrm share/apps/ksgmltools2/docbook/xsl/common
 @dirrm share/apps/ksgmltools2/docbook/xsl
-@dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.2
 @dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent
 @dirrm share/apps/ksgmltools2/docbook/xml-dtd-4.1.2
 @dirrm share/apps/ksgmltools2/docbook
 @dirrm share/apps/ksgmltools2/customization/zh-TW/entities
 @dirrm share/apps/ksgmltools2/customization/zh-TW
-@dirrm share/apps/ksgmltools2/customization/zh-CN
-@dirrm share/apps/ksgmltools2/customization/xx
 @dirrm share/apps/ksgmltools2/customization/xsl
-@dirrm share/apps/ksgmltools2/customization/xh
-@dirrm share/apps/ksgmltools2/customization/wa
 @dirrm share/apps/ksgmltools2/customization/uk/entities
 @dirrm share/apps/ksgmltools2/customization/uk
 @dirrm share/apps/ksgmltools2/customization/tr/entities
@@ -146,13 +128,11 @@
 @dirrm share/apps/ksgmltools2/customization/pl
 @dirrm share/apps/ksgmltools2/customization/obsolete
 @dirrm share/apps/ksgmltools2/customization/no/entities
-@dirrm share/apps/ksgmltools2/customization/no-NY
 @dirrm share/apps/ksgmltools2/customization/no
 @dirrm share/apps/ksgmltools2/customization/nn/entities
 @dirrm share/apps/ksgmltools2/customization/nn
 @dirrm share/apps/ksgmltools2/customization/nl/entities
 @dirrm share/apps/ksgmltools2/customization/nl
-@dirrm share/apps/ksgmltools2/customization/lt
 @dirrm share/apps/ksgmltools2/customization/ko/entities
 @dirrm share/apps/ksgmltools2/customization/ko
 @dirrm share/apps/ksgmltools2/customization/ja/entities
@@ -167,7 +147,6 @@
 @dirrm share/apps/ksgmltools2/customization/he
 @dirrm share/apps/ksgmltools2/customization/fr/entities
 @dirrm share/apps/ksgmltools2/customization/fr
-@dirrm share/apps/ksgmltools2/customization/fo
 @dirrm share/apps/ksgmltools2/customization/fi/entities
 @dirrm share/apps/ksgmltools2/customization/fi
 @dirrm share/apps/ksgmltools2/customization/et/entities
@@ -190,7 +169,6 @@
 @dirrm share/apps/ksgmltools2/customization/cs
 @dirrm share/apps/ksgmltools2/customization/ca/entities
 @dirrm share/apps/ksgmltools2/customization/ca
-@dirrm share/apps/ksgmltools2/customization/bg
 @dirrm share/apps/ksgmltools2/customization/af/entities
 @dirrm share/apps/ksgmltools2/customization/af
 @dirrm share/apps/ksgmltools2/customization
@@ -260,3 +238,4 @@
 @dirrm include/kate
 @dirrm include/kabc
 @dirrm include/dom
+@unexec /bin/rmdir %D/include/arts || true