diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2007-07-03 01:16:35 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2007-07-03 01:16:35 +0000 |
| commit | 23039b0533c48e1b71e009b40bd8a8d8fbdef577 (patch) | |
| tree | a78c14f631ed050a64c2fb24123740bf1d14eb23 /editors/openoffice.org-vcltesttool/files | |
| parent | - reflect the update of rubygem-hoe (diff) | |
Re-do patch-i76141 to reflect patch-i65514 update.
Approved by: maho (amd64 porting blanket)
Notes
Notes:
svn path=/head/; revision=194738
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files')
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i76141 | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i76141 b/editors/openoffice.org-vcltesttool/files/patch-i76141 index 6b1bfcaf860b..cd4a7fc5ebd8 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i76141 +++ b/editors/openoffice.org-vcltesttool/files/patch-i76141 @@ -1,6 +1,15 @@ ---- berkeleydb/db-4.2.52.patch Thu Apr 5 14:04:49 2007 -+++ berkeleydb/db-4.2.52.patch Thu Apr 5 14:26:49 2007 -@@ -276,6 +276,23 @@ +--- 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 ;; *************** @@ -12,7 +21,7 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) -+--- 9328,9334 ---- ++--- 9330,9336 ---- + ;; + + freebsd*) @@ -24,7 +33,7 @@ *** 10398,10404 **** # yet detect zsh echo's removal of \ escapes. Also zsh mangles # `"' quotes if we put them in here... so don't! -@@ -341,6 +358,57 @@ +@@ -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' @@ -37,7 +46,7 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) -+--- 12872,12878 ---- ++--- 12885,12891 ---- + ;; + + freebsd*) @@ -54,7 +63,7 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) -+--- 15849,15855 ---- ++--- 15862,15868 ---- + ;; + + freebsd*) @@ -71,7 +80,7 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) -+--- 18114,18120 ---- ++--- 18127,18133 ---- + ;; + + freebsd*) @@ -79,10 +88,9 @@ + 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 *************** - *** 28556,28561 **** - --- 28556,28606 ---- - --- 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 @@ |