Update to meta-tracker-1.6.0.

x11/gnome/tracker/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.193 2015/07/31 18:39:30 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.194 2015/09/25 06:56:02 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		powerful desktop search tool and indexer
 
 GNOME_PROJECT=		tracker
-GNOME_VERSION=		1.4.1
+GNOME_VERSION=		1.6.0
 
 # there is already audio/tracker, so this port has to live
 # as meta-tracker
@@ -23,10 +23,10 @@ SUBST_VARS=		TRACKER_API
 
 SHARED_LIBS +=  tracker-common       3.1      # unknown
 SHARED_LIBS +=  tracker-data         3.1      # unknown
-SHARED_LIBS +=  tracker-sparql-1.0   0.0      # 400.0
+SHARED_LIBS +=  tracker-sparql-1.0   1.0      # 600.0
 SHARED_LIBS +=  tracker-extract      0.0      # unknown
-SHARED_LIBS +=  tracker-miner-1.0    0.0      # 400.0
+SHARED_LIBS +=  tracker-miner-1.0    1.0      # 600.0
-SHARED_LIBS +=  tracker-control-1.0  0.0      # 400.0
+SHARED_LIBS +=  tracker-control-1.0  1.0      # 600.0
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
@@ -103,6 +103,9 @@ FAKE_FLAGS=		sysconfdir=${PREFIX}/share/examples/meta-tracker/
 pre-configure:
 	sed -i 's,/usr/bin,${LOCALBASE}/bin,' \
 		${WRKSRC}/src/tracker-needle/tracker-utils.vala
+# XXX LDFLAGS are reset in the configure script when checking for:
+# png, gif, jpeg and tiff
+	${SUBST_CMD} ${WRKSRC}/configure
 
 post-install:
 	rm ${PREFIX}/lib/tracker-${TRACKER_API}/extract-modules/*.{a,la}

x11/gnome/tracker/distinfo

@@ -1,2 +1,2 @@
-SHA256 (gnome/tracker-1.4.1.tar.xz) = lOzyWmT0UCZk4MRewl2uCpHwCtiT+4XdHC/+M2Vj4yg=
+SHA256 (gnome/tracker-1.6.0.tar.xz) = ficpYnIk9D+M2ZwY0CejuYTgSf6SSiZamzGFdWbJ4oo=
-SIZE (gnome/tracker-1.4.1.tar.xz) = 5937232
+SIZE (gnome/tracker-1.6.0.tar.xz) = 4929004

x11/gnome/tracker/patches/patch-configure

@@ -0,0 +1,42 @@
+$OpenBSD: patch-configure,v 1.17 2015/09/25 06:56:02 ajacoutot Exp $
+
+See pre-configure.
+
+--- configure.orig	Thu Sep 24 14:27:35 2015
++++ configure	Thu Sep 24 14:28:11 2015
+@@ -28009,7 +28009,7 @@ if ${ac_cv_lib_gif_DGifOpen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgif  $LIBS"
++LIBS="-L${LOCALBASE}/lib -lgif  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -28119,7 +28119,7 @@ if ${ac_cv_lib_jpeg_jpeg_CreateCompress+:} false; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ljpeg  $LIBS"
++LIBS="-L${LOCALBASE}/lib -ljpeg  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -28229,7 +28229,7 @@ if ${ac_cv_lib_tiff_TIFFOpen+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ltiff  $LIBS"
++LIBS="-L${LOCALBASE}/lib -ltiff  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -28339,7 +28339,7 @@ if ${ac_cv_lib_png_png_create_read_struct+:} false; th
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-L${LOCALBASE}/lib -lpng  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 

x11/gnome/tracker/patches/patch-src_tracker_Makefile_in

@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_tracker_Makefile_in,v 1.2 2015/07/31 18:39:30 ajacoutot Exp $
-
-From d231fba5392972aea61030db708d8dcdf9087963 Mon Sep 17 00:00:00 2001
-From: Martyn Russell <martyn@lanedo.com>
-Date: Tue, 31 Mar 2015 23:00:13 +0100
-Subject: tracker: Fixed execution bit of tracker-compat, which is broken by sed
-
---- src/tracker/Makefile.in.orig	Fri Jul 31 18:43:01 2015
-+++ src/tracker/Makefile.in	Fri Jul 31 19:57:11 2015
-@@ -990,6 +990,7 @@ uninstall-hook:
- 
- tracker-compat: tracker-compat.in
- 	$(AM_V_at)sed -e "s|@bindir[@]|${bindir}|" $< > $@
-+	$(AM_V_at)chmod +x $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.

x11/gnome/tracker/patches/patch-src_tracker_tracker-process_c

@@ -1,84 +0,0 @@
-$OpenBSD: patch-src_tracker_tracker-process_c,v 1.2 2015/03/29 12:23:38 ajacoutot Exp $
-
-From 95ddae1b224c75b37b2dbe5f1f6b4cb69ea79bdd Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Sat, 28 Mar 2015 17:56:44 +0100
-Subject: openbsd: implement tracker_process_get_uid_for_pid()
-
---- src/tracker/tracker-process.c.orig	Tue Jan 27 00:58:43 2015
-+++ src/tracker/tracker-process.c	Sat Mar 28 17:15:30 2015
-@@ -26,6 +26,15 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- 
-+#ifdef __OpenBSD__
-+#include <sys/param.h>
-+#include <sys/proc.h>
-+#include <sys/sysctl.h>
-+#include <fcntl.h>
-+#include <kvm.h>
-+#include <unistd.h>
-+#endif
-+
- #include "tracker-process.h"
- 
- static TrackerProcessData *
-@@ -134,6 +143,7 @@ tracker_process_get_uid_for_pid (const gchar  *pid_as_
- GSList *
- tracker_process_find_all (void)
- {
-+#ifndef __OpenBSD__
- 	GSList *pids, *l;
- 	GSList *found_pids = NULL;
- 	guint32 own_pid;
-@@ -221,6 +231,50 @@ tracker_process_find_all (void)
- 	g_slist_free (pids);
- 
- 	return g_slist_reverse (found_pids);
-+#else /* ! __OpenBSD__ */
-+	GSList *found_pids = NULL;
-+	gchar **strv;
-+	gchar *basename;
-+	pid_t pid;
-+	gint i, nproc;
-+	gchar buf[_POSIX2_LINE_MAX];
-+	struct kinfo_proc *plist, *kp;
-+	kvm_t *kd;
-+
-+	if ((kd = kvm_openfiles (NULL, NULL, NULL, KVM_NO_FILES, buf)) == NULL)
-+		return NULL;
-+
-+	if ((plist = kvm_getprocs (kd, KERN_PROC_ALL, 0, sizeof (*plist), &nproc)) == NULL)
-+		return NULL;
-+
-+	for (i = 0, kp = plist; i < nproc; i++, kp++) {
-+		if ((kp->p_flag & P_SYSTEM) != 0)
-+			continue;
-+		if ((strv = kvm_getargv (kd, kp, 0)) == NULL)
-+			continue;
-+
-+		pid = kp->p_pid;
-+
-+		/* Don't return our own PID */
-+		if (pid == getpid ())
-+			continue;
-+
-+		/* Don't return PID we don't own */
-+		if (kp->p_uid != getuid ())
-+			continue;
-+
-+		basename = g_path_get_basename (strv[0]);
-+
-+		if ((g_str_has_prefix (basename, "tracker") ||
-+		     g_str_has_prefix (basename, "lt-tracker"))) {
-+			found_pids = g_slist_prepend (found_pids, process_data_new (basename, pid));
-+		} else {
-+			g_free (basename);
-+		}
-+	}
-+
-+	return g_slist_reverse (found_pids);
-+#endif
- }
- 
- gint

x11/gnome/tracker/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.37 2015/07/31 18:39:30 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.38 2015/09/25 06:56:02 ajacoutot Exp $
 @conflict evolution-meta-tracker-*
 @conflict nautilus-meta-tracker-*
 @conflict tracker-*
@@ -145,6 +145,7 @@ share/glib-2.0/schemas/org.freedesktop.Tracker.DB.gschema.xml
 share/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml
 share/glib-2.0/schemas/org.freedesktop.Tracker.FTS.gschema.xml
 share/glib-2.0/schemas/org.freedesktop.Tracker.Miner.Files.gschema.xml
+share/glib-2.0/schemas/org.freedesktop.Tracker.Needle.gschema.xml
 share/glib-2.0/schemas/org.freedesktop.Tracker.Store.gschema.xml
 share/glib-2.0/schemas/org.freedesktop.Tracker.Writeback.gschema.xml
 share/glib-2.0/schemas/org.freedesktop.Tracker.enums.xml