From fc6aa52305b4f661368197a4662d065c101632a4 Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Wed, 2 Aug 2023 15:21:44 +0200 Subject: [PATCH] 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 5243b13ed2637..540a26deda954 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 2cfd8a0ac1af6..b8e10032720bd 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 d2b4818d25ce6..301f329b966ad 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 811d535be4147..19b0350306a83 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 1edda14c5aa32..3d134965a6343 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 cc82697b7c5c1..7ca9e2579f57f 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 84e29bc867ab5..cf3a17aa9fd49 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 04d46ef274f41..eeff59277cbbb 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 1f8a989570b9b..71e21b4fe7cac 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 53965f6a642d2..7294b5893b905 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 2f69d90c80556..60bfe1dc58b2d 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 08c004aa818e0..b598e180dd963 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 c9da90b4af178..bb758effda0dc 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 28ddfb30f19d2..8fbf9f55310b5 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}