From owner-svn-ports-head@FreeBSD.ORG  Mon Feb  4 08:06:17 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C3F1B80B;
 Mon,  4 Feb 2013 08:06:17 +0000 (UTC)
 (envelope-from maho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AC23E1D8;
 Mon,  4 Feb 2013 08:06:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1486HVw045334;
 Mon, 4 Feb 2013 08:06:17 GMT (envelope-from maho@svn.freebsd.org)
Received: (from maho@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1486H1S045333;
 Mon, 4 Feb 2013 08:06:17 GMT (envelope-from maho@svn.freebsd.org)
Message-Id: <201302040806.r1486H1S045333@svn.freebsd.org>
From: Maho Nakata <maho@FreeBSD.org>
Date: Mon, 4 Feb 2013 08:06:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311577 - head/editors/openoffice-3
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Feb 2013 08:06:17 -0000

Author: maho
Date: Mon Feb  4 08:06:17 2013
New Revision: 311577
URL: http://svnweb.freebsd.org/changeset/ports/311577

Log:
  Now libexttextcat and libtextcat can happily co-exist.
  
  Pointed out by:	Jan Henrik Sylvester <me@janh.de>

Modified:
  head/editors/openoffice-3/Makefile

Modified: head/editors/openoffice-3/Makefile
==============================================================================
--- head/editors/openoffice-3/Makefile	Mon Feb  4 07:44:48 2013	(r311576)
+++ head/editors/openoffice-3/Makefile	Mon Feb  4 08:06:17 2013	(r311577)
@@ -120,17 +120,6 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphic
 		CoinMP.7:${PORTSDIR}/math/coinmp \
 		serf-1.0:${PORTSDIR}/www/serf
 
-.if exists(${LOCALBASE}/include/libexttextcat/textcat.h)
-.if exists(${LOCALBASE}/include/textcat.h)
-LIB_DEPENDS+=	exttextcat-1.0.0:${PORTSDIR}/textproc/libexttextcat
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-libexttextcat-lingucomponent
-.else
-IGNORE= textproc/libexttextcat needs COMPAT_TEXTCAT enabled
-.endif
-.else
-LIB_DEPENDS+=	textcat.0:${PORTSDIR}/textproc/libtextcat
-.endif
-
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
 		gpatch:${PORTSDIR}/devel/patch \