From 11cee2e8c90cf7b2564f712b4ceb2ba08f91f761 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Thu, 26 Apr 2012 14:55:09 +0000 Subject: - add a patch fixing .doc/.docx loading [1] - workaround a pointyhat/tinderbox box, preventing it to figureout clang is needed as a dependency on 7 and 8 when host is 9+ Submitted by: Meowthink (via office@ mailing list) Obtained from: libreoffice git master [1] --- editors/libreoffice/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'editors/libreoffice/Makefile') diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index d42ef9a954b5..e2b5e40d7086 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -7,7 +7,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITE_SUBDIR= src/${PORTVERSION}/ MASTER_SITES+= http://dev-www.libreoffice.org/src/:ext \ @@ -217,7 +217,13 @@ CC= clang CXX= clang++ CXXCPP= clang-cpp CPP= clang-cpp -.if !exists(${DESTDIR}/usr/bin/clang) +# Work around a bug in pointyhat and tinderbox, prevent it to determine than +# clang from ports is needed when host is a freebsd 9+ +.if defined(PACKAGE_BUILDING) +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang:${PORTSDIR}/lang/clang +USE_BINUTILS= yes +.endif +.if !exists(/usr/bin/clang) BUILD_DEPENDS+= ${LOCALBASE}/bin/clang:${PORTSDIR}/lang/clang USE_BINUTILS= yes CXXCPP= clang++ -E -- cgit v1.2.3