Fix build after objformat removal.

1 files changed, 230 insertions, 0 deletions

diff --git a/editors/openoffice.org-1.1-devel/files/patch-objformat b/editors/openoffice.org-1.1-devel/files/patch-objformat
new file mode 100644
index 000000000000..53587fc236d8
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-objformat
@@ -0,0 +1,230 @@
+--- /dev/null	Thu May  3 10:02:14 2007
++++ berkeleydb/db-4.2.52.patch	Thu May  3 09:52:51 2007
+@@ -0,0 +1,70 @@
++*** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
++--- misc/build/db-4.2.52.NC/dist/configure	2007-02-19 16:12:12.000000000 +0100
++***************
++*** 9328,9334 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 9328,9334 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++***************
++*** 12872,12878 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 12872,12878 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++***************
++*** 15849,15855 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 15849,15855 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++***************
++*** 18114,18120 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 18114,18120 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+Index: berkeleydb/makefile.mk
+===================================================================
+RCS file: /cvs/external/berkeleydb/makefile.mk,v
+retrieving revision 1.13.12.2
+diff -u -r1.13.12.2 makefile.mk
+--- berkeleydb/makefile.mk	28 Oct 2004 11:54:48 -0000	1.13.12.2
++++ berkeleydb/makefile.mk	3 May 2007 01:04:40 -0000
+@@ -73,6 +73,8 @@
+ 
+ TARFILE_NAME=db-4.2.52.NC
+ 
++PATCH_FILE_NAME=db-4.2.52.patch
++
+ # not needed for win32. comment out when causing problems...
+ 
+ .IF "$(GUI)"=="UNX"
+
+Index: curl/unx1-curl-7.9.8.patch
+===================================================================
+RCS file: /cvs/external/curl/Attic/unx1-curl-7.9.8.patch,v
+retrieving revision 1.2.18.1
+diff -u -r1.2.18.1 unx1-curl-7.9.8.patch
+--- curl/unx1-curl-7.9.8.patch	3 May 2004 16:32:05 -0000	1.2.18.1
++++ curl/unx1-curl-7.9.8.patch	3 May 2007 01:13:15 -0000
+@@ -251,3 +251,22 @@
+     /*************************************************************
+      * No protocol part in URL was used, add it!
+      *************************************************************/
++*** misc/curl-7.9.8/configure	Wed Jun 12 00:16:54 2002
++--- misc/build/curl-7.9.8/configure	Thu May  3 10:10:42 2007
++***************
++*** 6292,6298 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 6292,6298 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+Index: freetype/freetype-2.1.4.patch
+===================================================================
+RCS file: /cvs/external/freetype/Attic/freetype-2.1.4.patch,v
+retrieving revision 1.2
+diff -u -r1.2 freetype-2.1.4.patch
+--- freetype/freetype-2.1.4.patch	17 Apr 2003 15:11:01 -0000	1.2
++++ freetype/freetype-2.1.4.patch	3 May 2007 01:15:56 -0000
+@@ -131,3 +131,22 @@
+   
+           /* XXX If some new encodings to represent UCS-4 are added,  */
+           /*     they should be added here.                           */
++*** misc/freetype-2.1.4/builds/unix/configure	Sun Jan 19 01:39:18 2003
++--- misc/build/freetype-2.1.4/builds/unix/configure	Thu May  3 10:14:26 2007
++***************
++*** 7203,7209 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 7203,7209 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+
+Index: sndfile/libsndfile-1.0.9.patch
+===================================================================
+RCS file: /cvs/external/sndfile/libsndfile-1.0.9.patch,v
+retrieving revision 1.2
+diff -u -r1.2 libsndfile-1.0.9.patch
+--- sndfile/libsndfile-1.0.9.patch	31 May 2005 16:31:31 -0000	1.2
++++ sndfile/libsndfile-1.0.9.patch	3 May 2007 01:21:01 -0000
+@@ -83,6 +83,23 @@
+     shlibpath_var=DYLD_LIBRARY_PATH
+     shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+ ***************
++*** 7871,7877 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 7878,7884 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++***************
+ *** 9111,9120 ****
+         ;;
+       esac
+@@ -143,6 +160,23 @@
+       module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       hardcode_direct_CXX=no
+ ***************
++*** 11560,11566 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 11567,11573 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++***************
+ *** 14069,14084 ****
+       	  lt_int_apple_cc_single_mod=yes
+       	fi
+@@ -178,6 +212,23 @@
+             module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+         hardcode_direct_F77=no
+ ***************
++*** 14700,14706 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 14707,14713 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++***************
+ *** 16414,16429 ****
+       	  lt_int_apple_cc_single_mod=yes
+       	fi