databases/strigi blocks an update of devel/cppunit [0], which seems
related to cppunit's public API requiring C++11 for compiling [1].
strigi in turn doesn't like C++11.
cppunit is only needed to build some tests, as such we could leave this
out.
Output 'make test':
96% tests passed, 1 tests failed out of 25
Total Test time (real) = 0.37 sec
The following tests FAILED:
10 - InputStreamReaderTest (Failed)
The failing test already occurs with the version in ports.
While here sync PLIST.
Comments/OK?
[0] https://marc.info/?l=openbsd-ports&m=157446636510981&w=2
[1] https://cgit.freedesktop.org/libreoffice/cppunit/tree/NEWS
diff --git Makefile Makefile
index fc2c4441325..6b3858e735f 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
COMMENT = document indexer
DISTNAME = strigi-0.7.8
-REVISION = 2
+REVISION = 3
CATEGORIES = databases devel textproc sysutils
HOMEPAGE = https://www.vandenoever.info/software/strigi/
@@ -28,8 +28,7 @@ COMPILER = base-clang ports-gcc base-gcc
MODULES = devel/cmake \
x11/qt4
-BUILD_DEPENDS = devel/cppunit \
- devel/boost
+BUILD_DEPENDS = devel/boost
LIB_DEPENDS = archivers/bzip2 \
converters/libiconv \
diff --git patches/patch-strigidaemon_CMakeLists_txt
patches/patch-strigidaemon_CMakeLists_txt
new file mode 100644
index 00000000000..e5ed1b70569
--- /dev/null
+++ patches/patch-strigidaemon_CMakeLists_txt
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Do not pick up cppunit as newer versions of it require C++11 for compiling,
+hence any project using cppunit must be compiled with C++11 support. strigi
+doesn't build with C++11.
+
+Index: strigidaemon/CMakeLists.txt
+--- strigidaemon/CMakeLists.txt.orig
++++ strigidaemon/CMakeLists.txt
+@@ -65,7 +65,7 @@ find_optional_dep(FAM ENABLE_FAM FAM_FOUND "efficient
+ find_optional_dep(Log4cxx ENABLE_LOG4CXX LOG4CXX_FOUND "advanced logging")
+ #find_optional_dep(CLucene ENABLE_CLUCENE CLucene_FOUND "CLucene backend")
+ #find_optional_dep(Exiv2 ENABLE_EXIV2 EXIV2_FOUND "indexing of EXIF/IPTC
metadata")
+-find_package(CppUnit)
++#find_package(CppUnit)
+ include(ConfigureChecks.cmake)
+ set (LIBSEARCHCLIENT_VERSION ${STRIGI_VERSION_STRING})
+
diff --git pkg/PLIST pkg/PLIST
index cea7d0c3e3b..7cf43242d67 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -94,26 +94,26 @@ lib/cmake/Strigi/StrigiConfigVersion.cmake
lib/pkgconfig/libstreamanalyzer.pc
lib/pkgconfig/libstreams.pc
lib/strigi/
-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
+@so lib/strigi/strigiea_digest.so
+@so lib/strigi/strigiea_ffmpeg.so
+@so lib/strigi/strigiea_jpeg.so
+@so lib/strigi/strigiea_riff.so
+@so lib/strigi/strigiindex_cluceneng.so
+@so lib/strigi/strigila_cpp.so
+@so lib/strigi/strigila_deb.so
+@so lib/strigi/strigila_namespaceharvester.so
+@so lib/strigi/strigila_txt.so
+@so lib/strigi/strigila_xpm.so
+@so lib/strigi/strigita_au.so
+@so lib/strigi/strigita_avi.so
+@so lib/strigi/strigita_dds.so
+@so lib/strigi/strigita_gif.so
+@so lib/strigi/strigita_ico.so
+@so lib/strigi/strigita_pcx.so
+@so lib/strigi/strigita_rgb.so
+@so lib/strigi/strigita_sid.so
+@so lib/strigi/strigita_wav.so
+@so lib/strigi/strigita_xbm.so
share/dbus-1/services/org.freedesktop.xesam.searcher.service
share/dbus-1/services/vandenoever.strigi.service
share/strigi/
