From a0695f88d393ee773b1ed17856eb608db3ae8c2f Mon Sep 17 00:00:00 2001
From: mbr <mbr@FreeBSD.org>
Date: Sun, 3 Mar 2002 18:57:07 +0000
Subject: Our patch(1) does treat -b differently than Linux. This should fix
 the build.

---
 editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk    | 14 ++++++++++++++
 editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk  | 14 ++++++++++++++
 .../openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk  | 14 ++++++++++++++
 .../files/patch-solenv::inc::tg_ext.mk                     | 14 ++++++++++++++
 editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk    | 14 ++++++++++++++
 editors/openoffice-1.1/files/patch-solenv::inc::tg_ext.mk  | 14 ++++++++++++++
 .../openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk  | 14 ++++++++++++++
 .../files/patch-solenv::inc::tg_ext.mk                     | 14 ++++++++++++++
 .../openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk    | 14 ++++++++++++++
 .../openoffice-3-devel/files/patch-solenv::inc::tg_ext.mk  | 14 ++++++++++++++
 editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk      | 14 ++++++++++++++
 editors/openoffice-3/files/patch-solenv::inc::tg_ext.mk    | 14 ++++++++++++++
 editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk  | 14 ++++++++++++++
 .../openoffice-devel/files/patch-solenv::inc::tg_ext.mk    | 14 ++++++++++++++
 .../openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk    | 14 ++++++++++++++
 .../openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk  | 14 ++++++++++++++
 .../files/patch-solenv+inc+tg_ext.mk                       | 14 ++++++++++++++
 .../files/patch-solenv::inc::tg_ext.mk                     | 14 ++++++++++++++
 .../openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk    | 14 ++++++++++++++
 .../openoffice.org-1.1/files/patch-solenv::inc::tg_ext.mk  | 14 ++++++++++++++
 .../openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk   | 14 ++++++++++++++
 .../openoffice.org-2-RC/files/patch-solenv::inc::tg_ext.mk | 14 ++++++++++++++
 .../files/patch-solenv+inc+tg_ext.mk                       | 14 ++++++++++++++
 .../files/patch-solenv::inc::tg_ext.mk                     | 14 ++++++++++++++
 .../files/patch-solenv+inc+tg_ext.mk                       | 14 ++++++++++++++
 .../files/patch-solenv::inc::tg_ext.mk                     | 14 ++++++++++++++
 .../openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk    | 14 ++++++++++++++
 .../openoffice.org-2.0/files/patch-solenv::inc::tg_ext.mk  | 14 ++++++++++++++
 editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk  | 14 ++++++++++++++
 .../openoffice.org-2/files/patch-solenv::inc::tg_ext.mk    | 14 ++++++++++++++
 .../openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk   | 14 ++++++++++++++
 .../openoffice.org-3-RC/files/patch-solenv::inc::tg_ext.mk | 14 ++++++++++++++
 .../files/patch-solenv+inc+tg_ext.mk                       | 14 ++++++++++++++
 .../files/patch-solenv::inc::tg_ext.mk                     | 14 ++++++++++++++
 editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk  | 14 ++++++++++++++
 .../openoffice.org-3/files/patch-solenv::inc::tg_ext.mk    | 14 ++++++++++++++
 .../files/patch-solenv+inc+tg_ext.mk                       | 14 ++++++++++++++
 .../files/patch-solenv::inc::tg_ext.mk                     | 14 ++++++++++++++
 editors/openoffice/files/patch-solenv+inc+tg_ext.mk        | 14 ++++++++++++++
 editors/openoffice/files/patch-solenv::inc::tg_ext.mk      | 14 ++++++++++++++
 40 files changed, 560 insertions(+)
 create mode 100644 editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice-1.1-devel/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice-1.1/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice-2.0-devel/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice-3-devel/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice-3/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice-devel/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-1.1-devel/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-1.1/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-2-RC/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-2.0-devel/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-2.0/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-2/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-3-RC/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-3-devel/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-3/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-solenv::inc::tg_ext.mk
 create mode 100644 editors/openoffice/files/patch-solenv+inc+tg_ext.mk
 create mode 100644 editors/openoffice/files/patch-solenv::inc::tg_ext.mk

diff --git a/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-1.1-devel/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-1.1/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-1.1/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-2.0-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-2.0-devel/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-3-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-3-devel/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-3/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-3/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-3/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-3/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice-devel/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-1.1-devel/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-1.1/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-1.1/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2-RC/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-2-RC/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2.0-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2.0/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-2.0/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-2/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-2/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-3-RC/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-3-RC/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-3-devel/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-3-devel/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-3/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-3/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice.org-vcltesttool/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice.org-vcltesttool/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice/files/patch-solenv+inc+tg_ext.mk b/editors/openoffice/files/patch-solenv+inc+tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice/files/patch-solenv+inc+tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
diff --git a/editors/openoffice/files/patch-solenv::inc::tg_ext.mk b/editors/openoffice/files/patch-solenv::inc::tg_ext.mk
new file mode 100644
index 000000000000..194668e86748
--- /dev/null
+++ b/editors/openoffice/files/patch-solenv::inc::tg_ext.mk
@@ -0,0 +1,14 @@
+--- ../solenv/inc/tg_ext.mk.orig	Sun Mar  3 19:47:04 2002
++++ ../solenv/inc/tg_ext.mk	Sun Mar  3 19:47:08 2002
+@@ -148,7 +148,11 @@
+ .IF "$(BSCLIENT)"=="TRUE"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | $(GNUPATCH) -f -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
+ .ELSE           # "$(BSCLIENT)"!=""
++.IF "$(OS)"=="FREEBSD"
+ 	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -b -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ELSE
++	+cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATCH_FILE_NAME) | patch -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
++.ENDIF
+ .ENDIF          # "$(BSCLIENT)"!=""
+ .ENDIF          # "$(GUI)"=="WNT"
+ .ENDIF			# "$(PATCH_FILE_NAME)"=="none" ||	"$(PATCH_FILE_NAME)"==""
-- 
cgit