From 1a51eb4bf45e0ff35e1c51ba179d6e82c6daf964 Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Tue, 7 Jun 2011 09:04:30 +0000
Subject: [PATCH] Fix build with recent gmake.

Submitted by:	truckman
---
 editors/openoffice-3/files/patch-i114323     | 28 ++++++++++++++++++++
 editors/openoffice.org-3/files/patch-i114323 | 28 ++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 editors/openoffice-3/files/patch-i114323
 create mode 100644 editors/openoffice.org-3/files/patch-i114323

diff --git a/editors/openoffice-3/files/patch-i114323 b/editors/openoffice-3/files/patch-i114323
new file mode 100644
index 000000000000..8c6f167ef478
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i114323
@@ -0,0 +1,28 @@
+--- moz/makefile.mk.orig	2011-01-18 05:34:25.000000000 -0800
++++ moz/makefile.mk	2011-04-29 16:04:37.000000000 -0700
+@@ -86,7 +86,8 @@
+     patches/dtoa.patch \
+     patches/respect_disable_pango.patch \
+     patches/arm_build_fix.patch \
+-    patches/link_fontconfig.patch
++    patches/link_fontconfig.patch \
++    patches/brokenmakefile.patch
+ 
+ # This file is needed for the W32 build when BUILD_MOZAB is set
+ # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
+--- /dev/null	2011-04-29 16:00:00.000000000 -0700
++++ moz/patches/brokenmakefile.patch	2011-04-29 16:04:55.000000000 -0700
+@@ -0,0 +1,13 @@
++--- misc/mozilla/mailnews/extensions/smime/build/Makefile.in	2010-09-04 16:00:38.000000000 +0100
+++++ misc/build/mozilla/mailnews/extensions/smime/build/Makefile.in	2010-09-04 16:02:24.000000000 +0100
++@@ -79,10 +79,6 @@
++ 		$(DIST)/lib/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \
++ 		$(NULL)
++ 
++-ifndef MOZ_STATIC_MAIL_BUILD
++-SHARED_LIBRARY_LIBS + = $(DIST)/lib/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
++-endif
++-
++ EXTRA_DSO_LDOPTS = \
++ 		$(LIBS_DIR) \
++ 		$(EXTRA_DSO_LIBS) \
diff --git a/editors/openoffice.org-3/files/patch-i114323 b/editors/openoffice.org-3/files/patch-i114323
new file mode 100644
index 000000000000..8c6f167ef478
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-i114323
@@ -0,0 +1,28 @@
+--- moz/makefile.mk.orig	2011-01-18 05:34:25.000000000 -0800
++++ moz/makefile.mk	2011-04-29 16:04:37.000000000 -0700
+@@ -86,7 +86,8 @@
+     patches/dtoa.patch \
+     patches/respect_disable_pango.patch \
+     patches/arm_build_fix.patch \
+-    patches/link_fontconfig.patch
++    patches/link_fontconfig.patch \
++    patches/brokenmakefile.patch
+ 
+ # This file is needed for the W32 build when BUILD_MOZAB is set
+ # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
+--- /dev/null	2011-04-29 16:00:00.000000000 -0700
++++ moz/patches/brokenmakefile.patch	2011-04-29 16:04:55.000000000 -0700
+@@ -0,0 +1,13 @@
++--- misc/mozilla/mailnews/extensions/smime/build/Makefile.in	2010-09-04 16:00:38.000000000 +0100
+++++ misc/build/mozilla/mailnews/extensions/smime/build/Makefile.in	2010-09-04 16:02:24.000000000 +0100
++@@ -79,10 +79,6 @@
++ 		$(DIST)/lib/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \
++ 		$(NULL)
++ 
++-ifndef MOZ_STATIC_MAIL_BUILD
++-SHARED_LIBRARY_LIBS + = $(DIST)/lib/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
++-endif
++-
++ EXTRA_DSO_LDOPTS = \
++ 		$(LIBS_DIR) \
++ 		$(EXTRA_DSO_LIBS) \