diff --git a/databases/strigi/Makefile b/databases/strigi/Makefile index ef519109495..0142f707b6f 100644 --- a/databases/strigi/Makefile +++ b/databases/strigi/Makefile @@ -1,28 +1,30 @@ -# $OpenBSD: Makefile,v 1.8 2010/06/16 13:35:43 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2010/06/18 15:09:41 sthen Exp $ SHARED_ONLY = Yes COMMENT = document indexer CATEGORIES = databases devel textproc sysutils HOMEPAGE = http://strigi.sourceforge.net -DISTNAME = strigi-0.6.4 +DISTNAME = strigi-0.7.2 PKGNAME = ${DISTNAME} EXTRACT_SUFX = .tar.bz2 -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=strigi/} +MASTER_SITES = http://www.vandenoever.info/software/strigi/ \ + http://spacehopper.org/mirrors/ +# LGPLv2+ PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -SHARED_LIBS += cluceneindex 0.0 # .0.5 -SHARED_LIBS += searchclient 0.0 # .0.5 -SHARED_LIBS += streamanalyzer 0.0 # .0.5 -SHARED_LIBS += streams 0.0 # .0.5 -SHARED_LIBS += strigihtmlgui 0.0 # .0.5 -SHARED_LIBS += strigiqtdbusclient 0.0 # .0.5 +SHARED_LIBS += cluceneindex 1.0 # .0.5 +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 -LIB_DEPENDS = clucene::textproc/clucene \ +LIB_DEPENDS = clucene->=1:clucene->=0.9.21:textproc/clucene \ bz2::archivers/bzip2 \ xml2::textproc/libxml \ lib/qt4/QtCore,lib/qt4/QtGui,lib/qt4/QtDBus::x11/qt4 \ diff --git a/databases/strigi/distinfo b/databases/strigi/distinfo index 3cde71ef754..cd1cdd3d7e8 100644 --- a/databases/strigi/distinfo +++ b/databases/strigi/distinfo @@ -1,5 +1,5 @@ -MD5 (strigi-0.6.4.tar.bz2) = Mk/ZYGrHd2VQFxf/ksBPmg== -RMD160 (strigi-0.6.4.tar.bz2) = S3LeFmsHd3jKorP/McIWimIVW9E= -SHA1 (strigi-0.6.4.tar.bz2) = 6R8xzFn9/DA7ZiqK+Jnv4TZWQ78= -SHA256 (strigi-0.6.4.tar.bz2) = HgdHbDs42/9q9z4iPPUv9PjkCkRFD2b4fBAyPhXfdIg= -SIZE (strigi-0.6.4.tar.bz2) = 895552 +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 diff --git a/databases/strigi/patches/patch-src_daemon_dbus_dbuscpp_makecode_pl b/databases/strigi/patches/patch-src_daemon_dbus_dbuscpp_makecode_pl new file mode 100644 index 00000000000..1ec04fb91c3 --- /dev/null +++ b/databases/strigi/patches/patch-src_daemon_dbus_dbuscpp_makecode_pl @@ -0,0 +1,12 @@ +$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 +@@ -325,7 +325,7 @@ print FH "#include \"$relativeinterfaceheader\"\n"; + print FH "#define DBUS_API_SUBJECT_TO_CHANGE 1\n"; + print FH "#include \n"; + print FH "#include \n"; +-print FH "#ifdef __APPLE__ \n"; ++print FH "#if defined(__APPLE__) || defined(__OpenBSD__)\n"; + print FH "#define uint64_t dbus_uint64_t\n"; + print FH "#endif\n"; + print FH "class DBusObjectInterface;\n"; diff --git a/databases/strigi/patches/patch-src_daemon_strigithread_cpp b/databases/strigi/patches/patch-src_daemon_strigithread_cpp index 07449f845bd..00b65fd1bc3 100644 --- a/databases/strigi/patches/patch-src_daemon_strigithread_cpp +++ b/databases/strigi/patches/patch-src_daemon_strigithread_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_daemon_strigithread_cpp,v 1.3 2010/06/16 13:35:43 espie Exp $ ---- src/daemon/strigithread.cpp.orig Fri May 28 22:35:39 2010 -+++ src/daemon/strigithread.cpp Fri May 28 22:36:08 2010 -@@ -118,12 +118,14 @@ threadstarter(void *d) { +$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)); } diff --git a/databases/strigi/patches/patch-src_searchclient_qtdbus_CMakeLists_txt b/databases/strigi/patches/patch-src_searchclient_qtdbus_CMakeLists_txt index bfeeae9046e..4eb065f68da 100644 --- a/databases/strigi/patches/patch-src_searchclient_qtdbus_CMakeLists_txt +++ b/databases/strigi/patches/patch-src_searchclient_qtdbus_CMakeLists_txt @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_searchclient_qtdbus_CMakeLists_txt,v 1.3 2010/06/16 13:35:43 espie Exp $ ---- src/searchclient/qtdbus/CMakeLists.txt.orig Sun Feb 1 20:56:02 2009 -+++ src/searchclient/qtdbus/CMakeLists.txt Fri May 28 22:32:13 2010 +$OpenBSD: patch-src_searchclient_qtdbus_CMakeLists_txt,v 1.4 2010/06/18 15:09:41 sthen Exp $ +--- src/searchclient/qtdbus/CMakeLists.txt.orig Wed Feb 3 19:03:07 2010 ++++ src/searchclient/qtdbus/CMakeLists.txt Fri Jun 18 13:51:02 2010 @@ -20,7 +20,7 @@ qt4_wrap_cpp(strigiqtdbusclient_MOC_SRCS ${strigiqtdbu add_library(strigiqtdbusclient SHARED ${strigiqtdbusclient_SRCS} ${strigiqtdbusclient_MOC_SRCS}) @@ -10,7 +10,7 @@ $OpenBSD: patch-src_searchclient_qtdbus_CMakeLists_txt,v 1.3 2010/06/16 13:35:43 set_target_properties(strigiqtdbusclient PROPERTIES VERSION ${STRIGI_VERSION_STRING} SOVERSION ${STRIGI_VERSION_MAJOR} -@@ -38,4 +38,4 @@ set(strigiasynctest_SRCS strigiasynctest.cpp strigiasy +@@ -40,4 +40,4 @@ set(strigiasynctest_SRCS strigiasynctest.cpp strigiasy set(strigiasynctest_MOC_HDRS strigiasyncwidget.h) qt4_wrap_cpp(strigiasynctest_MOC_SRCS ${strigiasynctest_MOC_HDRS}) add_executable(strigiasynctest ${strigiasynctest_SRCS} ${strigiasynctest_MOC_SRCS}) diff --git a/databases/strigi/patches/patch-src_sqliteindexer_CMakeLists_txt b/databases/strigi/patches/patch-src_sqliteindexer_CMakeLists_txt index 24be0848947..f20b2b2285c 100644 --- a/databases/strigi/patches/patch-src_sqliteindexer_CMakeLists_txt +++ b/databases/strigi/patches/patch-src_sqliteindexer_CMakeLists_txt @@ -1,10 +1,12 @@ -$OpenBSD: patch-src_sqliteindexer_CMakeLists_txt,v 1.2 2008/01/21 13:36:14 espie Exp $ ---- src/sqliteindexer/CMakeLists.txt.orig Fri Oct 26 14:25:39 2007 -+++ src/sqliteindexer/CMakeLists.txt Mon Jan 7 16:35:31 2008 -@@ -22,5 +22,5 @@ add_library(sqlite MODULE +$OpenBSD: patch-src_sqliteindexer_CMakeLists_txt,v 1.3 2010/06/18 15:09:41 sthen Exp $ +--- src/sqliteindexer/CMakeLists.txt.orig Wed Feb 3 19:03:07 2010 ++++ src/sqliteindexer/CMakeLists.txt Fri Jun 18 13:51:02 2010 +@@ -20,7 +20,7 @@ add_library(sqlite MODULE sqliteindexwriter.cpp ) set_target_properties(sqlite PROPERTIES PREFIX ${prefix}) -target_link_libraries(sqlite ${SQLITE_LIBRARIES}) +target_link_libraries(sqlite ${SQLITE_LIBRARIES} pthread) install(TARGETS sqlite LIBRARY DESTINATION ${LIB_DESTINATION}/strigi) + + if (CppUnit_FOUND) diff --git a/databases/strigi/patches/patch-src_streamanalyzer_saxeventanalyzer_cpp b/databases/strigi/patches/patch-src_streamanalyzer_saxeventanalyzer_cpp new file mode 100644 index 00000000000..4867a17b983 --- /dev/null +++ b/databases/strigi/patches/patch-src_streamanalyzer_saxeventanalyzer_cpp @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_streamanalyzer_saxeventanalyzer_cpp,v 1.1 2010/06/18 15:09:41 sthen Exp $ +--- src/streamanalyzer/saxeventanalyzer.cpp.orig Wed Feb 3 19:03:07 2010 ++++ src/streamanalyzer/saxeventanalyzer.cpp Fri Jun 18 15:07:00 2010 +@@ -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/pkg/PLIST b/databases/strigi/pkg/PLIST index c8105003eb5..8138c37f8cf 100644 --- a/databases/strigi/pkg/PLIST +++ b/databases/strigi/pkg/PLIST @@ -1,7 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.6 2010/06/16 13:35:43 espie Exp $ +@comment $OpenBSD: PLIST,v 1.7 2010/06/18 15:09:41 sthen Exp $ @bin bin/deepfind @bin bin/deepgrep @bin bin/luceneindexer +@bin bin/rdfindexer @bin bin/strigiclient @bin bin/strigicmd @bin bin/strigidaemon @@ -86,6 +87,13 @@ share/dbus-1/services/org.freedesktop.xesam.searcher.service share/dbus-1/services/vandenoever.strigi.service share/strigi/ share/strigi/fieldproperties/ +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