[kde-freebsd] [patch] deskutils/kdeplasma-addons: Don't force kdeedu dependency

[Mel Flynn]

>Submitter-Id:  current-users
>Originator:    Mel Flynn
>Organization:  
>Confidential:  no 
>Synopsis:      [patch] deskutils/kdeplasma-addons: Don't force kdeedu dependency
>Severity:      non-critical
>Priority:      low
>Category:      ports
>Class:         change-request
>Release:       FreeBSD 8.0-BETA4 i386
>Environment:
System: FreeBSD smoochies.rachie.is-a-geek.net 8.0-BETA4 FreeBSD 8.0-BETA4 #14 r196875M: Mon Sep 7 18:00:45 CEST 2009 mel at smoochies.rachie.is-a-geek.net:/usr/obj/usr/src/sys/HPDV9000 i386


        
>Description:
deskutils/kdeplasma-addons forces dependency on the rather large package kdeedu,
yet the CMakeLists.txt supports it as optional.

Patch below doesn't change the default behavior, but allows user to set WITHOUT_KDEEDU
so that Kdeedu isn't pulled in.

>How-To-Repeat:
make -C /usr/ports/deskutils/kdeplasma-addons install

>Fix:

	

--- patch-deskutils__kdeplasma-addons-nomarble begins here ---
Index: deskutils/kdeplasma-addons/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/kdeplasma-addons/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- deskutils/kdeplasma-addons/Makefile	1 Sep 2009 22:19:27 -0000	1.14
+++ deskutils/kdeplasma-addons/Makefile	12 Sep 2009 12:53:23 -0000
@@ -16,8 +16,13 @@
 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
+.if exists(${KDE4_PREFIX}/lib/marblewidget.so) || !defined(WITHOUT_KDEEDU)
+LIB_DEPENDS+=	marblewidget.5:${PORTSDIR}/misc/kdeedu4
+PLIST_SUB+=	MARBLE=""
+.else
+PLIST_SUB+=	MARBLE="@comment "
+.endif
 
 USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
 KDE4_BUILDENV=	yes
Index: deskutils/kdeplasma-addons/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/deskutils/kdeplasma-addons/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- deskutils/kdeplasma-addons/pkg-plist	4 Aug 2009 21:13:38 -0000	1.3
+++ deskutils/kdeplasma-addons/pkg-plist	12 Sep 2009 12:53:46 -0000
@@ -87,7 +87,7 @@
 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-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
--- patch-deskutils__kdeplasma-addons-nomarble ends here ---