summaryrefslogtreecommitdiff
path: root/vigra
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-07-05 07:49:34 +0000
committerRüdiger Timm <rt@openoffice.org>2007-07-05 07:49:34 +0000
commitc495ae7f183345284beb5b3be127b85d763ca4ad (patch)
tree0058bc72839fa8f780185b3a67274d40796dd4eb /vigra
parent1d7123af812ad094ec41fb8b0fdf2567d2f12e8d (diff)
INTEGRATION: CWS freebsd08 (1.3.10); FILE MERGED
2007/06/01 22:56:37 maho 1.3.10.1: /usr/bin/objformat is gone for 7-CURRENT. Issue number: #i76141# Submitted by: jkim
Diffstat (limited to 'vigra')
-rw-r--r--vigra/vigra1.4.0.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/vigra/vigra1.4.0.patch b/vigra/vigra1.4.0.patch
index 1f581aaab37e..cb754cdfbc35 100644
--- a/vigra/vigra1.4.0.patch
+++ b/vigra/vigra1.4.0.patch
@@ -1,3 +1,42 @@
+diff -uprN misc/vigra1.4.0/configure misc/build/vigra1.4.0/configure
+--- misc/vigra1.4.0/configure Tue Dec 20 23:53:28 2005
++++ misc/build/vigra1.4.0/configure Wed Apr 4 20:35:48 2007
+@@ -7259,7 +7259,7 @@ kfreebsd*-gnu)
+ ;;
+
+ freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -10961,7 +10961,7 @@ kfreebsd*-gnu)
+ ;;
+
+ freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -14110,7 +14110,7 @@ kfreebsd*-gnu)
+ ;;
+
+ freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -16461,7 +16461,7 @@ kfreebsd*-gnu)
+ ;;
+
+ freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
diff -uprN misc/vigra1.4.0/include/vigra/array_vector.hxx misc/build/vigra1.4.0/include/vigra/array_vector.hxx
--- misc/vigra1.4.0/include/vigra/array_vector.hxx 2005-12-21 05:53:30.000000000 +0100
+++ misc/build/vigra1.4.0/include/vigra/array_vector.hxx 2006-08-31 12:08:15.172679000 +0200