From owner-svn-ports-all@FreeBSD.ORG Mon Oct 28 23:18:27 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 26B3FECD; Mon, 28 Oct 2013 23:18:27 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EE5D2274A; Mon, 28 Oct 2013 23:18:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SNIQbC081450; Mon, 28 Oct 2013 23:18:26 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SNIQmR081449; Mon, 28 Oct 2013 23:18:26 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201310282318.r9SNIQmR081449@svn.freebsd.org> From: Jung-uk Kim Date: Mon, 28 Oct 2013 23:18:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331906 - head/editors/libreoffice X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2013 23:18:27 -0000 Author: jkim Date: Mon Oct 28 23:18:26 2013 New Revision: 331906 URL: http://svnweb.freebsd.org/changeset/ports/331906 Log: - Install manual pages. This fixes staging support. [1] - Convert to "USES=compiler:c++11-lang" to fix build. [2] Reported by: antoine [1] PR: ports/183392 [2] Modified: head/editors/libreoffice/Makefile Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Mon Oct 28 22:06:04 2013 (r331905) +++ head/editors/libreoffice/Makefile Mon Oct 28 23:18:26 2013 (r331906) @@ -67,7 +67,7 @@ USE_PYTHON= yes USE_QT4= # empty but required USE_XORG= xaw xrandr USE_XZ= yes -USES= bison gmake perl5 pkgconfig +USES= bison compiler:c++11-lang gmake perl5 pkgconfig WANT_GNOME= yes DISTFILES+= ${PORTNAME}-${LOVERSION}${EXTRACT_SUFX} @@ -320,27 +320,12 @@ CONFIGURE_ARGS+= --disable-neon .include -.if defined(WITH_GCC) -USE_GCC= yes -CONFIGURE_ENV+= CXXCPP="${CPP}" -.else -.if exists(/usr/bin/clang) && ${OSVERSION} > 901502 -CC= /usr/bin/clang -CPP= /usr/bin/clang-cpp -CXX= /usr/bin/clang++ -CONFIGURE_ENV+= CXXCPP="${CPP}" -.if ${OSVERSION} > 100054 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++ -.endif -.else -# XXX Clang PR13308 (http://llvm.org/bugs/show_bug.cgi?id=13308) -BUILD_DEPENDS+= clang>=3.2_4:${PORTSDIR}/lang/clang +.if ${CXX:M${LOCALBASE}/bin/clang++} USE_BINUTILS= yes -CC= ${LOCALBASE}/bin/clang -CPP= ${CC} -E -CXX= ${LOCALBASE}/bin/clang++ -CONFIGURE_ENV+= CXXCPP="${CXX} -E" .endif + +.if ${COMPILER_FEATURES:Mlibc++} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libc++ .endif .if ${OSVERSION} < 900506 @@ -374,7 +359,7 @@ do-install: @cd ${LODESTDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \ -empty -exec ${ECHO_CMD} "@exec ${MKDIR} %D/{}" \; >> ${PLISTD} - @cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s bin lib \ + @cd ${LODESTDIR}${PREFIX} && ${FIND} -H -s bin lib man \ \( -type f -o -type l \) -print >> ${PLISTF} @cd ${LODESTDIR}${PREFIX} && ${FIND} -d lib/libreoffice -type d \ -exec ${ECHO_CMD} "@dirrm {}" \; >> ${PLISTD}