3 files changed, 339 insertions, 323 deletions

diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index cfcd9a0cc139..5e9c983a9e4f 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdesdk
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -60,12 +59,15 @@ MAN1=	adddebug.1 \
 	xml2pot.1 \
 	zonetab2pot.py.1
 
-OPTIONS=	ANTLR "Support for po2xml and swappo tools" off \
-		KATE "Install Kate advanced text editor" on
+OPTIONS_DEFINE=	ANTLR KATE
+OPTIONS_DEFAULT=	KATE
+
+ANTLR_DESC=	Support for po2xml and swappo tools
+KATE_DESC=	Install Kate advanced text editor
 
 .include <bsd.port.options.mk>
 
-.ifdef(WITH_ANTLR)
+.if ${PORT_OPTIONS:MANTLR}
 BUILD_DEPENDS+=	antlr:${PORTSDIR}/devel/antlr
 RUN_DEPENDS+=	antlr:${PORTSDIR}/devel/antlr
 PLIST_SUB+=	ANTLR=""
@@ -74,7 +76,7 @@ CMAKE_ARGS+=	-DWITH_Antlr2:BOOL=off
 PLIST_SUB+=	ANTLR="@comment "
 .endif
 
-.ifndef(WITHOUT_KATE)
+.if ${PORT_OPTIONS:MKATE}
 USE_KDE4+=	kate_run
 .endif
 
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index e188513d57bf..83f31d943d74 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdesdk-4.8.4.tar.xz) = cf07bac39204b919eae6010fe4499a6674523a4b5bb3eecf8ba1a0aa1331ef97
-SIZE (KDE/kdesdk-4.8.4.tar.xz) = 5361480
+SHA256 (KDE/kdesdk-4.9.5.tar.xz) = 8b62c3ec7d3dd9ac5489df3e77f02b17e92a64c0b6e409b9f9e1665aa57e62f0
+SIZE (KDE/kdesdk-4.9.5.tar.xz) = 5165436
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index e1dc8b729830..2d025381c6db 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -74,108 +74,108 @@ bin/umbrello
 bin/wcgrep
 bin/xml2pot
 bin/zonetab2pot.py
-include/KDE/Kasten1/AbstractConnectJob
-include/KDE/Kasten1/AbstractDocument
-include/KDE/Kasten1/AbstractDocumentFactory
-include/KDE/Kasten1/AbstractDocumentStrategy
-include/KDE/Kasten1/AbstractExportJob
-include/KDE/Kasten1/AbstractFileSystemConnectJob
-include/KDE/Kasten1/AbstractFileSystemExportJob
-include/KDE/Kasten1/AbstractFileSystemLoadJob
-include/KDE/Kasten1/AbstractFileSystemSyncFromRemoteJob
-include/KDE/Kasten1/AbstractFileSystemSyncToRemoteJob
-include/KDE/Kasten1/AbstractFileSystemSyncWithRemoteJob
-include/KDE/Kasten1/AbstractGroupedViews
-include/KDE/Kasten1/AbstractLinePopup
-include/KDE/Kasten1/AbstractLoadJob
-include/KDE/Kasten1/AbstractModel
-include/KDE/Kasten1/AbstractModelDataGenerator
-include/KDE/Kasten1/AbstractModelDataGeneratorConfigEditor
-include/KDE/Kasten1/AbstractModelDataGeneratorConfigEditorFactory
-include/KDE/Kasten1/AbstractModelExporter
-include/KDE/Kasten1/AbstractModelExporterConfigEditor
-include/KDE/Kasten1/AbstractModelExporterConfigEditorFactory
-include/KDE/Kasten1/AbstractModelFileSystemSynchronizer
-include/KDE/Kasten1/AbstractModelSelection
-include/KDE/Kasten1/AbstractModelStreamEncoder
-include/KDE/Kasten1/AbstractModelStreamEncoderConfigEditor
-include/KDE/Kasten1/AbstractModelStreamEncoderConfigEditorFactory
-include/KDE/Kasten1/AbstractModelSynchronizer
-include/KDE/Kasten1/AbstractModelSynchronizerFactory
-include/KDE/Kasten1/AbstractSelectionView
-include/KDE/Kasten1/AbstractSyncFromRemoteJob
-include/KDE/Kasten1/AbstractSyncToRemoteJob
-include/KDE/Kasten1/AbstractSyncWithRemoteJob
-include/KDE/Kasten1/AbstractTool
-include/KDE/Kasten1/AbstractToolFactory
-include/KDE/Kasten1/AbstractToolInlineView
-include/KDE/Kasten1/AbstractToolView
-include/KDE/Kasten1/AbstractToolViewFactory
-include/KDE/Kasten1/AbstractToolWidget
-include/KDE/Kasten1/AbstractView
-include/KDE/Kasten1/AbstractViewArea
-include/KDE/Kasten1/AbstractViewFactory
-include/KDE/Kasten1/AbstractXmlGuiController
-include/KDE/Kasten1/ClipboardController
-include/KDE/Kasten1/CloseController
-include/KDE/Kasten1/CopyAsController
-include/KDE/Kasten1/CreatorController
-include/KDE/Kasten1/DataSelectable
-include/KDE/Kasten1/DialogHandler
-include/KDE/Kasten1/DocumentCreateManager
-include/KDE/Kasten1/DocumentManager
-include/KDE/Kasten1/DocumentSyncManager
-include/KDE/Kasten1/DocumentVersionData
-include/KDE/Kasten1/DocumentsTool
-include/KDE/Kasten1/DocumentsToolView
-include/KDE/Kasten1/DummyView
-include/KDE/Kasten1/ExportController
-include/KDE/Kasten1/FileSystemBrowserTool
-include/KDE/Kasten1/FileSystemBrowserToolView
-include/KDE/Kasten1/FullScreenController
-include/KDE/Kasten1/JobManager
-include/KDE/Kasten1/LoaderController
-include/KDE/Kasten1/ModelCodecManager
-include/KDE/Kasten1/ModelCodecViewManager
-include/KDE/Kasten1/ModelDataGenerateThread
-include/KDE/Kasten1/ModelEncoderFileSystemExportJob
-include/KDE/Kasten1/ModelEncoderFileSystemExporter
-include/KDE/Kasten1/ModelEncoderFileSystemExporterConfigEditor
-include/KDE/Kasten1/ModelEncoderFileSystemExporterConfigEditorFactory
-include/KDE/Kasten1/ModelStreamEncodeThread
-include/KDE/Kasten1/ModifiedBarController
-include/KDE/Kasten1/MultiDocumentStrategy
-include/KDE/Kasten1/MultiViewAreas
-include/KDE/Kasten1/Person
-include/KDE/Kasten1/QuitController
-include/KDE/Kasten1/ReadOnlyBarController
-include/KDE/Kasten1/ReadOnlyController
-include/KDE/Kasten1/SelectController
-include/KDE/Kasten1/SelectedDataWriteable
-include/KDE/Kasten1/SetRemoteController
-include/KDE/Kasten1/ShellWindow
-include/KDE/Kasten1/SingleDocumentStrategy
-include/KDE/Kasten1/SingleViewArea
-include/KDE/Kasten1/SingleViewWindow
-include/KDE/Kasten1/StatusBar
-include/KDE/Kasten1/SwitchViewController
-include/KDE/Kasten1/SynchronizeController
-include/KDE/Kasten1/TabbedViews
-include/KDE/Kasten1/ToggleButton
-include/KDE/Kasten1/ToolInlineViewable
-include/KDE/Kasten1/ToolListMenuController
-include/KDE/Kasten1/UserListable
-include/KDE/Kasten1/VersionController
-include/KDE/Kasten1/VersionViewTool
-include/KDE/Kasten1/VersionViewToolView
-include/KDE/Kasten1/Versionable
-include/KDE/Kasten1/ViewAreaSplitable
-include/KDE/Kasten1/ViewListMenuController
-include/KDE/Kasten1/ViewManager
-include/KDE/Kasten1/WidgetsDockable
-include/KDE/Kasten1/ZoomBarController
-include/KDE/Kasten1/ZoomController
-include/KDE/Kasten1/Zoomable
+include/KDE/Kasten2/AbstractConnectJob
+include/KDE/Kasten2/AbstractDocument
+include/KDE/Kasten2/AbstractDocumentFactory
+include/KDE/Kasten2/AbstractDocumentStrategy
+include/KDE/Kasten2/AbstractExportJob
+include/KDE/Kasten2/AbstractFileSystemConnectJob
+include/KDE/Kasten2/AbstractFileSystemExportJob
+include/KDE/Kasten2/AbstractFileSystemLoadJob
+include/KDE/Kasten2/AbstractFileSystemSyncFromRemoteJob
+include/KDE/Kasten2/AbstractFileSystemSyncToRemoteJob
+include/KDE/Kasten2/AbstractFileSystemSyncWithRemoteJob
+include/KDE/Kasten2/AbstractGroupedViews
+include/KDE/Kasten2/AbstractLinePopup
+include/KDE/Kasten2/AbstractLoadJob
+include/KDE/Kasten2/AbstractModel
+include/KDE/Kasten2/AbstractModelDataGenerator
+include/KDE/Kasten2/AbstractModelDataGeneratorConfigEditor
+include/KDE/Kasten2/AbstractModelDataGeneratorConfigEditorFactory
+include/KDE/Kasten2/AbstractModelExporter
+include/KDE/Kasten2/AbstractModelExporterConfigEditor
+include/KDE/Kasten2/AbstractModelExporterConfigEditorFactory
+include/KDE/Kasten2/AbstractModelFileSystemSynchronizer
+include/KDE/Kasten2/AbstractModelSelection
+include/KDE/Kasten2/AbstractModelStreamEncoder
+include/KDE/Kasten2/AbstractModelStreamEncoderConfigEditor
+include/KDE/Kasten2/AbstractModelStreamEncoderConfigEditorFactory
+include/KDE/Kasten2/AbstractModelSynchronizer
+include/KDE/Kasten2/AbstractModelSynchronizerFactory
+include/KDE/Kasten2/AbstractSelectionView
+include/KDE/Kasten2/AbstractSyncFromRemoteJob
+include/KDE/Kasten2/AbstractSyncToRemoteJob
+include/KDE/Kasten2/AbstractSyncWithRemoteJob
+include/KDE/Kasten2/AbstractTool
+include/KDE/Kasten2/AbstractToolFactory
+include/KDE/Kasten2/AbstractToolInlineView
+include/KDE/Kasten2/AbstractToolView
+include/KDE/Kasten2/AbstractToolViewFactory
+include/KDE/Kasten2/AbstractToolWidget
+include/KDE/Kasten2/AbstractView
+include/KDE/Kasten2/AbstractViewArea
+include/KDE/Kasten2/AbstractViewFactory
+include/KDE/Kasten2/AbstractXmlGuiController
+include/KDE/Kasten2/ClipboardController
+include/KDE/Kasten2/CloseController
+include/KDE/Kasten2/CopyAsController
+include/KDE/Kasten2/CreatorController
+include/KDE/Kasten2/DataSelectable
+include/KDE/Kasten2/DialogHandler
+include/KDE/Kasten2/DocumentCreateManager
+include/KDE/Kasten2/DocumentManager
+include/KDE/Kasten2/DocumentSyncManager
+include/KDE/Kasten2/DocumentVersionData
+include/KDE/Kasten2/DocumentsTool
+include/KDE/Kasten2/DocumentsToolView
+include/KDE/Kasten2/DummyView
+include/KDE/Kasten2/ExportController
+include/KDE/Kasten2/FileSystemBrowserTool
+include/KDE/Kasten2/FileSystemBrowserToolView
+include/KDE/Kasten2/FullScreenController
+include/KDE/Kasten2/JobManager
+include/KDE/Kasten2/LoaderController
+include/KDE/Kasten2/ModelCodecManager
+include/KDE/Kasten2/ModelCodecViewManager
+include/KDE/Kasten2/ModelDataGenerateThread
+include/KDE/Kasten2/ModelEncoderFileSystemExportJob
+include/KDE/Kasten2/ModelEncoderFileSystemExporter
+include/KDE/Kasten2/ModelEncoderFileSystemExporterConfigEditor
+include/KDE/Kasten2/ModelEncoderFileSystemExporterConfigEditorFactory
+include/KDE/Kasten2/ModelStreamEncodeThread
+include/KDE/Kasten2/ModifiedBarController
+include/KDE/Kasten2/MultiDocumentStrategy
+include/KDE/Kasten2/MultiViewAreas
+include/KDE/Kasten2/Person
+include/KDE/Kasten2/QuitController
+include/KDE/Kasten2/ReadOnlyBarController
+include/KDE/Kasten2/ReadOnlyController
+include/KDE/Kasten2/SelectController
+include/KDE/Kasten2/SelectedDataWriteable
+include/KDE/Kasten2/SetRemoteController
+include/KDE/Kasten2/ShellWindow
+include/KDE/Kasten2/SingleDocumentStrategy
+include/KDE/Kasten2/SingleViewArea
+include/KDE/Kasten2/SingleViewWindow
+include/KDE/Kasten2/StatusBar
+include/KDE/Kasten2/SwitchViewController
+include/KDE/Kasten2/SynchronizeController
+include/KDE/Kasten2/TabbedViews
+include/KDE/Kasten2/ToggleButton
+include/KDE/Kasten2/ToolInlineViewable
+include/KDE/Kasten2/ToolListMenuController
+include/KDE/Kasten2/UserListable
+include/KDE/Kasten2/VersionController
+include/KDE/Kasten2/VersionViewTool
+include/KDE/Kasten2/VersionViewToolView
+include/KDE/Kasten2/Versionable
+include/KDE/Kasten2/ViewAreaSplitable
+include/KDE/Kasten2/ViewListMenuController
+include/KDE/Kasten2/ViewManager
+include/KDE/Kasten2/WidgetsDockable
+include/KDE/Kasten2/ZoomBarController
+include/KDE/Kasten2/ZoomController
+include/KDE/Kasten2/Zoomable
 include/KDE/Okteta1/AbstractByteArrayColumnRenderer
 include/KDE/Okteta1/AbstractByteArrayModel
 include/KDE/Okteta1/AbstractByteArrayView
@@ -201,7 +201,6 @@ include/KDE/Okteta1/ChangesDescribable
 include/KDE/Okteta1/CharByteArrayColumnRenderer
 include/KDE/Okteta1/CharCodec
 include/KDE/Okteta1/Character
-include/KDE/Okteta1/ColumnsView
 include/KDE/Okteta1/Line
 include/KDE/Okteta1/LinePosition
 include/KDE/Okteta1/LinePositionRange
@@ -217,196 +216,202 @@ include/KDE/Okteta1/ValueCodec
 include/KDE/Okteta1/Versionable
 include/KDE/Okteta1/WidgetColumnStylist
 include/KDE/Okteta1/WordByteArrayService
-include/kasten1/abstractconnectjob.h
-include/kasten1/abstractcontroller.h
-include/kasten1/abstractdocument.h
-include/kasten1/abstractdocumentfactory.h
-include/kasten1/abstractdocumentstrategy.h
-include/kasten1/abstractexportjob.h
-include/kasten1/abstractfilesystemconnectjob.h
-include/kasten1/abstractfilesystemexportjob.h
-include/kasten1/abstractfilesystemloadjob.h
-include/kasten1/abstractfilesystemsyncfromremotejob.h
-include/kasten1/abstractfilesystemsynctoremotejob.h
-include/kasten1/abstractfilesystemsyncwithremotejob.h
-include/kasten1/abstractgroupedviews.h
-include/kasten1/abstractlinepopup.h
-include/kasten1/abstractloadjob.h
-include/kasten1/abstractmodel.h
-include/kasten1/abstractmodeldatagenerator.h
-include/kasten1/abstractmodeldatageneratorconfigeditor.h
-include/kasten1/abstractmodeldatageneratorconfigeditorfactory.h
-include/kasten1/abstractmodelexporter.h
-include/kasten1/abstractmodelexporterconfigeditor.h
-include/kasten1/abstractmodelexporterconfigeditorfactory.h
-include/kasten1/abstractmodelfilesystemsynchronizer.h
-include/kasten1/abstractmodelselection.h
-include/kasten1/abstractmodelstreamencoder.h
-include/kasten1/abstractmodelstreamencoderconfigeditor.h
-include/kasten1/abstractmodelstreamencoderconfigeditorfactory.h
-include/kasten1/abstractmodelsynchronizer.h
-include/kasten1/abstractmodelsynchronizerfactory.h
-include/kasten1/abstractoverwritedialog.h
-include/kasten1/abstractsavediscarddialog.h
-include/kasten1/abstractselectionview.h
-include/kasten1/abstractsyncfromremotejob.h
-include/kasten1/abstractsynctoremotejob.h
-include/kasten1/abstractsyncwithremotejob.h
-include/kasten1/abstracttool.h
-include/kasten1/abstracttoolfactory.h
-include/kasten1/abstracttoolinlineview.h
-include/kasten1/abstracttoolview.h
-include/kasten1/abstracttoolviewfactory.h
-include/kasten1/abstracttoolwidget.h
-include/kasten1/abstractview.h
-include/kasten1/abstractviewarea.h
-include/kasten1/abstractviewfactory.h
-include/kasten1/abstractxmlguicontroller.h
-include/kasten1/clipboardcontroller.h
-include/kasten1/closecontroller.h
-include/kasten1/copyascontroller.h
-include/kasten1/creatorcontroller.h
-include/kasten1/dataselectable.h
-include/kasten1/dialoghandler.h
-include/kasten1/documentcreatemanager.h
-include/kasten1/documentmanager.h
-include/kasten1/documentstool.h
-include/kasten1/documentstoolview.h
-include/kasten1/documentsyncmanager.h
-include/kasten1/documentversiondata.h
-include/kasten1/documentversionid.h
-include/kasten1/dummyview.h
-include/kasten1/exportcontroller.h
-include/kasten1/filesystembrowsertool.h
-include/kasten1/filesystembrowsertoolview.h
-include/kasten1/fullscreencontroller.h
-include/kasten1/insertcontroller.h
-include/kasten1/jobmanager.h
-include/kasten1/kastencontrollers_export.h
-include/kasten1/kastencore.h
-include/kasten1/kastencore_export.h
-include/kasten1/kastengui.h
-include/kasten1/kastengui_export.h
-include/kasten1/loadercontroller.h
-include/kasten1/modelcodecmanager.h
-include/kasten1/modelcodecviewmanager.h
-include/kasten1/modeldatageneratethread.h
-include/kasten1/modelencoderfilesystemexporter.h
-include/kasten1/modelencoderfilesystemexporterconfigeditor.h
-include/kasten1/modelencoderfilesystemexporterconfigeditorfactory.h
-include/kasten1/modelencoderfilesystemexportjob.h
-include/kasten1/modelstreamencodethread.h
-include/kasten1/modifiedbarcontroller.h
-include/kasten1/multidocumentstrategy.h
-include/kasten1/multiviewareas.h
-include/kasten1/okteta1/abstractbytearraystreamencoder.h
-include/kasten1/okteta1/bookmarkscontroller.h
-include/kasten1/okteta1/bookmarkstool.h
-include/kasten1/okteta1/bookmarkstoolfactory.h
-include/kasten1/okteta1/bookmarkstoolview.h
-include/kasten1/okteta1/bookmarkstoolviewfactory.h
-include/kasten1/okteta1/bytearraycharsstreamencoder.h
-include/kasten1/okteta1/bytearraydocument.h
-include/kasten1/okteta1/bytearraydocumentfactory.h
-include/kasten1/okteta1/bytearrayrawfilesynchronizer.h
-include/kasten1/okteta1/bytearrayrawfilesynchronizerfactory.h
-include/kasten1/okteta1/bytearrayselection.h
-include/kasten1/okteta1/bytearraysourcecodestreamencoder.h
-include/kasten1/okteta1/bytearraysourcecodestreamencoderconfigeditor.h
-include/kasten1/okteta1/bytearraysourcecodestreamencoderconfigeditorfactory.h
-include/kasten1/okteta1/bytearraytextstreamencoderpreview.h
-include/kasten1/okteta1/bytearrayvaluesstreamencoder.h
-include/kasten1/okteta1/bytearrayvaluesstreamencoderconfigeditor.h
-include/kasten1/okteta1/bytearrayvaluesstreamencoderconfigeditorfactory.h
-include/kasten1/okteta1/bytearrayview.h
-include/kasten1/okteta1/bytearrayviewfactory.h
-include/kasten1/okteta1/bytearrayviewtextstreamencoder.h
-include/kasten1/okteta1/bytetabletool.h
-include/kasten1/okteta1/bytetabletoolfactory.h
-include/kasten1/okteta1/bytetabletoolview.h
-include/kasten1/okteta1/bytetabletoolviewfactory.h
-include/kasten1/okteta1/charsetconversiontoolfactory.h
-include/kasten1/okteta1/charsetconversiontoolviewfactory.h
-include/kasten1/okteta1/checksumtool.h
-include/kasten1/okteta1/checksumtoolfactory.h
-include/kasten1/okteta1/checksumtoolview.h
-include/kasten1/okteta1/checksumtoolviewfactory.h
-include/kasten1/okteta1/documentinfotool.h
-include/kasten1/okteta1/documentinfotoolview.h
-include/kasten1/okteta1/filtertool.h
-include/kasten1/okteta1/filtertoolfactory.h
-include/kasten1/okteta1/filtertoolview.h
-include/kasten1/okteta1/filtertoolviewfactory.h
-include/kasten1/okteta1/gotooffsetcontroller.h
-include/kasten1/okteta1/gotooffsettool.h
-include/kasten1/okteta1/gotooffsettoolview.h
-include/kasten1/okteta1/infotool.h
-include/kasten1/okteta1/infotoolfactory.h
-include/kasten1/okteta1/infotoolview.h
-include/kasten1/okteta1/infotoolviewfactory.h
-include/kasten1/okteta1/kfinddirection.h
-include/kasten1/okteta1/oktetakastencontrollers_export.h
-include/kasten1/okteta1/oktetakastencore_export.h
-include/kasten1/okteta1/oktetakastengui_export.h
-include/kasten1/okteta1/overwritemodecontroller.h
-include/kasten1/okteta1/overwriteonlycontroller.h
-include/kasten1/okteta1/poddecodertool.h
-include/kasten1/okteta1/poddecodertoolfactory.h
-include/kasten1/okteta1/poddecodertoolview.h
-include/kasten1/okteta1/poddecodertoolviewfactory.h
-include/kasten1/okteta1/printcontroller.h
-include/kasten1/okteta1/replacecontroller.h
-include/kasten1/okteta1/replaceuserqueryable.h
-include/kasten1/okteta1/searchcontroller.h
-include/kasten1/okteta1/searchuserqueryable.h
-include/kasten1/okteta1/selectrangecontroller.h
-include/kasten1/okteta1/stringsextracttool.h
-include/kasten1/okteta1/stringsextracttoolfactory.h
-include/kasten1/okteta1/stringsextracttoolview.h
-include/kasten1/okteta1/stringsextracttoolviewfactory.h
-include/kasten1/okteta1/structtool.h
-include/kasten1/okteta1/structtoolview.h
-include/kasten1/okteta1/structurestoolfactory.h
-include/kasten1/okteta1/structurestoolviewfactory.h
-include/kasten1/okteta1/viewconfigcontroller.h
-include/kasten1/okteta1/viewmodecontroller.h
-include/kasten1/okteta1/viewstatuscontroller.h
-include/kasten1/person.h
-include/kasten1/quitcontroller.h
-include/kasten1/readonlybarcontroller.h
-include/kasten1/readonlycontroller.h
-include/kasten1/selectcontroller.h
-include/kasten1/selecteddatawriteable.h
-include/kasten1/setremotecontroller.h
-include/kasten1/shellwindow.h
-include/kasten1/singledocumentstrategy.h
-include/kasten1/singleviewarea.h
-include/kasten1/singleviewwindow.h
-include/kasten1/statusbar.h
-include/kasten1/statusbarlayout.h
-include/kasten1/switchviewcontroller.h
-include/kasten1/synchronizecontroller.h
-include/kasten1/tabbedviews.h
-include/kasten1/togglebutton.h
-include/kasten1/toolinlineviewable.h
-include/kasten1/toolinlineviewwidget.h
-include/kasten1/toollistmenucontroller.h
-include/kasten1/toolviewdockwidget.h
-include/kasten1/userlistable.h
-include/kasten1/versionable.h
-include/kasten1/versioncontroller.h
-include/kasten1/versionviewtool.h
-include/kasten1/versionviewtoolview.h
-include/kasten1/viewareabox.h
-include/kasten1/viewareasplitable.h
-include/kasten1/viewareasplitcontroller.h
-include/kasten1/viewbox.h
-include/kasten1/viewlistmenucontroller.h
-include/kasten1/viewmanager.h
-include/kasten1/widgetsdockable.h
-include/kasten1/zoomable.h
-include/kasten1/zoombarcontroller.h
-include/kasten1/zoomcontroller.h
+include/kasten2/abstractconnectjob.h
+include/kasten2/abstractcontroller.h
+include/kasten2/abstractdocument.h
+include/kasten2/abstractdocumentfactory.h
+include/kasten2/abstractdocumentstrategy.h
+include/kasten2/abstractexportjob.h
+include/kasten2/abstractfilesystemconnectjob.h
+include/kasten2/abstractfilesystemexportjob.h
+include/kasten2/abstractfilesystemloadjob.h
+include/kasten2/abstractfilesystemsyncfromremotejob.h
+include/kasten2/abstractfilesystemsynctoremotejob.h
+include/kasten2/abstractfilesystemsyncwithremotejob.h
+include/kasten2/abstractgroupedviews.h
+include/kasten2/abstractlinepopup.h
+include/kasten2/abstractloadjob.h
+include/kasten2/abstractmodel.h
+include/kasten2/abstractmodeldatagenerator.h
+include/kasten2/abstractmodeldatageneratorconfigeditor.h
+include/kasten2/abstractmodeldatageneratorconfigeditorfactory.h
+include/kasten2/abstractmodelexporter.h
+include/kasten2/abstractmodelexporterconfigeditor.h
+include/kasten2/abstractmodelexporterconfigeditorfactory.h
+include/kasten2/abstractmodelfilesystemsynchronizer.h
+include/kasten2/abstractmodelselection.h
+include/kasten2/abstractmodelstreamencoder.h
+include/kasten2/abstractmodelstreamencoderconfigeditor.h
+include/kasten2/abstractmodelstreamencoderconfigeditorfactory.h
+include/kasten2/abstractmodelsynchronizer.h
+include/kasten2/abstractmodelsynchronizerfactory.h
+include/kasten2/abstractoverwritedialog.h
+include/kasten2/abstractsavediscarddialog.h
+include/kasten2/abstractselectionview.h
+include/kasten2/abstractsyncfromremotejob.h
+include/kasten2/abstractsynctoremotejob.h
+include/kasten2/abstractsyncwithremotejob.h
+include/kasten2/abstracttool.h
+include/kasten2/abstracttoolfactory.h
+include/kasten2/abstracttoolinlineview.h
+include/kasten2/abstracttoolview.h
+include/kasten2/abstracttoolviewfactory.h
+include/kasten2/abstracttoolwidget.h
+include/kasten2/abstractview.h
+include/kasten2/abstractviewarea.h
+include/kasten2/abstractviewfactory.h
+include/kasten2/abstractxmlguicontroller.h
+include/kasten2/clipboardcontroller.h
+include/kasten2/closecontroller.h
+include/kasten2/copyascontroller.h
+include/kasten2/creatorcontroller.h
+include/kasten2/dataselectable.h
+include/kasten2/dialoghandler.h
+include/kasten2/documentcreatemanager.h
+include/kasten2/documentmanager.h
+include/kasten2/documentstool.h
+include/kasten2/documentstoolview.h
+include/kasten2/documentsyncmanager.h
+include/kasten2/documentversiondata.h
+include/kasten2/documentversionid.h
+include/kasten2/dummyview.h
+include/kasten2/exportcontroller.h
+include/kasten2/filesystembrowsertool.h
+include/kasten2/filesystembrowsertoolview.h
+include/kasten2/fullscreencontroller.h
+include/kasten2/insertcontroller.h
+include/kasten2/jobmanager.h
+include/kasten2/kastencontrollers_export.h
+include/kasten2/kastencore.h
+include/kasten2/kastencore_export.h
+include/kasten2/kastengui.h
+include/kasten2/kastengui_export.h
+include/kasten2/loadercontroller.h
+include/kasten2/modelcodecmanager.h
+include/kasten2/modelcodecviewmanager.h
+include/kasten2/modeldatageneratethread.h
+include/kasten2/modelencoderfilesystemexporter.h
+include/kasten2/modelencoderfilesystemexporterconfigeditor.h
+include/kasten2/modelencoderfilesystemexporterconfigeditorfactory.h
+include/kasten2/modelencoderfilesystemexportjob.h
+include/kasten2/modelstreamencodethread.h
+include/kasten2/modifiedbarcontroller.h
+include/kasten2/multidocumentstrategy.h
+include/kasten2/multiviewareas.h
+include/kasten2/okteta1/abstractbytearraystreamencoder.h
+include/kasten2/okteta1/bookmarkscontroller.h
+include/kasten2/okteta1/bookmarkstool.h
+include/kasten2/okteta1/bookmarkstoolfactory.h
+include/kasten2/okteta1/bookmarkstoolview.h
+include/kasten2/okteta1/bookmarkstoolviewfactory.h
+include/kasten2/okteta1/bytearraycharsstreamencoder.h
+include/kasten2/okteta1/bytearraydocument.h
+include/kasten2/okteta1/bytearraydocumentfactory.h
+include/kasten2/okteta1/bytearrayrawfilesynchronizer.h
+include/kasten2/okteta1/bytearrayrawfilesynchronizerfactory.h
+include/kasten2/okteta1/bytearrayselection.h
+include/kasten2/okteta1/bytearraysourcecodestreamencoder.h
+include/kasten2/okteta1/bytearraysourcecodestreamencoderconfigeditor.h
+include/kasten2/okteta1/bytearraysourcecodestreamencoderconfigeditorfactory.h
+include/kasten2/okteta1/bytearraytextstreamencoderpreview.h
+include/kasten2/okteta1/bytearrayvaluesstreamencoder.h
+include/kasten2/okteta1/bytearrayvaluesstreamencoderconfigeditor.h
+include/kasten2/okteta1/bytearrayvaluesstreamencoderconfigeditorfactory.h
+include/kasten2/okteta1/bytearrayview.h
+include/kasten2/okteta1/bytearrayviewfactory.h
+include/kasten2/okteta1/bytearrayviewprofile.h
+include/kasten2/okteta1/bytearrayviewprofilelock.h
+include/kasten2/okteta1/bytearrayviewprofilemanager.h
+include/kasten2/okteta1/bytearrayviewprofilesynchronizer.h
+include/kasten2/okteta1/bytearrayviewtextstreamencoder.h
+include/kasten2/okteta1/bytetabletool.h
+include/kasten2/okteta1/bytetabletoolfactory.h
+include/kasten2/okteta1/bytetabletoolview.h
+include/kasten2/okteta1/bytetabletoolviewfactory.h
+include/kasten2/okteta1/charsetconversiontoolfactory.h
+include/kasten2/okteta1/charsetconversiontoolviewfactory.h
+include/kasten2/okteta1/checksumtool.h
+include/kasten2/okteta1/checksumtoolfactory.h
+include/kasten2/okteta1/checksumtoolview.h
+include/kasten2/okteta1/checksumtoolviewfactory.h
+include/kasten2/okteta1/documentinfotool.h
+include/kasten2/okteta1/documentinfotoolview.h
+include/kasten2/okteta1/filtertool.h
+include/kasten2/okteta1/filtertoolfactory.h
+include/kasten2/okteta1/filtertoolview.h
+include/kasten2/okteta1/filtertoolviewfactory.h
+include/kasten2/okteta1/gotooffsetcontroller.h
+include/kasten2/okteta1/gotooffsettool.h
+include/kasten2/okteta1/gotooffsettoolview.h
+include/kasten2/okteta1/infotool.h
+include/kasten2/okteta1/infotoolfactory.h
+include/kasten2/okteta1/infotoolview.h
+include/kasten2/okteta1/infotoolviewfactory.h
+include/kasten2/okteta1/kfinddirection.h
+include/kasten2/okteta1/oktetakastencontrollers_export.h
+include/kasten2/okteta1/oktetakastencore_export.h
+include/kasten2/okteta1/oktetakastengui_export.h
+include/kasten2/okteta1/overwritemodecontroller.h
+include/kasten2/okteta1/overwriteonlycontroller.h
+include/kasten2/okteta1/poddecodertool.h
+include/kasten2/okteta1/poddecodertoolfactory.h
+include/kasten2/okteta1/poddecodertoolview.h
+include/kasten2/okteta1/poddecodertoolviewfactory.h
+include/kasten2/okteta1/printcontroller.h
+include/kasten2/okteta1/replacecontroller.h
+include/kasten2/okteta1/replaceuserqueryable.h
+include/kasten2/okteta1/searchcontroller.h
+include/kasten2/okteta1/searchuserqueryable.h
+include/kasten2/okteta1/selectrangecontroller.h
+include/kasten2/okteta1/stringsextracttool.h
+include/kasten2/okteta1/stringsextracttoolfactory.h
+include/kasten2/okteta1/stringsextracttoolview.h
+include/kasten2/okteta1/stringsextracttoolviewfactory.h
+include/kasten2/okteta1/structtool.h
+include/kasten2/okteta1/structtoolview.h
+include/kasten2/okteta1/structurestoolfactory.h
+include/kasten2/okteta1/structurestoolviewfactory.h
+include/kasten2/okteta1/viewconfigcontroller.h
+include/kasten2/okteta1/viewmodecontroller.h
+include/kasten2/okteta1/viewprofilecontroller.h
+include/kasten2/okteta1/viewprofilesmanagecontroller.h
+include/kasten2/okteta1/viewstatuscontroller.h
+include/kasten2/person.h
+include/kasten2/quitcontroller.h
+include/kasten2/readonlybarcontroller.h
+include/kasten2/readonlycontroller.h
+include/kasten2/selectcontroller.h
+include/kasten2/selecteddatawriteable.h
+include/kasten2/setremotecontroller.h
+include/kasten2/shellwindow.h
+include/kasten2/singledocumentstrategy.h
+include/kasten2/singleviewarea.h
+include/kasten2/singleviewwindow.h
+include/kasten2/statusbar.h
+include/kasten2/statusbarlayout.h
+include/kasten2/switchviewcontroller.h
+include/kasten2/synchronizecontroller.h
+include/kasten2/tabbedviews.h
+include/kasten2/togglebutton.h
+include/kasten2/toolinlineviewable.h
+include/kasten2/toolinlineviewwidget.h
+include/kasten2/toollistmenucontroller.h
+include/kasten2/toolviewdockwidget.h
+include/kasten2/userlistable.h
+include/kasten2/versionable.h
+include/kasten2/versioncontroller.h
+include/kasten2/versionviewtool.h
+include/kasten2/versionviewtoolview.h
+include/kasten2/viewareabox.h
+include/kasten2/viewareasplitable.h
+include/kasten2/viewareasplitcontroller.h
+include/kasten2/viewbox.h
+include/kasten2/viewlistmenucontroller.h
+include/kasten2/viewmanager.h
+include/kasten2/widgetsdockable.h
+include/kasten2/zoomable.h
+include/kasten2/zoombarcontroller.h
+include/kasten2/zoomcontroller.h
 include/kompare/kompareinterface.h
 include/kprofilemethod.h
 include/okteta1/abstractbytearraycolumnrenderer.h
@@ -461,7 +466,6 @@ lib/kde4/fileviewbazaarplugin.so
 lib/kde4/fileviewgitplugin.so
 lib/kde4/fileviewhgplugin.so
 lib/kde4/fileviewsvnplugin.so
-lib/kde4/kabcformat_kdeaccounts.so
 lib/kde4/kded_ksvnd.so
 lib/kde4/kio_perldoc.so
 lib/kde4/kio_svn.so
@@ -472,25 +476,26 @@ lib/kde4/kuiviewerpart.so
 lib/kde4/libkbytearrayedit.so
 lib/kde4/oktetapart.so
 lib/kde4/plugins/designer/oktetadesignerplugin.so
+lib/kde4/pothumbnail.so
 lib/kde4/quithumbnail.so
-lib/libkasten1controllers.so
-lib/libkasten1controllers.so.0.2.0
-lib/libkasten1controllers.so.1
-lib/libkasten1core.so
-lib/libkasten1core.so.0.2.0
-lib/libkasten1core.so.1
-lib/libkasten1gui.so
-lib/libkasten1gui.so.0.2.0
-lib/libkasten1gui.so.1
-lib/libkasten1okteta1controllers.so
-lib/libkasten1okteta1controllers.so.0.2.0
-lib/libkasten1okteta1controllers.so.1
-lib/libkasten1okteta1core.so
-lib/libkasten1okteta1core.so.0.2.0
-lib/libkasten1okteta1core.so.1
-lib/libkasten1okteta1gui.so
-lib/libkasten1okteta1gui.so.0.2.0
-lib/libkasten1okteta1gui.so.1
+lib/libkasten2controllers.so
+lib/libkasten2controllers.so.0.2.0
+lib/libkasten2controllers.so.2
+lib/libkasten2core.so
+lib/libkasten2core.so.0.2.0
+lib/libkasten2core.so.2
+lib/libkasten2gui.so
+lib/libkasten2gui.so.0.2.0
+lib/libkasten2gui.so.2
+lib/libkasten2okteta1controllers.so
+lib/libkasten2okteta1controllers.so.0.2.0
+lib/libkasten2okteta1controllers.so.1
+lib/libkasten2okteta1core.so
+lib/libkasten2okteta1core.so.0.2.0
+lib/libkasten2okteta1core.so.1
+lib/libkasten2okteta1gui.so
+lib/libkasten2okteta1gui.so.0.2.0
+lib/libkasten2okteta1gui.so.1
 lib/libkdeinit4_cervisia.so
 lib/libkdeinit4_cvsaskpass.so
 lib/libkdeinit4_cvsservice.so
@@ -524,7 +529,6 @@ share/applications/kde4/umbrello.desktop
 share/apps/cervisia/cervisia.notifyrc
 share/apps/cervisia/cervisiashellui.rc
 share/apps/cervisiapart/cervisiaui.rc
-share/apps/kabc/formats/kdeaccountsplugin.desktop
 share/apps/kcachegrind/icons/hicolor/16x16/actions/move.png
 share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
 share/apps/kcachegrind/icons/hicolor/22x22/actions/hidetemplates.png
@@ -574,6 +578,7 @@ share/apps/kpartloader/kpartloaderui.rc
 share/apps/kuiviewer/kuiviewerui.rc
 share/apps/kuiviewerpart/kuiviewer_part.rc
 share/apps/lokalize/editorui.rc
+share/apps/lokalize/filesearchtabui.rc
 share/apps/lokalize/lokalize.notifyrc
 share/apps/lokalize/lokalizemainwindowui.rc
 share/apps/lokalize/projectmanagerui.rc
@@ -631,6 +636,12 @@ share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_entityrelations
 share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_sequence.png
 share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_state.png
 share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_usecase.png
+share/apps/umbrello/layouts/activity-export.desktop
+share/apps/umbrello/layouts/class-export.desktop
+share/apps/umbrello/layouts/class-horizontal.desktop
+share/apps/umbrello/layouts/class-vertical.desktop
+share/apps/umbrello/layouts/state-export.desktop
+share/apps/umbrello/layouts/usecase-default.desktop
 share/apps/umbrello/pics/CVglobal_meth.png
 share/apps/umbrello/pics/CVglobal_var.png
 share/apps/umbrello/pics/CVimplementation_meth.png
@@ -787,6 +798,7 @@ share/config.kcfg/fileviewhgpluginsettings.kcfg
 share/config.kcfg/fileviewsvnpluginsettings.kcfg
 share/config.kcfg/kapptemplate.kcfg
 share/config.kcfg/lokalize.kcfg
+share/config.kcfg/pocreatorsettings.kcfg
 share/config.kcfg/structviewpreferences.kcfg
 share/config/okteta-structures.knsrc
 share/dbus-1/interfaces/org.kde.cervisia.cvsjob.xml
@@ -1106,6 +1118,7 @@ share/kde4/services/komparepart.desktop
 share/kde4/services/kuiviewer_part.desktop
 share/kde4/services/oktetapart.desktop
 share/kde4/services/perldoc.protocol
+share/kde4/services/pothumbnail.desktop
 share/kde4/services/svn+file.protocol
 share/kde4/services/svn+http.protocol
 share/kde4/services/svn+https.protocol
@@ -1139,6 +1152,7 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/doc/HTML/en/kapptemplate
 @dirrm share/doc/HTML/en/cervisia
 @dirrm share/apps/umbrello/pics
+@dirrm share/apps/umbrello/layouts
 @dirrm share/apps/umbrello/icons/hicolor/22x22/actions
 @dirrm share/apps/umbrello/icons/hicolor/22x22
 @dirrm share/apps/umbrello/icons/hicolor/16x16/actions
@@ -1176,9 +1190,9 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
 @dirrm share/apps/cervisia
 @dirrm include/okteta1
 @dirrm include/kompare
-@dirrm include/kasten1/okteta1
-@dirrm include/kasten1
+@dirrm include/kasten2/okteta1
+@dirrm include/kasten2
 @dirrm include/KDE/Okteta1
-@dirrm include/KDE/Kasten1
+@dirrm include/KDE/Kasten2
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true