aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2002-03-06 07:38:28 +0800
committermbr <mbr@FreeBSD.org>2002-03-06 07:38:28 +0800
commitd594ca511c4aa8de86d9d0e742de95466e0f706a (patch)
tree76197b3f2e696af74893b59218f0062d7fd7e228 /editors
parent313691c19b4f40187ba44ae99d04a79daf6c43b9 (diff)
downloadfreebsd-ports-gnome-d594ca511c4aa8de86d9d0e742de95466e0f706a.tar.gz
freebsd-ports-gnome-d594ca511c4aa8de86d9d0e742de95466e0f706a.tar.zst
freebsd-ports-gnome-d594ca511c4aa8de86d9d0e742de95466e0f706a.zip
Add missing #ifdef for FREEBSD
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.0/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice-1.0/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice-1.1-devel/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice-1.1/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice-1.1/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice-2.0-devel/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice-2.0-devel/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice-3/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice-3/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice-devel/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice-devel/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-1.0/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-1.1/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-1.1/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-2-RC/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-2-RC/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-2-devel/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-2-devel/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-2.0/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-2.0/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-2/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-2/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-3-RC/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-3-devel/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-3-devel/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-3/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-3/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-sal::workben::makefile.mk25
-rw-r--r--editors/openoffice/files/patch-sal+workben+makefile.mk25
-rw-r--r--editors/openoffice/files/patch-sal::workben::makefile.mk25
40 files changed, 320 insertions, 680 deletions
diff --git a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk b/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-1.0/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.0/files/patch-sal::workben::makefile.mk b/editors/openoffice-1.0/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-1.0/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice-1.0/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.1-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice-1.1-devel/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-1.1-devel/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice-1.1-devel/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.1/files/patch-sal+workben+makefile.mk b/editors/openoffice-1.1/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-1.1/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-1.1/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-1.1/files/patch-sal::workben::makefile.mk b/editors/openoffice-1.1/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-1.1/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice-1.1/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-2.0-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice-2.0-devel/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-2.0-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-2.0-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice-2.0-devel/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-2.0-devel/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice-2.0-devel/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice-3-devel/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3/files/patch-sal+workben+makefile.mk b/editors/openoffice-3/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-3/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-3/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-3/files/patch-sal::workben::makefile.mk b/editors/openoffice-3/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-3/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice-3/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice-devel/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice-devel/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice-devel/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice-devel/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice-devel/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-1.0/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.0/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-1.0/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-1.0/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-1.0/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-1.1/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-1.1/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-1.1/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-1.1/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-1.1/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-1.1/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2-RC/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2-RC/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2-RC/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2-RC/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-2-RC/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2-RC/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-2-RC/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2-devel/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-2-devel/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2-devel/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-2-devel/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-2.0-devel/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2.0/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2.0/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2.0/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-2.0/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2.0/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-2.0/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-2/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-2/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-2/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-2/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-2/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-2/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3-RC/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-3-RC/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-3-RC/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-3-RC/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3-devel/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-3-devel/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-3-devel/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3-devel/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-3-devel/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-3-devel/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-3-devel/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-3/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-3/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-3/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-3/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-3/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-3/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-3/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+workben+makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal::workben::makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice.org-vcltesttool/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice/files/patch-sal+workben+makefile.mk b/editors/openoffice/files/patch-sal+workben+makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice/files/patch-sal+workben+makefile.mk
+++ b/editors/openoffice/files/patch-sal+workben+makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------
diff --git a/editors/openoffice/files/patch-sal::workben::makefile.mk b/editors/openoffice/files/patch-sal::workben::makefile.mk
index 321952be1163..73dd2b1576ba 100644
--- a/editors/openoffice/files/patch-sal::workben::makefile.mk
+++ b/editors/openoffice/files/patch-sal::workben::makefile.mk
@@ -1,20 +1,11 @@
---- ../sal/workben/makefile.mk.orig Sun Mar 3 01:27:32 2002
-+++ ../sal/workben/makefile.mk Sun Mar 3 01:27:54 2002
-@@ -325,7 +325,7 @@
- # tgetpwnam
- #
- .IF "$(TESTAPP)" == "tgetpwnam"
--.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD"
-+.IF "$(OS)"=="SCO" || "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD"
+--- ../sal/workben/makefile.mk.orig Tue Mar 5 21:38:42 2002
++++ ../sal/workben/makefile.mk Tue Mar 5 21:39:11 2002
+@@ -113,7 +113,7 @@
- CXXFILES= tgetpwnam.cxx
- OBJFILES= $(OBJ)$/tgetpwnam.obj
-@@ -335,7 +335,7 @@
- APP5STDLIBS=$(SALLIB)
- APP5DEPN= $(SLB)$/sal.lib
+ .IF "$(TESTAPP)" == "salstattest"
--.ENDIF # (sco | netbsd)
-+.ENDIF # (sco | netbsd || freebsd)
- .ENDIF # tgetpwname
+- CFLAGS+= /DUSE_SAL_STATIC
++ CFLAGS+= -DUSE_SAL_STATIC
+
+ OBJFILES= $(OBJ)$/salstattest.obj
- # --- Targets ------------------------------------------------------