Index: branches/2020Q3/net/traefik/Makefile
===================================================================
--- branches/2020Q3/net/traefik/Makefile	(revision 547594)
+++ branches/2020Q3/net/traefik/Makefile	(revision 547595)
@@ -1,64 +1,64 @@
 # $FreeBSD$
 
 PORTNAME=	traefik
-PORTVERSION=	1.7.25
+PORTVERSION=	1.7.26
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 MASTER_SITES=	LOCAL/riggs/${PORTNAME}:webui
 DISTFILES=	${PORTNAME}-webui-static-${PORTVERSION}${EXTRACT_SUFX}:webui
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	High availability reverse proxy and load balancer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	go-bindata:devel/go-bindata
 
 USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	containous
 GH_SUBDIR=	src/github.com/containous/traefik
 
 USE_RC_SUBR=	traefik
 
 GO_BUILDFLAGS=	-ldflags "-s -w \
 		-X github.com/containous/traefik/version.Version=${DISTVERSION} \
 		-X github.com/containous/traefik/version.BuildDate=`date -u '+%Y-%m-%d_%I:%M:%S%p'`"
 GO_TARGET=	./cmd/traefik
 CGO_ENABLED=	0
 
 USERS=		traefik
 GROUPS=		traefik
 
 PLIST_FILES=	bin/traefik \
 		"@sample etc/traefik.toml.sample"
 
 # Recipe for building the web UI
 # Note this is not done during a standard port build as
 # it downloads node modules from the internet during build.
 # Instead, we use the pre-generated from LOCAL.
 # (20180510: the upath module requires node < 10)
 # BUILD_DEPENDS+=	npm:www/npm-node8 \
 #		yarnpkg:www/yarn-node8
 #USES+=		python:2.7,build
 #build-ui:
 #	@cd ${WRKSRC}/webui; \
 #	yarn install && \
 #	yarn run build
 
 post-patch:
 	@${MV} ${WRKDIR}/static ${WRKSRC}
 	# Install a sample configuration file which works by default
 	# without manual tweaking
 	${REINPLACE_CMD} -e 's|:80|:8088|' \
 			 -e 's|\[docker|# \[docker|' ${WRKSRC}/traefik.sample.toml
 
 pre-build:
 	cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/traefik.sample.toml ${STAGEDIR}${PREFIX}/etc/traefik.toml.sample
 
 .include <bsd.port.mk>
Index: branches/2020Q3/net/traefik/distinfo
===================================================================
--- branches/2020Q3/net/traefik/distinfo	(revision 547594)
+++ branches/2020Q3/net/traefik/distinfo	(revision 547595)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1595163674
-SHA256 (traefik-webui-static-1.7.25.tar.gz) = 36f421a12073883db8374d870507fe30450c24fe3371024890925c9daf51e858
-SIZE (traefik-webui-static-1.7.25.tar.gz) = 922785
-SHA256 (containous-traefik-v1.7.25_GH0.tar.gz) = fd073390b2333c2cccf91210d670ee36721edcf1071ce8b0b76da7da225edaec
-SIZE (containous-traefik-v1.7.25_GH0.tar.gz) = 11392414
+TIMESTAMP = 1599285554
+SHA256 (traefik-webui-static-1.7.26.tar.gz) = 80cd113b5b250fc9ebba26471667ad594d33ec214884d5b7ad7ef7477d5d9289
+SIZE (traefik-webui-static-1.7.26.tar.gz) = 920348
+SHA256 (containous-traefik-v1.7.26_GH0.tar.gz) = 440e8f3fa9cd5f3da2a4e9654f5216c89209de84590651d0ffff25f8155c8b20
+SIZE (containous-traefik-v1.7.26_GH0.tar.gz) = 11392194
Index: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 547594)
+++ branches/2020Q3	(revision 547595)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r547594