diff options
| -rw-r--r-- | sysutils/strigi/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/strigi/PLIST | 17 | ||||
| -rw-r--r-- | sysutils/strigi/distinfo | 9 | ||||
| -rw-r--r-- | sysutils/strigi/patches/patch-libstreams_CMakeLists.txt | 27 |
4 files changed, 45 insertions, 15 deletions
diff --git a/sysutils/strigi/Makefile b/sysutils/strigi/Makefile index a1dc72c9bf6..f2a097afddd 100644 --- a/sysutils/strigi/Makefile +++ b/sysutils/strigi/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2013/02/06 23:23:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.30 2013/02/09 22:32:45 markd Exp $ -DISTNAME= strigi-0.7.7 -PKGREVISION= 1 +DISTNAME= strigi-0.7.8 CATEGORIES= sysutils -MASTER_SITES= http://rdieter.fedorapeople.org/strigi/ +MASTER_SITES= http://www.vandenoever.info/software/strigi/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= markd@NetBSD.org diff --git a/sysutils/strigi/PLIST b/sysutils/strigi/PLIST index 6f66be44e4f..bc4f36b9186 100644 --- a/sysutils/strigi/PLIST +++ b/sysutils/strigi/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2013/02/04 20:21:08 markd Exp $ +@comment $NetBSD: PLIST,v 1.6 2013/02/09 22:32:45 markd Exp $ bin/deepfind bin/deepgrep bin/luceneindexer @@ -71,20 +71,24 @@ 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-noconfig.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.${PKGVERSION} -lib/libsearchclient/LibSearchClientConfig.cmake lib/libstreamanalyzer.so lib/libstreamanalyzer.so.0 lib/libstreamanalyzer.so.${PKGVERSION} -lib/libstreamanalyzer/LibStreamAnalyzerConfig.cmake lib/libstreams.so lib/libstreams.so.0 lib/libstreams.so.${PKGVERSION} -lib/libstreams/LibStreamsConfig.cmake -lib/libstreams/LibStreamsTargets-noconfig.cmake -lib/libstreams/LibStreamsTargets.cmake lib/libstrigihtmlgui.so lib/libstrigihtmlgui.so.0 lib/libstrigihtmlgui.so.${PKGVERSION} @@ -93,7 +97,6 @@ lib/libstrigiqtdbusclient.so.0 lib/libstrigiqtdbusclient.so.${PKGVERSION} lib/pkgconfig/libstreamanalyzer.pc lib/pkgconfig/libstreams.pc -lib/strigi/StrigiConfig.cmake lib/strigi/strigiea_digest.so lib/strigi/strigiea_jpeg.so lib/strigi/strigiea_riff.so diff --git a/sysutils/strigi/distinfo b/sysutils/strigi/distinfo index 1be4c664e65..dc3dd314d1f 100644 --- a/sysutils/strigi/distinfo +++ b/sysutils/strigi/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.7 2013/02/04 20:21:08 markd Exp $ +$NetBSD: distinfo,v 1.8 2013/02/09 22:32:45 markd Exp $ -SHA1 (strigi-0.7.7.tar.bz2) = a3100f851bb1a15231a863a5e66018946e3e8eb3 -RMD160 (strigi-0.7.7.tar.bz2) = 91610503ab3e9090bfd87213825112d3ab64deb8 -Size (strigi-0.7.7.tar.bz2) = 807093 bytes +SHA1 (strigi-0.7.8.tar.bz2) = 7250fb15109d33b0c49995a2cc3513ba7d937882 +RMD160 (strigi-0.7.8.tar.bz2) = 34cbbe98e7a371467b115b18586baf299340d1b8 +Size (strigi-0.7.8.tar.bz2) = 810574 bytes +SHA1 (patch-libstreams_CMakeLists.txt) = ce25d12f5c20f7f0be659bdccc24e8b4a898274a diff --git a/sysutils/strigi/patches/patch-libstreams_CMakeLists.txt b/sysutils/strigi/patches/patch-libstreams_CMakeLists.txt new file mode 100644 index 00000000000..b88ae55c1b4 --- /dev/null +++ b/sysutils/strigi/patches/patch-libstreams_CMakeLists.txt @@ -0,0 +1,27 @@ +$NetBSD: patch-libstreams_CMakeLists.txt,v 1.1 2013/02/09 22:32:45 markd Exp $ + +config.h must be generated after package tests. Specifically +find_package(Iconv) sets ICONV_SECOND_ARGUMENT_IS_CONST + +--- libstreams/CMakeLists.txt.orig 2013-02-05 21:34:57.000000000 +0000 ++++ libstreams/CMakeLists.txt +@@ -46,9 +46,6 @@ endif() + # check for visibility support + macro_check_gcc_visibility(__STRIGI_HAVE_GCC_VISIBILITY) + +-# Generate include/strigi/strigiconfig.h and lib/config.h +-include(ConfigureChecks.cmake) +- + # check for required packages + find_package(ZLIB) + set_package_properties(ZLIB PROPERTIES +@@ -75,6 +72,9 @@ set_package_properties(Threads PROPERTIE + TYPE REQUIRED + ) + ++# Generate include/strigi/strigiconfig.h and lib/config.h ++include(ConfigureChecks.cmake) ++ + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) + + ##### building and testing ##### |