4 files changed, 83 insertions, 26 deletions

diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 32d8f8805810..efb0162e790a 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -15,43 +15,52 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra plasmoids for KDE4
 
-BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2
-LIB_DEPENDS=	kexiv2:${PORTSDIR}/graphics/kdegraphics4 \
+LIB_DEPENDS=	kexiv2.10:${PORTSDIR}/graphics/libkexiv2-kde4 \
 		qalculate.5:${PORTSDIR}/math/libqalculate \
 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
-		marblewidget.11:${PORTSDIR}/astro/marble
+		soprano.4:${PORTSDIR}/textproc/soprano \
+		attica.0:${PORTSDIR}/x11-toolkits/attica \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		qca.2:${PORTSDIR}/devel/qca
+
+BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2
 
-USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
-KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
+USE_KDE4=	kdehier kdelibs kdeprefix pimlibs workspace \
+		akonadi sharedmime automoc4
+KDE4_BUILDENV=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl dbus qt3support webkit \
-		designer network svg qtestlib xml \
+QT_COMPONENTS=	dbus gui network opengl script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
-
+USE_XORG=	x11 xrender xtst
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	SCIM "Enable SCIM method input dialog" off
+OPTIONS=	MARBLE "Support for desktop globe wallpaper" on \
+		SCIM "Enable SCIM method input dialog" off
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_SCIM)
-PLIST_SUB+=	SCIM="@comment "
+.ifndef(WITHOUT_MARBLE)
+LIB_DEPENDS+=	marblewidget.12:${PORTSDIR}/astro/marble
+PLIST_SUB+=	MARBLE=""
 .else
+CMAKE_ARGS+=	-DWITH_Marble:BOOL=FALSE
+PLIST_SUB+=	MARBLE="@comment "
+.endif
+
+.ifdef(WITH_SCIM)
 LIB_DEPENDS+=	scim-1.0.10:${PORTSDIR}/textproc/scim
 PLIST_SUB+=	SCIM=""
+.else
+CMAKE_ARGS+=	-DWITH_SCIM:BOOL=FALSE
+PLIST_SUB+=	SCIM="@comment "
 .endif
 
 post-patch:
 	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
 		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
-
-.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' \
+	# Respect prefix, don't update MIME when installing.
+	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${WRKSRC}/applets/lancelot/parts/CMakeLists.txt
 
 post-install:
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index bdbdf1610f3b..33af8e5328d3 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeplasma-addons-4.6.5.tar.bz2) = 0852f3444706c518fc242d174a614ff7d54b1826c3e5f884b10fbc7fb0755925
-SIZE (KDE/kdeplasma-addons-4.6.5.tar.bz2) = 1936845
+SHA256 (KDE/kdeplasma-addons-4.7.2.tar.bz2) = 71956a99c943728696ba52bd7d0e165ae1d28f940da8c8676d79fdf18e1ec931
+SIZE (KDE/kdeplasma-addons-4.7.2.tar.bz2) = 1973434
diff --git a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
index 82a7ae93bac2..230221c017d4 100644
--- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
+++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./CMakeLists.txt.orig	2009-04-06 07:00:39.000000000 +1100
-+++ ./CMakeLists.txt	2009-06-26 11:00:58.000000000 +1100
-@@ -26,16 +26,20 @@
+--- ./CMakeLists.txt.orig	2011-05-21 07:37:49.000000000 +1100
++++ ./CMakeLists.txt	2011-08-15 14:56:28.177306481 +1100
+@@ -36,17 +36,21 @@
  endif (DEPEND_PACKAGE_Marble)
  macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.")
  
@@ -9,8 +9,9 @@
 -endif (NEPOMUK_FOUND)
 -
  add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 -include_directories (${KDE4_INCLUDES}
-+INCLUDE_DIRECTORIES (${QT_QTGUI_INCLUDE_DIR}
++include_directories (${QT_QTGUI_INCLUDE_DIR}
 +                     ${QT_QTCORE_INCLUDE_DIR}
 +                     ${QT_QTXML_INCLUDE_DIR}
 +                     ${PHONON_INCLUDE_DIR}
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index 3db327283360..c162fb73e499 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -179,7 +179,7 @@ lib/kde4/plasma_potd_wcpotdprovider.so
 lib/kde4/plasma_runner_datetime.so
 lib/kde4/plasma_runner_events.so
 lib/kde4/plasma_wallpaper_mandelbrot.so
-lib/kde4/plasma_wallpaper_marble.so
+%%MARBLE%%lib/kde4/plasma_wallpaper_marble.so
 lib/kde4/plasma_wallpaper_pattern.so
 lib/kde4/plasma_wallpaper_virus.so
 lib/kde4/plasma_wallpaper_weather.so
@@ -211,6 +211,19 @@ share/apps/bball/bounce.ogg
 share/apps/bball/football.svgz
 share/apps/cmake/modules/FindLancelot-Datamodels.cmake
 share/apps/cmake/modules/FindLancelot.cmake
+share/apps/desktoptheme/Androbit/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/Androbit/lancelot/category-triangle.svgz
+share/apps/desktoptheme/Androbit/lancelot/inner-background.svgz
+share/apps/desktoptheme/Androbit/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/Androbit/lancelot/lancelot-context.svgz
+share/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Androbit/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Androbit/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Androbit/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Androbit/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Androbit/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/Androbit/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Androbit/lancelot/theme.config
 share/apps/desktoptheme/Aya/lancelot/action-list-view-headers.svgz
 share/apps/desktoptheme/Aya/lancelot/category-triangle.svgz
 share/apps/desktoptheme/Aya/lancelot/inner-background.svgz
@@ -222,6 +235,32 @@ share/apps/desktoptheme/Aya/lancelot/section-buttons.svgz
 share/apps/desktoptheme/Aya/lancelot/system-buttons-extender.svgz
 share/apps/desktoptheme/Aya/lancelot/system-buttons.svgz
 share/apps/desktoptheme/Aya/lancelot/theme.config
+share/apps/desktoptheme/Produkt/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/Produkt/lancelot/category-triangle.svgz
+share/apps/desktoptheme/Produkt/lancelot/inner-background.svgz
+share/apps/desktoptheme/Produkt/lancelot/lancelot-context-extender.svgz
+share/apps/desktoptheme/Produkt/lancelot/lancelot-context.svgz
+share/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Produkt/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Produkt/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Produkt/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Produkt/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Produkt/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/Produkt/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Produkt/lancelot/theme.config
+share/apps/desktoptheme/Tibanna/lancelot/action-list-view-drop-indicator.svgz
+share/apps/desktoptheme/Tibanna/lancelot/action-list-view-headers.svgz
+share/apps/desktoptheme/Tibanna/lancelot/category-triangle.svgz
+share/apps/desktoptheme/Tibanna/lancelot/extender-button-icon.svgz
+share/apps/desktoptheme/Tibanna/lancelot/inner-background.svgz
+share/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons-extender.svgz
+share/apps/desktoptheme/Tibanna/lancelot/passageway-view-buttons.svgz
+share/apps/desktoptheme/Tibanna/lancelot/passageway-view-inactivebuttons.svgz
+share/apps/desktoptheme/Tibanna/lancelot/passageway-view-spacer.svgz
+share/apps/desktoptheme/Tibanna/lancelot/section-buttons.svgz
+share/apps/desktoptheme/Tibanna/lancelot/system-buttons-extender.svgz
+share/apps/desktoptheme/Tibanna/lancelot/system-buttons.svgz
+share/apps/desktoptheme/Tibanna/lancelot/theme.config
 share/apps/desktoptheme/default/bubblemon/bubble.svg
 share/apps/desktoptheme/default/fifteenPuzzle/blanksquare.svg
 share/apps/desktoptheme/default/lancelot/action-list-view-drop-indicator.svgz
@@ -249,6 +288,7 @@ share/apps/desktoptheme/default/widgets/eyes.svg
 share/apps/desktoptheme/default/widgets/luna.svgz
 share/apps/desktoptheme/default/widgets/microblog.svgz
 share/apps/desktoptheme/default/widgets/notes.svgz
+share/apps/desktoptheme/default/widgets/nowplaying/nocover.svgz
 share/apps/desktoptheme/default/widgets/previewer-16.svgz
 share/apps/desktoptheme/default/widgets/previewer-22.svgz
 share/apps/desktoptheme/default/widgets/timer.svgz
@@ -479,7 +519,7 @@ 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
-share/kde4/services/plasma-wallpaper-marble.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
@@ -503,6 +543,7 @@ share/mime/packages/lancelotpart-mime.xml
 @dirrmtry share/apps/desktoptheme/slim-glow
 @dirrm share/apps/desktoptheme/oxygen/lancelot
 @dirrmtry share/apps/desktoptheme/oxygen
+@dirrm share/apps/desktoptheme/default/widgets/nowplaying
 @dirrm share/apps/desktoptheme/default/weatherstation
 @dirrm share/apps/desktoptheme/default/weather
 @dirrm share/apps/desktoptheme/default/stylesheets
@@ -510,9 +551,15 @@ share/mime/packages/lancelotpart-mime.xml
 @dirrm share/apps/desktoptheme/default/lancelot
 @dirrm share/apps/desktoptheme/default/fifteenPuzzle
 @dirrm share/apps/desktoptheme/default/bubblemon
+@dirrm share/apps/desktoptheme/Tibanna/lancelot
+@dirrmtry share/apps/desktoptheme/Tibanna
+@dirrm share/apps/desktoptheme/Produkt/lancelot
+@dirrmtry share/apps/desktoptheme/Produkt
 @dirrmtry share/apps/desktoptheme/Clean-Bend
 @dirrm share/apps/desktoptheme/Aya/lancelot
 @dirrmtry share/apps/desktoptheme/Aya
+@dirrm share/apps/desktoptheme/Androbit/lancelot
+@dirrmtry share/apps/desktoptheme/Androbit
 @dirrmtry share/apps/cmake/modules
 @dirrmtry share/apps/cmake
 @dirrm share/apps/bball