From nobody Tue Mar 14 21:19:53 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pbmd56Rghz3yl1P; Tue, 14 Mar 2023 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pbmd55ytqz3qvH; Tue, 14 Mar 2023 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678828793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=73TY7v221PMWUEaW3Uxro32XqYzfH8CPwW4iUKNA2YQ=; b=qE7ZIvq0Kj8pXH5/kELP2O1i1kj/2RUYDZ+loikzV4qFiZxPohZ1qzdUu5P84EM1Jhtniu 0CV80Y+i9gOT7CEqzpH0DJfYmw76vUrpheoCJRDdpUSYU6TANFU8T3uw+Lnr8he8FBvzBH kcuO1If1t+mw/ss7RzJVL2kL/nZ/Y8pRaby7ZT/f4DBMZhviudDDc1CntTbfloeRCAn82N trGI1UiF3rEUL2QtAQsDV5Lfv95AXLMVfR7+qn5IW3fxilrxJQwnzEPA0SWPIbUH4OkpFI /ZmBcgzUpsO3BTTiTBgWTjZvvTt+uKmvHRBgXUUFs2fTp+OIe2O3N1nqyrC+/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678828793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=73TY7v221PMWUEaW3Uxro32XqYzfH8CPwW4iUKNA2YQ=; b=d4fXCWdJV+7SjO/aFkAipSzvCX1hjI1Vlb6EFZSFAt4IhOQiMepQO6DTsYTmpgDs1ZRM7q oG/fqlJdEWW2nSpNk/6FWbYYO19ntVFH4Y/qSWDqtm9TKD6sSMpao6FTHdmrYCcF7t/N7y /4UVACVynKu3VoP2URRyKrqw+oqC2pF9jabvi+V+c/1MB7kEOalMXgW9U1jmJnMw5UnQCo oh7atHWQ6Zyy2YH133AGWZz78os0ONr8DbhdO/4OptMS4MIqvuueMV1AoXWJeFFEoJ6SGU 0cC91o4sS/B8iRdvOnEQmLW5VHHS9/PhAYwhNFkOmDIiz9o+dqtFXD3yD/IjlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678828793; a=rsa-sha256; cv=none; b=hoj/poyPyJhhKaV6UwC0K/H+eB8GWzxpUryHqRpELM900VZNretdtUd7fdS7uB4w316NlX oKPNNrBmd6GvBDWNEzVFbHxZ2wvYgNdg1MKC7daX5kfjeZZajmACwlpZ2PQfNMSRls1swD JWOZaovivfp+4N2pEfWeBHmI9mLt+1EvSKWU8oz8sRVJrYaGxel9MBVlxJPC6t+x11s2x/ 0HdHBi+rRPlGuX5P00POC0tuahgGINmLsdfH8QgEKDhIPQgYwSn7smzDTt13oXSqT3uQjK D6gVxIwEmMT3syNpEvA0DF1CJGZkh5oKPQkn2/QybB2azyjuwoSiNPReJq0O4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pbmd54kNhzr0j; Tue, 14 Mar 2023 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ELJrBh035535; Tue, 14 Mar 2023 21:19:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ELJr6v035534; Tue, 14 Mar 2023 21:19:53 GMT (envelope-from git) Date: Tue, 14 Mar 2023 21:19:53 GMT Message-Id: <202303142119.32ELJr6v035534@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: e0a892ced94c - main - editors/openoffice-*: test for required jar file List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0a892ced94cf2502b2f8401b24c358bd3f7f6a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=e0a892ced94cf2502b2f8401b24c358bd3f7f6a1 commit e0a892ced94cf2502b2f8401b24c358bd3f7f6a1 Author: Don Lewis AuthorDate: 2023-03-14 20:56:42 +0000 Commit: Don Lewis CommitDate: 2023-03-14 21:19:45 +0000 editors/openoffice-*: test for required jar file Test for a required jar file that is optionally installed by textproc/lucene and fail at the configure step with a helpful message if we don't find it. If the jar file is missing, javac fails during the build of l10ntools module with an unhelpful error message that does not pinpoint the cause of the problem. PR: 270158 Reported by: Ken Gunderson --- editors/openoffice-4/Makefile | 8 ++++++++ editors/openoffice-devel/Makefile | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 6fd8b3d81a44..fa78c44e61ae 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -410,6 +410,14 @@ post-patch: ${REINPLACE_CMD} -e "s/ := -Os/ := -O2 -fno-unroll-loops/" ${WRKSRC}/solenv/gbuild/platform/freebsd.mk .endif +# Verify that lucene was built with the CONTRIB option instead of +# failing mysteriously during the build +pre-configure: + @if [ ! -f ${JAVALIBDIR}/lucene-analyzers-3.6.2.jar ]; then \ + ${ECHO} "error: textproc/lucene must be built with the CONTRIB option enabled"; \ + exit 1; \ + fi + do-build: ${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/source_config cd ${WRKSRC} ; ./bootstrap diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index b58427969cde..21f3a7170163 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -54,6 +54,7 @@ BROKEN_powerpc64= fails to compile: aoo-4.2.0/main/solver/420/unxfbsdppc64.pro/i BUILD_DEPENDS= \ p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ + ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs \ ${LOCALBASE}/bin/unzip:archivers/unzip \ zip:archivers/zip \ ant:devel/apache-ant \ @@ -414,6 +415,14 @@ post-patch: ${WRKSRC}/desktop/scripts/soffice.sh ${REINPLACE_CMD} -e '/^mkdir -p/,$$d' ${CREATE_TREE} +# Verify that lucene was built with the CONTRIB option instead of +# failing mysteriously during the build +pre-configure: + @if [ ! -f ${JAVALIBDIR}/lucene-analyzers-3.6.2.jar ]; then \ + ${ECHO} "error: textproc/lucene must be built with the CONTRIB option enabled"; \ + exit 1; \ + fi + do-build: ${PRINTF} "[repositories]\nmain=active\nextras=active\n" > ${WRKSUBDIR}/source_config cd ${WRKSRC} ; ./bootstrap