git: 077027406a31 - main - *: cleanup fetching

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Wed, 07 Oct 2026 09:06:18 UTC
The branch main has been updated by mat:

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

commit 077027406a314e84a94e520a372470527c2565cd
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2026-09-17 16:06:36 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2026-10-07 09:06:05 +0000

    *: cleanup fetching
---
 audio/mpg123.el/Makefile                     |  1 -
 graphics/xd3d/Makefile                       | 12 ++----------
 print/fpdf/Makefile                          |  9 +--------
 sysutils/cfengine-masterfiles-devel/Makefile |  2 --
 sysutils/cfengine-masterfiles327/Makefile    |  2 --
 sysutils/cfengine-masterfiles328/Makefile    |  2 --
 sysutils/cfengine327/Makefile                |  2 --
 sysutils/cfengine328/Makefile                |  2 --
 www/trac-spamfilter/Makefile                 | 10 +---------
 9 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/audio/mpg123.el/Makefile b/audio/mpg123.el/Makefile
index e8f96d161562..6bc8fdadbe82 100644
--- a/audio/mpg123.el/Makefile
+++ b/audio/mpg123.el/Makefile
@@ -35,7 +35,6 @@ NO_BUILD=	yes
 PLIST_FILES=	${EMACS_SITE_LISPDIR}/mpg123.el
 
 FETCH_ARGS=	-AR
-FETCH_BEFORE_ARGS=	-o mpg123el.cgi?${PORTVERSION}
 
 do-extract:
 	${CP} ${DISTDIR}/mpg123el.cgi?${PORTVERSION} ${EXTRACT_WRKDIR}/${PORTNAME}
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 01c53594ef12..fd6a5556cf84 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	xd3d
 PORTVERSION=	8.3.1
 PORTREVISION=	21
 CATEGORIES=	graphics math
-MASTER_SITES=	https://www.ljll.fr/jouve/xd3d/
+MASTER_SITES=	https://www.ljll.fr/jouve/xd3d/download.php?file=
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Simple scientific visualization tool
@@ -36,8 +36,7 @@ RUN_DEPENDS+=	gifsicle:graphics/gifsicle
 MASTER_SITES_BACKUP=	https://www.pompo.net/ports/
 
 REINPLACE_ARGS=	-i ""
-FETCH_ARGS=
-FETCH_BEFORE_ARGS=	-R -o ${DISTDIR}/${DISTFILES}
+FETCH_ARGS=	-R
 
 USES=		fortran xorg
 USE_XORG=	x11 xpm
@@ -56,13 +55,6 @@ DOCS=		BUGS CHANGELOG FAQ FORMATS INSTALL README Manuals/formats.txt	\
 
 .include <bsd.port.pre.mk>
 
-do-fetch:
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-	${FETCH_CMD} ${FETCH_BEFORE_ARGS}			\
-		${MASTER_SITES}download.php?file=${DISTFILES}	\
-	|| ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${MASTER_SITES_BACKUP}${DISTFILES}
-.endif
-
 pre-configure:
 	${CP} ${WRKSRC}/RULES.freeBSD ${WRKSRC}/RULES
 	${REINPLACE_CMD} -e "s|%%WRKSRC%%|${WRKSRC}|"		\
diff --git a/print/fpdf/Makefile b/print/fpdf/Makefile
index b69e180f5462..d1b24ad70a60 100644
--- a/print/fpdf/Makefile
+++ b/print/fpdf/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	fpdf
 DISTVERSION=	1.86
 PORTEPOCH=	1
 CATEGORIES=	print www
-MASTER_SITES=	http://www.fpdf.org/en/
+MASTER_SITES=	http://www.fpdf.org/en/dl.php?v=${DISTVERSION:S|.||}&f=${EXTRACT_SUFX:S|.||}&dummy=/
 DISTNAME=	${PORTNAME}${DISTVERSION:S|.||}
 
 MAINTAINER=	xaa+ports@dohd.org
@@ -14,7 +14,6 @@ LICENSE_NAME=	As_Is
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-FETCH_CMD=	${FETCH_BINARY} -ARr -o ${DISTDIR}/${DISTFILES}
 USES=		dos2unix php tar:tgz
 USE_PHP=	zlib
 NO_BUILD=	yes
@@ -31,12 +30,6 @@ DOCS=		FAQ.htm changelog.htm doc fpdf.css install.txt tutorial
 
 OPTIONS_DEFINE=	DOCS
 
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
-	${FETCH_CMD} ${FETCH_BEFORE_ARGS}	\
-		'${MASTER_SITES}dl.php?v=${DISTVERSION:S|.||}&f=${EXTRACT_SUFX:S|.||}'; \
-	fi
-
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${FPDF_DIR}
 	${INSTALL_DATA} ${WRKSRC}/fpdf.php ${STAGEDIR}${PREFIX}/${FPDF_DIR}
diff --git a/sysutils/cfengine-masterfiles-devel/Makefile b/sysutils/cfengine-masterfiles-devel/Makefile
index 4884878c657c..70939bb00457 100644
--- a/sysutils/cfengine-masterfiles-devel/Makefile
+++ b/sysutils/cfengine-masterfiles-devel/Makefile
@@ -24,8 +24,6 @@ CONFLICTS=	cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[02-9]-* \
 
 RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
 MAKE_JOBS_UNSAFE=	yes
 USES=		autoreconf:build cpe gmake python:build
 HAS_CONFIGURE=	yes
diff --git a/sysutils/cfengine-masterfiles327/Makefile b/sysutils/cfengine-masterfiles327/Makefile
index 6f1444ec12ce..09a018451958 100644
--- a/sysutils/cfengine-masterfiles327/Makefile
+++ b/sysutils/cfengine-masterfiles327/Makefile
@@ -20,8 +20,6 @@ CONFLICTS+=	cfengine-masterfiles-3.*
 
 RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
 MAKE_JOBS_UNSAFE=	yes
 USES=		cpe gmake python:build
 HAS_CONFIGURE=	yes
diff --git a/sysutils/cfengine-masterfiles328/Makefile b/sysutils/cfengine-masterfiles328/Makefile
index 77e2416eafba..c511413cbe33 100644
--- a/sysutils/cfengine-masterfiles328/Makefile
+++ b/sysutils/cfengine-masterfiles328/Makefile
@@ -20,8 +20,6 @@ CONFLICTS+=	cfengine-masterfiles-3.*
 
 RUN_DEPENDS=	cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
 
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
 MAKE_JOBS_UNSAFE=	yes
 USES=		cpe gmake python:build
 HAS_CONFIGURE=	yes
diff --git a/sysutils/cfengine327/Makefile b/sysutils/cfengine327/Makefile
index cc540f46cc2c..d292e1c1fe36 100644
--- a/sysutils/cfengine327/Makefile
+++ b/sysutils/cfengine327/Makefile
@@ -20,8 +20,6 @@ CONFLICTS=	cfengine cfengine3[0-9] cfengine3[0-9][0-9]
 PKGNAMESUFFIX=	327
 .endif
 
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/sysutils/cfengine328/Makefile b/sysutils/cfengine328/Makefile
index ac2481e73e48..51cc8a053fb1 100644
--- a/sysutils/cfengine328/Makefile
+++ b/sysutils/cfengine328/Makefile
@@ -19,8 +19,6 @@ CONFLICTS=	cfengine cfengine3[0-9] cfengine3[0-9][0-9]
 PKGNAMESUFFIX=	328
 .endif
 
-FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
-
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/www/trac-spamfilter/Makefile b/www/trac-spamfilter/Makefile
index 793e436b84b9..3b71baba8f15 100644
--- a/www/trac-spamfilter/Makefile
+++ b/www/trac-spamfilter/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	spamfilter
 PORTVERSION=	1.5.1r${REV}
 PORTREVISION=	3
 CATEGORIES=	www devel python
-MASTER_SITES=	https://trac.edgewall.org/browser/plugins/trunk/
+MASTER_SITES=	https://trac.edgewall.org/browser/plugins/trunk/spam-filter?rev=${REV}&format=zip&dummy=/
 PKGNAMEPREFIX=	trac-
 
 MAINTAINER=	samm@FreeBSD.org
@@ -14,18 +14,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	tracd:www/trac
 
-FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 REV=			17911
 WRKSRC=			${WRKDIR}/spam-filter
 USES=			python zip
 USE_PYTHON=		distutils autoplist
 NO_ARCH=		yes
 
-do-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
-	cd ${DISTDIR} && \
-	${FETCH_CMD} ${FETCH_BEFORE_ARGS}	\
-		'${MASTER_SITES}spam-filter?rev=${REV}&format=zip'; \
-	fi
-
 .include <bsd.port.mk>