INTEGRATION: CWS tl44 (1.3.6); FILE MERGED

2007/08/28 12:45:57 tl 1.3.6.1: #i78875# FreeBSD specific patch

1 files changed, 42 insertions, 26 deletions

diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
index 429cb21ee807..2ab25af490fa 100644
--- a/libtextcat/libtextcat-2.2.patch
+++ b/libtextcat/libtextcat-2.2.patch
@@ -1,5 +1,5 @@
 *** misc/libtextcat-2.2/configure	Thu May 22 13:39:55 2003
---- misc/build/libtextcat-2.2/configure	Thu Jun 21 17:44:15 2007
+--- misc/build/libtextcat-2.2/configure	Tue Aug 28 14:42:16 2007
 ***************
 *** 5391,5397 ****
   allow_undefined_flag=
@@ -18,8 +18,25 @@
   # when you set need_version to no, make sure it does not cause -set_version
   # flags to be left without arguments
   archive_cmds=
+***************
+*** 6280,6286 ****
+    ;;
+  
+  freebsd*)
+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+    version_type=freebsd-$objformat
+    case $version_type in
+      freebsd-elf*)
+--- 6281,6287 ----
+    ;;
+  
+  freebsd*)
+!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+    version_type=freebsd-$objformat
+    case $version_type in
+      freebsd-elf*)
 *** misc/libtextcat-2.2/src/Makefile.in	Thu May 22 13:39:52 2003
---- misc/build/libtextcat-2.2/src/Makefile.in	Thu Jun 21 17:44:15 2007
+--- misc/build/libtextcat-2.2/src/Makefile.in	Tue Aug 28 14:41:12 2007
 ***************
 *** 124,143 ****
   target_vendor = @target_vendor@
@@ -168,7 +185,7 @@
   distclean-depend:
   	-rm -rf ./$(DEPDIR)
 *** misc/libtextcat-2.2/src/common.c	Thu May 22 13:32:43 2003
---- misc/build/libtextcat-2.2/src/common.c	Thu Jun 21 17:44:15 2007
+--- misc/build/libtextcat-2.2/src/common.c	Tue Aug 28 14:41:12 2007
 ***************
 *** 3,25 ****
    *
@@ -525,7 +542,7 @@
   		p++;
   	}
 *** misc/libtextcat-2.2/src/common.h	Thu May 22 15:02:29 2003
---- misc/build/libtextcat-2.2/src/common.h	Thu Jun 21 17:44:15 2007
+--- misc/build/libtextcat-2.2/src/common.h	Tue Aug 28 14:41:12 2007
 ***************
 *** 1,28 ****
   #ifndef _COMMON_H_
@@ -632,7 +649,7 @@
   #endif
   
 *** misc/libtextcat-2.2/src/constants.h	Thu May 22 13:32:43 2003
---- misc/build/libtextcat-2.2/src/constants.h	Thu Jun 21 17:44:15 2007
+--- misc/build/libtextcat-2.2/src/constants.h	Tue Aug 28 14:41:12 2007
 ***************
 *** 39,44 ****
 --- 39,46 ----
@@ -683,18 +700,17 @@
   /* Maximum penalty for missing an n-gram in fingerprint */
   #define MAXOUTOFPLACE 400
 ***************
-*** 75,79 ****
---- 84,91 ----
-  #define TABLEPOW  13
+*** 76,79 ****
+--- 85,91 ----
   
   #define MAXSCORE  INT_MAX
-+ 
+  
 + /* where the fingerprints files are stored */
 + #define DEFAULT_FINGERPRINTS_PATH ""
-  
++ 
   #endif
 *** misc/libtextcat-2.2/src/fingerprint.c	Thu May 22 13:32:43 2003
---- misc/build/libtextcat-2.2/src/fingerprint.c	Thu Jun 21 17:44:15 2007
+--- misc/build/libtextcat-2.2/src/fingerprint.c	Tue Aug 28 14:41:12 2007
 ***************
 *** 6,28 ****
    * All rights reserved.
@@ -1381,7 +1397,7 @@
   
   
 *** misc/libtextcat-2.2/src/fingerprint.h	Mon May 19 14:16:31 2003
---- misc/build/libtextcat-2.2/src/fingerprint.h	Thu Jun 21 17:44:15 2007
+--- misc/build/libtextcat-2.2/src/fingerprint.h	Tue Aug 28 14:41:12 2007
 ***************
 *** 41,47 ****
 --- 41,53 ----
@@ -1398,8 +1414,8 @@
   extern void fp_Print( void *handle, FILE *fp );
   
   #endif
-*** misc/libtextcat-2.2/src/libtextcat.map	Thu Jun 21 17:45:14 2007
---- misc/build/libtextcat-2.2/src/libtextcat.map	Thu Jun 21 17:38:10 2007
+*** misc/libtextcat-2.2/src/libtextcat.map	Tue Aug 28 14:43:02 2007
+--- misc/build/libtextcat-2.2/src/libtextcat.map	Tue Aug 28 14:41:12 2007
 ***************
 *** 1 ****
 ! dummy
@@ -1444,8 +1460,8 @@
 ! 	local:
 ! 		*;
 ! }
-*** misc/libtextcat-2.2/src/makefile.mk	Thu Jun 21 17:45:14 2007
---- misc/build/libtextcat-2.2/src/makefile.mk	Thu Jun 21 17:38:32 2007
+*** misc/libtextcat-2.2/src/makefile.mk	Tue Aug 28 14:43:02 2007
+--- misc/build/libtextcat-2.2/src/makefile.mk	Tue Aug 28 14:41:13 2007
 ***************
 *** 1 ****
 ! dummy
@@ -1454,9 +1470,9 @@
 ! #
 ! #   $RCSfile: libtextcat-2.2.patch,v $
 ! #
-! #   $Revision: 1.3 $
+! #   $Revision: 1.4 $
 ! #
-! #   last change: $Author: kz $ $Date: 2007-06-21 16:05:43 $
+! #   last change: $Author: vg $ $Date: 2007-08-30 15:07:52 $
 ! #
 ! #*  The Contents of this file are made available subject to
 ! #*  the terms of GNU Lesser General Public License Version 2.1.
@@ -1543,7 +1559,7 @@
 !     @echo _real>>$@
 !     @echo unnamed>>$@
 *** misc/libtextcat-2.2/src/textcat.c	Thu May 22 13:32:43 2003
---- misc/build/libtextcat-2.2/src/textcat.c	Thu Jun 21 17:44:16 2007
+--- misc/build/libtextcat-2.2/src/textcat.c	Tue Aug 28 14:41:13 2007
 ***************
 *** 4,26 ****
    * Copyright (C) 2003 WiseGuys Internet B.V.
@@ -1785,7 +1801,7 @@
   #undef SHOULD_FREE
   #endif
 *** misc/libtextcat-2.2/src/textcat.h	Mon May 19 14:16:31 2003
---- misc/build/libtextcat-2.2/src/textcat.h	Thu Jun 21 17:44:16 2007
+--- misc/build/libtextcat-2.2/src/textcat.h	Tue Aug 28 14:41:13 2007
 ***************
 *** 40,45 ****
 --- 40,48 ----
@@ -1831,8 +1847,8 @@
 + }
 + #endif
   #endif
-*** misc/libtextcat-2.2/src/utf8misc.c	Thu Jun 21 17:45:14 2007
---- misc/build/libtextcat-2.2/src/utf8misc.c	Thu Jun 21 17:44:16 2007
+*** misc/libtextcat-2.2/src/utf8misc.c	Tue Aug 28 14:43:02 2007
+--- misc/build/libtextcat-2.2/src/utf8misc.c	Tue Aug 28 14:41:13 2007
 ***************
 *** 1 ****
 ! dummy
@@ -1969,8 +1985,8 @@
 !     return char_counter;
 ! }
 ! 
-*** misc/libtextcat-2.2/src/utf8misc.h	Thu Jun 21 17:45:14 2007
---- misc/build/libtextcat-2.2/src/utf8misc.h	Thu Jun 21 17:44:16 2007
+*** misc/libtextcat-2.2/src/utf8misc.h	Tue Aug 28 14:43:02 2007
+--- misc/build/libtextcat-2.2/src/utf8misc.h	Tue Aug 28 14:41:13 2007
 ***************
 *** 1 ****
 ! dummy
@@ -2063,8 +2079,8 @@
 ! 
 ! #endif
 ! 
-*** misc/libtextcat-2.2/src/win32_config.h	Thu Jun 21 17:45:14 2007
---- misc/build/libtextcat-2.2/src/win32_config.h	Thu Jun 21 17:44:16 2007
+*** misc/libtextcat-2.2/src/win32_config.h	Tue Aug 28 14:43:02 2007
+--- misc/build/libtextcat-2.2/src/win32_config.h	Tue Aug 28 14:41:13 2007
 ***************
 *** 1 ****
 ! dummy