Use stock gcc for FreeBSD 6.

8 files changed, 76 insertions, 22 deletions

diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index d688109b34b8..6f3d1c6f3d0e 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -106,11 +107,6 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_GCC=	4.2
-#following part should sync with ports/Mk/bsd.gcc.mk
-.if (${OSVERSION} >= 700042)
-CONFIGURE_ARGS+=	--with-system-stdlibs
-.endif
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
@@ -148,7 +144,9 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
 			--with-system-zlib				\
+			--with-system-stdlibs				\
 			--with-epm=internal
+
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
diff --git a/editors/openoffice.org-2-RC/files/patch-i91369 b/editors/openoffice.org-2-RC/files/patch-i91369
new file mode 100644
index 000000000000..f1de25ebdfad
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i91369
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.24
+diff -u -r1.24 makefile.mk
+--- store/util/makefile.mk	10 Apr 2008 14:23:47 -0000	1.24
++++ store/util/makefile.mk	30 Jun 2008 23:52:56 -0000
+@@ -78,7 +78,7 @@
+ .ELSE
+ .IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+-.ELIF "$(OS)"=="MACOSX"
++.ELIF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+ .IF "$(CCNUMVER)"<="000399999999"
+ SHL1STDLIBS+=	-lsupc++
+ .ENDIF # CCNUMVER
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 96ea44c634f6..0850893b4f1f 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
-PORTREVISION?=	3
+PORTREVISION?=	4
 PORTEPOCH?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -107,11 +107,6 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_GCC=	4.2
-#following part should sync with ports/Mk/bsd.gcc.mk
-.if (${OSVERSION} >= 700042)
-CONFIGURE_ARGS+=	--with-system-stdlibs
-.endif
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
@@ -153,7 +148,9 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
 			--with-system-zlib				\
+			--with-system-stdlibs				\
 			--with-epm=internal
+
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
diff --git a/editors/openoffice.org-2-devel/files/patch-i91369 b/editors/openoffice.org-2-devel/files/patch-i91369
new file mode 100644
index 000000000000..f1de25ebdfad
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i91369
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.24
+diff -u -r1.24 makefile.mk
+--- store/util/makefile.mk	10 Apr 2008 14:23:47 -0000	1.24
++++ store/util/makefile.mk	30 Jun 2008 23:52:56 -0000
+@@ -78,7 +78,7 @@
+ .ELSE
+ .IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+-.ELIF "$(OS)"=="MACOSX"
++.ELIF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+ .IF "$(CCNUMVER)"<="000399999999"
+ SHL1STDLIBS+=	-lsupc++
+ .ENDIF # CCNUMVER
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 7aaebb4e97fa..e2d58d7a5cf0 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -104,11 +105,6 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_GCC=	4.2
-#following part should sync with ports/Mk/bsd.gcc.mk
-.if (${OSVERSION} >= 700042)
-CONFIGURE_ARGS+=	--with-system-stdlibs
-.endif
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
@@ -146,7 +142,9 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
 			--with-system-zlib				\
+			--with-system-stdlibs				\
 			--with-epm=internal
+
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
diff --git a/editors/openoffice.org-2/files/patch-i91369 b/editors/openoffice.org-2/files/patch-i91369
new file mode 100644
index 000000000000..f1de25ebdfad
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-i91369
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.24
+diff -u -r1.24 makefile.mk
+--- store/util/makefile.mk	10 Apr 2008 14:23:47 -0000	1.24
++++ store/util/makefile.mk	30 Jun 2008 23:52:56 -0000
+@@ -78,7 +78,7 @@
+ .ELSE
+ .IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+-.ELIF "$(OS)"=="MACOSX"
++.ELIF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+ .IF "$(CCNUMVER)"<="000399999999"
+ SHL1STDLIBS+=	-lsupc++
+ .ENDIF # CCNUMVER
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 96ea44c634f6..0850893b4f1f 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	2.4.${SNAPDATE}
-PORTREVISION?=	3
+PORTREVISION?=	4
 PORTEPOCH?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
@@ -107,11 +107,6 @@ PKGNAMESUFFIX=		-${LANG_SUFFIX}
 
 RUN_DEPENDS+=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
-USE_GCC=	4.2
-#following part should sync with ports/Mk/bsd.gcc.mk
-.if (${OSVERSION} >= 700042)
-CONFIGURE_ARGS+=	--with-system-stdlibs
-.endif
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
 CCACHE_PREFIX=	ccache
@@ -153,7 +148,9 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
 			--with-system-zlib				\
+			--with-system-stdlibs				\
 			--with-epm=internal
+
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i91369 b/editors/openoffice.org-vcltesttool/files/patch-i91369
new file mode 100644
index 000000000000..f1de25ebdfad
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i91369
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.24
+diff -u -r1.24 makefile.mk
+--- store/util/makefile.mk	10 Apr 2008 14:23:47 -0000	1.24
++++ store/util/makefile.mk	30 Jun 2008 23:52:56 -0000
+@@ -78,7 +78,7 @@
+ .ELSE
+ .IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+-.ELIF "$(OS)"=="MACOSX"
++.ELIF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"
+ .IF "$(CCNUMVER)"<="000399999999"
+ SHL1STDLIBS+=	-lsupc++
+ .ENDIF # CCNUMVER