diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2012-11-07 00:33:02 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2012-11-07 00:33:02 +0000 |
| commit | 00922f1f415c2f8b5a91a1f7d5df9ed972b5b66d (patch) | |
| tree | 085a444937fcadcd0507ec33a2e524c720800ff2 /editors/openoffice-3-devel | |
| parent | Remove redundant conflict. (diff) | |
Remove IGNORE line as now textproc/libexttextcat and textproc/libtextcat
happily co-exist.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=307112
Diffstat (limited to 'editors/openoffice-3-devel')
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 14 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/extra-patch-libexttextcat-lingucomponent | 13 |
2 files changed, 2 insertions, 25 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 671f78f1e62f..c37040cf9394 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -120,18 +120,8 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ 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 \ diff --git a/editors/openoffice-3-devel/files/extra-patch-libexttextcat-lingucomponent b/editors/openoffice-3-devel/files/extra-patch-libexttextcat-lingucomponent deleted file mode 100644 index 0aec5c2f9b6b..000000000000 --- a/editors/openoffice-3-devel/files/extra-patch-libexttextcat-lingucomponent +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- lingucomponent/source/languageguessing/simpleguesser.cxx.orig 2012-01-10 19:42:30.000000000 +0900 -+++ lingucomponent/source/languageguessing/simpleguesser.cxx 2012-08-07 11:14:45.000000000 +0900 -@@ -114,7 +114,7 @@ - if(!h){return guesses;} - - //calculate le number of unicode charcters (symbols) -- int len = utfstrlen(text); -+ int len = strlen(text); - - if( len > MAX_STRING_LENGTH_TO_ANALYSE ){len = MAX_STRING_LENGTH_TO_ANALYSE ;} - |