3 files changed, 20 insertions, 30 deletions

diff --git a/deskutils/kdeplasma-addons/Makefile b/deskutils/kdeplasma-addons/Makefile
index 8baa8d8c84a1..845033bc9fc9 100644
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@@ -16,24 +16,38 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Extra plasmoids for KDE4
 
 BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2
-LIB_DEPENDS=	marblewidget.5:${PORTSDIR}/misc/kdeedu4 \
-		kipi.6:${PORTSDIR}/graphics/kdegraphics4
+LIB_DEPENDS=	kipi.6:${PORTSDIR}/graphics/kdegraphics4
 
 USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
 KDE4_BUILDENV=	yes
 USE_BZIP2=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	corelib opengl dbus qt3support  webkit \
+QT_COMPONENTS=	corelib opengl dbus qt3support webkit \
 		designer network svg qtestlib xml \
 		qmake_build moc_build rcc_build uic_build
 
 MAKE_JOBS_SAFE=	yes
 
+OPTIONS=	MARBLE "Marble globe wallpaper for Plasma" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_MARBLE)
+PLIST_SUB+=	MARBLE="@comment "
+.else
+LIB_DEPENDS+=	marblewidget.5:${PORTSDIR}/misc/kdeedu4
+PLIST_SUB+=	MARBLE=""
+.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
 	#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' \
@@ -42,4 +56,4 @@ pre-configure:
 post-install:
 	@-update-mime-database ${PREFIX}/share/mime
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt b/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt
deleted file mode 100644
index 32ede91bbbe7..000000000000
--- a/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./applets/frame/CMakeLists.txt.orig	2009-05-15 04:26:59.000000000 +1100
-+++ ./applets/frame/CMakeLists.txt	2009-06-26 10:37:04.000000000 +1100
-@@ -1,7 +1,20 @@
- project(plasma-frame)
- include (MacroLogFeature)
-+include (FindPkgConfig)
-+
-+# Check for KExiv2
-+PKG_CHECK_MODULES(LIBKEXIV2 libkexiv2-kde4>=0.5.0)
-+FIND_PATH(KEXIV2_INCLUDE_DIR NAMES libkexiv2/version.h
-+  PATHS ${LIBKEXIV2_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
-+FIND_LIBRARY(KEXIV2_LIBRARY NAMES kexiv2
-+  PATHS ${LIBKEXIV2_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH)
-+
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KEXIV2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR)
-+
-+IF(KEXIV2_FOUND)
-+  SET(KEXIV2_LIBRARIES ${KEXIV2_LIBRARY})
-+ENDIF(KEXIV2_FOUND)
- 
--macro_optional_find_package(Kexiv2)
- macro_log_feature(KEXIV2_FOUND "libkexiv2" "Library to access EXIF information" "http://www.kde.org" FALSE "0.2.0" "RECOMENDED: Enables automatic rotation for frame applet" )
- 
- macro_display_feature_log()
diff --git a/deskutils/kdeplasma-addons/pkg-plist b/deskutils/kdeplasma-addons/pkg-plist
index 75dd4a649ef8..23d55d8ed84c 100644
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@@ -87,7 +87,7 @@ lib/kde4/plasma_potd_flickrprovider.so
 lib/kde4/plasma_potd_oseiprovider.so
 lib/kde4/plasma_potd_wcpotdprovider.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
@@ -358,7 +358,7 @@ share/kde4/services/plasma-runner-converter.desktop
 share/kde4/services/plasma-runner-spellchecker.desktop
 share/kde4/services/plasma-runner-spellchecker_config.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