diff --git a/databases/strigi/Makefile b/databases/strigi/Makefile index 2e806599094..de886cdf5b1 100644 --- a/databases/strigi/Makefile +++ b/databases/strigi/Makefile @@ -1,45 +1,53 @@ -# $OpenBSD: Makefile,v 1.14 2012/03/29 13:38:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2012/11/15 00:04:30 sthen Exp $ -SHARED_ONLY = Yes COMMENT = document indexer CATEGORIES = databases devel textproc sysutils -HOMEPAGE = http://strigi.sourceforge.net -DISTNAME = strigi-0.7.2 +HOMEPAGE = https://projects.kde.org/projects/kdesupport/strigi/ -REVISION = 0 +# hand-rolled from strigi* submodules at quickgit.kde.org +DISTNAME = strigi-0.7.7pl1 +SHARED_ONLY = Yes -EXTRACT_SUFX = .tar.bz2 -MASTER_SITES = http://www.vandenoever.info/software/strigi/ \ - http://spacehopper.org/mirrors/ +MASTER_SITES = http://spacehopper.org/mirrors/ \ + ftp://3ps.if.ua/pub/OpenBSD/distfiles/ \ + http://www.ohvost.ru/dnl/kde/src/ # LGPLv2+ -PERMIT_PACKAGE_CDROM = Yes -PERMIT_PACKAGE_FTP = Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes -PERMIT_DISTFILES_FTP = Yes +PERMIT_DISTFILES_FTP = Yes -SHARED_LIBS += searchclient 1.0 # .0.5 -SHARED_LIBS += streamanalyzer 1.0 # .0.5 -SHARED_LIBS += streams 1.0 # .0.5 -SHARED_LIBS += strigihtmlgui 1.0 # .0.5 -SHARED_LIBS += strigiqtdbusclient 1.0 # .0.5 +SHARED_LIBS += searchclient 2.0 +SHARED_LIBS += streamanalyzer 2.0 +SHARED_LIBS += streams 2.0 +SHARED_LIBS += strigihtmlgui 2.0 +SHARED_LIBS += strigiqtdbusclient 2.0 -LIB_DEPENDS = clucene-core->=0.9.21:textproc/clucene \ - archivers/bzip2 \ +BUILD_DEPENDS = devel/cppunit \ + devel/boost + +LIB_DEPENDS = archivers/bzip2 \ + graphics/exiv2 \ + graphics/ffmpeg \ + sysutils/gamin \ + textproc/clucene>=2.3 \ textproc/libxml \ - x11/qt4 \ - x11/dbus \ - graphics/exiv2 + x11/dbus -WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender bz2 c clucene>=1 dbus-1 exiv2 \ - fontconfig freetype glib-2.0 gthread-2.0 lib/qt4/QtCore \ - lib/qt4/QtDBus lib/qt4/QtGui m png pthread stdc++ xml2 z ${MODLIBICONV_WANTLIB} +WANTLIB = lib/qt4/QtDBus lib/qt4/QtGui +WANTLIB += bz2 c clucene-core clucene-shared dbus-1 exiv2 fam m pthread +WANTLIB += stdc++ xml2 z avcodec avformat avutil swscale -MODULES += devel/cmake converters/libiconv -CONFIGURE_STYLE = cmake -SEPARATE_BUILD = Yes +MODULES = devel/cmake \ + converters/libiconv \ + x11/qt4 -CONFIGURE_ARGS += -DHyperEstraier_FOUND:BOOL=0 +# Not ported +CONFIGURE_ARGS = -DENABLE_LOG4CXX:Bool=No + +# Depends on Java +CONFIGURE_ARGS += -DENABLE_REGENERATEXSD:Bool=No .include diff --git a/databases/strigi/distinfo b/databases/strigi/distinfo index cd1cdd3d7e8..0e83f4f4138 100644 --- a/databases/strigi/distinfo +++ b/databases/strigi/distinfo @@ -1,5 +1,2 @@ -MD5 (strigi-0.7.2.tar.bz2) = ygm6F2zz/+mvzk2S84+ahQ== -RMD160 (strigi-0.7.2.tar.bz2) = dJcZUzX3bzCSL1xqyq44PhRLM8c= -SHA1 (strigi-0.7.2.tar.bz2) = tMFHLvBoU2rPnFxMjwM6l/nGn58= -SHA256 (strigi-0.7.2.tar.bz2) = HKQhu+Qg0YObvmv+fEtSoFWQqben7ad5JLVUyY5gKrg= -SIZE (strigi-0.7.2.tar.bz2) = 936320 +SHA256 (strigi-0.7.7pl1.tar.gz) = eLltb5+Jw4xu5iBdYv4MPyjYyS0gRCAZOvFK8Rq7IaM= +SIZE (strigi-0.7.7pl1.tar.gz) = 908466 diff --git a/databases/strigi/patches/patch-cmake_FindQt4_cmake b/databases/strigi/patches/patch-cmake_FindQt4_cmake deleted file mode 100644 index 8e4b5084474..00000000000 --- a/databases/strigi/patches/patch-cmake_FindQt4_cmake +++ /dev/null @@ -1,189 +0,0 @@ -$OpenBSD: patch-cmake_FindQt4_cmake,v 1.2 2007/10/24 22:49:38 espie Exp $ ---- cmake/FindQt4.cmake.orig Mon Jul 16 13:26:59 2007 -+++ cmake/FindQt4.cmake Thu Oct 25 00:10:55 2007 -@@ -184,6 +184,19 @@ - # Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. - # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - -+## macro for asking qmake to process pro files -+MACRO(QT_QUERY_QMAKE outvar invar) -+ FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake/tmp.pro -+ "message(CMAKE_MESSAGE<$$${invar}>)") -+ EXECUTE_PROCESS(COMMAND ${QT_QMAKE_EXECUTABLE} -+ WORKING_DIRECTORY -+ ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake -+ OUTPUT_VARIABLE _qmake_query_output -+ ERROR_VARIABLE _qmake_query_output ) -+ FILE(REMOVE_RECURSE -+ "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmpQmake") -+ STRING(REGEX REPLACE ".*CMAKE_MESSAGE<([^>]*).*" "\\1" ${outvar} "${_qmake_query_output}") -+ENDMACRO(QT_QUERY_QMAKE) - - INCLUDE(CheckSymbolExists) - INCLUDE(MacroAddFileDependencies) -@@ -217,7 +230,7 @@ MACRO(QT_QUERY_QMAKE outvar invar) - ENDMACRO(QT_QUERY_QMAKE) - - # check for qmake --FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS -+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 PATHS - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" - $ENV{QTDIR}/bin -@@ -557,7 +570,7 @@ IF (QT4_QMAKE_FOUND) - MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR) - - # Set QT_INCLUDES -- SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ) -+ SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default) - - - ######################################## -@@ -1190,7 +1203,142 @@ IF (QT4_QMAKE_FOUND) - SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(UNIX) - -+ IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") -+ FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents) -+ STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents}) -+ STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents}) -+ ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") - -+ SET(QT_GUI_LIB_DEPENDENCIES "") -+ SET(QT_CORE_LIB_DEPENDENCIES "") -+ SET(QT_DBUS_LIB_DEPENDENCIES "") -+ -+ ## system png -+ IF(QT_QCONFIG MATCHES "system-png") -+ FIND_LIBRARY(QT_PNG_LIBRARY NAMES png) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY}) -+ MARK_AS_ADVANCED(QT_PNG_LIBRARY) -+ FIND_PATH(QT_PNG_INCLUDE_DIR png.h -+ /usr/local/include -+ /usr/include -+ /usr/local/include/libpng # OpenBSD -+ ) -+ MARK_AS_ADVANCED(QT_PNG_INCLUDE_DIR) -+ SET(QT_INCLUDES ${QT_INCLUDES} ${QT_PNG_INCLUDE_DIR}) -+ -+ ENDIF(QT_QCONFIG MATCHES "system-png") -+ -+ IF(QT_QCONFIG MATCHES "glib") -+ FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0) -+ FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0) -+ MARK_AS_ADVANCED(QT_GLIB_LIBRARY) -+ MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY}) -+ ENDIF(QT_QCONFIG MATCHES "glib") -+ -+ IF(QT_QCONFIG MATCHES "gnu-libiconv") -+ FIND_LIBRARY(QT_LIBINTL NAMES intl) -+ FIND_LIBRARY(QT_LIBICONV NAMES iconv) -+ MARK_AS_ADVANCED(QT_LIBICONV) -+ MARK_AS_ADVANCED(QT_LIBINTL) -+ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBICONV} ${QT_LIBICONV}) -+ ENDIF(QT_QCONFIG MATCHES "gnu-libiconv") -+ -+ IF(QT_QCONFIG MATCHES "qdbus") -+ FIND_LIBRARY(QT_DBUS NAMES dbus-1) -+ MARK_AS_ADVANCED(QT_DBUS) -+ SET(QT_DBUS_LIB_DEPENDENCIES ${QT_DBUS_LIB_DEPENDENCIES} ${QT_DBUS}) -+ ENDIF(QT_QCONFIG MATCHES "qdbus") -+ # for X11, get X11 library directory -+ IF(Q_WS_X11) -+ SET(QMAKE_LIBDIR_X11 "/usr/X11R6/lib") -+ ENDIF(Q_WS_X11) -+ -+ ## X11 SM -+ IF(QT_QCONFIG MATCHES "x11sm") -+ # ask qmake where the x11 libs are -+ FIND_LIBRARY(QT_X11_SM_LIBRARY NAMES SM PATHS ${QMAKE_LIBDIR_X11}) -+ FIND_LIBRARY(QT_X11_ICE_LIBRARY NAMES ICE PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_X11_SM_LIBRARY} ${QT_X11_ICE_LIBRARY}) -+ MARK_AS_ADVANCED(QT_X11_SM_LIBRARY) -+ MARK_AS_ADVANCED(QT_X11_ICE_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "x11sm") -+ -+ ## Xi -+ IF(QT_QCONFIG MATCHES "tablet") -+ FIND_LIBRARY(QT_XI_LIBRARY NAMES Xi PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XI_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XI_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "tablet") -+ -+ ## Xrender -+ IF(QT_QCONFIG MATCHES "xrender") -+ FIND_LIBRARY(QT_XRENDER_LIBRARY NAMES Xrender PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRENDER_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XRENDER_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "xrender") -+ -+ ## Xrandr -+ IF(QT_QCONFIG MATCHES "xrandr") -+ FIND_LIBRARY(QT_XRANDR_LIBRARY NAMES Xrandr PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XRANDR_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XRANDR_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "xrandr") -+ -+ ## Xcursor -+ IF(QT_QCONFIG MATCHES "xcursor") -+ FIND_LIBRARY(QT_XCURSOR_LIBRARY NAMES Xcursor PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XCURSOR_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XCURSOR_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "xcursor") -+ -+ ## Xinerama -+ IF(QT_QCONFIG MATCHES "xinerama") -+ FIND_LIBRARY(QT_XINERAMA_LIBRARY NAMES Xinerama PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_XINERAMA_LIBRARY}) -+ MARK_AS_ADVANCED(QT_XINERAMA_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "xinerama") -+ -+ ## system-freetype -+ IF(QT_QCONFIG MATCHES "system-freetype") -+ FIND_LIBRARY(QT_FREETYPE_LIBRARY NAMES freetype) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FREETYPE_LIBRARY}) -+ MARK_AS_ADVANCED(QT_FREETYPE_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "system-freetype") -+ -+ ## fontconfig -+ IF(QT_QCONFIG MATCHES "fontconfig") -+ FIND_LIBRARY(QT_FONTCONFIG_LIBRARY NAMES fontconfig) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_FONTCONFIG_LIBRARY}) -+ MARK_AS_ADVANCED(QT_FONTCONFIG_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "fontconfig") -+ -+ ## system-zlib -+ IF(QT_QCONFIG MATCHES "system-zlib") -+ FIND_LIBRARY(QT_ZLIB_LIBRARY NAMES z) -+ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_ZLIB_LIBRARY}) -+ MARK_AS_ADVANCED(QT_ZLIB_LIBRARY) -+ ENDIF(QT_QCONFIG MATCHES "system-zlib") -+ -+ IF(Q_WS_X11) -+ # X11 libraries Qt absolutely depends on -+ QT_QUERY_QMAKE(QT_LIBS_X11 "QMAKE_LIBS_X11") -+ SEPARATE_ARGUMENTS(QT_LIBS_X11) -+ FOREACH(QT_X11_LIB ${QT_LIBS_X11}) -+ STRING(REGEX REPLACE "-l" "" QT_X11_LIB "${QT_X11_LIB}") -+ SET(QT_TMP_STR "QT_X11_${QT_X11_LIB}_LIBRARY") -+ FIND_LIBRARY(${QT_TMP_STR} NAMES "${QT_X11_LIB}" PATHS ${QMAKE_LIBDIR_X11}) -+ SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${${QT_TMP_STR}}) -+ ENDFOREACH(QT_X11_LIB) -+ -+ QT_QUERY_QMAKE(QT_LIBS_THREAD "QMAKE_LIBS_THREAD") -+ SET(QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QT_LIBS_THREAD}) -+ -+ QT_QUERY_QMAKE(QMAKE_LIBS_DYNLOAD "QMAKE_LIBS_DYNLOAD") -+ SET (QT_CORE_LIB_DEPENDENCIES ${QT_CORE_LIB_DEPENDENCIES} ${QMAKE_LIBS_DYNLOAD}) -+ -+ ENDIF(Q_WS_X11) -+ - ####################################### - # - # compatibility settings -@@ -1218,4 +1366,3 @@ ELSE(QT4_QMAKE_FOUND) - ENDIF(Qt4_FIND_REQUIRED) - - ENDIF (QT4_QMAKE_FOUND) -- diff --git a/databases/strigi/patches/patch-libstreamanalyzer_lib_saxeventanalyzer_cpp b/databases/strigi/patches/patch-libstreamanalyzer_lib_saxeventanalyzer_cpp new file mode 100644 index 00000000000..4c211f1a603 --- /dev/null +++ b/databases/strigi/patches/patch-libstreamanalyzer_lib_saxeventanalyzer_cpp @@ -0,0 +1,12 @@ +$OpenBSD: patch-libstreamanalyzer_lib_saxeventanalyzer_cpp,v 1.1 2012/11/15 00:04:30 sthen Exp $ +--- libstreamanalyzer/lib/saxeventanalyzer.cpp.orig Thu Nov 10 13:28:11 2011 ++++ libstreamanalyzer/lib/saxeventanalyzer.cpp Thu Nov 10 13:28:35 2011 +@@ -27,7 +27,7 @@ + #include + + #ifndef LIBXML_THREAD_ENABLED +-#error Strigi needs a thread safe version of libxml2 ++#warning Strigi needs a thread safe version of libxml2 + #endif + + using namespace Strigi; diff --git a/databases/strigi/patches/patch-src_streams_textutils_cpp b/databases/strigi/patches/patch-libstreams_lib_textutils_cpp similarity index 61% rename from databases/strigi/patches/patch-src_streams_textutils_cpp rename to databases/strigi/patches/patch-libstreams_lib_textutils_cpp index 4eb99bdda80..3f7d70e76e9 100644 --- a/databases/strigi/patches/patch-src_streams_textutils_cpp +++ b/databases/strigi/patches/patch-libstreams_lib_textutils_cpp @@ -1,7 +1,8 @@ -$OpenBSD: patch-src_streams_textutils_cpp,v 1.1 2010/06/16 13:36:16 espie Exp $ ---- src/streams/textutils.cpp.orig Wed Jul 30 16:59:33 2008 -+++ src/streams/textutils.cpp Wed Jul 30 17:00:07 2008 -@@ -159,12 +159,17 @@ Strigi::convertNewLines(char* p) { +$OpenBSD: patch-libstreams_lib_textutils_cpp,v 1.1 2012/11/15 00:04:30 sthen Exp $ +Do not use home-grown swapXX macros instead of system ones. +--- libstreams/lib/textutils.cpp.orig Sun Feb 5 17:08:27 2012 ++++ libstreams/lib/textutils.cpp Tue Oct 9 14:07:24 2012 +@@ -163,12 +163,18 @@ Strigi::convertNewLines(char* p) { } } @@ -15,11 +16,12 @@ $OpenBSD: patch-src_streams_textutils_cpp,v 1.1 2010/06/16 13:36:16 espie Exp $ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) \ | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) +#endif ++ +#ifndef swap64 #define swap64(x) \ ((((x) & 0xff00000000000000ull) >> 56) \ | (((x) & 0x00ff000000000000ull) >> 40) \ -@@ -174,6 +179,7 @@ Strigi::convertNewLines(char* p) { +@@ -178,6 +184,7 @@ Strigi::convertNewLines(char* p) { | (((x) & 0x0000000000ff0000ull) << 24) \ | (((x) & 0x000000000000ff00ull) << 40) \ | (((x) & 0x00000000000000ffull) << 56)) diff --git a/databases/strigi/patches/patch-src_archiveengine_CMakeLists_txt b/databases/strigi/patches/patch-src_archiveengine_CMakeLists_txt deleted file mode 100644 index bd356b8247f..00000000000 --- a/databases/strigi/patches/patch-src_archiveengine_CMakeLists_txt +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-src_archiveengine_CMakeLists_txt,v 1.3 2010/06/16 13:35:43 espie Exp $ ---- src/archiveengine/CMakeLists.txt.orig Sun Feb 1 20:56:04 2009 -+++ src/archiveengine/CMakeLists.txt Fri May 28 22:32:13 2010 -@@ -15,4 +15,4 @@ add_library(archiveengine STATIC - streamengine.cpp - ) - --target_link_libraries(archiveengine ${QT_QTCORE_LIBRARY} streams) -+target_link_libraries(archiveengine ${QT_QTCORE_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} streams) diff --git a/databases/strigi/patches/patch-src_archivereader_qclient_CMakeLists_txt b/databases/strigi/patches/patch-src_archivereader_qclient_CMakeLists_txt deleted file mode 100644 index 03e982d5225..00000000000 --- a/databases/strigi/patches/patch-src_archivereader_qclient_CMakeLists_txt +++ /dev/null @@ -1,10 +0,0 @@ -$OpenBSD: patch-src_archivereader_qclient_CMakeLists_txt,v 1.1.1.1 2007/06/10 21:46:27 espie Exp $ ---- src/archivereader/qclient/CMakeLists.txt.orig Fri Jun 8 23:00:40 2007 -+++ src/archivereader/qclient/CMakeLists.txt Fri Jun 8 23:01:00 2007 -@@ -13,5 +13,5 @@ set(qclient_MOC_HDRS filebrowser.h) - qt4_wrap_cpp(qclient_MOC_SRCS ${qclient_MOC_HDRS}) - add_executable(qclient ${qclient_SRCS} ${qclient_MOC_SRCS}) - target_link_libraries(qclient streams -- ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}) -+ ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_CORE_LIB_DEPENDENCIES} ${QT_GUI_LIB_DEPENDENCIES}) - diff --git a/databases/strigi/patches/patch-src_daemon_strigithread_cpp b/databases/strigi/patches/patch-src_daemon_strigithread_cpp deleted file mode 100644 index 00b65fd1bc3..00000000000 --- a/databases/strigi/patches/patch-src_daemon_strigithread_cpp +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-src_daemon_strigithread_cpp,v 1.4 2010/06/18 15:09:41 sthen Exp $ ---- src/daemon/strigithread.cpp.orig Wed Feb 3 19:03:07 2010 -+++ src/daemon/strigithread.cpp Fri Jun 18 13:51:02 2010 -@@ -119,12 +119,14 @@ threadstarter(void *d) { - + ".threadstarter", - string("error setting priority: ") + strerror(errno)); - } -+#ifndef __OpenBSD__ - r = sched_setscheduler(0, SCHED_BATCH, ¶m); - if (r != 0) { - STRIGI_LOG_INFO (string("strigi.daemon.") + thread->name - + ".threadstarter", - string("error setting to batch: ") + strerror(errno)); - } -+#endif - #ifdef SYS_ioprio_set - if (syscall(SYS_ioprio_set, IOPRIO_WHO_PROCESS, 0, - IOPRIO_CLASS_IDLE< - - #ifndef LIBXML_THREAD_ENABLED --#error Strigi needs a thread safe version of libxml2 -+#warning Strigi needs a thread safe version of libxml2 - #endif - - using namespace Strigi; diff --git a/databases/strigi/patches/patch-src_daemon_dbus_dbuscpp_makecode_pl b/databases/strigi/patches/patch-strigidaemon_bin_daemon_dbus_dbuscpp_makecode_pl similarity index 60% rename from databases/strigi/patches/patch-src_daemon_dbus_dbuscpp_makecode_pl rename to databases/strigi/patches/patch-strigidaemon_bin_daemon_dbus_dbuscpp_makecode_pl index 1ec04fb91c3..a008289144a 100644 --- a/databases/strigi/patches/patch-src_daemon_dbus_dbuscpp_makecode_pl +++ b/databases/strigi/patches/patch-strigidaemon_bin_daemon_dbus_dbuscpp_makecode_pl @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_daemon_dbus_dbuscpp_makecode_pl,v 1.1 2010/06/18 15:09:41 sthen Exp $ ---- src/daemon/dbus/dbuscpp/makecode.pl.orig Wed Feb 3 19:03:07 2010 -+++ src/daemon/dbus/dbuscpp/makecode.pl Fri Jun 18 14:50:45 2010 +$OpenBSD: patch-strigidaemon_bin_daemon_dbus_dbuscpp_makecode_pl,v 1.1 2012/11/15 00:04:30 sthen Exp $ +--- strigidaemon/bin/daemon/dbus/dbuscpp/makecode.pl.orig Thu Nov 10 13:39:46 2011 ++++ strigidaemon/bin/daemon/dbus/dbuscpp/makecode.pl Thu Nov 10 13:38:07 2011 @@ -325,7 +325,7 @@ print FH "#include \"$relativeinterfaceheader\"\n"; print FH "#define DBUS_API_SUBJECT_TO_CHANGE 1\n"; print FH "#include \n"; diff --git a/databases/strigi/pkg/PLIST b/databases/strigi/pkg/PLIST index 8138c37f8cf..4b9ab97167f 100644 --- a/databases/strigi/pkg/PLIST +++ b/databases/strigi/pkg/PLIST @@ -1,7 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.7 2010/06/18 15:09:41 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.8 2012/11/15 00:04:30 sthen Exp $ @bin bin/deepfind @bin bin/deepgrep -@bin bin/luceneindexer +@bin bin/lucene2indexer @bin bin/rdfindexer @bin bin/strigiclient @bin bin/strigicmd @@ -12,17 +12,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 @@ -31,6 +37,11 @@ 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/ include/strigi/qtdbus/strigiasyncclient.h include/strigi/qtdbus/strigiclient.h @@ -38,7 +49,9 @@ 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 @@ -48,6 +61,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 @@ -55,19 +69,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/ @lib lib/libsearchclient.so.${LIBsearchclient_VERSION} +lib/libsearchclient/LibSearchClientConfig.cmake +lib/libstreamanalyzer/ @lib lib/libstreamanalyzer.so.${LIBstreamanalyzer_VERSION} +lib/libstreamanalyzer/LibStreamAnalyzerConfig.cmake +lib/libstreams/ @lib lib/libstreams.so.${LIBstreams_VERSION} +lib/libstreams/LibStreamsConfig.cmake +lib/libstreams/LibStreamsTargets-noconfig.cmake +lib/libstreams/LibStreamsTargets.cmake @lib lib/libstrigihtmlgui.so.${LIBstrigihtmlgui_VERSION} @lib lib/libstrigiqtdbusclient.so.${LIBstrigiqtdbusclient_VERSION} lib/pkgconfig/libstreamanalyzer.pc lib/pkgconfig/libstreams.pc lib/strigi/ lib/strigi/StrigiConfig.cmake +lib/strigi/strigiea_digest.so +lib/strigi/strigiea_ffmpeg.so lib/strigi/strigiea_jpeg.so -lib/strigi/strigiindex_clucene.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