From nobody Sun Feb 20 12:13:29 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 5243C19D81A5; Sun, 20 Feb 2022 12:13:30 +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 4K1kqG12xbz4mKZ; Sun, 20 Feb 2022 12:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645359210; 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=WQtQUUnDhZk+zbLmlNtntF5z4PuLf/zsV4F0p1Zenok=; b=oYtvA8cNrUxC24btijsQhs6tVbeYNZE/6MH6uF8TVFi7iSxX4AStF/Fa5FjDmGbUM7Qnhc zWzXGiUot82MJ34JEDFL+HDtjeh3CICkT37kEEj6lMntPr0qAZL2u2wdCzoNrbqMZWsa2w RUX3ptwfBZNgcCgNnhyoUfLZLMCiqy/7A+XbXwes/4LwZ0O4joW7OWQ43Ri6TD37w+1hyh htSzO9/fVyZVPKJV/iC7ae1SbRDF1b94OcOz0LuYitrvINNIjHJo6Oz+7TNOx4d9rHnUaS /lWZQ5naFOc2EX6Xw/ljT/EMSqtEUvXAzR41OSVBNKN2Bd91YchfbvsGVTGGeA== 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 040E41C3B7; Sun, 20 Feb 2022 12:13:30 +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 21KCDTQu028318; Sun, 20 Feb 2022 12:13:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KCDTBa028317; Sun, 20 Feb 2022 12:13:29 GMT (envelope-from git) Date: Sun, 20 Feb 2022 12:13:29 GMT Message-Id: <202202201213.21KCDTBa028317@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: db4e6eb33ece - main - print/*: Fix ports installation of TeX2021 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db4e6eb33ece441b2f3d50984e4554ef201a6da4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645359210; 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=WQtQUUnDhZk+zbLmlNtntF5z4PuLf/zsV4F0p1Zenok=; b=nNA7aI0VlTDP9kXmzFEDWbZB4DCcpudXeXDwuD2sRtZ8/tVCNHs9xXd7zIc29xndzi7E2B DR9KG3EGoYtcjiHt4WwVOjDUj/W0uU8RCJBNT4UdnTrMZmr+hFhrGXW8ooVfm2kJVvRhuo okKAZur9WC7FjytPkqhgoEQ55rssE54dRjeyeL+hIrOppuPpTUzbplAN5t5H0RHUqC/+Ss ro2pxV5vUAn+wEkdmFz2PbFBQnfBk27MclwmC1AbFOJ8bP7ftK9Y479rKJQRcwNUcbmfX/ E+o5zES9g1j1NO1epQnUOq1orqT8YZ6apnzRo7bVFy6Yn1eZGqJl7ltFZf9Yxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645359210; a=rsa-sha256; cv=none; b=OjjYM1kIsGc00lVu/Eq/SrSBwd9hSbW66V70QXZNyp7wiD8TH9RujuCQAM+OGobxVkSVZ2 WNtVZs2WGw79Wdvbuz3kqcK4mFJSmqxwsgVIyY3MM6XlnOCjeS14KWw66IfPzsJ3Hn/wOa /ceReO1ktlL4AHb/odhDJbK3ZajRY3kzS0uIAIWlrHZvhjc2aSdY33GVdsIS75w1sQYAjy lFNzGViqvcy1OP9xoM8YZMuzNceDauR1rRGCIBWuan84AgF0OzneHpJ2IRRsecqnKFMuQt b0z9VUfZSqiPBOkirYLc2Zzo6XGo5jypXWe9Hvoz+dW5Jl+7Yu4lah7ijZlJaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=db4e6eb33ece441b2f3d50984e4554ef201a6da4 commit db4e6eb33ece441b2f3d50984e4554ef201a6da4 Author: Muhammad Moinur Rahman AuthorDate: 2022-02-20 12:09:57 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-02-20 12:09:57 +0000 print/*: Fix ports installation of TeX2021 There have some CONFLICTS which doesn't make sense and actually makes it impossible to install/upgrade the TeX through portmaster/ports so remove those CONFLICTS and update UPDATING accordingly. PR: 262058 Reported by: alt2600@icloud.com --- UPDATING | 6 ++++-- print/texlive-base/Makefile | 2 +- print/texlive-tlmgr/Makefile | 2 -- print/xpdfopen/Makefile | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/UPDATING b/UPDATING index fe0fb5e9e920..4495cf08d0aa 100644 --- a/UPDATING +++ b/UPDATING @@ -36,9 +36,11 @@ you update your ports collection, before attempting any port upgrades. create a ticket or send a mail to tex@FreeBSD.org print/tex-aleph has been removed as per upstream. This package should be - removed manually: + removed manually. Additionally users have reported to delete + texlive-texmf prior to starting update, or pkg-static will indicate + there is a conflict during the upgrade of texlive-base : - # pkg remove tex-aleph + # pkg remove tex-aleph texlive-texmf 20220218: AFFECTS: users of net-mgmt/librenms diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index bff5fcfd6074..8a8bf81b7845 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -110,7 +110,7 @@ CONFIGURE_ARGS+=--with-system-$L \ MAKE_ENV= CONFIG_SITE=${CONFIG_SITE} INSTALL_TARGET= install-strip -CONFLICTS_INSTALL= detex dvi2tty ps2eps texlive-texmf +CONFLICTS_INSTALL= detex dvi2tty ps2eps BINARY_ALIAS= freetype-config=true EXTRACT_AFTER_ARGS= ${EXCLUDE_FILES:S,^,--exclude ,} diff --git a/print/texlive-tlmgr/Makefile b/print/texlive-tlmgr/Makefile index 11404621ae5c..0f2fd3ac49be 100644 --- a/print/texlive-tlmgr/Makefile +++ b/print/texlive-tlmgr/Makefile @@ -19,8 +19,6 @@ CPE_VENDOR= tug USE_PERL5= run USE_TEX= kpathsea -CONFLICTS= texlive-base-[0-9]* texlive-infra - NO_ARCH= yes NO_BUILD= yes diff --git a/print/xpdfopen/Makefile b/print/xpdfopen/Makefile index 4c43f35508bf..78e65f2e998c 100644 --- a/print/xpdfopen/Makefile +++ b/print/xpdfopen/Makefile @@ -16,8 +16,6 @@ USE_XORG= x11 xmu EXTRACT_FILES= build-aux utils/xpdfopen GNU_CONFIGURE= yes -CONFLICTS= texlive-base-* - EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,} WRKSRC= ${WRKDIR}/${DISTNAME}/utils/xpdfopen