From f81d78cc8292e7fd7d21b40ee7dde0a28459d115 Mon Sep 17 00:00:00 2001
From: Maho Nakata <maho@FreeBSD.org>
Date: Wed, 11 Aug 2004 08:45:55 +0000
Subject: Better support for SDK, and now have IZ #24142.

---
 .../files/patch-odk+configure.pl                   | 44 ++++++++++++++++++++++
 .../files/patch-odk+setsdkenv_unix.in              |  2 +
 .../files/patch-odk+settings+settings.mk           |  2 +
 .../openoffice-1.1/files/patch-odk+configure.pl    | 44 ++++++++++++++++++++++
 .../files/patch-odk+setsdkenv_unix.in              |  2 +
 .../files/patch-odk+settings+settings.mk           |  2 +
 .../files/patch-odk+configure.pl                   | 44 ++++++++++++++++++++++
 .../files/patch-odk+setsdkenv_unix.in              |  2 +
 .../files/patch-odk+settings+settings.mk           |  2 +
 .../files/patch-odk+configure.pl                   | 44 ++++++++++++++++++++++
 .../files/patch-odk+setsdkenv_unix.in              |  2 +
 .../files/patch-odk+settings+settings.mk           |  2 +
 12 files changed, 192 insertions(+)
 create mode 100644 editors/openoffice-1.1-devel/files/patch-odk+configure.pl
 create mode 100644 editors/openoffice-1.1/files/patch-odk+configure.pl
 create mode 100644 editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl
 create mode 100644 editors/openoffice.org-1.1/files/patch-odk+configure.pl

(limited to 'editors')

diff --git a/editors/openoffice-1.1-devel/files/patch-odk+configure.pl b/editors/openoffice-1.1-devel/files/patch-odk+configure.pl
new file mode 100644
index 000000000000..eeebf346c600
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-odk+configure.pl
@@ -0,0 +1,44 @@
+#IZ Not raised yet. this is very ad hoc patch...
+
+Index: configure.pl
+===================================================================
+RCS file: /cvs/api/odk/configure.pl,v
+retrieving revision 1.4.12.3
+diff -u -r1.4.12.3 configure.pl
+--- ../odk/configure.pl	18 May 2004 10:02:00 -0000	1.4.12.3
++++ ../configure.pl	11 Aug 2004 08:21:04 -0000
+@@ -19,7 +19,7 @@
+ chop ($main::OFFICE_HOME_SUGGESTION);
+ 
+ $main::OO_SDK_MAKE_HOME = "";
+-$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
++$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
+ $main::makeVersion = "3.79.1";
+ $main::correctVersion = 0;
+ 
+@@ -101,7 +101,7 @@
+ # prepare GNU make path
+ while ( (!$main::correctVersion) &&
+ 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
+-		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
++		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake"))) )
+ {
+     print "Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
+     $main::OO_SDK_MAKE_HOME = <STDIN>;
+@@ -111,14 +111,14 @@
+ 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
+     }
+     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
+-		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
++		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake")) )
+     { 
+ 		$main::OO_SDK_MAKE_HOME = "";
+ 		print "Error: GNU make is required, please specify a GNU make tools directory.\n";
+     } else 
+     {
+ 		#check version
+-		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
++		my $testVersion = `$OO_SDK_MAKE_HOME/gmake --version`;
+ 		if ( $testVersion eq "")
+ 		{
+ 			print "The 'make' command found at $main::OO_SDK_MAKE_HOME/make is not GNU Make\n";
diff --git a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
index f3178e703ab9..dbcad91a1fb4 100644
--- a/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
+++ b/editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=24142
+
 --- ../odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
 +++ ../odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
 @@ -2,7 +2,8 @@
diff --git a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
index 1a645d01abf1..22fd7fd2f816 100644
--- a/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
+++ b/editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=24142
+
 --- ../odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
 +++ ../odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
 @@ -368,3 +368,85 @@
diff --git a/editors/openoffice-1.1/files/patch-odk+configure.pl b/editors/openoffice-1.1/files/patch-odk+configure.pl
new file mode 100644
index 000000000000..eeebf346c600
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-odk+configure.pl
@@ -0,0 +1,44 @@
+#IZ Not raised yet. this is very ad hoc patch...
+
+Index: configure.pl
+===================================================================
+RCS file: /cvs/api/odk/configure.pl,v
+retrieving revision 1.4.12.3
+diff -u -r1.4.12.3 configure.pl
+--- ../odk/configure.pl	18 May 2004 10:02:00 -0000	1.4.12.3
++++ ../configure.pl	11 Aug 2004 08:21:04 -0000
+@@ -19,7 +19,7 @@
+ chop ($main::OFFICE_HOME_SUGGESTION);
+ 
+ $main::OO_SDK_MAKE_HOME = "";
+-$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
++$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
+ $main::makeVersion = "3.79.1";
+ $main::correctVersion = 0;
+ 
+@@ -101,7 +101,7 @@
+ # prepare GNU make path
+ while ( (!$main::correctVersion) &&
+ 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
+-		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
++		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake"))) )
+ {
+     print "Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
+     $main::OO_SDK_MAKE_HOME = <STDIN>;
+@@ -111,14 +111,14 @@
+ 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
+     }
+     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
+-		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
++		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake")) )
+     { 
+ 		$main::OO_SDK_MAKE_HOME = "";
+ 		print "Error: GNU make is required, please specify a GNU make tools directory.\n";
+     } else 
+     {
+ 		#check version
+-		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
++		my $testVersion = `$OO_SDK_MAKE_HOME/gmake --version`;
+ 		if ( $testVersion eq "")
+ 		{
+ 			print "The 'make' command found at $main::OO_SDK_MAKE_HOME/make is not GNU Make\n";
diff --git a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in b/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in
index f3178e703ab9..dbcad91a1fb4 100644
--- a/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in
+++ b/editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=24142
+
 --- ../odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
 +++ ../odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
 @@ -2,7 +2,8 @@
diff --git a/editors/openoffice-1.1/files/patch-odk+settings+settings.mk b/editors/openoffice-1.1/files/patch-odk+settings+settings.mk
index 1a645d01abf1..22fd7fd2f816 100644
--- a/editors/openoffice-1.1/files/patch-odk+settings+settings.mk
+++ b/editors/openoffice-1.1/files/patch-odk+settings+settings.mk
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=24142
+
 --- ../odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
 +++ ../odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
 @@ -368,3 +368,85 @@
diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl b/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl
new file mode 100644
index 000000000000..eeebf346c600
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl
@@ -0,0 +1,44 @@
+#IZ Not raised yet. this is very ad hoc patch...
+
+Index: configure.pl
+===================================================================
+RCS file: /cvs/api/odk/configure.pl,v
+retrieving revision 1.4.12.3
+diff -u -r1.4.12.3 configure.pl
+--- ../odk/configure.pl	18 May 2004 10:02:00 -0000	1.4.12.3
++++ ../configure.pl	11 Aug 2004 08:21:04 -0000
+@@ -19,7 +19,7 @@
+ chop ($main::OFFICE_HOME_SUGGESTION);
+ 
+ $main::OO_SDK_MAKE_HOME = "";
+-$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
++$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
+ $main::makeVersion = "3.79.1";
+ $main::correctVersion = 0;
+ 
+@@ -101,7 +101,7 @@
+ # prepare GNU make path
+ while ( (!$main::correctVersion) &&
+ 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
+-		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
++		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake"))) )
+ {
+     print "Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
+     $main::OO_SDK_MAKE_HOME = <STDIN>;
+@@ -111,14 +111,14 @@
+ 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
+     }
+     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
+-		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
++		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake")) )
+     { 
+ 		$main::OO_SDK_MAKE_HOME = "";
+ 		print "Error: GNU make is required, please specify a GNU make tools directory.\n";
+     } else 
+     {
+ 		#check version
+-		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
++		my $testVersion = `$OO_SDK_MAKE_HOME/gmake --version`;
+ 		if ( $testVersion eq "")
+ 		{
+ 			print "The 'make' command found at $main::OO_SDK_MAKE_HOME/make is not GNU Make\n";
diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in
index f3178e703ab9..dbcad91a1fb4 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in
+++ b/editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=24142
+
 --- ../odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
 +++ ../odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
 @@ -2,7 +2,8 @@
diff --git a/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk b/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk
index 1a645d01abf1..22fd7fd2f816 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk
+++ b/editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=24142
+
 --- ../odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
 +++ ../odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
 @@ -368,3 +368,85 @@
diff --git a/editors/openoffice.org-1.1/files/patch-odk+configure.pl b/editors/openoffice.org-1.1/files/patch-odk+configure.pl
new file mode 100644
index 000000000000..eeebf346c600
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-odk+configure.pl
@@ -0,0 +1,44 @@
+#IZ Not raised yet. this is very ad hoc patch...
+
+Index: configure.pl
+===================================================================
+RCS file: /cvs/api/odk/configure.pl,v
+retrieving revision 1.4.12.3
+diff -u -r1.4.12.3 configure.pl
+--- ../odk/configure.pl	18 May 2004 10:02:00 -0000	1.4.12.3
++++ ../configure.pl	11 Aug 2004 08:21:04 -0000
+@@ -19,7 +19,7 @@
+ chop ($main::OFFICE_HOME_SUGGESTION);
+ 
+ $main::OO_SDK_MAKE_HOME = "";
+-$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("make");
++$main::OO_SDK_MAKE_HOME_SUGGESTION = searchprog("gmake");
+ $main::makeVersion = "3.79.1";
+ $main::correctVersion = 0;
+ 
+@@ -101,7 +101,7 @@
+ # prepare GNU make path
+ while ( (!$main::correctVersion) &&
+ 		((! -d "$main::OO_SDK_MAKE_HOME" ) ||
+-		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make"))) )
++		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake"))) )
+ {
+     print "Enter GNU make ($main::makeVersion or higher) tools directory [$main::OO_SDK_MAKE_HOME_SUGGESTION]: ";
+     $main::OO_SDK_MAKE_HOME = <STDIN>;
+@@ -111,14 +111,14 @@
+ 		$main::OO_SDK_MAKE_HOME = $main::OO_SDK_MAKE_HOME_SUGGESTION;
+     }
+     if ( (! -d "$main::OO_SDK_MAKE_HOME") || 
+-		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/make")) )
++		 ((-d "$main::OO_SDK_MAKE_HOME") && (! -e "$main::OO_SDK_MAKE_HOME/gmake")) )
+     { 
+ 		$main::OO_SDK_MAKE_HOME = "";
+ 		print "Error: GNU make is required, please specify a GNU make tools directory.\n";
+     } else 
+     {
+ 		#check version
+-		my $testVersion = `$OO_SDK_MAKE_HOME/make --version`;
++		my $testVersion = `$OO_SDK_MAKE_HOME/gmake --version`;
+ 		if ( $testVersion eq "")
+ 		{
+ 			print "The 'make' command found at $main::OO_SDK_MAKE_HOME/make is not GNU Make\n";
diff --git a/editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in b/editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in
index f3178e703ab9..dbcad91a1fb4 100644
--- a/editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in
+++ b/editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=24142
+
 --- ../odk/setsdkenv_unix.in	Sun Jan 25 18:41:01 2004
 +++ ../odk/setsdkenv_unix.in	Sun Jan 25 18:42:00 2004
 @@ -2,7 +2,8 @@
diff --git a/editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk b/editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk
index 1a645d01abf1..22fd7fd2f816 100644
--- a/editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk
+++ b/editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk
@@ -1,3 +1,5 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=24142
+
 --- ../odk/settings/settings.mk	Sun Jan 25 18:41:02 2004
 +++ ../odk/settings/settings.mk	Sun Jan 25 18:45:09 2004
 @@ -368,3 +368,85 @@
-- 
cgit v1.2.3