summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-vcltesttool/files/patch-i76141
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files/patch-i76141')
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i76141839
1 files changed, 0 insertions, 839 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76141 b/editors/openoffice.org-vcltesttool/files/patch-i76141
deleted file mode 100644
index c1d964b3b5c2..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i76141
+++ /dev/null
@@ -1,839 +0,0 @@
---- berkeleydb/db-4.2.52.patch 26 Mar 2007 12:24:38 -0000 1.19
-+++ berkeleydb/db-4.2.52.patch 3 Jul 2007 01:03:31 -0000
-@@ -222,7 +222,7 @@
- !
- ! .INCLUDE : target.mk
- *** 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
-+--- misc/build/db-4.2.52.NC/dist/configure 2007-07-02 21:00:00.000000000 -0400
- ***************
- *** 3518,3525 ****
- # Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf
-@@ -262,6 +262,23 @@
- test "$with_gnu_ld" != no && break
- ;;
- ***************
-+*** 9328,9334 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 9330,9336 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
- *** 10398,10404 ****
- # yet detect zsh echo's removal of \ escapes. Also zsh mangles
- # `"' quotes if we put them in here... so don't!
-@@ -327,6 +344,57 @@
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+***************
-+*** 12872,12878 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 12885,12891 ----
-+ ;;
-+
-+ 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*)
-+--- 15862,15868 ----
-+ ;;
-+
-+ 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*)
-+--- 18127,18133 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
- *** misc/db-4.2.52.NC/dist/ltmain.sh 2003-04-26 19:45:37.000000000 +0200
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh 2007-02-19 16:12:12.000000000 +0100
- ***************
---- curl/curl-7.12.2.patch 25 Sep 2006 13:33:49 -0000 1.9
-+++ curl/curl-7.12.2.patch 5 Apr 2007 00:01:20 -0000
-@@ -1,3 +1,73 @@
-+*** misc/curl-7.12.2/configure Sun Oct 17 18:22:10 2004
-+--- misc/build/curl-7.12.2/configure Wed Apr 4 19:56:30 2007
-+***************
-+*** 9456,9462 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 9456,9462 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 13154,13160 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 13154,13160 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 16303,16309 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 16303,16309 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 18650,18656 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 18650,18656 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
- *** misc/curl-7.12.2/ltmain.sh Mon Aug 9 13:12:17 2004
- --- misc/build/curl-7.12.2/ltmain.sh Thu Jun 22 13:07:14 2006
- ***************
---- freetype/freetype-2.2.1.patch 3 Aug 2006 14:58:26 -0000 1.2
-+++ freetype/freetype-2.2.1.patch 5 Apr 2007 00:07:40 -0000
-@@ -1,5 +1,75 @@
--*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Mon Jan 30 17:49:42 2006
----- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h Thu Jul 13 16:04:27 2006
-+*** misc/freetype-2.2.1/builds/unix/configure Fri May 12 11:12:27 2006
-+--- misc/build/freetype-2.2.1/builds/unix/configure Wed Apr 4 20:05:15 2007
-+***************
-+*** 10644,10650 ****
-+ freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 10644,10650 ----
-+ freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 14420,14426 ****
-+ freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 14420,14426 ----
-+ freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 17684,17690 ****
-+ freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 17684,17690 ----
-+ freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 20153,20159 ****
-+ freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 20153,20159 ----
-+ freebsd* | dragonfly*)
-+ # DragonFly does not have aout. When/if they implement a new
-+ # versioning mechanism, adjust this.
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+*** misc/freetype-2.2.1/include/freetype/config/ftmodule.h Mon Jan 30 11:49:42 2006
-+--- misc/build/freetype-2.2.1/include/freetype/config/ftmodule.h Wed Apr 4 20:04:02 2007
- ***************
- *** 17,24 ****
- --- 17,26 ----
---- libwpd/libwpd-0.8.8.diff 19 Jan 2007 15:57:46 -0000 1.1.4.1
-+++ libwpd/libwpd-0.8.8.diff 5 Apr 2007 00:13:31 -0000
-@@ -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/WP1Part.cpp 2007-01-03 14:07:55.000000000 +0100
- --- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp 2007-01-13 00:18:52.000000000 +0100
- ***************
-
---- libxml2/libxml2-2.6.17.patch 26 Mar 2007 12:25:19 -0000 1.5
-+++ libxml2/libxml2-2.6.17.patch 3 May 2007 17:31:33 -0000
-@@ -34,6 +34,74 @@
- fi
- echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
- ***************
-+*** 8547,8553 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 8547,8553 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 12266,12272 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 12266,12272 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 15436,15442 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 15436,15442 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
-+*** 17804,17810 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 17804,17810 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
- *** 26339,26347 ****
-
- echo "$as_me:$LINENO: checking for setsockopt" >&5
---- libxmlsec/xmlsec1-1.2.6.patch 27 Mar 2007 09:36:38 -0000 1.19
-+++ libxmlsec/xmlsec1-1.2.6.patch 3 May 2007 18:12:52 -0000
-@@ -158,6 +158,23 @@
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 7778,7784 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 7779,7785 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
- *** 9046,9052 ****
- ;;
- esac
-@@ -215,6 +232,23 @@
- # built for inclusion in a dll (and should export symbols for example).
- lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- ***************
-+*** 11497,11503 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 11498,11504 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
- *** 13259,13269 ****
- lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
- ;;
-@@ -257,6 +291,23 @@
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 14667,14673 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 14668,14674 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
- *** 15607,15617 ****
- lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
- ;;
-@@ -316,6 +367,23 @@
- # is EXPORTS), use it as is; otherwise, prepend...
- archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- ***************
-+*** 17035,17041 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 17036,17042 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+***************
- *** 24598,24604 ****
- fi
-
---- moz/mozilla-source-1.7.5.patch.orig Fri Apr 27 15:23:29 2007
-+++ moz/mozilla-source-1.7.5.patch Fri Apr 27 15:32:07 2007
-@@ -266,6 +266,23 @@
- *** misc/mozilla/configure Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure Thu Mar 29 14:27:08 2007
- ***************
-+*** 5228,5234 ****
-+ ;;
-+
-+ *-freebsd*)
-+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+ DLL_SUFFIX=".so.1.0"
-+ DSO_LDOPTS="-shared"
-+ fi
-+--- 5228,5234 ----
-+ ;;
-+
-+ *-freebsd*)
-+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+ DLL_SUFFIX=".so.1.0"
-+ DSO_LDOPTS="-shared"
-+ fi
-+***************
- *** 5895,5901 ****
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
- MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -311,6 +328,23 @@
- *** misc/mozilla/configure.in Tue Oct 12 00:13:29 2004
- --- misc/build/mozilla/configure.in Thu Mar 29 14:27:08 2007
- ***************
-+*** 1006,1012 ****
-+ ;;
-+
-+ *-freebsd*)
-+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` != "elf"; then
-+ DLL_SUFFIX=".so.1.0"
-+ DSO_LDOPTS="-shared"
-+ fi
-+--- 1006,1012 ----
-+ ;;
-+
-+ *-freebsd*)
-+! if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
-+ DLL_SUFFIX=".so.1.0"
-+ DSO_LDOPTS="-shared"
-+ fi
-+***************
- *** 1536,1542 ****
- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
- MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
-@@ -449,6 +483,25 @@
- ASM_SUFFIX = @ASM_SUFFIX@
- PROG_SUFFIX = @PROG_SUFFIX@
- MOD_NAME = @NSPR_MODNAME@
-+*** misc/mozilla/directory/c-sdk/config/FreeBSD.mk Tue Mar 26 16:51:46 2002
-+--- misc/build/mozilla/directory/c-sdk/config/FreeBSD.mk Wed Apr 4 20:56:05 2007
-+***************
-+*** 66,72 ****
-+
-+ ARCH = freebsd
-+
-+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+
-+ ifeq ($(MOZ_OBJFORMAT),elf)
-+ DLL_SUFFIX = so
-+--- 66,72 ----
-+
-+ ARCH = freebsd
-+
-+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+
-+ ifeq ($(MOZ_OBJFORMAT),elf)
-+ DLL_SUFFIX = so
- *** misc/mozilla/directory/c-sdk/config/cygwin-wrapper Wed Apr 2 19:22:39 2003
- --- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper Thu Mar 29 14:27:08 2007
- ***************
-@@ -524,6 +577,23 @@
- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- PR_MD_ASFILES=
- ***************
-+*** 3465,3471 ****
-+ EOF
-+
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
-+--- 3465,3471 ----
-+ EOF
-+
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
-+***************
- *** 3832,3837 ****
- --- 3833,3839 ----
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -604,6 +674,23 @@
- MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
- PR_MD_ASFILES=
- ***************
-+*** 896,902 ****
-+ AC_DEFINE(FREEBSD)
-+ AC_DEFINE(HAVE_BSD_FLOCK)
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
-+--- 896,902 ----
-+ AC_DEFINE(FREEBSD)
-+ AC_DEFINE(HAVE_BSD_FLOCK)
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
-+***************
- *** 1144,1149 ****
- --- 1145,1151 ----
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -7562,6 +7649,44 @@
-
- switch (name) {
- case MAX_CONNECTIONS:
-+*** misc/mozilla/nsprpub/configure Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure Wed Apr 4 20:56:33 2007
-+***************
-+*** 3407,3413 ****
-+ EOF
-+
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
-+--- 3407,3413 ----
-+ EOF
-+
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
-+*** misc/mozilla/nsprpub/configure.in Tue Sep 14 17:14:38 2004
-+--- misc/build/mozilla/nsprpub/configure.in Wed Apr 4 20:56:40 2007
-+***************
-+*** 922,928 ****
-+ AC_DEFINE(HAVE_BSD_FLOCK)
-+ AC_DEFINE(HAVE_SOCKLEN_T)
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
-+--- 922,928 ----
-+ AC_DEFINE(HAVE_BSD_FLOCK)
-+ AC_DEFINE(HAVE_SOCKLEN_T)
-+ CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
-+! MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ if test "$MOZ_OBJFORMAT" = "elf"; then
-+ DLL_SUFFIX=so
-+ else
- *** misc/mozilla/nsprpub/build/cygwin-wrapper Wed Apr 2 19:22:38 2003
- --- misc/build/mozilla/nsprpub/build/cygwin-wrapper Thu Mar 29 14:27:08 2007
- ***************
-@@ -8090,6 +8215,25 @@
- + ifdef NS_USE_GCC
- + NSPR31_LIB_PREFIX = lib
- + endif
-+*** misc/mozilla/security/coreconf/FreeBSD.mk Wed Mar 26 20:17:25 2003
-+--- misc/build/mozilla/security/coreconf/FreeBSD.mk Wed Apr 4 20:56:48 2007
-+***************
-+*** 63,69 ****
-+
-+ ARCH = freebsd
-+
-+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo aout)
-+
-+ ifeq ($(MOZ_OBJFORMAT),elf)
-+ DLL_SUFFIX = so
-+--- 63,69 ----
-+
-+ ARCH = freebsd
-+
-+! MOZ_OBJFORMAT := $(shell test -x /usr/bin/objformat && /usr/bin/objformat || echo elf)
-+
-+ ifeq ($(MOZ_OBJFORMAT),elf)
-+ DLL_SUFFIX = so
- *** misc/mozilla/security/coreconf/command.mk Fri Feb 15 17:53:12 2002
- --- misc/build/mozilla/security/coreconf/command.mk Thu Mar 29 14:27:09 2007
- ***************
---- sndfile/libsndfile-1.0.9.patch 3 Feb 2006 17:31:46 -0000 1.3
-+++ sndfile/libsndfile-1.0.9.patch 5 Apr 2007 00:31:26 -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
-@@ -212,6 +263,23 @@
- fi
- module_expsym_cmds_GCJ='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_GCJ=no
-+***************
-+*** 17045,17051 ****
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
-+--- 17052,17058 ----
-+ ;;
-+
-+ freebsd*)
-+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-+ version_type=freebsd-$objformat
-+ case $version_type in
-+ freebsd-elf*)
- *** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 05:02:07 2004
- --- misc/build/libsndfile-1.0.9/ltmain.sh Mon Jan 23 20:13:31 2006
- ***************
---- vigra/vigra1.4.0.patch 12 Oct 2006 10:35:19 -0000 1.3
-+++ vigra/vigra1.4.0.patch 5 Apr 2007 00:40:20 -0000
-@@ -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