Rejoice, for the long awaited upgrade to kde 3.1.1 is here!

7 files changed, 488 insertions, 253 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 1513169f1c59..680adf019ee1 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -15,7 +15,7 @@ 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 \
@@ -44,29 +44,31 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-ltdl-install	\
 		--enable-mt		\
-		--enable-cups		\
-		${XINERAMA}
+		--enable-cups
 
 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)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif # exists(${LOCALBASE}/bin/fam)
 
+# bzip2 is required as a libdepend for the help: kioslave
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif # !exists(/usr/bin/bzip2)
 
-.if defined(WITH_XINERAMA)
-XINERAMA=	-with-xinerama
-PKGNAMESUFFIX=	-xinerama
-.else
-XINERAMA=	-without-xinerama
-.endif # defined(WITH_XINERAMA)
+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
+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
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index fa90e08264bc..a1a6eb15842c 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-3.1.tar.bz2) = 4b5cb94d5889134ba4e86749e6b5476c
+MD5 (KDE/kdelibs-3.1.1.tar.bz2) = 15eb9412c589126844b277b9e80cfffc
diff --git a/x11/kdelibs3/files/patch-kio::kio::kzip.cpp b/x11/kdelibs3/files/patch-kio::kio::kzip.cpp
new file mode 100644
index 000000000000..1b4b7d35e230
--- /dev/null
+++ b/x11/kdelibs3/files/patch-kio::kio::kzip.cpp
@@ -0,0 +1,59 @@
+--- kio/kio/kzip.cpp.orig	Fri Jan  3 05:58:47 2003
++++ kio/kio/kzip.cpp	Fri Mar 21 11:13:48 2003
+@@ -332,27 +332,43 @@
+ 
+             KArchiveEntry* entry;
+             if ( isdir )
+-                entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null );
++            {
++                QString path = QDir::cleanDirPath( name.left( pos ) );
++                KArchiveEntry* ent = rootDir()->entry( path );
++                if ( ent && ent->isDirectory() )
++                {
++                    //kdDebug(7040) << "Directory already exists, NOT going to add it again" << endl;
++                    entry = 0L;
++                }
++                else
++                {
++                    entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null );
++                    //kdDebug(7040) << "KArchiveDirectory created, entryName= " << entryName << ", name=" << name << endl;
++                }
++            }
+             else
+             {
+                 entry = new KZipFileEntry( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null,
+-                                          name, dataoffset, ucsize, cmethod, csize );
++                                        name, dataoffset, ucsize, cmethod, csize );
+                 static_cast<KZipFileEntry *>(entry)->setHeaderStart( localheaderoffset );
+-                //kdDebug(7040) << "KZipFileEntry created" << endl;
++                //kdDebug(7040) << "KZipFileEntry created, entryName= " << entryName << ", name=" << name << endl;
+                 d->m_fileList.append( static_cast<KZipFileEntry *>( entry ) );
+             }
+ 
+-            if ( pos == -1 )
++            if ( entry )
+             {
+-                rootDir()->addEntry(entry);
+-            }
+-            else
+-            {
+-                // In some tar files we can find dir/./file => call cleanDirPath
+-                QString path = QDir::cleanDirPath( name.left( pos ) );
+-                // Ensure container directory exists, create otherwise
+-                KArchiveDirectory * tdir = findOrCreate( path );
+-                tdir->addEntry(entry);
++                if ( pos == -1 )
++                {
++                    rootDir()->addEntry(entry);
++                }
++                else
++                {
++                    // In some tar files we can find dir/./file => call cleanDirPath
++                    QString path = QDir::cleanDirPath( name.left( pos ) );
++                    // Ensure container directory exists, create otherwise
++                    KArchiveDirectory * tdir = findOrCreate( path );
++                    tdir->addEntry(entry);
++                }
+             }
+ 
+             //calculate offset to next entry
diff --git a/x11/kdelibs3/files/patch-kioslave::http::http.cc b/x11/kdelibs3/files/patch-kioslave::http::http.cc
new file mode 100644
index 000000000000..b2ed6d914d1f
--- /dev/null
+++ b/x11/kdelibs3/files/patch-kioslave::http::http.cc
@@ -0,0 +1,126 @@
+--- kioslave/http/http.cc.orig	Sun Mar  2 20:02:28 2003
++++ kioslave/http/http.cc	Thu Mar 20 22:05:14 2003
+@@ -438,7 +438,6 @@
+           kdDebug(7113) << "(" << m_pid << ") Unset tunneling flag!" << endl;
+           setEnableSSLTunnel( false );
+           m_bIsTunneled = true;
+-          m_bNeedTunnel = false;
+           // Reset the CONNECT response code...
+           m_responseCode = m_prevResponseCode;
+           continue;
+@@ -1936,7 +1935,42 @@
+   // Check the validity of the current connection, if one exists.
+   httpCheckConnection();  
+ 
+-  // Determine if this is a POST or GET method
++
++  if ( !m_bIsTunneled && m_bNeedTunnel )
++  {
++    setEnableSSLTunnel( true );
++    // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't
++    // need any HTTP 1.1 capabilities for CONNECT - Waba
++    header = QString("CONNECT %1:%2 HTTP/1.0"
++                     "\r\n").arg( m_request.hostname).arg(m_request.port);
++
++    // Identify who you are to the proxy server!
++    if (!m_request.userAgent.isEmpty())
++        header += "User-Agent: " + m_request.userAgent + "\r\n";
++
++    /* Add hostname information */
++    header += "Host: ";
++    if (m_state.hostname.find(':') != -1)
++    {
++      // This is an IPv6 (not hostname)
++      header += '[';
++      header += m_state.hostname;
++      header += ']';
++    }
++    else
++    {
++      header += m_state.hostname;
++    }
++
++    if (m_state.port != m_iDefaultPort)
++      header += QString(":%1").arg(m_state.port);
++    header += "\r\n";
++
++    header += proxyAuthenticationHeader();
++  }
++  else
++  {
++    // Determine the kind of method we are handling...
+   switch (m_request.method)
+   {
+   case HTTP_GET:
+@@ -1944,12 +1978,12 @@
+       break;
+   case HTTP_PUT:
+       header = "PUT ";
+-      moreData = !m_bNeedTunnel;
++        moreData = true;
+       m_request.bCachedWrite = false; // Do not put any result in the cache
+       break;
+   case HTTP_POST:
+       header = "POST ";
+-      moreData = !m_bNeedTunnel;
++        moreData = true;
+       m_request.bCachedWrite = false; // Do not put any result in the cache
+       break;
+   case HTTP_HEAD:
+@@ -2033,40 +2067,6 @@
+       return false;
+   }
+ 
+-  if ( !m_bIsTunneled && m_bNeedTunnel )
+-  {
+-    setEnableSSLTunnel( true );
+-    // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't
+-    // need any HTTP 1.1 capabilities for CONNECT - Waba
+-    header = QString("CONNECT %1:%2 HTTP/1.0"
+-                     "\r\n").arg( m_request.hostname).arg(m_request.port);
+-
+-    // Identify who you are to the proxy server!
+-    if (!m_request.userAgent.isEmpty())
+-        header += "User-Agent: " + m_request.userAgent + "\r\n";
+-
+-    /* Add hostname information */
+-    header += "Host: ";
+-    if (m_state.hostname.find(':') != -1)
+-    {
+-      // This is an IPv6 (not hostname)
+-      header += '[';
+-      header += m_state.hostname;
+-      header += ']';
+-    }
+-    else
+-    {
+-      header += m_state.hostname;
+-    }
+-
+-    if (m_state.port != m_iDefaultPort)
+-      header += QString(":%1").arg(m_state.port);
+-    header += "\r\n";
+-
+-    header += proxyAuthenticationHeader();
+-  }
+-  else
+-  {
+     // format the URI
+     if (m_state.doProxy && !m_bIsTunneled)
+     {
+@@ -2271,7 +2271,6 @@
+     // Do we need to authorize to the proxy server ?
+     if ( m_state.doProxy && !m_bIsTunneled )
+       header += proxyAuthenticationHeader();
+-  }
+ 
+   if ( m_protocol == "webdav" || m_protocol == "webdavs" )
+   {
+@@ -2289,6 +2288,7 @@
+     // add extra header elements for WebDAV
+     if ( !davHeader.isNull() )
+       header += davHeader;
++    }
+   }
+ 
+   kdDebug(7103) << "(" << m_pid << ") ============ Sending Header:" << endl;
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/files/plist.base
index 3bf527f8d469..f5458c52a237 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/files/plist.base
@@ -627,6 +627,8 @@ lib/kde3/kio_http.la
 lib/kde3/kio_http.so
 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
@@ -777,7 +779,9 @@ share/apps/katepart/syntax/javascript.xml
 share/apps/katepart/syntax/kbasic.xml
 share/apps/katepart/syntax/language.dtd
 share/apps/katepart/syntax/latex.xml
+share/apps/katepart/syntax/ldif.xml
 share/apps/katepart/syntax/literate-haskell.xml
+share/apps/katepart/syntax/lpc.xml
 share/apps/katepart/syntax/mab.xml
 share/apps/katepart/syntax/makefile.xml
 share/apps/katepart/syntax/mason.xml
@@ -786,6 +790,7 @@ share/apps/katepart/syntax/objectivec.xml
 share/apps/katepart/syntax/pascal.xml
 share/apps/katepart/syntax/perl.xml
 share/apps/katepart/syntax/php.xml
+share/apps/katepart/syntax/picsrc.xml
 share/apps/katepart/syntax/postscript.xml
 share/apps/katepart/syntax/prolog.xml
 share/apps/katepart/syntax/python.xml
@@ -795,6 +800,7 @@ share/apps/katepart/syntax/rsiidl.xml
 share/apps/katepart/syntax/ruby.xml
 share/apps/katepart/syntax/sather.xml
 share/apps/katepart/syntax/scheme.xml
+share/apps/katepart/syntax/sci.xml
 share/apps/katepart/syntax/sgml.xml
 share/apps/katepart/syntax/sml.xml
 share/apps/katepart/syntax/sql-mysql.xml
@@ -802,6 +808,8 @@ share/apps/katepart/syntax/sql-postgresql.xml
 share/apps/katepart/syntax/sql.xml
 share/apps/katepart/syntax/syntax.template
 share/apps/katepart/syntax/tcl.xml
+share/apps/katepart/syntax/uscript.xml
+share/apps/katepart/syntax/velocity.xml
 share/apps/katepart/syntax/verilog.xml
 share/apps/katepart/syntax/vhdl.xml
 share/apps/katepart/syntax/winehq.xml
@@ -3657,6 +3665,7 @@ share/mimelnk/application/x-graphite.desktop
 share/mimelnk/application/x-gzip.desktop
 share/mimelnk/application/x-hancomword.desktop
 share/mimelnk/application/x-jar.desktop
+share/mimelnk/application/x-java-applet.desktop
 share/mimelnk/application/x-java.desktop
 share/mimelnk/application/x-karbon.desktop
 share/mimelnk/application/x-kchart.desktop
@@ -3815,6 +3824,7 @@ share/services/kgzipfilter.desktop
 share/services/khtml.desktop
 share/services/khtmlimage.desktop
 share/services/kio_uiserver.desktop
+share/services/kjavaappletviewer.desktop
 share/services/kmailservice.protocol
 share/services/kmultipart.desktop
 share/services/knotify.desktop
@@ -3858,6 +3868,19 @@ 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
@@ -3873,243 +3896,3 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
 @exec /bin/mkdir -p %D/share/icons/crystalsvg/22x22/actions/kde
 @exec /bin/mkdir -p %D/share/icons/crystalsvg/32x32/actions/kde
-@unexec /bin/rmdir %D/share/icons/crystalsvg/32x32/actions/kde || true
-@unexec /bin/rmdir %D/share/icons/crystalsvg/22x22/actions/kde || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kspell/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kio/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html || true
-@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html || true
-@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
-@dirrm share/servicetypes
-@dirrm share/services/kded
-@dirrm share/services
-@dirrm share/mimelnk/video
-@dirrm share/mimelnk/text
-@dirrm share/mimelnk/multipart
-@dirrm share/mimelnk/message
-@dirrm share/mimelnk/inode
-@dirrm share/mimelnk/image
-@dirrm share/mimelnk/audio
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk/all
-@dirrm share/mimelnk
-@dirrm share/icons/hicolor
-@dirrm share/icons/crystalsvg/scalable/filesystems
-@dirrm share/icons/crystalsvg/scalable/devices
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/scalable
-@dirrm share/icons/crystalsvg/64x64/mimetypes
-@dirrm share/icons/crystalsvg/64x64/filesystems
-@dirrm share/icons/crystalsvg/64x64/devices
-@dirrm share/icons/crystalsvg/64x64/actions
-@dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/mimetypes
-@dirrm share/icons/crystalsvg/48x48/filesystems
-@dirrm share/icons/crystalsvg/48x48/devices
-@dirrm share/icons/crystalsvg/48x48/actions
-@dirrm share/icons/crystalsvg/48x48
-@dirrm share/icons/crystalsvg/32x32/mimetypes
-@dirrm share/icons/crystalsvg/32x32/filesystems
-@dirrm share/icons/crystalsvg/32x32/devices
-@dirrm share/icons/crystalsvg/32x32/actions
-@dirrm share/icons/crystalsvg/32x32
-@dirrm share/icons/crystalsvg/22x22/mimetypes
-@dirrm share/icons/crystalsvg/22x22/actions
-@dirrm share/icons/crystalsvg/22x22
-@dirrm share/icons/crystalsvg/16x16/mimetypes/pdf
-@dirrm share/icons/crystalsvg/16x16/mimetypes
-@dirrm share/icons/crystalsvg/16x16/filesystems
-@dirrm share/icons/crystalsvg/16x16/devices
-@dirrm share/icons/crystalsvg/16x16/actions
-@dirrm share/icons/crystalsvg/16x16
-@dirrm share/icons/crystalsvg/128x128/mimetypes
-@dirrm share/icons/crystalsvg/128x128
-@dirrm share/icons/crystalsvg
-@dirrm share/icons
-@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kspell
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kjs
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kio
-@dirrm share/doc/HTML/en/kdelibs-apidocs/khtml
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeui
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdefx
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
-@dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
-@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
-@dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
-@dirrm share/doc/HTML/en/kdelibs-apidocs
-@dirrm share/doc/HTML/en/common
-@dirrm share/doc/HTML/en
-@dirrm share/doc/HTML
-@dirrm share/config/ui
-@dirrm share/config/colors
-@dirrm share/config
-@dirrm share/autostart
-@dirrm share/apps/ktexteditor_kdatatool
-@dirrm share/apps/ktexteditor_isearch
-@dirrm share/apps/ktexteditor_insertfile
-@dirrm share/apps/kstyle/themes
-@dirrm share/apps/kstyle/pixmaps/riscos
-@dirrm share/apps/kstyle/pixmaps
-@dirrm share/apps/kstyle
-@dirrm share/apps/kssl
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools
-@dirrm share/apps/ksgmltools2/docbook/xsl/params
-@dirrm share/apps/ksgmltools2/docbook/xsl/lib
-@dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
-@dirrm share/apps/ksgmltools2/docbook/xsl/images
-@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.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/xsl
-@dirrm share/apps/ksgmltools2/customization/uk/entities
-@dirrm share/apps/ksgmltools2/customization/uk
-@dirrm share/apps/ksgmltools2/customization/tr/entities
-@dirrm share/apps/ksgmltools2/customization/tr
-@dirrm share/apps/ksgmltools2/customization/sv/entities
-@dirrm share/apps/ksgmltools2/customization/sv
-@dirrm share/apps/ksgmltools2/customization/sr/entities
-@dirrm share/apps/ksgmltools2/customization/sr
-@dirrm share/apps/ksgmltools2/customization/sl/entities
-@dirrm share/apps/ksgmltools2/customization/sl
-@dirrm share/apps/ksgmltools2/customization/sk/entities
-@dirrm share/apps/ksgmltools2/customization/sk
-@dirrm share/apps/ksgmltools2/customization/ru/entities
-@dirrm share/apps/ksgmltools2/customization/ru
-@dirrm share/apps/ksgmltools2/customization/ro/entities
-@dirrm share/apps/ksgmltools2/customization/ro
-@dirrm share/apps/ksgmltools2/customization/pt/entities
-@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
-@dirrm share/apps/ksgmltools2/customization/pt-BR
-@dirrm share/apps/ksgmltools2/customization/pt
-@dirrm share/apps/ksgmltools2/customization/pl/entities
-@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
-@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/ko/entities
-@dirrm share/apps/ksgmltools2/customization/ko
-@dirrm share/apps/ksgmltools2/customization/ja/entities
-@dirrm share/apps/ksgmltools2/customization/ja
-@dirrm share/apps/ksgmltools2/customization/it/entities
-@dirrm share/apps/ksgmltools2/customization/it
-@dirrm share/apps/ksgmltools2/customization/id/entities
-@dirrm share/apps/ksgmltools2/customization/id
-@dirrm share/apps/ksgmltools2/customization/hu/entities
-@dirrm share/apps/ksgmltools2/customization/hu
-@dirrm share/apps/ksgmltools2/customization/he/entities
-@dirrm share/apps/ksgmltools2/customization/he
-@dirrm share/apps/ksgmltools2/customization/fr/entities
-@dirrm share/apps/ksgmltools2/customization/fr
-@dirrm share/apps/ksgmltools2/customization/fi/entities
-@dirrm share/apps/ksgmltools2/customization/fi
-@dirrm share/apps/ksgmltools2/customization/et/entities
-@dirrm share/apps/ksgmltools2/customization/et
-@dirrm share/apps/ksgmltools2/customization/es/entities
-@dirrm share/apps/ksgmltools2/customization/es
-@dirrm share/apps/ksgmltools2/customization/entities
-@dirrm share/apps/ksgmltools2/customization/en/entities
-@dirrm share/apps/ksgmltools2/customization/en-GB/entities
-@dirrm share/apps/ksgmltools2/customization/en-GB
-@dirrm share/apps/ksgmltools2/customization/en
-@dirrm share/apps/ksgmltools2/customization/el/entities
-@dirrm share/apps/ksgmltools2/customization/el
-@dirrm share/apps/ksgmltools2/customization/dtd
-@dirrm share/apps/ksgmltools2/customization/de/entities
-@dirrm share/apps/ksgmltools2/customization/de
-@dirrm share/apps/ksgmltools2/customization/da/entities
-@dirrm share/apps/ksgmltools2/customization/da
-@dirrm share/apps/ksgmltools2/customization/cs/entities
-@dirrm share/apps/ksgmltools2/customization/cs
-@dirrm share/apps/ksgmltools2/customization/ca/entities
-@dirrm share/apps/ksgmltools2/customization/ca
-@dirrm share/apps/ksgmltools2/customization/af/entities
-@dirrm share/apps/ksgmltools2/customization/af
-@dirrm share/apps/ksgmltools2/customization
-@dirrm share/apps/ksgmltools2
-@dirrm share/apps/knotify
-@dirrm share/apps/kjava
-@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16
-@dirrm share/apps/kio_uiserver/icons/crystalsvg
-@dirrm share/apps/kio_uiserver/icons
-@dirrm share/apps/kio_uiserver
-@dirrm share/apps/khtml/icons/crystalsvg/32x32/actions
-@dirrm share/apps/khtml/icons/crystalsvg/32x32
-@dirrm share/apps/khtml/icons/crystalsvg/22x22/actions
-@dirrm share/apps/khtml/icons/crystalsvg/22x22
-@dirrm share/apps/khtml/icons/crystalsvg/16x16/actions
-@dirrm share/apps/khtml/icons/crystalsvg/16x16
-@dirrm share/apps/khtml/icons/crystalsvg
-@dirrm share/apps/khtml/icons
-@dirrm share/apps/khtml/css
-@dirrm share/apps/khtml
-@dirrm share/apps/kdewidgets/pics
-@dirrm share/apps/kdewidgets
-@dirrm share/apps/kdeui/pics
-@dirrm share/apps/kdeui
-@dirrm share/apps/kdeprint/tools
-@dirrm share/apps/kdeprint/plugins
-@dirrm share/apps/kdeprint/pics
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
-@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/22x22
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kdeprint/icons/crystalsvg/16x16
-@dirrm share/apps/kdeprint/icons/crystalsvg
-@dirrm share/apps/kdeprint/icons
-@dirrm share/apps/kdeprint/filters
-@dirrm share/apps/kdeprint
-@dirrm share/apps/kconf_update
-@dirrm share/apps/kcm_componentchooser
-@dirrm share/apps/kcertpart
-@dirrm share/apps/katepart/syntax
-@dirrm share/apps/katepart
-@dirrm share/apps/kabc/plugins
-@dirrm share/apps/kabc/formats
-@dirrm share/apps/kabc
-@dirrm share/apps/LICENSES
-@dirrm share/apps
-@dirrm share/applnk/Settings/Components
-@dirrm share/applnk/Settings
-@dirrm share/applnk
-@dirrm lib/kde3/plugins/styles
-@dirrm lib/kde3/plugins/designer
-@dirrm lib/kde3/plugins
-@dirrm lib/kde3
-@dirrm include/libkmid
-@dirrm include/ktexteditor
-@dirrm include/kparts
-@dirrm include/kmediaplayer
-@dirrm include/kjs
-@dirrm include/kio
-@dirrm include/kdesu
-@dirrm include/kdeprint/lpr
-@dirrm include/kdeprint
-@dirrm include/kate
-@dirrm include/kabc
-@dirrm include/dom
diff --git a/x11/kdelibs3/files/plist.base.rm b/x11/kdelibs3/files/plist.base.rm
new file mode 100644
index 000000000000..279b61cf447a
--- /dev/null
+++ b/x11/kdelibs3/files/plist.base.rm
@@ -0,0 +1,262 @@
+@unexec /bin/rmdir %D/share/icons/crystalsvg/32x32/actions/kde || true
+@unexec /bin/rmdir %D/share/icons/crystalsvg/22x22/actions/kde || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kspell/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kio/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdeui/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdefx/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdelibs-apidocs/kdecore/html || true
+@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
+@dirrm share/mimelnk/video
+@dirrm share/mimelnk/text
+@dirrm share/mimelnk/multipart
+@dirrm share/mimelnk/message
+@dirrm share/mimelnk/inode
+@dirrm share/mimelnk/image
+@dirrm share/mimelnk/audio
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk/all
+@dirrm share/mimelnk
+@dirrm share/icons/hicolor
+@dirrm share/icons/crystalsvg/scalable/filesystems
+@dirrm share/icons/crystalsvg/scalable/devices
+@dirrm share/icons/crystalsvg/scalable/apps
+@dirrm share/icons/crystalsvg/scalable
+@dirrm share/icons/crystalsvg/64x64/mimetypes
+@dirrm share/icons/crystalsvg/64x64/filesystems
+@dirrm share/icons/crystalsvg/64x64/devices
+@dirrm share/icons/crystalsvg/64x64/actions
+@dirrm share/icons/crystalsvg/64x64
+@dirrm share/icons/crystalsvg/48x48/mimetypes
+@dirrm share/icons/crystalsvg/48x48/filesystems
+@dirrm share/icons/crystalsvg/48x48/devices
+@dirrm share/icons/crystalsvg/48x48/actions
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/mimetypes
+@dirrm share/icons/crystalsvg/32x32/filesystems
+@dirrm share/icons/crystalsvg/32x32/devices
+@dirrm share/icons/crystalsvg/32x32/actions
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/22x22/mimetypes
+@dirrm share/icons/crystalsvg/22x22/actions
+@dirrm share/icons/crystalsvg/22x22
+@dirrm share/icons/crystalsvg/16x16/mimetypes/pdf
+@dirrm share/icons/crystalsvg/16x16/mimetypes
+@dirrm share/icons/crystalsvg/16x16/filesystems
+@dirrm share/icons/crystalsvg/16x16/devices
+@dirrm share/icons/crystalsvg/16x16/actions
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg/128x128/mimetypes
+@dirrm share/icons/crystalsvg/128x128
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kutils
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kspell
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kjs
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kio
+@dirrm share/doc/HTML/en/kdelibs-apidocs/khtml
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdeui
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdefx
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kdecore
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
+@dirrm share/doc/HTML/en/kdelibs-apidocs
+@dirrm share/doc/HTML/en/common
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/config/ui
+@dirrm share/config/colors
+@dirrm share/config
+@dirrm share/autostart
+@dirrm share/apps/ktexteditor_kdatatool
+@dirrm share/apps/ktexteditor_isearch
+@dirrm share/apps/ktexteditor_insertfile
+@dirrm share/apps/kstyle/themes
+@dirrm share/apps/kstyle/pixmaps/riscos
+@dirrm share/apps/kstyle/pixmaps
+@dirrm share/apps/kstyle
+@dirrm share/apps/kssl
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
+@dirrm share/apps/ksgmltools2/docbook/xsl/tools
+@dirrm share/apps/ksgmltools2/docbook/xsl/params
+@dirrm share/apps/ksgmltools2/docbook/xsl/lib
+@dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
+@dirrm share/apps/ksgmltools2/docbook/xsl/images
+@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
+@dirrm share/apps/ksgmltools2/customization/tr
+@dirrm share/apps/ksgmltools2/customization/sv/entities
+@dirrm share/apps/ksgmltools2/customization/sv
+@dirrm share/apps/ksgmltools2/customization/sr/entities
+@dirrm share/apps/ksgmltools2/customization/sr
+@dirrm share/apps/ksgmltools2/customization/sl/entities
+@dirrm share/apps/ksgmltools2/customization/sl
+@dirrm share/apps/ksgmltools2/customization/sk/entities
+@dirrm share/apps/ksgmltools2/customization/sk
+@dirrm share/apps/ksgmltools2/customization/ru/entities
+@dirrm share/apps/ksgmltools2/customization/ru
+@dirrm share/apps/ksgmltools2/customization/ro/entities
+@dirrm share/apps/ksgmltools2/customization/ro
+@dirrm share/apps/ksgmltools2/customization/pt/entities
+@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
+@dirrm share/apps/ksgmltools2/customization/pt-BR
+@dirrm share/apps/ksgmltools2/customization/pt
+@dirrm share/apps/ksgmltools2/customization/pl/entities
+@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
+@dirrm share/apps/ksgmltools2/customization/ja
+@dirrm share/apps/ksgmltools2/customization/it/entities
+@dirrm share/apps/ksgmltools2/customization/it
+@dirrm share/apps/ksgmltools2/customization/id/entities
+@dirrm share/apps/ksgmltools2/customization/id
+@dirrm share/apps/ksgmltools2/customization/hu/entities
+@dirrm share/apps/ksgmltools2/customization/hu
+@dirrm share/apps/ksgmltools2/customization/he/entities
+@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
+@dirrm share/apps/ksgmltools2/customization/et
+@dirrm share/apps/ksgmltools2/customization/es/entities
+@dirrm share/apps/ksgmltools2/customization/es
+@dirrm share/apps/ksgmltools2/customization/entities
+@dirrm share/apps/ksgmltools2/customization/en/entities
+@dirrm share/apps/ksgmltools2/customization/en-GB/entities
+@dirrm share/apps/ksgmltools2/customization/en-GB
+@dirrm share/apps/ksgmltools2/customization/en
+@dirrm share/apps/ksgmltools2/customization/el/entities
+@dirrm share/apps/ksgmltools2/customization/el
+@dirrm share/apps/ksgmltools2/customization/dtd
+@dirrm share/apps/ksgmltools2/customization/de/entities
+@dirrm share/apps/ksgmltools2/customization/de
+@dirrm share/apps/ksgmltools2/customization/da/entities
+@dirrm share/apps/ksgmltools2/customization/da
+@dirrm share/apps/ksgmltools2/customization/cs/entities
+@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
+@dirrm share/apps/ksgmltools2
+@dirrm share/apps/knotify
+@dirrm share/apps/kjava
+@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16
+@dirrm share/apps/kio_uiserver/icons/crystalsvg
+@dirrm share/apps/kio_uiserver/icons
+@dirrm share/apps/kio_uiserver
+@dirrm share/apps/khtml/icons/crystalsvg/32x32/actions
+@dirrm share/apps/khtml/icons/crystalsvg/32x32
+@dirrm share/apps/khtml/icons/crystalsvg/22x22/actions
+@dirrm share/apps/khtml/icons/crystalsvg/22x22
+@dirrm share/apps/khtml/icons/crystalsvg/16x16/actions
+@dirrm share/apps/khtml/icons/crystalsvg/16x16
+@dirrm share/apps/khtml/icons/crystalsvg
+@dirrm share/apps/khtml/icons
+@dirrm share/apps/khtml/css
+@dirrm share/apps/khtml
+@dirrm share/apps/kdewidgets/pics
+@dirrm share/apps/kdewidgets
+@dirrm share/apps/kdeui/pics
+@dirrm share/apps/kdeui
+@dirrm share/apps/kdeprint/tools
+@dirrm share/apps/kdeprint/plugins
+@dirrm share/apps/kdeprint/pics
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/32x32
+@dirrm share/apps/kdeprint/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/22x22
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kdeprint/icons/crystalsvg/16x16
+@dirrm share/apps/kdeprint/icons/crystalsvg
+@dirrm share/apps/kdeprint/icons
+@dirrm share/apps/kdeprint/filters
+@dirrm share/apps/kdeprint
+@dirrm share/apps/kconf_update
+@dirrm share/apps/kcm_componentchooser
+@dirrm share/apps/kcertpart
+@dirrm share/apps/katepart/syntax
+@dirrm share/apps/katepart
+@dirrm share/apps/kabc/plugins
+@dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps/LICENSES
+@dirrm share/apps
+@dirrm share/applnk/Settings/Components
+@dirrm share/applnk/Settings
+@dirrm share/applnk
+@dirrm lib/kde3/plugins/styles
+@dirrm lib/kde3/plugins/designer
+@dirrm lib/kde3/plugins
+@dirrm lib/kde3
+@dirrm include/libkmid
+@dirrm include/ktexteditor
+@dirrm include/kparts
+@dirrm include/kmediaplayer
+@dirrm include/kjs
+@dirrm include/kio
+@dirrm include/kdesu
+@dirrm include/kdeprint/lpr
+@dirrm include/kdeprint
+@dirrm include/kate
+@dirrm include/kabc
+@dirrm include/dom
diff --git a/x11/kdelibs3/files/plist.ldap b/x11/kdelibs3/files/plist.ldap
new file mode 100644
index 000000000000..2f30c7f63e21
--- /dev/null
+++ b/x11/kdelibs3/files/plist.ldap
@@ -0,0 +1,3 @@
+lib/kde3/kabc_ldap.la
+lib/kde3/kabc_ldap.so
+share/apps/kabc/plugins/ldap.desktop