Update strigi to 0.6.2

0.6.2
 - Better support for nice IO priorities on Linux (Sebastian Trueg)
 - Compile with development version of CLucene (Ben van Klinken)
 - Explicitly use 'unsigned char' or 'signed char' instead of 'char'
   since 'char' can be either signed or unsigned on different processors.
   E.g. on ARM 'char' means 'unsigned char' and on i386 'char' means
   'signed char'. This changes makes libstreamanalyzer 0.6.2 binary
   incompatible with versions < 0.6.0. (Jos van den OOever)
 - Many CMake cleanups (Alexander Neundorf)
 - 6.5x speedup of C++ comment analyzer (Jakub Stachowski)
 - Various stability fixes (Jos van den Oever, Sebastian Trueg)
 - Support for ePub format (Jakub Stachowski)
 - Handle RIFF file with unspecified size for the RIFF packet. (Jos van
   den Oever)
0.5.11
 - Fix a bug that can cause a crash on an executable zip file.
 - Fix parsing of empty headers when CRLFCRLF is followed by a space. In
   other words, fix parsing of emails that have a space as the first
   character in the body.
 - Fix two broken (by design) throughanalyzers by replacing the with one
   eventanalyzer.
 - Updated xesam ontology to include proper ranges. This is necessary for
   the Nepomuk backend but does not change anything for clucene (were all
   is string anyway)
 - Make sure the app can handle environments where HOME is not defined.
 - Make the zip analyzer check more often if it should stop analyzing.
 - Fix wrong comparison when checking if we are finished yet.
 - Make the analyzer respect a configuration that only wants part of the
   stream to be analyzed.
 - Add an analyzer for Windows self-extracting zip archives.
 - Ask the analyzerconfiguration if we should continue and put a cap on
   the maximum length of stream we read
 - Log parse errors in the analysisresult.

4 files changed, 24 insertions, 18 deletions

diff --git a/sysutils/strigi/Makefile b/sysutils/strigi/Makefile
index ab6ce42a375..fd73e1bc0b4 100644
--- a/sysutils/strigi/Makefile
+++ b/sysutils/strigi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/04 11:11:50 markd Exp $
+# $NetBSD: Makefile,v 1.2 2009/01/09 22:22:04 markd Exp $
 
-DISTNAME=	strigi-0.5.10
+DISTNAME=	strigi-0.6.2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=strigi/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +15,9 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake pkg-config perl
 USE_CMAKE=	yes
 
+PKGCONFIG_OVERRIDE+=	src/streamanalyzer/libstreamanalyzer.pc.cmake
+PKGCONFIG_OVERRIDE+=	src/streams/libstreams.pc.cmake
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/pset.h)
 RT_LIB_SCHED=	-lrt
diff --git a/sysutils/strigi/PLIST b/sysutils/strigi/PLIST
index f842d28d528..1479f3d7895 100644
--- a/sysutils/strigi/PLIST
+++ b/sysutils/strigi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/11/04 11:11:50 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/09 22:22:04 markd Exp $
 bin/deepfind
 bin/deepgrep
 bin/luceneindexer
@@ -24,6 +24,7 @@ include/strigi/fileinputstream.h
 include/strigi/indexeddocument.h
 include/strigi/indexmanager.h
 include/strigi/indexplugin.h
+include/strigi/indexpluginloader.h
 include/strigi/indexreader.h
 include/strigi/indexwriter.h
 include/strigi/inputstream.h
@@ -55,19 +56,19 @@ include/strigi/textutils.h
 include/strigi/variant.h
 lib/libsearchclient.so
 lib/libsearchclient.so.0
-lib/libsearchclient.so.${PKGVERSION}
+lib/libsearchclient.so.0.6.2
 lib/libstreamanalyzer.so
 lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.${PKGVERSION}
+lib/libstreamanalyzer.so.0.6.2
 lib/libstreams.so
 lib/libstreams.so.0
-lib/libstreams.so.${PKGVERSION}
+lib/libstreams.so.0.6.2
 lib/libstrigihtmlgui.so
 lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.${PKGVERSION}
+lib/libstrigihtmlgui.so.0.6.2
 lib/libstrigiqtdbusclient.so
 lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.${PKGVERSION}
+lib/libstrigiqtdbusclient.so.0.6.2
 lib/pkgconfig/libstreamanalyzer.pc
 lib/pkgconfig/libstreams.pc
 lib/strigi/StrigiConfig.cmake
diff --git a/sysutils/strigi/distinfo b/sysutils/strigi/distinfo
index 98d1a50fd6f..b56bbe14aad 100644
--- a/sysutils/strigi/distinfo
+++ b/sysutils/strigi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/04 11:11:50 markd Exp $
+$NetBSD: distinfo,v 1.2 2009/01/09 22:22:04 markd Exp $
 
-SHA1 (strigi-0.5.10.tar.bz2) = 02efd6bd7c815148fa9c9134287175b8aec0409b
-RMD160 (strigi-0.5.10.tar.bz2) = 2af9870ccd86744450e0ab93e0c34a1aefb01e1a
-Size (strigi-0.5.10.tar.bz2) = 876957 bytes
-SHA1 (patch-aa) = 6329b5787e2abb402e0c4f723b98dba925578bce
+SHA1 (strigi-0.6.2.tar.bz2) = 6363a3fbb360ba194bd785b07d155103e68b2cbb
+RMD160 (strigi-0.6.2.tar.bz2) = 95aa8e69d2f2b7dced9da3890609620402ba4687
+Size (strigi-0.6.2.tar.bz2) = 880297 bytes
+SHA1 (patch-aa) = 96bf66b656731db79f0a52e90e294afef010b252
diff --git a/sysutils/strigi/patches/patch-aa b/sysutils/strigi/patches/patch-aa
index b4d3dc0577d..e0dd22b16c2 100644
--- a/sysutils/strigi/patches/patch-aa
+++ b/sysutils/strigi/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/11/04 11:11:50 markd Exp $
+$NetBSD: patch-aa,v 1.2 2009/01/09 22:22:04 markd Exp $
 
---- CMakeLists.txt.orig	2007-11-29 17:49:02.000000000 +1300
+CMAKE_MODULE_PATH may be a path (ie multiple directories) so don't use it.
+
+--- CMakeLists.txt.orig	2009-01-03 23:06:22.000000000 +1300
 +++ CMakeLists.txt
-@@ -204,7 +204,7 @@ include(ConfigureChecks.cmake)
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+@@ -225,7 +225,7 @@ if (CppUnit_FOUND)
+ endif (CppUnit_FOUND)
  
- CONFIGURE_FILE(
+ configure_file(
 -  "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
 +  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"