Attachment #102368 for bug #142152

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

Lines 26-33 Link Here

(-)Makefile (-2 / +6 lines)
26	RUN_DEPENDS= ${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois \	26	RUN_DEPENDS= ${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois \
27	xset:${PORTSDIR}/x11/xset	27	xset:${PORTSDIR}/x11/xset
28		28
29	BROKEN= does not build
30
31	USE_ZIP= yes	29	USE_ZIP= yes
32	USE_XORG= x11 xt xaw sm ice xext	30	USE_XORG= x11 xt xaw sm ice xext
33	WRKSRC= ${WRKDIR}/${PORTNAME}-source-${PORTVERSION}/build	31	WRKSRC= ${WRKDIR}/${PORTNAME}-source-${PORTVERSION}/build
Lines 79-84 Link Here
79	${WRKSRC}/configurator/CMakeLists.txt	77	${WRKSRC}/configurator/CMakeLists.txt
80	.endif	78	.endif
81		79
		80	post-configure:
		81	# @${REINPLACE_CMD} -e 's/-pthread;-D_THREAD_SAFE //; \
		82	@${REINPLACE_CMD} -e 's/;-D_THREAD_SAFE//; \
		83	s/-isystem /-I/g' \
		84	${WRKSRC}/configurator/CMakeFiles/rorconfig.dir/flags.make
		85
82	do-install:	86	do-install:
83	# libs	87	# libs
84	${MKDIR} ${PREFIX}/lib/${PORTNAME}	88	${MKDIR} ${PREFIX}/lib/${PORTNAME}




--- configurator/CMakeLists.txt.orig	2009-06-25 22:30:12.000000000 +0200
+++ configurator/CMakeLists.txt	2009-12-30 00:04:55.000000000 +0100
@@ -12,8 +12,7 @@
 
 FIND_PACKAGE(wxWidgets COMPONENTS base core html net)
 IF(wxWidgets_FOUND)
-  include_directories(${wxWidgets_INCLUDE_DIRS})
-  add_definitions(${wxWidgets_DEFINITIONS} ${wxWidgets_CXX_FLAGS})
+  include(${wxWidgets_USE_FILE})
 
   IF(WIN32)
     include_directories(${wxWidgets_INCLUDE_DIRS}/msvc)
@@ -27,9 +26,10 @@
   link_directories (${wxWidgets_LIB_DIR})
   include_directories (${RoR_Dependencies_SOURCE_DIR}/rorserver-sf/source)
   include_directories (${RoR_Dependencies_SOURCE_DIR}/ogrenew/OgreMain/include)

 
   SET(config_source ${config_source} ${RoR_SOURCE_DIR}/main/source/InputEngine.cpp)
 
@@ -48,7 +48,7 @@
 
   add_executable(rorconfig ${config_source} ${config_headers} ${config_res})
   TARGET_LINK_LIBRARIES(rorconfig ${wxWidgets_LIBRARIES} )

Return to bug 142152

Lines 1-6 Link Here

(-)files/patch-configurator-CMakeLists.txt (-4 / +14 lines)
1	--- configurator/CMakeLists.txt.orig 2009-06-25 22:30:12.000000000 +0400	1	--- configurator/CMakeLists.txt.orig 2009-06-25 22:30:12.000000000 +0200
2	+++ configurator/CMakeLists.txt 2009-08-13 19:19:37.000000000 +0400	2	+++ configurator/CMakeLists.txt 2009-12-30 00:04:55.000000000 +0100
3	@@ -27,9 +27,10 @@	3	@@ -12,8 +12,7 @@
		4
		5	FIND_PACKAGE(wxWidgets COMPONENTS base core html net)
		6	IF(wxWidgets_FOUND)
		7	- include_directories(${wxWidgets_INCLUDE_DIRS})
		8	- add_definitions(${wxWidgets_DEFINITIONS} ${wxWidgets_CXX_FLAGS})
		9	+ include(${wxWidgets_USE_FILE})
		10
		11	IF(WIN32)
		12	include_directories(${wxWidgets_INCLUDE_DIRS}/msvc)
		13	@@ -27,9 +26,10 @@
4	link_directories (${wxWidgets_LIB_DIR})	14	link_directories (${wxWidgets_LIB_DIR})
5	include_directories (${RoR_Dependencies_SOURCE_DIR}/rorserver-sf/source)	15	include_directories (${RoR_Dependencies_SOURCE_DIR}/rorserver-sf/source)
6	include_directories (${RoR_Dependencies_SOURCE_DIR}/ogrenew/OgreMain/include)	16	include_directories (${RoR_Dependencies_SOURCE_DIR}/ogrenew/OgreMain/include)
Lines 13-19 Link Here
13		23
14	SET(config_source ${config_source} ${RoR_SOURCE_DIR}/main/source/InputEngine.cpp)	24	SET(config_source ${config_source} ${RoR_SOURCE_DIR}/main/source/InputEngine.cpp)
15		25
16	@@ -48,7 +49,7 @@	26	@@ -48,7 +48,7 @@
17		27
18	add_executable(rorconfig ${config_source} ${config_headers} ${config_res})	28	add_executable(rorconfig ${config_source} ${config_headers} ${config_res})
19	TARGET_LINK_LIBRARIES(rorconfig ${wxWidgets_LIBRARIES} )	29	TARGET_LINK_LIBRARIES(rorconfig ${wxWidgets_LIBRARIES} )