Update to KDE SC 4.10.2

missed commiting this the other day - thanks to Greg Oster for
noticing.

3 files changed, 58 insertions, 44 deletions

diff --git a/misc/rocs/Makefile b/misc/rocs/Makefile
index f3b90f37b0b..8ece3813d36 100644
--- a/misc/rocs/Makefile
+++ b/misc/rocs/Makefile
@@ -1,21 +1,17 @@
-# $NetBSD: Makefile,v 1.14 2013/02/26 23:37:32 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2013/04/04 19:30:03 markd Exp $
 
 DISTNAME=	rocs-${_KDE_VERSION}
-PKGREVISION=	10
 CATEGORIES=	misc
 COMMENT=	KDE graph theory IDE
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
+CMAKE_ARGS+=	-DKDE4_BUILD_TESTS:BOOL=OFF
+
 .include "../../meta-pkgs/kde4/kde4.mk"
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=	-std=c++11
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/rocs/PLIST b/misc/rocs/PLIST
index 19e630aea9d..4c660b64721 100644
--- a/misc/rocs/PLIST
+++ b/misc/rocs/PLIST
@@ -1,34 +1,40 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 08:29:32 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/04 19:30:04 markd Exp $
 bin/rocs
+include/rocs/CoreTypes.h
 include/rocs/Data.h
 include/rocs/DataItem.h
 include/rocs/DataStructure.h
+include/rocs/DataStructureBackendManager.h
+include/rocs/DataStructurePluginInterface.h
 include/rocs/Document.h
-include/rocs/DynamicPropertiesList.h
-include/rocs/FilePluginInterface.h
-include/rocs/GraphicsLayout.h
-include/rocs/KrossBackend.h
-include/rocs/PluginManager.h
+include/rocs/GraphFileBackendManager.h
+include/rocs/GraphFilePluginInterface.h
+include/rocs/GraphVisualEditor.h
 include/rocs/Pointer.h
 include/rocs/PointerItem.h
-include/rocs/QtScriptBackend.h
-include/rocs/Rocs_Typedefs.h
-include/rocs/ToolsPluginInterface.h
+include/rocs/RocsCoreExport.h
 include/rocs/Topology.h
-include/rocs/rocslib_export.h
-lib/kde4/rocs_GMLParser.so
 lib/kde4/rocs_GraphStructure.so
 lib/kde4/rocs_ListStructure.so
+lib/kde4/rocs_RootedTreeStructure.so
 lib/kde4/rocs_assignvaluesplugin.so
-lib/kde4/rocs_dotFilePlugin.so
 lib/kde4/rocs_generategraphplugin.so
-lib/kde4/rocs_plaintxt.so
+lib/kde4/rocs_gmlfileformat.so
+lib/kde4/rocs_kmlfileformat.so
+lib/kde4/rocs_tgffileformat.so
+lib/kde4/rocs_tikzfileformat.so
 lib/kde4/rocs_transformedgesplugin.so
-lib/librocslib.so
-lib/librocslib.so.4
-lib/librocslib.so.4.8.0
+lib/librocscore.so
+lib/librocscore.so.4
+lib/librocscore.so.${PKGVERSION}
+lib/librocsvisualeditor.so
+lib/librocsvisualeditor.so.4
+lib/librocsvisualeditor.so.${PKGVERSION}
 share/applications/kde4/rocs.desktop
 share/doc/kde/HTML/en/rocs/common
+share/doc/kde/HTML/en/rocs/document-selector.png
+share/doc/kde/HTML/en/rocs/hi22-action-rocsadddata.png
+share/doc/kde/HTML/en/rocs/hi22-action-rocsaddedge.png
 share/doc/kde/HTML/en/rocs/hi22-action-rocsalignbottom.png
 share/doc/kde/HTML/en/rocs/hi22-action-rocsaligncircle.png
 share/doc/kde/HTML/en/rocs/hi22-action-rocsalignhmiddle.png
@@ -37,8 +43,18 @@ share/doc/kde/HTML/en/rocs/hi22-action-rocsalignright.png
 share/doc/kde/HTML/en/rocs/hi22-action-rocsaligntop.png
 share/doc/kde/HTML/en/rocs/hi22-action-rocsaligntree.png
 share/doc/kde/HTML/en/rocs/hi22-action-rocsalignvmiddle.png
+share/doc/kde/HTML/en/rocs/hi22-action-rocsdelete.png
+share/doc/kde/HTML/en/rocs/hi22-action-rocsdeletedata.png
+share/doc/kde/HTML/en/rocs/hi22-action-rocsnew.png
+share/doc/kde/HTML/en/rocs/hi22-action-rocsproperties.png
+share/doc/kde/HTML/en/rocs/hi22-action-rocsselectmove.png
+share/doc/kde/HTML/en/rocs/hi22-action-rocszoom.png
 share/doc/kde/HTML/en/rocs/index.cache.bz2
 share/doc/kde/HTML/en/rocs/index.docbook
+share/doc/kde/HTML/en/rocs/rocs-control-engine-debug.png
+share/doc/kde/HTML/en/rocs/rocs-control-engine-run.png
+share/doc/kde/HTML/en/rocs/rocs-control-engine-step.png
+share/doc/kde/HTML/en/rocs/rocs-control-engine-stop.png
 share/doc/kde/HTML/en/rocs/rocs-interfaces.png
 share/doc/kde/HTML/en/rocs/rocs-screenshot.png
 share/doc/kde/HTML/en/rocs/rocs-toolbar-alignment.png
@@ -51,7 +67,6 @@ share/kde/apps/rocs/examples/broadWalk.js
 share/kde/apps/rocs/examples/coloring.js
 share/kde/apps/rocs/iconpacks/default.svg
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsaddedge.png
-share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsaddnode.png
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsalignbottom.png
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsaligncircle.png
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsalignhmiddle.png
@@ -60,9 +75,9 @@ share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsalignright.png
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsaligntop.png
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsaligntree.png
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsalignvmiddle.png
-share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsdelete.png
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsselect.png
 share/kde/apps/rocs/icons/hicolor/16x16/actions/rocsselectmove.png
+share/kde/apps/rocs/icons/hicolor/16x16/apps/rocs.png
 share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsaddedge.png
 share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsaddnode.png
 share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsalignbottom.png
@@ -73,10 +88,8 @@ share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsalignright.png
 share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsaligntop.png
 share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsaligntree.png
 share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsalignvmiddle.png
-share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsdelete.png
 share/kde/apps/rocs/icons/hicolor/22x22/actions/rocsselectmove.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsaddedge.png
-share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsaddnode.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsalignbottom.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsaligncircle.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsalignhmiddle.png
@@ -85,11 +98,10 @@ share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsalignright.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsaligntop.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsaligntree.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsalignvmiddle.png
-share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsdelete.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsselect.png
 share/kde/apps/rocs/icons/hicolor/32x32/actions/rocsselectmove.png
+share/kde/apps/rocs/icons/hicolor/32x32/apps/rocs.png
 share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsaddedge.png
-share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsaddnode.png
 share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsalignbottom.png
 share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsaligncircle.png
 share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsalignhmiddle.png
@@ -98,10 +110,9 @@ share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsalignright.png
 share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsaligntop.png
 share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsaligntree.png
 share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsalignvmiddle.png
-share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsdelete.png
 share/kde/apps/rocs/icons/hicolor/48x48/actions/rocsselectmove.png
+share/kde/apps/rocs/icons/hicolor/48x48/apps/rocs.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsaddedge.png
-share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsaddnode.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsalignbottom.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsaligncircle.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsalignhmiddle.png
@@ -110,20 +121,30 @@ share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsalignright.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsaligntop.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsaligntree.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsalignvmiddle.png
-share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsdelete.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsselect.png
 share/kde/apps/rocs/icons/hicolor/64x64/actions/rocsselectmove.png
+share/kde/apps/rocs/icons/hicolor/scalable/actions/rocsadddata.svgz
+share/kde/apps/rocs/icons/hicolor/scalable/actions/rocsdelete.svgz
+share/kde/apps/rocs/icons/hicolor/scalable/actions/rocsdeletedata.svgz
+share/kde/apps/rocs/icons/hicolor/scalable/actions/rocsdeletegrey.svgz
+share/kde/apps/rocs/icons/hicolor/scalable/actions/rocseyeblack.svgz
+share/kde/apps/rocs/icons/hicolor/scalable/actions/rocsnew.svgz
+share/kde/apps/rocs/icons/hicolor/scalable/actions/rocstexticon.svgz
+share/kde/apps/rocs/icons/hicolor/scalable/actions/rocsvalueicon.svgz
 share/kde/apps/rocs/rocsui.rc
+share/kde/apps/rocs_rootedtree/RootedTreeui.rc
 share/kde/config.kcfg/rocs.kcfg
 share/kde/config/rocs.knsrc
-share/kde4/services/rocs_GMLParser.desktop
 share/kde4/services/rocs_GraphStructure.desktop
 share/kde4/services/rocs_ListStructure.desktop
+share/kde4/services/rocs_RootedTreeStructure.desktop
 share/kde4/services/rocs_assignvaluesplugin.desktop
-share/kde4/services/rocs_dotFilePlugin.desktop
 share/kde4/services/rocs_generategraphplugin.desktop
-share/kde4/services/rocs_plaintxtplugin.desktop
+share/kde4/services/rocs_gmlfileformatplugin.desktop
+share/kde4/services/rocs_kmlfileformatplugin.desktop
+share/kde4/services/rocs_tgffileformatplugin.desktop
+share/kde4/services/rocs_tikzfileformatplugin.desktop
 share/kde4/services/rocs_transformedgesplugin.desktop
 share/kde4/servicetypes/RocsDataStructurePlugin.desktop
-share/kde4/servicetypes/RocsFilePlugin.desktop
+share/kde4/servicetypes/RocsGraphFilePlugin.desktop
 share/kde4/servicetypes/RocsToolsPlugin.desktop
diff --git a/misc/rocs/distinfo b/misc/rocs/distinfo
index 6e85e76b4b8..ef18257e1fc 100644
--- a/misc/rocs/distinfo
+++ b/misc/rocs/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2013/02/26 23:37:32 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/04/04 19:30:04 markd Exp $
 
-SHA1 (rocs-4.8.4.tar.xz) = 991e5aa15e59cc432a9c9f140fe90bd47f8f8e15
-RMD160 (rocs-4.8.4.tar.xz) = 1960ba3fbaabf2a9658f260d7a96de2b699b0829
-Size (rocs-4.8.4.tar.xz) = 665416 bytes
-SHA1 (patch-src_Plugins_AssignValues_assignvalueswidget.h) = 4bb8cc6a7bd276a3f2b1dbf2797f519def0263e8
-SHA1 (patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp) = dca421dd83d7f293c84a776626315ebca3beedda
-SHA1 (patch-src_Plugins_GenerateGraph_generategraphwidget.h) = e24a9018a75bc2d769c51a314bd4b667c8b097ee
-SHA1 (patch-src_Plugins_TransformEdges_transformedgeswidget.h) = 5232f933597dd6f31957f6d6f804993fd60cacc5
+SHA1 (rocs-4.10.2.tar.xz) = ab7e357732fec3a7ecccce586c6de51b829267ed
+RMD160 (rocs-4.10.2.tar.xz) = 5287be1c099202522fe6eaf648b22a637faa513f
+Size (rocs-4.10.2.tar.xz) = 1142592 bytes
+SHA1 (patch-RocsCore_LoadSave_Plugins_CMakeLists.txt) = ae4d15f9aa8fc2f19715db544a15ddbc2f0d98fb