summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-1.1/files/patch-objformat
blob: b36e94bf85e22d1457d4f68e8563e943bc69ddf3 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
--- /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
@@ -147,5 +147,24 @@
 !         if( !unicmap )     /* HDU: #107980# Saraswati workaround */
 !            unicmap = cur;  /* record we found a Unicode charmap */
   
           /* 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