Fix the web miner option. That option should pull in firefox, thunderbird

and evo. Also while here disable the evolution plugin, tracker wants
evolution-plugins-3.0.pc which was removed in evo in 3.11.91.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19580 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 144 insertions, 14 deletions

diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index 82c8ec8fc..56451cb01 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	tracker
 PORTVERSION=	1.0.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
@@ -41,6 +41,8 @@ CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
 		--enable-tracker-preferences \
 		--disable-libosinfo \
 		--enable-generic-media-extractor=gstreamer
+# disable evolution miner until tracker fixes the dep
+CONFIGURE_ARGS+=	--disable-miner-evolution
 GLIB_SCHEMAS=	org.freedesktop.Tracker.DB.gschema.xml \
 		org.freedesktop.Tracker.Extract.gschema.xml \
 		org.freedesktop.Tracker.FTS.gschema.xml \
@@ -60,8 +62,12 @@ GRAPHIC_MINERS_DESC=	Support for some graphic formats (gif, png, tiff)
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MWEB_MINERS}
-CONFIGURE_ARGS+=	--enable-miner-evolution --enable-miner-firefox \
+CONFIGURE_ARGS+=	--enable-miner-firefox \
 			--enable-miner-thunderbird
+BUILD_DEPENDS+=	firefox>=0:${PORTSDIR}/www/firefox \
+		thunderbird>=0:${PORTSDIR}/mail/thunderbird
+RUN_DEPENDS+=	firefox>=0:${PORTSDIR}/www/firefox \
+		thunderbird>=0:${PORTSDIR}/mail/thunderbird
 PLIST_SUB+=	WEB_MINERS=""
 .else
 CONFIGURE_ARGS+=	--disable-miner-evolution --disable-miner-firefox \
diff --git a/sysutils/tracker/files/patch-configure b/sysutils/tracker/files/patch-configure
index 1c7db9aa2..23ab8fb6c 100644
--- a/sysutils/tracker/files/patch-configure
+++ b/sysutils/tracker/files/patch-configure
@@ -1,6 +1,38 @@
---- configure.orig	2014-03-23 12:15:46.322707111 +0000
-+++ configure	2014-03-23 12:19:39.849690806 +0000
-@@ -23983,14 +23983,14 @@
+--- configure.orig	2014-04-26 08:30:22.560186108 +0000
++++ configure	2014-04-26 08:31:33.733181153 +0000
+@@ -19223,7 +19223,6 @@
+ # First test for 3_3_5
+ TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
+                                         evolution-shell-3.0       >= 3.1
+-                                        evolution-plugin-3.0
+                                         libemail-utils
+                                         libemail-engine
+                                         evolution-data-server-1.2 >= $EDS_REQUIRED
+@@ -19316,7 +19315,6 @@
+ # Second test for 3_2
+ TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
+                                       evolution-shell-3.0       >= 3.1
+-                                      evolution-plugin-3.0
+                                       evolution-data-server-1.2 >= $EDS_REQUIRED
+                                       camel-1.2                 >= $CAMEL_REQUIRED"
+ 
+@@ -19404,7 +19402,6 @@
+ # Third test for 2_91
+ TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
+                                        evolution-shell-3.0
+-                                       evolution-plugin-3.0
+                                        evolution-data-server-1.2 >= $EDS_REQUIRED
+                                        camel-1.2                 >= $CAMEL_REQUIRED"
+ 
+@@ -19488,7 +19485,6 @@
+ # Fourth test others (do we really want support for anything < 3.2)?
+ TRACKER_MINER_EVOLUTION_LAST_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
+                                        evolution-shell           >= $EVO_SHELL_REQUIRED
+-                                       evolution-plugin          >= $EVO_REQUIRED
+                                        evolution-data-server-1.2 >= $EDS_REQUIRED
+                                        camel-1.2                 >= $CAMEL_REQUIRED"
+ 
+@@ -23983,14 +23979,14 @@
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1      >= \$DBUS_REQUIRED
@@ -18,7 +50,7 @@
  else
    pkg_failed=yes
  fi
-@@ -24002,14 +24002,16 @@
+@@ -24002,14 +23998,16 @@
   elif test -n "$PKG_CONFIG"; then
      if test -n "$PKG_CONFIG" && \
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1      >= \$DBUS_REQUIRED
@@ -38,7 +70,7 @@
  else
    pkg_failed=yes
  fi
-@@ -24030,10 +24032,12 @@
+@@ -24030,10 +24028,12 @@
  fi
          if test $_pkg_short_errors_supported = yes; then
  	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1      >= $DBUS_REQUIRED
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index 7056e1925..f81d90b89 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -25,6 +25,8 @@ include/tracker-%%TRACKER_VER%%/libtracker-miner/tracker-miner.h
 include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-generated.h
 include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-sparql.h
 include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-version.h
+%%WEB_MINERS%%lib/firefox-addons/extensions/trackerfox@bustany.org
+%%WEB_MINERS%%lib/thunderbird-addons/extensions/trackerbird@bustany.org
 lib/libtracker-control-%%TRACKER_VER%%.la
 lib/libtracker-control-%%TRACKER_VER%%.so
 lib/libtracker-control-%%TRACKER_VER%%.so.0
@@ -122,6 +124,7 @@ man/man1/tracker-tag.1.gz
 man/man1/tracker-writeback.1.gz
 share/applications/tracker-needle.desktop
 share/applications/tracker-preferences.desktop
+%%WEB_MINERS%%share/applications/trackerbird-launcher.desktop
 share/dbus-1/services/org.freedesktop.Tracker1.Miner.Applications.service
 share/dbus-1/services/org.freedesktop.Tracker1.Miner.Extract.service
 share/dbus-1/services/org.freedesktop.Tracker1.Miner.Files.service
@@ -352,20 +355,109 @@ share/vala/vapi/tracker-miner-%%TRACKER_VER%%.deps
 share/vala/vapi/tracker-miner-%%TRACKER_VER%%.vapi
 share/vala/vapi/tracker-sparql-%%TRACKER_VER%%.deps
 share/vala/vapi/tracker-sparql-%%TRACKER_VER%%.vapi
+%%WEB_MINERS%%share/xul-ext/trackerbird/README
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome.manifest
+%%WEB_MINERS%%share/xul-ext/trackerbird/install.rdf
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/about.xul
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/bindings.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/email-address-parser.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/mailstore.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/namespace.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/options.xul
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/persistent-store.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/plugin.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/queue.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/tb-overlay.xul
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/trackerstore.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/content/ui.js
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/options.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/de-DE/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/options.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/en-US/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/options.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/es-ES/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/options.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/fr-FR/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/options.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/locale/pl-PL/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerbird/chrome/skin/overlay.css
+%%WEB_MINERS%%share/xul-ext/trackerbird/defaults/preferences/prefs.js
+%%WEB_MINERS%%share/xul-ext/trackerfox/COPYRIGHT
+%%WEB_MINERS%%share/xul-ext/trackerfox/README
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome.manifest
+%%WEB_MINERS%%share/xul-ext/trackerfox/install.rdf
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/about.xul
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/bindings.js
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/bookmarks.js
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/ff-overlay.xul
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/namespace.js
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/content/plugin.js
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/en-US/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/es-ES/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/fr-FR/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/about.dtd
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/overlay.dtd
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/locale/pl-PL/overlay.properties
+%%WEB_MINERS%%share/xul-ext/trackerfox/chrome/skin/overlay.css
+%%WEB_MINERS%%share/xul-ext/trackerfox/defaults/preferences/prefs.js
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/defaults/preferences
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/defaults
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/chrome/skin
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/chrome/locale/pl-PL
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/chrome/locale/fr-FR
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/chrome/locale/es-ES
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/chrome/locale/en-US
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/chrome/locale
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/chrome/content
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox/chrome
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerfox
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/defaults/preferences
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/defaults
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome/skin
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome/locale/pl-PL
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome/locale/fr-FR
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome/locale/es-ES
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome/locale/en-US
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome/locale/de-DE
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome/locale
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome/content
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird/chrome
+%%WEB_MINERS%%@dirrm share/xul-ext/trackerbird
+%%WEB_MINERS%%@dirrm share/xul-ext
+@dirrm %%DATADIR%%/ontologies
+@dirrm %%DATADIR%%/miners
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/extract-rules
+@dirrm %%DATADIR%%-tests
+@dirrm %%DATADIR%%
 @dirrm share/doc/libtracker-sparql
 @dirrm share/doc/libtracker-miner
 @dirrm share/doc/libtracker-control
+%%WEB_MINERS%%@dirrm lib/thunderbird-addons/extensions
+%%WEB_MINERS%%@dirrm lib/thunderbird-addons
 @dirrm lib/tracker-%%TRACKER_VER%%/writeback-modules
 @dirrm lib/tracker-%%TRACKER_VER%%/extract-modules
 @dirrm lib/tracker-%%TRACKER_VER%%
+%%WEB_MINERS%%@dirrm lib/firefox-addons/extensions
+%%WEB_MINERS%%@dirrm lib/firefox-addons
 @dirrm include/tracker-%%TRACKER_VER%%/libtracker-sparql
 @dirrm include/tracker-%%TRACKER_VER%%/libtracker-miner
 @dirrm include/tracker-%%TRACKER_VER%%/libtracker-control
 @dirrm include/tracker-%%TRACKER_VER%%
-@dirrm %%DATADIR%%/ontologies
-@dirrm %%DATADIR%%/miners
-@dirrm %%DATADIR%%/languages
-@dirrm %%DATADIR%%/icons
-@dirrm %%DATADIR%%/extract-rules
-@dirrm %%DATADIR%%-tests
-@dirrm %%DATADIR%%