ports/163577: graphics/ogre3d fails to build when textproc/tinyxml is installed

[Pawel Pekala]

>Number:         163577
>Category:       ports
>Synopsis:       graphics/ogre3d fails to build when textproc/tinyxml is installed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 23 21:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Pawel Pekala
>Release:        FreeBSD 8.2-STABLE
>Organization:
>Environment:
FreeBSD blaviken.slowicza.org 8.2-STABLE FreeBSD 8.2-STABLE #1: Sun Jul  3 15:11:21 CEST 2011     corn at blaviken.slowicza.org:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Looks like ogre3d has it's own copy of tinyxml in tree. While
building there is a clash between header files and build fails.
Attached patch fixes issue for me.


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/graphics/ogre3d/Makefile ./Makefile
--- /usr/ports/graphics/ogre3d/Makefile	2011-12-17 15:50:13.000000000 +0100
+++ ./Makefile	2011-12-23 18:30:56.000000000 +0100
@@ -58,6 +58,10 @@
 	@${REINPLACE_CMD} -e '\
 		s,defined(__x86_64__),& || defined(__powerpc__) || defined(__ia64__) || defined(__sparc64__) || defined(__alpha__) || defined(__amd64__),' \
 		${WRKSRC}/OgreMain/include/OgrePlatform.h
+	@${REINPLACE_CMD} -e 's|tinyxml.h|../include/tinyxml.h|' \
+		${WRKSRC}/Tools/XMLConverter/src/tinyxml.cpp \
+		${WRKSRC}/Tools/XMLConverter/src/tinyxmlerror.cpp \
+		${WRKSRC}/Tools/XMLConverter/src/tinyxmlparser.cpp
 
 post-install:
 .if !defined(NOPORTDOCS)


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