11 files changed, 17 insertions, 32 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 09c13aa097d6..a3a83a43504d 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -147,9 +147,6 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
-.if (${OSVERSION} >= 700042)
-EXTRA_PATCHES+=	${FILESDIR}/amd64-gcc42-workaround
-.endif
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
diff --git a/editors/openoffice-3-devel/files/amd64-gcc42-workaround b/editors/openoffice-3-devel/files/patch-i98714
index 01ace4ad728c..50cecadf6ede 100644
--- a/editors/openoffice-3-devel/files/amd64-gcc42-workaround
+++ b/editors/openoffice-3-devel/files/patch-i98714
@@ -7,7 +7,7 @@
 -# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
 -.IF "$(OUTPATH)"=="unxlngx6"
 +# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
-+.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6"
++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxfbsdi" || "$(OUTPATH)"=="unxlngx6"
  NOOPTFILES= \
  	$(SLO)$/qnametostr.obj
  .ENDIF
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 4a23b244a38f..844add380cf3 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -149,9 +149,6 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
-.if (${OSVERSION} >= 700042)
-EXTRA_PATCHES+=	${FILESDIR}/amd64-gcc42-workaround
-.endif
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
diff --git a/editors/openoffice-3/files/amd64-gcc42-workaround b/editors/openoffice-3/files/patch-i98714
index 01ace4ad728c..50cecadf6ede 100644
--- a/editors/openoffice-3/files/amd64-gcc42-workaround
+++ b/editors/openoffice-3/files/patch-i98714
@@ -7,7 +7,7 @@
 -# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
 -.IF "$(OUTPATH)"=="unxlngx6"
 +# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
-+.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6"
++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxfbsdi" || "$(OUTPATH)"=="unxlngx6"
  NOOPTFILES= \
  	$(SLO)$/qnametostr.obj
  .ENDIF
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 2e1d4cb9e0d3..a6d83141d679 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -151,9 +151,6 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
-.if (${OSVERSION} >= 700042)
-EXTRA_PATCHES+=	${FILESDIR}/amd64-gcc42-workaround
-.endif
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
diff --git a/editors/openoffice.org-3-RC/files/amd64-gcc42-workaround b/editors/openoffice.org-3-RC/files/patch-i98714
index 01ace4ad728c..50cecadf6ede 100644
--- a/editors/openoffice.org-3-RC/files/amd64-gcc42-workaround
+++ b/editors/openoffice.org-3-RC/files/patch-i98714
@@ -7,7 +7,7 @@
 -# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
 -.IF "$(OUTPATH)"=="unxlngx6"
 +# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
-+.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6"
++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxfbsdi" || "$(OUTPATH)"=="unxlngx6"
  NOOPTFILES= \
  	$(SLO)$/qnametostr.obj
  .ENDIF
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 09c13aa097d6..a3a83a43504d 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -147,9 +147,6 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
-.if (${OSVERSION} >= 700042)
-EXTRA_PATCHES+=	${FILESDIR}/amd64-gcc42-workaround
-.endif
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
diff --git a/editors/openoffice.org-3-devel/files/amd64-gcc42-workaround b/editors/openoffice.org-3-devel/files/patch-i98714
index 01ace4ad728c..50cecadf6ede 100644
--- a/editors/openoffice.org-3-devel/files/amd64-gcc42-workaround
+++ b/editors/openoffice.org-3-devel/files/patch-i98714
@@ -7,7 +7,7 @@
 -# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
 -.IF "$(OUTPATH)"=="unxlngx6"
 +# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
-+.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6"
++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxfbsdi" || "$(OUTPATH)"=="unxlngx6"
  NOOPTFILES= \
  	$(SLO)$/qnametostr.obj
  .ENDIF
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 4a23b244a38f..844add380cf3 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -149,9 +149,6 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
-.if (${OSVERSION} >= 700042)
-EXTRA_PATCHES+=	${FILESDIR}/amd64-gcc42-workaround
-.endif
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
diff --git a/editors/openoffice.org-3/files/amd64-gcc42-workaround b/editors/openoffice.org-3/files/amd64-gcc42-workaround
deleted file mode 100644
index 01ace4ad728c..000000000000
--- a/editors/openoffice.org-3/files/amd64-gcc42-workaround
+++ /dev/null
@@ -1,13 +0,0 @@
---- writerfilter/source/resourcemodel/makefile.mk.orig	2008-07-22 08:53:57.000000000 -0400
-+++ writerfilter/source/resourcemodel/makefile.mk	2008-09-03 12:26:09.000000000 -0400
-@@ -56,8 +56,8 @@
-     $(SLO)$/TagLogger.obj \
- 	$(SLO)$/WW8Analyzer.obj
- 
--# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
--.IF "$(OUTPATH)"=="unxlngx6"
-+# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
-+.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6"
- NOOPTFILES= \
- 	$(SLO)$/qnametostr.obj
- .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-i98714 b/editors/openoffice.org-3/files/patch-i98714
new file mode 100644
index 000000000000..50cecadf6ede
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i98714
@@ -0,0 +1,13 @@
+--- writerfilter/source/resourcemodel/makefile.mk.orig	2008-07-22 08:53:57.000000000 -0400
++++ writerfilter/source/resourcemodel/makefile.mk	2008-09-03 12:26:09.000000000 -0400
+@@ -56,8 +56,8 @@
+     $(SLO)$/TagLogger.obj \
+ 	$(SLO)$/WW8Analyzer.obj
+ 
+-# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
+-.IF "$(OUTPATH)"=="unxlngx6"
++# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxfbsdi" || "$(OUTPATH)"=="unxlngx6"
+ NOOPTFILES= \
+ 	$(SLO)$/qnametostr.obj
+ .ENDIF