From nobody Wed Aug  2 14:17:10 2023
X-Original-To: dev-commits-ports-main@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 4RGDZX5cw2z4qcmW;
	Wed,  2 Aug 2023 14:17:15 +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 4RGDZK0pdYz3sfj;
	Wed,  2 Aug 2023 14:17:13 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1690985833;
	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=LuqOk/yo3PWN7v/LB632dyikoLfeu97HYk5CxgTe6s8=;
	b=JtaKhmI/48oBJ/r2bkasAU5GQoU5IOCNQ/nMiQDoun1S4O3JXY7dTrzCQ+NBMouXYGnwj9
	9fpPGobvUmsOymWwDqbTMvyRyy4cLzYImmQ2O7l3w/mMZwxfDH0Dk1B6Nd92fv8nxU17+n
	ji38mKtPoD8a/tNDM2S26J0UaLyz0jERVNX4H+bj2t6arzJfFYxLPgcllLoehdDegiKodU
	mpTxfezJsrxND/7eI59vg1TIRkqilkd4tT+5YfmO3/Ysl84vIb9PGhg9i/rh4dI2qJ4CyA
	+qQ4+YObMZIVU6mbX02PbuloYXqeCEc3m55ix72XyN/Jgf3hDOsaAdORpFWeZQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690985833; a=rsa-sha256; cv=none;
	b=OFV5RUqj4XrCvuY8LvegZjoDOhW48MWSQjXGPwTGazbjba2VI2AtNrgVjUPYc1rMb1dcIY
	bM02P/eyKzLwhZO9MW7LvhGJr+DgC3MnHM8l8Vna2f/dy5cJgRYmxzNv1TXYna8Vv4hlOg
	ckL8h7FhddgEUcV8XIBU+qMhroiWVeWcZIoNvFhkof7gc4gPM9oF8v66aRablM6gQ01MyM
	1xqebrS0k3xGU3bmYpFx43rzbaPPlCH7jo2D4I7jZjEEBWjQjFgJDmDO2LCE9ztPWJdc8y
	r64nlrFfrpBLsii9jRlWJhr7gAMIzkhkI2QjC8lz7PYXaKzPoLktC+zASimlDw==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1690985833;
	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=LuqOk/yo3PWN7v/LB632dyikoLfeu97HYk5CxgTe6s8=;
	b=dzCLPvlmoXKyQhZgZSaAFqpVJvQNFuU8qJi8rXOP48dq+977M14tPId1xtjZkxUfpV7VQS
	8+YCM2SLqeCBdkVsQE4mnIDYKQdudggB5YpQdvFMxIPuPN2IK49PPhgVJUMqkKyQeP5qAy
	HsU37Ta89JPdROcnQ4e+6q2p1tfO51iJhvbpwZACzgZN5DAbSjE613MZuvyHC9nf113IKD
	Urvh0KTdfJarg3E911DZu6Z4g9M3ZFm68AmWfT4JjknliN4QTdzRl0qD2DijQGo0edpD//
	E50UB/A32JY8gEJcByekfGrlsEho9oWwRsGOQQRuxppQDPeTu9aMx76flRnVEA==
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 4RGDZJ6F8MzMsZ;
	Wed,  2 Aug 2023 14:17:12 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 372EHAFc021349;
	Wed, 2 Aug 2023 14:17:10 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372EHA2f021348;
	Wed, 2 Aug 2023 14:17:10 GMT
	(envelope-from git)
Date: Wed, 2 Aug 2023 14:17:10 GMT
Message-Id: <202308021417.372EHA2f021348@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-main@FreeBSD.org
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
Subject: git: fc6aa52305b4 - main - Mk/bsd.sites.mk: Add new MACRO TEX
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@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: fc6aa52305b4f661368197a4662d065c101632a4
Auto-Submitted: auto-generated

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fc6aa52305b4f661368197a4662d065c101632a4

commit fc6aa52305b4f661368197a4662d065c101632a4
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-08-02 13:21:44 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-08-02 14:16:41 +0000

    Mk/bsd.sites.mk: Add new MACRO TEX
    
    There are two different sites/mirror required for the ports tree. Due to
    the packaging of texlive we need the CTAN historic mirror which is
    defined in TEX_CTAN and normal mirror which hosts most of the packages.
    Unfortunately both were uses interchangeably without checking the
    details and in previous there was single sites mirroring both the
    historic dists and the noemal packages. As this is no longer the case
    update all other ports pointing towards the wrong site.
    
    Approved by:    portmgr (blanket)
---
 Mk/bsd.sites.mk              | 5 +++++
 devel/cweb/Makefile          | 2 +-
 devel/cweb/distinfo          | 1 +
 devel/tex-web2c/Makefile     | 2 +-
 graphics/xtexcad/Makefile    | 2 +-
 print/bibview/Makefile       | 2 +-
 print/latex-resume/Makefile  | 2 +-
 print/latex2rtf/Makefile     | 3 +--
 print/psutils/Makefile       | 2 +-
 textproc/bib2html/Makefile   | 2 +-
 textproc/bibtool/Makefile    | 2 +-
 textproc/latex2html/Makefile | 2 +-
 textproc/ppower4/Makefile    | 2 +-
 www/dillo2/Makefile          | 2 +-
 14 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 5243b13ed263..540a26deda95 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -987,6 +987,11 @@ MASTER_SITE_TCLTK+= \
 	ftp://ftp.funet.fi/pub/languages/tcl/tcl/%SUBDIR%/
 .endif
 
+.if !defined(IGNORE_MASTER_SITE_TEX)
+MASTER_SITE_TEX+= \
+	https://mirror.ctan.org/%SUBDIR%/
+.endif
+
 .if !defined(IGNORE_MASTER_SITE_TEX_CTAN)
 MASTER_SITE_TEX_CTAN+= \
 	https://ftp.tu-chemnitz.de/pub/tug/historic/%SUBDIR%/ \
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 2cfd8a0ac1af..b8e10032720b 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	cweb
 PORTVERSION=	3.64a.a
 CATEGORIES=	devel
-MASTER_SITES=	TEX_CTAN/web/c_cpp/cweb
+MASTER_SITES=	TEX/web/c_cpp/cweb
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.([a-z])$/\1/}
 
 MAINTAINER=	gerald@FreeBSD.org
diff --git a/devel/cweb/distinfo b/devel/cweb/distinfo
index d2b4818d25ce..301f329b966a 100644
--- a/devel/cweb/distinfo
+++ b/devel/cweb/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1690981853
 SHA256 (cweb-3.64aa.tar.gz) = 0cde41fd86643aefa80cd1704acfafcb2b485e71fa8dc6277bfd87971004900c
 SIZE (cweb-3.64aa.tar.gz) = 223945
diff --git a/devel/tex-web2c/Makefile b/devel/tex-web2c/Makefile
index 811d535be414..19b0350306a8 100644
--- a/devel/tex-web2c/Makefile
+++ b/devel/tex-web2c/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	web2c
 PORTVERSION=	${TEXLIVE_VERSION}
 CATEGORIES=	devel
-MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
+MASTER_SITES=	TEX_CTAN/systems/texlive/${TEXLIVE_YEAR}
 PKGNAMEPREFIX=	tex-
 DISTNAME=	texlive-${PORTVERSION}-source
 DIST_SUBDIR=	TeX
diff --git a/graphics/xtexcad/Makefile b/graphics/xtexcad/Makefile
index 1edda14c5aa3..3d134965a634 100644
--- a/graphics/xtexcad/Makefile
+++ b/graphics/xtexcad/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	xtexcad
 PORTVERSION=	2.4.1
 PORTREVISION=	2
 CATEGORIES=	graphics
-MASTER_SITES=	TEX_CTAN/graphics/xtexcad
+MASTER_SITES=	TEX/graphics/${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple drawing program enforcing limited slopes and diameters
diff --git a/print/bibview/Makefile b/print/bibview/Makefile
index cc82697b7c5c..7ca9e2579f57 100644
--- a/print/bibview/Makefile
+++ b/print/bibview/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	bibview
 PORTVERSION=	2.2
 PORTREVISION=	2
 CATEGORIES=	print databases
-MASTER_SITES=	TEX_CTAN/biblio/bibtex/utils/bibview-2.0
+MASTER_SITES=	TEX/biblio/bibtex/utils/bibview-2.0
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical interface for manipulating BibTeX bibliography databases
diff --git a/print/latex-resume/Makefile b/print/latex-resume/Makefile
index 84e29bc867ab..cf3a17aa9fd4 100644
--- a/print/latex-resume/Makefile
+++ b/print/latex-resume/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	resume
 PORTVERSION=	20010823
 PORTREVISION=	3
 CATEGORIES=	print
-MASTER_SITES=	TEX_CTAN/macros/latex/contrib/${PORTNAME}
+MASTER_SITES=	TEX/macros/latex/contrib/${PORTNAME}
 PKGNAMEPREFIX=	latex-
 DISTNAME=	res
 EXTRACT_SUFX=	.cls
diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile
index 04d46ef274f4..eeff59277cbb 100644
--- a/print/latex2rtf/Makefile
+++ b/print/latex2rtf/Makefile
@@ -2,8 +2,7 @@ PORTNAME=	latex2rtf
 DISTVERSION=	2.3.17
 PORTREVISION=	1
 CATEGORIES=	print
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION} \
-		TEX_CTAN
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Translator from LaTeX to RTF
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 1f8a989570b9..71e21b4fe7ca 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.dcs.ed.ac.uk/pub/ajcd/ \
 		ftp://ftp.knackered.org/pub/psutils/ \
-		TEX_CTAN/support/psutils \
+		TEX/obsolete/support/psutils \
 		https://ftp.osuosl.org/pub/blfs/conglomeration/psutils/
 DISTNAME=	psutils-p17
 
diff --git a/textproc/bib2html/Makefile b/textproc/bib2html/Makefile
index 53965f6a642d..7294b5893b90 100644
--- a/textproc/bib2html/Makefile
+++ b/textproc/bib2html/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bib2html
 DISTVERSION=	6.7
 CATEGORIES=	textproc print
-MASTER_SITES=	TEX_CTAN/biblio/bibtex/utils
+MASTER_SITES=	TEX/biblio/bibtex/utils
 DISTNAME=	bib2ml
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
diff --git a/textproc/bibtool/Makefile b/textproc/bibtool/Makefile
index 2f69d90c8055..60bfe1dc58b2 100644
--- a/textproc/bibtool/Makefile
+++ b/textproc/bibtool/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bibtool
 PORTVERSION=	2.68
 CATEGORIES=	textproc print
-MASTER_SITES=	TEX_CTAN/biblio/bibtex/utils/${PORTNAME}
+MASTER_SITES=	TEX/biblio/bibtex/utils/${PORTNAME}
 DISTNAME=	BibTool-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 08c004aa818e..b598e180dd96 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	latex2html
 PORTVERSION=	2016
 PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	TEX_CTAN/support/${PORTNAME}
+MASTER_SITES=	TEX/obsolete/support/${PORTNAME}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Convert LaTeX documents to HTML
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index c9da90b4af17..bb758effda0d 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	ppower4
 PORTVERSION=	0.9.4
 PORTREVISION=	8
 CATEGORIES=	textproc java
-MASTER_SITES=	TEX_CTAN/support/${PORTNAME}
+MASTER_SITES=	TEX/support/${PORTNAME}
 DISTFILES=	pp4sty.zip pp4p.jar manual.pdf leveldemo.zip
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	pp4sty.zip leveldemo.zip
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 28ddfb30f19d..8fbf9f55310b 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.dillo.org/download/ \
 		LOCAL/bf/dillo/ \
-		TEX_CTAN/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen
+		TEX/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}