diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-12-11 01:02:19 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-12-11 01:02:19 +0000 |
| commit | faebbd02e30cd0d381340029b5b261695340b3be (patch) | |
| tree | 6d786cf6c26b647f3230bf7c4d85026fa60a656c /editors/openoffice.org-2-devel/files/patch-instsetoo | |
| parent | net/mldonkey-devel has been fixed to work with lang/ocaml version (diff) | |
Update to 2.0m145=(2.0.1rc4)
Notes
Notes:
svn path=/head/; revision=150841
Diffstat (limited to 'editors/openoffice.org-2-devel/files/patch-instsetoo')
| -rw-r--r-- | editors/openoffice.org-2-devel/files/patch-instsetoo | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/editors/openoffice.org-2-devel/files/patch-instsetoo b/editors/openoffice.org-2-devel/files/patch-instsetoo index 1546e5ab8d09..77fcd635acfa 100644 --- a/editors/openoffice.org-2-devel/files/patch-instsetoo +++ b/editors/openoffice.org-2-devel/files/patch-instsetoo @@ -130,20 +130,24 @@ diff -u -r1.47 globals.pm $unpackpath = ""; $idttemplatepath = ""; $idtlanguagepath = ""; + Index: solenv/bin/modules/installer/parameter.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v retrieving revision 1.29 diff -u -r1.29 parameter.pm --- solenv/bin/modules/installer/parameter.pm 9 Nov 2005 09:10:12 -0000 1.29 -+++ solenv/bin/modules/installer/parameter.pm 3 Dec 2005 22:26:53 -0000 -@@ -304,6 +304,10 @@ ++++ solenv/bin/modules/installer/parameter.pm 10 Dec 2005 13:11:30 -0000 +@@ -304,6 +304,13 @@ $installer::globals::epmoutpath = "packages"; } } + if ( $installer::globals::compiler =~ /unxfbsdi/ ) + { -+ $installer::globals::isfreebsdpkgbuild = 1; ++ if ( $installer::globals::packageformat eq "bsd" ) ++ { ++ $installer::globals::isfreebsdpkgbuild = 1; ++ } + } if ( $installer::globals::compiler =~ /unxso[lg]s/ ) { $installer::globals::issolarissparcbuild = 1; } |