- Update to 0.7.5.

Submitted by:	Raphael Kubo da Costa <kubito@gmail.com> via area51

5 files changed, 37 insertions, 38 deletions

diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 27ef394cbc46..65d18f3984ad 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	strigi
-PORTVERSION=	0.7.2
-PORTREVISION=	2
+PORTVERSION=	0.7.5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.vandenoever.info/software/strigi/ \
 		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@@ -14,7 +13,8 @@ MASTER_SITES=	http://www.vandenoever.info/software/strigi/ \
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Desktop searching program
 
-LIB_DEPENDS=	clucene.0:${PORTSDIR}/textproc/clucene \
+LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
+		clucene.0:${PORTSDIR}/textproc/clucene \
 		dbus-1:${PORTSDIR}/devel/dbus \
 		exiv2.10:${PORTSDIR}/graphics/exiv2
 
@@ -22,7 +22,7 @@ USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui dbus moc_build uic_build qmake_build rcc_build
 USE_BZIP2=	yes
 USE_GNOME=	libxml2 pkgconfig
-# USE_FAM=	yes
+USE_FAM=	yes
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
 MAKE_JOBS_UNSAFE=	yes
@@ -31,10 +31,7 @@ post-patch:
 	${MKDIR} ${WRKSRC}
 	${REINPLACE_CMD} -e \
 		's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
-		${WRKSRC}/src/streamanalyzer/CMakeLists.txt \
-		${WRKSRC}/src/streams/CMakeLists.txt
-	${REINPLACE_CMD} -e \
-		's,\[56\],\[567\],' \
-		${WRKSRC}/src/xsd/CMakeLists.txt
+		${WRKSRC}/libstreamanalyzer/CMakeLists.txt \
+		${WRKSRC}/libstreams/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/deskutils/strigi/distinfo b/deskutils/strigi/distinfo
index f75518fa6945..148ccf97f86a 100644
--- a/deskutils/strigi/distinfo
+++ b/deskutils/strigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (strigi-0.7.2.tar.bz2) = 1ca421bbe420d1839bbe6bfe7c4b52a05590a9b7a7eda77924b554c98e602ab8
-SIZE (strigi-0.7.2.tar.bz2) = 936320
+SHA256 (strigi-0.7.5.tar.bz2) = 111f5e3ede171292302b906418af0175445ca01958d40fb54879f80620b5189b
+SIZE (strigi-0.7.5.tar.bz2) = 801845
diff --git a/deskutils/strigi/files/patch-config.h.cmake b/deskutils/strigi/files/patch-config.h.cmake
deleted file mode 100644
index 8a05f93576a7..000000000000
--- a/deskutils/strigi/files/patch-config.h.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./config.h.cmake.orig	2009-01-13 00:50:22.000000000 +0300
-+++ ./config.h.cmake	2009-03-21 00:02:27.000000000 +0300
-@@ -40,7 +40,7 @@
- //thread stuff
- //////////////////////////////
- #cmakedefine CMAKE_USE_WIN32_THREADS_INIT 1
--#cmakedefine CMAKE_HAVE_PTHREAD_CREATE 1
-+#cmakedefine CMAKE_HAVE_PTHREAD_H 1
- 
- //////////////////////////////
- //types
diff --git a/deskutils/strigi/files/patch-src__streams__strigi__strigi_thread.h b/deskutils/strigi/files/patch-src__streams__strigi__strigi_thread.h
deleted file mode 100644
index 941077a46cdd..000000000000
--- a/deskutils/strigi/files/patch-src__streams__strigi__strigi_thread.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/streams/strigi/strigi_thread.h.orig	2009-01-13 00:50:17.000000000 +0300
-+++ ./src/streams/strigi/strigi_thread.h	2009-03-21 00:01:51.000000000 +0300
-@@ -23,7 +23,7 @@
- 
- #include <config.h>
- 
--#if defined(CMAKE_HAVE_PTHREAD_CREATE)
-+#if defined(CMAKE_HAVE_PTHREAD_H)
-     #include <pthread.h>
-     #define STRIGI_MUTEX_DEFINE(x) pthread_mutex_t x
-     #define STRIGI_MUTEX_INIT(x) pthread_mutex_init(x, 0)
diff --git a/deskutils/strigi/pkg-plist b/deskutils/strigi/pkg-plist
index 1eff609fae83..e57588a6a270 100644
--- a/deskutils/strigi/pkg-plist
+++ b/deskutils/strigi/pkg-plist
@@ -10,17 +10,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 +35,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 +58,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,25 +66,32 @@ 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.0.7.2
+lib/libsearchclient.so.0.7.5
+lib/libsearchclient/LibSearchClientConfig.cmake
 lib/libstreamanalyzer.so
 lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.0.7.2
+lib/libstreamanalyzer.so.0.7.5
+lib/libstreamanalyzer/LibStreamAnalyzerConfig.cmake
 lib/libstreams.so
 lib/libstreams.so.0
-lib/libstreams.so.0.7.2
+lib/libstreams.so.0.7.5
+lib/libstreams/LibStreamsConfig.cmake
 lib/libstrigihtmlgui.so
 lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.0.7.2
+lib/libstrigihtmlgui.so.0.7.5
 lib/libstrigiqtdbusclient.so
 lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.0.7.2
+lib/libstrigiqtdbusclient.so.0.7.5
 lib/strigi/StrigiConfig.cmake
+lib/strigi/strigiea_ffmpeg.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
@@ -104,5 +125,8 @@ share/dbus-1/services/vandenoever.strigi.service
 @dirrmtry %%DATADIR%%/fieldproperties
 @dirrmtry %%DATADIR%%
 @dirrmtry lib/strigi
+@dirrmtry lib/libstreams
+@dirrmtry lib/libstreamanalyzer
+@dirrmtry lib/libsearchclient
 @dirrmtry include/strigi/qtdbus
 @dirrmtry include/strigi