Update to KDE 3.5.6 / KOffice 1.6.2

6 files changed, 11 insertions, 271 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index b83bb044e80c..9b19292a79d8 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	4
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -56,8 +55,7 @@ USE_OPENSSL=	yes
 USE_QT_VER=	3
 PREFIX=		${KDE_PREFIX}
 
-USE_LDCONFIG=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+USE_LDCONFIG=	${PREFIX}/lib/kde3
 
 USE_AUTOTOOLS=  libtool:15
 CONFIGURE_TARGET=# empty
@@ -102,11 +100,4 @@ post-configure:
 	${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in
 	${TOUCH} ${WRKSRC}/kjs/global.h.in
 
-post-install:
-	${MKDIR} ${PREFIX}/etc/rc.d
-	${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${FILESDIR}/kdelibs.sh \
-		> ${PREFIX}/etc/rc.d/kdelibs.sh
-	${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh
-	${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh
-
 .include <bsd.port.post.mk>
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 85c7caa7ecab..c4f0914142c7 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.5.tar.bz2) = 2cba792e3b0a766431b837c8ef924117
-SHA256 (KDE/kdelibs-3.5.5.tar.bz2) = e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3
-SIZE (KDE/kdelibs-3.5.5.tar.bz2) = 15486690
+MD5 (KDE/kdelibs-3.5.6.tar.bz2) = e4d137879a66e92b895b3de5413a61d8
+SHA256 (KDE/kdelibs-3.5.6.tar.bz2) = 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c
+SIZE (KDE/kdelibs-3.5.6.tar.bz2) = 15509460
diff --git a/x11/kdelibs3/files/kdelibs.sh b/x11/kdelibs3/files/kdelibs.sh
deleted file mode 100644
index 24568777caf1..000000000000
--- a/x11/kdelibs3/files/kdelibs.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PREFIX=%%PREFIX%%
-ldconfig -m $PREFIX/lib/kde3
diff --git a/x11/kdelibs3/files/patch-cups-1.2.x-sockets b/x11/kdelibs3/files/patch-cups-1.2.x-sockets
deleted file mode 100644
index ae126ad441f6..000000000000
--- a/x11/kdelibs3/files/patch-cups-1.2.x-sockets
+++ /dev/null
@@ -1,248 +0,0 @@
---- kdeprint/cups/ipprequest.cpp
-+++ kdeprint/cups/ipprequest.cpp
-@@ -329,6 +329,10 @@
- 		dumpRequest(request_, true);
- 	}
- 
-+	/* No printers found */
-+	if ( request_ && request_->request.status.status_code == 0x406 )
-+		return true;
-+
- 	if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00))
- 		return false;
- 
---- kdeprint/cups/kmcupsmanager.cpp
-+++ kdeprint/cups/kmcupsmanager.cpp
-@@ -61,7 +61,7 @@
- #define ppdi18n(s)	i18n(QString::fromLocal8Bit(s).utf8())
- 
- void extractMaticData(QString& buf, const QString& filename);
--QString printerURI(KMPrinter *p, bool useExistingURI = false);
-+QString printerURI(KMPrinter *p, bool useExistingURI);
- QString downloadDriver(KMPrinter *p);
- 
- static int trials = 5;
-@@ -218,7 +218,7 @@
- 	QString		uri;
- 
- 	req.setOperation(state);
--	uri = printerURI(p);
-+	uri = printerURI(p, true);
- 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
- 	if (req.doRequest("/admin/"))
- 		return true;
---- kdeprint/cups/cupsinfos.cpp	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/cupsinfos.cpp	2006-10-26 21:29:07.000000000 +0300
-@@ -21,6 +21,7 @@
- #include "kmfactory.h"
- #include "kmtimer.h"
- #include "messagewindow.h"
-+#include "ipprequest.h"
- 
- #include <kio/passdlg.h>
- #include <kio/authinfo.h>
-@@ -76,6 +77,11 @@
-     return host_;
- }
- 
-+QString CupsInfos::ippAssembleURI(const QString& resource) const
-+{
-+	return IppRequest::assembleURI(host(), port(), resource);
-+}
-+
- void CupsInfos::setHost(const QString& s)
- {
- 	host_ = s;
---- kdeprint/cups/cupsinfos.h	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/cupsinfos.h	2006-10-26 21:26:26.000000000 +0300
-@@ -34,6 +34,7 @@
- 	const QString& host() const;
-         QString  hostaddr() const;
- 	int port() const;
-+	QString ippAssembleURI(const QString& resource) const;
- 	const QString& login() const;
- 	const QString& password() const;
- 	const QString& realLogin() const;
---- kdeprint/cups/ipprequest.cpp	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/ipprequest.cpp	2006-10-26 21:33:09.000000000 +0300
-@@ -529,4 +529,48 @@
- 		attr = attr->next;
- 	}
- #endif
-+
-+
- }
-+
-+
-+QString IppRequest::assembleURI(const QString& host, int port, const QString& resource)
-+{
-+	const char* hostname;
-+
-+	// Replace UNIX socket address with "localhost". ipp URI specification
-+	// does not allow UNIX socket addresses in the host portion
-+	if (host[0] == '/' || host.isEmpty()) {
-+		hostname = "localhost";
-+		port = 0;
-+	} else {
-+		hostname = host.local8Bit();
-+	}
-+
-+	if (port < 0)
-+		return QString::null;
-+
-+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 
-+	QCString uri(HTTP_MAX_URI);
-+
-+	// Use URI assembling function provided by CUPS
-+	if (httpAssembleURI(HTTP_URI_CODING_ALL, uri.data(), uri.size(),
-+			"ipp", NULL, hostname, port, resource.local8Bit()) == HTTP_URI_OK)
-+		return QString(uri);
-+	else		
-+		return QString::null;
-+
-+#else
-+	// Use our own URI assembling function
-+	if (port > 0) 
-+		return QString("ipp://%1:%2%3")
-+			.arg(hostname)
-+			.arg(port)
-+			.arg(KURL::encode_string(resource));
-+	else
-+		return QString("ipp://%1%2")
-+			.arg(hostname)
-+			.arg(KURL::encode_string(resource));
-+#endif
-+}
-+
---- kdeprint/cups/ipprequest.h	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/ipprequest.h	2006-10-26 21:24:41.000000000 +0300
-@@ -86,6 +86,9 @@
- 	// debug function
- 	void dump(int state);
- 
-+	// URI assembling function [static]
-+	static QString assembleURI(const QString& host, int port, const QString& resource);
-+
- protected:
- 	void addString_p(int group, int type, const QString& name, const QString& value);
- 	void addStringList_p(int group, int type, const QString& name, const QStringList& values);
---- kdeprint/cups/kmcupsjobmanager.cpp	2006-10-26 21:45:23.000000000 +0300
-+++ kdeprint/cups/kmcupsjobmanager.cpp	2006-10-27 01:33:12.000000000 +0300
-@@ -92,7 +92,7 @@
- 			case KMJob::Move:
- 				if (argstr.isEmpty()) return false;
- 				req.setOperation(CUPS_MOVE_JOB);
--				uri = QString::fromLatin1("ipp://%1:%2/printers/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(argstr);
-+				uri = CupsInfos::self()->ippAssembleURI(QString("/printers/%1").arg(argstr));
- 				req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri);
- 				break;
- 			default:
-@@ -109,7 +109,6 @@
- bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType type, int limit)
- {
- 	IppRequest	req;
--	QString		uri("ipp://%1:%2/%3/%4");
- 	QStringList	keys;
- 	CupsInfos	*infos = CupsInfos::self();
- 
-@@ -143,7 +142,8 @@
- 		*/
- 	}
- 	else
--		req.addURI(IPP_TAG_OPERATION, "printer-uri", uri.arg(infos->host()).arg(infos->port()).arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname));
-+		req.addURI(IPP_TAG_OPERATION, "printer-uri",
-+			infos->ippAssembleURI(QString("/%1/%2").arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname)));
- 
- 	// other attributes
- 	req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys);
---- kdeprint/cups/kmcupsmanager.cpp	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/kmcupsmanager.cpp	2006-10-26 21:31:12.000000000 +0300
-@@ -138,7 +138,7 @@
- 		req.setOperation(CUPS_ADD_CLASS);
- 		QStringList	members = p->members(), uris;
- 		QString		s;
--                s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
-+                s = CupsInfos::self()->ippAssembleURI("/printers/");
- 		for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
- 			uris.append(s+(*it));
- 		req.addURI(IPP_TAG_PRINTER,"member-uris",uris);
-@@ -1024,7 +1024,7 @@
- 	if (use && !p->uri().isEmpty())
- 		uri = p->uri().prettyURL();
- 	else
--		uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"));
-+		uri = CupsInfos::self()->ippAssembleURI(QString("/%2/%1").arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")));
- 	return uri;
- }
- 
---- kdeprint/cups/kmcupsuimanager.cpp	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/kmcupsuimanager.cpp	2006-10-26 21:34:02.000000000 +0300
-@@ -135,7 +135,7 @@
- 	QString		uri;
- 
- 	req.setOperation(CUPS_GET_DEVICES);
--	uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
-+	uri = CupsInfos::self()->ippAssembleURI("/printers/");
- 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
- 
- 	if (req.doRequest("/"))
---- kdeprint/cups/kmwfax.cpp	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/kmwfax.cpp	2006-10-26 21:34:54.000000000 +0300
-@@ -48,7 +48,7 @@
- 	// initialize
- 	IppRequest	req;
- 	req.setOperation(CUPS_GET_DEVICES);
--	QString	uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
-+	QString	uri = CupsInfos::self()->ippAssembleURI("/printers/");
- 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
- 	if (req.doRequest("/"))
- 	{
---- kdeprint/cups/kmwippprinter.cpp	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/kmwippprinter.cpp	2006-10-26 21:41:20.000000000 +0300
-@@ -157,7 +157,7 @@
- 	req.setOperation(IPP_GET_PRINTER_ATTRIBUTES);
- 	req.setHost(item->text(1));
- 	req.setPort(item->text(2).toInt());
--	uri = QString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2));
-+	uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp");
- 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
- 	keys.append("printer-name");
- 	keys.append("printer-state");
-@@ -176,7 +176,7 @@
- 		if (req.uri("printer-uri-supported",value))
- 		{
- 			if (value[0] == '/')
--				value.prepend(QString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2)));
-+				value = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), value);
- 			m_uri->setText(value);
- 		}
- 		if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value));
-@@ -203,7 +203,7 @@
- void KMWIppPrinter::slotIppReport()
- {
- 	IppRequest	req;
--	QString	uri("ipp://%1:%2/ipp");
-+	QString		uri;
- 	QListViewItem	*item = m_list->currentItem();
- 
- 	if (item)
-@@ -211,7 +211,7 @@
- 		req.setOperation(IPP_GET_PRINTER_ATTRIBUTES);
- 		req.setHost(item->text(1));
- 		req.setPort(item->text(2).toInt());
--		uri = uri.arg(item->text(1)).arg(item->text(2));
-+		uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp");
- 		req.addURI(IPP_TAG_OPERATION, "printer-uri", uri);
- 		if (req.doRequest("/ipp/"))
- 		{
---- kdeprint/cups/kmwippselect.cpp	2006-10-26 19:31:11.000000000 +0300
-+++ kdeprint/cups/kmwippselect.cpp	2006-10-26 21:32:34.000000000 +0300
-@@ -75,7 +75,7 @@
- 	IppRequest	req;
- 	QString		uri;
- 	req.setOperation(CUPS_GET_PRINTERS);
--	uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(url.host()).arg(url.port());
-+	uri = IppRequest::assembleURI(url.host(), url.port(), "/printers/");
- 	req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
- 	req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name"));
- 	if (req.doRequest("/printers/"))
diff --git a/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in b/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in
index cfc259a470c7..27490412a187 100644
--- a/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in
+++ b/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in
@@ -1,6 +1,6 @@
---- mimetypes/application/Makefile.in.orig	Tue Aug 15 18:56:01 2006
-+++ mimetypes/application/Makefile.in	Tue Aug 15 18:56:32 2006
-@@ -525,7 +525,7 @@
+--- mimetypes/application/Makefile.in.orig	Wed Feb 21 14:03:14 2007
++++ mimetypes/application/Makefile.in	Wed Feb 21 14:03:30 2007
+@@ -533,7 +533,7 @@
  	vnd.sun.xml.impress.template.desktop vnd.sun.xml.draw.template.desktop \
  	vnd.stardivision.chart.desktop vnd.stardivision.draw.desktop \
  	vnd.stardivision.math.desktop vnd.stardivision.writer-global.desktop vnd.sun.xml.writer.master.desktop \
@@ -9,12 +9,12 @@
  	xsd.desktop relaxng.desktop \
  	vnd.oasis.opendocument.graphics-template.desktop \
  	vnd.oasis.opendocument.graphics.desktop \
-@@ -757,7 +757,7 @@
+@@ -765,7 +765,7 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-7z.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop 
-+KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop 
+-KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-7z.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop vnd.stardivision.writer-global.desktop x-applixgraphics.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop octet-stream.desktop x-magicpoint.desktop x-rar-compressed.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-font-speedo.desktop x-linguist.desktop 
++KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop vnd.stardivision.writer-global.desktop x-applixgraphics.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop octet-stream.desktop x-magicpoint.desktop x-rar-compressed.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-font-speedo.desktop x-linguist.desktop 
  
  #>+ 2
  docs-am:
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index eb29486ed87e..90183447454b 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -60,7 +60,6 @@ bin/makekdewidgets
 bin/meinproc
 bin/preparetips
 bin/start_kdeinit
-etc/rc.d/kdelibs.sh
 etc/xdg/menus/kde-applications.menu
 include/arts/artskde.h
 include/arts/kartsdispatcher.h
@@ -1204,6 +1203,7 @@ share/apps/katepart/scripts/script-indent-c-char.js
 share/apps/katepart/scripts/script-indent-c-newline.js
 share/apps/katepart/scripts/sort.js
 share/apps/katepart/syntax/abc.xml
+share/apps/katepart/syntax/actionscript.xml
 share/apps/katepart/syntax/ada.xml
 share/apps/katepart/syntax/ahdl.xml
 share/apps/katepart/syntax/alert.xml