mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-02 01:20:54 +00:00
Code Issues Releases Activity

Better support for SDK, and now have IZ #24142.

Browse Source
This commit is contained in:
Maho Nakata 2004-08-11 08:45:55 +00:00
parent c2bc614f66
commit f81d78cc82
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=115905
12 changed files with 192 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
editors/openoffice-1.1-devel/files/patch-odk+configure.pl Normal file
View File

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

2
editors/openoffice-1.1-devel/files/patch-odk+setsdkenv_unix.in
View File

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

2
editors/openoffice-1.1-devel/files/patch-odk+settings+settings.mk
View File

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

44
editors/openoffice-1.1/files/patch-odk+configure.pl Normal file
View File

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

2
editors/openoffice-1.1/files/patch-odk+setsdkenv_unix.in
View File

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

2
editors/openoffice-1.1/files/patch-odk+settings+settings.mk
View File

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

44
editors/openoffice.org-1.1-devel/files/patch-odk+configure.pl Normal file
View File

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

2
editors/openoffice.org-1.1-devel/files/patch-odk+setsdkenv_unix.in
View File

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

2
editors/openoffice.org-1.1-devel/files/patch-odk+settings+settings.mk
View File

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

44
editors/openoffice.org-1.1/files/patch-odk+configure.pl Normal file
View File

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

2
editors/openoffice.org-1.1/files/patch-odk+setsdkenv_unix.in
View File

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

2
editors/openoffice.org-1.1/files/patch-odk+settings+settings.mk
View File

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