Update to 0.7.7 - based on patches from Jaap Boender

0.7.7 (2011-12-07)
 - Many nepomuk field name fixes
 - More accurate file format check for tar files
 - Better checking of bounds in OLE files.
 - Increase performance of default file input stream.
 - Check for surrogate pairs in UTF-8 strings.
 - Improve ID3 analyzer: skip zero padding before mp3 stream to
   handle typical LAME output, implement unsynchronization flag handling
 - Properly finish child indexing in all analyzers.
0.7.6 (2011-07-26)
 - Fix build with clucene 2.3
 - Use the deprecated function av_metadata_get for libffmpeg
 - Improved child indexing
 - Convert the DateTime field in EXIF data to a time_t value.
 - Move DigestEventAnalyzer to a plugin.
0.7.5
 - Synchronize the modules. In 0.7.4, the modules were not synchronized.
0.7.4
 - Disable building strigidaemon and strigiclient on windows
 - Support more feature of Strigi Query in the CLucene backend.
 - Fix premature EOF condition in PDF parser.
 - Make discovering of invalid characters in checkHeader more compliant
   to RFC822.
 - Improvements to movie analysers that use ffmpeg.
 - Fix a bug where width and height of certain JPG files are not shown.
 - Fixes to libstreams to avoid crashes.
 - Improved Nepomuk compliance.
 - Faster reading of streams with SkippingFileInputStream and
   MMapFileInputStream.
 - Reorganize Strigi into smaller modules.
0.7.2
 - Improve cpp analyzer speed and output
 - Fix crash due to deep nesting of calls in pdf analyzer
 - Fix iconv use on Mac OS X
0.7.1
 - Support more fields from ODF documents
 - Improved skipping behavior on streams for large files.
 - Added album art support.
 - Added support for ID3v1 tags.
 - Added MP3 stream metadata extraction, UTF-16 support in tags.
 - Extended the range of metadata extracted by ID3 analyzer.
 - Added a FLAC audio file analyzer.
 - Significantly unbreak the PDF analyzer.
 - Fix scanning trees where permissions are insufficient to read some parts
 - Check for multithreaded version of libxml2
 - Require newer CLucene version (0.9.21)
0.7.0
 - Change to Nepomuk ontologies
 - Set file property for embedded ar streams. This fixes the opening
   of these streams in archivereader.
 - Instead of reading each .rdf file at once in memory and then parse
   it, use the libxml2 I/O API to read chunks of the file when requested.
 - The attribute value is not '\0' terminated but has a pointer to the
   end of the string. In addition, string comparison was sped up by
   first comparing the string length.
0.6.5
 - Fix KDE bug 185551: Strigi now allows paths that start with protocol:/*
   like 'file:///' or 'remote:/'
 - Add a new function AnalysisResult::child(). This function allows an
   AnalysisResult instance to access the last child it has had indexed.
   This is needed for cases when a parent knows something about a child
   which the child does not know. In such cases the parent can call
   child()->addValue(...).
 - Adjust to the new library naming scheme in iconv-1.12
 - Implemented missing addTriplet method
 - Rewrite the implementation of ArchiveReader. The new implementation
   is more efficient in listing contents of directories. Now single
   directory entries can be returned without the need for reading the
   entire archive of which the directory is a part.

6 files changed, 46 insertions, 59 deletions

diff --git a/sysutils/strigi/Makefile b/sysutils/strigi/Makefile
index 01b191c11cb..c91599d64b4 100644
--- a/sysutils/strigi/Makefile
+++ b/sysutils/strigi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2013/01/26 21:38:54 adam Exp $
+# $NetBSD: Makefile,v 1.28 2013/02/04 20:21:08 markd Exp $
 
-DISTNAME=	strigi-0.6.4
-PKGREVISION=	18
+DISTNAME=	strigi-0.7.7
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=strigi/}
+MASTER_SITES=	http://rdieter.fedorapeople.org/strigi/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
@@ -28,7 +27,7 @@ RT_LIB_SCHED=	# empty
 CFLAGS.SunOS+=	-DCMAKE_HAVE_PTHREAD_CREATE
 LDFLAGS.SunOS+=	-mimpure-text -lrt
 
-CMAKE_ARGS+=	-DENABLE_CPPUNIT=OFF
+CMAKE_ARGS+=	-DENABLE_FFMPEG=OFF
 .if !empty(RT_LIB_SCHED)
 # these use sched_setscheduler
 CMAKE_ARGS+=	-Dstrigidaemon_LIBS=${RT_LIB_SCHED}
@@ -40,11 +39,14 @@ pre-configure:
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/cppunit/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/exiv2/buildlink3.mk"
 .include "../../textproc/libclucene/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../x11/qt4-qdbus/buildlink3.mk"
+.include "../../mk/fam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/strigi/PLIST b/sysutils/strigi/PLIST
index 3306906df1e..6f66be44e4f 100644
--- a/sysutils/strigi/PLIST
+++ b/sysutils/strigi/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/02/04 20:21:08 markd Exp $
 bin/deepfind
 bin/deepgrep
 bin/luceneindexer
+bin/rdfindexer
 bin/strigiclient
 bin/strigicmd
 bin/strigidaemon
@@ -10,17 +11,23 @@ include/strigi/analysisresult.h
 include/strigi/analyzerconfiguration.h
 include/strigi/analyzerplugin.h
 include/strigi/archivereader.h
+include/strigi/arinputstream.h
 include/strigi/asyncsocket.h
 include/strigi/asyncsocketclient.h
 include/strigi/bufferedstream.h
+include/strigi/bz2inputstream.h
 include/strigi/classproperties.h
 include/strigi/clientinterface.h
+include/strigi/cpioinputstream.h
+include/strigi/dataeventinputstream.h
 include/strigi/diranalyzer.h
 include/strigi/encodinginputstream.h
 include/strigi/fieldproperties.h
 include/strigi/fieldpropertiesdb.h
 include/strigi/fieldtypes.h
 include/strigi/fileinputstream.h
+include/strigi/filelister.h
+include/strigi/gzipinputstream.h
 include/strigi/indexeddocument.h
 include/strigi/indexmanager.h
 include/strigi/indexplugin.h
@@ -29,13 +36,20 @@ include/strigi/indexreader.h
 include/strigi/indexwriter.h
 include/strigi/inputstream.h
 include/strigi/inputstreamreader.h
+include/strigi/kmpsearcher.h
+include/strigi/lzmainputstream.h
+include/strigi/mailinputstream.h
+include/strigi/oleinputstream.h
+include/strigi/processinputstream.h
 include/strigi/qtdbus/strigiasyncclient.h
 include/strigi/qtdbus/strigiclient.h
 include/strigi/qtdbus/strigidbus.h
 include/strigi/qtdbus/strigitypes.h
 include/strigi/query.h
 include/strigi/queryparser.h
+include/strigi/rpminputstream.h
 include/strigi/sdfinputstream.h
+include/strigi/socketclient.h
 include/strigi/streamanalyzer.h
 include/strigi/streamanalyzerfactory.h
 include/strigi/streambase.h
@@ -45,6 +59,7 @@ include/strigi/streameventanalyzer.h
 include/strigi/streamlineanalyzer.h
 include/strigi/streamsaxanalyzer.h
 include/strigi/streamthroughanalyzer.h
+include/strigi/strigi_thread.h
 include/strigi/strigiconfig.h
 include/strigi/strigihtmlgui.h
 include/strigi/stringstream.h
@@ -52,17 +67,24 @@ include/strigi/stringterminatedsubstream.h
 include/strigi/subinputstream.h
 include/strigi/substreamprovider.h
 include/strigi/substreamproviderprovider.h
+include/strigi/tarinputstream.h
 include/strigi/textutils.h
 include/strigi/variant.h
+include/strigi/zipinputstream.h
 lib/libsearchclient.so
 lib/libsearchclient.so.0
 lib/libsearchclient.so.${PKGVERSION}
+lib/libsearchclient/LibSearchClientConfig.cmake
 lib/libstreamanalyzer.so
 lib/libstreamanalyzer.so.0
 lib/libstreamanalyzer.so.${PKGVERSION}
+lib/libstreamanalyzer/LibStreamAnalyzerConfig.cmake
 lib/libstreams.so
 lib/libstreams.so.0
 lib/libstreams.so.${PKGVERSION}
+lib/libstreams/LibStreamsConfig.cmake
+lib/libstreams/LibStreamsTargets-noconfig.cmake
+lib/libstreams/LibStreamsTargets.cmake
 lib/libstrigihtmlgui.so
 lib/libstrigihtmlgui.so.0
 lib/libstrigihtmlgui.so.${PKGVERSION}
@@ -72,6 +94,9 @@ lib/libstrigiqtdbusclient.so.${PKGVERSION}
 lib/pkgconfig/libstreamanalyzer.pc
 lib/pkgconfig/libstreams.pc
 lib/strigi/StrigiConfig.cmake
+lib/strigi/strigiea_digest.so
+lib/strigi/strigiea_jpeg.so
+lib/strigi/strigiea_riff.so
 lib/strigi/strigiindex_clucene.so
 lib/strigi/strigila_cpp.so
 lib/strigi/strigila_deb.so
@@ -90,6 +115,13 @@ lib/strigi/strigita_wav.so
 lib/strigi/strigita_xbm.so
 share/dbus-1/services/org.freedesktop.xesam.searcher.service
 share/dbus-1/services/vandenoever.strigi.service
+share/strigi/fieldproperties/homeless.rdfs
+share/strigi/fieldproperties/nao_data.rdfs
+share/strigi/fieldproperties/ncal_data.rdfs
+share/strigi/fieldproperties/nco_data.rdfs
+share/strigi/fieldproperties/nexif_data.rdfs
+share/strigi/fieldproperties/nfo_data.rdfs
+share/strigi/fieldproperties/nid3_data.rdfs
+share/strigi/fieldproperties/nie_data.rdfs
+share/strigi/fieldproperties/nmo_data.rdfs
 share/strigi/fieldproperties/strigi.rdfs
-share/strigi/fieldproperties/xesam-convenience.rdfs
-share/strigi/fieldproperties/xesam.rdfs
diff --git a/sysutils/strigi/distinfo b/sysutils/strigi/distinfo
index 6697438c85d..1be4c664e65 100644
--- a/sysutils/strigi/distinfo
+++ b/sysutils/strigi/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/01/16 19:47:31 adam Exp $
+$NetBSD: distinfo,v 1.7 2013/02/04 20:21:08 markd Exp $
 
-SHA1 (strigi-0.6.4.tar.bz2) = e91f31cc59fdfc303b662a8af899efe1365643bf
-RMD160 (strigi-0.6.4.tar.bz2) = 4b72de166b077778caa2b3ff31c2168a62155bd1
-Size (strigi-0.6.4.tar.bz2) = 895552 bytes
-SHA1 (patch-aa) = 96bf66b656731db79f0a52e90e294afef010b252
-SHA1 (patch-src_daemon_strigithread.cpp) = 0356c1cbe6ca490e7a916d65e6b7113c26c4d511
-SHA1 (patch-src_luceneindexer_jsgzipcompressstream.h) = a8617a73c13e9da903b114336e0c45ceeb3dcb36
+SHA1 (strigi-0.7.7.tar.bz2) = a3100f851bb1a15231a863a5e66018946e3e8eb3
+RMD160 (strigi-0.7.7.tar.bz2) = 91610503ab3e9090bfd87213825112d3ab64deb8
+Size (strigi-0.7.7.tar.bz2) = 807093 bytes
diff --git a/sysutils/strigi/patches/patch-aa b/sysutils/strigi/patches/patch-aa
deleted file mode 100644
index e0dd22b16c2..00000000000
--- a/sysutils/strigi/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/01/09 22:22:04 markd Exp $
-
-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
-@@ -225,7 +225,7 @@ if (CppUnit_FOUND)
- endif (CppUnit_FOUND)
- 
- 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"
-   IMMEDIATE @ONLY)
- 
diff --git a/sysutils/strigi/patches/patch-src_daemon_strigithread.cpp b/sysutils/strigi/patches/patch-src_daemon_strigithread.cpp
deleted file mode 100644
index 7263d9f69f2..00000000000
--- a/sysutils/strigi/patches/patch-src_daemon_strigithread.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_daemon_strigithread.cpp,v 1.1 2011/02/17 09:45:00 markd Exp $
-
-Fix build with gcc4.3
-
---- src/daemon/strigithread.cpp.orig	2009-02-01 19:56:01.000000000 +0000
-+++ src/daemon/strigithread.cpp
-@@ -23,6 +23,7 @@
- 
- #include <string>
- #include <cstring>
-+#include <cstdio>
- #include <errno.h>
- #include <signal.h>
- #include <vector>
diff --git a/sysutils/strigi/patches/patch-src_luceneindexer_jsgzipcompressstream.h b/sysutils/strigi/patches/patch-src_luceneindexer_jsgzipcompressstream.h
deleted file mode 100644
index d7ef37e72bb..00000000000
--- a/sysutils/strigi/patches/patch-src_luceneindexer_jsgzipcompressstream.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_luceneindexer_jsgzipcompressstream.h,v 1.2 2012/01/16 19:47:31 adam Exp $
-
-Fix build with gcc4.3 and clang
-
---- src/luceneindexer/jsgzipcompressstream.h.orig	2009-02-01 19:55:38.000000000 +0000
-+++ src/luceneindexer/jsgzipcompressstream.h
-@@ -21,6 +21,8 @@
- #define GZIPCOMPRESSSTREAM_H
- 
- #include <strigi/strigiconfig.h>   // (u)int64_t
-+#include <cstdio>
-+#include <cstring>
- #include <CLucene/util/streambase.h>
- #include <CLucene/util/bufferedstream.h>
-