Index: head/net/irrd/Makefile
===================================================================
--- head/net/irrd/Makefile	(revision 526476)
+++ head/net/irrd/Makefile	(revision 526477)
@@ -1,74 +1,76 @@
 # Created by: TAKANO Yuji <takano@net-chef.net>
 # $FreeBSD$
 
 PORTNAME=	irrd
 PORTVERSION=	2.3.10
+DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/irrdnet/irrd-legacy/archive/
-DISTNAME=	v${PORTVERSION}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Internet Routing Registry database server
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}-legacy-${PORTVERSION}/COPYRIGHT
 
 RUN_DEPENDS=	wget:ftp/wget
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-legacy-${PORTVERSION}/src
+WRKSRC_SUBDIR=	src
 
 IRRD_CONFDIR=	${PREFIX}/etc
 
 USES=		shebangfix
 USE_RC_SUBR=	irrd
+USE_GITHUB=	yes
+GH_ACCOUNT=	irrdnet
+GH_PROJECT=	irrd-legacy
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	YACC="${YACC}"
 MAKE_JOBS_UNSAFE=	yes
 DESTDIRNAME=	STAGEDIR
 
 OPTIONS_DEFINE=		IPV6
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 SHEBANG_FILES=	programs/irrdcacher/irrdcacher \
 		programs/irrdcacher/ripe2rpsl
 
 PLIST_FILES=	etc/irrd.conf.sample \
 		man/man8/irrd.8.gz \
 		sbin/irr_notify \
 		sbin/irr_rpsl_check \
 		sbin/irr_rpsl_submit \
 		sbin/irrd \
 		sbin/irrdcacher \
 		sbin/ripe2rpsl
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/etc/irrd.conf|${IRRD_CONFDIR}/irrd.conf|g' \
 		${WRKSRC}/programs/IRRd/irrd.8 \
 		${WRKSRC}/programs/IRRd/main.c \
 		${WRKSRC}/programs/hdr_comm/read_conf.c \
 		${WRKSRC}/programs/irr_notify/main.c \
 		${WRKSRC}/programs/irr_rpsl_check/main.c \
 		${WRKSRC}/programs/irr_rpsl_submit/main.c \
 		${WRKSRC}/programs/irrdcacher/irrdcacher \
 		${WRKSRC}/programs/rps_dist/rpsdist.c
 	${REINPLACE_CMD} -e 's|\($$(DESTDIR)\)|$$(STAGEDIR)\1|g' \
 		-e 's|\( -m 755 \)| -s\1|g' \
 		-e 's| -o root -g bin||g' \
 		${WRKSRC}/programs/IRRd/Makefile \
 		${WRKSRC}/programs/irr_notify/Makefile \
 		${WRKSRC}/programs/irr_rpsl_check/Makefile \
 		${WRKSRC}/programs/irr_rpsl_submit/Makefile
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/irrdcacher \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/programs/irrdcacher/ripe2rpsl \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample \
 		${STAGEDIR}${IRRD_CONFDIR}
 	${INSTALL_DATA} ${WRKSRC}/programs/IRRd/irrd.8 \
 		${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: head/net/irrd/distinfo
===================================================================
--- head/net/irrd/distinfo	(revision 526476)
+++ head/net/irrd/distinfo	(revision 526477)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573895413
-SHA256 (irrd/v2.3.10.tar.gz) = acc1b6e5b219c617b1a614cfd586901183a184ee91a42c81473724161a63d65a
-SIZE (irrd/v2.3.10.tar.gz) = 769512
+TIMESTAMP = 1582065766
+SHA256 (irrdnet-irrd-legacy-v2.3.10_GH0.tar.gz) = acc1b6e5b219c617b1a614cfd586901183a184ee91a42c81473724161a63d65a
+SIZE (irrdnet-irrd-legacy-v2.3.10_GH0.tar.gz) = 769512
Index: head/www/nginx-ultimate-bad-bot-blocker/Makefile
===================================================================
--- head/www/nginx-ultimate-bad-bot-blocker/Makefile	(revision 526476)
+++ head/www/nginx-ultimate-bad-bot-blocker/Makefile	(revision 526477)
@@ -1,41 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=		nginx-ultimate-bad-bot-blocker
+DISTVERSIONPREFIX=	V
 DISTVERSION=		4.2020.02.1988
-DISTFILES=		V${PORTVERSION}${EXTRACT_SUFX}
 PORTREVISION=		0
 CATEGORIES=		www security
-MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Nginx bad bot and other things blocker
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	gsed:textproc/gsed
 
-USE_GITHUB=	nodefault
+USE_GITHUB=	yes
 
 GH_ACCOUNT=	mitchellkrogza
-GH_PROJECT=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	sbin/install-ngxblocker \
 		sbin/setup-ngxblocker \
 		sbin/update-ngxblocker
 
 post-patch:
 	${REINPLACE_CMD} -e 's:/usr/local:${PREFIX}:g' \
 		-e 's:/etc/nginx:${LOCALBASE}/etc/nginx:g' \
 		-e 's:nginx/sites-available:nginx/sites:g' \
 		-e 's:/var/www:${LOCALBASE}/www:g' \
 		-e 's:VHOST_EXT="vhost":VHOST_EXT="conf":' ${WRKSRC}/*-ngxblocker
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/*-ngxblocker ${STAGEDIR}${PREFIX}/sbin/
 
 .include <bsd.port.mk>
Index: head/www/nginx-ultimate-bad-bot-blocker/distinfo
===================================================================
--- head/www/nginx-ultimate-bad-bot-blocker/distinfo	(revision 526476)
+++ head/www/nginx-ultimate-bad-bot-blocker/distinfo	(revision 526477)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582031978
-SHA256 (V4.2020.02.1988.tar.gz) = 9bf264f6192bf8a0d9f78f1c54bc2e3b9314ea1bf80bbb33b460514b0173b47b
-SIZE (V4.2020.02.1988.tar.gz) = 3785603
+TIMESTAMP = 1582064627
+SHA256 (mitchellkrogza-nginx-ultimate-bad-bot-blocker-V4.2020.02.1988_GH0.tar.gz) = 9bf264f6192bf8a0d9f78f1c54bc2e3b9314ea1bf80bbb33b460514b0173b47b
+SIZE (mitchellkrogza-nginx-ultimate-bad-bot-blocker-V4.2020.02.1988_GH0.tar.gz) = 3785603

Property changes on: head/www/nginx-ultimate-bad-bot-blocker/distinfo
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-on
\ No newline at end of property
+yes
\ No newline at end of property