Index: head/dns/p5-App-DSC-DataTool/Makefile
===================================================================
--- head/dns/p5-App-DSC-DataTool/Makefile	(revision 465402)
+++ head/dns/p5-App-DSC-DataTool/Makefile	(revision 465403)
@@ -1,34 +1,32 @@
 # Created by: Leo Vandewoestijne <freebsd@dns.company>
 # $FreeBSD$
 
-PORTNAME=	App-DSC-DataTool
+PORTNAME=	p5-App-DSC-DataTool
 PORTVERSION=	0.03
 CATEGORIES=	dns perl5
 MASTER_SITES=	https://www.dns-oarc.net/files/dsc/ \
 		https://dns.company/downloads/dsc/
-PKGNAMEPREFIX=	p5-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	freebsd@dns.company
 COMMENT=	Tool for converting, exporting, merging and transforming DSC data
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	p5-common-sense>=3:devel/p5-common-sense		\
 		p5-IO-Socket-INET6>=1.31:net/p5-IO-Socket-INET6		\
 		p5-IP-Country>=2.28:net/p5-IP-Country			\
 		p5-Module-Find>=0.13:devel/p5-Module-Find		\
 		p5-NetAddr-IP>=4.078:net-mgmt/p5-NetAddr-IP		\
 		p5-Scalar-Util-Numeric>=0.40:devel/p5-Scalar-Util-Numeric \
 		p5-Test-More-UTF8>=0.04:devel/p5-Test-More-UTF8		\
 		p5-XML-LibXML-Simple>=0.93:textproc/p5-XML-LibXML-Simple \
 		p5-YAML-Tiny>=1.69:textproc/p5-YAML-Tiny
 TEST_DEPENDS=	p5-Test-CheckManifest>=0.9:devel/p5-Test-CheckManifest
 BUILD_DEPENDS:=	${RUN_DEPENDS} \
 		${TEST_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
Index: head/dns/p5-DSC/Makefile
===================================================================
--- head/dns/p5-DSC/Makefile	(revision 465402)
+++ head/dns/p5-DSC/Makefile	(revision 465403)
@@ -1,35 +1,33 @@
 # Created by: Leo Vandewoestijne <freebsd@dns.company>
 # $FreeBSD$
 
-PORTNAME=	DSC
+PORTNAME=	p5-DSC
 PORTVERSION=	2.04
 CATEGORIES=	dns perl5
 MASTER_SITES=	https://www.dns-oarc.net/files/dsc/ \
 		https://dns.company/downloads/dsc/
-PKGNAMEPREFIX=	p5-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	freebsd@dns.company
 COMMENT=	DNS Statistics Presenter Perl Library
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	ploticus>=2.40:math/ploticus				\
 		p5-CGI-Untaint>=1.26:www/p5-CGI-Untaint			\
 		p5-File-NFSLock>=1.21:devel/p5-File-NFSLock		\
 		p5-Hash-Merge>=0.299:textproc/p5-Hash-Merge		\
 		p5-IP-Country>=2.28:net/p5-IP-Country			\
 		p5-Math-Calc-Units>=1.07:math/p5-Math-Calc-Units	\
 		p5-Net-DNS>=1.15:dns/p5-Net-DNS				\
 		p5-Text-Template>=1.51:textproc/p5-Text-Template	\
 		p5-Any-URI-Escape>=0.01:www/p5-Any-URI-Escape		\
 		p5-URI>=1.73:net/p5-URI					\
 		p5-XML-Simple>=2.24:textproc/p5-XML-Simple
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure patch
 
 .include <bsd.port.mk>