Date: Sun, 20 Feb 2022 12:13:29 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: db4e6eb33ece - main - print/*: Fix ports installation of TeX2021 Message-ID: <202202201213.21KCDTBa028317@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=db4e6eb33ece441b2f3d50984e4554ef201a6da4 commit db4e6eb33ece441b2f3d50984e4554ef201a6da4 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-02-20 12:09:57 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202201213.21KCDTBa028317>