ports/142152: [patch] games/rigsofrods - unbreak build

Barbara barbara.xxx1975 at libero.it
Wed Dec 30 01:10:04 UTC 2009


>Number:         142152
>Category:       ports
>Synopsis:       [patch] games/rigsofrods - unbreak build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 30 01:10:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Barbara
>Release:        RELENG_7
>Organization:
>Environment:
FreeBSD satanasso.local.net 7.2-STABLE FreeBSD 7.2-STABLE #0: Fri Dec 23 16:46:17 CET 2009     root at satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO  i386

>Description:
Similarly to what I did for games/vavoom (ports/141410), I wrote a patch to fix the build of games/rigsofrods, broken with recent cmake (+wxgtk).
This could also impact ports/142123.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2009-12-13 00:50:06.000000000 +0100
+++ Makefile	2009-12-30 00:33:53.000000000 +0100
@@ -26,8 +26,6 @@
 RUN_DEPENDS=	${LOCALBASE}/lib/libOIS.so:${PORTSDIR}/devel/ois \
 		xset:${PORTSDIR}/x11/xset
 
-BROKEN=		does not build
-
 USE_ZIP=	yes
 USE_XORG=	x11 xt xaw sm ice xext
 WRKSRC=		${WRKDIR}/${PORTNAME}-source-${PORTVERSION}/build
@@ -79,6 +77,12 @@
 		${WRKSRC}/configurator/CMakeLists.txt
 .endif
 
+post-configure:
+#	@${REINPLACE_CMD} -e 's/-pthread;-D_THREAD_SAFE //; \
+	@${REINPLACE_CMD} -e 's/;-D_THREAD_SAFE//; \
+			s/-isystem /-I/g' \
+		${WRKSRC}/configurator/CMakeFiles/rorconfig.dir/flags.make
+
 do-install:
 # libs
 	${MKDIR} ${PREFIX}/lib/${PORTNAME}
--- files/patch-configurator-CMakeLists.txt.orig	2009-08-14 01:45:26.000000000 +0200
+++ files/patch-configurator-CMakeLists.txt	2009-12-30 00:06:42.000000000 +0100
@@ -1,6 +1,16 @@
---- configurator/CMakeLists.txt.orig	2009-06-25 22:30:12.000000000 +0400
-+++ configurator/CMakeLists.txt	2009-08-13 19:19:37.000000000 +0400
-@@ -27,9 +27,10 @@
+--- 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)
@@ -13,7 +23,7 @@
  
    SET(config_source ${config_source} ${RoR_SOURCE_DIR}/main/source/InputEngine.cpp)
  
-@@ -48,7 +49,7 @@
+@@ -48,7 +48,7 @@
  
    add_executable(rorconfig ${config_source} ${config_headers} ${config_res})
    TARGET_LINK_LIBRARIES(rorconfig ${wxWidgets_LIBRARIES} )


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list