From nobody Wed Apr 13 03:40:55 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 B7F711AFA11D; Wed, 13 Apr 2022 03:40:55 +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 4KdSzq4hcLz3G5b; Wed, 13 Apr 2022 03:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649821255; 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=1qA+6qL0a1Hyd90vxWTvF3ft0WlWKDsOJBHrBKisSmo=; b=eGe7eKp5FUcB0u5mKi1Ejz7P6gkpvaX77k6SeI0AHN9Pq13DocDH5hrBT0KKADgyKsIMtb MN6QvEfjnmVz0ouUIY+jaGPqgDivaVIFPd6wPBzNMm1ZJJVYxTYWb8a35LuVPKJOYD+tue q1k/3IqFzwb/wgOYoUVMGp/mcIOKrFyFkn7GzlBDT9fo7U9tZcEYbeqGZ/JQ/Q/2dGu46u D/BT+lrfiwDLEd922YdEdw+TIgM8pIlpiwf47ygd4T/KEABFcZO/5SDwLLrroeOyCNRXVa 0hJEdyU6l6J84+MVYESVC3wOrv7aMRhDAtZDV44tAFo7/ayUqZdudOinm0Buog== 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 80B45244C1; Wed, 13 Apr 2022 03:40:55 +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 23D3et2a004628; Wed, 13 Apr 2022 03:40:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23D3et1U004627; Wed, 13 Apr 2022 03:40:55 GMT (envelope-from git) Date: Wed, 13 Apr 2022 03:40:55 GMT Message-Id: <202204130340.23D3et1U004627@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: 3e0ecae08333 - 2022Q2 - editors/openoffice-4: 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: 3e0ecae083337d652540d17c31beb8ac12bd6173 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649821255; 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=1qA+6qL0a1Hyd90vxWTvF3ft0WlWKDsOJBHrBKisSmo=; b=QqNF1OQfJOenA2BTi6p+CV1T09DvwGxW4wHWafYHaAqE89VoHtJrkU3H+pgVwM1x2u7IQW BPISGP7qJPZ3CURfPnPAlm8MWakM9nanVV6S2knVeIuahf78y4ykXHpnDfIjCu+VbHCYdW AxybftsGhf769utTw5kKHNjif8XJNhzQYWmZk8bJsxUS2istoCQ253FB41P2NgT4eUoO+G p2YUm0wnGFCmowSRi9IJMvFxt9F4RuiSX5TURW+ta+ATUC1c6vvr3hBdxjnWqtCARdtFw7 0Kw6wlAjuQnK2CzEftQR3WxXqMWbXGVwh+dlr1PpV6Ty+OLTZumj5XskQyXnZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649821255; a=rsa-sha256; cv=none; b=PsY2p4cQeVmwjC5e9hAjvFY8G8VO58wqoDYSptPxKHY8ATtq4DQHgcTTxiWqkD6cpBYI8d 22lrWLuEvH/qeMvMkJohwbfDH4pwpGRBWXcXwaaRkCDk7oJ73syeHArdNqpZ0SKtF0f73o uqw7AbmCkgEEVDRWOnkfLHB5/uz+6HLCeoE/dxu50wUfQvpKLSkb3q2ls16lNuqduQWvMw XGQ8c3iv3CFyZ0JxyvJzm8pTt4+YdVgbItP4S08+ZX1ZW0mDhiT/LtnmZeHFHqkXHGyeoq HjXMnWMgS9periTc/jqqBK7Upy/qbRUDYrtyFRSnALvnmchpoPyZq6zMAmgvtg== 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=3e0ecae083337d652540d17c31beb8ac12bd6173 commit 3e0ecae083337d652540d17c31beb8ac12bd6173 Author: Don Lewis AuthorDate: 2022-04-13 02:05:25 +0000 Commit: Don Lewis CommitDate: 2022-04-13 03:40:20 +0000 editors/openoffice-4: Fix dependency issues Fix an incorrect coinmp-related dependency that was causing spurious rebuilds. It was also reported to break the build, 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 7b40ee8ab732691960bcc7d49eacff1bf1f544fe) --- editors/openoffice-4/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 770a8e0b1b04..255004f3e303 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -2,7 +2,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors java MASTER_SITES= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \ https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \ @@ -83,7 +83,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 \ @@ -113,7 +113,7 @@ USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ shared-mime-info ssl tar:bzip2 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