Attachment 231950 Details for Bug 262058 – Nuke-Conflicts-for-Runtime_Library-depends.diff

[patch] Nuke-Conflicts-for-Runtime_Library-depends.diff

texhell.diff (text/plain), 1.75 KB, created by alt2600 on 2022-02-20 01:41:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: alt2600

Created: 2022-02-20 01:41:23 UTC

Size: 1.75 KB

patch

obsolete

>diff --git a/UPDATING b/UPDATING
>index fe0fb5e9e920..2eb4d3db6670 100644
>--- a/UPDATING
>+++ b/UPDATING
>@@ -35,6 +35,9 @@ you update your ports collection, before attempting any port upgrades.
>   portmaster -a should handle all the upgrade properly. In case not please
>   create a ticket or send a mail to tex@FreeBSD.org
> 
>+  NOTE: Delete texlive-texmf prior to starting update, or pkg-static will
>+  indicate there is a conflict during the upgrade of texlive-base
>+
>   print/tex-aleph has been removed as per upstream. This package should be
>   removed manually:
> 
>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..afb6c541656e 100644
>--- a/print/texlive-tlmgr/Makefile
>+++ b/print/texlive-tlmgr/Makefile
>@@ -19,7 +19,7 @@ CPE_VENDOR=	tug
> USE_PERL5=	run
> USE_TEX=	kpathsea
> 
>-CONFLICTS=	texlive-base-[0-9]* texlive-infra
>+CONFLICTS=	texlive-infra
> 
> NO_ARCH=	yes
> NO_BUILD=	yes
>diff --git a/print/xpdfopen/Makefile b/print/xpdfopen/Makefile
>index 4c43f35508bf..c13a7e6ed130 100644
>--- a/print/xpdfopen/Makefile
>+++ b/print/xpdfopen/Makefile
>@@ -16,7 +16,7 @@ USE_XORG=	x11 xmu
> EXTRACT_FILES=	build-aux utils/xpdfopen
> GNU_CONFIGURE=	yes
> 
>-CONFLICTS=	texlive-base-*
>+#CONFLICTS=	texlive-base-*
> 
> EXTRACT_AFTER_ARGS=	${EXTRACT_FILES:S,^,${DISTNAME}/,}
>

Actions: View | Diff

Attachments on bug 262058: 231950