diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-27 21:51:52 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-27 21:51:52 +0000 |
commit | 5ced43a6b572f48aaedecb54000235c9afbd76bd (patch) | |
tree | f8bc0a8af391fc3d5c2d4ba95c02c6b63fe882c7 /editors | |
parent | - Update to 2.58 (diff) |
Add "bsd" include path to SOLARINC too.
Notes
Notes:
svn path=/head/; revision=77553
Diffstat (limited to 'editors')
17 files changed, 68 insertions, 51 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-config_office+set_soenv.in b/editors/openoffice-1.1-devel/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice-1.1-devel/files/patch-config_office+set_soenv.in +++ b/editors/openoffice-1.1-devel/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice-1.1/files/patch-config_office+set_soenv.in b/editors/openoffice-1.1/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice-1.1/files/patch-config_office+set_soenv.in +++ b/editors/openoffice-1.1/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in b/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in +++ b/editors/openoffice-2.0-devel/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in b/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in +++ b/editors/openoffice-3-devel/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice-3/files/patch-config_office+set_soenv.in b/editors/openoffice-3/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice-3/files/patch-config_office+set_soenv.in +++ b/editors/openoffice-3/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice-devel/files/patch-config_office+set_soenv.in b/editors/openoffice-devel/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice-devel/files/patch-config_office+set_soenv.in +++ b/editors/openoffice-devel/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-1.1-devel/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-1.1/files/patch-config_office+set_soenv.in b/editors/openoffice.org-1.1/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-1.1/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-1.1/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-2-RC/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-2-devel/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-2.0-devel/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-2.0/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-2/files/patch-config_office+set_soenv.in b/editors/openoffice.org-2/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-2/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-2/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-3-RC/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-3-devel/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-3/files/patch-config_office+set_soenv.in b/editors/openoffice.org-3/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-3/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-3/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") diff --git a/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in b/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in index 9ea6b11bdab2..b32a5fd6d5bd 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in +++ b/editors/openoffice.org-vcltesttool/files/patch-config_office+set_soenv.in @@ -1,5 +1,5 @@ ---- set_soenv.in.orig Thu Feb 27 15:12:36 2003 -+++ set_soenv.in Wed Mar 5 21:16:43 2003 +--- set_soenv.in.orig Thu Feb 27 14:12:36 2003 ++++ set_soenv.in Thu Mar 27 21:49:39 2003 @@ -52,7 +52,7 @@ #------------------------------------------------- # @@ -28,7 +28,7 @@ $WRAPCMD = ""; # Wrapper (only for winnt) # -@@ -1265,7 +1266,12 @@ +@@ -1265,7 +1266,13 @@ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; } elsif ($platform eq "$FreeBSD") @@ -38,6 +38,7 @@ + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux"; + } else { + $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd"; ++ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd"; + } } elsif ($platform eq "$NetBSD") |