summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-2-RC/files/patch-i65514
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2007-01-24 03:05:41 +0000
committerMaho Nakata <maho@FreeBSD.org>2007-01-24 03:05:41 +0000
commitfe053479cab7dfbed87838ffdff6d9d825d49ef4 (patch)
tree2a7cd8c7f311a104e8dbdea21fabdb56f3764302 /editors/openoffice.org-2-RC/files/patch-i65514
parent- Update to 0.47 (diff)
Update to OOF680_m2.
Bit better than 2.2 Beta(OOF680_m1; http://www.openoffice.org/servlets/ReadMsg?list=releases&msgNo=10505 )
Notes
Notes: svn path=/head/; revision=183146
Diffstat (limited to 'editors/openoffice.org-2-RC/files/patch-i65514')
-rw-r--r--editors/openoffice.org-2-RC/files/patch-i6551432
1 files changed, 14 insertions, 18 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-i65514 b/editors/openoffice.org-2-RC/files/patch-i65514
index 1b80adbcb7c0..07755cda662b 100644
--- a/editors/openoffice.org-2-RC/files/patch-i65514
+++ b/editors/openoffice.org-2-RC/files/patch-i65514
@@ -1,12 +1,8 @@
-Index: berkeleydb/db-4.2.52.patch
-===================================================================
-RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v
-retrieving revision 1.13
-diff -u -r1.13 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch 25 Jul 2006 10:23:22 -0000 1.13
-+++ berkeleydb/db-4.2.52.patch 23 Aug 2006 02:24:30 -0000
-@@ -313,6 +313,20 @@
- ! $(SLO)$/btree_auto.obj
+diff -u -r1.17 db-4.2.52.patch
+--- berkeleydb/db-4.2.52.patch 1 Dec 2006 12:59:45 -0000 1.17
++++ berkeleydb/db-4.2.52.patch 23 Jan 2007 07:10:29 -0000
+@@ -54,6 +54,20 @@
+ ! SLOFILES= $(SLO)$/strcasecmp.obj
!
! .INCLUDE : target.mk
+*** misc/db-4.2.52.NC/dist/config.hin Wed Dec 3 16:10:00 2003
@@ -23,13 +19,13 @@ diff -u -r1.13 db-4.2.52.patch
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+
- *** misc/db-4.2.52.NC/clib/makefile.mk Tue Jul 25 09:33:00 2006
- --- misc/build/db-4.2.52.NC/clib/makefile.mk Tue Jul 25 09:05:20 2006
+ *** misc/db-4.2.52.NC/common/makefile.mk 2006-12-01 13:57:33.000000000 +0100
+ --- misc/build/db-4.2.52.NC/common/makefile.mk 2006-12-01 13:57:19.000000000 +0100
***************
-@@ -554,6 +568,76 @@
- fi
-
- # Commands to make compiler produce verbose output that lists
+@@ -306,6 +320,76 @@
+ 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'
+***************
+*** 28556,28561 ****
+--- 28556,28606 ----
@@ -100,10 +96,10 @@ diff -u -r1.13 db-4.2.52.patch
+ _ACEOF
+
+
- *** misc/db-4.2.52.NC/dist/ltmain.sh Sat Apr 26 19:45:37 2003
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh Tue Jul 25 09:05:20 2006
+ *** 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 2006-12-01 13:57:19.000000000 +0100
***************
-@@ -1010,3 +1094,39 @@
+@@ -1059,3 +1143,39 @@
! $(SLO)$/xa_map.obj
!
! .INCLUDE : target.mk