3 files changed, 101 insertions, 25 deletions

diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 9073d43f6ec1..c9977efdf82d 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	kdeplasma-addons
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	deskutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +16,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra plasmoids for KDE4
 
 BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2
-LIB_DEPENDS=	kipi.6:${PORTSDIR}/graphics/kdegraphics4
+LIB_DEPENDS=	kipi.7:${PORTSDIR}/graphics/kdegraphics4
 
 USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
 KDE4_BUILDENV=	yes
@@ -29,9 +28,11 @@ QT_COMPONENTS=	corelib opengl dbus qt3support webkit \
 
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	MARBLE "Marble globe wallpaper for Plasma" on
+OPTIONS=	MARBLE "Marble globe wallpaper for Plasma" on \
+		OBSERVATORY "KDE Observatory plasmoid" off \
+		SCIM "Enable SCIM method input dialog" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITHOUT_MARBLE)
 PLIST_SUB+=	MARBLE="@comment "
@@ -40,15 +41,36 @@ LIB_DEPENDS+=	marblewidget.5:${PORTSDIR}/misc/kdeedu4
 PLIST_SUB+=	MARBLE=""
 .endif
 
+.if defined(WITHOUT_OBSERVATORY)
+PLIST_SUB+=	OBSERVATORY="@comment "
+.else
+LIB_DEPENDS+=	qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+PLIST_SUB+=	OBSERVATORY=""
+.endif
+
+.if defined(WITHOUT_SCIM)
+PLIST_SUB+=	SCIM="@comment "
+.else
+LIB_DEPENDS+=	scim-1.0.10:${PORTSDIR}/textproc/scim
+PLIST_SUB+=	SCIM=""
+.endif
+
 post-patch:
 	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
 		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
 
-pre-configure:
 .if defined(WITHOUT_MARBLE)
 	${REINPLACE_CMD} -e '/add_subdirectory(marble)/d' \
 		${WRKSRC}/wallpapers/CMakeLists.txt
 .endif
+.if defined(WITHOUT_OBSERVATORY)
+	${REINPLACE_CMD} -e '/add_subdirectory(kdeobservatory)/d' \
+		${WRKSRC}/applets/CMakeLists.txt
+.endif
+.if defined(WITHOUT_SCIM)
+	${REINPLACE_CMD} -e '/add_subdirectory(kimpanel)/d' \
+		${WRKSRC}/applets/CMakeLists.txt
+.endif
 	#respect prefix, don't update mime when installing
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
 		-e '/^set/s,DBUS_INTERFACES_INSTALL_DIR,KDE4_DBUS_INTERFACES_DIR,g' \
@@ -57,4 +79,4 @@ pre-configure:
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 6268043550a0..a41fdfed14b6 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeplasma-addons-4.3.5.tar.bz2) = cc1dbdc54760f3e7ded6ca6a717ee6da
-SHA256 (KDE/kdeplasma-addons-4.3.5.tar.bz2) = b75f6fb618da099d2c73f81dc65ea49b59e0485b5a3e44bfce2076ee217cb53a
-SIZE (KDE/kdeplasma-addons-4.3.5.tar.bz2) = 1451610
+MD5 (KDE/kdeplasma-addons-4.4.3.tar.bz2) = e347d1ca1f1e3100e838287365de43e4
+SHA256 (KDE/kdeplasma-addons-4.4.3.tar.bz2) = 275d60b32ffa878be97ccd34070ee23e89c6642ba39a4dd4b11c210c3a39f902
+SIZE (KDE/kdeplasma-addons-4.4.3.tar.bz2) = 1645196
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index cc01d1ce93ff..cbeb4bce0314 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -1,9 +1,5 @@
+%%SCIM%%bin/kimpanel
 bin/lancelot
-include/conversion/converter.h
-include/conversion/plasmaconversion_export.h
-include/conversion/unit.h
-include/conversion/unitcategory.h
-include/conversion/value.h
 include/lancelot/Global.h
 include/lancelot/lancelot.h
 include/lancelot/lancelot_export.h
@@ -26,17 +22,22 @@ include/lancelot/widgets/PopupList.h
 include/lancelot/widgets/PopupMenu.h
 include/lancelot/widgets/ResizeBordersPanel.h
 include/lancelot/widgets/Widget.h
+lib/kde4/kcm_krunner_audioplayercontrol.so
 lib/kde4/kcm_krunner_spellcheck.so
+lib/kde4/krunner_audioplayercontrol.so
 lib/kde4/krunner_browserhistory.so
 lib/kde4/krunner_contacts.so
 lib/kde4/krunner_converter.so
 lib/kde4/krunner_katesessions.so
 lib/kde4/krunner_konquerorsessions.so
 lib/kde4/krunner_konsolesessions.so
+lib/kde4/krunner_kopete.so
+lib/kde4/krunner_mediawiki.so
 lib/kde4/krunner_spellcheckrunner.so
 lib/kde4/plasma-applet_systemloadviewer.so
 lib/kde4/plasma_applet_bball.so
 lib/kde4/plasma_applet_binaryclock.so
+lib/kde4/plasma_applet_blackboard.so
 lib/kde4/plasma_applet_bubblemon.so
 lib/kde4/plasma_applet_calculator.so
 lib/kde4/plasma_applet_charselect.so
@@ -48,6 +49,9 @@ lib/kde4/plasma_applet_fileWatcher.so
 lib/kde4/plasma_applet_frame.so
 lib/kde4/plasma_applet_fuzzy_clock.so
 lib/kde4/plasma_applet_incomingmsg.so
+%%OBSERVATORY%%lib/kde4/plasma_applet_kdeobservatory.so
+%%SCIM%%lib/kde4/plasma_applet_kimpanel.so
+lib/kde4/plasma_applet_knowledgebase.so
 lib/kde4/plasma_applet_kolourpicker.so
 lib/kde4/plasma_applet_konqprofiles.so
 lib/kde4/plasma_applet_konsoleprofiles.so
@@ -63,21 +67,27 @@ lib/kde4/plasma_applet_news.so
 lib/kde4/plasma_applet_notes.so
 lib/kde4/plasma_applet_nowplaying.so
 lib/kde4/plasma_applet_opendesktop.so
+lib/kde4/plasma_applet_opendesktop_activities.so
 lib/kde4/plasma_applet_paste.so
 lib/kde4/plasma_applet_pastebin.so
+lib/kde4/plasma_applet_plasmaboard.so
 lib/kde4/plasma_applet_previewer.so
+lib/kde4/plasma_applet_qalculate.so
 lib/kde4/plasma_applet_rssnow.so
 lib/kde4/plasma_applet_rtm.so
 lib/kde4/plasma_applet_showdashboard.so
 lib/kde4/plasma_applet_showdesktop.so
+lib/kde4/plasma_applet_spellcheck.so
 lib/kde4/plasma_applet_timer.so
 lib/kde4/plasma_applet_unitconverter.so
 lib/kde4/plasma_applet_weather.so
 lib/kde4/plasma_applet_weatherstation.so
+lib/kde4/plasma_applet_webslice.so
 lib/kde4/plasma_comic_krossprovider.so
 lib/kde4/plasma_engine_comic.so
 lib/kde4/plasma_engine_microblog.so
 lib/kde4/plasma_engine_ocs.so
+lib/kde4/plasma_engine_pastebin.so
 lib/kde4/plasma_engine_potd.so
 lib/kde4/plasma_engine_rtm.so
 lib/kde4/plasma_packagestructure_comic.so
@@ -91,15 +101,11 @@ lib/kde4/plasma_wallpaper_mandelbrot.so
 lib/kde4/plasma_wallpaper_pattern.so
 lib/kde4/plasma_wallpaper_virus.so
 lib/kde4/plasma_wallpaper_weather.so
-lib/libconversion.so
-lib/libconversion.so.5
-lib/libconversion.so.5.0.1
+%%SCIM%%lib/libkimpanelruntime.so
+%%SCIM%%lib/libkimpanelruntime.so.0
 lib/liblancelot.so
 lib/liblancelot.so.0
-lib/liblancelot.so.0.7.0
-lib/libocsclient.so
-lib/libocsclient.so.5
-lib/libocsclient.so.5.0.1
+lib/liblancelot.so.1.7.0
 lib/libplasmacomicprovidercore.so
 lib/libplasmacomicprovidercore.so.1
 lib/libplasmacomicprovidercore.so.1.0.0
@@ -115,7 +121,6 @@ lib/librtm.so.5.0.1
 share/apps/bball/bball.svgz
 share/apps/bball/bounce.ogg
 share/apps/bball/football.svgz
-share/apps/cmake/modules/FindConversion.cmake
 share/apps/desktoptheme/Aya/lancelot/action-list-view-categories-applet.svgz
 share/apps/desktoptheme/Aya/lancelot/action-list-view-categories-extender.svgz
 share/apps/desktoptheme/Aya/lancelot/action-list-view-categories.svgz
@@ -155,15 +160,15 @@ share/apps/desktoptheme/Silicon/lancelot/system-buttons-extender.svgz
 share/apps/desktoptheme/Silicon/lancelot/system-buttons.svgz
 share/apps/desktoptheme/Silicon/lancelot/theme.config
 share/apps/desktoptheme/default/bubblemon/bubble.svg
-share/apps/desktoptheme/default/fifteenPuzzle/greensquare.svgz
+share/apps/desktoptheme/default/fifteenPuzzle/blanksquare.svg
 share/apps/desktoptheme/default/lancelot/action-list-view-categories-extender.svgz
 share/apps/desktoptheme/default/lancelot/action-list-view-categories.svgz
+share/apps/desktoptheme/default/lancelot/action-list-view-drop-indicator.svgz
 share/apps/desktoptheme/default/lancelot/action-list-view-headers.svgz
 share/apps/desktoptheme/default/lancelot/action-list-view-items-extender.svgz
 share/apps/desktoptheme/default/lancelot/action-list-view-items.svgz
 share/apps/desktoptheme/default/lancelot/extender-button-icon.svgz
 share/apps/desktoptheme/default/lancelot/inner-background.svgz
-share/apps/desktoptheme/default/lancelot/main-background.svgz
 share/apps/desktoptheme/default/lancelot/passageway-view-buttons-extender.svgz
 share/apps/desktoptheme/default/lancelot/passageway-view-buttons.svgz
 share/apps/desktoptheme/default/lancelot/passageway-view-inactivebuttons.svgz
@@ -246,22 +251,41 @@ share/apps/desktoptheme/slim-glow/lancelot/system-buttons.svgz
 share/apps/desktoptheme/slim-glow/lancelot/theme.config
 share/apps/lancelot/lancelot.notifyrc
 share/apps/plasma-applet-frame/picture-frame-default.jpg
+share/apps/plasma-applet-opendesktop-activities/plasma-applet-opendesktop-activities.notifyrc
 share/apps/plasma-applet-opendesktop/user.css
+share/apps/plasma/services/ocsPerson.operations
+share/apps/plasma/services/pastebin.operations
 share/apps/plasma/services/rtmauth.operations
 share/apps/plasma/services/rtmtask.operations
 share/apps/plasma/services/rtmtasks.operations
 share/apps/plasma/services/tweet.operations
 share/apps/plasma_pastebin/plasma_pastebin.notifyrc
+share/apps/plasma_wallpaper_pattern/patterns/bees.desktop
+share/apps/plasma_wallpaper_pattern/patterns/bees.png
+share/apps/plasma_wallpaper_pattern/patterns/celtic.desktop
+share/apps/plasma_wallpaper_pattern/patterns/celtic.png
+share/apps/plasma_wallpaper_pattern/patterns/eastern_blues.desktop
+share/apps/plasma_wallpaper_pattern/patterns/eastern_blues.png
 share/apps/plasma_wallpaper_pattern/patterns/fish.desktop
 share/apps/plasma_wallpaper_pattern/patterns/fish.png
 share/apps/plasma_wallpaper_pattern/patterns/flowers.desktop
 share/apps/plasma_wallpaper_pattern/patterns/flowers.png
+share/apps/plasma_wallpaper_pattern/patterns/french.desktop
+share/apps/plasma_wallpaper_pattern/patterns/french.png
+share/apps/plasma_wallpaper_pattern/patterns/ivory_coast.desktop
+share/apps/plasma_wallpaper_pattern/patterns/ivory_coast.png
+share/apps/plasma_wallpaper_pattern/patterns/lineage.desktop
+share/apps/plasma_wallpaper_pattern/patterns/lineage.png
 share/apps/plasma_wallpaper_pattern/patterns/night-rock.desktop
 share/apps/plasma_wallpaper_pattern/patterns/night-rock.jpg
 share/apps/plasma_wallpaper_pattern/patterns/pavement.desktop
 share/apps/plasma_wallpaper_pattern/patterns/pavement.png
+share/apps/plasma_wallpaper_pattern/patterns/persism.desktop
+share/apps/plasma_wallpaper_pattern/patterns/persism.png
 share/apps/plasma_wallpaper_pattern/patterns/rattan.desktop
 share/apps/plasma_wallpaper_pattern/patterns/rattan.png
+share/apps/plasma_wallpaper_pattern/patterns/stars.desktop
+share/apps/plasma_wallpaper_pattern/patterns/stars.png
 share/apps/plasma_wallpaper_pattern/patterns/stonewall2.desktop
 share/apps/plasma_wallpaper_pattern/patterns/stonewall2.png
 share/apps/plasma_wallpaper_pattern/patterns/triangles.desktop
@@ -269,35 +293,47 @@ share/apps/plasma_wallpaper_pattern/patterns/triangles.png
 share/apps/plasma_wallpaper_pattern/patterns/xeroxstar.desktop
 share/apps/plasma_wallpaper_pattern/patterns/xeroxstar.png
 share/apps/rssnow/feeds
+%%SCIM%%share/config.kcfg/kimpanelconfig.kcfg
 share/config/comic.knsrc
+share/config/plasmaweather.knsrc
 share/config/virus_wallpaper.knsrc
+%%SCIM%%share/dbus-1/interfaces/org.kde.impanel.xml
 share/dbus-1/services/org.kde.lancelot.service
 share/icons/hicolor/128x128/apps/bball.png
+%%OBSERVATORY%%share/icons/hicolor/128x128/apps/kdeobservatory.png
 share/icons/hicolor/128x128/apps/lancelot-part.png
 share/icons/hicolor/128x128/apps/lancelot.png
 share/icons/hicolor/128x128/apps/previewer.png
 share/icons/hicolor/16x16/apps/bball.png
+%%OBSERVATORY%%share/icons/hicolor/16x16/apps/kdeobservatory.png
 share/icons/hicolor/16x16/apps/lancelot-part.png
 share/icons/hicolor/16x16/apps/lancelot.png
 share/icons/hicolor/16x16/apps/previewer.png
+%%OBSERVATORY%%share/icons/hicolor/22x22/apps/kdeobservatory.png
 share/icons/hicolor/22x22/apps/lancelot-part.png
 share/icons/hicolor/22x22/apps/lancelot.png
 share/icons/hicolor/22x22/apps/previewer.png
 share/icons/hicolor/32x32/apps/bball.png
+%%OBSERVATORY%%share/icons/hicolor/32x32/apps/kdeobservatory.png
 share/icons/hicolor/32x32/apps/lancelot-part.png
 share/icons/hicolor/32x32/apps/lancelot.png
 share/icons/hicolor/32x32/apps/previewer.png
 share/icons/hicolor/48x48/apps/bball.png
+%%OBSERVATORY%%share/icons/hicolor/48x48/apps/kdeobservatory.png
 share/icons/hicolor/48x48/apps/lancelot-part.png
 share/icons/hicolor/48x48/apps/lancelot.png
 share/icons/hicolor/48x48/apps/previewer.png
 share/icons/hicolor/64x64/apps/bball.png
+%%OBSERVATORY%%share/icons/hicolor/64x64/apps/kdeobservatory.png
 share/icons/hicolor/64x64/apps/lancelot-part.png
 share/icons/hicolor/64x64/apps/lancelot.png
 share/icons/hicolor/64x64/apps/previewer.png
 share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
 share/icons/hicolor/scalable/apps/bball.svgz
 share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
+%%OBSERVATORY%%share/icons/hicolor/scalable/apps/kdeobservatory.svgz
+share/icons/oxygen/128x128/apps/qalculate-applet.png
+share/icons/oxygen/48x48/apps/qalculate-applet.png
 share/kde4/services/ServiceMenus/preview.desktop
 share/kde4/services/apodprovider.desktop
 share/kde4/services/browserhistory.desktop
@@ -309,12 +345,16 @@ share/kde4/services/konsolesessions.desktop
 share/kde4/services/oseiprovider.desktop
 share/kde4/services/plasma-applet-bball.desktop
 share/kde4/services/plasma-applet-binaryclock.desktop
+share/kde4/services/plasma-applet-blackboard.desktop
 share/kde4/services/plasma-applet-bubblemon.desktop
 share/kde4/services/plasma-applet-calculator.desktop
 share/kde4/services/plasma-applet-charselect.desktop
 share/kde4/services/plasma-applet-eyes.desktop
 share/kde4/services/plasma-applet-fifteenPuzzle.desktop
 share/kde4/services/plasma-applet-incomingmsg.desktop
+%%OBSERVATORY%%share/kde4/services/plasma-applet-kdeobservatory.desktop
+%%SCIM%%share/kde4/services/plasma-applet-kimpanel.desktop
+share/kde4/services/plasma-applet-knowledgebase.desktop
 share/kde4/services/plasma-applet-konqprofiles.desktop
 share/kde4/services/plasma-applet-konsoleprofiles.desktop
 share/kde4/services/plasma-applet-lancelot-launcher.desktop
@@ -327,19 +367,23 @@ share/kde4/services/plasma-applet-mediaplayer.desktop
 share/kde4/services/plasma-applet-microblog.desktop
 share/kde4/services/plasma-applet-news.desktop
 share/kde4/services/plasma-applet-nowplaying.desktop
+share/kde4/services/plasma-applet-opendesktop-activities.desktop
 share/kde4/services/plasma-applet-opendesktop.desktop
 share/kde4/services/plasma-applet-paste.desktop
 share/kde4/services/plasma-applet-pastebin.desktop
 share/kde4/services/plasma-applet-previewer.desktop
+share/kde4/services/plasma-applet-qalculate.desktop
 share/kde4/services/plasma-applet-rememberthemilk.desktop
 share/kde4/services/plasma-applet-rssnow.desktop
 share/kde4/services/plasma-applet-showdashboard.desktop
 share/kde4/services/plasma-applet-showdesktop.desktop
+share/kde4/services/plasma-applet-spellcheck.desktop
 share/kde4/services/plasma-applet-systemloadviewer.desktop
 share/kde4/services/plasma-applet-timer.desktop
 share/kde4/services/plasma-applet-unitconverter.desktop
 share/kde4/services/plasma-applet-weather.desktop
 share/kde4/services/plasma-applet-weatherstation.desktop
+share/kde4/services/plasma-applet-webslice.desktop
 share/kde4/services/plasma-clock-fuzzy.desktop
 share/kde4/services/plasma-comic-default.desktop
 share/kde4/services/plasma-dataengine-comic.desktop
@@ -347,21 +391,29 @@ share/kde4/services/plasma-dataengine-microblog.desktop
 share/kde4/services/plasma-dataengine-ocs.desktop
 share/kde4/services/plasma-dataengine-potd.desktop
 share/kde4/services/plasma-dict-default.desktop
+share/kde4/services/plasma-engine-pastebin.desktop
 share/kde4/services/plasma-engine-rtm.desktop
 share/kde4/services/plasma-fileWatcher-default.desktop
 share/kde4/services/plasma-frame-default.desktop
 share/kde4/services/plasma-kolourpicker-default.desktop
 share/kde4/services/plasma-notes-default.desktop
 share/kde4/services/plasma-packagestructure-comic.desktop
+share/kde4/services/plasma-runner-audioplayercontrol.desktop
+share/kde4/services/plasma-runner-audioplayercontrol_config.desktop
 share/kde4/services/plasma-runner-contacts.desktop
 share/kde4/services/plasma-runner-converter.desktop
+share/kde4/services/plasma-runner-kopete.desktop
 share/kde4/services/plasma-runner-spellchecker.desktop
 share/kde4/services/plasma-runner-spellchecker_config.desktop
+share/kde4/services/plasma-runner-techbase.desktop
+share/kde4/services/plasma-runner-wikipedia.desktop
+share/kde4/services/plasma-runner-wikitravel.desktop
 share/kde4/services/plasma-wallpaper-mandelbrot.desktop
 %%MARBLE%%share/kde4/services/plasma-wallpaper-marble.desktop
 share/kde4/services/plasma-wallpaper-pattern.desktop
 share/kde4/services/plasma-wallpaper-virus.desktop
 share/kde4/services/plasma-wallpaper-weather.desktop
+share/kde4/services/plasma_applet_plasmaboard.desktop
 share/kde4/services/wcpotdprovider.desktop
 share/kde4/servicetypes/plasma_comicprovider.desktop
 share/kde4/servicetypes/plasma_potdprovider.desktop
@@ -371,6 +423,7 @@ share/mime/packages/lancelotpart-mime.xml
 @dirrm share/apps/plasma_wallpaper_pattern
 @dirrm share/apps/plasma_pastebin
 @dirrm share/apps/plasma-applet-opendesktop
+@dirrm share/apps/plasma-applet-opendesktop-activities
 @dirrm share/apps/plasma-applet-frame
 @dirrm share/apps/lancelot
 @dirrm share/apps/desktoptheme/slim-glow/lancelot
@@ -400,6 +453,7 @@ share/mime/packages/lancelotpart-mime.xml
 @dirrm include/lancelot/models
 @dirrm include/lancelot/layouts
 @dirrm include/lancelot
-@dirrm include/conversion
 @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
+%%SCIM%%@cwd %%LOCALBASE%%
+%%SCIM%%lib/scim-1.0/scim-panel-dbus