From nobody Wed Apr 13 18:26:39 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 7A3B41B42B03; Wed, 13 Apr 2022 18:26:39 +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 4Kdrdq31phz3Drc; Wed, 13 Apr 2022 18:26:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649874399; 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=C7Rv9wV5GLe2GoTOHqRVgBvazU5t5ucx9py5ay6OAAw=; b=plRDJvm4K5OlQ0uGh7Bs0izLG8m1S/COd5zZkT4VcWGbe360NBpWLS0+aJ32cJL1iTX26g pP3paIHmW1zjIy4bdCsK8Pdnzf1dbOq+cLMPN9tkriXNitM9c5jFf/nxLNK4F49r/wHfmr X8dTwT3lK639fQU0U5sm1CQiXUyO20qnwqSgaj3rh1lx8oOrHIGjUt8D2/1wkgmZRCX01Z uKRh1LvNy/0YIOX+aGKtJrdUcK+8YMt+jup1SWowT4iz2ueIVGbfuk4yawcyACGCkFWoy2 /vn2HmbG6UNiczeUT9xsm9pDhG1GTvG5+nAXbmaJKfe8wDpTQZX0wfKNIj1Idw== 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 44861113A8; Wed, 13 Apr 2022 18:26:39 +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 23DIQdPk094251; Wed, 13 Apr 2022 18:26:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23DIQdjx094250; Wed, 13 Apr 2022 18:26:39 GMT (envelope-from git) Date: Wed, 13 Apr 2022 18:26:39 GMT Message-Id: <202204131826.23DIQdjx094250@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: db0d93edd89c - main - 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/main X-Git-Reftype: branch X-Git-Commit: db0d93edd89c424bcb722cf7851d256fedf666db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649874399; 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=C7Rv9wV5GLe2GoTOHqRVgBvazU5t5ucx9py5ay6OAAw=; b=cEl/VQY6hVW8Y4SQz8RSqluUinOvqRRYGpk6iQl79Cljw10IZ2zRGkUFgmwD5Gxxm9WGaF OXnfZlU5zFoKQOWkKIRUR6/1gzV1Imq0cPkw2qI+o2u0qOcGeAJ3GKZriBBfXr1AF6mznx lPnamGq9gEJl44eDxNDxmTmioTLI1P0PVTVywXVyIvd4txunZCctDDWDGYSt2PxP6lrMPz CzZ8QVLVaSFmZGyrlrOvnvExxnmPbf2EjK4PGoNPWP7/nbTaLuF4w90jol/NuAAgrFo7LW 5cYWUplUgzEby6YYnv/5FXmz0q7kZvRLchsrPRs5Poe216kPDxlB0G+uAUd/pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649874399; a=rsa-sha256; cv=none; b=hGE6DYGxfXHWvCbS7/CuBkurc7UmiOGLoZ8SfXb/sGCSEPwolnUES7zd1MG4VFvbJU4nOc F218QpTphoKVdc+YmVpy/3dkL5FHvHE/1hdtpezrz2l9HxrjuoWa7znxk57SxYtIVOr9KZ wCuov0mLlYa4gsY+dt0+Twa8ICzffqZTKAQPsrFCqNAfCZiZIAO3j6f/gNblYQ/mkIxIUb Y8ZZ2Mja3v6l/zen0UM2j0dGVAovd+Zw0OCgGLN4odR9iIS0rBRiPfyoIUbIHKoErmp26B Oxy4+13IJgmvWkiZTn/i+2t7UXuoMbKWojaHUK18LY7w10lld6olT96CJf3yyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=db0d93edd89c424bcb722cf7851d256fedf666db commit db0d93edd89c424bcb722cf7851d256fedf666db Author: Don Lewis AuthorDate: 2022-04-13 18:22:48 +0000 Commit: Don Lewis CommitDate: 2022-04-13 18:26:28 +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 --- 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