Better patch, using OPTIONS.
Tested with kdeedu4 installed and running configure, shows correct output for both options. -- Mel
Index: deskutils/kdeplasma-addons/files/patch-CMakeLists.txt =================================================================== --- deskutils/kdeplasma-addons/files/patch-CMakeLists.txt (revision 5360) +++ deskutils/kdeplasma-addons/files/patch-CMakeLists.txt (working copy) @@ -1,7 +1,25 @@ ---- ./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 @@ - endif (DEPEND_PACKAGE_Marble) +--- CMakeLists.txt.orig 2009-04-05 12:00:39.000000000 -0800 ++++ CMakeLists.txt 2009-09-15 03:07:18.000000000 -0800 +@@ -18,24 +18,33 @@ + macro_log_feature(NEPOMUK_FOUND "Nepomuk" "Handles all kinds of metadata on the KDE desktop to provide a semantic desktop" "http://nepomuk.kde.org/"; FALSE "" "STRONGLY_RECOMMENDED: Nepomuk is used to provide metadata on objects like files, emails etc. to provide a semantic desktop.") + macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK) + +-macro_optional_depend_package(Marble "Marble") +-if (DEPEND_PACKAGE_Marble) +- macro_optional_find_package(Marble) +-else (DEPEND_PACKAGE_Marble) ++if (DONT_DEPEND_PACKAGE_Marble) + set (MARBLE_FOUND FALSE) +-endif (DEPEND_PACKAGE_Marble) ++ set (DEPEND_PACKAGE_Marble FALSE) ++else (DONT_DEPEND_PACKAGE_Marble) ++ macro_optional_depend_package(Marble "Marble") ++ if (DEPEND_PACKAGE_Marble) ++ macro_optional_find_package(Marble) ++ else (DEPEND_PACKAGE_Marble) ++ set (MARBLE_FOUND FALSE) ++ endif (DEPEND_PACKAGE_Marble) ++endif(DONT_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.") -if (NEPOMUK_FOUND) Index: deskutils/kdeplasma-addons/pkg-plist =================================================================== --- deskutils/kdeplasma-addons/pkg-plist (revision 5360) +++ deskutils/kdeplasma-addons/pkg-plist (working copy) @@ -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 Index: deskutils/kdeplasma-addons/Makefile =================================================================== --- deskutils/kdeplasma-addons/Makefile (revision 5360) +++ deskutils/kdeplasma-addons/Makefile (working copy) @@ -16,9 +16,9 @@ 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 @@ -27,8 +27,24 @@ designer network svg qtestlib xml \ qmake_build moc_build rcc_build uic_build +.if exists(${KDE4_PREFIX}/lib/libmarblewidget.so.5) +OPTIONS= MARBLE "Build desktop marble (requires Kdeedu)" on +.else +OPTIONS= MARBLE "Build desktop marble (requires Kdeedu)" off +.endif + MAKE_JOBS_SAFE= yes +.include <bsd.port.pre.mk> +.if !defined(WITHOUT_MARBLE) +LIB_DEPENDS= marblewidget.5:${PORTSDIR}/misc/kdeedu4 +PLIST_SUB+= MARBLE="" +CMAKE_ARGS+= -DDONT_DEPEND_PACKAGE_Marble:BOOL=off +.else +CMAKE_ARGS+= -DDONT_DEPEND_PACKAGE_Marble:BOOL=on +PLIST_SUB+= MARBLE="@comment " +.endif + post-patch: ${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \ ${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt @@ -42,4 +58,4 @@ post-install: @-update-mime-database ${PREFIX}/share/mime -.include <bsd.port.mk> +.include <bsd.port.post.mk>
_______________________________________________ kde-freebsd mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
