sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add include path $STLPORT_inc_stlport for FreeBSD too and remove a second

Browse source 
instance of this include path.
This commit is contained in:
Martin Blapp 2002-03-07 15:32:52 +00:00
parent 848e771601
commit 69a1c8e79f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=55680
23 changed files with 736 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
editors/openoffice-1.0/files/patch-config_office+set_soenv.1
View file

@ -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;

34
editors/openoffice-1.0/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice-1.1-devel/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice-1.1/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice-2.0-devel/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice-3-devel/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice-3/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice-devel/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
View file

@ -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;

34
editors/openoffice.org-1.0/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-1.1/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-2-RC/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-2-devel/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-2.0/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-2/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-3-RC/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-3-devel/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-3/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
View file

@ -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;

34
editors/openoffice/files/patch-config_office+set_soenv.1
View file

@ -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;

34
editors/openoffice/files/patch-set_soenv.1
View file

@ -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;