Index: head/devel/bcc/Makefile
===================================================================
--- head/devel/bcc/Makefile	(revision 438101)
+++ head/devel/bcc/Makefile	(revision 438102)
@@ -1,23 +1,22 @@
 # Created by: joerg
 # $FreeBSD$
 
 PORTNAME=	bcc
 PORTVERSION=	1995.03.12
 PORTREVISION=	2
 CATEGORIES=	devel lang
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	joerg
+MASTER_SITES=	LOCAL/joerg
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Bruce's C compiler (with as and ld); can do 16-bit code
 
 LICENSE=	GPLv2
 
 USES=		uidfix
 
 CONFLICTS=	bin86-[0-9]* dev86-[0-9]*
 
 BROKEN_aarch64=		Fails to link: error adding symbols: File in wrong format
 
 .include <bsd.port.mk>
Index: head/editors/bpatch/Makefile
===================================================================
--- head/editors/bpatch/Makefile	(revision 438101)
+++ head/editors/bpatch/Makefile	(revision 438102)
@@ -1,27 +1,26 @@
 # Created by: joerg
 # $FreeBSD$
 
 PORTNAME=	bpatch
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	joerg
+MASTER_SITES=	LOCAL/joerg
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Hex editor that doesn't load the whole file at once
 
 # 2016-11-14: Email from Prof. (em.) John Rupley
 # As far as I am concerned, the code is public domain, with no
 # restrictions.  Steven List, in his README for the original
 # distribution, said that the original author, Garry Johnson, gave him
 # permission to place the code in the public domain.  So, do whatever
 # you will with bpatch.  Nice to know it may still have a life.
 LICENSE=	CC0-1.0
 
 NO_WRKSUBDIR=   yes
 PLIST_FILES=	bin/bpatch \
 		man/man1/bpatch.1.gz
 
 .include <bsd.port.mk>