-Fix the BROKEN, do not install in /. Remove the BROKEN.

-Remove a patch and use gnomehack instead.
-The '--mandir=' is no longer need, taken care by gnomeprefix.
-Clean up a bit in Makefile to make it readable.
-Update the WWW.

6 files changed, 32 insertions, 26 deletions

diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index 2f4b12345eb7..cf8f6f29d796 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -4,6 +4,7 @@
 #
 # $FreeBSD$
 #    $MCom: ports/sysutils/tracker/Makefile,v 1.2 2006/12/10 17:33:17 ahze Exp $
+#
 
 PORTNAME=	tracker
 PORTVERSION=	0.5.4
@@ -19,26 +20,25 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		wv-1.2.3:${PORTSDIR}/textproc/wv \
 		gmime-2.0.4:${PORTSDIR}/mail/gmime2
 
-BROKEN=		Installs file into /
-
 USE_FAM=	yes
-WANT_FAM_SYSTEM=	gamin
-USE_GSTREAMER=	core
-USE_GNOME=	gnomedesktop gnomeprefix libgsf
-CONFIGURE_ARGS=	--enable-gstreamer --disable-inotify --mandir=${PREFIX}/man
-GNU_CONFIGURE=	yes
+WANT_FAM_SYSTEM=gamin
+USE_GNOME=	gnomedesktop gnomehack gnomeprefix libgsf
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+USE_GSTREAMER=	core
+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
+
 
-MAN1=	tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
-	tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1
+MAN1=		tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
+		tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/tracker-client/pkg-descr b/sysutils/tracker-client/pkg-descr
index 31691f34ec3a..fbabf7af0df8 100644
--- a/sysutils/tracker-client/pkg-descr
+++ b/sysutils/tracker-client/pkg-descr
@@ -10,4 +10,4 @@ infinte number of properties, metadata (both embedded/harvested as well as user
 definable), a comprehensive database of keywords/tags and links to other
 entities.
 
-WWW: http://www.gnome.org/~jamiemcc/tracker/
+WWW: http://www.tracker-project.org/
diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist
index 474819fe8663..a2d5e9e7a4eb 100644
--- a/sysutils/tracker-client/pkg-plist
+++ b/sysutils/tracker-client/pkg-plist
@@ -13,6 +13,7 @@ bin/trackerd
 etc/xdg/autostart/trackerd.desktop
 include/tracker-client.h
 include/tracker.h
+lib/deskbar-applet/handlers/tracker-handler.py
 lib/libtrackerclient.a
 lib/libtrackerclient.la
 lib/libtrackerclient.so
@@ -91,5 +92,7 @@ share/locale/sv/LC_MESSAGES/tracker.mo
 @dirrm lib/tracker/filters/application
 @dirrm lib/tracker/filters
 @dirrm lib/tracker
+@dirrmtry lib/deskbar-applet/handlers
+@dirrmtry lib/deskbar-applet
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index 2f4b12345eb7..cf8f6f29d796 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -4,6 +4,7 @@
 #
 # $FreeBSD$
 #    $MCom: ports/sysutils/tracker/Makefile,v 1.2 2006/12/10 17:33:17 ahze Exp $
+#
 
 PORTNAME=	tracker
 PORTVERSION=	0.5.4
@@ -19,26 +20,25 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		wv-1.2.3:${PORTSDIR}/textproc/wv \
 		gmime-2.0.4:${PORTSDIR}/mail/gmime2
 
-BROKEN=		Installs file into /
-
 USE_FAM=	yes
-WANT_FAM_SYSTEM=	gamin
-USE_GSTREAMER=	core
-USE_GNOME=	gnomedesktop gnomeprefix libgsf
-CONFIGURE_ARGS=	--enable-gstreamer --disable-inotify --mandir=${PREFIX}/man
-GNU_CONFIGURE=	yes
+WANT_FAM_SYSTEM=gamin
+USE_GNOME=	gnomedesktop gnomehack gnomeprefix libgsf
 USE_GMAKE=	yes
-USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+USE_GSTREAMER=	core
+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
+
 
-MAN1=	tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
-	tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1
+MAN1=		tracker-extract.1 tracker-files.1 tracker-meta-folder.1 \
+		tracker-query.1 tracker-search.1 tracker-stats.1 trackerd.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/tracker/pkg-descr b/sysutils/tracker/pkg-descr
index 31691f34ec3a..fbabf7af0df8 100644
--- a/sysutils/tracker/pkg-descr
+++ b/sysutils/tracker/pkg-descr
@@ -10,4 +10,4 @@ infinte number of properties, metadata (both embedded/harvested as well as user
 definable), a comprehensive database of keywords/tags and links to other
 entities.
 
-WWW: http://www.gnome.org/~jamiemcc/tracker/
+WWW: http://www.tracker-project.org/
diff --git a/sysutils/tracker/pkg-plist b/sysutils/tracker/pkg-plist
index 474819fe8663..a2d5e9e7a4eb 100644
--- a/sysutils/tracker/pkg-plist
+++ b/sysutils/tracker/pkg-plist
@@ -13,6 +13,7 @@ bin/trackerd
 etc/xdg/autostart/trackerd.desktop
 include/tracker-client.h
 include/tracker.h
+lib/deskbar-applet/handlers/tracker-handler.py
 lib/libtrackerclient.a
 lib/libtrackerclient.la
 lib/libtrackerclient.so
@@ -91,5 +92,7 @@ share/locale/sv/LC_MESSAGES/tracker.mo
 @dirrm lib/tracker/filters/application
 @dirrm lib/tracker/filters
 @dirrm lib/tracker
+@dirrmtry lib/deskbar-applet/handlers
+@dirrmtry lib/deskbar-applet
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg