diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index 32b9f2f4d52b..2fcb00074926 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	DBIx-SearchBuilder
 PORTVERSION=	1.85
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN/../by-authors/id/B/BP/BPS/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BPS
 
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mikael@FreeBSD.org
 COMMENT=	Perl extension for easy SQL SELECT Statement generation
 WWW=		https://metacpan.org/release/DBIx-SearchBuilder
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-ReturnValue>=0:devel/p5-Class-ReturnValue \
 		p5-Cache-Simple-TimedExpiry>=0:devel/p5-Cache-Simple-TimedExpiry \
 		p5-Want>=0:devel/p5-Want \
 		p5-capitalization>=0:devel/p5-capitalization \
 		p5-DBI>=0:databases/p5-DBI \
 		p5-DBIx-DBSchema>=0:databases/p5-DBIx-DBSchema \
 		p5-Class-Accessor>=0:devel/p5-Class-Accessor \
 		p5-Clone>=0:devel/p5-Clone
 TEST_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 post-patch:
 		${CP} ${WRKSRC}/lib/DBIx/SearchBuilder/Handle/Pg.pm ${WRKSRC}/lib/DBIx/SearchBuilder/Handle/Pg32.pm
 		${REINPLACE_CMD} -e 's/Pg/Pg32/g' ${WRKSRC}/lib/DBIx/SearchBuilder/Handle/Pg32.pm
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Capture-Tiny-Extended/Makefile b/devel/p5-Capture-Tiny-Extended/Makefile
index 2a5e6604e792..df0aade4cc53 100644
--- a/devel/p5-Capture-Tiny-Extended/Makefile
+++ b/devel/p5-Capture-Tiny-Extended/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	Capture-Tiny-Extended
 PORTVERSION=	0.114
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../by-authors/id/M/MI/MITHALDU
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:MITHALDU
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Capture output from external programs (with some extras)
 WWW=		https://metacpan.org/dist/Capture-Tiny-Extended
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-MooseX-HasDefaults/Makefile b/devel/p5-MooseX-HasDefaults/Makefile
index 504897c16ee0..02a50e6a07ed 100644
--- a/devel/p5-MooseX-HasDefaults/Makefile
+++ b/devel/p5-MooseX-HasDefaults/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	MooseX-HasDefaults
 PORTVERSION=	0.03
 PORTREVISION=	1
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../by-authors/id/S/SA/SARTAK
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:SARTAK
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Default "is" to "ro" or "rw" for all attributes
 WWW=		https://metacpan.org/release/MooseX-HasDefaults
 
 BUILD_DEPENDS=	p5-Moose>2:devel/p5-Moose \
 		p5-Test-Exception>0:devel/p5-Test-Exception
 
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Time-ParseDate/Makefile b/devel/p5-Time-ParseDate/Makefile
index 6a96afde59d7..3bf56594ea28 100644
--- a/devel/p5-Time-ParseDate/Makefile
+++ b/devel/p5-Time-ParseDate/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	Time-ParseDate
 PORTVERSION=	2026.033
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/../by-authors/id/B/BP/BPS/
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:BPS
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Date parsing, both relative and absolute
 WWW=		https://metacpan.org/pod/Time::ParseDate
 
 USES=		perl5
 USE_PERL5=	configure
 NO_ARCH=	yes
 
 .include <bsd.port.mk>