svn commit: r315308 - in head: . Mk deskutils deskutils/libstreamanalyzer deskutils/libstreamanalyzer/files deskutils/libstreams deskutils/libstreams/files deskutils/strigi deskutils/strigi/files d...

Max Brazhnikov makc at FreeBSD.org
Tue Mar 26 15:43:13 UTC 2013 

Author: makc
Date: Tue Mar 26 15:43:09 2013
New Revision: 315308
URL: http://svnweb.freebsd.org/changeset/ports/315308

Log:
  - Split deskutils/strigi port on libraries, client, daemon and utilities.
    deskutils/strigi is a meta port now
  - USE_KDE4= strigi now implies dependence on deskutils/libstreamanalyzer

Added:
  head/deskutils/libstreamanalyzer/
     - copied from r315304, head/deskutils/strigi/
  head/deskutils/libstreams/
     - copied from r315304, head/deskutils/strigi/
  head/deskutils/strigi/Makefile.common   (contents, props changed)
     - copied, changed from r315304, head/deskutils/strigi/Makefile
  head/deskutils/strigiclient/
     - copied from r315304, head/deskutils/strigi/
  head/deskutils/strigidaemon/
     - copied from r315304, head/deskutils/strigi/
  head/deskutils/strigiutils/
     - copied from r315304, head/deskutils/strigi/
Deleted:
  head/deskutils/libstreamanalyzer/distinfo
  head/deskutils/libstreamanalyzer/files/patch-libstreams__CMakeLists.txt
  head/deskutils/libstreamanalyzer/pkg-descr
  head/deskutils/libstreams/distinfo
  head/deskutils/libstreams/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
  head/deskutils/libstreams/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake
  head/deskutils/libstreams/pkg-descr
  head/deskutils/strigi/files/
  head/deskutils/strigi/pkg-plist
  head/deskutils/strigiclient/distinfo
  head/deskutils/strigiclient/files/
  head/deskutils/strigiclient/pkg-descr
  head/deskutils/strigidaemon/distinfo
  head/deskutils/strigidaemon/files/
  head/deskutils/strigidaemon/pkg-descr
  head/deskutils/strigiutils/distinfo
  head/deskutils/strigiutils/files/
  head/deskutils/strigiutils/pkg-descr
Modified:
  head/Mk/bsd.kde4.mk
  head/UPDATING
  head/deskutils/Makefile
  head/deskutils/libstreamanalyzer/Makefile
  head/deskutils/libstreamanalyzer/pkg-plist
  head/deskutils/libstreams/Makefile
  head/deskutils/libstreams/pkg-plist
  head/deskutils/strigi/Makefile
  head/deskutils/strigiclient/Makefile
  head/deskutils/strigiclient/pkg-plist
  head/deskutils/strigidaemon/Makefile
  head/deskutils/strigidaemon/pkg-plist
  head/deskutils/strigiutils/Makefile
  head/deskutils/strigiutils/pkg-plist

Modified: head/Mk/bsd.kde4.mk
==============================================================================
--- head/Mk/bsd.kde4.mk	Tue Mar 26 15:39:08 2013	(r315307)
+++ head/Mk/bsd.kde4.mk	Tue Mar 26 15:43:09 2013	(r315308)
@@ -249,7 +249,7 @@ qimageblitz_PATH=	${LOCALBASE}/lib/libqi
 soprano_PORT=		textproc/soprano
 soprano_PATH=		${LOCALBASE}/lib/libsoprano.so.4
 
-strigi_PORT=		deskutils/strigi
+strigi_PORT=		deskutils/libstreamanalyzer
 strigi_PATH=		${LOCALBASE}/lib/libstreamanalyzer.so.0
 
 # Iterate through components deprived of suffix.

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Tue Mar 26 15:39:08 2013	(r315307)
+++ head/UPDATING	Tue Mar 26 15:43:09 2013	(r315308)
@@ -5,6 +5,16 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20130204:
+  AFFECTS: users of deskutils/strigi
+  AUTHOR: makc at FreeBSD.org
+
+  Strigi port has been split on libraries, client, daemon, and utilities.
+  Manual update is required:
+
+  # cd /usr/ports/deskutils/strigi && make deinstall && \
+    make clean && make install clean
+
 20130323:
   AFFECTS: users of archivers/libarchive
   AUTHOR: glewis at FreeBSD.org

Modified: head/deskutils/Makefile
==============================================================================
--- head/deskutils/Makefile	Tue Mar 26 15:39:08 2013	(r315307)
+++ head/deskutils/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
@@ -155,6 +155,8 @@
     SUBDIR += libopensync-plugin-synce-devel
     SUBDIR += libopensync-plugin-synce-legacy
     SUBDIR += libopensync-plugin-vformat-devel
+    SUBDIR += libstreamanalyzer
+    SUBDIR += libstreams
     SUBDIR += ljcharm
     SUBDIR += ljclive
     SUBDIR += ljit
@@ -239,6 +241,9 @@
     SUBDIR += splashsetter
     SUBDIR += steadyflow
     SUBDIR += strigi
+    SUBDIR += strigiclient
+    SUBDIR += strigidaemon
+    SUBDIR += strigiutils
     SUBDIR += sugarcrm
     SUBDIR += superkaramba
     SUBDIR += superswitcher

Modified: head/deskutils/libstreamanalyzer/Makefile
==============================================================================
--- head/deskutils/strigi/Makefile	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/libstreamanalyzer/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,32 +1,27 @@
-# Created by: Tilman Keskinoz <arved at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	strigi
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTNAME=	libstreamanalyzer
+PORTVERSION=	${STRIGI_VERSION}
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.vandenoever.info/software/strigi/
+MASTER_SITES=	${STRIGI_MASTER_SITES}
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Desktop searching program
+COMMENT=	Strigi desktop search: streamanalyzer library
 
 LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
 		clucene-core:${PORTSDIR}/textproc/clucene \
-		dbus-1:${PORTSDIR}/devel/dbus \
-		exiv2:${PORTSDIR}/graphics/exiv2
+		exiv2:${PORTSDIR}/graphics/exiv2 \
+		streams:${PORTSDIR}/deskutils/libstreams
 
-USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
-USE_BZIP2=	yes
+USE_ICONV=	yes
 USE_GNOME=	libxml2
 USE_PKGCONFIG=	build
-USE_FAM=	yes
 USE_LDCONFIG=	yes
-USES=		cmake:outsource
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
 
 # supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
 # corresponding FFMPEG_SUFFIX: '', '1', '-devel'
-FFMPEG_SUFFIX?=	#
+FFMPEG_SUFFIX?=	1
 CMAKE_ARGS+=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFFIX}"
 
 .if !empty(FFMPEG_SUFFIX)
@@ -39,7 +34,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extrapatch-l
 post-patch:
 	${REINPLACE_CMD} -e \
 		's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
-		${WRKSRC}/libstreamanalyzer/CMakeLists.txt \
-		${WRKSRC}/libstreams/CMakeLists.txt
+		${WRKSRC}/libstreamanalyzer/CMakeLists.txt
 
+.include <${.CURDIR}/../strigi/Makefile.common>
 .include <bsd.port.mk>

Modified: head/deskutils/libstreamanalyzer/pkg-plist
==============================================================================
--- head/deskutils/strigi/pkg-plist	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/libstreamanalyzer/pkg-plist	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,99 +1,35 @@
-bin/deepfind
-bin/deepgrep
 bin/lucene2indexer
-bin/rdfindexer
-bin/strigiclient
-bin/strigicmd
-bin/strigidaemon
-bin/xmlindexer
 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
 include/strigi/indexpluginloader.h
 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
-include/strigi/streambuffer.h
 include/strigi/streamendanalyzer.h
 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
-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/cmake/LibSearchClient/LibSearchClientConfig.cmake
 lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
 lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfigVersion.cmake
-lib/cmake/LibStreams/LibStreamsConfig.cmake
-lib/cmake/LibStreams/LibStreamsConfigVersion.cmake
-lib/cmake/LibStreams/LibStreamsTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/LibStreams/LibStreamsTargets.cmake
-lib/cmake/Strigi/StrigiConfig.cmake
-lib/cmake/Strigi/StrigiConfigVersion.cmake
-lib/libsearchclient.so
-lib/libsearchclient.so.0
-lib/libsearchclient.so.0.7.8
 lib/libstreamanalyzer.so
 lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.0.7.8
-lib/libstreams.so
-lib/libstreams.so.0
-lib/libstreams.so.0.7.8
-lib/libstrigihtmlgui.so
-lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.0.7.8
-lib/libstrigiqtdbusclient.so
-lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.0.7.8
+lib/libstreamanalyzer.so.%%SHLIB_VER%%
 lib/strigi/strigiea_digest.so
 lib/strigi/strigiea_ffmpeg.so
 lib/strigi/strigiea_jpeg.so
@@ -115,9 +51,6 @@ lib/strigi/strigita_sid.so
 lib/strigi/strigita_wav.so
 lib/strigi/strigita_xbm.so
 libdata/pkgconfig/libstreamanalyzer.pc
-libdata/pkgconfig/libstreams.pc
-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
@@ -131,10 +64,6 @@ share/strigi/fieldproperties/strigi.rdfs
 @dirrmtry share/strigi/fieldproperties
 @dirrmtry share/strigi
 @dirrmtry lib/strigi
- at dirrmtry lib/cmake/Strigi
- at dirrmtry lib/cmake/LibStreams
- at dirrmtry lib/cmake/LibStreamAnalyzer
- at dirrmtry lib/cmake/LibSearchClient
+ at dirrm lib/cmake/LibStreamAnalyzer
 @dirrmtry lib/cmake
- at dirrmtry include/strigi/qtdbus
 @dirrmtry include/strigi

Modified: head/deskutils/libstreams/Makefile
==============================================================================
--- head/deskutils/strigi/Makefile	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/libstreams/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,45 +1,21 @@
-# Created by: Tilman Keskinoz <arved at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	strigi
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTNAME=	libstreams
+PORTVERSION=	${STRIGI_VERSION}
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.vandenoever.info/software/strigi/
+MASTER_SITES=	${STRIGI_MASTER_SITES}
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Desktop searching program
+COMMENT=	Strigi desktop search: streams library
 
-LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
-		clucene-core:${PORTSDIR}/textproc/clucene \
-		dbus-1:${PORTSDIR}/devel/dbus \
-		exiv2:${PORTSDIR}/graphics/exiv2
-
-USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
-USE_BZIP2=	yes
-USE_GNOME=	libxml2
-USE_PKGCONFIG=	build
-USE_FAM=	yes
+USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USES=		cmake:outsource
-MAKE_JOBS_UNSAFE=	yes
-
-# supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
-# corresponding FFMPEG_SUFFIX: '', '1', '-devel'
-FFMPEG_SUFFIX?=	#
-CMAKE_ARGS+=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFFIX}"
-
-.if !empty(FFMPEG_SUFFIX)
-# Reorder include directories to allow build with multiple ffmpeg installed.
-# This patch must NOT be used, if ffmpeg headers are installed
-# directly to ${LOCALBASE}/include
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
-.endif
+MAKE_JOBS_SAFE=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e \
 		's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
-		${WRKSRC}/libstreamanalyzer/CMakeLists.txt \
 		${WRKSRC}/libstreams/CMakeLists.txt
 
+.include <${.CURDIR}/../strigi/Makefile.common>
 .include <bsd.port.mk>

Modified: head/deskutils/libstreams/pkg-plist
==============================================================================
--- head/deskutils/strigi/pkg-plist	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/libstreams/pkg-plist	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,38 +1,12 @@
-bin/deepfind
-bin/deepgrep
-bin/lucene2indexer
-bin/rdfindexer
-bin/strigiclient
-bin/strigicmd
-bin/strigidaemon
-bin/xmlindexer
-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
-include/strigi/indexpluginloader.h
-include/strigi/indexreader.h
-include/strigi/indexwriter.h
 include/strigi/inputstream.h
 include/strigi/inputstreamreader.h
 include/strigi/kmpsearcher.h
@@ -40,27 +14,11 @@ 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
 include/strigi/streambuffer.h
-include/strigi/streamendanalyzer.h
-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
 include/strigi/stringterminatedsubstream.h
 include/strigi/subinputstream.h
@@ -68,73 +26,18 @@ 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/cmake/LibSearchClient/LibSearchClientConfig.cmake
-lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
-lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfigVersion.cmake
 lib/cmake/LibStreams/LibStreamsConfig.cmake
 lib/cmake/LibStreams/LibStreamsConfigVersion.cmake
 lib/cmake/LibStreams/LibStreamsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/LibStreams/LibStreamsTargets.cmake
 lib/cmake/Strigi/StrigiConfig.cmake
 lib/cmake/Strigi/StrigiConfigVersion.cmake
-lib/libsearchclient.so
-lib/libsearchclient.so.0
-lib/libsearchclient.so.0.7.8
-lib/libstreamanalyzer.so
-lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.0.7.8
 lib/libstreams.so
 lib/libstreams.so.0
-lib/libstreams.so.0.7.8
-lib/libstrigihtmlgui.so
-lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.0.7.8
-lib/libstrigiqtdbusclient.so
-lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.0.7.8
-lib/strigi/strigiea_digest.so
-lib/strigi/strigiea_ffmpeg.so
-lib/strigi/strigiea_jpeg.so
-lib/strigi/strigiea_riff.so
-lib/strigi/strigiindex_cluceneng.so
-lib/strigi/strigila_cpp.so
-lib/strigi/strigila_deb.so
-lib/strigi/strigila_namespaceharvester.so
-lib/strigi/strigila_txt.so
-lib/strigi/strigila_xpm.so
-lib/strigi/strigita_au.so
-lib/strigi/strigita_avi.so
-lib/strigi/strigita_dds.so
-lib/strigi/strigita_gif.so
-lib/strigi/strigita_ico.so
-lib/strigi/strigita_pcx.so
-lib/strigi/strigita_rgb.so
-lib/strigi/strigita_sid.so
-lib/strigi/strigita_wav.so
-lib/strigi/strigita_xbm.so
-libdata/pkgconfig/libstreamanalyzer.pc
+lib/libstreams.so.%%SHLIB_VER%%
 libdata/pkgconfig/libstreams.pc
-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
- at dirrmtry share/strigi/fieldproperties
- at dirrmtry share/strigi
- at dirrmtry lib/strigi
 @dirrmtry lib/cmake/Strigi
- at dirrmtry lib/cmake/LibStreams
- at dirrmtry lib/cmake/LibStreamAnalyzer
- at dirrmtry lib/cmake/LibSearchClient
+ at dirrm lib/cmake/LibStreams
 @dirrmtry lib/cmake
- at dirrmtry include/strigi/qtdbus
 @dirrmtry include/strigi

Modified: head/deskutils/strigi/Makefile
==============================================================================
--- head/deskutils/strigi/Makefile	Tue Mar 26 15:39:08 2013	(r315307)
+++ head/deskutils/strigi/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
@@ -2,44 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	strigi
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTVERSION=	${STRIGI_VERSION}
+PORTREVISION=	2
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.vandenoever.info/software/strigi/
+DISTFILES=      #
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Desktop searching program
+COMMENT=	Strigi desktop search (meta port)
 
-LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
-		clucene-core:${PORTSDIR}/textproc/clucene \
-		dbus-1:${PORTSDIR}/devel/dbus \
-		exiv2:${PORTSDIR}/graphics/exiv2
-
-USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
-USE_BZIP2=	yes
-USE_GNOME=	libxml2
-USE_PKGCONFIG=	build
-USE_FAM=	yes
-USE_LDCONFIG=	yes
-USES=		cmake:outsource
-MAKE_JOBS_UNSAFE=	yes
-
-# supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
-# corresponding FFMPEG_SUFFIX: '', '1', '-devel'
-FFMPEG_SUFFIX?=	#
-CMAKE_ARGS+=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFFIX}"
-
-.if !empty(FFMPEG_SUFFIX)
-# Reorder include directories to allow build with multiple ffmpeg installed.
-# This patch must NOT be used, if ffmpeg headers are installed
-# directly to ${LOCALBASE}/include
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
+USE_KDE4=	strigi_run
+NO_BUILD=	yes
+
+OPTIONS_DEFINE=	CLIENT DAEMON UTILITIES
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+
+.include <${.CURDIR}/Makefile.common>
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MCLIENT}
+RUN_DEPENDS+=	${LOCALBASE}/bin/strigiclient:${PORTSDIR}/deskutils/strigiclient
+.endif
+
+.if ${PORT_OPTIONS:MDAEMON}
+RUN_DEPENDS+=	${LOCALBASE}/bin/strigidaemon:${PORTSDIR}/deskutils/strigidaemon
+.endif
+
+.if ${PORT_OPTIONS:MUTILITIES}
+RUN_DEPENDS+=	${LOCALBASE}/bin/xmlindexer:${PORTSDIR}/deskutils/strigiutils
 .endif
 
-post-patch:
-	${REINPLACE_CMD} -e \
-		's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
-		${WRKSRC}/libstreamanalyzer/CMakeLists.txt \
-		${WRKSRC}/libstreams/CMakeLists.txt
+do-install:
+	@${DO_NADA}
 
 .include <bsd.port.mk>

Copied and modified: head/deskutils/strigi/Makefile.common (from r315304, head/deskutils/strigi/Makefile)
==============================================================================
--- head/deskutils/strigi/Makefile	Tue Mar 26 14:48:17 2013	(r315304, copy source)
+++ head/deskutils/strigi/Makefile.common	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,45 +1,16 @@
-# Created by: Tilman Keskinoz <arved at FreeBSD.org>
-# $FreeBSD$
+STRIGI_VERSION=		0.7.8
+STRIGI_MASTER_SITES=	http://www.vandenoever.info/software/strigi/
 
-PORTNAME=	strigi
-PORTVERSION=	0.7.8
-PORTREVISION=	1
-CATEGORIES=	deskutils
-MASTER_SITES=	http://www.vandenoever.info/software/strigi/
+.if !defined(NO_BUILD)
+DISTNAME=		strigi-${STRIGI_VERSION}
+DISTINFO_FILE=		${.CURDIR}/../strigi/distinfo
+DESCR=			${.CURDIR}/../strigi/pkg-descr
 
-MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Desktop searching program
+CONFLICTS_INSTALL=	strigi-0.*
 
-LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
-		clucene-core:${PORTSDIR}/textproc/clucene \
-		dbus-1:${PORTSDIR}/devel/dbus \
-		exiv2:${PORTSDIR}/graphics/exiv2
+USE_BZIP2=		yes
+USES+=			cmake:outsource
+CMAKE_SOURCE_PATH=	${WRKSRC}/${PORTNAME}
 
-USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
-USE_BZIP2=	yes
-USE_GNOME=	libxml2
-USE_PKGCONFIG=	build
-USE_FAM=	yes
-USE_LDCONFIG=	yes
-USES=		cmake:outsource
-MAKE_JOBS_UNSAFE=	yes
-
-# supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
-# corresponding FFMPEG_SUFFIX: '', '1', '-devel'
-FFMPEG_SUFFIX?=	#
-CMAKE_ARGS+=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFFIX}"
-
-.if !empty(FFMPEG_SUFFIX)
-# Reorder include directories to allow build with multiple ffmpeg installed.
-# This patch must NOT be used, if ffmpeg headers are installed
-# directly to ${LOCALBASE}/include
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
+PLIST_SUB=		SHLIB_VER=${STRIGI_VERSION}
 .endif
-
-post-patch:
-	${REINPLACE_CMD} -e \
-		's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
-		${WRKSRC}/libstreamanalyzer/CMakeLists.txt \
-		${WRKSRC}/libstreams/CMakeLists.txt
-
-.include <bsd.port.mk>

Modified: head/deskutils/strigiclient/Makefile
==============================================================================
--- head/deskutils/strigi/Makefile	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/strigiclient/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,45 +1,20 @@
-# Created by: Tilman Keskinoz <arved at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	strigi
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTNAME=	strigiclient
+PORTVERSION=	${STRIGI_VERSION}
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.vandenoever.info/software/strigi/
+MASTER_SITES=	${STRIGI_MASTER_SITES}
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Desktop searching program
+COMMENT=	Strigi desktop search: Qt4 GUI
 
-LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
-		clucene-core:${PORTSDIR}/textproc/clucene \
-		dbus-1:${PORTSDIR}/devel/dbus \
-		exiv2:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	streams:${PORTSDIR}/deskutils/libstreams \
+		streamanalyzer:${PORTSDIR}/deskutils/libstreamanalyzer \
+		searchclient:${PORTSDIR}/deskutils/strigidaemon
 
 USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
-USE_BZIP2=	yes
-USE_GNOME=	libxml2
-USE_PKGCONFIG=	build
-USE_FAM=	yes
 USE_LDCONFIG=	yes
-USES=		cmake:outsource
-MAKE_JOBS_UNSAFE=	yes
-
-# supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
-# corresponding FFMPEG_SUFFIX: '', '1', '-devel'
-FFMPEG_SUFFIX?=	#
-CMAKE_ARGS+=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFFIX}"
-
-.if !empty(FFMPEG_SUFFIX)
-# Reorder include directories to allow build with multiple ffmpeg installed.
-# This patch must NOT be used, if ffmpeg headers are installed
-# directly to ${LOCALBASE}/include
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e \
-		's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
-		${WRKSRC}/libstreamanalyzer/CMakeLists.txt \
-		${WRKSRC}/libstreams/CMakeLists.txt
+MAKE_JOBS_SAFE=	yes
 
+.include <${.CURDIR}/../strigi/Makefile.common>
 .include <bsd.port.mk>

Modified: head/deskutils/strigiclient/pkg-plist
==============================================================================
--- head/deskutils/strigi/pkg-plist	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/strigiclient/pkg-plist	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,140 +1,14 @@
-bin/deepfind
-bin/deepgrep
-bin/lucene2indexer
-bin/rdfindexer
 bin/strigiclient
-bin/strigicmd
-bin/strigidaemon
-bin/xmlindexer
-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
-include/strigi/indexpluginloader.h
-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
-include/strigi/streambuffer.h
-include/strigi/streamendanalyzer.h
-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
-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/cmake/LibSearchClient/LibSearchClientConfig.cmake
-lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
-lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfigVersion.cmake
-lib/cmake/LibStreams/LibStreamsConfig.cmake
-lib/cmake/LibStreams/LibStreamsConfigVersion.cmake
-lib/cmake/LibStreams/LibStreamsTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/LibStreams/LibStreamsTargets.cmake
-lib/cmake/Strigi/StrigiConfig.cmake
-lib/cmake/Strigi/StrigiConfigVersion.cmake
-lib/libsearchclient.so
-lib/libsearchclient.so.0
-lib/libsearchclient.so.0.7.8
-lib/libstreamanalyzer.so
-lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.0.7.8
-lib/libstreams.so
-lib/libstreams.so.0
-lib/libstreams.so.0.7.8
 lib/libstrigihtmlgui.so
 lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.0.7.8
+lib/libstrigihtmlgui.so.%%SHLIB_VER%%
 lib/libstrigiqtdbusclient.so
 lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.0.7.8
-lib/strigi/strigiea_digest.so
-lib/strigi/strigiea_ffmpeg.so
-lib/strigi/strigiea_jpeg.so
-lib/strigi/strigiea_riff.so
-lib/strigi/strigiindex_cluceneng.so
-lib/strigi/strigila_cpp.so
-lib/strigi/strigila_deb.so
-lib/strigi/strigila_namespaceharvester.so
-lib/strigi/strigila_txt.so
-lib/strigi/strigila_xpm.so
-lib/strigi/strigita_au.so
-lib/strigi/strigita_avi.so
-lib/strigi/strigita_dds.so
-lib/strigi/strigita_gif.so
-lib/strigi/strigita_ico.so
-lib/strigi/strigita_pcx.so
-lib/strigi/strigita_rgb.so
-lib/strigi/strigita_sid.so
-lib/strigi/strigita_wav.so
-lib/strigi/strigita_xbm.so
-libdata/pkgconfig/libstreamanalyzer.pc
-libdata/pkgconfig/libstreams.pc
-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
- at dirrmtry share/strigi/fieldproperties
- at dirrmtry share/strigi
- at dirrmtry lib/strigi
- at dirrmtry lib/cmake/Strigi
- at dirrmtry lib/cmake/LibStreams
- at dirrmtry lib/cmake/LibStreamAnalyzer
- at dirrmtry lib/cmake/LibSearchClient
- at dirrmtry lib/cmake
- at dirrmtry include/strigi/qtdbus
+lib/libstrigiqtdbusclient.so.%%SHLIB_VER%%
+ at dirrm include/strigi/qtdbus
 @dirrmtry include/strigi

Modified: head/deskutils/strigidaemon/Makefile
==============================================================================
--- head/deskutils/strigi/Makefile	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/strigidaemon/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,45 +1,22 @@
-# Created by: Tilman Keskinoz <arved at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	strigi
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTNAME=	strigidaemon
+PORTVERSION=	${STRIGI_VERSION}
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.vandenoever.info/software/strigi/
+MASTER_SITES=	${STRIGI_MASTER_SITES}
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Desktop searching program
+COMMENT=	Strigi desktop search: daemon
 
-LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
-		clucene-core:${PORTSDIR}/textproc/clucene \
-		dbus-1:${PORTSDIR}/devel/dbus \
-		exiv2:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
+		streams:${PORTSDIR}/deskutils/libstreams \
+		streamanalyzer:${PORTSDIR}/deskutils/libstreamanalyzer
 
-USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
-USE_BZIP2=	yes
+USE_FAM=	yes
 USE_GNOME=	libxml2
 USE_PKGCONFIG=	build
-USE_FAM=	yes
 USE_LDCONFIG=	yes
-USES=		cmake:outsource
-MAKE_JOBS_UNSAFE=	yes
-
-# supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
-# corresponding FFMPEG_SUFFIX: '', '1', '-devel'
-FFMPEG_SUFFIX?=	#
-CMAKE_ARGS+=	-DFFMPEG_SUFFIX:STRING="${FFMPEG_SUFFIX}"
-
-.if !empty(FFMPEG_SUFFIX)
-# Reorder include directories to allow build with multiple ffmpeg installed.
-# This patch must NOT be used, if ffmpeg headers are installed
-# directly to ${LOCALBASE}/include
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e \
-		's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
-		${WRKSRC}/libstreamanalyzer/CMakeLists.txt \
-		${WRKSRC}/libstreams/CMakeLists.txt
+MAKE_JOBS_SAFE=	yes
 
+.include <${.CURDIR}/../strigi/Makefile.common>
 .include <bsd.port.mk>

Modified: head/deskutils/strigidaemon/pkg-plist
==============================================================================
--- head/deskutils/strigi/pkg-plist	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/strigidaemon/pkg-plist	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,140 +1,15 @@
-bin/deepfind
-bin/deepgrep
-bin/lucene2indexer
-bin/rdfindexer
-bin/strigiclient
 bin/strigicmd
 bin/strigidaemon
-bin/xmlindexer
-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
-include/strigi/indexpluginloader.h
-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
-include/strigi/streambuffer.h
-include/strigi/streamendanalyzer.h
-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
-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/cmake/LibSearchClient/LibSearchClientConfig.cmake
-lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
-lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfigVersion.cmake
-lib/cmake/LibStreams/LibStreamsConfig.cmake
-lib/cmake/LibStreams/LibStreamsConfigVersion.cmake
-lib/cmake/LibStreams/LibStreamsTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/LibStreams/LibStreamsTargets.cmake
-lib/cmake/Strigi/StrigiConfig.cmake
-lib/cmake/Strigi/StrigiConfigVersion.cmake
 lib/libsearchclient.so
 lib/libsearchclient.so.0
-lib/libsearchclient.so.0.7.8
-lib/libstreamanalyzer.so
-lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.0.7.8
-lib/libstreams.so
-lib/libstreams.so.0
-lib/libstreams.so.0.7.8
-lib/libstrigihtmlgui.so
-lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.0.7.8
-lib/libstrigiqtdbusclient.so
-lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.0.7.8
-lib/strigi/strigiea_digest.so
-lib/strigi/strigiea_ffmpeg.so
-lib/strigi/strigiea_jpeg.so
-lib/strigi/strigiea_riff.so
-lib/strigi/strigiindex_cluceneng.so
-lib/strigi/strigila_cpp.so
-lib/strigi/strigila_deb.so
-lib/strigi/strigila_namespaceharvester.so
-lib/strigi/strigila_txt.so
-lib/strigi/strigila_xpm.so
-lib/strigi/strigita_au.so
-lib/strigi/strigita_avi.so
-lib/strigi/strigita_dds.so
-lib/strigi/strigita_gif.so
-lib/strigi/strigita_ico.so
-lib/strigi/strigita_pcx.so
-lib/strigi/strigita_rgb.so
-lib/strigi/strigita_sid.so
-lib/strigi/strigita_wav.so
-lib/strigi/strigita_xbm.so
-libdata/pkgconfig/libstreamanalyzer.pc
-libdata/pkgconfig/libstreams.pc
+lib/libsearchclient.so.%%SHLIB_VER%%
 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
- at dirrmtry share/strigi/fieldproperties
- at dirrmtry share/strigi
- at dirrmtry lib/strigi
- at dirrmtry lib/cmake/Strigi
- at dirrmtry lib/cmake/LibStreams
- at dirrmtry lib/cmake/LibStreamAnalyzer
- at dirrmtry lib/cmake/LibSearchClient
+ at dirrm lib/cmake/LibSearchClient
 @dirrmtry lib/cmake
- at dirrmtry include/strigi/qtdbus
 @dirrmtry include/strigi

Modified: head/deskutils/strigiutils/Makefile
==============================================================================
--- head/deskutils/strigi/Makefile	Tue Mar 26 14:48:17 2013	(r315304)
+++ head/deskutils/strigiutils/Makefile	Tue Mar 26 15:43:09 2013	(r315308)
@@ -1,45 +1,17 @@
-# Created by: Tilman Keskinoz <arved at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	strigi
-PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTNAME=	strigiutils
+PORTVERSION=	${STRIGI_VERSION}
 CATEGORIES=	deskutils
-MASTER_SITES=	http://www.vandenoever.info/software/strigi/
+MASTER_SITES=	${STRIGI_MASTER_SITES}
 
 MAINTAINER=	kde at FreeBSD.org
-COMMENT=	Desktop searching program
+COMMENT=	Strigi desktop search: utilities
 
-LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
-		clucene-core:${PORTSDIR}/textproc/clucene \
-		dbus-1:${PORTSDIR}/devel/dbus \
-		exiv2:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS=	streams:${PORTSDIR}/deskutils/libstreams \
+		streamanalyzer:${PORTSDIR}/deskutils/libstreamanalyzer
 
-USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
-USE_BZIP2=	yes
-USE_GNOME=	libxml2
-USE_PKGCONFIG=	build
-USE_FAM=	yes
-USE_LDCONFIG=	yes
-USES=		cmake:outsource

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list