8 files changed, 309 insertions, 150 deletions

diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index e3544857c65e..05f7723ac85e 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -17,25 +17,34 @@ MAINTAINER=	kde@FreeBSD.org
 LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
 
 USE_KDEBASE_VER=3
-GNU_CONFIGURE=	yes
+PREFIX=		${KDE_PREFIX}
+KDE_BUILD_PLIST=yes
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-MAN1=		cvs2pack.1 cvsversion.1 noncvslist.1 kde-build.1
-
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-
 .include <bsd.port.pre.mk>
 
 # Doesn't compile due to C++-unsafe header sys/wait.h.
 # XXX: Need to figure out when this actually happens.
 .if ${OSVERSION} > 500000
-CONFIGURE_ENV=	DO_NOT_COMPILE="cervisia"
-PLIST_SUB+=	CERVISIA="@comment "
+WITHOUT_CERVISIA=	yes
+.endif # ${OSVERSION} > 500000
+
+.if defined(WITHOUT_CERVISIA)
+DO_NOT_COMPILE+=cervisia
 .else
-PLIST_SUB+=	CERVISIA=""
-.endif
+PLIST_APPEND+=	plist.cervisia
+.include "${FILESDIR}/manpages.mk"
+.endif # defined(WITHOUT_CERVISIA)
+
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif # defined(DO_NOT_COMPILE)
 
 .include <bsd.port.post.mk>
diff --git a/devel/kdesdk4/Makefile~ b/devel/kdesdk4/Makefile~
new file mode 100644
index 000000000000..a4537f8d6391
--- /dev/null
+++ b/devel/kdesdk4/Makefile~
@@ -0,0 +1,51 @@
+# New ports collection makefile for:	KDE SDK
+# Date created:				2 March 2001
+# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
+#
+# $FreeBSD: /tmp/pcvs/ports/devel/kdesdk4/Attic/Makefile~,v 1.1 2003-01-28 18:36:52 alane Exp $
+#
+
+PORTNAME=	kdesdk
+PORTVERSION=	${KDE_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	kde@FreeBSD.org
+
+LIB_DEPENDS=	db2.0:${PORTSDIR}/databases/db2
+
+USE_KDEBASE_VER=3
+PREFIX=		${KDE_PREFIX}
+KDE_BUILD_PLIST=yes
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+
+MAN1=		cvs2pack.1 cvsversion.1 noncvslist.1 kde-build.1
+
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
+
+# Doesn't compile due to C++-unsafe header sys/wait.h.
+# XXX: Need to figure out when this actually happens.
+.if ${OSVERSION} > 500000
+WITHOUT_CERVISIA=	yes
+.endif # ${OSVERSION} > 500000
+
+.if defined(WITHOUT_CERVISIA)
+DO_NOT_COMPILE+=cervisia
+.else
+PLIST_APPEND+=	plist.cervisia
+.endif # defined(WITHOUT_CERVISIA)
+
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif # defined(DO_NOT_COMPILE)
+
+.include <bsd.port.post.mk>
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 617fbb7fbc0a..2ee9a172ec2c 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdesdk-3.0.4.tar.bz2) = 13c54f973533f4816069e82f7f375c34
+MD5 (KDE/kdesdk-3.1.tar.bz2) = 8c4e22ce1dd2be8464d31800cb0b347b
diff --git a/devel/kdesdk4/files/manpages.mk b/devel/kdesdk4/files/manpages.mk
new file mode 100644
index 000000000000..9ac7c790c4e2
--- /dev/null
+++ b/devel/kdesdk4/files/manpages.mk
@@ -0,0 +1,7 @@
+MAN1+=		cervisia.1
+MAN1+=		cvs2pack.1
+MAN1+=		cvsversion.1
+MAN1+=		noncvslist.1
+MAN1+=		kde-build.1
+MAN1+=		cvsblame.1
+MAN1+=		cvscheck.1
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/files/plist.base
index 6968ddf085d7..94164fb33c67 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/files/plist.base
@@ -1,6 +1,6 @@
 bin/adddebug
 bin/catalogmanager
-%%CERVISIA%%bin/cervisia
+bin/cheatmake
 bin/create_cvsignore
 bin/create_makefile
 bin/create_makefiles
@@ -14,11 +14,13 @@ bin/cvsversion
 bin/cxxmetric
 bin/extend_dmalloc
 bin/extractrc
+bin/fixincludes
 bin/fixsgml
 bin/includemocs
 bin/kapptemplate
 bin/kbabel
 bin/kbabeldict
+bin/kbugbuster
 bin/kde-build
 bin/kdedoc
 bin/kdekillall
@@ -34,6 +36,7 @@ bin/split2po
 bin/swappo
 bin/transxx
 bin/xml2pot
+bin/zonetab2pot.py
 include/kbabel/catalog.h
 include/kbabel/catalogitem.h
 include/kbabel/catalogsettings.h
@@ -47,9 +50,20 @@ include/kbabel/kbabeldictiface.h
 include/kbabel/msgfmt.h
 include/kbabel/searchengine.h
 include/kbabel/tagextractor.h
+include/kprofilemethod.h
 include/kspy.h
+lib/kde3/kabcformat_kdeaccounts.la
+lib/kde3/kabcformat_kdeaccounts.so
+lib/kde3/kfile_cpp.la
+lib/kde3/kfile_cpp.so
+lib/kde3/kfile_diff.la
+lib/kde3/kfile_diff.so
+lib/kde3/kfile_po.la
+lib/kde3/kfile_po.so
 lib/kde3/libdbsearchengine.la
 lib/kde3/libdbsearchengine.so
+lib/kde3/libkomparenavtreepart.la
+lib/kde3/libkomparenavtreepart.so
 lib/kde3/libkomparepart.la
 lib/kde3/libkomparepart.so
 lib/kde3/libpoauxiliary.la
@@ -61,9 +75,6 @@ lib/kde3/pothumbnail.so
 lib/libcatalogmanager.la
 lib/libcatalogmanager.so
 lib/libcatalogmanager.so.1
-%%CERVISIA%%lib/libcervisia.la
-%%CERVISIA%%lib/libcervisia.so
-%%CERVISIA%%lib/libcervisia.so.1
 lib/libkbabel.la
 lib/libkbabel.so
 lib/libkbabel.so.1
@@ -80,55 +91,38 @@ lib/libkspy.la
 lib/libkspy.so
 lib/libkspy.so.1
 share/applnk/Development/catalogmanager.desktop
-%%CERVISIA%%share/applnk/Development/cervisia.desktop
 share/applnk/Development/kbabel.desktop
 share/applnk/Development/kbabeldict.desktop
+share/applnk/Development/kbugbuster.desktop
 share/applnk/Development/kompare.desktop
 share/apps/catalogmanager/catalogmanagerui.rc
-share/apps/catalogmanager/icons/hicolor/16x16/actions/statistics.png
-share/apps/catalogmanager/icons/hicolor/16x16/actions/syntax.png
-share/apps/catalogmanager/icons/hicolor/22x22/actions/statistics.png
-share/apps/catalogmanager/icons/hicolor/22x22/actions/syntax.png
-share/apps/catalogmanager/icons/hicolor/32x32/actions/statistics.png
-share/apps/catalogmanager/icons/hicolor/32x32/actions/syntax.png
-share/apps/catalogmanager/icons/locolor/16x16/actions/statistics.png
-share/apps/catalogmanager/icons/locolor/16x16/actions/syntax.png
-share/apps/catalogmanager/icons/locolor/22x22/actions/statistics.png
-share/apps/catalogmanager/icons/locolor/22x22/actions/syntax.png
-share/apps/catalogmanager/icons/locolor/32x32/actions/statistics.png
-share/apps/catalogmanager/icons/locolor/32x32/actions/syntax.png
-share/apps/catalogmanager/pics/broken.png
-share/apps/catalogmanager/pics/missing.png
-share/apps/catalogmanager/pics/needwork.png
-share/apps/catalogmanager/pics/ok.png
-%%CERVISIA%%share/apps/cervisia/cervisiashellui.rc
-%%CERVISIA%%share/apps/cervisia/cervisiaui.rc
+share/apps/kabc/formats/kdeaccountsplugin.desktop
 share/apps/kapptemplate/admin/ChangeLog
+share/apps/kapptemplate/admin/Doxyfile.am
+share/apps/kapptemplate/admin/Doxyfile.global
 share/apps/kapptemplate/admin/Makefile
 share/apps/kapptemplate/admin/Makefile.am
 share/apps/kapptemplate/admin/Makefile.common
 share/apps/kapptemplate/admin/Makefile.in
 share/apps/kapptemplate/admin/acinclude.m4.in
 share/apps/kapptemplate/admin/am_edit
+share/apps/kapptemplate/admin/compile
 share/apps/kapptemplate/admin/conf.change.pl
 share/apps/kapptemplate/admin/config.guess
 share/apps/kapptemplate/admin/config.pl
 share/apps/kapptemplate/admin/config.sub
+share/apps/kapptemplate/admin/configure.in.bot.end
 share/apps/kapptemplate/admin/configure.in.min
+share/apps/kapptemplate/admin/cvs-clean.pl
+share/apps/kapptemplate/admin/cvs.sh
 share/apps/kapptemplate/admin/debianrules
 share/apps/kapptemplate/admin/depcomp
+share/apps/kapptemplate/admin/detect-autoconf.sh
 share/apps/kapptemplate/admin/install-sh
 share/apps/kapptemplate/admin/libtool.m4.in
-share/apps/kapptemplate/admin/ltconfig
 share/apps/kapptemplate/admin/ltmain.sh
 share/apps/kapptemplate/admin/missing
 share/apps/kapptemplate/admin/mkinstalldirs
-share/apps/kapptemplate/admin/old-libtool.m4.in
-share/apps/kapptemplate/admin/old-ltcf-c.sh
-share/apps/kapptemplate/admin/old-ltcf-cxx.sh
-share/apps/kapptemplate/admin/old-ltcf-gcj.sh
-share/apps/kapptemplate/admin/old-ltconfig
-share/apps/kapptemplate/admin/old-ltmain.sh
 share/apps/kapptemplate/admin/ylwrap
 share/apps/kapptemplate/appframework/AUTHORS
 share/apps/kapptemplate/appframework/COPYING
@@ -141,7 +135,6 @@ share/apps/kapptemplate/appframework/app.lsm
 share/apps/kapptemplate/appframework/app.spec
 share/apps/kapptemplate/appframework/base-Makefile.am
 share/apps/kapptemplate/appframework/base-Makefile.cvs
-share/apps/kapptemplate/appframework/config.h.bot
 share/apps/kapptemplate/appframework/configure.in.in.in
 share/apps/kapptemplate/appframework/no-exe/COPYING
 share/apps/kapptemplate/appframework/no-exe/INSTALL
@@ -216,81 +209,136 @@ share/apps/kapptemplate/kpartplugin/plugin_app.rc
 share/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png
 share/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png
 share/apps/kbabel/icons/hicolor/16x16/actions/diff.png
+share/apps/kbabel/icons/hicolor/16x16/actions/insert_arg.png
 share/apps/kbabel/icons/hicolor/16x16/actions/insert_tag.png
 share/apps/kbabel/icons/hicolor/16x16/actions/msgid2msgstr.png
 share/apps/kbabel/icons/hicolor/16x16/actions/nexterror.png
 share/apps/kbabel/icons/hicolor/16x16/actions/nextfuzzy.png
 share/apps/kbabel/icons/hicolor/16x16/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/16x16/actions/nextmarked.png
+share/apps/kbabel/icons/hicolor/16x16/actions/nextpo.png
+share/apps/kbabel/icons/hicolor/16x16/actions/nexttemplate.png
 share/apps/kbabel/icons/hicolor/16x16/actions/nextuntranslated.png
 share/apps/kbabel/icons/hicolor/16x16/actions/preverror.png
 share/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzy.png
 share/apps/kbabel/icons/hicolor/16x16/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/16x16/actions/prevmarked.png
+share/apps/kbabel/icons/hicolor/16x16/actions/prevpo.png
+share/apps/kbabel/icons/hicolor/16x16/actions/prevtemplate.png
 share/apps/kbabel/icons/hicolor/16x16/actions/prevuntranslated.png
 share/apps/kbabel/icons/hicolor/16x16/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/16x16/actions/spellcheck_actual.png
+share/apps/kbabel/icons/hicolor/16x16/actions/spellcheck_all.png
+share/apps/kbabel/icons/hicolor/16x16/actions/spellcheck_from_cursor.png
+share/apps/kbabel/icons/hicolor/16x16/actions/spellcheck_selected.png
+share/apps/kbabel/icons/hicolor/16x16/actions/statistics.png
+share/apps/kbabel/icons/hicolor/16x16/actions/syntax.png
 share/apps/kbabel/icons/hicolor/16x16/actions/togglefuzzy.png
 share/apps/kbabel/icons/hicolor/16x16/actions/transsearch.png
 share/apps/kbabel/icons/hicolor/22x22/actions/autodiff.png
 share/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png
 share/apps/kbabel/icons/hicolor/22x22/actions/diff.png
+share/apps/kbabel/icons/hicolor/22x22/actions/insert_arg.png
 share/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png
 share/apps/kbabel/icons/hicolor/22x22/actions/msgid2msgstr.png
 share/apps/kbabel/icons/hicolor/22x22/actions/nexterror.png
 share/apps/kbabel/icons/hicolor/22x22/actions/nextfuzzy.png
 share/apps/kbabel/icons/hicolor/22x22/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/22x22/actions/nextmarked.png
+share/apps/kbabel/icons/hicolor/22x22/actions/nextpo.png
+share/apps/kbabel/icons/hicolor/22x22/actions/nexttemplate.png
 share/apps/kbabel/icons/hicolor/22x22/actions/nextuntranslated.png
 share/apps/kbabel/icons/hicolor/22x22/actions/preverror.png
 share/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzy.png
 share/apps/kbabel/icons/hicolor/22x22/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/22x22/actions/prevmarked.png
+share/apps/kbabel/icons/hicolor/22x22/actions/prevpo.png
+share/apps/kbabel/icons/hicolor/22x22/actions/prevtemplate.png
 share/apps/kbabel/icons/hicolor/22x22/actions/prevuntranslated.png
 share/apps/kbabel/icons/hicolor/22x22/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/22x22/actions/statistics.png
+share/apps/kbabel/icons/hicolor/22x22/actions/syntax.png
 share/apps/kbabel/icons/hicolor/22x22/actions/togglefuzzy.png
 share/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png
 share/apps/kbabel/icons/hicolor/32x32/actions/autodiff.png
 share/apps/kbabel/icons/hicolor/32x32/actions/catalogmanager.png
 share/apps/kbabel/icons/hicolor/32x32/actions/diff.png
+share/apps/kbabel/icons/hicolor/32x32/actions/insert_arg.png
 share/apps/kbabel/icons/hicolor/32x32/actions/insert_tag.png
 share/apps/kbabel/icons/hicolor/32x32/actions/msgid2msgstr.png
 share/apps/kbabel/icons/hicolor/32x32/actions/nexterror.png
 share/apps/kbabel/icons/hicolor/32x32/actions/nextfuzzy.png
 share/apps/kbabel/icons/hicolor/32x32/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/32x32/actions/nextmarked.png
+share/apps/kbabel/icons/hicolor/32x32/actions/nextpo.png
+share/apps/kbabel/icons/hicolor/32x32/actions/nexttemplate.png
 share/apps/kbabel/icons/hicolor/32x32/actions/nextuntranslated.png
 share/apps/kbabel/icons/hicolor/32x32/actions/preverror.png
 share/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzy.png
 share/apps/kbabel/icons/hicolor/32x32/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/hicolor/32x32/actions/prevmarked.png
+share/apps/kbabel/icons/hicolor/32x32/actions/prevpo.png
+share/apps/kbabel/icons/hicolor/32x32/actions/prevtemplate.png
 share/apps/kbabel/icons/hicolor/32x32/actions/prevuntranslated.png
 share/apps/kbabel/icons/hicolor/32x32/actions/search2msgstr.png
+share/apps/kbabel/icons/hicolor/32x32/actions/statistics.png
+share/apps/kbabel/icons/hicolor/32x32/actions/syntax.png
 share/apps/kbabel/icons/hicolor/32x32/actions/togglefuzzy.png
 share/apps/kbabel/icons/hicolor/32x32/actions/transsearch.png
 share/apps/kbabel/icons/locolor/16x16/actions/autodiff.png
 share/apps/kbabel/icons/locolor/16x16/actions/catalogmanager.png
 share/apps/kbabel/icons/locolor/16x16/actions/diff.png
+share/apps/kbabel/icons/locolor/16x16/actions/insert_arg.png
 share/apps/kbabel/icons/locolor/16x16/actions/insert_tag.png
 share/apps/kbabel/icons/locolor/16x16/actions/msgid2msgstr.png
 share/apps/kbabel/icons/locolor/16x16/actions/nexterror.png
 share/apps/kbabel/icons/locolor/16x16/actions/nextfuzzy.png
 share/apps/kbabel/icons/locolor/16x16/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/locolor/16x16/actions/nextmarked.png
+share/apps/kbabel/icons/locolor/16x16/actions/nextpo.png
+share/apps/kbabel/icons/locolor/16x16/actions/nexttemplate.png
 share/apps/kbabel/icons/locolor/16x16/actions/nextuntranslated.png
 share/apps/kbabel/icons/locolor/16x16/actions/preverror.png
 share/apps/kbabel/icons/locolor/16x16/actions/prevfuzzy.png
 share/apps/kbabel/icons/locolor/16x16/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/locolor/16x16/actions/prevmarked.png
+share/apps/kbabel/icons/locolor/16x16/actions/prevpo.png
+share/apps/kbabel/icons/locolor/16x16/actions/prevtemplate.png
 share/apps/kbabel/icons/locolor/16x16/actions/prevuntranslated.png
 share/apps/kbabel/icons/locolor/16x16/actions/search2msgstr.png
+share/apps/kbabel/icons/locolor/16x16/actions/spellcheck_actual.png
+share/apps/kbabel/icons/locolor/16x16/actions/spellcheck_all.png
+share/apps/kbabel/icons/locolor/16x16/actions/spellcheck_from_cursor.png
+share/apps/kbabel/icons/locolor/16x16/actions/spellcheck_selected.png
+share/apps/kbabel/icons/locolor/16x16/actions/statistics.png
+share/apps/kbabel/icons/locolor/16x16/actions/syntax.png
 share/apps/kbabel/icons/locolor/16x16/actions/togglefuzzy.png
 share/apps/kbabel/icons/locolor/16x16/actions/transsearch.png
+share/apps/kbabel/icons/locolor/22x22/actions/statistics.png
+share/apps/kbabel/icons/locolor/22x22/actions/syntax.png
 share/apps/kbabel/icons/locolor/32x32/actions/autodiff.png
 share/apps/kbabel/icons/locolor/32x32/actions/catalogmanager.png
 share/apps/kbabel/icons/locolor/32x32/actions/diff.png
+share/apps/kbabel/icons/locolor/32x32/actions/insert_arg.png
 share/apps/kbabel/icons/locolor/32x32/actions/insert_tag.png
 share/apps/kbabel/icons/locolor/32x32/actions/msgid2msgstr.png
 share/apps/kbabel/icons/locolor/32x32/actions/nexterror.png
 share/apps/kbabel/icons/locolor/32x32/actions/nextfuzzy.png
 share/apps/kbabel/icons/locolor/32x32/actions/nextfuzzyuntrans.png
+share/apps/kbabel/icons/locolor/32x32/actions/nextmarked.png
+share/apps/kbabel/icons/locolor/32x32/actions/nextpo.png
+share/apps/kbabel/icons/locolor/32x32/actions/nexttemplate.png
 share/apps/kbabel/icons/locolor/32x32/actions/nextuntranslated.png
 share/apps/kbabel/icons/locolor/32x32/actions/preverror.png
 share/apps/kbabel/icons/locolor/32x32/actions/prevfuzzy.png
 share/apps/kbabel/icons/locolor/32x32/actions/prevfuzzyuntrans.png
+share/apps/kbabel/icons/locolor/32x32/actions/prevmarked.png
+share/apps/kbabel/icons/locolor/32x32/actions/prevpo.png
+share/apps/kbabel/icons/locolor/32x32/actions/prevtemplate.png
 share/apps/kbabel/icons/locolor/32x32/actions/prevuntranslated.png
 share/apps/kbabel/icons/locolor/32x32/actions/search2msgstr.png
+share/apps/kbabel/icons/locolor/32x32/actions/statistics.png
+share/apps/kbabel/icons/locolor/32x32/actions/syntax.png
 share/apps/kbabel/icons/locolor/32x32/actions/togglefuzzy.png
 share/apps/kbabel/icons/locolor/32x32/actions/transsearch.png
 share/apps/kbabel/kbabelui.rc
@@ -303,23 +351,29 @@ share/apps/kbabel/pics/splash.png
 share/apps/kbabeldict/modules/dbsearchengine.rc
 share/apps/kbabeldict/modules/poauxiliary.rc
 share/apps/kbabeldict/modules/pocompendium.rc
-share/apps/kompare/icons/hicolor/16x16/apps/kompare.png
+share/apps/kbugbuster/kbugbusterui.rc
+share/apps/kbugbuster/pics/bars.png
+share/apps/kbugbuster/pics/logo.png
+share/apps/kbugbuster/pics/tools.png
+share/apps/kompare/icons/crystalsvg/16x16/apps/kompare.png
 share/apps/kompare/icons/locolor/16x16/apps/kompare.png
 share/apps/kompare/icons/locolor/32x32/apps/kompare.png
 share/apps/kompare/kompareui.rc
 share/apps/komparepart/komparepartui.rc
-%%CERVISIA%%share/doc/HTML/en/cervisia/checkout.png
-%%CERVISIA%%share/doc/HTML/en/cervisia/commit.png
-%%CERVISIA%%share/doc/HTML/en/cervisia/common
-%%CERVISIA%%share/doc/HTML/en/cervisia/diff.png
-%%CERVISIA%%share/doc/HTML/en/cervisia/history.png
-%%CERVISIA%%share/doc/HTML/en/cervisia/import.png
-%%CERVISIA%%share/doc/HTML/en/cervisia/index.cache.bz2
-%%CERVISIA%%share/doc/HTML/en/cervisia/index.docbook
-%%CERVISIA%%share/doc/HTML/en/cervisia/logtree.png
-%%CERVISIA%%share/doc/HTML/en/cervisia/mainview.png
-%%CERVISIA%%share/doc/HTML/en/cervisia/resolve.png
-%%CERVISIA%%share/doc/HTML/en/cervisia/updatetag.png
+share/doc/HTML/en/cervisia/annotate.png
+share/doc/HTML/en/cervisia/checkout.png
+share/doc/HTML/en/cervisia/commit.png
+share/doc/HTML/en/cervisia/common
+share/doc/HTML/en/cervisia/diff.png
+share/doc/HTML/en/cervisia/history.png
+share/doc/HTML/en/cervisia/import.png
+share/doc/HTML/en/cervisia/index.cache.bz2
+share/doc/HTML/en/cervisia/index.docbook
+share/doc/HTML/en/cervisia/logtree.png
+share/doc/HTML/en/cervisia/mainview.png
+share/doc/HTML/en/cervisia/resolve.png
+share/doc/HTML/en/cervisia/updatetag.png
+share/doc/HTML/en/kbabel/TODO
 share/doc/HTML/en/kbabel/back.png
 share/doc/HTML/en/kbabel/bottom.png
 share/doc/HTML/en/kbabel/catalogmanager.png
@@ -329,140 +383,85 @@ share/doc/HTML/en/kbabel/catalogmanager_needwork.png
 share/doc/HTML/en/kbabel/catalogmanager_nopot.png
 share/doc/HTML/en/kbabel/catalogmanager_nopot_ok.png
 share/doc/HTML/en/kbabel/catalogmanager_ok.png
+share/doc/HTML/en/kbabel/catalogmanager_reload.png
+share/doc/HTML/en/kbabel/catman.docbook
 share/doc/HTML/en/kbabel/common
+share/doc/HTML/en/kbabel/dbcan.png
+share/doc/HTML/en/kbabel/dictionaries.docbook
 share/doc/HTML/en/kbabel/editcopy.png
 share/doc/HTML/en/kbabel/editcut.png
 share/doc/HTML/en/kbabel/editpaste.png
+share/doc/HTML/en/kbabel/faq.docbook
 share/doc/HTML/en/kbabel/fileopen.png
 share/doc/HTML/en/kbabel/filesave.png
 share/doc/HTML/en/kbabel/find.png
 share/doc/HTML/en/kbabel/forward.png
+share/doc/HTML/en/kbabel/glossary.docbook
 share/doc/HTML/en/kbabel/index.cache.bz2
 share/doc/HTML/en/kbabel/index.docbook
+share/doc/HTML/en/kbabel/kbabeldict.docbook
+share/doc/HTML/en/kbabel/menu.docbook
 share/doc/HTML/en/kbabel/msgid2msgstr.png
 share/doc/HTML/en/kbabel/next.png
 share/doc/HTML/en/kbabel/nexterror.png
 share/doc/HTML/en/kbabel/nextfuzzy.png
 share/doc/HTML/en/kbabel/nextfuzzyuntrans.png
 share/doc/HTML/en/kbabel/nextuntranslated.png
+share/doc/HTML/en/kbabel/preferences.docbook
 share/doc/HTML/en/kbabel/preverror.png
 share/doc/HTML/en/kbabel/prevfuzzy.png
 share/doc/HTML/en/kbabel/prevfuzzyuntrans.png
 share/doc/HTML/en/kbabel/previous.png
 share/doc/HTML/en/kbabel/prevuntranslated.png
 share/doc/HTML/en/kbabel/redo.png
+share/doc/HTML/en/kbabel/roughtranslation.png
 share/doc/HTML/en/kbabel/snap1.png
 share/doc/HTML/en/kbabel/snap_catalogmanager.png
+share/doc/HTML/en/kbabel/snap_kbabeldict.png
+share/doc/HTML/en/kbabel/snap_kbabeldict2.png
 share/doc/HTML/en/kbabel/stop.png
 share/doc/HTML/en/kbabel/top.png
 share/doc/HTML/en/kbabel/transsearch.png
 share/doc/HTML/en/kbabel/undo.png
-share/icons/hicolor/16x16/apps/catalogmanager.png
-%%CERVISIA%%share/icons/hicolor/16x16/apps/cervisia.png
-share/icons/hicolor/16x16/apps/kbabel.png
-share/icons/hicolor/16x16/apps/kbabeldict.png
-share/icons/hicolor/16x16/apps/kompare.png
-share/icons/hicolor/16x16/mimetypes/gettext.png
-share/icons/hicolor/32x32/apps/catalogmanager.png
-%%CERVISIA%%share/icons/hicolor/32x32/apps/cervisia.png
-share/icons/hicolor/32x32/apps/kbabel.png
-share/icons/hicolor/32x32/apps/kbabeldict.png
-share/icons/hicolor/32x32/mimetypes/gettext.png
-share/icons/hicolor/48x48/apps/catalogmanager.png
-share/icons/hicolor/48x48/apps/kbabel.png
-share/icons/hicolor/48x48/mimetypes/gettext.png
+share/doc/HTML/en/kbabel/using.docbook
+share/doc/HTML/en/kbugbuster/common
+share/doc/HTML/en/kbugbuster/index.cache.bz2
+share/doc/HTML/en/kbugbuster/index.docbook
+share/doc/HTML/en/kompare/common
+share/doc/HTML/en/kompare/index.cache.bz2
+share/doc/HTML/en/kompare/index.docbook
+share/icons/crystalsvg/16x16/apps/catalogmanager.png
+share/icons/crystalsvg/16x16/apps/kbabel.png
+share/icons/crystalsvg/16x16/apps/kbabeldict.png
+share/icons/crystalsvg/16x16/apps/kbugbuster.png
+share/icons/crystalsvg/16x16/apps/kompare.png
+share/icons/crystalsvg/16x16/mimetypes/gettext.png
+share/icons/crystalsvg/32x32/apps/catalogmanager.png
+share/icons/crystalsvg/32x32/apps/kbabel.png
+share/icons/crystalsvg/32x32/apps/kbabeldict.png
+share/icons/crystalsvg/32x32/mimetypes/gettext.png
+share/icons/crystalsvg/48x48/apps/catalogmanager.png
+share/icons/crystalsvg/48x48/apps/kbabel.png
+share/icons/crystalsvg/48x48/mimetypes/gettext.png
 share/icons/locolor/16x16/apps/catalogmanager.png
 share/icons/locolor/16x16/apps/kbabel.png
 share/icons/locolor/16x16/apps/kbabeldict.png
+share/icons/locolor/16x16/apps/kbugbuster.png
 share/icons/locolor/16x16/apps/kompare.png
 share/icons/locolor/16x16/mimetypes/gettext.png
 share/icons/locolor/32x32/apps/catalogmanager.png
 share/icons/locolor/32x32/apps/kbabel.png
 share/icons/locolor/32x32/apps/kbabeldict.png
+share/icons/locolor/32x32/apps/kbugbuster.png
 share/icons/locolor/32x32/apps/kompare.png
 share/icons/locolor/32x32/mimetypes/gettext.png
 share/mimelnk/application/x-gettext.desktop
-share/services/kompare_part.desktop
+share/services/kfile_cpp.desktop
+share/services/kfile_diff.desktop
+share/services/kfile_h.desktop
+share/services/kfile_po.desktop
+share/services/komparenavtreepart.desktop
+share/services/komparepart.desktop
 share/services/pothumbnail.desktop
-@dirrm share/mimelnk/application
-@dirrm share/mimelnk
-@dirrm share/icons/locolor/32x32/mimetypes
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/mimetypes
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/mimetypes
-@dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/48x48
-@dirrm share/icons/hicolor/32x32/mimetypes
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/mimetypes
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
-@dirrm share/icons/hicolor
-@dirrm share/doc/HTML/en/kbabel
-%%CERVISIA%%@dirrm share/doc/HTML/en/cervisia
-@dirrm share/apps/komparepart
-@dirrm share/apps/kompare/icons/locolor/32x32/apps
-@dirrm share/apps/kompare/icons/locolor/32x32
-@dirrm share/apps/kompare/icons/locolor/16x16/apps
-@dirrm share/apps/kompare/icons/locolor/16x16
-@dirrm share/apps/kompare/icons/locolor
-@dirrm share/apps/kompare/icons/hicolor/16x16/apps
-@dirrm share/apps/kompare/icons/hicolor/16x16
-@dirrm share/apps/kompare/icons/hicolor
-@dirrm share/apps/kompare/icons
-@dirrm share/apps/kompare
-@dirrm share/apps/kbabeldict/modules
-@dirrm share/apps/kbabeldict
-@dirrm share/apps/kbabel/pics
-@dirrm share/apps/kbabel/icons/locolor/32x32/actions
-@dirrm share/apps/kbabel/icons/locolor/32x32
-@dirrm share/apps/kbabel/icons/locolor/16x16/actions
-@dirrm share/apps/kbabel/icons/locolor/16x16
-@dirrm share/apps/kbabel/icons/locolor
-@dirrm share/apps/kbabel/icons/hicolor/32x32/actions
-@dirrm share/apps/kbabel/icons/hicolor/32x32
-@dirrm share/apps/kbabel/icons/hicolor/22x22/actions
-@dirrm share/apps/kbabel/icons/hicolor/22x22
-@dirrm share/apps/kbabel/icons/hicolor/16x16/actions
-@dirrm share/apps/kbabel/icons/hicolor/16x16
-@dirrm share/apps/kbabel/icons/hicolor
-@dirrm share/apps/kbabel/icons
-@dirrm share/apps/kbabel
-@dirrm share/apps/kapptemplate/kpartplugin/no-exe
-@dirrm share/apps/kapptemplate/kpartplugin
-@dirrm share/apps/kapptemplate/kpartapp/no-exe
-@dirrm share/apps/kapptemplate/kpartapp
-@dirrm share/apps/kapptemplate/kapp/no-exe
-@dirrm share/apps/kapptemplate/kapp
-@dirrm share/apps/kapptemplate/include
-@dirrm share/apps/kapptemplate/existing
-@dirrm share/apps/kapptemplate/bin
-@dirrm share/apps/kapptemplate/appframework/no-exe
-@dirrm share/apps/kapptemplate/appframework
-@dirrm share/apps/kapptemplate/admin
-@dirrm share/apps/kapptemplate
-%%CERVISIA%%@dirrm share/apps/cervisia
-@dirrm share/apps/catalogmanager/pics
-@dirrm share/apps/catalogmanager/icons/locolor/32x32/actions
-@dirrm share/apps/catalogmanager/icons/locolor/32x32
-@dirrm share/apps/catalogmanager/icons/locolor/22x22/actions
-@dirrm share/apps/catalogmanager/icons/locolor/22x22
-@dirrm share/apps/catalogmanager/icons/locolor/16x16/actions
-@dirrm share/apps/catalogmanager/icons/locolor/16x16
-@dirrm share/apps/catalogmanager/icons/locolor
-@dirrm share/apps/catalogmanager/icons/hicolor/32x32/actions
-@dirrm share/apps/catalogmanager/icons/hicolor/32x32
-@dirrm share/apps/catalogmanager/icons/hicolor/22x22/actions
-@dirrm share/apps/catalogmanager/icons/hicolor/22x22
-@dirrm share/apps/catalogmanager/icons/hicolor/16x16/actions
-@dirrm share/apps/catalogmanager/icons/hicolor/16x16
-@dirrm share/apps/catalogmanager/icons/hicolor
-@dirrm share/apps/catalogmanager/icons
-@dirrm share/apps/catalogmanager
-@dirrm share/applnk/Development
-@dirrm include/kbabel
+share/servicetypes/komparenavigationpart.desktop
+share/servicetypes/kompareviewpart.desktop
diff --git a/devel/kdesdk4/files/plist.base.rm b/devel/kdesdk4/files/plist.base.rm
new file mode 100644
index 000000000000..bcad575b0393
--- /dev/null
+++ b/devel/kdesdk4/files/plist.base.rm
@@ -0,0 +1,82 @@
+@dirrm share/servicetypes
+@dirrm share/services
+@dirrm share/mimelnk/application
+@dirrm share/mimelnk
+@dirrm share/icons/locolor/32x32/mimetypes
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/mimetypes
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/crystalsvg/48x48/mimetypes
+@dirrm share/icons/crystalsvg/48x48/apps
+@dirrm share/icons/crystalsvg/48x48
+@dirrm share/icons/crystalsvg/32x32/mimetypes
+@dirrm share/icons/crystalsvg/32x32/apps
+@dirrm share/icons/crystalsvg/32x32
+@dirrm share/icons/crystalsvg/16x16/mimetypes
+@dirrm share/icons/crystalsvg/16x16/apps
+@dirrm share/icons/crystalsvg/16x16
+@dirrm share/icons/crystalsvg
+@dirrm share/icons
+@dirrm share/doc/HTML/en/kompare
+@dirrm share/doc/HTML/en/kbugbuster
+@dirrm share/doc/HTML/en/kbabel
+@dirrm share/doc/HTML/en/cervisia
+@dirrm share/doc/HTML/en
+@dirrm share/doc/HTML
+@dirrm share/doc
+@dirrm share/apps/komparepart
+@dirrm share/apps/kompare/icons/locolor/32x32/apps
+@dirrm share/apps/kompare/icons/locolor/32x32
+@dirrm share/apps/kompare/icons/locolor/16x16/apps
+@dirrm share/apps/kompare/icons/locolor/16x16
+@dirrm share/apps/kompare/icons/locolor
+@dirrm share/apps/kompare/icons/crystalsvg/16x16/apps
+@dirrm share/apps/kompare/icons/crystalsvg/16x16
+@dirrm share/apps/kompare/icons/crystalsvg
+@dirrm share/apps/kompare/icons
+@dirrm share/apps/kompare
+@dirrm share/apps/kbugbuster/pics
+@dirrm share/apps/kbugbuster
+@dirrm share/apps/kbabeldict/modules
+@dirrm share/apps/kbabeldict
+@dirrm share/apps/kbabel/pics
+@dirrm share/apps/kbabel/icons/locolor/32x32/actions
+@dirrm share/apps/kbabel/icons/locolor/32x32
+@dirrm share/apps/kbabel/icons/locolor/22x22/actions
+@dirrm share/apps/kbabel/icons/locolor/22x22
+@dirrm share/apps/kbabel/icons/locolor/16x16/actions
+@dirrm share/apps/kbabel/icons/locolor/16x16
+@dirrm share/apps/kbabel/icons/locolor
+@dirrm share/apps/kbabel/icons/hicolor/32x32/actions
+@dirrm share/apps/kbabel/icons/hicolor/32x32
+@dirrm share/apps/kbabel/icons/hicolor/22x22/actions
+@dirrm share/apps/kbabel/icons/hicolor/22x22
+@dirrm share/apps/kbabel/icons/hicolor/16x16/actions
+@dirrm share/apps/kbabel/icons/hicolor/16x16
+@dirrm share/apps/kbabel/icons/hicolor
+@dirrm share/apps/kbabel/icons
+@dirrm share/apps/kbabel
+@dirrm share/apps/kapptemplate/kpartplugin/no-exe
+@dirrm share/apps/kapptemplate/kpartplugin
+@dirrm share/apps/kapptemplate/kpartapp/no-exe
+@dirrm share/apps/kapptemplate/kpartapp
+@dirrm share/apps/kapptemplate/kapp/no-exe
+@dirrm share/apps/kapptemplate/kapp
+@dirrm share/apps/kapptemplate/include
+@dirrm share/apps/kapptemplate/existing
+@dirrm share/apps/kapptemplate/bin
+@dirrm share/apps/kapptemplate/appframework/no-exe
+@dirrm share/apps/kapptemplate/appframework
+@dirrm share/apps/kapptemplate/admin
+@dirrm share/apps/kapptemplate
+@dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps/catalogmanager
+@dirrm share/apps
+@dirrm share/applnk/Development
+@dirrm share/applnk
+@dirrm lib/kde3
+@dirrm include/kbabel
diff --git a/devel/kdesdk4/files/plist.cervisia b/devel/kdesdk4/files/plist.cervisia
new file mode 100644
index 000000000000..880ced8785a9
--- /dev/null
+++ b/devel/kdesdk4/files/plist.cervisia
@@ -0,0 +1,9 @@
+bin/cervisia
+lib/libcervisia.la
+lib/libcervisia.so
+lib/libcervisia.so.1
+share/applnk/Development/cervisia.desktop
+share/apps/cervisia/cervisiashellui.rc
+share/apps/cervisiapart/cervisiaui.rc
+share/icons/crystalsvg/16x16/apps/cervisia.png
+share/icons/crystalsvg/32x32/apps/cervisia.png
diff --git a/devel/kdesdk4/files/plist.cervisia.rm b/devel/kdesdk4/files/plist.cervisia.rm
new file mode 100644
index 000000000000..1759058f42c0
--- /dev/null
+++ b/devel/kdesdk4/files/plist.cervisia.rm
@@ -0,0 +1,2 @@
+@dirrm share/apps/cervisiapart
+@dirrm share/apps/cervisia