From owner-svn-ports-head@FreeBSD.ORG  Wed Nov  7 00:33:03 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 18FC7A9;
 Wed,  7 Nov 2012 00:33:03 +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 F14EE8FC0C;
 Wed,  7 Nov 2012 00:33:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA70X2Lp002052;
 Wed, 7 Nov 2012 00:33:02 GMT (envelope-from maho@svn.freebsd.org)
Received: (from maho@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA70X2Oe002050;
 Wed, 7 Nov 2012 00:33:02 GMT (envelope-from maho@svn.freebsd.org)
Message-Id: <201211070033.qA70X2Oe002050@svn.freebsd.org>
From: Maho Nakata <maho@FreeBSD.org>
Date: Wed, 7 Nov 2012 00:33:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307112 - in head/editors/openoffice-3-devel: . files
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: Wed, 07 Nov 2012 00:33:03 -0000

Author: maho
Date: Wed Nov  7 00:33:02 2012
New Revision: 307112
URL: http://svnweb.freebsd.org/changeset/ports/307112

Log:
  Remove IGNORE line as now textproc/libexttextcat and textproc/libtextcat
  happily co-exist.
  
  Feature safe: yes

Deleted:
  head/editors/openoffice-3-devel/files/extra-patch-libexttextcat-lingucomponent
Modified:
  head/editors/openoffice-3-devel/Makefile

Modified: head/editors/openoffice-3-devel/Makefile
==============================================================================
--- head/editors/openoffice-3-devel/Makefile	Tue Nov  6 23:35:00 2012	(r307111)
+++ head/editors/openoffice-3-devel/Makefile	Wed Nov  7 00:33:02 2012	(r307112)
@@ -120,18 +120,8 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphic
 		apr-1.4:${PORTSDIR}/devel/apr1 \
 		CoinMP.7:${PORTSDIR}/math/coinmp \
 		serf-1.0:${PORTSDIR}/www/serf \
-		freetype.9:${PORTSDIR}/print/freetype2
-
-.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
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		textcat.0:${PORTSDIR}/textproc/libtextcat
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \