diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:52:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:52:30 +0000 |
| commit | 1858424fa02727e0ec58aee35fde0884d50e42cd (patch) | |
| tree | b70e4b9a87dfce715685a37f1d973fb9f51df01e /libwpd | |
| parent | 63267c640d9bafb1c51a5e222b11baab042ec06b (diff) | |
INTEGRATION: CWS freebsd08 (1.4.4); FILE MERGED
2007/06/01 22:56:33 maho 1.4.4.1: /usr/bin/objformat is gone for 7-CURRENT.
Issue number: #i76141#
Submitted by: jkim
Diffstat (limited to 'libwpd')
| -rw-r--r-- | libwpd/libwpd-0.8.8.diff | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/libwpd/libwpd-0.8.8.diff b/libwpd/libwpd-0.8.8.diff index b75339c5a2b7..50156e98303c 100644 --- a/libwpd/libwpd-0.8.8.diff +++ b/libwpd/libwpd-0.8.8.diff @@ -1,3 +1,73 @@ +*** misc/libwpd-0.8.8/configure Tue Jan 9 05:35:10 2007 +--- misc/build/libwpd-0.8.8/configure Wed Apr 4 20:10:49 2007 +*************** +*** 8089,8095 **** + ;; + + freebsd*) +! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +--- 8089,8095 ---- + ;; + + freebsd*) +! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +*************** +*** 11808,11814 **** + ;; + + freebsd*) +! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +--- 11808,11814 ---- + ;; + + freebsd*) +! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +*************** +*** 14978,14984 **** + ;; + + freebsd*) +! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +--- 14978,14984 ---- + ;; + + freebsd*) +! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +*************** +*** 17346,17352 **** + ;; + + freebsd*) +! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +--- 17346,17352 ---- + ;; + + freebsd*) +! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) *** misc/libwpd-0.8.8/src/lib/WP1Heuristics.cpp Wed Jan 3 14:07:55 2007 --- misc/build/libwpd-0.8.8/src/lib/WP1Heuristics.cpp Tue Apr 17 16:20:47 2007 *************** |