Index: head/security/keychain/Makefile
===================================================================
--- head/security/keychain/Makefile	(revision 532481)
+++ head/security/keychain/Makefile	(revision 532482)
@@ -1,40 +1,40 @@
 # Created by: Johann Visagie <wjv@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	keychain
 PORTVERSION=	2.8.5
 CATEGORIES=	security
-MASTER_SITES=	http://www.funtoo.org/archive/keychain/ \
-		GENTOO
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	User-friendly front-end to ssh-agent(1)
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-USES=		tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	funtoo
+
 OPTIONS_DEFINE=	DOCS
 
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/keychain.1.gz
 
 PORTDOCS=	ChangeLog README.md
 
 .if !exists(${LOCALBASE}/bin/ssh-agent) && !exists(/usr/bin/ssh-agent)
 RUN_DEPENDS+=	ssh-agent:security/openssh-portable
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '1 s,^.*,#!/bin/sh,' \
 		${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/keychain.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/keychain/distinfo
===================================================================
--- head/security/keychain/distinfo	(revision 532481)
+++ head/security/keychain/distinfo	(revision 532482)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1528577567
-SHA256 (keychain-2.8.5.tar.bz2) = 16f5949b606691dea6e1832a77e697b8c0b2a536abfbd29e3a3f47222259c3b2
-SIZE (keychain-2.8.5.tar.bz2) = 34869
+TIMESTAMP = 1587517454
+SHA256 (funtoo-keychain-2.8.5_GH0.tar.gz) = dcce703e5001211c8ebc0528f45b523f84d2bceeb240600795b4d80cb8475a0b
+SIZE (funtoo-keychain-2.8.5_GH0.tar.gz) = 66446
Index: head/security/keychain/pkg-descr
===================================================================
--- head/security/keychain/pkg-descr	(revision 532481)
+++ head/security/keychain/pkg-descr	(revision 532482)
@@ -1,8 +1,8 @@
 Keychain is a shell script which acts as a user-friendly front-end to
 ssh-agent(1), allowing you to have one long-running ssh-agent process per
 system rather than per login session.
 
 Please study the documentation on the keychain website carefully since
 incorrect usage of this script may have certain security implications.
 
-WWW: http://www.funtoo.org/index.php?title=Keychain
+WWW: https://www.funtoo.org/Keychain