Index: head/net/traefik/Makefile
===================================================================
--- head/net/traefik/Makefile	(revision 552039)
+++ head/net/traefik/Makefile	(revision 552040)
@@ -1,64 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	traefik
-PORTVERSION=	1.7.26
-DISTVERSIONPREFIX=	v
+PORTVERSION=	2.3.1
 CATEGORIES=	net
-MASTER_SITES=	LOCAL/riggs/${PORTNAME}:webui
-DISTFILES=	${PORTNAME}-webui-static-${PORTVERSION}${EXTRACT_SUFX}:webui
+MASTER_SITES=	LOCAL/riggs/${PORTNAME}
 
 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
+USES=		go:modules tar:xz
 
-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'`"
+		-X github.com/traefik/traefik/v2/pkg/version.Version=${DISTVERSION} \
+		-X github.com/traefik/traefik/v2/pkg/version.Codename=portbuild \
+		-X github.com/traefik/traefik/v2/pkg/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
+# Preparing the vendor dir for a self-contained tarball now works by just
+# executing 'make gomod-vendor' and bundling the resulting ${WRKSRC}/vendor.
+# Building the UI with node + yarn is no longer necessary.
 
 post-patch:
-	@${MV} ${WRKDIR}/static ${WRKSRC}
-	# Install a sample configuration file which works by default
-	# without manual tweaking
+	# Install a sample configuration file which at least allows the daemon
+	# to start without manual tweaking.
 	${REINPLACE_CMD} -e 's|:80|:8088|' \
-			 -e 's|\[docker|# \[docker|' ${WRKSRC}/traefik.sample.toml
+			 -e 's|:443|:8433|' \
+			 -e 's|\[providers.docker|# \[providers.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: head/net/traefik/distinfo
===================================================================
--- head/net/traefik/distinfo	(revision 552039)
+++ head/net/traefik/distinfo	(revision 552040)
@@ -1,5 +1,3 @@
-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
+TIMESTAMP = 1602282919
+SHA256 (traefik-2.3.1.tar.xz) = 4c270456282773e234057d8a7959856d7a61eac930a5f159cb4f7ea19dabcab6
+SIZE (traefik-2.3.1.tar.xz) = 13105328
Index: head/net/traefik/files/traefik.in
===================================================================
--- head/net/traefik/files/traefik.in	(revision 552039)
+++ head/net/traefik/files/traefik.in	(revision 552040)
@@ -1,53 +1,53 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: traefik
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # traefik_enable (bool):	Set to NO by default.
 #				Set it to YES to enable traefik.
 # traefik_user (user):		Set user to run traefik.
 #				Default is "traefik".
 # traefik_group (group):	Set group to run traefik.
 #				Default is "traefik".
 # traefik_conf (path):		Path to traefik configuration file.
 #				Default is %%PREFIX%%/etc/traefik.toml
 # traefik_env (vars):		Set environment variables used with traefik
 #				Default is "".
 #				These are necessary for ACME (Let's Encrypt)
 #				configuration, see
 #				https://docs.traefik.io/configuration/acme/
 
 . /etc/rc.subr
 
 name=traefik
 rcvar=traefik_enable
 
 load_rc_config $name
 
 : ${traefik_enable:="NO"}
 : ${traefik_user:="traefik"}
 : ${traefik_group:="traefik"}
 : ${traefik_conf:="%%PREFIX%%/etc/traefik.toml"}
 : ${traefik_env:=""}
 
 pidfile=/var/run/traefik.pid
 procname="%%PREFIX%%/bin/traefik"
 command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} /usr/bin/env ${traefik_env} ${procname} --configFile=${traefik_conf} ${traefik_args}"
+command_args="-f -p ${pidfile} /usr/bin/env ${traefik_env} ${procname} --configfile=${traefik_conf} ${traefik_args}"
 
 start_precmd=traefik_startprecmd
 
 traefik_startprecmd()
 {
         if [ ! -e ${pidfile} ]; then
                 install -o ${traefik_user} -g ${traefik_group} /dev/null ${pidfile};
         fi
 }
 
 run_rc_command "$1"
Index: head/net/traefik/pkg-message
===================================================================
--- head/net/traefik/pkg-message	(revision 552039)
+++ head/net/traefik/pkg-message	(revision 552040)
@@ -1,18 +1,31 @@
 [
 { type: install
   message: <<EOM
 Note that traefik starts as unpriviliged user. Thus, it cannot
 bind to privileged ports (by default, ports below 1024) and
 will exit when configured to do so.
 
 If traefik should serve ports in the privileged range, there
 are options to achieve this:
 - Have traffic bind to an unprivileged port and use the
   packet filter configuration to redirect requests to the
   desired privileged port to the unprivileged port in
   traefik's configuration file e.g. the rdr rules in pf(4).
 - The mac_portacl kernel module allows unprivileged processes
   to bind to privileged ports.
 EOM
 }
+{ type: upgrade
+  maximum_version: "2.0"
+  message: <<EOM
+The version 2 of Traefik requires manual configuration changes
+when migrating from a legacy v1 version to v2.
+Please consult the Traefik migration guide at
+https://doc.traefik.io/traefik/migration/v1-to-v2/
+for details on how to adapt existing configuration files.
+Note that there is a tool that can automate migration and
+rewrite existing configuration files (at least partially):
+https://github.com/traefik/traefik-migration-tool
+EOM
+}
 ]