5 files changed, 73 insertions, 68 deletions

diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index b45081f01e8b..867d4b49f82d 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: ports/sysutils/tracker/Makefile,v 1.8 2007/10/05 16:55:59 mezz Exp $
 #
 
 PORTNAME=	tracker
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.6.2
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.gnome.org/~jamiemcc/tracker/
 
@@ -19,7 +19,9 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		wv-1.2.3:${PORTSDIR}/textproc/wv \
-		gmime-2.0.4:${PORTSDIR}/mail/gmime2
+		gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
+#RUN_DEPENDS=	${LOCALBASE}/lib/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet
 
 USE_BZIP2=	yes
 USE_FAM=	yes
@@ -39,12 +41,12 @@ CONFIGURE_ARGS=	--enable-video-extractor=gstreamer \
 		--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-preferences.1 tracker-search-tool.1 tracker-status.1 \
-		tracker-tag.1 tracker-thumbnailer.1
-MAN5=		tracker.cfg.5
-MAN7=		tracker-services.7
+MAN1=	tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
+	tracker-preferences.1 tracker-query.1 tracker-search.1 \
+	tracker-search-tool.1 tracker-stats.1 tracker-status.1 \
+	tracker-tag.1 tracker-thumbnailer.1 trackerd.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 a9bf15f39356..01cde91775e7 100644
--- a/sysutils/tracker/distinfo
+++ b/sysutils/tracker/distinfo
@@ -1,3 +1,3 @@
-MD5 (tracker-0.6.1.tar.bz2) = 3f706dc73fffa0a7b633b0c0aff6a263
-SHA256 (tracker-0.6.1.tar.bz2) = 2c671498d7406b25bb6e75dd1799165d0d0abfe4309532aeb6ba5e533556932a
-SIZE (tracker-0.6.1.tar.bz2) = 1199993
+MD5 (tracker-0.6.2.tar.bz2) = d4d66cd73e6c59ac392565be622370f2
+SHA256 (tracker-0.6.2.tar.bz2) = 8a7e80fe5384c0f5d7f87f43121b48be0b7bc5ccf50fdb2ca81517ce2375b36f
+SIZE (tracker-0.6.2.tar.bz2) = 747560
diff --git a/sysutils/tracker/files/patch-src_sqlite3_Makefile.in b/sysutils/tracker/files/patch-src_sqlite3_Makefile.in
deleted file mode 100644
index 21069bd24ced..000000000000
--- a/sysutils/tracker/files/patch-src_sqlite3_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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_trackerd_tracker-apps.c b/sysutils/tracker/files/patch-src_trackerd_tracker-apps.c
new file mode 100644
index 000000000000..6326c01a2719
--- /dev/null
+++ b/sysutils/tracker/files/patch-src_trackerd_tracker-apps.c
@@ -0,0 +1,12 @@
+--- ./src/trackerd/tracker-apps.c.orig	2007-10-05 20:18:39.000000000 +0400
++++ ./src/trackerd/tracker-apps.c	2007-10-05 20:19:10.000000000 +0400
+@@ -18,7 +18,8 @@
+  * Boston, MA  02110-1301, USA.
+  */
+ 
+-#include<string.h>
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "tracker-apps.h"
+ #include "tracker-db.h"
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index ea2c827b73a6..2d36ccbfa4e1 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -20,7 +20,6 @@ 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
@@ -67,44 +66,9 @@ lib/tracker/thumbnailers/image/jpeg_thumbnailer
 lib/tracker/thumbnailers/image/png_thumbnailer
 libdata/pkgconfig/libtracker-gtk.pc
 libdata/pkgconfig/tracker.pc
+share/applications/tracker-preferences.desktop
+share/applications/tracker-search-tool.desktop
 share/dbus-1/services/tracker.service
-share/gnome/applications/tracker-preferences.desktop
-share/gnome/applications/tracker-search-tool.desktop
-share/gnome/tracker/icons/thumbnail_frame.png
-share/gnome/tracker/languages/stopwords.da
-share/gnome/tracker/languages/stopwords.de
-share/gnome/tracker/languages/stopwords.en
-share/gnome/tracker/languages/stopwords.es
-share/gnome/tracker/languages/stopwords.fi
-share/gnome/tracker/languages/stopwords.fr
-share/gnome/tracker/languages/stopwords.it
-share/gnome/tracker/languages/stopwords.nb
-share/gnome/tracker/languages/stopwords.nl
-share/gnome/tracker/languages/stopwords.pt
-share/gnome/tracker/languages/stopwords.ru
-share/gnome/tracker/languages/stopwords.sv
-share/gnome/tracker/services/application.metadata
-share/gnome/tracker/services/audio.metadata
-share/gnome/tracker/services/default.metadata
-share/gnome/tracker/services/default.service
-share/gnome/tracker/services/document.metadata
-share/gnome/tracker/services/email.metadata
-share/gnome/tracker/services/file.metadata
-share/gnome/tracker/services/image.metadata
-share/gnome/tracker/services/video.metadata
-share/gnome/tracker/sqlite-cache.sql
-share/gnome/tracker/sqlite-email.sql
-share/gnome/tracker/sqlite-metadata.sql
-share/gnome/tracker/sqlite-service-stored-procs.sql
-share/gnome/tracker/sqlite-service-triggers.sql
-share/gnome/tracker/sqlite-service-types.sql
-share/gnome/tracker/sqlite-service.sql
-share/gnome/tracker/sqlite-stored-procs.sql
-share/gnome/tracker/sqlite-tracker-triggers.sql
-share/gnome/tracker/sqlite-tracker.sql
-share/gnome/tracker/sqlite-user-data.sql
-share/gnome/tracker/tracker-introspect.xml
-share/gnome/tracker/tracker-preferences.glade
 share/icons/hicolor/16x16/apps/tracker.png
 share/icons/hicolor/22x22/apps/tracker.png
 share/icons/hicolor/24x24/apps/tracker.png
@@ -122,14 +86,55 @@ 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/lt/LC_MESSAGES/tracker.mo
 share/locale/mk/LC_MESSAGES/tracker.mo
 share/locale/nb/LC_MESSAGES/tracker.mo
+share/locale/nl/LC_MESSAGES/tracker.mo
 share/locale/oc/LC_MESSAGES/tracker.mo
+share/locale/pl/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 include/libtracker-gtk
+%%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
@@ -137,15 +142,11 @@ share/locale/sv/LC_MESSAGES/tracker.mo
 @dirrm lib/tracker/filters/application
 @dirrm lib/tracker/filters
 @dirrm lib/tracker
-@dirrm share/gnome/tracker/services
-@dirrm share/gnome/tracker/languages
-@dirrm share/gnome/tracker/icons
-@dirrm share/gnome/tracker
+@dirrm include/libtracker-gtk
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
-@dirrmtry lib/deskbar-applet/handlers
-@dirrmtry lib/deskbar-applet
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/applications