Index: branches/2019Q4/mail/smtprelay/Makefile
===================================================================
--- branches/2019Q4/mail/smtprelay/Makefile	(revision 514510)
+++ branches/2019Q4/mail/smtprelay/Makefile	(revision 514511)
@@ -1,33 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	smtprelay
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	https://code.bluelife.at/decke/smtprelay/archive/ \
-		LOCAL/decke/smtprelay/
-DISTFILES=	${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}
-DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	decke@FreeBSD.org
 COMMENT=	Simple Go SMTP relay/proxy server
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go:modules
 USE_RC_SUBR=	smtprelay
 
-USE_GITHUB=	nodefault
-GH_TUPLE=	chrj:smtpd:v0.1.2:smtpd/vendor/github.com/chrj/smtpd \
-		vharitonsky:iniflags:a33cd0b5f3de:iniflags/vendor/github.com/vharitonsky/iniflags \
-		golang:crypto:9756ffdc2472:golang/vendor/golang.org/x/crypto
+USE_GITHUB=	yes
+GH_ACCOUNT=	decke
+
+GH_TUPLE=	chrj:smtpd:v0.1.2:chrj_smtpd/vendor/github.com/chrj/smtpd \
+		golang:crypto:9756ffdc2472:golang_crypto/vendor/golang.org/x/crypto \
+		vharitonsky:iniflags:a33cd0b5f3de:vharitonsky_iniflags/vendor/github.com/vharitonsky/iniflags
 
 PLIST_FILES=	bin/${PORTNAME} \
 		"@sample ${ETCDIR}/smtprelay.ini.sample"
 
 post-install:
 		${MKDIR} ${STAGEDIR}${ETCDIR}
 		${INSTALL_DATA} ${WRKSRC}/smtprelay.ini ${STAGEDIR}${ETCDIR}/smtprelay.ini.sample
 
 .include <bsd.port.mk>
Index: branches/2019Q4/mail/smtprelay/distinfo
===================================================================
--- branches/2019Q4/mail/smtprelay/distinfo	(revision 514510)
+++ branches/2019Q4/mail/smtprelay/distinfo	(revision 514511)
@@ -1,9 +1,9 @@
-TIMESTAMP = 1567882351
-SHA256 (smtprelay/v1.3.0.tar.gz) = b5eca3889beb56b0c4632905ddde5df0ca9dd57249a3f7eabe531d5944e62f4c
-SIZE (smtprelay/v1.3.0.tar.gz) = 9650
-SHA256 (smtprelay/chrj-smtpd-v0.1.2_GH0.tar.gz) = f290b7233bf781222e40184f32bfa4550424f96a9d69cbb75241d744080eb8f7
-SIZE (smtprelay/chrj-smtpd-v0.1.2_GH0.tar.gz) = 13676
-SHA256 (smtprelay/vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = d60f3292be138071158e47e794c2ba93ea9dfc866c44e6472833e2d8566024aa
-SIZE (smtprelay/vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = 7498
-SHA256 (smtprelay/golang-crypto-9756ffdc2472_GH0.tar.gz) = 6af409930c3a9313b33f9b8da1a2c24da8ffa07c4fcd55356a77a2f09a0d6326
-SIZE (smtprelay/golang-crypto-9756ffdc2472_GH0.tar.gz) = 1693048
+TIMESTAMP = 1571040295
+SHA256 (decke-smtprelay-v1.3.0_GH0.tar.gz) = 4958601c701789ea9103f3a401f0a74bb367a87be76997eff47f4495081c44ab
+SIZE (decke-smtprelay-v1.3.0_GH0.tar.gz) = 9589
+SHA256 (chrj-smtpd-v0.1.2_GH0.tar.gz) = f290b7233bf781222e40184f32bfa4550424f96a9d69cbb75241d744080eb8f7
+SIZE (chrj-smtpd-v0.1.2_GH0.tar.gz) = 13676
+SHA256 (golang-crypto-9756ffdc2472_GH0.tar.gz) = 6af409930c3a9313b33f9b8da1a2c24da8ffa07c4fcd55356a77a2f09a0d6326
+SIZE (golang-crypto-9756ffdc2472_GH0.tar.gz) = 1693048
+SHA256 (vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = d60f3292be138071158e47e794c2ba93ea9dfc866c44e6472833e2d8566024aa
+SIZE (vharitonsky-iniflags-a33cd0b5f3de_GH0.tar.gz) = 7498
Index: branches/2019Q4/mail/smtprelay/pkg-descr
===================================================================
--- branches/2019Q4/mail/smtprelay/pkg-descr	(revision 514510)
+++ branches/2019Q4/mail/smtprelay/pkg-descr	(revision 514511)
@@ -1,6 +1,6 @@
 Simple Golang SMTP relay/proxy server that accepts mail via SMTP
 and forwards it directly to another SMTP server. It supports TLS,
 STARTTLS, plain SMTP, can do authentication and various sender
 and receiver checks.
 
-WWW: https://code.bluelife.at/decke/smtprelay
+WWW: https://github.com/decke/smtprelay
Index: branches/2019Q4
===================================================================
--- branches/2019Q4	(revision 514510)
+++ branches/2019Q4	(revision 514511)

Property changes on: branches/2019Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r514440