Attachment #99641 for bug #138768

View | Details | Raw Unified | Return to bug 138768
Collapse All | Expand All




--- 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)

Lines 16-24 Link Here

(-)deskutils/kdeplasma-addons/Makefile (-3 / +19 lines)
16	COMMENT= Extra plasmoids for KDE4	16	COMMENT= Extra plasmoids for KDE4
17		17
18	BUILD_DEPENDS= eigen>=2.0.b3:${PORTSDIR}/math/eigen2	18	BUILD_DEPENDS= eigen>=2.0.b3:${PORTSDIR}/math/eigen2
19	LIB_DEPENDS= marblewidget.5:${PORTSDIR}/misc/kdeedu4 \	19	LIB_DEPENDS= kipi.6:${PORTSDIR}/graphics/kdegraphics4
20	kipi.6:${PORTSDIR}/graphics/kdegraphics4
21		20
		21
22	USE_KDE4= kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime	22	USE_KDE4= kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
23	KDE4_BUILDENV= yes	23	KDE4_BUILDENV= yes
24	USE_BZIP2= yes	24	USE_BZIP2= yes
Lines 27-34 Link Here
27	designer network svg qtestlib xml \	27	designer network svg qtestlib xml \
28	qmake_build moc_build rcc_build uic_build	28	qmake_build moc_build rcc_build uic_build
29		29
		30	.if exists(${KDE4_PREFIX}/lib/libmarblewidget.so.5)
		31	OPTIONS= MARBLE "Build desktop marble (requires Kdeedu)" on
		32	.else
		33	OPTIONS= MARBLE "Build desktop marble (requires Kdeedu)" off
		34	.endif
		35
30	MAKE_JOBS_SAFE= yes	36	MAKE_JOBS_SAFE= yes
31		37
		38	.include <bsd.port.pre.mk>
		39	.if !defined(WITHOUT_MARBLE)
		40	LIB_DEPENDS= marblewidget.5:${PORTSDIR}/misc/kdeedu4
		41	PLIST_SUB+= MARBLE=""
		42	CMAKE_ARGS+= -DDONT_DEPEND_PACKAGE_Marble:BOOL=off
		43	.else
		44	CMAKE_ARGS+= -DDONT_DEPEND_PACKAGE_Marble:BOOL=on
		45	PLIST_SUB+= MARBLE="@comment "
		46	.endif
		47
32	post-patch:	48	post-patch:
33	${GREP} -H -r "#include <q" ${WRKSRC} \| ${CUT} -d: -f1 \| uniq \| \	49	${GREP} -H -r "#include <q" ${WRKSRC} \| ${CUT} -d: -f1 \| uniq \| \
34	${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt	50	${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
Lines 42-45 Link Here
42	post-install:	58	post-install:
43	@-update-mime-database ${PREFIX}/share/mime	59	@-update-mime-database ${PREFIX}/share/mime
44		60
45	.include <bsd.port.mk>	61	.include <bsd.port.post.mk>

Return to bug 138768

Lines 1-7 Link Here

(-)deskutils/kdeplasma-addons/files/patch-CMakeLists.txt (-4 / +22 lines)
1	--- ./CMakeLists.txt.orig 2009-04-06 07:00:39.000000000 +1100	1	--- CMakeLists.txt.orig 2009-04-05 12:00:39.000000000 -0800
2	+++ ./CMakeLists.txt 2009-06-26 11:00:58.000000000 +1100	2	+++ CMakeLists.txt 2009-09-15 03:07:18.000000000 -0800
3	@@ -26,16 +26,20 @@	3	@@ -18,24 +18,33 @@
4	endif (DEPEND_PACKAGE_Marble)	4	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.")
		5	macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK)
		6
		7	-macro_optional_depend_package(Marble "Marble")
		8	-if (DEPEND_PACKAGE_Marble)
		9	- macro_optional_find_package(Marble)
		10	-else (DEPEND_PACKAGE_Marble)
		11	+if (DONT_DEPEND_PACKAGE_Marble)
		12	set (MARBLE_FOUND FALSE)
		13	-endif (DEPEND_PACKAGE_Marble)
		14	+ set (DEPEND_PACKAGE_Marble FALSE)
		15	+else (DONT_DEPEND_PACKAGE_Marble)
		16	+ macro_optional_depend_package(Marble "Marble")
		17	+ if (DEPEND_PACKAGE_Marble)
		18	+ macro_optional_find_package(Marble)
		19	+ else (DEPEND_PACKAGE_Marble)
		20	+ set (MARBLE_FOUND FALSE)
		21	+ endif (DEPEND_PACKAGE_Marble)
		22	+endif(DONT_DEPEND_PACKAGE_Marble)
5	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.")	23	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.")
6		24
7	-if (NEPOMUK_FOUND)	25	-if (NEPOMUK_FOUND)

Lines 87-93 Link Here

(-)deskutils/kdeplasma-addons/pkg-plist (-2 / +2 lines)
87	lib/kde4/plasma_potd_oseiprovider.so	87	lib/kde4/plasma_potd_oseiprovider.so
88	lib/kde4/plasma_potd_wcpotdprovider.so	88	lib/kde4/plasma_potd_wcpotdprovider.so
89	lib/kde4/plasma_wallpaper_mandelbrot.so	89	lib/kde4/plasma_wallpaper_mandelbrot.so
90	lib/kde4/plasma_wallpaper_marble.so	90	%%MARBLE%%lib/kde4/plasma_wallpaper_marble.so
91	lib/kde4/plasma_wallpaper_pattern.so	91	lib/kde4/plasma_wallpaper_pattern.so
92	lib/kde4/plasma_wallpaper_virus.so	92	lib/kde4/plasma_wallpaper_virus.so
93	lib/kde4/plasma_wallpaper_weather.so	93	lib/kde4/plasma_wallpaper_weather.so
Lines 358-364 Link Here
358	share/kde4/services/plasma-runner-spellchecker.desktop	358	share/kde4/services/plasma-runner-spellchecker.desktop
359	share/kde4/services/plasma-runner-spellchecker_config.desktop	359	share/kde4/services/plasma-runner-spellchecker_config.desktop
360	share/kde4/services/plasma-wallpaper-mandelbrot.desktop	360	share/kde4/services/plasma-wallpaper-mandelbrot.desktop
361	share/kde4/services/plasma-wallpaper-marble.desktop	361	%%MARBLE%%share/kde4/services/plasma-wallpaper-marble.desktop
362	share/kde4/services/plasma-wallpaper-pattern.desktop	362	share/kde4/services/plasma-wallpaper-pattern.desktop
363	share/kde4/services/plasma-wallpaper-virus.desktop	363	share/kde4/services/plasma-wallpaper-virus.desktop
364	share/kde4/services/plasma-wallpaper-weather.desktop	364	share/kde4/services/plasma-wallpaper-weather.desktop