aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.kde4.mk2
-rw-r--r--UPDATING10
-rw-r--r--deskutils/Makefile5
-rw-r--r--deskutils/libstreamanalyzer/Makefile40
-rw-r--r--deskutils/libstreamanalyzer/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt (renamed from deskutils/strigi/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt)0
-rw-r--r--deskutils/libstreamanalyzer/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake (renamed from deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake)0
-rw-r--r--deskutils/libstreamanalyzer/pkg-plist69
-rw-r--r--deskutils/libstreams/Makefile21
-rw-r--r--deskutils/libstreams/files/patch-libstreams__CMakeLists.txt (renamed from deskutils/strigi/files/patch-libstreams__CMakeLists.txt)0
-rw-r--r--deskutils/libstreams/pkg-plist43
-rw-r--r--deskutils/strigi/Makefile60
-rw-r--r--deskutils/strigi/Makefile.common16
-rw-r--r--deskutils/strigi/pkg-plist140
-rw-r--r--deskutils/strigiclient/Makefile20
-rw-r--r--deskutils/strigiclient/pkg-plist14
-rw-r--r--deskutils/strigidaemon/Makefile22
-rw-r--r--deskutils/strigidaemon/pkg-plist15
-rw-r--r--deskutils/strigiutils/Makefile17
-rw-r--r--deskutils/strigiutils/pkg-plist4
19 files changed, 323 insertions, 175 deletions
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 5d54aea081a4..d50580971f83 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -249,7 +249,7 @@ qimageblitz_PATH= ${LOCALBASE}/lib/libqimageblitz.so.4
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.
diff --git a/UPDATING b/UPDATING
index f80d63dcb96a..1841e1d34615 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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@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@FreeBSD.org
diff --git a/deskutils/Makefile b/deskutils/Makefile
index a62903ee248a..a23f8f1da9cc 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -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
diff --git a/deskutils/libstreamanalyzer/Makefile b/deskutils/libstreamanalyzer/Makefile
new file mode 100644
index 000000000000..63a4969688c3
--- /dev/null
+++ b/deskutils/libstreamanalyzer/Makefile
@@ -0,0 +1,40 @@
+# $FreeBSD$
+
+PORTNAME= libstreamanalyzer
+PORTVERSION= ${STRIGI_VERSION}
+CATEGORIES= deskutils
+MASTER_SITES= ${STRIGI_MASTER_SITES}
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Strigi desktop search: streamanalyzer library
+
+LIB_DEPENDS= avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
+ clucene-core:${PORTSDIR}/textproc/clucene \
+ exiv2:${PORTSDIR}/graphics/exiv2 \
+ streams:${PORTSDIR}/deskutils/libstreams
+
+USE_ICONV= yes
+USE_GNOME= libxml2
+USE_PKGCONFIG= build
+USE_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
+
+# supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
+# corresponding FFMPEG_SUFFIX: '', '1', '-devel'
+FFMPEG_SUFFIX?= 1
+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
+
+.include <${.CURDIR}/../strigi/Makefile.common>
+.include <bsd.port.mk>
diff --git a/deskutils/strigi/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt b/deskutils/libstreamanalyzer/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
index bfa8aaa27bd0..bfa8aaa27bd0 100644
--- a/deskutils/strigi/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
+++ b/deskutils/libstreamanalyzer/files/extrapatch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
diff --git a/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake b/deskutils/libstreamanalyzer/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake
index 37c9af318e40..37c9af318e40 100644
--- a/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake
+++ b/deskutils/libstreamanalyzer/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake
diff --git a/deskutils/libstreamanalyzer/pkg-plist b/deskutils/libstreamanalyzer/pkg-plist
new file mode 100644
index 000000000000..c6c23ad18c28
--- /dev/null
+++ b/deskutils/libstreamanalyzer/pkg-plist
@@ -0,0 +1,69 @@
+bin/lucene2indexer
+include/strigi/analysisresult.h
+include/strigi/analyzerconfiguration.h
+include/strigi/analyzerplugin.h
+include/strigi/classproperties.h
+include/strigi/diranalyzer.h
+include/strigi/fieldproperties.h
+include/strigi/fieldpropertiesdb.h
+include/strigi/fieldtypes.h
+include/strigi/filelister.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/query.h
+include/strigi/queryparser.h
+include/strigi/streamanalyzer.h
+include/strigi/streamanalyzerfactory.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/variant.h
+lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
+lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfigVersion.cmake
+lib/libstreamanalyzer.so
+lib/libstreamanalyzer.so.0
+lib/libstreamanalyzer.so.%%SHLIB_VER%%
+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
+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
+@dirrmtry share/strigi/fieldproperties
+@dirrmtry share/strigi
+@dirrmtry lib/strigi
+@dirrm lib/cmake/LibStreamAnalyzer
+@dirrmtry lib/cmake
+@dirrmtry include/strigi
diff --git a/deskutils/libstreams/Makefile b/deskutils/libstreams/Makefile
new file mode 100644
index 000000000000..1d5178558067
--- /dev/null
+++ b/deskutils/libstreams/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME= libstreams
+PORTVERSION= ${STRIGI_VERSION}
+CATEGORIES= deskutils
+MASTER_SITES= ${STRIGI_MASTER_SITES}
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Strigi desktop search: streams library
+
+USE_ICONV= yes
+USE_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
+
+post-patch:
+ ${REINPLACE_CMD} -e \
+ 's,$${LIB_DESTINATION}/pkgconfig,libdata/pkgconfig,' \
+ ${WRKSRC}/libstreams/CMakeLists.txt
+
+.include <${.CURDIR}/../strigi/Makefile.common>
+.include <bsd.port.mk>
diff --git a/deskutils/strigi/files/patch-libstreams__CMakeLists.txt b/deskutils/libstreams/files/patch-libstreams__CMakeLists.txt
index 652a79f97cfd..652a79f97cfd 100644
--- a/deskutils/strigi/files/patch-libstreams__CMakeLists.txt
+++ b/deskutils/libstreams/files/patch-libstreams__CMakeLists.txt
diff --git a/deskutils/libstreams/pkg-plist b/deskutils/libstreams/pkg-plist
new file mode 100644
index 000000000000..ec4c35dad028
--- /dev/null
+++ b/deskutils/libstreams/pkg-plist
@@ -0,0 +1,43 @@
+include/strigi/archivereader.h
+include/strigi/arinputstream.h
+include/strigi/bufferedstream.h
+include/strigi/bz2inputstream.h
+include/strigi/cpioinputstream.h
+include/strigi/dataeventinputstream.h
+include/strigi/encodinginputstream.h
+include/strigi/fileinputstream.h
+include/strigi/gzipinputstream.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/rpminputstream.h
+include/strigi/sdfinputstream.h
+include/strigi/streambase.h
+include/strigi/streambuffer.h
+include/strigi/strigiconfig.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/zipinputstream.h
+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/libstreams.so
+lib/libstreams.so.0
+lib/libstreams.so.%%SHLIB_VER%%
+libdata/pkgconfig/libstreams.pc
+@dirrmtry lib/cmake/Strigi
+@dirrm lib/cmake/LibStreams
+@dirrmtry lib/cmake
+@dirrmtry include/strigi
diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 727e11fb42f0..8c10d12b4aa5 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -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@FreeBSD.org
-COMMENT= Desktop searching program
-
-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
+COMMENT= Strigi desktop search (meta port)
+
+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>
diff --git a/deskutils/strigi/Makefile.common b/deskutils/strigi/Makefile.common
new file mode 100644
index 000000000000..b4ec06c1ee60
--- /dev/null
+++ b/deskutils/strigi/Makefile.common
@@ -0,0 +1,16 @@
+STRIGI_VERSION= 0.7.8
+STRIGI_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
+
+CONFLICTS_INSTALL= strigi-0.*
+
+USE_BZIP2= yes
+USES+= cmake:outsource
+CMAKE_SOURCE_PATH= ${WRKSRC}/${PORTNAME}
+
+PLIST_SUB= SHLIB_VER=${STRIGI_VERSION}
+.endif
diff --git a/deskutils/strigi/pkg-plist b/deskutils/strigi/pkg-plist
deleted file mode 100644
index 41a517bd6ebe..000000000000
--- a/deskutils/strigi/pkg-plist
+++ /dev/null
@@ -1,140 +0,0 @@
-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
-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
-@dirrmtry share/strigi/fieldproperties
-@dirrmtry share/strigi
-@dirrmtry lib/strigi
-@dirrmtry lib/cmake/Strigi
-@dirrmtry lib/cmake/LibStreams
-@dirrmtry lib/cmake/LibStreamAnalyzer
-@dirrmtry lib/cmake/LibSearchClient
-@dirrmtry lib/cmake
-@dirrmtry include/strigi/qtdbus
-@dirrmtry include/strigi
diff --git a/deskutils/strigiclient/Makefile b/deskutils/strigiclient/Makefile
new file mode 100644
index 000000000000..f8b81789e636
--- /dev/null
+++ b/deskutils/strigiclient/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= strigiclient
+PORTVERSION= ${STRIGI_VERSION}
+CATEGORIES= deskutils
+MASTER_SITES= ${STRIGI_MASTER_SITES}
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Strigi desktop search: Qt4 GUI
+
+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_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
+
+.include <${.CURDIR}/../strigi/Makefile.common>
+.include <bsd.port.mk>
diff --git a/deskutils/strigiclient/pkg-plist b/deskutils/strigiclient/pkg-plist
new file mode 100644
index 000000000000..88a7b140ebc3
--- /dev/null
+++ b/deskutils/strigiclient/pkg-plist
@@ -0,0 +1,14 @@
+bin/strigiclient
+include/strigi/qtdbus/strigiasyncclient.h
+include/strigi/qtdbus/strigiclient.h
+include/strigi/qtdbus/strigidbus.h
+include/strigi/qtdbus/strigitypes.h
+include/strigi/strigihtmlgui.h
+lib/libstrigihtmlgui.so
+lib/libstrigihtmlgui.so.0
+lib/libstrigihtmlgui.so.%%SHLIB_VER%%
+lib/libstrigiqtdbusclient.so
+lib/libstrigiqtdbusclient.so.0
+lib/libstrigiqtdbusclient.so.%%SHLIB_VER%%
+@dirrm include/strigi/qtdbus
+@dirrmtry include/strigi
diff --git a/deskutils/strigidaemon/Makefile b/deskutils/strigidaemon/Makefile
new file mode 100644
index 000000000000..59f46397e365
--- /dev/null
+++ b/deskutils/strigidaemon/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME= strigidaemon
+PORTVERSION= ${STRIGI_VERSION}
+CATEGORIES= deskutils
+MASTER_SITES= ${STRIGI_MASTER_SITES}
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Strigi desktop search: daemon
+
+LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \
+ streams:${PORTSDIR}/deskutils/libstreams \
+ streamanalyzer:${PORTSDIR}/deskutils/libstreamanalyzer
+
+USE_FAM= yes
+USE_GNOME= libxml2
+USE_PKGCONFIG= build
+USE_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
+
+.include <${.CURDIR}/../strigi/Makefile.common>
+.include <bsd.port.mk>
diff --git a/deskutils/strigidaemon/pkg-plist b/deskutils/strigidaemon/pkg-plist
new file mode 100644
index 000000000000..fa1684e6c0a0
--- /dev/null
+++ b/deskutils/strigidaemon/pkg-plist
@@ -0,0 +1,15 @@
+bin/strigicmd
+bin/strigidaemon
+include/strigi/asyncsocket.h
+include/strigi/asyncsocketclient.h
+include/strigi/clientinterface.h
+include/strigi/socketclient.h
+lib/cmake/LibSearchClient/LibSearchClientConfig.cmake
+lib/libsearchclient.so
+lib/libsearchclient.so.0
+lib/libsearchclient.so.%%SHLIB_VER%%
+share/dbus-1/services/org.freedesktop.xesam.searcher.service
+share/dbus-1/services/vandenoever.strigi.service
+@dirrm lib/cmake/LibSearchClient
+@dirrmtry lib/cmake
+@dirrmtry include/strigi
diff --git a/deskutils/strigiutils/Makefile b/deskutils/strigiutils/Makefile
new file mode 100644
index 000000000000..2830c521400b
--- /dev/null
+++ b/deskutils/strigiutils/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= strigiutils
+PORTVERSION= ${STRIGI_VERSION}
+CATEGORIES= deskutils
+MASTER_SITES= ${STRIGI_MASTER_SITES}
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Strigi desktop search: utilities
+
+LIB_DEPENDS= streams:${PORTSDIR}/deskutils/libstreams \
+ streamanalyzer:${PORTSDIR}/deskutils/libstreamanalyzer
+
+MAKE_JOBS_SAFE= yes
+
+.include <${.CURDIR}/../strigi/Makefile.common>
+.include <bsd.port.mk>
diff --git a/deskutils/strigiutils/pkg-plist b/deskutils/strigiutils/pkg-plist
new file mode 100644
index 000000000000..75987812735f
--- /dev/null
+++ b/deskutils/strigiutils/pkg-plist
@@ -0,0 +1,4 @@
+bin/deepfind
+bin/deepgrep
+bin/rdfindexer
+bin/xmlindexer