svn commit: r307112 - in head/editors/openoffice-3-devel: . files

[Maho Nakata]

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 \