summaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2002-03-07 15:32:52 +0000
committermbr <mbr@FreeBSD.org>2002-03-07 15:32:52 +0000
commit28a487361858b2193c3dca8363e6f7b82f7788ee (patch)
tree6a9a653c5ffae2106ba1c9baf6837554f58116b2 /editors
parente1b35fe16bc0d8e1dae359d533d3527cb44b23c0 (diff)
downloadFreeBSD-ports-28a487361858b2193c3dca8363e6f7b82f7788ee.zip
FreeBSD-ports-28a487361858b2193c3dca8363e6f7b82f7788ee.tar.gz
Add include path $STLPORT_inc_stlport for FreeBSD too and remove a second
instance of this include path.
Diffstat (limited to 'editors')
-rw-r--r--editors/openoffice-1.0/files/patch-config_office+set_soenv.134
-rw-r--r--editors/openoffice-1.0/files/patch-set_soenv.134
-rw-r--r--editors/openoffice-1.1-devel/files/patch-set_soenv.134
-rw-r--r--editors/openoffice-1.1/files/patch-set_soenv.134
-rw-r--r--editors/openoffice-2.0-devel/files/patch-set_soenv.134
-rw-r--r--editors/openoffice-3-devel/files/patch-set_soenv.134
-rw-r--r--editors/openoffice-3/files/patch-set_soenv.134
-rw-r--r--editors/openoffice-devel/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-1.0/files/patch-config_office+set_soenv.134
-rw-r--r--editors/openoffice.org-1.0/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-1.1/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-2-RC/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-2-devel/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-2.0/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-2/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-3-RC/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-3-devel/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-3/files/patch-set_soenv.134
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-set_soenv.134
-rw-r--r--editors/openoffice/files/patch-config_office+set_soenv.134
-rw-r--r--editors/openoffice/files/patch-set_soenv.134
23 files changed, 736 insertions, 46 deletions
diff --git a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
+++ b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice-1.0/files/patch-set_soenv.1 b/editors/openoffice-1.0/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice-1.0/files/patch-set_soenv.1
+++ b/editors/openoffice-1.0/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice-1.1-devel/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice-1.1-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-1.1-devel/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice-1.1/files/patch-set_soenv.1 b/editors/openoffice-1.1/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice-1.1/files/patch-set_soenv.1
+++ b/editors/openoffice-1.1/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice-2.0-devel/files/patch-set_soenv.1 b/editors/openoffice-2.0-devel/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice-2.0-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-2.0-devel/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice-3-devel/files/patch-set_soenv.1 b/editors/openoffice-3-devel/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice-3-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-3-devel/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice-3/files/patch-set_soenv.1 b/editors/openoffice-3/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice-3/files/patch-set_soenv.1
+++ b/editors/openoffice-3/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice-devel/files/patch-set_soenv.1 b/editors/openoffice-devel/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice-devel/files/patch-set_soenv.1
+++ b/editors/openoffice-devel/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
+++ b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-1.0/files/patch-set_soenv.1 b/editors/openoffice.org-1.0/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-1.0/files/patch-set_soenv.1
+++ b/editors/openoffice.org-1.0/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
+++ b/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-1.1/files/patch-set_soenv.1 b/editors/openoffice.org-1.1/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-1.1/files/patch-set_soenv.1
+++ b/editors/openoffice.org-1.1/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-2-RC/files/patch-set_soenv.1 b/editors/openoffice.org-2-RC/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-2-RC/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2-RC/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-2-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2-devel/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-2-devel/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2-devel/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-2.0/files/patch-set_soenv.1 b/editors/openoffice.org-2.0/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-2.0/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2.0/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-2/files/patch-set_soenv.1 b/editors/openoffice.org-2/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-2/files/patch-set_soenv.1
+++ b/editors/openoffice.org-2/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-3-RC/files/patch-set_soenv.1 b/editors/openoffice.org-3-RC/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-3-RC/files/patch-set_soenv.1
+++ b/editors/openoffice.org-3-RC/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-3-devel/files/patch-set_soenv.1 b/editors/openoffice.org-3-devel/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-3-devel/files/patch-set_soenv.1
+++ b/editors/openoffice.org-3-devel/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-3/files/patch-set_soenv.1 b/editors/openoffice.org-3/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-3/files/patch-set_soenv.1
+++ b/editors/openoffice.org-3/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1 b/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
+++ b/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice/files/patch-config_office+set_soenv.1 b/editors/openoffice/files/patch-config_office+set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice/files/patch-config_office+set_soenv.1
+++ b/editors/openoffice/files/patch-config_office+set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
diff --git a/editors/openoffice/files/patch-set_soenv.1 b/editors/openoffice/files/patch-set_soenv.1
index 96793da..7fc4bc5 100644
--- a/editors/openoffice/files/patch-set_soenv.1
+++ b/editors/openoffice/files/patch-set_soenv.1
@@ -1,5 +1,5 @@
---- set_soenv.1.orig Tue Nov 20 18:26:33 2001
-+++ set_soenv.1 Tue Mar 5 00:12:09 2002
+--- set_soenv.1.orig Thu Mar 7 16:23:57 2002
++++ set_soenv.1 Thu Mar 7 16:24:14 2002
@@ -954,7 +954,7 @@
$ps.$USR.$LIB.
$ps.$USR_LOCAL.$BIN;
@@ -32,3 +32,33 @@
elsif ($platform eq "$Winnt")
{ $COMPATH_ROOT = $COMPATH;
$COMPATH_ROOT =~ s/\/vc98$//;
+@@ -1067,25 +1083,19 @@
+ {
+ $SOLARINC .= $I.$USR.$INCLUDE.
+ $STLPORT_stlport;
+-if ($platform eq "$Linux")
+-{
+-# This simply adds an include path, so even cases that break the FHS work
+-$SOLARINC .= $STLPORT_inc_stlport;
+-}
++
+ if ($platform eq "$Solaris")
+ {
+ $SOLARINC .= '/SC5 ';
+-}
+-# Platform dependent include path at the top of this list of include paths
+-if ($platform eq "$Solaris")
+-{ $SOLARINC .= $I.'$COMPATH'.$ds."include";
++$SOLARINC .= $I.'$COMPATH'.$ds."include";
+ }
+
+-if ($platform eq "$Linux")
++if (($platform eq "$Linux") or ($platform eq "$FreeBSD"))
+ {
+ # This simply adds an include path, so even cases that break the FHS work
+ $SOLARINC .= $STLPORT_inc_stlport;
+ }
++
+ $SOLARINC .= $I.'$SOLARENV'.$INC.$ds."Xp31".
+ $I.'$JAVA_HOME'.$INCLUDE;
+
OpenPOWER on IntegriCloud