From nobody Wed Apr 13 20:40:47 2022 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 80E9D1B4699D; Wed, 13 Apr 2022 20:40:47 +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 4Kdvcb3CY1z3rs9; Wed, 13 Apr 2022 20:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649882447; 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=Cb83K3sYL5fQDqHsfBpbNJNJr+Y+1dYaW3BQ0eu3RWU=; b=N9Qr+qsSt0+i9JoFwgSFVVmXehUmwSnm5iYxfyL78vB9IpphaCF6qFYHISi2Fye++d2a0T kmSo1AZNrR145nFSf3CV/VqsKHDcOqi0FSIZiBQKLnyJLMZgTqtx6BIec0dheN2GOLMJrg 9D3f84rFlXkuPFKF/NK7ws6XQPFqbn+WIPQa8jEZmnUewaByHLrvNUbdOq6WfYCo/Wb4Fp pG3rpJg1dS3jaSVtbMvCyBf55Lo+5qihk7vK+4ayuJfwdTCDBpIpAYpvl7VtYBnRuJCyfF 2fSlQ+oEGeTvd5cNxmiJJf2kIL1oZyQOB4QrqLgVPJXmNtvSc1T/fPeXNcBsrg== 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 4EBD512875; Wed, 13 Apr 2022 20:40:47 +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 23DKelVQ079743; Wed, 13 Apr 2022 20:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DKelOS079742; Wed, 13 Apr 2022 20:40:47 GMT (envelope-from git) Date: Wed, 13 Apr 2022 20:40:47 GMT Message-Id: <202204132040.23DKelOS079742@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Don Lewis Subject: git: 71cf25e7ab61 - 2022Q2 - editors/openoffice-devel: Fix dependency issues 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 71cf25e7ab619a447a00de0d3d8a3c459f956c83 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649882447; 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=Cb83K3sYL5fQDqHsfBpbNJNJr+Y+1dYaW3BQ0eu3RWU=; b=dkuV6XstxWUDIRgpk7K0T8VQ7BVmpN1K1Az8kUrhRIigc3jtj3WezZNmp8mNLSYjTWDSQQ 3oig9gtDEPZPKybzh6uWVqYa63gHNuxgWsHobUTu46Sah4WR8/jTwFM63GlkbVk7c7gOJC r4/Is3WGEUAnsf+tmsx1gx0bxh28NTNSFvhF9tiYFFCWwe8AVU/64S9t3F9KB1ZaxVc0Jt of08iET/gwcABYqB8tHUWAQI48SzqWcaIpaSr7iMxcuJxwgnRar34dlglsEyhKDJjcTipg 4QtDbKBiQxg3EJZeYz2TjWP3CHw4CtVB/S8Xcrj6NqjDvcyjZa/lXVPWiLHnKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649882447; a=rsa-sha256; cv=none; b=J+P1pTRs4v6c7ixNOTsZpEXMyDfP0sSdhDIaiSwgdYDK95/4w1gKX59v1233KJNYmrukrL DzEQpB6nsAQrRenAJE6yj5B+PLGgx6ntnk5BoCODJ+CiOEni2kE72KC9uB2PElOiNcRUY2 bfDOMSrgU9vvnfxylBbaA24kqgqYmBs+Y7kJA0ITdKzCvkxSlQ/i4XIEEC61Mu8D9VBjTT ZVwbVx1/R26ZdElD/8XYkaoKqqnWPJaQpiqyzJZRiw96uC0OVigVGAw/mmAqsO5dkvjtZ7 0D+EtSZYo92vtw5NfMVHjk5VjjIjou0HdS3dee7DXIxGIe9iSZ475J/rkibTEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=71cf25e7ab619a447a00de0d3d8a3c459f956c83 commit 71cf25e7ab619a447a00de0d3d8a3c459f956c83 Author: Don Lewis AuthorDate: 2022-04-13 18:22:48 +0000 Commit: Don Lewis CommitDate: 2022-04-13 20:40:38 +0000 editors/openoffice-devel: Fix dependency issues Fix an incorrect coinmp-related dependency that was causing spurious rebuilds. It was also reported to break the build of openoffice-4, though I was unable to reproduce the problem, and it did not seem to break the official package build. Add another missing dependency. Both issues were reported by stage-qa. PR: 263238 (cherry picked from commit db0d93edd89c424bcb722cf7851d256fedf666db) --- editors/openoffice-devel/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 2156f4e76f42..cd5147c818c0 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ @@ -85,7 +85,7 @@ LIB_DEPENDS= \ libClpSolver.so:math/clp \ libCoinMP.so:math/coinmp \ libCoinUtils.so:math/coinutils \ - libcoinmumps.so:math/ipopt \ + libcoinmumps.so:math/coin-or-mumps \ libnauty.so:math/nauty \ libopenblas.so:math/openblas \ libOsi.so:math/osi \ @@ -115,7 +115,7 @@ USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ python:3.7 shared-mime-info ssl tar:${TARTYPE} xorg USE_GL= gl glu -USE_GNOME= gtk20 libxslt libidl glib20 +USE_GNOME= gdkpixbuf2 gtk20 libxslt libidl glib20 USE_JAVA= yes JAVA_BUILD= jdk JAVA_RUN= jdk