Sync w/ FreeBSD ports.

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

9 files changed, 165 insertions, 44 deletions

diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index dd2d7d3dc..af2021cfc 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/tracker/Makefile,v 1.2 2006/12/10 17:33:17 ahze Exp $
+#   $MCom$
 #
 
 PORTNAME=	tracker
-PORTVERSION=	0.5.4
-PORTREVISION=	5
+PORTVERSION=	0.6.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.gnome.org/~jamiemcc/tracker/
 
@@ -21,6 +21,7 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		wv-1.2.3:${PORTSDIR}/textproc/wv \
 		gmime-2.0.4:${PORTSDIR}/mail/gmime2
 
+USE_BZIP2=	yes
 USE_FAM=	yes
 WANT_FAM_SYSTEM=gamin
 USE_GNOME=	gnomedesktop gnomehack gnomeprefix libgsf
@@ -28,15 +29,22 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GSTREAMER=	core
+INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--enable-gstreamer \
-		--disable-inotify \
-		--with-deskbar-applet-handler-dir=${PREFIX}/lib/deskbar-applet/handlers
+CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
+		--enable-file-monitoring=fam \
+		--with-session-bus-services-dir=${LOCALBASE}/share/dbus-1/services \
+		--enable-deskbar-applet \
+		--with-deskbar-applet-handler-dir=${LOCALBASE}/lib/deskbar-applet/handlers
 
 MAN1=		tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
-		tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1
+		tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1 \
+		tracker-preferences.1 tracker-search-tool.1 tracker-status.1 \
+		tracker-tag.1 tracker-thumbnailer.1
+MAN5=		tracker.cfg.5
+MAN7=		tracker-services.7
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
diff --git a/sysutils/tracker/distinfo b/sysutils/tracker/distinfo
index e63bfb6ae..a9bf15f39 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,3 +1,3 @@
-MD5 (tracker-0.5.4.tar.gz) = 724208e1b2d235148499672b44181298
-SHA256 (tracker-0.5.4.tar.gz) = ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2
-SIZE (tracker-0.5.4.tar.gz) = 1381786
+MD5 (tracker-0.6.1.tar.bz2) = 3f706dc73fffa0a7b633b0c0aff6a263
+SHA256 (tracker-0.6.1.tar.bz2) = 2c671498d7406b25bb6e75dd1799165d0d0abfe4309532aeb6ba5e533556932a
+SIZE (tracker-0.6.1.tar.bz2) = 1199993
diff --git a/sysutils/tracker/files/patch-src_libtracker-gtk_Makefile.in b/sysutils/tracker/files/patch-src_libtracker-gtk_Makefile.in
new file mode 100644
index 000000000..e90b89fe8
--- /dev/null
+++ b/sysutils/tracker/files/patch-src_libtracker-gtk_Makefile.in
@@ -0,0 +1,13 @@
+--- src/libtracker-gtk/Makefile.in.orig	2007-08-25 14:42:37.000000000 -0500
++++ src/libtracker-gtk/Makefile.in	2007-08-25 14:42:59.000000000 -0500
+@@ -324,8 +324,8 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ INCLUDES = \
+-	$(LIBTRACKERGTK_CFLAGS) \
+-	-I$(top_srcdir)/src/libtracker
++	-I$(top_srcdir)/src/libtracker \
++	$(LIBTRACKERGTK_CFLAGS)
+ 
+ libtracker_gtkincdir = $(includedir)/libtracker-gtk
+ lib_LTLIBRARIES = libtracker-gtk.la
diff --git a/sysutils/tracker/files/patch-src_libtracker-gtk_tracker-tag-bar.h b/sysutils/tracker/files/patch-src_libtracker-gtk_tracker-tag-bar.h
new file mode 100644
index 000000000..950306602
--- /dev/null
+++ b/sysutils/tracker/files/patch-src_libtracker-gtk_tracker-tag-bar.h
@@ -0,0 +1,11 @@
+--- src/libtracker-gtk/tracker-tag-bar.h.orig	2007-07-17 04:35:33.000000000 +0400
++++ src/libtracker-gtk/tracker-tag-bar.h	2007-08-25 00:53:14.000000000 +0400
+@@ -59,6 +59,8 @@
+ 				    const gchar 		*uri
+ 				   );
+ 
++GType tracker_tag_bar_get_type(void);
++
+ G_END_DECLS
+ 
+ #endif /* TRACKER_TAG_BAR_H */
diff --git a/sysutils/tracker/files/patch-src_sqlite3_Makefile.in b/sysutils/tracker/files/patch-src_sqlite3_Makefile.in
new file mode 100644
index 000000000..21069bd24
--- /dev/null
+++ b/sysutils/tracker/files/patch-src_sqlite3_Makefile.in
@@ -0,0 +1,10 @@
+--- src/sqlite3/Makefile.in.orig	2007-08-25 13:54:21.000000000 -0500
++++ src/sqlite3/Makefile.in	2007-08-25 13:54:28.000000000 -0500
+@@ -321,7 +321,6 @@
+ INCLUDES = \
+ 	 $(SQLITE_OS)			\
+ 	 -DHAVE_USLEEP=1 		\
+-	 -DHAVE_FDATASYNC=1 		\
+ 	 -DNDEBUG			\
+ 	 -DTHREADSAFE=1			\
+ 	 -DSQLITE_THREAD_OVERRIDE_LOCK=-1	\
diff --git a/sysutils/tracker/files/patch-src_sqlite3_os_unix.c b/sysutils/tracker/files/patch-src_sqlite3_os_unix.c
deleted file mode 100644
index 5cbb1a30c..000000000
--- a/sysutils/tracker/files/patch-src_sqlite3_os_unix.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/sqlite3/os_unix.c.orig	Sat Dec  9 21:35:39 2006
-+++ src/sqlite3/os_unix.c	Sat Dec  9 21:36:02 2006
-@@ -1110,9 +1110,7 @@
- ** Use the fdatasync() API only if the HAVE_FDATASYNC macro is defined.
- ** Otherwise use fsync() in its place.
- */
--#ifndef HAVE_FDATASYNC
- # define fdatasync fsync
--#endif
- 
- /*
- ** Define HAVE_FULLFSYNC to 0 or 1 depending on whether or not
diff --git a/sysutils/tracker/files/patch-src_tracker-search-tool_tracker-search-tool-support.h b/sysutils/tracker/files/patch-src_tracker-search-tool_tracker-search-tool-support.h
new file mode 100644
index 000000000..609f18068
--- /dev/null
+++ b/sysutils/tracker/files/patch-src_tracker-search-tool_tracker-search-tool-support.h
@@ -0,0 +1,18 @@
+--- src/tracker-search-tool/tracker-search-tool-support.h.orig	2007-07-21 20:55:20.000000000 +0400
++++ src/tracker-search-tool/tracker-search-tool-support.h	2007-08-24 22:31:05.000000000 +0400
+@@ -143,6 +143,15 @@
+ tracker_search_get_stored_window_geometry (gint * width,
+                                         gint * height);
+ 
++void
++tracker_set_stored_separator_position (int pos);
++
++char *
++tracker_string_replace (const char *haystack, char *needle, char *replacement);
++
++int
++tracker_get_stored_separator_position ();
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/sysutils/tracker/files/patch-src_trackerd_tracker-utils.c b/sysutils/tracker/files/patch-src_trackerd_tracker-utils.c
new file mode 100644
index 000000000..132346af4
--- /dev/null
+++ b/sysutils/tracker/files/patch-src_trackerd_tracker-utils.c
@@ -0,0 +1,14 @@
+--- src/trackerd/tracker-utils.c.orig	2007-08-05 01:53:12.000000000 +0400
++++ src/trackerd/tracker-utils.c	2007-08-24 22:31:05.000000000 +0400
+@@ -727,10 +727,7 @@
+ 		tm.tm_sec = strtoul (timestamp, (char **)&timestamp, 10);
+ 	}
+ 
+-	tt = mktime (&tm);
+-        /* mktime() always assumes that "tm" is in locale time but
+-           we want to keep control on time, so we go to UTC */
+-        tt -= timezone;
++	tt = timegm (&tm);
+ 
+ 	if (*timestamp == '+' || *timestamp == '-') {
+ 		int sign;
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index 748459889..fb1c70c53 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -1,25 +1,39 @@
-bin/htmless
 bin/o3totxt
 bin/tracker-extract
 bin/tracker-files
 bin/tracker-meta-folder
+bin/tracker-preferences
 bin/tracker-query
 bin/tracker-search
 bin/tracker-search-tool
 bin/tracker-stats
+bin/tracker-status
 bin/tracker-tag
 bin/tracker-thumbnailer
 bin/trackerd
 etc/xdg/autostart/trackerd.desktop
+include/libtracker-gtk/tracker-gtk.h
+include/libtracker-gtk/tracker-keyword-store.h
+include/libtracker-gtk/tracker-metadata-tile.h
+include/libtracker-gtk/tracker-tag-bar.h
+include/libtracker-gtk/tracker-ui.h
+include/libtracker-gtk/tracker-utils.h
 include/tracker-client.h
 include/tracker.h
 lib/deskbar-applet/handlers/tracker-handler.py
+lib/libtracker-gtk.a
+lib/libtracker-gtk.la
+lib/libtracker-gtk.so
+lib/libtracker-gtk.so.0
 lib/libtrackerclient.a
 lib/libtrackerclient.la
 lib/libtrackerclient.so
 lib/libtrackerclient.so.0
+lib/tracker/filters/application/csv_filter
 lib/tracker/filters/application/msword_filter
 lib/tracker/filters/application/pdf_filter
+lib/tracker/filters/application/tab-separated-values_filter
+lib/tracker/filters/application/vnd.ms-excel_filter
 lib/tracker/filters/application/vnd.oasis.opendocument.presentation-template_filter
 lib/tracker/filters/application/vnd.oasis.opendocument.presentation_filter
 lib/tracker/filters/application/vnd.oasis.opendocument.spreadsheet-template_filter
@@ -29,12 +43,19 @@ lib/tracker/filters/application/vnd.oasis.opendocument.text_filter
 lib/tracker/filters/application/vnd.stardivision.writer_filter
 lib/tracker/filters/application/vnd.sun.xml.calc.template_filter
 lib/tracker/filters/application/vnd.sun.xml.calc_filter
+lib/tracker/filters/application/vnd.sun.xml.draw_filter
 lib/tracker/filters/application/vnd.sun.xml.impress.template_filter
 lib/tracker/filters/application/vnd.sun.xml.impress_filter
 lib/tracker/filters/application/vnd.sun.xml.writer.template_filter
 lib/tracker/filters/application/vnd.sun.xml.writer_filter
 lib/tracker/filters/application/x-abiword_filter
+lib/tracker/filters/application/x-gnumeric_filter
+lib/tracker/filters/text/csv_filter
+lib/tracker/filters/text/djvu_filter
 lib/tracker/filters/text/html_filter
+lib/tracker/filters/text/spreadsheet_filter
+lib/tracker/filters/text/tab-separated-values_filter
+lib/tracker/filters/text/x-comma-separated-values_filter
 lib/tracker/filters/text/x-tex_filter
 lib/tracker/filters/text/xml_filter
 lib/tracker/thumbnailers/application/pdf_thumbnailer
@@ -44,28 +65,21 @@ lib/tracker/thumbnailers/application/vnd.oasis.opendocument.spreadsheet_thumbnai
 lib/tracker/thumbnailers/application/vnd.oasis.opendocument.text_thumbnailer
 lib/tracker/thumbnailers/image/jpeg_thumbnailer
 lib/tracker/thumbnailers/image/png_thumbnailer
+libdata/pkgconfig/libtracker-gtk.pc
 libdata/pkgconfig/tracker.pc
-share/dbus-1/services/tracker.service
+share/applications/tracker-preferences.desktop
 share/applications/tracker-search-tool.desktop
-share/pixmaps/tracker/thumbnail_frame.png
-share/pixmaps/tracker/tracker.png
-share/tracker/languages/stopwords.da
-share/tracker/languages/stopwords.de
-share/tracker/languages/stopwords.en
-share/tracker/languages/stopwords.es
-share/tracker/languages/stopwords.fi
-share/tracker/languages/stopwords.fr
-share/tracker/languages/stopwords.it
-share/tracker/languages/stopwords.nb
-share/tracker/languages/stopwords.nl
-share/tracker/languages/stopwords.pt
-share/tracker/languages/stopwords.ru
-share/tracker/languages/stopwords.sv
-share/tracker/sqlite-stored-procs.sql
-share/tracker/sqlite-tracker.sql
-share/tracker/tracker-introspect.xml
+share/dbus-1/services/tracker.service
+share/icons/hicolor/16x16/apps/tracker.png
+share/icons/hicolor/22x22/apps/tracker.png
+share/icons/hicolor/24x24/apps/tracker.png
+share/icons/hicolor/32x32/apps/tracker.png
+share/icons/hicolor/48x48/apps/tracker.png
+share/icons/hicolor/scalable/apps/tracker.svg
 share/locale/ar/LC_MESSAGES/tracker.mo
+share/locale/ca/LC_MESSAGES/tracker.mo
 share/locale/de/LC_MESSAGES/tracker.mo
+share/locale/dz/LC_MESSAGES/tracker.mo
 share/locale/en_GB/LC_MESSAGES/tracker.mo
 share/locale/es/LC_MESSAGES/tracker.mo
 share/locale/et/LC_MESSAGES/tracker.mo
@@ -73,12 +87,52 @@ share/locale/fi/LC_MESSAGES/tracker.mo
 share/locale/fr/LC_MESSAGES/tracker.mo
 share/locale/gl/LC_MESSAGES/tracker.mo
 share/locale/it/LC_MESSAGES/tracker.mo
+share/locale/mk/LC_MESSAGES/tracker.mo
 share/locale/nb/LC_MESSAGES/tracker.mo
+share/locale/oc/LC_MESSAGES/tracker.mo
+share/locale/pt/LC_MESSAGES/tracker.mo
+share/locale/ru/LC_MESSAGES/tracker.mo
 share/locale/sl/LC_MESSAGES/tracker.mo
 share/locale/sv/LC_MESSAGES/tracker.mo
-@dirrm share/tracker/languages
-@dirrm share/tracker
-@dirrm share/pixmaps/tracker
+%%DATADIR%%/icons/thumbnail_frame.png
+%%DATADIR%%/languages/stopwords.da
+%%DATADIR%%/languages/stopwords.de
+%%DATADIR%%/languages/stopwords.en
+%%DATADIR%%/languages/stopwords.es
+%%DATADIR%%/languages/stopwords.fi
+%%DATADIR%%/languages/stopwords.fr
+%%DATADIR%%/languages/stopwords.it
+%%DATADIR%%/languages/stopwords.nb
+%%DATADIR%%/languages/stopwords.nl
+%%DATADIR%%/languages/stopwords.pt
+%%DATADIR%%/languages/stopwords.ru
+%%DATADIR%%/languages/stopwords.sv
+%%DATADIR%%/services/application.metadata
+%%DATADIR%%/services/audio.metadata
+%%DATADIR%%/services/default.metadata
+%%DATADIR%%/services/default.service
+%%DATADIR%%/services/document.metadata
+%%DATADIR%%/services/email.metadata
+%%DATADIR%%/services/file.metadata
+%%DATADIR%%/services/image.metadata
+%%DATADIR%%/services/video.metadata
+%%DATADIR%%/sqlite-cache.sql
+%%DATADIR%%/sqlite-email.sql
+%%DATADIR%%/sqlite-metadata.sql
+%%DATADIR%%/sqlite-service-stored-procs.sql
+%%DATADIR%%/sqlite-service-triggers.sql
+%%DATADIR%%/sqlite-service-types.sql
+%%DATADIR%%/sqlite-service.sql
+%%DATADIR%%/sqlite-stored-procs.sql
+%%DATADIR%%/sqlite-tracker-triggers.sql
+%%DATADIR%%/sqlite-tracker.sql
+%%DATADIR%%/sqlite-user-data.sql
+%%DATADIR%%/tracker-introspect.xml
+%%DATADIR%%/tracker-preferences.glade
+@dirrm %%DATADIR%%/services
+@dirrm %%DATADIR%%/languages
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 @dirrm lib/tracker/thumbnailers/image
 @dirrm lib/tracker/thumbnailers/application
 @dirrm lib/tracker/thumbnailers
@@ -88,5 +142,10 @@ share/locale/sv/LC_MESSAGES/tracker.mo
 @dirrm lib/tracker
 @dirrmtry lib/deskbar-applet/handlers
 @dirrmtry lib/deskbar-applet
+@dirrm include/libtracker-gtk
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz