Compiles again with system gcc on 5.x.

17 files changed, 34 insertions, 0 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2
 
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index a129abc524d8..464666f4c594 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -88,10 +88,12 @@ USE_LANG=	${LANG}
 
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
+.if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
 USE_GCC=3.3 # make no sense yet
 CC=  gcc33
 CXX= g++33
+.endif
 
 EXTRACT_ONLY=	oo_${PORTVERSION}_src_${SNAPDATE}.tar.bz2