ports/70443: [MAINTAINER] textproc/rtfx: fix build error under gcc 3.4.2

[Cheng-Lung Sung]

>Number:         70443
>Category:       ports
>Synopsis:       [MAINTAINER] textproc/rtfx: fix build error under gcc 3.4.2
>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:   Sat Aug 14 06:50:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Cheng-Lung Sung
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
FreeBSD @ Taiwan
>Environment:
System: FreeBSD FreeBSD.csie.NCTU.edu.tw 4.10-STABLE FreeBSD 4.10-STABLE #0: Sat May 29 08:18:00 CST 2004
>Description:
- fix build error under gcc 3.4.2
- rename bool variable to distinguish between bool and function

Added file(s):
- files/extra-patch-src::reference.h-gcc342
- files/extra-patch-src::sablo.h-gcc342

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- rtfx-0.9.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/rtfx/Makefile /home/clsung/rtfx/Makefile
--- /usr/ports/textproc/rtfx/Makefile	Thu Jul 29 22:53:55 2004
+++ /home/clsung/rtfx/Makefile	Sat Aug 14 14:46:12 2004
@@ -28,5 +28,9 @@
 post-patch:
 	@${REINPLACE_CMD} -e "s/
//g" ${WRKSRC}/src/xmlcomposer.cpp
 .endif
+.if ${OSVERSION} >= 502124
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src::reference.h-gcc342 \
+		${FILESDIR}/extra-patch-src::sablo.h-gcc342
+.endif
 
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/textproc/rtfx/files/extra-patch-src::reference.h-gcc342 /home/clsung/rtfx/files/extra-patch-src::reference.h-gcc342
--- /usr/ports/textproc/rtfx/files/extra-patch-src::reference.h-gcc342	Thu Jan  1 08:00:00 1970
+++ /home/clsung/rtfx/files/extra-patch-src::reference.h-gcc342	Sat Aug 14 14:42:04 2004
@@ -0,0 +1,15 @@
+--- src/reference.h.orig	Fri Jul 23 05:03:03 2004
++++ src/reference.h	Sat Aug 14 14:41:14 2004
+@@ -57,10 +57,10 @@
+ 		addref();
+ 	}
+ 
+-	Reference(C* ptr, bool addref)
++	Reference(C* ptr, bool has_addref)
+ 	{
+ 		m_ptr = ptr;
+-		if(addref)
++		if(has_addref)
+ 			addref();
+ 	}
+ 
diff -ruN --exclude=CVS /usr/ports/textproc/rtfx/files/extra-patch-src::sablo.h-gcc342 /home/clsung/rtfx/files/extra-patch-src::sablo.h-gcc342
--- /usr/ports/textproc/rtfx/files/extra-patch-src::sablo.h-gcc342	Thu Jan  1 08:00:00 1970
+++ /home/clsung/rtfx/files/extra-patch-src::sablo.h-gcc342	Sat Aug 14 14:43:04 2004
@@ -0,0 +1,15 @@
+--- src/sablo.h.orig	Sat Jul 24 12:18:06 2004
++++ src/sablo.h	Sat Aug 14 14:42:45 2004
+@@ -146,10 +146,10 @@
+ 				addref();
+ 			}
+ 
+-			Ref(C* ptr, bool addref)
++			Ref(C* ptr, bool has_addref)
+ 			{
+ 				m_ptr = ptr;
+-				if(addref)
++				if(has_addref)
+ 					addref();
+ 			}
+ 
--- rtfx-0.9.3.patch ends here ---

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