ports/114745: [devel/upp]: fix GCC 4.2 builds

[Matthias Sund]

>Number:         114745
>Category:       ports
>Synopsis:       [devel/upp]: fix GCC 4.2 builds
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 19 18:10:09 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Matthias Sund
>Release:        FreeBSD 6 stable
>Organization:
>Environment:
FreeBSD travelmate 6.2-STABLE FreeBSD 6.2-STABLE #1: Sat Jun 23 15:51:05 CEST 2007     masu at travelmate:/usr/obj/usr/src/sys/TRAVELMATE  i386
>Description:
Fixed build error when using GCC 4.2 where atomicity.h is located in ext instead of bits.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN upp_orig/Makefile upp/Makefile
--- upp_orig/Makefile	Thu Jul 19 20:04:20 2007
+++ upp/Makefile	Thu Jul 19 20:04:00 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	upp
 PORTVERSION=	2007.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -ruN upp_orig/files/patch-uppsrc-Core-Core.h upp/files/patch-uppsrc-Core-Core.h
--- upp_orig/files/patch-uppsrc-Core-Core.h	Thu Jan  1 01:00:00 1970
+++ upp/files/patch-uppsrc-Core-Core.h	Thu Jul 19 20:02:19 2007
@@ -0,0 +1,19 @@
+--- uppsrc/Core/Core.h.orig	Thu Jul 19 19:57:53 2007
++++ uppsrc/Core/Core.h	Thu Jul 19 19:59:16 2007
+@@ -300,8 +300,16 @@
+ #include <string>
+ 
+ #ifdef PLATFORM_POSIX
++#ifdef COMPILER_GCC
++#if __GNUC__ > 3
++#include <ext/atomicity.h>
++#else
++#include <bits/atomicity.h>
++#endif
++#else
+ #include <bits/atomicity.h>
+ #endif
++#endif
+ 
+ // fix MSC8 beta problem....
+ #ifdef COMPILER_MSC


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