- Update to 0.7.8

- Adjust Qt4 components
- Convert to USES
- Allow to build with different FFmpeg ports. Build with ffmpeg-0.7
  by default, since other KDE ports depend on it. It'll be switched
  to ffmpeg1 for KDE SC 4.10

7 files changed, 123 insertions, 37 deletions

diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile
index 2fc490f9aece..95495e5c7915 100644
--- a/deskutils/strigi/Makefile
+++ b/deskutils/strigi/Makefile
@@ -2,17 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	strigi
-PORTVERSION=	0.7.7
-PORTREVISION=	5
+PORTVERSION=	0.7.8
 CATEGORIES=	deskutils
-MASTER_SITES=	http://rdieter.fedorapeople.org/strigi/
-#MASTER_SITES=	http://www.vandenoever.info/software/strigi/ \
-#		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://www.vandenoever.info/software/strigi/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Desktop searching program
 
-LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
+LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
 		clucene-core:${PORTSDIR}/textproc/clucene \
 		dbus-1:${PORTSDIR}/devel/dbus \
 		exiv2.12:${PORTSDIR}/graphics/exiv2 \
@@ -20,12 +17,16 @@ LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
 
 USE_QT4=	corelib gui dbus moc_build uic_build qmake_build rcc_build
 USE_BZIP2=	yes
-USE_GNOME=	libxml2 pkgconfig
+USE_GNOME=	libxml2
+USE_PKGCONFIG=	build
 USE_FAM=	yes
 USE_LDCONFIG=	yes
-USE_CMAKE=	yes
+USES=		cmake
 MAKE_JOBS_UNSAFE=	yes
 
+# supported versions: ffmpeg, ffmpeg1, ffmpeg-devel
+FFMPEG_SUFFIX?=	#
+
 post-patch:
 	${MKDIR} ${WRKSRC}
 	${REINPLACE_CMD} -e \
diff --git a/deskutils/strigi/distinfo b/deskutils/strigi/distinfo
index 5f676b58635b..e355fbb6ff99 100644
--- a/deskutils/strigi/distinfo
+++ b/deskutils/strigi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (strigi-0.7.7.tar.bz2) = 76c559a8d53071e175b1d31f09818987733dfabec98ba9520665b206a15f32f3
-SIZE (strigi-0.7.7.tar.bz2) = 807093
+SHA256 (strigi-0.7.8.tar.bz2) = 43e461a625acdefa59bf58cc9d10aebda9eba920dfbe800fc77e6dcbf1eff989
+SIZE (strigi-0.7.8.tar.bz2) = 810574
diff --git a/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake b/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake
new file mode 100644
index 000000000000..d7ba0a266451
--- /dev/null
+++ b/deskutils/strigi/files/patch-libstreamanalyzer__cmake__FindFFmpeg.cmake
@@ -0,0 +1,45 @@
+--- ./libstreamanalyzer/cmake/FindFFmpeg.cmake.orig	2013-03-01 07:07:31.562142000 +0000
++++ ./libstreamanalyzer/cmake/FindFFmpeg.cmake	2013-03-06 00:32:09.269367542 +0000
+@@ -71,13 +71,15 @@
+       ${PC_LIB${_component}_INCLUDEDIR}
+       ${PC_LIB${_component}_INCLUDE_DIRS}
+     PATH_SUFFIXES
+-      ffmpeg
++      ffmpeg${FFMPEG_SUFFIX}
+   )
+ 
+   find_library(${_component}_LIBRARIES NAMES ${_library}
+-      HINTS
++    HINTS
+       ${PC_LIB${_component}_LIBDIR}
+       ${PC_LIB${_component}_LIBRARY_DIRS}
++    PATH_SUFFIXES
++      ffmpeg${FFMPEG_SUFFIX}
+   )
+ 
+   set(${_component}_DEFINITIONS  ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
+@@ -97,13 +99,18 @@
+ # Check for cached results. If there are skip the costly part.
+ if (NOT FFMPEG_LIBRARIES)
+ 
++  # Look for ffmpeg1 by default. Use empty suffix for ffmpeg-0.7
++  if (NOT FFMPEG_SUFFIX)
++    set(FFMPEG_SUFFIX 1)
++  endif ()
++
+   # Check for all possible component.
+-  find_component(AVCODEC  libavcodec  avcodec  libavcodec/avcodec.h)
+-  find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
+-  find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
+-  find_component(AVUTIL   libavutil   avutil   libavutil/avutil.h)
+-  find_component(SWSCALE  libswscale  swscale  libswscale/swscale.h)
+-  find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
++  find_component(AVCODEC  libavcodec${FFMPEG_SUFFIX}  avcodec${FFMPEG_SUFFIX}  libavcodec/avcodec.h)
++  find_component(AVFORMAT libavformat${FFMPEG_SUFFIX} avformat${FFMPEG_SUFFIX} libavformat/avformat.h)
++  find_component(AVDEVICE libavdevice${FFMPEG_SUFFIX} avdevice${FFMPEG_SUFFIX} libavdevice/avdevice.h)
++  find_component(AVUTIL   libavutil${FFMPEG_SUFFIX}   avutil${FFMPEG_SUFFIX}   libavutil/avutil.h)
++  find_component(SWSCALE  libswscale${FFMPEG_SUFFIX}  swscale${FFMPEG_SUFFIX}  libswscale/swscale.h)
++  find_component(POSTPROC libpostproc${FFMPEG_SUFFIX} postproc${FFMPEG_SUFFIX} libpostproc/postprocess.h)
+ 
+   # Check if the required components were found and add their stuff to the FFMPEG_* vars.
+   foreach (_component ${FFmpeg_FIND_COMPONENTS})
diff --git a/deskutils/strigi/files/patch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt b/deskutils/strigi/files/patch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
new file mode 100644
index 000000000000..c1459ea33cb2
--- /dev/null
+++ b/deskutils/strigi/files/patch-libstreamanalyzer__plugins__endplugins__CMakeLists.txt
@@ -0,0 +1,13 @@
+# Reorder include directories to fix build when multiple ffmpeg installed
+#
+--- ./libstreamanalyzer/plugins/endplugins/CMakeLists.txt.orig	2011-12-07 20:28:33.000000000 +0000
++++ ./libstreamanalyzer/plugins/endplugins/CMakeLists.txt	2013-03-06 00:58:08.824363575 +0000
+@@ -32,7 +32,7 @@
+ endif(XINE_FOUND)
+ 
+ if(FFMPEG_FOUND)
+-  include_directories( ${FFMPEG_INCLUDE_DIRS} )
++  include_directories(BEFORE ${FFMPEG_INCLUDE_DIRS} )
+   add_definitions(-D__STDC_CONSTANT_MACROS)
+   ADD_STRIGIEA(ffmpeg ffmpegendanalyzer.cpp)
+   #set_target_properties( ffmpeg PROPERTIES COMPILE_FLAGS "${FFMPEG_DEFINITIONS}" )
diff --git a/deskutils/strigi/files/patch-libstreams__CMakeLists.txt b/deskutils/strigi/files/patch-libstreams__CMakeLists.txt
new file mode 100644
index 000000000000..652a79f97cfd
--- /dev/null
+++ b/deskutils/strigi/files/patch-libstreams__CMakeLists.txt
@@ -0,0 +1,22 @@
+--- ./libstreams/CMakeLists.txt.orig	2013-02-05 21:34:57.000000000 +0000
++++ ./libstreams/CMakeLists.txt	2013-03-06 22:02:36.587664409 +0000
+@@ -46,9 +46,6 @@
+ # 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 @@
+                        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 #####
diff --git a/deskutils/strigi/pkg-descr b/deskutils/strigi/pkg-descr
index ad1a60a25644..842ee700e386 100644
--- a/deskutils/strigi/pkg-descr
+++ b/deskutils/strigi/pkg-descr
@@ -6,4 +6,4 @@ fastest and smallest desktop searching program.
 Strigi can index different file formats, including the contents of
 the archive files.
 
-WWW:	http://strigi.sourceforge.net/
+WWW: http://www.vandenoever.info/software/strigi/
diff --git a/deskutils/strigi/pkg-plist b/deskutils/strigi/pkg-plist
index 06840610926a..41a517bd6ebe 100644
--- a/deskutils/strigi/pkg-plist
+++ b/deskutils/strigi/pkg-plist
@@ -70,27 +70,30 @@ 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.7
-lib/libsearchclient/LibSearchClientConfig.cmake
+lib/libsearchclient.so.0.7.8
 lib/libstreamanalyzer.so
 lib/libstreamanalyzer.so.0
-lib/libstreamanalyzer.so.0.7.7
-lib/libstreamanalyzer/LibStreamAnalyzerConfig.cmake
+lib/libstreamanalyzer.so.0.7.8
 lib/libstreams.so
 lib/libstreams.so.0
-lib/libstreams.so.0.7.7
-lib/libstreams/LibStreamsConfig.cmake
-lib/libstreams/LibStreamsTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/libstreams/LibStreamsTargets.cmake
+lib/libstreams.so.0.7.8
 lib/libstrigihtmlgui.so
 lib/libstrigihtmlgui.so.0
-lib/libstrigihtmlgui.so.0.7.7
+lib/libstrigihtmlgui.so.0.7.8
 lib/libstrigiqtdbusclient.so
 lib/libstrigiqtdbusclient.so.0
-lib/libstrigiqtdbusclient.so.0.7.7
-lib/strigi/StrigiConfig.cmake
+lib/libstrigiqtdbusclient.so.0.7.8
 lib/strigi/strigiea_digest.so
 lib/strigi/strigiea_ffmpeg.so
 lib/strigi/strigiea_jpeg.so
@@ -115,21 +118,23 @@ libdata/pkgconfig/libstreamanalyzer.pc
 libdata/pkgconfig/libstreams.pc
 share/dbus-1/services/org.freedesktop.xesam.searcher.service
 share/dbus-1/services/vandenoever.strigi.service
-%%DATADIR%%/fieldproperties/homeless.rdfs
-%%DATADIR%%/fieldproperties/nao_data.rdfs
-%%DATADIR%%/fieldproperties/ncal_data.rdfs
-%%DATADIR%%/fieldproperties/nco_data.rdfs
-%%DATADIR%%/fieldproperties/nexif_data.rdfs
-%%DATADIR%%/fieldproperties/nfo_data.rdfs
-%%DATADIR%%/fieldproperties/nid3_data.rdfs
-%%DATADIR%%/fieldproperties/nie_data.rdfs
-%%DATADIR%%/fieldproperties/nmo_data.rdfs
-%%DATADIR%%/fieldproperties/strigi.rdfs
-@dirrmtry %%DATADIR%%/fieldproperties
-@dirrmtry %%DATADIR%%
+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/libstreams
-@dirrmtry lib/libstreamanalyzer
-@dirrmtry lib/libsearchclient
+@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