Update tracker to 1.0.2. Minor changes in the Makefile and the pkg-plist.

Poudriere complains about %%DATADIR%%/icons which is already in the pkg-plist
file. Probably a problem in poudriere when checking for stale files.


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

4 files changed, 24 insertions, 23 deletions

diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index ef733e130..cbaa44196 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -3,7 +3,7 @@
 #    $MCom$
 
 PORTNAME=	tracker
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 
@@ -100,7 +100,7 @@ LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
 		libgxps.so:${PORTSDIR}/graphics/libgxps \
 		libgsf-1.so:${PORTSDIR}/devel/libgsf \
 		libexempi.so:${PORTSDIR}/textproc/exempi \
-		libwv-1.2.so:${PORTSDIR}/textproc/wv
+		libwv.so:${PORTSDIR}/textproc/wv
 CONFIGURE_ARGS+=	--enable-libgxps --enable-poppler \
 			--enable-libxml2 --enable-exif \
 			--enable-libgsf --enable-abiword \
diff --git a/sysutils/tracker/distinfo b/sysutils/tracker/distinfo
index 30d59ea4c..fa63bc987 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tracker-1.0.1.tar.xz) = 76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889
-SIZE (tracker-1.0.1.tar.xz) = 6060276
+SHA256 (tracker-1.0.2.tar.xz) = 73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4
+SIZE (tracker-1.0.2.tar.xz) = 6046600
diff --git a/sysutils/tracker/files/patch-configure b/sysutils/tracker/files/patch-configure
index 23ab8fb6c..c10f3193a 100644
--- a/sysutils/tracker/files/patch-configure
+++ b/sysutils/tracker/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2014-04-26 08:30:22.560186108 +0000
-+++ configure	2014-04-26 08:31:33.733181153 +0000
-@@ -19223,7 +19223,6 @@
+--- configure.orig	2014-07-10 16:14:37.471040624 +0000
++++ configure	2014-07-10 16:20:50.072015231 +0000
+@@ -19531,7 +19531,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
@@ -8,7 +8,7 @@
                                          libemail-utils
                                          libemail-engine
                                          evolution-data-server-1.2 >= $EDS_REQUIRED
-@@ -19316,7 +19315,6 @@
+@@ -19626,7 +19625,6 @@
  # Second test for 3_2
  TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
                                        evolution-shell-3.0       >= 3.1
@@ -16,7 +16,7 @@
                                        evolution-data-server-1.2 >= $EDS_REQUIRED
                                        camel-1.2                 >= $CAMEL_REQUIRED"
  
-@@ -19404,7 +19402,6 @@
+@@ -19716,7 +19714,6 @@
  # Third test for 2_91
  TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0                  >= $GLIB_REQUIRED
                                         evolution-shell-3.0
@@ -24,7 +24,7 @@
                                         evolution-data-server-1.2 >= $EDS_REQUIRED
                                         camel-1.2                 >= $CAMEL_REQUIRED"
  
-@@ -19488,7 +19485,6 @@
+@@ -19802,7 +19799,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
@@ -32,7 +32,7 @@
                                         evolution-data-server-1.2 >= $EDS_REQUIRED
                                         camel-1.2                 >= $CAMEL_REQUIRED"
  
-@@ -23983,14 +23979,14 @@
+@@ -24340,14 +24336,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
@@ -40,17 +40,17 @@
 +                      hal         >= \$HAL_REQUIRED dbus-glib-1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-1      >= $DBUS_REQUIRED
 -                      hal         >= $HAL_REQUIRED") 2>&5
-+                      hal         >= $HAL_REQUIRED dbus-glib-1") 2>&5
++                      hal         >= $HAL_REQUIRED dbus-glib-1"; ) >&5
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; then
    pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "dbus-1      >= $DBUS_REQUIRED
 -                      hal         >= $HAL_REQUIRED" 2>/dev/null`
 +                      hal         >= $HAL_REQUIRED dbus-glib-1" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
- fi
-@@ -24002,14 +23998,16 @@
+@@ -24360,14 +24356,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
@@ -67,21 +67,21 @@
 -                      hal         >= $HAL_REQUIRED" 2>/dev/null`
 +                      hal         >= $HAL_REQUIRED
 +		      dbus-glib-1" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
  else
    pkg_failed=yes
- fi
-@@ -24030,10 +24028,12 @@
+@@ -24389,10 +24387,12 @@
  fi
          if test $_pkg_short_errors_supported = yes; then
- 	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1      >= $DBUS_REQUIRED
+ 	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1      >= $DBUS_REQUIRED
 -                      hal         >= $HAL_REQUIRED" 2>&1`
 +                      hal         >= $HAL_REQUIRED
-+                      dbus-glib-1" 2>&1`
++		      dbus-glib-1" 2>&1`
          else
- 	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1      >= $DBUS_REQUIRED
+ 	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1      >= $DBUS_REQUIRED
 -                      hal         >= $HAL_REQUIRED" 2>&1`
 +                      hal         >= $HAL_REQUIRED
-+                      dbus-glib-1" 2>&1`
++		      dbus-glib-1" 2>&1`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$HAL_PKG_ERRORS" >&5
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index cd2f4de88..3013414ee 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -30,15 +30,15 @@ include/tracker-%%TRACKER_VER%%/libtracker-sparql/tracker-version.h
 lib/libtracker-control-%%TRACKER_VER%%.la
 lib/libtracker-control-%%TRACKER_VER%%.so
 lib/libtracker-control-%%TRACKER_VER%%.so.0
-lib/libtracker-control-%%TRACKER_VER%%.so.0.0.1
+lib/libtracker-control-%%TRACKER_VER%%.so.0.0.2
 lib/libtracker-miner-%%TRACKER_VER%%.la
 lib/libtracker-miner-%%TRACKER_VER%%.so
 lib/libtracker-miner-%%TRACKER_VER%%.so.0
-lib/libtracker-miner-%%TRACKER_VER%%.so.0.0.1
+lib/libtracker-miner-%%TRACKER_VER%%.so.0.0.2
 lib/libtracker-sparql-%%TRACKER_VER%%.la
 lib/libtracker-sparql-%%TRACKER_VER%%.so
 lib/libtracker-sparql-%%TRACKER_VER%%.so.0
-lib/libtracker-sparql-%%TRACKER_VER%%.so.0.0.1
+lib/libtracker-sparql-%%TRACKER_VER%%.so.0.0.2
 lib/girepository-%%TRACKER_VER%%/Tracker-1.0.typelib
 lib/girepository-%%TRACKER_VER%%/TrackerControl-1.0.typelib
 lib/girepository-%%TRACKER_VER%%/TrackerMiner-1.0.typelib
@@ -448,6 +448,7 @@ share/vala/vapi/tracker-sparql-%%TRACKER_VER%%.vapi
 @dirrm %%DATADIR%%/extract-rules
 @dirrm %%DATADIR%%-tests
 @dirrm %%DATADIR%%
+@dirrmtry share/icons
 @dirrm share/doc/libtracker-sparql
 @dirrm share/doc/libtracker-miner
 @dirrm share/doc/libtracker-control