Allow some parts to be used from LibreOffice (C++ code).

Submitted by:	bapt
Feature safe:	yes

3 files changed, 44 insertions, 57 deletions

diff --git a/textproc/libtextcat/Makefile b/textproc/libtextcat/Makefile
index 0efb8cdee999..e2048c5c6d91 100644
--- a/textproc/libtextcat/Makefile
+++ b/textproc/libtextcat/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtextcat
 PORTVERSION=	2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://software.wise-guys.nl/download/
 
diff --git a/textproc/libtextcat/files/patch-src_fingerprint.h b/textproc/libtextcat/files/patch-src_fingerprint.h
index e0cf8d882ca2..d5d270bf0af2 100644
--- a/textproc/libtextcat/files/patch-src_fingerprint.h
+++ b/textproc/libtextcat/files/patch-src_fingerprint.h
@@ -1,50 +1,16 @@
---- /dev/null	Thu Aug 23 22:55:00 2007
-+++ src/fingerprint.h	Mon May 19 14:16:31 2003
-@@ -0,0 +1,47 @@
-+#ifndef _FINGERPRINT_H_
-+#define _FINGERPRINT_H_
-+/*
-+ * Copyright (C) 2003 WiseGuys Internet B.V.
-+ *
-+ * THE BSD LICENSE
-+ * 
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 
-+ * - Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 
-+ * - Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the
-+ * distribution.
-+ * 
-+ * - Neither the name of the WiseGuys Internet B.V. nor the names of
-+ * its contributors may be used to endorse or promote products derived
-+ * from this software without specific prior written permission.
-+ * 
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+#include "common.h"
-+
-+extern void *fp_Init(const char *name);
-+extern void fp_Done( void *handle );
-+extern int fp_Create( void *handle, const char *buffer, uint4 bufsize, uint4 maxngrams );
-+extern int fp_Read( void *handle, const char *fname, int maxngrams );
-+extern sint4 fp_Compare( void *cat, void *unknown, int cutoff );
-+extern void fp_Show( void *handle );
-+extern const char *fp_Name( void *handle );
-+extern void fp_Print( void *handle, FILE *fp );
-+
+--- ./src/fingerprint.h.orig	2003-05-19 14:16:31.000000000 +0200
++++ ./src/fingerprint.h	2010-12-21 16:18:55.000000000 +0100
+@@ -41,7 +41,13 @@
+ extern int fp_Read( void *handle, const char *fname, int maxngrams );
+ extern sint4 fp_Compare( void *cat, void *unknown, int cutoff );
+ extern void fp_Show( void *handle );
++#ifdef __cplusplus
++extern "C" {
 +#endif
+ extern const char *fp_Name( void *handle );
++#ifdef __cplusplus
++}
++#endif
+ extern void fp_Print( void *handle, FILE *fp );
+ 
+ #endif
diff --git a/textproc/libtextcat/files/patch-src_textcat.h b/textproc/libtextcat/files/patch-src_textcat.h
index 9c49ac8672dc..d7a6c4892ea4 100644
--- a/textproc/libtextcat/files/patch-src_textcat.h
+++ b/textproc/libtextcat/files/patch-src_textcat.h
@@ -1,6 +1,16 @@
---- src/textcat.h.orig	Mon May 19 14:16:31 2003
-+++ src/textcat.h	Thu Aug 23 22:47:07 2007
-@@ -51,8 +51,17 @@
+--- ./src/textcat.h.orig	2003-05-19 14:16:31.000000000 +0200
++++ ./src/textcat.h	2010-12-21 16:18:55.000000000 +0100
+@@ -39,6 +39,9 @@
+ 
+ #define _TEXTCAT_RESULT_UNKOWN        "UNKNOWN"
+ #define _TEXTCAT_RESULT_SHORT         "SHORT"
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ 
+ /**
+@@ -51,10 +54,19 @@
   * Returns: handle on success, NULL on error. (At the moment, the
   * only way errors can occur, is when the library cannot read the
   * conffile, or one of the fingerprint files listed in it.)
@@ -9,12 +19,23 @@
 + * see below
   */
  extern void *textcat_Init( const char *conffile );
-+
-+/**
+ 
+ /**
 + * Originaly this function had only one parameter (conffile) it has been modified since OOo must be able to load alternativ DB
 + * Basicaly prefix is the directory path where fingerprints are stored
 + */
 +extern void *special_textcat_Init( const char *conffile, const char *prefix );
- 
- /**
++
++/**
   * textcat_Done() - Free up resources for handle
+  */
+ extern void textcat_Done( void *handle );
+@@ -77,4 +89,8 @@
+  * textcat_Version() - Returns a string describing the version of this classifier.
+  */
+ extern char *textcat_Version();
++
++#ifdef __cplusplus
++}
++#endif
+ #endif