From 86ef5bb458ca338995a6aa7ad54c15ce54a62e5d Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 4 Sep 2008 21:46:31 +0000 Subject: Resolve the conflict in the between of tracker-client and converters/o3read by get this port to not build/install o3totxt and depend on converters/o3read. Bump the PORTREVISION. PR: ports/126738 Submitted by: Hirohisa Yamaguchi --- sysutils/tracker-client/Makefile | 3 ++- .../tracker-client/files/patch-src_text-filters__Makefile.in | 11 +++++++++++ sysutils/tracker-client/pkg-plist | 1 - 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 sysutils/tracker-client/files/patch-src_text-filters__Makefile.in diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile index 026ed9b2c4d9..5227f1a0a100 100644 --- a/sysutils/tracker-client/Makefile +++ b/sysutils/tracker-client/Makefile @@ -8,7 +8,7 @@ PORTNAME= tracker PORTVERSION= 0.6.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils gnome MASTER_SITES= http://www.gnome.org/~jamiemcc/tracker/ PKGNAMESUFFIX?= -client @@ -25,6 +25,7 @@ LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ qdbm.14:${PORTSDIR}/databases/qdbm \ exempi.3:${PORTSDIR}/textproc/exempi RUN_DEPENDS= xdg-desktop-icon:${PORTSDIR}/devel/xdg-utils \ + o3totxt:${PORTSDIR}/converters/o3read \ pdftotext:${PORTSDIR}/graphics/poppler-utils \ w3m:${PORTSDIR}/www/w3m diff --git a/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in b/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in new file mode 100644 index 000000000000..ee9e1903a1a4 --- /dev/null +++ b/sysutils/tracker-client/files/patch-src_text-filters__Makefile.in @@ -0,0 +1,11 @@ +--- ./src/text-filters/Makefile.in.orig 2008-03-03 13:14:00.000000000 +0900 ++++ ./src/text-filters/Makefile.in 2008-08-22 21:40:00.000000000 +0900 +@@ -266,7 +266,7 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = ooo_converter ++#SUBDIRS = ooo_converter + all: all-recursive + + .SUFFIXES: diff --git a/sysutils/tracker-client/pkg-plist b/sysutils/tracker-client/pkg-plist index 7d16c6e510b3..13723729115d 100644 --- a/sysutils/tracker-client/pkg-plist +++ b/sysutils/tracker-client/pkg-plist @@ -1,4 +1,3 @@ -bin/o3totxt bin/tracker-extract bin/tracker-files bin/tracker-meta-folder -- cgit