Some updates related to bringing to life deskutils/gnome-documents:

	- Add an option to deskutils/gnome-utils to depend on
	  deskutils/gnome-documents, because the later brings in sysutils/tracker
	- Convert sysutils/tracker-client to sysutils/tracker. The slaves are
	  outdated (the options aren't there anymore)
	- Check the ports are correctly stagified
	- Strip the libs installed by tracker and g-d
	- Convert tracker's lib depends to the new style
	- Use TRACKER_VER to make tracker's pkg-plist more maintainable
	- Keep commented out the tracker options that are not still enabled, I'm
	  going to review those soon

Discussed with:	kwm


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

3 files changed, 17 insertions, 8 deletions

diff --git a/deskutils/gnome-documents/Makefile b/deskutils/gnome-documents/Makefile
index 2ac624d89..01ce8fe3c 100644
--- a/deskutils/gnome-documents/Makefile
+++ b/deskutils/gnome-documents/Makefile
@@ -11,8 +11,6 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Document manager application designed to work with GNOME 3
 
-BROKEN=		need newer libgdata and tracker
-
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
@@ -21,12 +19,14 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libgdata.so.13:${PORTSDIR}/devel/libgdata \
 		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
 		libgjs.so:${PORTSDIR}/lang/gjs \
-		libtrackerclient.so:${PORTSDIR}/sysutils/tracker-client \
+		libtracker-sparql-0.14.so:${PORTSDIR}/sysutils/tracker \
 		libzapojit-0.0.so:${PORTSDIR}/net/libzapojit
-#		libtracker-sparql-0.14.so:${PORTSDIR}/sysutils/tracker-client \
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
+GLIB_SCHEMAS=	org.gnome.Documents.enums.xml \
+		org.gnome.documents.gschema.xml
+
 USE_XZ=		yes
 USES=		gettext gmake pathfix pkgconfig
 USE_GNOME=	gnomedesktop3 gnomeprefix gtk30 intlhack libxml2
@@ -36,4 +36,7 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -Wno-format-nonliteral
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnome-documents/*.so
+
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-documents/pkg-plist b/deskutils/gnome-documents/pkg-plist
index aa0c88c3e..c4d6f0217 100644
--- a/deskutils/gnome-documents/pkg-plist
+++ b/deskutils/gnome-documents/pkg-plist
@@ -14,8 +14,6 @@ share/applications/gnome-documents.desktop
 share/dbus-1/services/org.gnome.Documents.GDataMiner.service
 share/dbus-1/services/org.gnome.Documents.SearchProvider.service
 share/dbus-1/services/org.gnome.Documents.ZpjMiner.service
-share/glib-2.0/schemas/org.gnome.Documents.enums.xml
-share/glib-2.0/schemas/org.gnome.documents.gschema.xml
 share/gnome-documents/gir-1.0/Gd-1.0.gir
 share/gnome-documents/gir-1.0/GdPrivate-1.0.gir
 share/gnome-documents/gnome-documents.gresource
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index f986c1110..45be79591 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -1,6 +1,6 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/deskutils/gnome-utils/Makefile 18837 2013-10-30 21:59:33Z kwm $
+#   $MCom$
 
 PORTNAME=	gnome-utils
 PORTVERSION=	3.6.0
@@ -21,10 +21,18 @@ RUN_DEPENDS=	baobab>=3.0:${PORTSDIR}/deskutils/baobab \
 		gnome-dictionary>=3.0:${PORTSDIR}/deskutils/gnome-dictionary \
 		gnome-system-log>=3.0:${PORTSDIR}/deskutils/gnome-system-log \
 		gnome-font-viewer>=3.0:${PORTSDIR}/deskutils/gnome-font-viewer
-#gnome-documents>=3.0:${PORTSDIR}/deskutils/gnome-documents \
 
 NO_BUILD=	yes
 NO_INSTALL=	yes
 NO_MTREE=	yes
 
+OPTIONS_DEFINE=	DOCS 
+DOCS_DESC=	Build Gnome Documents (pulls in tracker)
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+RUN_DEPENDS+=	gnome-documents>=0:${PORTSDIR}/deskutils/gnome-documents
+.endif
+
 .include <bsd.port.mk>